Merge branch 'feature/int-types' into 'master'

Feature/int types Closes #162 See merge request b650/Deep-Lynx!131
idaholab · Nov 30, 2021 · beaaaf0 · beaaaf0
2 parents d801820 + 4757314
commit beaaaf0
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 24 deletions.
diff --git a/API Documentation/Core.swagger_collection.yaml b/API Documentation/Core.swagger_collection.yaml
@@ -6502,6 +6502,16 @@ components:
           type: object
         config:
           $ref: '#/components/schemas/TaskConfig'
+        status_message:
+          type: string
+        created_at:
+          type: string
+        modified_at:
+          type: string
+        created_by:
+          type: string
+        modified_by:
+          type: string
     TaskConfig:
       title: TaskConfig
       type: object

diff --git a/AdminWebApp/src/components/createMetatypeKeyDialog.vue b/AdminWebApp/src/components/createMetatypeKeyDialog.vue
@@ -159,7 +159,7 @@ export default class CreateMetatypeKeyDialog extends Vue {
   dialog = false
   formValid = false
   metatypeKey: MetatypeKeyT = {validation: {regex: "", min: 0, max: 0}, required: false} as MetatypeKeyT
-  dataTypes = ["number", "date", "string", "boolean", "enumeration", "file"]
+  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
   booleanOptions =  [true, false]
 
   @Watch('dialog', {immediate: true})

diff --git a/AdminWebApp/src/components/createMetatypeRelationshipKeyDialog.vue b/AdminWebApp/src/components/createMetatypeRelationshipKeyDialog.vue
@@ -155,7 +155,7 @@ export default class CreateMetatypeRelationshipKeyDialog extends Vue {
   dialog = false
   formValid = false
   metatypeRelationshipKey: MetatypeRelationshipKeyT = {validation: {regex: "", min: 0, max: 0}, required: false} as MetatypeRelationshipKeyT
-  dataTypes = ["number", "date", "string", "boolean", "enumeration", "file"]
+  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
   booleanOptions = [true, false]
 
   @Watch('dialog', {immediate: true})

diff --git a/AdminWebApp/src/components/editMetatypeKeyDialog.vue b/AdminWebApp/src/components/editMetatypeKeyDialog.vue
@@ -160,7 +160,7 @@ export default class EditMetatypeKeyDialog extends Vue {
   dialog = false
   formValid = false
   selectedMetatypeKey: MetatypeKeyT | null  = null
-  dataTypes = ["number", "date", "string", "boolean", "enumeration", "file"]
+  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
   booleanOptions = [true, false]
 
   @Watch('dialog', {immediate: true})

diff --git a/AdminWebApp/src/components/editMetatypeRelationshipKeyDialog.vue b/AdminWebApp/src/components/editMetatypeRelationshipKeyDialog.vue
@@ -160,7 +160,7 @@ export default class EditMetatypeRelationshipKeyDialog extends Vue {
   dialog = false
   formValid = false
   selectedMetatypeRelationshipKey: MetatypeRelationshipKeyT | null  = null
-  dataTypes = ["number", "date", "string", "boolean", "enumeration", "file"]
+  dataTypes = ["number", "number64", "float", "float64", "date", "string", "boolean", "enumeration", "file"]
   booleanOptions = [true, false]
 
   @Watch('dialog', {immediate: true})

diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/container_import.ts b/src/data_access_layer/mappers/data_warehouse/ontology/container_import.ts
@@ -56,22 +56,22 @@ export default class ContainerImport {
         if (!['string', 'number', 'boolean', 'date', 'enumeration', 'file'].includes(target) && !regex.test(target)) {
             switch (target) {
                 case 'integer':
-                    target = 'number';
+                    target = 'number64';
                     break;
                 case 'int':
-                    target = 'number';
+                    target = 'number64';
                     break;
                 case 'decimal':
-                    target = 'number';
+                    target = 'float64';
                     break;
                 case 'float':
-                    target = 'number';
+                    target = 'float';
                     break;
                 case 'double':
-                    target = 'number';
+                    target = 'float64';
                     break;
                 case 'rational':
-                    target = 'number';
+                    target = 'float64';
                     break;
                 case 'dateTimeStamp':
                     target = 'date';
@@ -288,8 +288,9 @@ export default class ContainerImport {
                             target = dataRange; // This contains the class or datatype with a cardinality
                             target = this.ValidateTarget(target);
 
-                            // Determine if primitive or relationship property
-                            const regex = new RegExp('[1-9:-]');
+                            // Determine if primitive or relationship property by looking for :
+                            // This will indicate that the target is another class (e.g. ontologyName:0001)
+                            const regex = new RegExp('[:-]');
                             if (regex.test(target)) {
                                 // The target is an identifier for another class
                                 propertyType = 'relationship';

diff --git a/src/domain_objects/data_warehouse/etl/type_transformation.ts b/src/domain_objects/data_warehouse/etl/type_transformation.ts
@@ -653,7 +653,7 @@ export default class TypeTransformation extends BaseDomainClass {
                     return null;
                 }
 
-                const convertedValue = parseFloat(value);
+                const convertedValue = parseInt(value, 10);
                 if (isNaN(convertedValue)) {
                     return new Conversion({original_value: value, errors: 'unable to convert value to number'});
                 }
@@ -663,6 +663,29 @@ export default class TypeTransformation extends BaseDomainClass {
                     : new Conversion({original_value: value, converted_value: convertedValue});
             }
 
+            case 'float': {
+                if (typeof value === 'number') {
+                    return null;
+                }
+
+                const convertedValue = parseFloat(value);
+                if (isNaN(convertedValue)) {
+                    return new Conversion({original_value: value, errors: 'unable to convert value to float'});
+                }
+
+                return convertedValue % 1 === 0
+                    ? new Conversion({original_value: value, converted_value: Math.floor(convertedValue)})
+                    : new Conversion({original_value: value, converted_value: convertedValue});
+            }
+
+            case 'number64' || 'float64': {
+                if (typeof value === 'string') {
+                    return null;
+                }
+
+                return new Conversion({original_value: value, converted_value: String(value)});
+            }
+
             // because dates can be formatted in various ways, all we can really do for conversion is to
             // set it to string - Deep Lynx only checks to see if dates are strings currently
             case 'date': {

diff --git a/src/domain_objects/data_warehouse/ontology/metatype_key.ts b/src/domain_objects/data_warehouse/ontology/metatype_key.ts
@@ -32,7 +32,7 @@ export default class MetatypeKey extends BaseDomainClass {
 
     @IsNotEmpty()
     @IsString()
-    @IsIn(['number', 'date', 'string', 'boolean', 'enumeration', 'file', 'list', 'unknown'])
+    @IsIn(['number', 'number64', 'float', 'float64', 'date', 'string', 'boolean', 'enumeration', 'file', 'list', 'unknown'])
     data_type = 'unknown';
 
     @IsBoolean()

diff --git a/src/domain_objects/data_warehouse/ontology/metatype_relationship_key.ts b/src/domain_objects/data_warehouse/ontology/metatype_relationship_key.ts
@@ -33,7 +33,7 @@ export default class MetatypeRelationshipKey extends BaseDomainClass {
 
     @IsNotEmpty()
     @IsString()
-    @IsIn(['number', 'date', 'string', 'boolean', 'enumeration', 'file', 'list', 'unknown'])
+    @IsIn(['number', 'number64', 'float', 'float64', 'date', 'string', 'boolean', 'enumeration', 'file', 'list', 'unknown'])
     data_type = 'unknown';
 
     @IsBoolean()

diff --git a/src/tests/data_warehouse/etl/type_transformation_mapper.spec.ts b/src/tests/data_warehouse/etl/type_transformation_mapper.spec.ts
@@ -298,8 +298,8 @@ describe('A Data Type Mapping Transformation', async () => {
                 container_id: containerID,
                 name: faker.name.findName(),
                 description: faker.random.alphaNumeric(),
-            })
-        )
+            }),
+        );
 
         expect(relationship.isError).false;
         expect(relationship.value).not.empty;
@@ -313,9 +313,9 @@ describe('A Data Type Mapping Transformation', async () => {
                 origin_metatype: metatype.value.id!,
                 destination_metatype: metatype.value.id!,
                 relationship: relationship.value.id!,
-                relationship_type: 'many:many'
-            })
-        )
+                relationship_type: 'many:many',
+            }),
+        );
 
         expect(relationshipPair.isError).false;
         expect(relationshipPair.value).not.empty;
@@ -420,7 +420,7 @@ describe('A Data Type Mapping Transformation', async () => {
         );
 
         expect(updatedRelationshipTransformation.isError).false;
-    })
+    });
 
     it('can fetch keys from payload using dot notation', async () => {
         let value = TypeTransformation.getNestedValue('car.id', test_payload[0]);
@@ -461,11 +461,11 @@ describe('A Data Type Mapping Transformation', async () => {
         expect(conversion?.errors).undefined;
         expect(conversion?.converted_value).eq(1);
 
-        conversion = TypeTransformation.convertValue({data_type: 'number'} as MetatypeKey, '.02');
+        conversion = TypeTransformation.convertValue({data_type: 'float'} as MetatypeKey, '.02');
         expect(conversion?.errors).undefined;
         expect(conversion?.converted_value).eq(0.02);
 
-        conversion = TypeTransformation.convertValue({data_type: 'number'} as MetatypeKey, '5.600e-3');
+        conversion = TypeTransformation.convertValue({data_type: 'float'} as MetatypeKey, '5.600e-3');
         expect(conversion?.errors).undefined;
         expect(conversion?.converted_value).eq(0.0056);
 

diff --git a/src/tests/graphql/schema.spec.ts b/src/tests/graphql/schema.spec.ts
@@ -428,7 +428,6 @@ describe('The GraphQL Schema Generator', async () => {
         expect((typeMap['Car'] as GraphQLObjectType).getFields()['id'].type).eq(GraphQLString);
         expect((typeMap['Car'] as GraphQLObjectType).getFields()['name'].type).eq(GraphQLString);
         expect((typeMap['Car'] as GraphQLObjectType).getFields()['drivers'].type.toString).eq(GraphQLList(GraphQLJSON).toString);
-        expect((typeMap['Car'] as GraphQLObjectType).getFields()['trim'].type.toString()).eq('Car-trim Enum Type');
         // check the enum values
         const values = ((typeMap['Car'] as GraphQLObjectType).getFields()['trim'].type as GraphQLEnumType).getValues();
         expect(values.length).eq(2);