feat(filter): handle correctly uuid field type (#835)

Author: ngriselle

src/services/apimap-field-type-detector.js

@@ -4,9 +4,6 @@ function ApimapFieldTypeDetector(column, options) {
   this.perform = () => {
     if (column.type instanceof DataTypes.STRING
       || column.type instanceof DataTypes.TEXT
-      || column.type instanceof DataTypes.UUID
-      || column.type instanceof DataTypes.UUIDV1
-      || column.type instanceof DataTypes.UUIDV4
       || (DataTypes.CITEXT && column.type instanceof DataTypes.CITEXT)
       || column.type === 'citext') { // TODO: Remove 'citext' once Sequelize 4 has been deprecated.
       return 'String';
@@ -41,6 +38,11 @@ function ApimapFieldTypeDetector(column, options) {
       && column.type.type === 'POINT') {
       return 'Point';
     }
+    if (column.type instanceof DataTypes.UUID
+      || column.type instanceof DataTypes.UUIDV1
+      || column.type instanceof DataTypes.UUIDV4) {
+      return 'Uuid';
+    }
     // NOTICE: Detect Array types (Array(String), Array(Integer), ...)
     if (column.type.type) {
       return [new ApimapFieldTypeDetector({ type: column.type.type }, options).perform()];

test/databases.test.js

@@ -483,7 +483,7 @@ const user = { renderingId: 1 };
           expect(schema.fields[7].type).toStrictEqual('Date');
           expect(schema.fields[8].type).toStrictEqual('Date');
           expect(schema.fields[9].type).toStrictEqual('String');
-          expect(schema.fields[10].type).toStrictEqual('String');
+          expect(schema.fields[10].type).toStrictEqual('Uuid');
           expect(schema.fields[11].type).toStrictEqual('Number');
           expect(schema.fields[12].type[0]).toStrictEqual('Number');
           expect(schema.fields[13].type[0]).toStrictEqual('Number');

test/services/apimap-field-builder.test.js

@@ -38,10 +38,10 @@ describe('services > apimap-field-builder', () => {
       expect(uuid.field).toStrictEqual('uuid');
     });
 
-    it('should have a String type', () => {
+    it('should have a Uuid type', () => {
       expect.assertions(1);
       const { uuid } = initializeField(fieldDefinitions);
-      expect(uuid.type).toStrictEqual('String');
+      expect(uuid.type).toStrictEqual('Uuid');
     });
 
     it('should not be set as required', () => {