Skip to content

Commit d0d8e37

Browse files
intproBoris Dorofeev
and
Boris Dorofeev
authored
fix: delete opts repeat interface
* feat: id field for queue * fix: job removed without data * feat: delete job output opts repeat interface * fix: del unused import Co-authored-by: Boris Dorofeev <[email protected]>
1 parent b9afa7e commit d0d8e37

File tree

2 files changed

+15
-38
lines changed

2 files changed

+15
-38
lines changed

src/types/job/Job.opts.repeat.ts

+4-38
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,23 @@
1-
import { isObject, SchemaComposer } from 'graphql-compose';
1+
import { SchemaComposer } from 'graphql-compose';
22
import { Options } from '../../definitions';
33

44
export function createRepeatOptionsTC(sc: SchemaComposer<any>, opts: Options) {
55
const { typePrefix } = opts;
66

7-
const RepeatOptionsInterfaceTC = sc.createInterfaceTC({
8-
name: `${typePrefix}RepeatOptionsInterface`,
7+
const RepeatOptionsTC = sc.createObjectTC({
8+
name: `${typePrefix}RepeatOptions`,
99
fields: {
1010
tz: 'String',
1111
endDate: 'Date',
1212
limit: 'Int',
1313
count: 'Int',
1414
prevMillis: 'Int',
1515
jobId: 'String',
16-
},
17-
});
18-
19-
const RepeatOptionsCronTC = sc.createObjectTC({
20-
name: `${typePrefix}RepeatOptionsCron`,
21-
interfaces: [RepeatOptionsInterfaceTC],
22-
fields: {
23-
tz: 'String',
24-
endDate: 'Date',
25-
limit: 'Int',
2616
cron: 'String',
2717
startDate: 'Date',
28-
count: 'Int',
29-
prevMillis: 'Int',
30-
jobId: 'String',
31-
},
32-
});
33-
34-
const RepeatOptionsEveryTC = sc.createObjectTC({
35-
name: `${typePrefix}RepeatOptionsEvery`,
36-
interfaces: [RepeatOptionsInterfaceTC],
37-
fields: {
38-
tz: 'String',
39-
endDate: 'Date',
40-
limit: 'Int',
4118
every: 'String',
42-
count: 'Int',
43-
prevMillis: 'Int',
44-
jobId: 'String',
4519
},
4620
});
4721

48-
RepeatOptionsInterfaceTC.addTypeResolver(RepeatOptionsEveryTC, (value) => {
49-
return isObject(value) && value.hasOwnProperty('every');
50-
});
51-
52-
RepeatOptionsInterfaceTC.addTypeResolver(RepeatOptionsCronTC, (value) => {
53-
return isObject(value) && value.hasOwnProperty('cron');
54-
});
55-
56-
return RepeatOptionsInterfaceTC;
22+
return RepeatOptionsTC;
5723
}

src/types/queue/Queue.id.ts

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Queue } from 'bullmq';
2+
import { ObjectTypeComposerFieldConfigDefinition } from 'graphql-compose';
3+
4+
export function createIdFC(): ObjectTypeComposerFieldConfigDefinition<any, any> {
5+
return {
6+
type: 'String!',
7+
resolve: async (queue: Queue) => {
8+
return queue.name;
9+
},
10+
};
11+
}

0 commit comments

Comments
 (0)