diff --git a/engines/dfc_provider/app/services/address_builder.rb b/engines/dfc_provider/app/services/address_builder.rb index 1c7b3618d3..5f20a0e67c 100644 --- a/engines/dfc_provider/app/services/address_builder.rb +++ b/engines/dfc_provider/app/services/address_builder.rb @@ -8,7 +8,9 @@ class AddressBuilder < DfcBuilder postalCode: address.zipcode, city: address.city, country: address.country.name, - region: address.state.name + region: address.state.name, + latitude: address.latitude, + longitude: address.longitude, ) end end diff --git a/engines/dfc_provider/spec/requests/enterprises_spec.rb b/engines/dfc_provider/spec/requests/enterprises_spec.rb index 059080ffc0..858fd84789 100644 --- a/engines/dfc_provider/spec/requests/enterprises_spec.rb +++ b/engines/dfc_provider/spec/requests/enterprises_spec.rb @@ -15,9 +15,16 @@ RSpec.describe "Enterprises", swagger_doc: "dfc.yaml" do email_address: "hello@example.org", phone: "0404 444 000 200", website: "https://openfoodnetwork.org", - address: build(:address, id: 40_000, address1: "42 Doveton Street"), + address:, ) end + let(:address) { + build( + :address, + id: 40_000, address1: "42 Doveton Street", + latitude: -25.345376, longitude: 131.0312006, + ) + } let!(:other_enterprise) do create( :distributor_enterprise, diff --git a/engines/dfc_provider/spec/services/address_builder_spec.rb b/engines/dfc_provider/spec/services/address_builder_spec.rb index 89020de3e7..da9830b323 100644 --- a/engines/dfc_provider/spec/services/address_builder_spec.rb +++ b/engines/dfc_provider/spec/services/address_builder_spec.rb @@ -8,6 +8,7 @@ RSpec.describe AddressBuilder do build( :address, id: 1, address1: "Paradise 15", zipcode: "0001", city: "Goosnargh", + latitude: -25.345376, longitude: 131.0312006, state: build(:state, name: "Victoria") ) } @@ -38,5 +39,10 @@ RSpec.describe AddressBuilder do it "assigns a region" do expect(result.region).to eq "Victoria" end + + it "assigns coordinates" do + expect(result.latitude).to eq(-25.345376) + expect(result.longitude).to eq 131.0312006 + end end end diff --git a/swagger/dfc.yaml b/swagger/dfc.yaml index 146edf8736..74a4fd113b 100644 --- a/swagger/dfc.yaml +++ b/swagger/dfc.yaml @@ -467,6 +467,8 @@ paths: dfc-b:hasPostalCode: '20170' dfc-b:hasCity: Herndon dfc-b:hasCountry: Australia + dfc-b:latitude: -25.345376 + dfc-b:longitude: 131.0312006 dfc-b:region: Victoria - "@id": http://test.host/api/dfc/enterprises/10000/supplied_products/10001 "@type": dfc-b:SuppliedProduct @@ -541,6 +543,8 @@ paths: dfc-b:hasPostalCode: '20170' dfc-b:hasCity: Herndon dfc-b:hasCountry: Australia + dfc-b:latitude: -25.345376 + dfc-b:longitude: 131.0312006 dfc-b:region: Victoria - "@id": http://test.host/api/dfc/enterprises/10000/supplied_products/10001 "@type": dfc-b:SuppliedProduct