From 44d29e98e0ea816ba1b4f105fb2e50c58efb3701 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Mon, 15 Sep 2025 13:54:08 +1000 Subject: [PATCH] Fix publishing all enterprises when listing catalog --- .../controllers/dfc_provider/catalog_items_controller.rb | 8 +++----- engines/dfc_provider/spec/requests/catalog_items_spec.rb | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb b/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb index 15705dc217..ca029b3072 100644 --- a/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb +++ b/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb @@ -9,13 +9,11 @@ module DfcProvider def index require_permission "ReadProducts" - enterprises = current_user.enterprises.map do |enterprise| - EnterpriseBuilder.enterprise(enterprise) - end - catalog_items = enterprises.flat_map(&:catalogItems) + enterprise = EnterpriseBuilder.enterprise(current_enterprise) + catalog_items = enterprise.catalogItems render json: DfcIo.export( - *enterprises, + enterprise, *catalog_items, *catalog_items.map(&:product), *catalog_items.map(&:product).flat_map(&:isVariantOf), diff --git a/engines/dfc_provider/spec/requests/catalog_items_spec.rb b/engines/dfc_provider/spec/requests/catalog_items_spec.rb index 95de58a1ca..1b69192310 100644 --- a/engines/dfc_provider/spec/requests/catalog_items_spec.rb +++ b/engines/dfc_provider/spec/requests/catalog_items_spec.rb @@ -89,8 +89,6 @@ RSpec.describe "CatalogItems", swagger_doc: "dfc.yaml" do id: 10_001, owner: user, name: "Fred's Icecream", description: "Yum", address: build(:address, id: 40_001), ) - - pending "Fix publishing all enterprises!!!" end run_test! do