refactor: Status enum as arg

Boris · Boris · commit 662d8a179143 · 2020-04-08T17:11:03.000+06:00
diff --git a/example/src/declarations/MutationsDependencies.ts b/example/src/declarations/MutationsDependencies.ts
@@ -1,9 +1,10 @@
-import { SchemaComposer, ObjectTC, InputTC } from './gqlCompose';
+import { SchemaComposer, ObjectTC, InputTC, EnumTC } from './gqlCompose';
 import { Context } from './Context';
 
 export interface MutationsDependencies {
   schemaComposer: SchemaComposer<Context>;
   QueueTC: ObjectTC;
   JobTC: ObjectTC;
   JobOptionsInputTC: InputTC;
+  JobStatusEnumTC: EnumTC;
 }
diff --git a/example/src/schema/index.ts b/example/src/schema/index.ts
@@ -3,7 +3,7 @@ import createTypes from './types';
 import { createQueryFields } from './query';
 import { createMutationFields } from './mutation';
 
-const { JobTC, QueueTC, JobOptionsInputTC } = createTypes({ schemaComposer });
+const { JobTC, QueueTC, JobOptionsInputTC, JobStatusEnumTC } = createTypes({ schemaComposer });
 
 schemaComposer.Query.addFields({
   ...createQueryFields({ QueueTC, JobTC }),
@@ -14,6 +14,7 @@ schemaComposer.Mutation.addFields({
     schemaComposer,
     JobTC,
     JobOptionsInputTC,
+    JobStatusEnumTC,
   }),
 });
 
diff --git a/example/src/schema/mutation/index.ts b/example/src/schema/mutation/index.ts
@@ -12,18 +12,23 @@ import { createJobRetryFC } from './jobRetry';
 import { createJobUpdateFC } from './jobUpdate';
 import { createJobLogAddFC } from './jobLogAdd';
 
