From 3c62fe2ca1a700fbf25ca51ef40e09d3f7de9250 Mon Sep 17 00:00:00 2001
From: Eli Ribble <eli@gleipnir.technology>
Date: Tue, 14 Apr 2026 01:26:23 +0000
Subject: [PATCH] Be consistent about using report.public_id over report.id

---
 resource/publicreport_compliance.go       |  4 ++--
 ts/components/CommunicationColumnList.vue |  2 +-
 ts/components/PublicreportCard.vue        |  2 +-
 ts/rmo/content/Nuisance.vue               |  2 +-
 ts/rmo/content/Water.vue                  |  2 +-
 ts/rmo/content/compliance/Complete.vue    | 14 --------------
 ts/rmo/view/Compliance.vue                | 14 ++++++++++++--
 ts/store/publicreport.ts                  |  2 +-
 ts/type/api.ts                            |  6 ------
 9 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/resource/publicreport_compliance.go b/resource/publicreport_compliance.go
index c4f5d470..eb454597 100644
--- a/resource/publicreport_compliance.go
+++ b/resource/publicreport_compliance.go
@@ -28,7 +28,7 @@ type complianceR struct {
 }
 type compliance struct {
 	District string `json:"district"`
-	ID       string `json:"id"`
+	PublicID string `json:"public_id"`
 	URI      string `json:"uri"`
 }
 
@@ -91,7 +91,7 @@ func (res *complianceR) Create(ctx context.Context, r *http.Request, n publicrep
 	}
 	return &compliance{
 		District: district_uri,
-		ID:       report.PublicID,
+		PublicID: report.PublicID,
 		URI:      uri,
 	}, nil
 }
diff --git a/ts/components/CommunicationColumnList.vue b/ts/components/CommunicationColumnList.vue
index e3511746..e407fdc7 100644
--- a/ts/components/CommunicationColumnList.vue
+++ b/ts/components/CommunicationColumnList.vue
@@ -212,7 +212,7 @@ function filterMatchesLogEntry(filter: string, logs: LogEntry[]) {
 function filterMatchesPublicReport(filter: string, pr: PublicReport) {
 	if (
 		pr.address.raw.includes(filter) ||
-		pr.id.includes(filter) ||
+		pr.public_id.includes(filter) ||
 		filterMatchesLogEntry(filter, pr.log)
 	) {
 		return true;
diff --git a/ts/components/PublicreportCard.vue b/ts/components/PublicreportCard.vue
index 541f6de5..43bf2e10 100644
--- a/ts/components/PublicreportCard.vue
+++ b/ts/components/PublicreportCard.vue
@@ -25,7 +25,7 @@
 						Standing Water Report
 					</span>
 				</h5>
-				<small class="text-muted">Report ID: #{{ report.id }}</small>
+				<small class="text-muted">Report ID: #{{ report.public_id }}</small>
 			</div>
 			<span class="badge bg-secondary">
 				<TimeRelative :time="report.created" />
diff --git a/ts/rmo/content/Nuisance.vue b/ts/rmo/content/Nuisance.vue
index 74ca6da6..84b3319b 100644
--- a/ts/rmo/content/Nuisance.vue
+++ b/ts/rmo/content/Nuisance.vue
@@ -537,7 +537,7 @@ async function doSubmit() {
 		});
 		const data: PublicReport = (await resp.json()) as PublicReport;
 		storePublicReport.add(data);
-		router.push("/submitted/" + data.id);
+		router.push("/submitted/" + data.public_id);
 	} catch (error) {
 		errorMessage.value =
 			error instanceof Error ? error.message : "Upload failed";
diff --git a/ts/rmo/content/Water.vue b/ts/rmo/content/Water.vue
index 9e60d1eb..eea853bc 100644
--- a/ts/rmo/content/Water.vue
+++ b/ts/rmo/content/Water.vue
@@ -697,7 +697,7 @@ async function doSubmit() {
 		});
 		const data: PublicReport = (await resp.json()) as PublicReport;
 		storePublicReport.add(data);
-		router.push("/submitted/" + data.id);
+		router.push("/submitted/" + data.public_id);
 	} catch (error) {
 		errorMessage.value =
 			error instanceof Error ? error.message : "Upload failed";
diff --git a/ts/rmo/content/compliance/Complete.vue b/ts/rmo/content/compliance/Complete.vue
index d15be528..2e5d45a8 100644
--- a/ts/rmo/content/compliance/Complete.vue
+++ b/ts/rmo/content/compliance/Complete.vue
@@ -121,13 +121,6 @@
 	margin-top: 16px;
 }
 
