diff --git a/engines/dfc_provider/app/services/affiliate_sales_data_row_builder.rb b/engines/dfc_provider/app/services/affiliate_sales_data_row_builder.rb index c6e9a2d913c..8d50508a636 100644 --- a/engines/dfc_provider/app/services/affiliate_sales_data_row_builder.rb +++ b/engines/dfc_provider/app/services/affiliate_sales_data_row_builder.rb @@ -14,7 +14,6 @@ def build_supplier nil, localizations: [build_address( item[:supplier_postcode], - item[:supplier_city], item[:supplier_country] )], suppliedProducts: [build_product], @@ -26,7 +25,6 @@ def build_distributor nil, localizations: [build_address( item[:distributor_postcode], - item[:distributor_city], item[:distributor_country] )], ) @@ -97,10 +95,9 @@ def build_price ) end - def build_address(postcode, city, country) + def build_address(postcode, country) DataFoodConsortium::Connector::Address.new( nil, - city:, country:, postalCode: postcode, ) diff --git a/engines/dfc_provider/app/services/affiliate_sales_query.rb b/engines/dfc_provider/app/services/affiliate_sales_query.rb index 91a3f9e627c..a2a90ad233f 100644 --- a/engines/dfc_provider/app/services/affiliate_sales_query.rb +++ b/engines/dfc_provider/app/services/affiliate_sales_query.rb @@ -55,10 +55,8 @@ def fields spree_variants.unit_presentation, spree_line_items.price, distributor_addresses.zipcode AS distributor_postcode, - distributor_addresses.city AS distributor_city, distributor_countries.name AS distributor_country, supplier_addresses.zipcode AS supplier_postcode, - supplier_addresses.city AS supplier_city, supplier_countries.name AS supplier_country, SUM(spree_line_items.quantity) AS quantity_sold @@ -75,8 +73,6 @@ def key_fields spree_line_items.price, distributor_postcode, supplier_postcode, - distributor_city, - supplier_city, distributor_country, supplier_country SQL @@ -92,10 +88,8 @@ def labels unit_presentation price distributor_postcode - distributor_city distributor_country supplier_postcode - supplier_city supplier_country quantity_sold ] diff --git a/engines/dfc_provider/spec/services/affiliate_sales_query_spec.rb b/engines/dfc_provider/spec/services/affiliate_sales_query_spec.rb index 35261fac9f2..7bb431cb065 100644 --- a/engines/dfc_provider/spec/services/affiliate_sales_query_spec.rb +++ b/engines/dfc_provider/spec/services/affiliate_sales_query_spec.rb @@ -59,10 +59,8 @@ nil, 15.50, "3210", - "city1", "country1", "3211", - "city2", "country2", 3, ] @@ -75,10 +73,8 @@ unit_presentation: nil, price: 15.50, distributor_postcode: "3210", - distributor_city: "city1", distributor_country: "country1", supplier_postcode: "3211", - supplier_city: "city2", supplier_country: "country2", quantity_sold: 3, } diff --git a/swagger/dfc.yaml b/swagger/dfc.yaml index 12542eae9b8..3f325a5b73e 100644 --- a/swagger/dfc.yaml +++ b/swagger/dfc.yaml @@ -97,7 +97,6 @@ paths: dfc-b:hasAddress: "@type": dfc-b:Address dfc-b:hasPostalCode: '20170' - dfc-b:hasCity: Herndon dfc-b:hasCountry: Australia dfc-b:supplies: "@type": dfc-b:SuppliedProduct @@ -126,7 +125,6 @@ paths: dfc-b:hasAddress: "@type": dfc-b:Address dfc-b:hasPostalCode: '20170' - dfc-b:hasCity: Herndon dfc-b:hasCountry: Australia '400': description: bad request