fix(database): array type not extracted properly (#182)

ConduitPlatform · Jun 2, 2022 · 7cb2546 · 7cb2546
1 parent 6cf7070
commit 7cb2546
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 9 deletions.
diff --git a/modules/database/src/adapters/mongoose-adapter/index.ts b/modules/database/src/adapters/mongoose-adapter/index.ts
@@ -111,8 +111,25 @@ export class MongooseAdapter extends DatabaseAdapter<MongooseSchema> {
         },
         cms: {
           authentication: false,
-          crudOperations: false,
-          enabled: false,
+          crudOperations: {
+            create: {
+              enabled: false,
+              authenticated: false,
+            },
+            read: {
+              enabled: false,
+              authenticated: false,
+            },
+            update: {
+              enabled: false,
+              authenticated: false,
+            },
+            delete: {
+              enabled: false,
+              authenticated: false,
+            },
+          },
+          enabled: true,
         },
       },
     };

diff --git a/modules/database/src/adapters/sequelize-adapter/index.ts b/modules/database/src/adapters/sequelize-adapter/index.ts
@@ -161,8 +161,25 @@ export class SequelizeAdapter extends DatabaseAdapter<SequelizeSchema> {
         },
         cms: {
           authentication: false,
-          crudOperations: false,
-          enabled: false,
+          crudOperations: {
+              create: {
+                enabled: false,
+                authenticated: false,
+              },
+              read: {
+                enabled: false,
+                authenticated: false,
+              },
+              update: {
+                enabled: false,
+                authenticated: false,
+              },
+              delete: {
+                enabled: false,
+                authenticated: false,
+              },
+          },
+          enabled: true,
         },
       },
     });

diff --git a/modules/database/src/introspection/mongoose/utils.ts b/modules/database/src/introspection/mongoose/utils.ts
@@ -1,4 +1,9 @@
-import { ConduitModel, ConduitModelField } from '@conduitplatform/grpc-sdk';
+import {
+  ConduitModel,
+  ConduitModelField,
+  Indexable,
+  TYPE,
+} from '@conduitplatform/grpc-sdk';
 
 export const INITIAL_DB_SCHEMAS = [
   '_declaredschemas',
@@ -18,17 +23,24 @@ export function mongoSchemaConverter(mongoSchema: any): ConduitModel {
   return conduitSchema as ConduitModel;
 }
 
-function extractType(field: any): ConduitModelField {
+function extractType(field: Indexable) {
   let conduitField: Partial<ConduitModelField> = {};
   if (Array.isArray(field.type)) {
     conduitField.type = field.type.filter(
       (t: string) => t !== 'Undefined' && t !== 'Null'
     )[0];
+  } else if (
+    (field.type === 'Array' || field.name === 'Array') &&
+    field.hasOwnProperty('types')
+  ) {
+    let nestedField = field.types[0];
+    nestedField = extractType(nestedField.types[0]);
+    return [nestedField];
   } else {
-    conduitField.type = field.type;
+    conduitField.type = field.type ?? field.name;
   }
-  if(conduitField.type === 'Document') {
-    conduitField.type = 'Object' as any; //workaround for Document types
+  if (conduitField.type === 'Document') {
+    conduitField.type = TYPE.JSON; //workaround for Document types
   }
   return conduitField;
 }