-.reference-number {
-	text-align: center;
-	color: #6c757d;
-	font-size: 0.9rem;
-	margin-top: 24px;
-}
-
 .action-buttons {
 	width: 100%;
 }
@@ -233,13 +226,6 @@
 				</div>
 			</div>
 		</template>
-
-		<!-- Reference Number -->
-		<div class="reference-number">
-			<small>
-				Reference number: <strong>{{ modelValue.public_id }}</strong>
-			</small>
-		</div>
 	</div>
 </template>
 <script setup lang="ts">
diff --git a/ts/rmo/view/Compliance.vue b/ts/rmo/view/Compliance.vue
index 889dee65..92f4dd74 100644
--- a/ts/rmo/view/Compliance.vue
+++ b/ts/rmo/view/Compliance.vue
@@ -5,15 +5,19 @@ body {
 	display: flex;
 	flex-direction: column;
 }
-
 body > .container-fluid {
 	flex: 1;
 }
-
 .progress-bar {
 	background-color: #0d6efd;
 	transition: width 0.3s ease;
 }
+.reference-number {
+	text-align: center;
+	color: #6c757d;
+	font-size: 0.9rem;
+	margin-top: 24px;
+}
 </style>
 <template>
 	<template v-if="district">
@@ -38,6 +42,12 @@ body > .container-fluid {
 	<template v-else>
 		<p>loading {{ slug }}...</p>
 	</template>
+	<!-- Reference Number -->
+	<div class="reference-number" v-if="report && report.public_id">
+		<small>
+			Reference number: <strong>{{ report.public_id }}</strong>
+		</small>
+	</div>
 </template>
 
 <script setup lang="ts">
diff --git a/ts/store/publicreport.ts b/ts/store/publicreport.ts
index 76e4127e..77bb4c24 100644
--- a/ts/store/publicreport.ts
+++ b/ts/store/publicreport.ts
@@ -10,7 +10,7 @@ export const useStorePublicReport = defineStore("publicreport", () => {
 	//const ongoingFetch = ref<Promise<PublicReport[]> | null>(null);
 
 	function add(pr: PublicReport) {
-		_byID.value.set(pr.id, pr);
+		_byID.value.set(pr.public_id, pr);
 	}
 	// Actions
 	async function byID(id: string): Promise<PublicReport | undefined> {
diff --git a/ts/type/api.ts b/ts/type/api.ts
index b0277076..49518125 100644
--- a/ts/type/api.ts
+++ b/ts/type/api.ts
@@ -153,7 +153,6 @@ export interface ComplianceUpdate {
 	comments?: string;
 	gate_code?: string;
 	has_dog?: boolean;
-	//id: string;
 	//images?: Image[];
 	location?: Location;
 	permission_type?: string;
@@ -166,7 +165,6 @@ export interface PublicReportDTO {
 	//compliance?: PublicReportCompliance;
 	created: string;
 	district: string;
-	id: string;
 	images: Image[];
 	location: Location;
 	log: LogEntryDTO[];
@@ -182,7 +180,6 @@ export interface PublicReportOptions {
 	address: Address;
 	created: Date;
 	district: string;
-	id: string;
 	images: Image[];
 	location: Location;
 	log: LogEntry[];
@@ -196,7 +193,6 @@ export class PublicReport {
 	address: Address;
 	created: Date;
 	district: string;
-	id: string;
 	images: Image[];
 	log: LogEntry[];
 	public_id: string;
@@ -209,7 +205,6 @@ export class PublicReport {
 		this.address = options?.address ?? new Address();
 		this.created = options?.created ?? new Date();
 		this.district = options?.district ?? "";
-		this.id = options?.id ?? "";
 		this.images = options?.images ?? [];
 		this.log = options?.log ?? [];
 		this.public_id = options?.public_id ?? "";
@@ -224,7 +219,6 @@ export class PublicReport {
 			address: json.address,
 			created: new Date(json.created),
 			district: json.district,
-			id: json.id,
 			images: json.images,
 			location: json.location,
 			log: json.log.map((l: LogEntryDTO) => LogEntry.fromJSON(l)),