From 89eca2ddf97b80967e877f7b3e009e9b18a34485 Mon Sep 17 00:00:00 2001
From: Eli Ribble <eli@gleipnir.technology>
Date: Wed, 29 Apr 2026 20:58:47 +0000
Subject: [PATCH] One more attempt to handle report null-ness

---
 platform/publicreport/compliance.go |  2 +-
 platform/publicreport/nuisance.go   |  2 +-
 platform/publicreport/report.go     | 17 +++++++++++++----
 platform/publicreport/water.go      |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/platform/publicreport/compliance.go b/platform/publicreport/compliance.go
index 8df8069f..dbb01346 100644
--- a/platform/publicreport/compliance.go
+++ b/platform/publicreport/compliance.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stephenafamo/scan"
 )
 
-func compliance(ctx context.Context, public_id string, report *types.PublicReport) (*types.PublicReportCompliance, error) {
+func compliance(ctx context.Context, public_id string, report types.PublicReport) (*types.PublicReportCompliance, error) {
 	row, err := bob.One(ctx, db.PGInstance.BobDB, psql.Select(
 		sm.Columns(
 			models.PublicreportCompliances.Columns.AccessInstructions,
diff --git a/platform/publicreport/nuisance.go b/platform/publicreport/nuisance.go
index 1e97dba3..1ef420bc 100644
--- a/platform/publicreport/nuisance.go
+++ b/platform/publicreport/nuisance.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stephenafamo/scan"
 )
 
-func nuisance(ctx context.Context, public_id string, report *types.PublicReport) (*types.PublicReportNuisance, error) {
+func nuisance(ctx context.Context, public_id string, report types.PublicReport) (*types.PublicReportNuisance, error) {
 	row, err := bob.One(ctx, db.PGInstance.BobDB, psql.Select(
 		sm.Columns(
 			"additional_info",
diff --git a/platform/publicreport/report.go b/platform/publicreport/report.go
index 668a7e1e..b3ba1e70 100644
--- a/platform/publicreport/report.go
+++ b/platform/publicreport/report.go
@@ -20,21 +20,30 @@ func ByIDCompliance(ctx context.Context, public_id string, is_public bool) (*typ
 	if err != nil {
 		return nil, fmt.Errorf("base report byid: %w", err)
 	}
-	return compliance(ctx, public_id, report)
+	if report == nil {
+		return nil, nil
+	}
+	return compliance(ctx, public_id, *report)
 }
 func ByIDNuisance(ctx context.Context, public_id string, is_public bool) (*types.PublicReportNuisance, error) {
 	report, err := byID(ctx, public_id, is_public)
 	if err != nil {
 		return nil, fmt.Errorf("base report byid: %w", err)
 	}
-	return nuisance(ctx, public_id, report)
+	if report == nil {
+		return nil, nil
+	}
+	return nuisance(ctx, public_id, *report)
 }
 func ByIDWater(ctx context.Context, public_id string, is_public bool) (*types.PublicReportWater, error) {
 	report, err := byID(ctx, public_id, is_public)
 	if err != nil {
 		return nil, fmt.Errorf("base report byid: %w", err)
 	}
-	return water(ctx, public_id, report)
+	if report == nil {
+		return nil, nil
+	}
+	return water(ctx, public_id, *report)
 }
 func ReportsForOrganization(ctx context.Context, org_id int32, is_public bool) ([]*types.PublicReport, error) {
 	query := reportQuery()
@@ -119,7 +128,7 @@ func ReportsForOrganizationCount(ctx context.Context, org_id int32) (uint, error
 	}
 	return row.Count, nil
 }
-func copyReportContent(src *types.PublicReport, dst *types.PublicReport) {
+func copyReportContent(src types.PublicReport, dst *types.PublicReport) {
 	dst.Address = src.Address
 	dst.Created = src.Created
 	dst.ID = src.ID
diff --git a/platform/publicreport/water.go b/platform/publicreport/water.go
index 93fa7d89..51d96185 100644
--- a/platform/publicreport/water.go
+++ b/platform/publicreport/water.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stephenafamo/scan"
 )
 
-func water(ctx context.Context, public_id string, report *types.PublicReport) (*types.PublicReportWater, error) {
+func water(ctx context.Context, public_id string, report types.PublicReport) (*types.PublicReportWater, error) {
 	row, err := bob.One(ctx, db.PGInstance.BobDB, psql.Select(
 		sm.Columns(
 			"access_comments",