feat: split add job mutation by repeatability

Author: Boris

example/src/config.ts

@@ -6,9 +6,8 @@
 //   password: process.env.REDIS_PASSWORD || '',
 // };
 
-// const BULL_REDIS_URI = 'redis://127.0.0.1:6379';
-const BULL_REDIS_URI =
-  'redis://:uut2tiew5waeli1aefup0Toecaikoque5eepahch5AowaiJ2@10.216.129.128:6379';
+const BULL_REDIS_URI = 'redis://127.0.0.1:6379';
+//const BULL_REDIS_URI ='redis://:uut2tiew5waeli1aefup0Toecaikoque5eepahch5AowaiJ2@10.216.129.128:6379';
 
 const BULL_HOST_ID = 'maybe_uuid_and_mac';
 

example/src/schema/mutation/index.ts

@@ -1,10 +1,13 @@
+import { SchemaComposer } from 'graphql-compose';
 import { createQueueCleanFC } from './queueClean';
 import { createQueuePauseFC } from './queuePause';
 import { createQueueResumeFC } from './queueResume';
 
 import { createRemoveRepeatableFC } from './queueRemoveRepeatable';
 
 import { createJobAddFC } from './jobAdd';
+import { createJobAddRepeatableCronFC } from './jobAdd';
+import { createJobAddRepeatableEveryFC } from './jobAdd';
 import { createJobDiscardFC } from './jobDiscard';
 import { createjobPromoteFC } from './jobPromote';
 import { createJobRremoveFC } from './jobRemove';
@@ -14,15 +17,23 @@ import { createJobLogAddFC } from './jobLogAdd';
 
 import { createGenerateHelper } from './_helpers';
 
-export function createMutationFields({ schemaComposer }): any {
+export function createMutationFields({
+  schemaComposer,
+}: {
+  schemaComposer: SchemaComposer<any>;
+}): any {
   const generateHelper = createGenerateHelper(schemaComposer);
   //TODO: пропустить через map это
   return {
     queueClean: generateHelper(createQueueCleanFC({ schemaComposer })),
     queuePause: generateHelper(createQueuePauseFC()),
     queueResume: generateHelper(createQueueResumeFC()),
     queueRemoveRepeatable: generateHelper(createRemoveRepeatableFC()),
+
     jobAdd: generateHelper(createJobAddFC(schemaComposer)),
+    jobAddRepeatableCron: generateHelper(createJobAddRepeatableCronFC(schemaComposer)),
+    jobAddRepeatableEvery: generateHelper(createJobAddRepeatableEveryFC(schemaComposer)),
+
     jobDiscard: generateHelper(createJobDiscardFC({ schemaComposer })),
     jobPromote: generateHelper(createjobPromoteFC({ schemaComposer })),
     jobRemove: generateHelper(createJobRremoveFC(schemaComposer)),

example/src/schema/mutation/jobAdd.ts

@@ -1,20 +1,74 @@
 import { getQueue } from './_helpers';
-import { SchemaComposer } from 'graphql-compose';
-import { getJobTC, getJobOptionsInputTC } from '../types/job';
+import {
+  SchemaComposer,
+  InputTypeComposer,
+  ObjectTypeComposerFieldConfigAsObjectDefinition,
+} from 'graphql-compose';
+import { getJobTC } from '../types/job';
 
-export function createJobAddFC(schemaComposer: SchemaComposer<any>) {
+function getPayloadTC(sc: SchemaComposer<any>) {
+  return sc.getOrCreateOTC('JobAddPayload', (etc) => {
+    etc.addFields({
+      job: getJobTC(sc),
+    });
+  });
+}
+
+export function createJobAddFC(sc: SchemaComposer<any>) {
+  return composeJobAddFC(sc, createJobOptionsInputTC('JobOptionsInput', sc));
+}
+
+export function createJobAddRepeatableCronFC(sc: SchemaComposer<any>) {
+  return composeJobAddFC(
+    sc,
+    createJobOptionsInputTC('JobOptionsInputRepeatableCron', sc).addFields({
+      repeat: sc
+        .createInputTC({
+          name: 'RepeatOptionsInputCron',
+          fields: {
+            tz: 'String',
+            endDate: 'Date',
+            limit: 'Int',
+            cron: 'String!',
+            startDate: 'Date',
+          },
+        })
+        .getTypeNonNull(),
+    })
+  );
+}
+
+export function createJobAddRepeatableEveryFC(sc: SchemaComposer<any>) {
+  return composeJobAddFC(
+    sc,
+    createJobOptionsInputTC('JobOptionsInputRepeatableEvery', sc).addFields({
+      repeat: sc
+        .createInputTC({
+          name: 'RepeatOptionsInputEvery',
+          fields: {
+            tz: 'String',
+            endDate: 'Date',
+            limit: 'Int',
+            cron: 'String!',
+            startDate: 'Date',
+          },
+        })
+        .getTypeNonNull(),
+    })
+  );
+}
+
+function composeJobAddFC(
+  sc: SchemaComposer<any>,
+  optionsTC: InputTypeComposer<any>
+): ObjectTypeComposerFieldConfigAsObjectDefinition<any, any> {
   return {
-    type: {
-      name: 'JobAddPayload',
-      fields: {
-        job: getJobTC(schemaComposer),
-      },
-    },
+    type: getPayloadTC(sc),
     args: {
       queueName: 'String!',
       jobName: 'String!',
       data: 'JSON!',
-      options: getJobOptionsInputTC(schemaComposer),
+      options: optionsTC,
     },
     resolve: async (_, { queueName, jobName, data, options }, context) => {
       const queue = getQueue(queueName, context);
@@ -25,3 +79,21 @@ export function createJobAddFC(schemaComposer: SchemaComposer<any>) {
     },
   };
 }
+
+function createJobOptionsInputTC(name: string, sc: SchemaComposer<any>): InputTypeComposer<any> {
+  return sc.createInputTC({
+    name,
+    fields: {
+      priority: 'Int',
+      delay: 'Int',
+      attempts: 'Int',
+      backoff: 'Int', // | TODO: BackoffOptions
+      lifo: 'Boolean',
+      timeout: 'Int',
+      jobId: 'String',
+      removeOnComplete: 'Boolean', //TODO: bool or int
+      removeOnFail: 'Boolean', //TODO: bool or int
+      stackTraceLimit: 'Int',
+    },
+  });
+}

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

@@ -3,8 +3,6 @@ import { createStateFC } from './state';
 import { createRepeatOptionsTC } from './RepeatOptionsInterface';
 import { SchemaComposer } from 'graphql-compose';
 
-export { getJobOptionsInputTC } from './OptionsInput';
-
 export function getJobTC(sc: SchemaComposer<any>) {
   return sc.getOrCreateOTC('Job', (etc) => {
     etc.addFields({