wip: refactoring after review

Author: nodkz

example/src/schema/types/enums.ts

@@ -1,3 +1,5 @@
+import { SchemaComposer } from 'graphql-compose';
+
 export enum JobStatusEnum {
   COMPLETED = 'completed',
   WAITING = 'waiting',
@@ -18,39 +20,34 @@ export enum ErrorCodeEnum {
   OTHER_ERROR = 'other_error',
 }
 
-export function createEnumsTC({ schemaComposer }) {
-  const JobStatusEnumTC = schemaComposer.createEnumTC({
-    name: 'JobStatusEnum',
-    values: {
+export function getJobStatusEnumTC(sc: SchemaComposer<any>) {
+  return sc.getOrCreateETC('JobStatusEnum', (etc) => {
+    etc.addFields({
       COMPLETED: { value: JobStatusEnum.COMPLETED },
       WAITING: { value: JobStatusEnum.WAITING },
       ACTIVE: { value: JobStatusEnum.ACTIVE },
       DELAYED: { value: JobStatusEnum.DELAYED },
       FAILED: { value: JobStatusEnum.FAILED },
       PAUSED: { value: JobStatusEnum.PAUSED }, //TODO: в bull написано что устарело, теперь все waiting
-    },
+    });
   });
+}
 
-  const PayloadStatusEnumTC = schemaComposer.createEnumTC({
-    name: 'PayloadStatusEnum',
-    values: {
+export function getMutationStatusEnumTC(sc: SchemaComposer<any>) {
+  return sc.getOrCreateETC('MutationStatusEnum', (etc) => {
+    etc.addFields({
       OK: { value: PayloadStatusEnum.OK },
       ERROR: { value: PayloadStatusEnum.ERROR },
-    },
+    });
   });
+}
 
-  const ErrorCodeEnumTC = schemaComposer.createEnumTC({
-    name: 'ErrorCodeEnum',
-    values: {
+export 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 },
-    },
+    });
   });
-
-  return {
-    JobStatusEnumTC,
-    PayloadStatusEnumTC,
-    ErrorCodeEnumTC,
-  };
 }

example/src/schema/types/index.ts

@@ -1,16 +1,10 @@
-import { createEnumsTC } from './enums';
 import { createInputTypes } from './input';
 import { createQueueTC } from './queue';
 import { createJobTC } from './job';
 
 export default function ({ schemaComposer }) {
-  const { JobStatusEnumTC, PayloadStatusEnumTC, ErrorCodeEnumTC } = createEnumsTC({
-    schemaComposer,
-  });
-
-  const JobTC = createJobTC(schemaComposer, { JobStatusEnumTC });
-
-  const QueueTC = createQueueTC(schemaComposer, { JobTC, JobStatusEnumTC });
+  const JobTC = createJobTC(schemaComposer);
+  const QueueTC = createQueueTC(schemaComposer, { JobTC });
 
   const { JobOptionsInputTC } = createInputTypes(schemaComposer);
 

example/src/schema/types/job/index.ts

@@ -1,8 +1,9 @@
 import { createLogsFC } from './logs';
 import { createStateFC } from './state';
 import { createRepeatOptionsTC } from './repeatOptionsUnion';
+import { SchemaComposer } from 'graphql-compose';
 
-export function createJobTC(schemaComposer, { JobStatusEnumTC }) {
+export function createJobTC(schemaComposer: SchemaComposer<any>) {
   return schemaComposer.createObjectTC({
     name: 'Job',
     fields: {
@@ -34,7 +35,7 @@ export function createJobTC(schemaComposer, { JobStatusEnumTC }) {
           stackTraceLimit: 'Int',
         },
       }),
-      state: createStateFC({ JobStatusEnumTC }),
+      state: createStateFC(schemaComposer),
       logs: createLogsFC(schemaComposer),
     },
   });

example/src/schema/types/job/logs.ts

@@ -1,3 +1,5 @@
+import { Job } from 'bullmq';
+
 export function createLogsFC(schemaComposer) {
   return {
     type: schemaComposer.createObjectTC({

example/src/schema/types/job/state.ts

@@ -1,8 +1,10 @@
 import { Job } from 'bullmq';
+import { SchemaComposer } from 'graphql-compose';
+import { getJobStatusEnumTC } from '../enums';
 
-export function createStateFC({ JobStatusEnumTC }) {
+export function createStateFC(schemaComposer: SchemaComposer<any>) {
   return {
-    type: JobStatusEnumTC,
+    type: getJobStatusEnumTC(schemaComposer),
     resolve: async (job: Job) => {
       return await job.getState();
     },

example/src/schema/types/queue/index.ts

@@ -6,8 +6,9 @@ import { createCompletedJobsFC } from './completedJobs';
 import { createActiveJobsFC } from './activeJobs';
 import { createDelayedJobsFC } from './delayedJobs';
 import { createFailedJobsFC } from './failedJobs';
+import { SchemaComposer } from 'graphql-compose';
 
-export function createQueueTC(schemaComposer, { JobTC, JobStatusEnumTC }) {
+export function createQueueTC(schemaComposer: SchemaComposer<any>, { JobTC }) {
   return schemaComposer.createObjectTC({
     name: 'Queue',
     description: 'Bull queue',
@@ -17,7 +18,7 @@ export function createQueueTC(schemaComposer, { JobTC, JobStatusEnumTC }) {
       jobNames: '[String!]',
       jobCounts: createJobCountFC(schemaComposer),
       repeatables: createRepeatablesFC(schemaComposer),
-      jobs: createJobsFC({ JobTC, JobStatusEnumTC }),
+      jobs: createJobsFC({ JobTC }),
       waitingJobs: createWaitingJobsFC({ JobTC }),
       completedJobs: createCompletedJobsFC({ JobTC }),
       activeJobs: createActiveJobsFC({ JobTC }),

example/src/schema/types/queue/jobs.ts

@@ -1,10 +1,12 @@
 import { Queue } from 'bullmq';
+import { SchemaComposer } from 'graphql-compose';
+import { getJobStatusEnumTC } from '../enums';
 
-export function createJobsFC({ JobTC, JobStatusEnumTC }) {
+export function createJobsFC(schemaComposer: SchemaComposer<any>, { JobTC }) {
   return {
     type: [JobTC],
     args: {
-      status: JobStatusEnumTC,
+      status: getJobStatusEnumTC(schemaComposer),
       start: {
         type: 'Int',
         defaultValue: 0,
@@ -13,6 +15,7 @@ export function createJobsFC({ JobTC, JobStatusEnumTC }) {
         type: 'Int',
         defaultValue: -1,
       },
+      // TODO: add sorting
     },
     resolve: async (queue: Queue, { status, start, end }) => {
       return await queue.getJobs([status], start, end, false);