Add address raw content to report
This populates the address in the compliance flow UI
This commit is contained in:
parent
53ce100859
commit
af39a73e8f
2 changed files with 8 additions and 1 deletions
|
|
@ -90,6 +90,7 @@ func reportQueryToRows(ctx context.Context, query bob.BaseQuery[*dialect.SelectQ
|
|||
if row.Location.Latitude == 0.0 || row.Location.Longitude == 0.0 {
|
||||
row.Location = nil
|
||||
}
|
||||
row.Address.Raw = types.AddressToRaw(row.Address)
|
||||
results[i] = &row
|
||||
}
|
||||
return results, nil
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ func AddressFromModel(m *models.Address) Address {
|
|||
},
|
||||
Number: m.Number,
|
||||
PostalCode: m.PostalCode,
|
||||
Raw: fmt.Sprintf("%s %s, %s, %s", m.Number, m.Street, m.Locality, m.Region),
|
||||
Raw: addressToRaw(*m),
|
||||
Region: m.Region,
|
||||
Street: m.Street,
|
||||
Unit: m.Unit,
|
||||
|
|
@ -79,3 +79,9 @@ func AddressList(ctx context.Context, ids []int32) (map[int32]*Address, error) {
|
|||
|
||||
return addresses_by_id, err
|
||||
}
|
||||
func AddressToRaw(a Address) string {
|
||||
return fmt.Sprintf("%s %s, %s, %s", a.Number, a.Street, a.Locality, a.Region)
|
||||
}
|
||||
func addressToRaw(m models.Address) string {
|
||||
return fmt.Sprintf("%s %s, %s, %s", m.Number, m.Street, m.Locality, m.Region)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue