[DFC Orders] List products to import on screen

app/controllers/admin/dfc_product_imports_controller.rb

@@ -5,32 +5,52 @@
 
 module Admin
   class DfcProductImportsController < Spree::Admin::BaseController
+    before_action :load_enterprise
+
     # Define model class for `can?` permissions:
     def model_class
       self.class
     end
 
     def index
-      # The plan:
-      #
-      # * Fetch DFC catalog as JSON from URL.
-      enterprise = OpenFoodNetwork::Permissions.new(spree_current_user)
-        .managed_product_enterprises.is_primary_producer
-        .find(params.require(:enterprise_id))
+      # Fetch DFC catalog JSON for preview
+      api = DfcRequest.new(spree_current_user)
+      @catalog_url = params.require(:catalog_url)
+      @catalog_json = api.call(@catalog_url)
+      graph = DfcIo.import(@catalog_json)
+      catalog = DfcCatalog.new(graph)
 
-      catalog_url = params.require(:catalog_url)
-      catalog = DfcCatalog.load(spree_current_user, catalog_url)
+      # Render table and let user decide which ones to import.
+      @items = catalog.products.map do |subject|
+        [
+          subject,
+          @enterprise.supplied_variants.linked_to(subject.semanticId)&.product
+        ]
+      end
+    rescue Faraday::Error,
+           Addressable::URI::InvalidURIError,
+           ActionController::ParameterMissing => e
+      flash[:error] = e.message
+      redirect_to admin_product_import_path
+    end
+
+    def import
+      ids = params.require(:semanticIds)
+
+      # Load DFC catalog JSON
+      graph = DfcIo.import(params.require(:catalog_json))
+      catalog = DfcCatalog.new(graph)
       catalog.apply_wholesale_values!
 
-      # * First step: import all products for given enterprise.
-      # * Second step: render table and let user decide which ones to import.
-      imported = catalog.products.map do |subject|
-        existing_variant = enterprise.supplied_variants.linked_to(subject.semanticId)
+      # Import all selected products for given enterprise.
+      imported = catalog.products.select{ |subject| ids.include?(subject.semanticId) }
+        .map do |subject|
+        existing_variant = @enterprise.supplied_variants.linked_to(subject.semanticId)
 
         if existing_variant
           SuppliedProductBuilder.update_product(subject, existing_variant)
         else
-          SuppliedProductBuilder.store_product(subject, enterprise)
+          SuppliedProductBuilder.store_product(subject, @enterprise)
         end
       end
 
@@ -41,5 +61,13 @@ def index
       flash[:error] = e.message
       redirect_to admin_product_import_path
     end
+
+    private
+
+    def load_enterprise
+      @enterprise = OpenFoodNetwork::Permissions.new(spree_current_user)
+        .managed_product_enterprises.is_primary_producer
+        .find(params.require(:enterprise_id))
+    end
   end
 end

app/models/spree/ability.rb

@@ -238,7 +238,7 @@ def add_product_management_abilities(user)
       can [:admin, :index, :guide, :import, :save, :save_data,
            :validate_data, :reset_absent_products], ProductImport::ProductImporter
 
-      can [:admin, :index], ::Admin::DfcProductImportsController
+      can [:admin, :index, :import], ::Admin::DfcProductImportsController
 
       # Reports page
       can [:admin, :index, :show, :create], ::Admin::ReportsController

app/views/admin/dfc_product_imports/import.html.haml

@@ -0,0 +1,7 @@
+- content_for :page_title do
+  #{t(".title")}
+
+= render partial: 'spree/admin/shared/product_sub_menu'
+
+%p= t(".imported_products")
+= @count

app/views/admin/dfc_product_imports/index.html.haml

@@ -3,5 +3,29 @@
 
 = render partial: 'spree/admin/shared/product_sub_menu'
 
