From 1674d8ab5cd098f05cf4de462160f0e2a003243d Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Tue, 12 Mar 2024 13:05:48 +1100 Subject: [PATCH] Simplify DFC product controller --- .../dfc_provider/supplied_products_controller.rb | 10 ++-------- .../app/services/supplied_product_builder.rb | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb b/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb index 6d3dce2e58..57d25c1929 100644 --- a/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb +++ b/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb @@ -20,14 +20,8 @@ module DfcProvider ) product = variant.product - if product.new_record? - product.supplier = current_enterprise - product.save! - end - - if variant.new_record? - variant.save! - end + product.save! if product.new_record? + variant.save! if variant.new_record? supplied_product = SuppliedProductBuilder.supplied_product(variant) render json: DfcIo.export(supplied_product) diff --git a/engines/dfc_provider/app/services/supplied_product_builder.rb b/engines/dfc_provider/app/services/supplied_product_builder.rb index 835d08261d..4e2b3d947b 100644 --- a/engines/dfc_provider/app/services/supplied_product_builder.rb +++ b/engines/dfc_provider/app/services/supplied_product_builder.rb @@ -35,6 +35,7 @@ class SuppliedProductBuilder < DfcBuilder end else product = import_product(supplied_product) + product.supplier = supplier product.ensure_standard_variant product.variants.first end