Codefactor duplication issues (#515)

ConduitPlatform · Feb 14, 2023 · c2ee7f5 · c2ee7f5
1 parent f3cbdfe
commit c2ee7f5
Show file tree

Hide file tree

Showing 12 changed files with 305 additions and 457 deletions.
diff --git a/modules/database/src/adapters/mongoose-adapter/index.ts b/modules/database/src/adapters/mongoose-adapter/index.ts
@@ -15,7 +15,10 @@ import pluralize from '../../utils/pluralize';
 import { mongoSchemaConverter } from '../../introspection/mongoose/utils';
 import { status } from '@grpc/grpc-js';
 import { checkIfMongoOptions } from './utils';
-import { ConduitDatabaseSchema } from '../../interfaces';
+import {
+  ConduitDatabaseSchema,
+  introspectedSchemaCmsOptionsDefaults,
+} from '../../interfaces';
 
 const parseSchema = require('mongodb-schema');
 let deepPopulate = require('mongoose-deep-populate');
@@ -132,28 +135,7 @@ export class MongooseAdapter extends DatabaseAdapter<MongooseSchema> {
           canModify: 'Nothing' as 'Everything' | 'Nothing' | 'ExtensionOnly',
           canDelete: false,
         },
-        cms: {
-          authentication: false,
-          crudOperations: {
-            create: {
-              enabled: false,
-              authenticated: false,
-            },
-            read: {
-              enabled: false,
-              authenticated: false,
-            },
-            update: {
-              enabled: false,
-              authenticated: false,
-            },
-            delete: {
-              enabled: false,
-              authenticated: false,
-            },
-          },
-          enabled: true,
-        },
+        cms: introspectedSchemaCmsOptionsDefaults,
       },
     };
     const declaredSchemas = await this.getSchemaModel('_DeclaredSchema').model.findMany(

diff --git a/modules/database/src/adapters/sequelize-adapter/SequelizeSchema.ts b/modules/database/src/adapters/sequelize-adapter/SequelizeSchema.ts
@@ -202,23 +202,7 @@ export abstract class SequelizeSchema implements SchemaAdapter<ModelStatic<any>>
   }
 
   async findOne(query: Query, select?: string, populate?: string[]) {
-    let parsedQuery: ParsedQuery | ParsedQuery[];
-    if (typeof query === 'string') {
-      parsedQuery = JSON.parse(query);
-    } else {
-      parsedQuery = query;
-    }
-    const parsingResult = parseQuery(
-      parsedQuery,
-      this.adapter.sequelize.getDialect(),
-      this.extractedRelations,
-      { populate, select, exclude: [...this.excludedFields] },
-      this.associations,
-    );
-    let filter = parsingResult.query;
-    if (this.sequelize.getDialect() !== 'postgres') {
-      filter = arrayPatch(filter, this.originalSchema.fields, this.associations);
-    }
+    const { filter, parsingResult } = this.parseQueryFilter(query, { populate, select });
     const options: FindOptions = {
       where: filter,
       nest: true,
@@ -380,23 +364,7 @@ export abstract class SequelizeSchema implements SchemaAdapter<ModelStatic<any>>
     sort?: { [field: string]: -1 | 1 },
     populate?: string[],
   ): Promise<any> {
-    let parsedQuery: ParsedQuery | ParsedQuery[];
-    if (typeof query === 'string') {
-      parsedQuery = JSON.parse(query);
-    } else {
-      parsedQuery = query;
-    }
-    const parsingResult = parseQuery(
-      parsedQuery,
-      this.adapter.sequelize.getDialect(),
-      this.extractedRelations,
-      { populate, select, exclude: [...this.excludedFields] },
-      this.associations,
-    );
-    let filter = parsingResult.query;
-    if (this.sequelize.getDialect() !== 'postgres') {
-      filter = arrayPatch(filter, this.originalSchema.fields, this.associations);
-    }
+    const { filter, parsingResult } = this.parseQueryFilter(query, { populate, select });
     const options: FindOptions = {
       where: filter,
       nest: true,
@@ -423,24 +391,7 @@ export abstract class SequelizeSchema implements SchemaAdapter<ModelStatic<any>>
   }
 
   deleteMany(query: Query) {
-    let parsedQuery: ParsedQuery;
-    if (typeof query === 'string') {
-      parsedQuery = JSON.parse(query);
-    } else {
-      parsedQuery = query;
-    }
-    incrementDbQueries();
-    const parsingResult = parseQuery(
-      parsedQuery,
-      this.adapter.sequelize.getDialect(),
-      this.extractedRelations,
-      {},
-      this.associations,
-    );
-    let filter = parsingResult.query;
-    if (this.sequelize.getDialect() !== 'postgres') {
-      filter = arrayPatch(filter, this.originalSchema.fields, this.associations);
-    }
+    const { filter, parsingResult } = this.parseQueryFilter(query);
     return this.model
       .findAll({
         where: filter,
@@ -457,24 +408,7 @@ export abstract class SequelizeSchema implements SchemaAdapter<ModelStatic<any>>
   }
 
   deleteOne(query: Query) {
-    let parsedQuery: ParsedQuery;
-    if (typeof query === 'string') {
-      parsedQuery = JSON.parse(query);
-    } else {
-      parsedQuery = query;
-    }
-    incrementDbQueries();
-    const parsingResult = parseQuery(
-      parsedQuery,
-      this.adapter.sequelize.getDialect(),
-      this.extractedRelations,
-      {},
-      this.associations,
-    );
-    let filter = parsingResult.query;
-    if (this.sequelize.getDialect() !== 'postgres') {
-      filter = arrayPatch(filter, this.originalSchema.fields, this.associations);
-    }
+    const { filter, parsingResult } = this.parseQueryFilter(query);
     return this.model
       .findOne({
         where: filter,
@@ -561,6 +495,32 @@ export abstract class SequelizeSchema implements SchemaAdapter<ModelStatic<any>>
     }
   }
 
+  parseQueryFilter(query: Query, options?: { populate?: string[]; select?: string }) {
+    let parsedQuery: ParsedQuery;
+    if (typeof query === 'string') {
+      parsedQuery = JSON.parse(query);
+    } else {
+      parsedQuery = query;
+    }
+    const queryOptions = !isNil(options)
+      ? { ...options, exclude: [...this.excludedFields] }
+      : {};
+    const parsingResult = parseQuery(
+      parsedQuery,
+      this.adapter.sequelize.getDialect(),
+      this.extractedRelations,
+      queryOptions,
+      this.associations,
+    );
+
+    let filter = parsingResult.query;
+    if (this.sequelize.getDialect() !== 'postgres') {
+      filter = arrayPatch(filter, this.originalSchema.fields, this.associations);
+    }
+
+    return { filter, parsingResult };
+  }
+
   abstract findByIdAndUpdate(
     id: any,
     document: SingleDocQuery,

diff --git a/modules/database/src/adapters/sequelize-adapter/index.ts b/modules/database/src/adapters/sequelize-adapter/index.ts
@@ -16,6 +16,7 @@ import { DatabaseAdapter } from '../DatabaseAdapter';
 import { SequelizeSchema } from './SequelizeSchema';
 import { checkIfPostgresOptions, tableFetch } from './utils';
 import { sqlSchemaConverter } from '../../introspection/sequelize/utils';
+import { introspectedSchemaCmsOptionsDefaults } from '../../interfaces';
 
 const sqlSchemaName = process.env.SQL_SCHEMA ?? 'public';
 
@@ -145,28 +146,7 @@ export abstract class SequelizeAdapter<
           canModify: 'Nothing',
           canDelete: false,
         },
-        cms: {
-          authentication: false,
-          crudOperations: {
-            create: {
-              enabled: false,
-              authenticated: false,
-            },
-            read: {
-              enabled: false,
-              authenticated: false,
-            },
-            update: {
-              enabled: false,
-              authenticated: false,
-            },
-            delete: {
-              enabled: false,
-              authenticated: false,
-            },
-          },
-          enabled: true,
-        },
+        cms: introspectedSchemaCmsOptionsDefaults,
       },
     });
     schema.ownerModule = 'database';