From 5d29dee848cfa469931875c47def105c666a0d60 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 9 Nov 2023 15:08:46 +1100
Subject: [PATCH] Update DFC Importer to use shortened URIs

The new Connector code uses shortened URIs now.
---
 .../connector/importer.rb                     | 31 +++++++++++--------
 .../connector/importer_spec.rb                |  6 ++--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb b/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb
index b8365cdc8a..4e7d2b289a 100644
--- a/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb
+++ b/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb
@@ -30,13 +30,22 @@ module DataFoodConsortium
         args = Array.new(number_of_required_args)
         type_uri = clazz.new(*args).semanticType
         type_map[type_uri] = clazz
+      end
 
-        # Add support for the old DFC v1.7 URLs:
-        new_type_uri = type_uri.gsub(
+      def self.prefixed_name(uri)
+        # When we skip backwards compatibility, we can just do this:
+        #
+        #     key = RDF::URI.new(uri).pname(prefixes: Context::VERSION_1_8)
+        #
+        # But for now we do it manually.
+        uri.gsub(
           "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#",
-          "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#"
+          "dfc-b:"
+        ).gsub(
+          # legacy URI
+          "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#",
+          "dfc-b:"
         )
-        type_map[new_type_uri] = clazz
       end
 
       def import(json_string_or_io)
@@ -71,7 +80,8 @@ module DataFoodConsortium
         # Not all subjects have an id, some are anonymous.
         id = type_statement.subject.try(:value)
         type = type_statement.object.value
-        clazz = self.class.type_map[type]
+        key = self.class.prefixed_name(type)
+        clazz = self.class.type_map[key]
 
         clazz.new(*[id].compact)
       end
@@ -84,16 +94,11 @@ module DataFoodConsortium
 
       def apply_statement(statement)
         subject = subject_of(statement)
-        property_id = statement.predicate.value
+        property_uri = statement.predicate.value
         value = resolve_object(statement.object)
 
-        # Backwards-compatibility with old DFC v1.7 ids:
-        unless subject.hasSemanticProperty?(property_id)
-          property_id = property_id.gsub(
-            "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#",
-            "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#"
-          )
-        end
+        property_id = self.class.prefixed_name(property_uri)
+
         return unless subject.hasSemanticProperty?(property_id)
 
         property = subject.semanticProperty(property_id)
diff --git a/engines/dfc_provider/spec/lib/data_food_consortium/connector/importer_spec.rb b/engines/dfc_provider/spec/lib/data_food_consortium/connector/importer_spec.rb
index 04e9407ce6..a2202db015 100644
--- a/engines/dfc_provider/spec/lib/data_food_consortium/connector/importer_spec.rb
+++ b/engines/dfc_provider/spec/lib/data_food_consortium/connector/importer_spec.rb
@@ -112,7 +112,7 @@ describe DataFoodConsortium::Connector::Importer do
     result = connector.import(product_data)
 
     expect(result).to be_a DataFoodConsortium::Connector::SuppliedProduct
-    expect(result.semanticType).to eq "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#SuppliedProduct"
+    expect(result.semanticType).to eq "dfc-b:SuppliedProduct"
     expect(result.semanticId).to eq "https://example.net/tomato"
     expect(result.name).to eq "Tomato"
     expect(result.description).to eq "Awesome tomato"
@@ -123,7 +123,7 @@ describe DataFoodConsortium::Connector::Importer do
     result = connector.import(product_data_with_context)
 
     expect(result).to be_a DataFoodConsortium::Connector::SuppliedProduct
-    expect(result.semanticType).to eq "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#SuppliedProduct"
+    expect(result.semanticType).to eq "dfc-b:SuppliedProduct"
     expect(result.semanticId).to eq "https://example.net/tomato"
     expect(result.name).to eq "Tomato"
     expect(result.description).to eq "Awesome tomato"
@@ -134,7 +134,7 @@ describe DataFoodConsortium::Connector::Importer do
     result = connector.import(product_data_with_context_v1_8)
 
     expect(result).to be_a DataFoodConsortium::Connector::SuppliedProduct
-    expect(result.semanticType).to eq "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#SuppliedProduct"
+    expect(result.semanticType).to eq "dfc-b:SuppliedProduct"
     expect(result.semanticId).to eq "https://example.net/tomato"
     expect(result.name).to eq "Tomato"
     expect(result.description).to eq "Awesome tomato"