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

Update fetching address number to match new types.Address pattern

Browse source 
This matches what we get by using the models column definition directly.
This commit is contained in:
Eli Ribble 2026-04-22 22:20:42 +00:00
parent f24a583e2e
commit b0170b20d5
No known key found for this signature in database
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/publicreport/report.go
View file

@ -142,7 +142,7 @@ func reportQuery() bob.BaseQuery[*dialect.SelectQuery] {
"COALESCE(a.location_latitude, 0) AS \"address.location.latitude\"",
"COALESCE(a.location_longitude, 0) AS \"address.location.longitude\"",
"COALESCE(a.locality, '') AS \"address.locality\"",
"COALESCE(a.number_, '') AS \"address.number\"",
"COALESCE(a.number_, '') AS \"address.number_\"",
"COALESCE(a.postal_code, '') AS \"address.postal_code\"",
"COALESCE(a.region, '') AS \"address.region\"",
"COALESCE(a.street, '') AS \"address.street\"",

2
platform/signal.go
View file

@ -236,7 +236,7 @@ func SignalList(ctx context.Context, user User, limit int) ([]*Signal, error) {
"signal.type_ AS type",
"COALESCE(address.country, 'usa') AS \"address.country\"",
"COALESCE(address.locality, '') AS \"address.locality\"",
"COALESCE(address.number_, '') AS \"address.number\"",
"COALESCE(address.number_, '') AS \"address.number_\"",
"COALESCE(address.postal_code, '') AS \"address.postal_code\"",
"COALESCE(address.region, '') AS \"address.region\"",
"COALESCE(address.street, '') AS \"address.street\"",

2
platform/site.go
View file

@ -146,7 +146,7 @@ func siteQuery() bob.BaseQuery[*dialect.SelectQuery] {
"address.locality AS \"address.locality\"",
"COALESCE(address.location_latitude, 0) AS \"address.location.latitude\"",
"COALESCE(address.location_longitude, 0) AS \"address.location.longitude\"",
"address.number_ AS \"address.number\"",
"address.number_ AS \"address.number_\"",
"address.postal_code AS \"address.postal_code\"",
"address.region AS \"address.region\"",
"address.street AS \"address.street\"",

2
platform/types/address.go
View file

@ -20,7 +20,7 @@ type Address struct {
ID *int32 `db:"id" json:"-" schema:"-"`
Locality string `db:"locality" json:"locality"`
Location *Location `db:"location" json:"location" schema:"location"`
Number string `db:"number" json:"number"`
Number string `db:"number_" json:"number"`
PostalCode string `db:"postal_code" json:"postal_code"`
Raw string `db:"raw" json:"raw" schema:"raw"`
Region string `db:"region" json:"region"`