-%p= t(".imported_products")
-= @count
+%p= t('.catalog_url', count: @items.count, catalog_url: @catalog_url)
+%p= t('.enterprise', enterprise_name: @enterprise.name)
+%br
+
+= form_with url: main_app.import_admin_dfc_product_imports_path do |form|
+  -# This is a very inefficient way of holding a json blob. Maybe base64 encode or store as a temporary file
+  = form.hidden_field :enterprise_id, value: @enterprise.id
+  = form.hidden_field :catalog_json, value: @catalog_json
+
+  %table
+    %tbody
+      - @items.each do |supplied_product, existing_product|
+        %tr{id: supplied_product.semanticId }
+          %td
+            %label
+              = form.check_box 'semanticIds[]', { checked: true }, supplied_product.semanticId, ""
+              = supplied_product.name
+          %td
+            - if existing_product.present?
+              Update
+              = link_to(existing_product.id, edit_admin_product_path(existing_product))
+            - else
+              New
+
+  %br
+  = form.submit t(".import")

app/views/admin/product_import/_dfc_import_form.html.haml

@@ -2,15 +2,15 @@
 %br
 
 = form_with url: main_app.admin_dfc_product_imports_path, method: :get do |form|
-  = form.label :enterprise_id, t(".enterprise")
-  %span.required *
+  = form.label :catalog_url, t(".catalog_url")
   %br
-  = form.select :enterprise_id, options_from_collection_for_select(@producers, :id, :name, @producers.first&.id), { "data-controller": "tom-select", class: "primary" }
+  = form.text_field :catalog_url, size: 60
   %br
   %br
-  = form.label :catalog_url, t(".catalog_url")
+  = form.label :enterprise_id, t(".enterprise")
+  %span.required *
   %br
-  = form.text_field :catalog_url, size: 60
+  = form.select :enterprise_id, options_from_collection_for_select(@producers, :id, :name, @producers.first&.id), { "data-controller": "tom-select", class: "primary" }
   %br
   %br
-  = form.submit t(".import")
+  = form.submit t(".preview")

config/locales/en.yml

@@ -847,7 +847,12 @@ en:
 
     dfc_product_imports:
       index:
-        title: "Importing a DFC product catalog"
+        title: "DFC product catalog"
+        catalog_url: "%{count} products to be imported from: %{catalog_url}"
+        enterprise: "Import to enterprise: %{enterprise_name}"
+        import: Import
+      import:
+        title: "DFC product catalog import"
         imported_products: "Imported products:"
     enterprise_fees:
       index:
@@ -1036,7 +1041,7 @@ en:
         title: "Import from DFC catalog"
         enterprise: "Enterprise"
         catalog_url: "DFC catalog URL"
-        import: "Import"
+        preview: Preview
       import:
         review: Review
         import: Import

config/routes/admin.rb

@@ -69,7 +69,9 @@
     post '/product_import/save_data', to: 'product_import#save_data', as: 'product_import_save_async'
     post '/product_import/reset_absent', to: 'product_import#reset_absent_products', as: 'product_import_reset_async'
 
-    resources :dfc_product_imports, only: [:index]
+    resources :dfc_product_imports, only: [:index] do
+      post :import, on: :collection
+    end
 
     constraints FeatureToggleConstraint.new(:admin_style_v3) do
       # This might be easier to arrange once we rename the controller to plain old "products"

spec/system/admin/dfc_product_import_spec.rb

@@ -7,8 +7,8 @@
   include AuthorizationHelper
 
   let(:user) { create(:oidc_user, owned_enterprises: [enterprise]) }
-  let(:enterprise) { create(:supplier_enterprise) }
-  let(:source_product) { create(:product, supplier_id: enterprise.id) }
+  let(:enterprise) { create(:supplier_enterprise, name: "Saucy preserves") }
+  let(:source_product) { create(:product, name: "Sauce", supplier_id: enterprise.id) }
 
   before do
     login_as user
@@ -20,58 +20,72 @@
   it "imports from given catalog" do
     visit admin_product_import_path
 
-    select enterprise.name, from: "Enterprise"
-
     # We are testing against our own catalog for now but we want to replace
     # this with the URL of another app when available.
     host = Rails.application.default_url_options[:host]
     url = "http://#{host}/api/dfc/enterprises/#{enterprise.id}/catalog_items"
     fill_in "catalog_url", with: url
