From 1fcefcfcd066f887bc5befc009733c56380b704d Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 30 Jan 2025 10:11:03 +1100 Subject: [PATCH] Remove now useless wrapper class --- .../app/services/dfc_product_type_factory.rb | 7 --- .../app/services/supplied_product_builder.rb | 2 +- .../services/dfc_product_type_factory_spec.rb | 49 ------------------- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 engines/dfc_provider/app/services/dfc_product_type_factory.rb delete mode 100644 engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb diff --git a/engines/dfc_provider/app/services/dfc_product_type_factory.rb b/engines/dfc_provider/app/services/dfc_product_type_factory.rb deleted file mode 100644 index 22a152afb6..0000000000 --- a/engines/dfc_provider/app/services/dfc_product_type_factory.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -class DfcProductTypeFactory - def self.for(dfc_id) - DataFoodConsortium::Connector::SKOSParser.concepts[dfc_id] - end -end diff --git a/engines/dfc_provider/app/services/supplied_product_builder.rb b/engines/dfc_provider/app/services/supplied_product_builder.rb index 8707ce04b0..c55ae55828 100644 --- a/engines/dfc_provider/app/services/supplied_product_builder.rb +++ b/engines/dfc_provider/app/services/supplied_product_builder.rb @@ -107,7 +107,7 @@ class SuppliedProductBuilder < DfcBuilder def self.product_type(variant) taxon_dfc_id = variant.primary_taxon&.dfc_id - DfcProductTypeFactory.for(taxon_dfc_id) + DataFoodConsortium::Connector::SKOSParser.concepts[taxon_dfc_id] end def self.taxon(supplied_product) diff --git a/engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb b/engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb deleted file mode 100644 index 191046c294..0000000000 --- a/engines/dfc_provider/spec/services/dfc_product_type_factory_spec.rb +++ /dev/null @@ -1,49 +0,0 @@ -# frozen_string_literal: true - -require_relative "../spec_helper" - -RSpec.describe DfcProductTypeFactory do - describe ".for" do - let(:dfc_id) { - "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#drink" - } - - it "assigns a top level product type" do - drink = DfcLoader.connector.PRODUCT_TYPES.DRINK - - expect(described_class.for(dfc_id).semanticId).to eq drink.semanticId - end - - context "with second level product type" do - let(:dfc_id) { - "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#soft-drink" - } - - it "assigns a second level product type" do - soft_drink = DfcLoader.connector.PRODUCT_TYPES.DRINK.SOFT_DRINK - - expect(described_class.for(dfc_id).semanticId).to eq soft_drink.semanticId - end - end - - context "with leaf level product type" do - let(:dfc_id) { - "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#lemonade" - } - - it "assigns a leaf level product type" do - lemonade = DfcLoader.connector.PRODUCT_TYPES.DRINK.SOFT_DRINK.LEMONADE - - expect(described_class.for(dfc_id).semanticId).to eq lemonade.semanticId - end - end - - context "with non existing product type" do - let(:dfc_id) { "other" } - - it "returns nil" do - expect(described_class.for(dfc_id)).to be_nil - end - end - end -end