refactor: use RepeatOptionsInterface instead of union

Author: nodkz

example/src/config.ts

@@ -8,7 +8,7 @@
 
 // const BULL_REDIS_URI = 'redis://127.0.0.1:6379';
 const BULL_REDIS_URI =
-  'redis://:uut2tiew5waeli1aefup0Toecaikoque5eepahch5AowaiJ2@10.216.129.127:6379';
+  'redis://:uut2tiew5waeli1aefup0Toecaikoque5eepahch5AowaiJ2@10.216.129.128:6379';
 
 const BULL_HOST_ID = 'maybe_uuid_and_mac';
 

example/src/queues/fetchMetrics.ts

@@ -9,7 +9,7 @@ if (!BULL_REDIS_URI) {
 export const queueSettings = {
   hostId: BULL_HOST_ID,
   name: 'fetch_metrics',
-  prefix: 'bull.fetch-metrics',
+  prefix: 'bull.demo',
 };
 
 const prefix = queueSettings.prefix;

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

@@ -0,0 +1,48 @@
+import { isObject, SchemaComposer } from 'graphql-compose';
+
+export function createRepeatOptionsTC(schemaComposer: SchemaComposer<any>) {
+  const RepeatOptionsInterfaceTC = schemaComposer.createInterfaceTC({
+    name: 'RepeatOptionsInterface',
+    fields: {
+      tz: 'String',
+      endDate: 'Date',
+      limit: 'Int',
+    },
+  });
+
+  const RepeatOptionsCronTC = schemaComposer.createObjectTC({
+    name: 'RepeatOptionsCron',
+    interfaces: [RepeatOptionsInterfaceTC],
+    fields: {
+      tz: 'String',
+      endDate: 'Date',
+      limit: 'Int',
+      cron: 'String',
+      startDate: 'Date',
+    },
+  });
+
+  const RepeatOptionsEveryTC = schemaComposer.createObjectTC({
+    name: 'RepeatOptionsEvery',
+    interfaces: [RepeatOptionsInterfaceTC],
+    fields: {
+      tz: 'String',
+      endDate: 'Date',
+      limit: 'Int',
+      every: 'String',
+    },
+  });
+
+  RepeatOptionsInterfaceTC.addTypeResolver(RepeatOptionsEveryTC, (value) => {
+    return isObject(value) && value.hasOwnProperty('every');
+  });
+
+  RepeatOptionsInterfaceTC.addTypeResolver(RepeatOptionsCronTC, (value) => {
+    return isObject(value) && value.hasOwnProperty('cron');
+  });
+
+  schemaComposer.addSchemaMustHaveType(RepeatOptionsEveryTC);
+  schemaComposer.addSchemaMustHaveType(RepeatOptionsCronTC);
+
+  return RepeatOptionsInterfaceTC;
+}

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

@@ -1,6 +1,6 @@
 import { createLogsFC } from './logs';
 import { createStateFC } from './state';
-import { createRepeatOptionsTC } from './RepeatOptionsUnion';
+import { createRepeatOptionsTC } from './RepeatOptionsInterface';
 import { SchemaComposer } from 'graphql-compose';
 
 export { getJobOptionsInputTC } from './OptionsInput';

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

@@ -1,4 +1,4 @@
-import { Job } from 'bullmq';
+import { Job, Queue } from 'bullmq';
 import { SchemaComposer, ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
 
 export function createLogsFC(
@@ -9,14 +9,17 @@ export function createLogsFC(
       name: 'JobLogs',
       fields: {
         count: 'Int',
-        logs: '[String!]',
+        items: '[String!]',
       },
+      // args: {}, // TODO: start end
     }),
     resolve: (job: Job) => {
       // `queue` is private property of Job instance
       // so here we are not guarantee that log will be avaliable in the future
-      if ((job as any).queue) {
-        return (job as any).queue.getJobLogs(job.id);
+      if (job.id && (job as any).queue) {
+        return ((job as any).queue as Queue)
+          .getJobLogs(job.id)
+          .then((r) => ({ count: r.count, items: r.logs }));
       }
     },
   };