Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

One more attempt to handle report null-ness

Browse source
This commit is contained in:
Eli Ribble 2026-04-29 20:58:47 +00:00
parent a1b2d580a8
commit 89eca2ddf9
No known key found for this signature in database
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/publicreport/compliance.go
View file

@ -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,

2
platform/publicreport/nuisance.go
View file

@ -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",

17
platform/publicreport/report.go
View file

@ -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

2
platform/publicreport/water.go
View file

@ -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",