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

Fix MustGet calls from when Globalid was not required.

Browse source
This commit is contained in:
Eli Ribble 2026-01-05 20:35:09 +00:00
parent c6b048d0cb
commit 2e74f95e8c
2 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
html.go
View file

@ -766,7 +766,7 @@ func trapsBySource(ctx context.Context, org *models.Organization, sourceID uuid.
location_ids := make([]uuid.UUID, 0) location_ids := make([]uuid.UUID, 0)
var args []bob.Expression var args []bob.Expression
for _, location := range locations { for _, location := range locations {
location_ids = append(location_ids, location.TrapLocationGlobalid.MustGet()) location_ids = append(location_ids, location.TrapLocationGlobalid)
args = append(args, psql.Arg(location.TrapLocationGlobalid)) args = append(args, psql.Arg(location.TrapLocationGlobalid))
} }
/* /*
@ -944,7 +944,7 @@ func breedingSourcesByCell(ctx context.Context, org *models.Organization, c h3.C
last_treat_date = &l last_treat_date = &l
} }
results = append(results, BreedingSourceSummary{ results = append(results, BreedingSourceSummary{
ID: r.Globalid.MustGet(), ID: r.Globalid,
LastInspected: last_inspected, LastInspected: last_inspected,
LastTreated: last_treat_date, LastTreated: last_treat_date,
Type: r.Habitat.GetOr("none"), Type: r.Habitat.GetOr("none"),

10
model_conversion.go
View file

@ -168,7 +168,7 @@ func toTemplateTraps(locations []sql.TrapLocationBySourceIDRow, trap_data []sql.
results := make([]TrapNearby, 0) results := make([]TrapNearby, 0)
count_by_trap_data_id := make(map[uuid.UUID]*sql.TrapCountByLocationIDRow) count_by_trap_data_id := make(map[uuid.UUID]*sql.TrapCountByLocationIDRow)
for _, c := range counts { for _, c := range counts {
count_by_trap_data_id[c.TrapdataGlobalid.MustGet()] = &c count_by_trap_data_id[c.TrapdataGlobalid] = &c
} }
counts_by_location_id := make(map[uuid.UUID][]*TrapCount) counts_by_location_id := make(map[uuid.UUID][]*TrapCount)
for _, td := range trap_data { for _, td := range trap_data {
@ -193,14 +193,14 @@ func toTemplateTraps(locations []sql.TrapLocationBySourceIDRow, trap_data []sql.
counts_by_location_id[loc_id] = counts counts_by_location_id[loc_id] = counts
} }
for _, location := range locations { for _, location := range locations {
counts, ok := counts_by_location_id[location.TrapLocationGlobalid.MustGet()] counts, ok := counts_by_location_id[location.TrapLocationGlobalid]
if !ok { if !ok {
return results, errors.New(fmt.Sprintf("Failed to find counts for %s", location.TrapLocationGlobalid)) return results, errors.New(fmt.Sprintf("Failed to find counts for %s", location.TrapLocationGlobalid))
} }
trap := TrapNearby{ trap := TrapNearby{
Counts: counts, Counts: counts,
Distance: location.Distance, Distance: location.Distance,
ID: location.TrapLocationGlobalid.MustGet(), ID: location.TrapLocationGlobalid,
} }
results = append(results, trap) results = append(results, trap)
} }
@ -219,7 +219,7 @@ func toTemplateTrapData(trap_data models.FieldseekerTrapdatumSlice) ([]TrapData,
// Basic Identifiers // Basic Identifiers
OrganizationID: r.OrganizationID, OrganizationID: r.OrganizationID,
ObjectID: r.Objectid, ObjectID: r.Objectid,
GlobalID: r.Globalid.MustGet(), GlobalID: r.Globalid,
LocationName: r.Locationname.GetOr(""), LocationName: r.Locationname.GetOr(""),
LocationID: r.LocID.GetOr(uuid.UUID{}), LocationID: r.LocID.GetOr(uuid.UUID{}),
SRID: r.Srid.GetOr(uuid.UUID{}), SRID: r.Srid.GetOr(uuid.UUID{}),
@ -343,7 +343,7 @@ func toTemplateBreedingSource(source *models.FieldseekerPointlocation) *Breeding
Description: source.Description.MustGet(), Description: source.Description.MustGet(),
LocationNumber: int64(source.Locationnumber.GetOr(0)), LocationNumber: int64(source.Locationnumber.GetOr(0)),
ObjectID: source.Objectid, ObjectID: source.Objectid,
GlobalID: source.Globalid.MustGet(), GlobalID: source.Globalid,
ExternalID: source.Externalid.GetOr(""), ExternalID: source.Externalid.GetOr(""),
// Status Information // Status Information