+    select enterprise.name, from: "Enterprise"
+    click_button "Preview"
+
+    expect(page).to have_content "Saucy preserves"
+    expect(page).to have_content "Sauce - 1g New"
 
     # By feeding our own catalog to the import, we are effectively cloning the
     # products. But the DFC product references the spree_product_id which
     # make the importer create a variant for that product instead of creating
     # a new independent product.
     expect {
       click_button "Import"
+      expect(page).to have_content "Imported products: 1"
     }.to change {
       source_product.variants.count
     }.by(1)
-
-    expect(page).to have_content "Importing a DFC product catalog"
-    expect(page).to have_content "Imported products: 1"
   end
 
   it "imports from a FDC catalog", vcr: true do
     user.update!(oidc_account: build(:testdfc_account))
+    # One product is existing in OFN
     product_id =
       "https://env-0105831.jcloud-ver-jpe.ik-server.com/api/dfc/Enterprises/test-hodmedod/SuppliedProducts/44519466467635"
     linked_variant = source_product.variants.first
     linked_variant.semantic_links << SemanticLink.new(semantic_id: product_id)
 
     visit admin_product_import_path
 
-    select enterprise.name, from: "Enterprise"
-
     url = "https://env-0105831.jcloud-ver-jpe.ik-server.com/api/dfc/Enterprises/test-hodmedod/SuppliedProducts"
     fill_in "catalog_url", with: url
+    select enterprise.name, from: "Enterprise"
+    click_button "Preview"
+
+    expect(page).to have_content "4 products to be imported"
+    expect(page).to have_content "Saucy preserves"
+    expect(page).not_to have_content "Sauce - 1g" # Does not show other product
+    expect(page).to have_content "Beans - Retail can, 400g (can) Update" # existing product
+    expect(page).to have_content "Beans - Case, 12 x 400g (can) New"
+    expect(page).to have_content "Chia Seed, Organic - Retail pack, 300g"
+
+    uncheck "Chia Seed, Organic - Case, 8 x 300g" # don't import this one
 
     expect {
       click_button "Import"
+      expect(page).to have_content "Imported products: 3"
       linked_variant.reload
-    }.to change { enterprise.supplied_products.count }
+    }.to change { enterprise.supplied_products.count }.by(2) # 1 updated, 2 new
       .and change { linked_variant.display_name }
       .and change { linked_variant.unit_value }
       # 18.85 wholesale variant price divided by 12 cans in the slab.
       .and change { linked_variant.price }.to(1.57)
       .and change { linked_variant.on_demand }.to(true)
       .and change { linked_variant.on_hand }.by(0)
 
-    expect(page).to have_content "Importing a DFC product catalog"
-
     product = Spree::Product.last
     expect(product.variants[0].semantic_links).to be_present
     expect(product.image).to be_present
+
+    names = Spree::Product.pluck(:name)
+    expect(names).to include "Baked British Beans - Case, 12 x 400g (can)"
+    expect(names).not_to include "Chia Seed, Organic - Case, 8 x 300g"
   end
 
   it "fails gracefully" do
@@ -86,18 +100,18 @@
     select enterprise.name, from: "Enterprise"
     fill_in "catalog_url", with: url
 
-    expect { click_button "Import" }.not_to change { Spree::Variant.count }
+    expect { click_button "Preview" }.not_to change { Spree::Variant.count }
 
     expect(page).to have_content "the server responded with status 401"
 
     select enterprise.name, from: "Enterprise"
     fill_in "catalog_url", with: "badurl"
-    click_button "Import"
+    click_button "Preview"
     expect(page).to have_content "Absolute URI missing hierarchical segment: 'http://:80'"
 
     select enterprise.name, from: "Enterprise"
     fill_in "catalog_url", with: ""
-    click_button "Import"
+    click_button "Preview"
     expect(page).to have_content "param is missing or the value is empty: catalog_url"
   end
 end