diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/README.md b/src/org/datafoodconsortium/connector/codegen/typescript/static/README.md index 3019927..956799d 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/README.md +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/README.md @@ -270,7 +270,7 @@ options?: { This will output DFC compliant valid JSON-LD like: ```JS { - "@context": "http://static.datafoodconsortium.org/ontologies/context.json", + "@context": "http://www.datafoodconsortium.org/ontologies/context.json", "@graph": [ { "@id": "_:b1", @@ -374,7 +374,7 @@ const Semanticable | undefined = await connector.importOne(jsonAsAString); You can pass the `only` option to target one type using the `importOneTyped` method: ```JS -const order: string = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Order"; +const order: string = "http://www.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Order"; const IOrder | undefined = await connector.importOneTyped(jsonAsAString, { only: order }); ``` diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/src/Connector.ts b/src/org/datafoodconsortium/connector/codegen/typescript/static/src/Connector.ts index eb8a29d..b54fb6f 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/src/Connector.ts +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/src/Connector.ts @@ -54,7 +54,7 @@ export default class Connector implements IConnector { this.fetchFunction = async (semanticId: string) => (await fetch(semanticId)); this.factory = new ConnectorFactory(this); this.importer = new ConnectorImporterJsonldStream({ context: context }); - const outputContext = "http://static.datafoodconsortium.org/ontologies/context.json"; + const outputContext = "https://www.datafoodconsortium.org"; this.exporter = new ConnectorExporterJsonldStream(context, outputContext); } @@ -260,17 +260,17 @@ export default class Connector implements IConnector { } public async loadFacets(facets: any): Promise { - const prefix: string = "http://static.datafoodconsortium.org/data/facets.rdf#"; + const prefix: string = "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/facets.rdf#"; this.FACETS = await this.importThesaurus(facets, prefix); } public async loadMeasures(measures: any): Promise { - const prefix: string = "http://static.datafoodconsortium.org/data/measures.rdf#"; + const prefix: string = "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/measures.rdf#"; this.MEASURES = await this.importThesaurus(measures, prefix); } public async loadProductTypes(productTypes: any): Promise { - const prefix: string = "http://static.datafoodconsortium.org/data/productTypes.rdf#"; + const prefix: string = "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#"; this.PRODUCT_TYPES = await this.importThesaurus(productTypes, prefix); } diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/src/ConnectorFactory.ts b/src/org/datafoodconsortium/connector/codegen/typescript/static/src/ConnectorFactory.ts index 3632b93..76a2c8a 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/src/ConnectorFactory.ts +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/src/ConnectorFactory.ts @@ -126,7 +126,7 @@ export default class ConnectorFactory implements IConnectorFactory { public createFromType(type: string): Semanticable | undefined { let result: Semanticable | undefined = undefined; - const prefix: string = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#"; + const prefix: string = "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#"; switch (type) { case prefix + "Enterprise": result = this.createEnterprise({ semanticId: "" }); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/src/context.ts b/src/org/datafoodconsortium/connector/codegen/typescript/static/src/context.ts index f2d0e69..5212932 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/src/context.ts +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/src/context.ts @@ -1,14 +1,14 @@ export default { "rdfs": "http://www.w3.org/2000/01/rdf-schema#", "skos" : "http://www.w3.org/2004/02/skos/core#", - "dfc": "http://static.datafoodconsortium.org/ontologies/DFC_FullModel.owl#", + "dfc": "http://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_FullModel.owl#", "dc": "http://purl.org/dc/elements/1.1/#", - "dfc-b": "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#", - "dfc-p": "http://static.datafoodconsortium.org/ontologies/DFC_ProductOntology.owl#", - "dfc-t": "http://static.datafoodconsortium.org/ontologies/DFC_TechnicalOntology.owl#", - "dfc-m": "http://static.datafoodconsortium.org/data/measures.rdf#", - "dfc-pt": "http://static.datafoodconsortium.org/data/productTypes.rdf#", - "dfc-f": "http://static.datafoodconsortium.org/data/facets.rdf#", + "dfc-b": "http://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#", + "dfc-p": "http://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_ProductOntology.owl#", + "dfc-t": "http://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_TechnicalOntology.owl#", + "dfc-m": "http://github.com/datafoodconsortium/ontology/releases/latest/download/measures.rdf#", + "dfc-pt": "http://github.com/datafoodconsortium/ontology/releases/latest/download/productTypes.rdf#", + "dfc-f": "http://github.com/datafoodconsortium/ontology/releases/latest/download/facets.rdf#", "dfc-p:hasUnit":{ "@type":"@id" }, diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Address.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Address.test.js index a700eba..ecc62c8 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Address.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Address.test.js @@ -14,7 +14,7 @@ const address = new Address({ country: "Belgium", }); -const data = '{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/address/address1","@type":"dfc-b:Address","dfc-b:hasCity":"Brussels","dfc-b:hasCountry":"Belgium","dfc-b:hasPostalCode":"00001","dfc-b:hasStreet":"1, place or Europe"}'; +const data = '{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/address/address1","@type":"dfc-b:Address","dfc-b:hasCity":"Brussels","dfc-b:hasCountry":"Belgium","dfc-b:hasPostalCode":"00001","dfc-b:hasStreet":"1, place or Europe"}'; test('Address:import', async () => { const imported = await connector.import(data); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/AllergenCharacteristic.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/AllergenCharacteristic.test.js index bb3566a..ec15f38 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/AllergenCharacteristic.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/AllergenCharacteristic.test.js @@ -15,7 +15,7 @@ const allergenCharacteristic = new AllergenCharacteristic({ allergenDimension: allergenDimension }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"_:b1","@type":"dfc-b:AllergenCharacteristic","dfc-b:hasAllergenDimension":"dfc-m:Peanuts","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"_:b1","@type":"dfc-b:AllergenCharacteristic","dfc-b:hasAllergenDimension":"dfc-m:Peanuts","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1"}`; test('AllergenCharacteristic:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Catalog.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Catalog.test.js index 35dbad6..21f3287 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Catalog.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Catalog.test.js @@ -5,7 +5,7 @@ import Connector from "../lib/Connector.js"; const connector = new Connector(); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/catalog1","@type":"dfc-b:Catalog","dfc-b:lists":{"@id":"http://myplatform.com/catalogItem1"},"dfc-b:maintainedBy":{"@id":"http://myplatform.com/enterprise1"}}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/catalog1","@type":"dfc-b:Catalog","dfc-b:lists":{"@id":"http://myplatform.com/catalogItem1"},"dfc-b:maintainedBy":{"@id":"http://myplatform.com/enterprise1"}}`; const enterprise = new Enterprise({ connector: connector, diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CatalogItem.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CatalogItem.test.js index abc54ef..ef4e14f 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CatalogItem.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CatalogItem.test.js @@ -6,7 +6,7 @@ import Connector from "../lib/Connector.js"; const connector = new Connector(); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/catalogItem1","@type":"dfc-b:CatalogItem","dfc-b:listedIn":{"@id":"http://myplatform.com/catalog1"},"dfc-b:offeredThrough":"http://myplatform.com/offer1","dfc-b:references":"http://myplatform.com/suppliedProduct1","dfc-b:sku":"sku","dfc-b:stockLimitation":"6.32"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/catalogItem1","@type":"dfc-b:CatalogItem","dfc-b:listedIn":{"@id":"http://myplatform.com/catalog1"},"dfc-b:offeredThrough":"http://myplatform.com/offer1","dfc-b:references":"http://myplatform.com/suppliedProduct1","dfc-b:sku":"sku","dfc-b:stockLimitation":"6.32"}`; const suppliedProduct = new SuppliedProduct({ connector: connector, diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Connector.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Connector.test.js index 624492a..5015198 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Connector.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Connector.test.js @@ -13,7 +13,7 @@ class Loader { } const importer = new ConnectorImporterJsonldStream({ documentLoader: new Loader() }); -const data = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@graph":[{"@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"8","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"2.54"},{"@id":"http://myplatform.com/offer1","@type":"dfc-b:Offer","dfc-b:offeredItem":{"@id":"http://myplatform.com/suppliedProduct1"},"dfc-b:offeredTo":{"@id":"http://myplatform.com/customerCategory1"},"dfc-b:price":{"@id":"_:b1"},"dfc-b:stockLimitation":"4.21"}]}`; +const data = `{"@context":"https://www.datafoodconsortium.org","@graph":[{"@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"8","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"2.54"},{"@id":"http://myplatform.com/offer1","@type":"dfc-b:Offer","dfc-b:offeredItem":{"@id":"http://myplatform.com/suppliedProduct1"},"dfc-b:offeredTo":{"@id":"http://myplatform.com/customerCategory1"},"dfc-b:price":{"@id":"_:b1"},"dfc-b:stockLimitation":"4.21"}]}`; const imported = await connector.import(data, { importer: importer }); const expected = imported[0]; diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CustomerCategory.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CustomerCategory.test.js index 7698ee6..9b0b5df 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CustomerCategory.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/CustomerCategory.test.js @@ -9,7 +9,7 @@ const customerCategory = new CustomerCategory({ description: "description" }) -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/customerCategory1","@type":"dfc-b:CustomerCategory","dfc-b:description":"description"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/customerCategory1","@type":"dfc-b:CustomerCategory","dfc-b:description":"description"}`; test('CustomerCategory:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Enterprise.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Enterprise.test.js index 5aa240b..45fa8f1 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Enterprise.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Enterprise.test.js @@ -72,7 +72,7 @@ const enterprise = new Enterprise({ catalogItems: [catalogItem] }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/enterprise1","@type":"dfc-b:Enterprise","dfc-b:VATnumber":"vatNumber","dfc-b:defines":"http://myplatform.com/customerCategory1","dfc-b:hasAddress":{"@id":"http://myplatform.com/address1"},"dfc-b:hasDescription":"description","dfc-b:maintains":{"@id":"http://myplatform.com/catalog1"},"dfc-b:manages":"http://myplatform.com/catalogItem1","dfc-b:supplies":"http://myplatform.com/suppliedProduct1"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/enterprise1","@type":"dfc-b:Enterprise","dfc-b:VATnumber":"vatNumber","dfc-b:defines":"http://myplatform.com/customerCategory1","dfc-b:hasAddress":{"@id":"http://myplatform.com/address1"},"dfc-b:hasDescription":"description","dfc-b:maintains":{"@id":"http://myplatform.com/catalog1"},"dfc-b:manages":"http://myplatform.com/catalogItem1","dfc-b:supplies":"http://myplatform.com/suppliedProduct1"}`; test('Enterprise:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/NutrientCharacteristic.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/NutrientCharacteristic.test.js index 8ef40e2..fb8ec0e 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/NutrientCharacteristic.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/NutrientCharacteristic.test.js @@ -19,7 +19,7 @@ const nutrientCharacteristic = new NutrientCharacteristic({ nutrientDimension: nutrientDimension }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"_:b1","@type":"dfc-b:NutrientCharacteristic","dfc-b:hasNutrientDimension":{"@id":"dfc-m:Calcium"},"dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"10"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"_:b1","@type":"dfc-b:NutrientCharacteristic","dfc-b:hasNutrientDimension":{"@id":"dfc-m:Calcium"},"dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"10"}`; test('NutrientCharacteristic:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Offer.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Offer.test.js index 3498761..a9352a9 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Offer.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Offer.test.js @@ -34,7 +34,7 @@ const offer = new Offer({ stockLimitation: 4.21 }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@graph":[{"@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"8","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"2.54"},{"@id":"http://myplatform.com/offer1","@type":"dfc-b:Offer","dfc-b:hasPrice":{"@id":"_:b1"},"dfc-b:offeredItem":{"@id":"http://myplatform.com/suppliedProduct1"},"dfc-b:offeredTo":{"@id":"http://myplatform.com/customerCategory1"},"dfc-b:stockLimitation":"4.21"}]}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@graph":[{"@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"8","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"2.54"},{"@id":"http://myplatform.com/offer1","@type":"dfc-b:Offer","dfc-b:hasPrice":{"@id":"_:b1"},"dfc-b:offeredItem":{"@id":"http://myplatform.com/suppliedProduct1"},"dfc-b:offeredTo":{"@id":"http://myplatform.com/customerCategory1"},"dfc-b:stockLimitation":"4.21"}]}`; test('Offer:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Order.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Order.test.js index 23733a9..cb5319f 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Order.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Order.test.js @@ -46,7 +46,7 @@ const order = new Order({ lines: [orderLine] }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/order1","@type":"dfc-b:Order","dfc-b:belongsTo":{"@id":"http://myplatform.com/saleSession1"},"dfc-b:date":"date","dfc-b:hasPart":{"@id":"http://myplatform.com/orderLine1"},"dfc-b:orderNumber":"0001","dfc-b:orderedBy":{"@id":"http://myplatform.com/person1"}}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/order1","@type":"dfc-b:Order","dfc-b:belongsTo":{"@id":"http://myplatform.com/saleSession1"},"dfc-b:date":"date","dfc-b:hasPart":{"@id":"http://myplatform.com/orderLine1"},"dfc-b:orderNumber":"0001","dfc-b:orderedBy":{"@id":"http://myplatform.com/person1"}}`; test('Order:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/OrderLine.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/OrderLine.test.js index 8ecf9b7..5222e52 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/OrderLine.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/OrderLine.test.js @@ -34,7 +34,7 @@ const orderLine = new OrderLine({ quantity: 2 }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@graph":[{"@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"19.9","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"5.42"},{"@id":"http://myplatform.com/orderLine1","@type":"dfc-b:OrderLine","dfc-b:concerns":{"@id":"http://myplatform.com/offer1"},"dfc-b:hasPrice":{"@id":"_:b1"},"dfc-b:partOf":{"@id":"http://myplatform.com/order1"},"dfc-b:quantity":"2"}]}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@graph":[{"@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"19.9","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"5.42"},{"@id":"http://myplatform.com/orderLine1","@type":"dfc-b:OrderLine","dfc-b:concerns":{"@id":"http://myplatform.com/offer1"},"dfc-b:hasPrice":{"@id":"_:b1"},"dfc-b:partOf":{"@id":"http://myplatform.com/order1"},"dfc-b:quantity":"2"}]}`; test('OrderLine:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Person.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Person.test.js index d0cbb51..7ace670 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Person.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Person.test.js @@ -34,7 +34,7 @@ const person = new Person({ organizations: [enterprise] }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/person1","@type":"dfc-b:Person","dfc-b:affiliates":"http://myplatform.com/address/enterprise1","dfc-b:familyName":"Smith","dfc-b:firstName":"John","dfc-b:hasAddress":{"@id":"http://myplatform.com/address/address1"}}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/person1","@type":"dfc-b:Person","dfc-b:affiliates":"http://myplatform.com/address/enterprise1","dfc-b:familyName":"Smith","dfc-b:firstName":"John","dfc-b:hasAddress":{"@id":"http://myplatform.com/address/address1"}}`; test('Person:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/PhysicalCharacteristic.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/PhysicalCharacteristic.test.js index f4a750b..8b4289c 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/PhysicalCharacteristic.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/PhysicalCharacteristic.test.js @@ -19,7 +19,7 @@ const physicalCharacteristic = new PhysicalCharacteristic({ physicalDimension: physicalDimension }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"_:b1","@type":"dfc-b:PhysicalCharacteristic","dfc-b:hasPhysicalDimension":"dfc-m:Weight","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"100"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"_:b1","@type":"dfc-b:PhysicalCharacteristic","dfc-b:hasPhysicalDimension":"dfc-m:Weight","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"100"}`; test('PhysicalCharacteristic:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Price.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Price.test.js index 5ca1fbb..a33c999 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Price.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/Price.test.js @@ -14,7 +14,7 @@ const price = new Price({ unit: euro }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"8","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"2.54"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"_:b1","@type":"dfc-b:Price","dfc-b:VATrate":"8","dfc-b:hasUnit":"dfc-m:Euro","dfc-b:value":"2.54"}`; test('Price:import', async () => { const imported = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/QuantitativeValue.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/QuantitativeValue.test.js index 0577a1b..a35457b 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/QuantitativeValue.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/QuantitativeValue.test.js @@ -13,7 +13,7 @@ const quantitativeValue = new QuantitativeValue({ unit: kilogram }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"_:b1","@type":"dfc-b:QuantitativeValue","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"_:b1","@type":"dfc-b:QuantitativeValue","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1"}`; test('QuantitativeValue:import', async () => { const importedAll = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SaleSession.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SaleSession.test.js index 4aca71f..650b606 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SaleSession.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SaleSession.test.js @@ -23,7 +23,7 @@ const saleSession = new SaleSession({ offers: [offer] }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@id":"http://myplatform.com/saleSession1","@type":"dfc-b:SaleSession","dfc-b:beginDate":"beginDate","dfc-b:endDate":"endDate","dfc-b:lists":{"@id":"http://myplatform.com/offer1"},"dfc-b:quantity":"5"}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@id":"http://myplatform.com/saleSession1","@type":"dfc-b:SaleSession","dfc-b:beginDate":"beginDate","dfc-b:endDate":"endDate","dfc-b:lists":{"@id":"http://myplatform.com/offer1"},"dfc-b:quantity":"5"}`; test('SaleSession:import', async () => { const importedAll = await connector.import(json); diff --git a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SuppliedProduct.test.js b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SuppliedProduct.test.js index 06432c5..f5a0408 100644 --- a/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SuppliedProduct.test.js +++ b/src/org/datafoodconsortium/connector/codegen/typescript/static/test/SuppliedProduct.test.js @@ -97,7 +97,7 @@ let suppliedProduct = new SuppliedProduct({ partOrigin: [connector.FACETS.PARTORIGIN.PLANTPARTORIGIN.FRUIT] }); -const json = `{"@context":"http://static.datafoodconsortium.org/ontologies/context.json","@graph":[{"@id":"_:b1","@type":"dfc-b:QuantitativeValue","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1.2"},{"@id":"_:b2","@type":"dfc-b:AllergenCharacteristic","dfc-b:hasAllergenDimension":"dfc-m:Peanuts","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1"},{"@id":"_:b4","@type":"dfc-b:NutrientCharacteristic","dfc-b:hasNutrientDimension":{"@id":"dfc-m:Calcium"},"dfc-b:hasUnit":"dfc-m:Gram","dfc-b:value":"10"},{"@id":"_:b6","@type":"dfc-b:PhysicalCharacteristic","dfc-b:hasPhysicalDimension":"dfc-m:Weight","dfc-b:hasUnit":"dfc-m:Gram","dfc-b:value":"100"},{"@id":"http://myplatform.com/tomato","@type":"dfc-b:SuppliedProduct","dfc-b:alcoholPercentage":"0","dfc-b:description":"Awesome tomato","dfc-b:hasAllergenCharacteristic":{"@id":"_:b2"},"dfc-b:hasCertification":[{"@id":"dfc-f:Organic-AB"},{"@id":"dfc-f:Organic-EU"}],"dfc-b:hasClaim":"dfc-f:NoAddedSugars","dfc-b:hasGeographicalOrigin":"dfc-f:CentreValLoire","dfc-b:hasNatureOrigin":{"@id":"dfc-f:PlantOrigin"},"dfc-b:hasNutrientCharacteristic":{"@id":"_:b4"},"dfc-b:hasPartOrigin":{"@id":"dfc-f:Fruit"},"dfc-b:hasPhysicalCharacteristic":{"@id":"_:b6"},"dfc-b:hasQuantity":"_:b1","dfc-b:hasType":"dfc-pt:round-tomato","dfc-b:lifetime":"a week","dfc-b:referencedBy":"http://myplatform.com/catalogItem","dfc-b:totalTheoreticalStock":"2.23","dfc-b:usageOrStorageCondition":"free text"}]}`; +const json = `{"@context":"https://www.datafoodconsortium.org","@graph":[{"@id":"_:b1","@type":"dfc-b:QuantitativeValue","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1.2"},{"@id":"_:b2","@type":"dfc-b:AllergenCharacteristic","dfc-b:hasAllergenDimension":"dfc-m:Peanuts","dfc-b:hasUnit":"dfc-m:Kilogram","dfc-b:value":"1"},{"@id":"_:b4","@type":"dfc-b:NutrientCharacteristic","dfc-b:hasNutrientDimension":{"@id":"dfc-m:Calcium"},"dfc-b:hasUnit":"dfc-m:Gram","dfc-b:value":"10"},{"@id":"_:b6","@type":"dfc-b:PhysicalCharacteristic","dfc-b:hasPhysicalDimension":"dfc-m:Weight","dfc-b:hasUnit":"dfc-m:Gram","dfc-b:value":"100"},{"@id":"http://myplatform.com/tomato","@type":"dfc-b:SuppliedProduct","dfc-b:alcoholPercentage":"0","dfc-b:description":"Awesome tomato","dfc-b:hasAllergenCharacteristic":{"@id":"_:b2"},"dfc-b:hasCertification":[{"@id":"dfc-f:Organic-AB"},{"@id":"dfc-f:Organic-EU"}],"dfc-b:hasClaim":"dfc-f:NoAddedSugars","dfc-b:hasGeographicalOrigin":"dfc-f:CentreValLoire","dfc-b:hasNatureOrigin":{"@id":"dfc-f:PlantOrigin"},"dfc-b:hasNutrientCharacteristic":{"@id":"_:b4"},"dfc-b:hasPartOrigin":{"@id":"dfc-f:Fruit"},"dfc-b:hasPhysicalCharacteristic":{"@id":"_:b6"},"dfc-b:hasQuantity":"_:b1","dfc-b:hasType":"dfc-pt:round-tomato","dfc-b:lifetime":"a week","dfc-b:referencedBy":"http://myplatform.com/catalogItem","dfc-b:totalTheoreticalStock":"2.23","dfc-b:usageOrStorageCondition":"free text"}]}`; test('SuppliedProduct:import', async () => { const importedAll = await connector.import(json);