refactor: change project structure

Author: nodkz

example/src/declarations/Context.ts

@@ -1,5 +1,5 @@
 import { ApolloServer } from 'apollo-server';
-import { Queues } from './queues';
+import { Queues } from './demo_queues';
 import schema from './schema';
 
 const server = new ApolloServer({

example/src/declarations/index.ts

@@ -1,8 +1,12 @@
-import { ErrorCodeEnum } from '../types';
-
 export class MutationError extends Error {
   constructor(message: string, public code: ErrorCodeEnum) {
     super(message);
     Object.setPrototypeOf(this, MutationError.prototype);
   }
 }
+
+export enum ErrorCodeEnum {
+  QUEUE_NOT_FOUND = 'queue_not_found',
+  JOB_NOT_FOUND = 'job_not_found',
+  OTHER_ERROR = 'other_error',
+}

example/src/queues/fetchMetrics.ts example/src/demo_queues/fetchMetrics.tsexample/src/queues/fetchMetrics.ts renamed to example/src/demo_queues/fetchMetrics.ts

@@ -2,18 +2,16 @@ import { Queue } from 'bullmq';
 import {
   SchemaComposer,
   getFlatProjectionFromAST,
-  ObjectTypeComposer,
   ObjectTypeComposerFieldConfigAsObjectDefinition,
-  ObjectTypeComposerAsObjectDefinition,
+  ObjectTypeComposer,
+  inspect,
 } from 'graphql-compose';
-import {
-  MutationStatusEnum,
-  ErrorCodeEnum,
-  getMutationStatusEnumTC,
-  getMutationErrorCodeEnumTC,
-} from '../types';
-import { createBullConnection } from '../../connectRedis';
-import { MutationError } from './Error';
+import { MutationError, ErrorCodeEnum } from './Error';
+
+export enum MutationStatusEnum {
+  OK = 'ok',
+  ERROR = 'error',
+}
 
 export function getQueue(queueName: string, context: any): Queue {
   const queue = context?.Queues?.get(queueName);
@@ -23,46 +21,29 @@ export function getQueue(queueName: string, context: any): Queue {
   return queue;
 }
 
-// export function getQueue(queueName: string, prefix: string): Queue {
-//   const queue = new Queue(queueName, {
-//     prefix,
-//     connection: createBullConnection('queue'),
-//   });
-
-//   if (!queue) {
-//     throw new MutationError('Queue not found!', ErrorCodeEnum.QUEUE_NOT_FOUND);
-//   }
-//   return queue;
-// }
-
-type FieldConfig = Omit<ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>, 'type'> & {
-  type: ObjectTypeComposerAsObjectDefinition<any, any>;
-};
-
 type Generator = (
-  fieldConfig: FieldConfig
+  fieldConfig: ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>
 ) => ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>;
 
 export function createGenerateHelper(schemaComposer: SchemaComposer<any>): Generator {
   return function generateMutation(
-    fieldConfig: FieldConfig
+    fieldConfig: ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>
   ): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
-    let type: ObjectTypeComposer;
-    try {
-      type = schemaComposer.createObjectTC(fieldConfig.type as any);
-    } catch (e) {
-      throw new Error('Cannot wrap mutation payload cause it returns non-object type.');
+    if (!(fieldConfig.type instanceof ObjectTypeComposer)) {
+      throw new Error(
+        `Cannot wrap mutation payload cause it returns non-object type: ${inspect(fieldConfig)}`
+      );
     }
 
-    type.addFields({
+    fieldConfig.type.addFields({
       status: getMutationStatusEnumTC(schemaComposer),
       query: 'Query!',
       error: 'String',
       errorCode: getMutationErrorCodeEnumTC(schemaComposer),
     });
 
     const subResolve = fieldConfig.resolve || (() => ({}));
-    const resolve = async (source, args, context, info) => {
+    fieldConfig.resolve = async (source, args, context, info) => {
       try {
         const subResult = await subResolve(source, args, context, info);
         return {
@@ -85,10 +66,25 @@ export function createGenerateHelper(schemaComposer: SchemaComposer<any>): Gener
       }
     };
 
-    return {
-      ...fieldConfig,
-      type,
-      resolve,
-    };
+    return fieldConfig;
   };
 }
+
+function getMutationErrorCodeEnumTC(sc: SchemaComposer<any>) {
+  return sc.getOrCreateETC('MutationErrorCodeEnum', (etc) => {
+    etc.addFields({
+      QUEUE_NOT_FOUND: { value: ErrorCodeEnum.QUEUE_NOT_FOUND },
+      JOB_NOT_FOUND: { value: ErrorCodeEnum.JOB_NOT_FOUND },
+      OTHER_ERROR: { value: ErrorCodeEnum.OTHER_ERROR },
+    });
+  });
+}
+
+function getMutationStatusEnumTC(sc: SchemaComposer<any>) {
+  return sc.getOrCreateETC('MutationStatusEnum', (etc) => {
+    etc.addFields({
+      OK: { value: MutationStatusEnum.OK },
+      ERROR: { value: MutationStatusEnum.ERROR },
+    });
+  });
+}

example/src/queues/index.ts example/src/demo_queues/index.tsexample/src/queues/index.ts renamed to example/src/demo_queues/index.ts

@@ -16,7 +16,7 @@ import { createJobRetryFC } from './jobRetry';
 import { createJobUpdateFC } from './jobUpdate';
 import { createJobLogAddFC } from './jobLogAdd';
 
-import { createGenerateHelper } from './_helpers';
+import { createGenerateHelper } from './helpers/wrapMutationFC';
 
 export function createMutationFields({
   schemaComposer,

example/src/index.ts

@@ -1,10 +1,10 @@
-import { getQueue } from './_helpers';
+import { getQueue } from './helpers/wrapMutationFC';
 import {
   SchemaComposer,
   InputTypeComposer,
   ObjectTypeComposerFieldConfigAsObjectDefinition,
 } from 'graphql-compose';
-import { getJobTC } from '../types/job';
+import { getJobTC } from '../types/job/Job';
 
 function getPayloadTC(sc: SchemaComposer<any>) {
   return sc.getOrCreateOTC('JobAddPayload', (etc) => {

example/src/schema/mutation/Error.ts …ple/src/schema/mutation/helpers/Error.tsexample/src/schema/mutation/Error.ts renamed to example/src/schema/mutation/helpers/Error.ts example/src/schema/mutation/Error.ts renamed to example/src/schema/mutation/helpers/Error.ts

@@ -1,6 +1,6 @@
-import { MutationError } from './Error';
+import { MutationError } from './helpers/Error';
 import { ErrorCodeEnum, getJobStatusEnumTC } from '../types';
-import { getQueue } from './_helpers';
+import { getQueue } from './helpers/wrapMutationFC';
 
 export function createJobDiscardFC({ schemaComposer }) {
   return {