-export function createMutationFields({ schemaComposer, JobTC, JobOptionsInputTC }): any {
+export function createMutationFields({
+  schemaComposer,
+  JobTC,
+  JobStatusEnumTC,
+  JobOptionsInputTC,
+}): any {
   return {
-    queueClean: queueClean({ schemaComposer }),
+    queueClean: queueClean({ schemaComposer, JobStatusEnumTC }),
     queuePause: queuePause({ schemaComposer }),
     queueResume: queueResume({ schemaComposer }),
     queueRemoveRepeatable: queueRemoveRepeatable({ schemaComposer }),
     jobAdd: createJobAddFC({ schemaComposer, JobTC, JobOptionsInputTC }),
-    jobDiscard: createJobDiscardFC({ schemaComposer }),
-    jobPromote: createjobPromoteFC({ schemaComposer }),
+    jobDiscard: createJobDiscardFC({ schemaComposer, JobStatusEnumTC }),
+    jobPromote: createjobPromoteFC({ schemaComposer, JobStatusEnumTC }),
     jobRemove: createJobRremoveFC({ schemaComposer, JobTC }),
-    jobRetry: createJobRetryFC({ schemaComposer }),
+    jobRetry: createJobRetryFC({ schemaComposer, JobStatusEnumTC }),
     jobUpdate: createJobUpdateFC({ schemaComposer, JobTC }),
-    jobLogAdd: createJobLogAddFC({ schemaComposer }),
+    jobLogAdd: createJobLogAddFC({ schemaComposer, JobStatusEnumTC }),
   };
 }
diff --git a/example/src/schema/mutation/jobDiscard.ts b/example/src/schema/mutation/jobDiscard.ts
@@ -2,13 +2,13 @@ import { PayloadError } from '../../declarations/errors';
 import { ErrorCodeEnum } from '../types/enums';
 import { generateMutation, getQueue } from './_helpers';
 
-export function createJobDiscardFC({ schemaComposer }) {
+export function createJobDiscardFC({ schemaComposer, JobStatusEnumTC }) {
   return generateMutation(schemaComposer, {
     type: {
       name: 'JobDiscardPayload',
       fields: {
         id: 'String',
-        state: 'JobStatusEnum',
+        state: JobStatusEnumTC,
       },
     },
     args: {
diff --git a/example/src/schema/mutation/jobLogAdd.ts b/example/src/schema/mutation/jobLogAdd.ts
@@ -2,13 +2,13 @@ import { PayloadError } from '../../declarations/errors';
 import { ErrorCodeEnum } from '../types/enums';
 import { generateMutation, getQueue } from './_helpers';
 
-export function createJobLogAddFC({ schemaComposer }) {
+export function createJobLogAddFC({ schemaComposer, JobStatusEnumTC }) {
   return generateMutation(schemaComposer, {
     type: {
       name: 'JobLogAddPayload',
       fields: {
         id: 'String',
-        state: 'JobStatusEnum',
+        state: JobStatusEnumTC,
       },
     },
     args: {
diff --git a/example/src/schema/mutation/jobPromote.ts b/example/src/schema/mutation/jobPromote.ts
@@ -2,13 +2,13 @@ import { PayloadError } from '../../declarations/errors';
 import { ErrorCodeEnum } from '../types/enums';
 import { generateMutation, getQueue } from './_helpers';
 
-export function createjobPromoteFC({ schemaComposer }) {
+export function createjobPromoteFC({ schemaComposer, JobStatusEnumTC }) {
   return generateMutation(schemaComposer, {
     type: {
       name: 'JobPromotePayload',
       fields: {
         id: 'String',
-        state: 'JobStatusEnum',
+        state: JobStatusEnumTC,
       },
     },
     args: {
diff --git a/example/src/schema/mutation/jobRetry.ts b/example/src/schema/mutation/jobRetry.ts
@@ -2,13 +2,13 @@ import { PayloadError } from '../../declarations/errors';
 import { JobStatusEnum, ErrorCodeEnum } from '../types/enums';
 import { generateMutation, getQueue } from './_helpers';
 
-export function createJobRetryFC({ schemaComposer }) {
+export function createJobRetryFC({ schemaComposer, JobStatusEnumTC }) {
   return generateMutation(schemaComposer, {
     type: {
       name: 'JobRetryPayload',
       fields: {
         id: 'String',
-        state: 'JobStatusEnum',
+        state: JobStatusEnumTC,
       },
     },
     args: {
diff --git a/example/src/schema/mutation/queueClean.ts b/example/src/schema/mutation/queueClean.ts
@@ -1,6 +1,6 @@
 import { generateMutation, getQueue } from './_helpers';
 
-export default function createMutation({ schemaComposer }) {
+export default function createMutation({ schemaComposer, JobStatusEnumTC }) {
   return generateMutation(schemaComposer, {
     type: {
       name: 'QueueCleanPayload',
@@ -15,7 +15,7 @@ export default function createMutation({ schemaComposer }) {
         fields: {
           grace: 'Int!',
           status: {
-            type: 'JobStatusEnum',
+            type: JobStatusEnumTC,
             defaultValue: 'completed',
           },
           limit: {
diff --git a/example/src/schema/mutation/queueResume.ts b/example/src/schema/mutation/queueResume.ts
@@ -5,9 +5,6 @@ export default function createQueuePauseMutation({ schemaComposer }) {
     type: {
       name: 'QueueResumePayload',
       fields: {
-        status: 'PayloadStatusEnum!',
-        error: 'String',
-        errorCode: 'ErrorCodeEnum',
         queueName: 'String!',
       },
     },
diff --git a/example/src/schema/types/enums.ts b/example/src/schema/types/enums.ts
@@ -18,7 +18,7 @@ export enum ErrorCodeEnum {
   OTHER_ERROR = 'other_error',
 }
 
-export default function ({ schemaComposer }) {
+export function createEnumsTC({ schemaComposer }) {
   const JobStatusEnumTC = schemaComposer.createEnumTC({
     name: 'JobStatusEnum',
     values: {
diff --git a/example/src/schema/types/index.ts b/example/src/schema/types/index.ts
@@ -1,14 +1,16 @@
-import createEnums from './enums';
+import { createEnumsTC } from './enums';
 import { createInputTypes } from './input';
 import { createQueueTC } from './queue';
 import { createJobTC } from './job';
 
 export default function ({ schemaComposer }) {
-  const { JobStatusEnumTC, PayloadStatusEnumTC, ErrorCodeEnumTC } = createEnums({ schemaComposer });
+  const { JobStatusEnumTC, PayloadStatusEnumTC, ErrorCodeEnumTC } = createEnumsTC({
+    schemaComposer,
+  });
 
   const JobTC = createJobTC(schemaComposer, { JobStatusEnumTC });
 
-  const QueueTC = createQueueTC(schemaComposer, { JobTC });
+  const QueueTC = createQueueTC(schemaComposer, { JobTC, JobStatusEnumTC });
 
   const { JobOptionsInputTC } = createInputTypes(schemaComposer);
 
diff --git a/example/src/schema/types/job/state.ts b/example/src/schema/types/job/state.ts
@@ -1,7 +1,9 @@
+import { Job } from 'bullmq';
+
 export function createStateFC({ JobStatusEnumTC }) {
   return {
     type: JobStatusEnumTC,
-    resolve: async (job) => {
+    resolve: async (job: Job) => {
       return await job.getState();
     },
   };
diff --git a/example/src/schema/types/queue/activeJobs.ts b/example/src/schema/types/queue/activeJobs.ts
@@ -13,7 +13,7 @@ export function createActiveJobsFC({ JobTC }) {
         defaultValue: -1,
       },
     },
-    resolve: async (queue: Queue, { status, start, end }) => {
+    resolve: async (queue: Queue, { start, end }) => {
       return await queue.getActive(start, end);
     },
   };
diff --git a/example/src/schema/types/queue/completedJobs.ts b/example/src/schema/types/queue/completedJobs.ts
@@ -13,7 +13,7 @@ export function createCompletedJobsFC({ JobTC }) {
         defaultValue: -1,
       },
     },
-    resolve: async (queue: Queue, { status, start, end }) => {
+    resolve: async (queue: Queue, { start, end }) => {
       return await queue.getCompleted(start, end);
     },
   };
diff --git a/example/src/schema/types/queue/delayedJobs.ts b/example/src/schema/types/queue/delayedJobs.ts
@@ -13,7 +13,7 @@ export function createDelayedJobsFC({ JobTC }) {
         defaultValue: -1,
       },
     },
-    resolve: async (queue: Queue, { status, start, end }) => {
+    resolve: async (queue: Queue, { start, end }) => {
       return await queue.getDelayed(start, end);
     },
   };
diff --git a/example/src/schema/types/queue/failedJobs.ts b/example/src/schema/types/queue/failedJobs.ts
@@ -13,7 +13,7 @@ export function createFailedJobsFC({ JobTC }) {
         defaultValue: -1,
       },
     },
-    resolve: async (queue: Queue, { status, start, end }) => {
+    resolve: async (queue: Queue, { start, end }) => {
       return await queue.getFailed(start, end);
     },
   };
diff --git a/example/src/schema/types/queue/index.ts b/example/src/schema/types/queue/index.ts
@@ -7,7 +7,7 @@ import { createActiveJobsFC } from './activeJobs';
 import { createDelayedJobsFC } from './delayedJobs';
 import { createFailedJobsFC } from './failedJobs';
 
-export function createQueueTC(schemaComposer, { JobTC }) {
+export function createQueueTC(schemaComposer, { JobTC, JobStatusEnumTC }) {
   return schemaComposer.createObjectTC({
     name: 'Queue',
     description: 'Bull queue',
@@ -17,7 +17,7 @@ export function createQueueTC(schemaComposer, { JobTC }) {
       jobNames: '[String!]',
       jobCounts: createJobCountFC(schemaComposer),
       repeatables: createRepeatablesFC(schemaComposer),
-      jobs: createJobsFC({ JobTC }),
+      jobs: createJobsFC({ JobTC, JobStatusEnumTC }),
       waitingJobs: createWaitingJobsFC({ JobTC }),
       completedJobs: createCompletedJobsFC({ JobTC }),
       activeJobs: createActiveJobsFC({ JobTC }),
diff --git a/example/src/schema/types/queue/jobs.ts b/example/src/schema/types/queue/jobs.ts
@@ -1,10 +1,10 @@
 import { Queue } from 'bullmq';
 
-export function createJobsFC({ JobTC }) {
+export function createJobsFC({ JobTC, JobStatusEnumTC }) {
   return {
     type: [JobTC],
     args: {
-      status: 'JobStatusEnum',
+      status: JobStatusEnumTC,
       start: {
         type: 'Int',
         defaultValue: 0,

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export enum ErrorCodeEnum {`
`18`	`18`	`OTHER_ERROR = 'other_error',`
`19`	`19`	`}`
`20`	`20`
`21`		`-export default function ({ schemaComposer }) {`
	`21`	`+export function createEnumsTC({ schemaComposer }) {`
`22`	`22`	`const JobStatusEnumTC = schemaComposer.createEnumTC({`
`23`	`23`	`name: 'JobStatusEnum',`
`24`	`24`	`values: {`