Bugfix/esmf 37 custom unit problems (#48)

* Fix custom unit and adjust some validation on that part

Fixes: #37

* Update edit-unit.spec.ts

Author: michelu89

core/apps/ame-e2e/src/integration/editor/edit-unit.spec.ts

@@ -51,7 +51,7 @@ describe('Test editing Unit', () => {
         cy.getUpdatedRDF().then(rdf => {
           expect(rdf).to.contain('Quantifiable1 a samm-c:Quantifiable');
           expect(rdf).to.contain('samm-c:unit :CustomUnit1');
-          expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+          expect(rdf).to.contain('CustomUnit1 a samm:Unit');
           expect(rdf).to.contain('samm:dataType xsd:string');
         });
       });
@@ -80,8 +80,8 @@ describe('Test editing Unit', () => {
         cy.getUpdatedRDF().then(rdf => {
           expect(rdf).to.contain('Quantifiable1 a samm-c:Quantifiable');
           expect(rdf).to.contain('samm-c:unit :CustomUnit2');
-          expect(rdf).to.contain('CustomUnit2 a unit:Unit');
-          expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+          expect(rdf).to.contain('CustomUnit2 a samm:Unit');
+          expect(rdf).to.contain('CustomUnit1 a samm:Unit');
           expect(rdf).to.contain('samm:dataType xsd:string');
 
           expect(rdf).not.contain('samm-c:unit :CustomUnit1');
@@ -102,8 +102,8 @@ describe('Test editing Unit', () => {
       .then(() => {
         cy.getUpdatedRDF().then(rdf => {
           expect(rdf).to.contain('Quantifiable1 a samm-c:Quantifiable');
-          expect(rdf).to.contain('CustomUnit2 a unit:Unit');
-          expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+          expect(rdf).to.contain('CustomUnit2 a samm:Unit');
+          expect(rdf).to.contain('CustomUnit1 a samm:Unit');
           expect(rdf).to.contain('samm:dataType xsd:string');
 
           expect(rdf).not.contain('samm-c:unit :CustomUnit1');
@@ -135,10 +135,10 @@ describe('Test editing Unit', () => {
       .then(() =>
         cy.getUpdatedRDF().then(rdf => {
           expect(rdf).to.contain('Quantifiable1 a samm-c:Quantifiable');
-          expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+          expect(rdf).to.contain('CustomUnit1 a samm:Unit');
           expect(rdf).to.contain('samm:dataType xsd:string');
 
-          expect(rdf).not.contain('CustomUnit2 a unit:Unit');
+          expect(rdf).not.contain('CustomUnit2 a samm:Unit');
           expect(rdf).not.contain('samm-c:unit :CustomUnit1');
           expect(rdf).not.contain('samm-c:unit :CustomUnit2');
         })
@@ -166,7 +166,7 @@ describe('Test editing Unit', () => {
       .then(() => {
         cy.getUpdatedRDF().then(rdf => {
           expect(rdf).to.contain('Measurement1 a samm-c:Measurement');
-          expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+          expect(rdf).to.contain('CustomUnit1 a samm:Unit');
           expect(rdf).to.contain('samm-c:unit :CustomUnit1');
           expect(rdf).to.contain('samm:dataType xsd:string');
         });
@@ -194,7 +194,7 @@ describe('Test editing Unit', () => {
       .then(() => {
         cy.getUpdatedRDF().then(rdf => {
           expect(rdf).to.contain('Duration1 a samm-c:Duration');
-          expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+          expect(rdf).to.contain('CustomUnit1 a samm:Unit');
           expect(rdf).to.contain('samm-c:unit :CustomUnit1');
           expect(rdf).to.contain('samm:dataType xsd:string');
         });
@@ -212,12 +212,12 @@ describe('Test editing Unit', () => {
       .then(() => {
         cy.getUpdatedRDF().then(rdf => {
           expect(rdf).to.contain('Duration1 a samm-c:Duration');
-          expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+          expect(rdf).to.contain('CustomUnit1 a samm:Unit');
           expect(rdf).to.contain('samm-c:unit unit:day');
           expect(rdf).to.contain('samm:dataType xsd:string');
 
           expect(rdf).not.contain('samm-c:unit :CustomUnit1');
-          expect(rdf).not.contain('day a unit:Unit');
+          expect(rdf).not.contain('day a samm:Unit');
         });
       });
   });
@@ -231,7 +231,7 @@ describe('Test editing Unit', () => {
             assert.isNull(aspect.properties[0].property.characteristic);
           });
           cy.getUpdatedRDF().then(rdf => {
-            expect(rdf).to.contain('CustomUnit1 a unit:Unit');
+            expect(rdf).to.contain('CustomUnit1 a samm:Unit');
 
             expect(rdf).not.contain('Duration1');
             expect(rdf).not.contain('samm-c:unit :CustomUnit1');

core/libs/aspect-exporter/src/lib/rdf-node/rdf-node.service.ts

@@ -105,6 +105,9 @@ export class RdfNodeService {
             samm.getEncodingList().find(enc => enc.value === properties[key]).isDefinedBy
           );
           break;
+        case PropertyEnum.NumericConversionFactor:
+          this.addQuad(metaModelElement, properties[key], samm.getAspectModelUrn(key));
+          break;
         case PropertyEnum.DataType:
           this.addDatatype(metaModelElement, samm.getAspectModelUrn(key), properties[key]);
           break;
@@ -120,10 +123,7 @@ export class RdfNodeService {
         case PropertyEnum.LanguageCode:
           this.addQuad(metaModelElement, properties[key], sammC.getAspectModelUrn(key), properties['characteristicType']);
           break;
-        case PropertyEnum.CommonCode:
-        case PropertyEnum.Symbol:
         case PropertyEnum.ConversionFactor:
-        case PropertyEnum.NumericConversionFactor:
           this.addQuad(metaModelElement, properties[key], sammU.getAspectModelUrn(key));
           break;
         default:

core/libs/mx-graph/src/lib/helpers/mx-graph-visitor-helper.ts

@@ -266,8 +266,8 @@ export class MxGraphVisitorHelper {
   }
 
   static addNumericConversionFactor(unit: Unit): PropertyInformation {
-    if (unit.conversionFactor) {
-      return {label: `numericConversionFactor = ${unit.numericConversionFactor}`, key: 'conversionFactor'};
+    if (unit.numericConversionFactor) {
+      return {label: `numericConversionFactor = ${unit.numericConversionFactor}`, key: 'numericConversionFactor'};
     }
     return null;
   }

core/libs/rdf/src/lib/utils/rdf-model-util.ts

@@ -37,6 +37,8 @@ import {MetaModelElementInstantiator} from '@ame/instantiator';
 import {RdfModel} from './rdf-model';
 import {Samm, SammC, SammE, SammU} from '@ame/vocabulary';
 
+declare const sammUDefinition: any;
+
 export class RdfModelUtil {
   static isSammUDefinition(urn: string, sammU: SammU): boolean {
     return urn && urn.includes(sammU.getNamespace());
@@ -102,6 +104,8 @@ export class RdfModelUtil {
       return this.getDataType(metaModelElement.dataType);
     } else if (metaModelElement instanceof DefaultState && sammC.isDefaultValueProperty(predicateUrn)) {
       return this.getDataType(metaModelElement.dataType);
+    } else if (metaModelElement instanceof DefaultUnit && samm.isNumericConversionFactorProperty(predicateUrn)) {
+      return this.getDataType(new DefaultScalar(simpleDataTypes?.double?.isDefinedBy));
     }
 
     return null;
@@ -129,7 +133,7 @@ export class RdfModelUtil {
     } else if (modelElement instanceof DefaultCharacteristic || modelElement instanceof DefaultConstraint) {
       namespace = sammC.getNamespace();
     } else if (modelElement instanceof DefaultUnit) {
-      namespace = sammU.getNamespace();
+      namespace = modelElement.name in sammUDefinition.units ? sammU.getNamespace() : samm.getNamespace();
     } else if (modelElement instanceof DefaultEntity) {
       namespace = sammE.getNamespace();
     } else {