From 80a846b678c806640cdba506d473ae1d3feef4a8 Mon Sep 17 00:00:00 2001 From: Ana Nunes da Silva Date: Mon, 8 Jul 2024 16:16:01 +0100 Subject: [PATCH] Add producer city --- .../app/services/affiliate_sales_data_builder.rb | 14 +++++++++++--- .../app/services/affiliate_sales_query.rb | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/engines/dfc_provider/app/services/affiliate_sales_data_builder.rb b/engines/dfc_provider/app/services/affiliate_sales_data_builder.rb index 2908a810f6..135f9c463e 100644 --- a/engines/dfc_provider/app/services/affiliate_sales_data_builder.rb +++ b/engines/dfc_provider/app/services/affiliate_sales_data_builder.rb @@ -18,11 +18,15 @@ class AffiliateSalesDataBuilder < DfcBuilder end def build_addresses - sales_data.map { |sale| build_address(sale) } + sales_data + .uniq { |sale| sale.producer_city && sale.producer_postcode } + .map { |sale| build_address(sale) } end def build_producers - sales_data.map { |sale| build_producer(sale) } + sales_data + .uniq(&:producer_id) + .map { |sale| build_producer(sale) } end def build_supplied_products @@ -64,13 +68,17 @@ class AffiliateSalesDataBuilder < DfcBuilder longitude: nil, region: nil, street: nil, - city: 'test' + city: sale.producer_city ) end def build_producer(sale) DataFoodConsortium::Connector::Enterprise.new( urls.enterprise_url(sale.producer_id), + logo: nil, + name: nil, + description: nil, + vatNumber: nil, suppliedProducts: build_supplied_product(sale), localizations: build_address(sale) ) diff --git a/engines/dfc_provider/app/services/affiliate_sales_query.rb b/engines/dfc_provider/app/services/affiliate_sales_query.rb index 9bc1a77502..7c41d35b5a 100644 --- a/engines/dfc_provider/app/services/affiliate_sales_query.rb +++ b/engines/dfc_provider/app/services/affiliate_sales_query.rb @@ -42,6 +42,7 @@ class AffiliateSalesQuery spree_line_items.currency, producers.id AS producer_id, distributors.id AS distributor_id, + producers.city AS producer_city, distributors.zipcode AS distributor_postcode, producers.zipcode AS producer_postcode SQL