@servicelabsco/nestjs-utility-services 1.2.112 → 1.2.113
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/system/jobs/code.fix.script.job.js +3 -3
- package/dist/system/jobs/code.fix.script.job.js.map +1 -1
- package/dist/system/jobs/execute.recurring.query.job.d.ts +1 -1
- package/dist/system/jobs/execute.recurring.query.job.js +7 -3
- package/dist/system/jobs/execute.recurring.query.job.js.map +1 -1
- package/dist/system/jobs/recurring.query.job.js +1 -1
- package/dist/system/jobs/set.codefix.script.event.job.d.ts +2 -3
- package/dist/system/jobs/set.codefix.script.event.job.js +4 -7
- package/dist/system/jobs/set.codefix.script.event.job.js.map +1 -1
- package/dist/system/jobs/set.event.queue.job.d.ts +0 -3
- package/dist/system/jobs/set.event.queue.job.js +1 -36
- package/dist/system/jobs/set.event.queue.job.js.map +1 -1
- package/dist/system/jobs/set.recurring.query.event.job.d.ts +1 -2
- package/dist/system/jobs/set.recurring.query.event.job.js +14 -17
- package/dist/system/jobs/set.recurring.query.event.job.js.map +1 -1
- package/dist/system/jobs/set.scheduled.event.job.js.map +1 -1
- package/dist/system/services/event.queue.service.d.ts +6 -0
- package/dist/system/services/event.queue.service.js +44 -1
- package/dist/system/services/event.queue.service.js.map +1 -1
- package/dist/system/services/scheduled.event.service.js +3 -2
- package/dist/system/services/scheduled.event.service.js.map +1 -1
- package/dist/system/subscribers/code.fix.script.subscriber.d.ts +3 -1
- package/dist/system/subscribers/code.fix.script.subscriber.js +13 -0
- package/dist/system/subscribers/code.fix.script.subscriber.js.map +1 -1
- package/dist/system/subscribers/recurring.query.subscriber.js +2 -2
- package/dist/system/subscribers/recurring.query.subscriber.js.map +1 -1
- package/dist/system/subscribers/scheduled.event.subscriber.js +2 -2
- package/dist/system/subscribers/scheduled.event.subscriber.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,7 +14,7 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const date_fns_1 = require("date-fns");
|
|
15
15
|
const common_job_1 = require("../../common/libraries/common.job");
|
|
16
16
|
const queue_service_1 = require("../../platformUtility/services/queue.service");
|
|
17
|
-
const
|
|
17
|
+
const code_fix_script_entity_1 = require("../entities/code.fix.script.entity");
|
|
18
18
|
const scheduled_event_service_1 = require("../services/scheduled.event.service");
|
|
19
19
|
const set_codefix_script_event_job_1 = require("./set.codefix.script.event.job");
|
|
20
20
|
const SourceHash = require("../../config/source.hash");
|
|
@@ -36,8 +36,8 @@ let CodeFixScriptJob = class CodeFixScriptJob extends common_job_1.CommonJob {
|
|
|
36
36
|
return this.setCodefixScriptEventJob.dispatch(evt.entity.id);
|
|
37
37
|
}
|
|
38
38
|
async cleanRecord(evt) {
|
|
39
|
-
await this.scheduledEventService.deleteActiveEvents({ source_type: SourceHash.
|
|
40
|
-
const r = await
|
|
39
|
+
await this.scheduledEventService.deleteActiveEvents({ source_type: SourceHash.codeFixScript, source_id: evt.entity.id });
|
|
40
|
+
const r = await code_fix_script_entity_1.CodeFixScriptEntity.first(evt.entity.id);
|
|
41
41
|
r.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 1);
|
|
42
42
|
return r.save();
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.fix.script.job.js","sourceRoot":"","sources":["../../../src/system/jobs/code.fix.script.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAsC;AAEtC,kEAA8D;AAC9D,gFAA4E;
|
|
1
|
+
{"version":3,"file":"code.fix.script.job.js","sourceRoot":"","sources":["../../../src/system/jobs/code.fix.script.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAsC;AAEtC,kEAA8D;AAC9D,gFAA4E;AAC5E,+EAAyE;AACzE,iFAA4E;AAC5E,iFAA0E;AAC1E,uDAAwD;AAGjD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,sBAAS;IAC3C,YACuB,YAA0B,EAC5B,qBAA4C,EAC5C,wBAAkD;QAEnE,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAJvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,6BAAwB,GAAxB,wBAAwB,CAA0B;IAGvE,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,GAA0C;QACnD,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,GAA0C;QAChE,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,CAAC;YAAE,OAAO;QAExD,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,GAA0C;QAChE,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAEzH,MAAM,CAAC,GAAG,MAAM,4CAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC,CAAC,mBAAmB,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAElD,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;CACJ,CAAA;AA5BY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAG4B,4BAAY;QACL,+CAAqB;QAClB,uDAAwB;GAJ9D,gBAAgB,CA4B5B"}
|
|
@@ -25,10 +25,14 @@ let ExecuteRecurringQueryJob = class ExecuteRecurringQueryJob extends common_job
|
|
|
25
25
|
async handle(id) {
|
|
26
26
|
if (!id)
|
|
27
27
|
return;
|
|
28
|
-
const
|
|
29
|
-
|
|
28
|
+
const recurring = await recurring_query_entity_1.RecurringQueryEntity.first(+id, { relations: ['query'] });
|
|
29
|
+
const sqlQueries = recurring?.query?.script;
|
|
30
|
+
if (!sqlQueries)
|
|
30
31
|
return;
|
|
31
|
-
|
|
32
|
+
const queries = sqlQueries.split(';');
|
|
33
|
+
for (const query of queries) {
|
|
34
|
+
await this.sqlService.sql(query);
|
|
35
|
+
}
|
|
32
36
|
}
|
|
33
37
|
};
|
|
34
38
|
exports.ExecuteRecurringQueryJob = ExecuteRecurringQueryJob;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.recurring.query.job.js","sourceRoot":"","sources":["../../../src/system/jobs/execute.recurring.query.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gFAA4E;AAC5E,4EAAwE;AACxE,+EAA0E;AAGnE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,sBAAS;IAGnD,YACuB,YAA0B,EAC5B,UAAsB;QAEvC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,eAAU,GAAV,UAAU,CAAY;QAJjC,YAAO,GAAW,MAAM,CAAC;IAOnC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,MAAM,
|
|
1
|
+
{"version":3,"file":"execute.recurring.query.job.js","sourceRoot":"","sources":["../../../src/system/jobs/execute.recurring.query.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gFAA4E;AAC5E,4EAAwE;AACxE,+EAA0E;AAGnE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,sBAAS;IAGnD,YACuB,YAA0B,EAC5B,UAAsB;QAEvC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,eAAU,GAAV,UAAU,CAAY;QAJjC,YAAO,GAAW,MAAM,CAAC;IAOnC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,MAAM,SAAS,GAAG,MAAM,6CAAoB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAElF,MAAM,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC;QAC5C,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEtC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;IACL,CAAC;CACJ,CAAA;AAvBY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAK4B,4BAAY;QAChB,wBAAU;GALlC,wBAAwB,CAuBpC"}
|
|
@@ -36,7 +36,7 @@ let RecurringQueryJob = class RecurringQueryJob extends common_job_1.CommonJob {
|
|
|
36
36
|
return this.setRecurringQueryEventJob.dispatch(evt.entity.id);
|
|
37
37
|
}
|
|
38
38
|
async cleanRecord(evt) {
|
|
39
|
-
await this.scheduledEventService.deleteActiveEvents({ source_type: SourceHash.
|
|
39
|
+
await this.scheduledEventService.deleteActiveEvents({ source_type: SourceHash.recurringQuery, source_id: evt.entity.id });
|
|
40
40
|
const r = await recurring_query_entity_1.RecurringQueryEntity.first(evt.entity.id);
|
|
41
41
|
r.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 1);
|
|
42
42
|
return r.save();
|
|
@@ -7,8 +7,7 @@ export declare class SetCodefixScriptEventJob extends CommonJob {
|
|
|
7
7
|
protected timeout: number;
|
|
8
8
|
constructor(queueService: QueueService, scheduledEventService: ScheduledEventService);
|
|
9
9
|
handle(): Promise<void>;
|
|
10
|
-
private
|
|
11
|
-
private
|
|
12
|
-
private getEligibleScheduledEvents;
|
|
10
|
+
private handleScript;
|
|
11
|
+
private getEligibleCodeFixes;
|
|
13
12
|
private setNewEvent;
|
|
14
13
|
}
|
|
@@ -28,18 +28,15 @@ let SetCodefixScriptEventJob = class SetCodefixScriptEventJob extends common_job
|
|
|
28
28
|
this.timeout = 300000;
|
|
29
29
|
}
|
|
30
30
|
async handle() {
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
async handleAllActiveJobs() {
|
|
34
|
-
const scheduledJobs = await this.getEligibleScheduledEvents();
|
|
31
|
+
const scheduledJobs = await this.getEligibleCodeFixes();
|
|
35
32
|
const event = await event_detail_entity_1.EventDetailEntity.findOne({ where: { identifier: SourceHash.codeFixExecutionEvent } });
|
|
36
33
|
const startDate = (0, date_fns_1.subMinutes)(new Date(), 1);
|
|
37
34
|
const endDate = (0, date_fns_1.addYears)(new Date(), 1);
|
|
38
35
|
for (const scheduledJob of scheduledJobs) {
|
|
39
|
-
await this.
|
|
36
|
+
await this.handleScript(scheduledJob, startDate, endDate, event);
|
|
40
37
|
}
|
|
41
38
|
}
|
|
42
|
-
async
|
|
39
|
+
async handleScript(script, startDate, endDate, event) {
|
|
43
40
|
const source = { source_type: SourceHash.codeFixScript, source_id: script.id };
|
|
44
41
|
const dates = await this.scheduledEventService.getSchedules(source, script.timing, startDate, endDate);
|
|
45
42
|
if (!dates?.length)
|
|
@@ -50,7 +47,7 @@ let SetCodefixScriptEventJob = class SetCodefixScriptEventJob extends common_job
|
|
|
50
47
|
script.last_scheduled_time = dates.pop();
|
|
51
48
|
return script.save();
|
|
52
49
|
}
|
|
53
|
-
async
|
|
50
|
+
async getEligibleCodeFixes() {
|
|
54
51
|
const d = (0, date_fns_1.addMinutes)(new Date(), 15);
|
|
55
52
|
return code_fix_script_entity_1.CodeFixScriptEntity.find({
|
|
56
53
|
where: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.codefix.script.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.codefix.script.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA4D;AAC5D,qCAAuD;AACvD,kEAA8D;AAC9D,gFAA4E;AAC5E,+EAAyE;AACzE,yEAAoE;AACpE,uEAAkE;AAClE,iFAA4E;AAC5E,uDAAwD;AAGjD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,sBAAS;IASnD,YACuB,YAA0B,EAC5B,qBAA4C;QAE7D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QATvD,YAAO,GAAW,MAAM,CAAC;IAYnC,CAAC;
|
|
1
|
+
{"version":3,"file":"set.codefix.script.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.codefix.script.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA4D;AAC5D,qCAAuD;AACvD,kEAA8D;AAC9D,gFAA4E;AAC5E,+EAAyE;AACzE,yEAAoE;AACpE,uEAAkE;AAClE,iFAA4E;AAC5E,uDAAwD;AAGjD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,sBAAS;IASnD,YACuB,YAA0B,EAC5B,qBAA4C;QAE7D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QATvD,YAAO,GAAW,MAAM,CAAC;IAYnC,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,uCAAiB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;QAE3G,MAAM,SAAS,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAA,mBAAQ,EAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAExC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;IAWO,KAAK,CAAC,YAAY,CAAC,MAA2B,EAAE,SAAe,EAAE,OAAa,EAAE,KAAwB;QAC5G,MAAM,MAAM,GAAG,EAAE,WAAW,EAAE,UAAU,CAAC,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;QAE/E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAEvG,IAAI,CAAC,KAAK,EAAE,MAAM;YAAE,OAAO,MAAM,CAAC;QAElC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,CAAC,mBAAmB,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACzC,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAQO,KAAK,CAAC,oBAAoB;QAC9B,MAAM,CAAC,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAErC,OAAO,4CAAmB,CAAC,IAAI,CAAC;YAC5B,KAAK,EAAE;gBACH,MAAM,EAAE,IAAI;gBACZ,mBAAmB,EAAE,IAAA,yBAAe,EAAC,CAAC,CAAC;gBACvC,MAAM,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC;aACxB;SACJ,CAAC,CAAC;IACP,CAAC;IAUO,KAAK,CAAC,WAAW,CAAC,MAA2B,EAAE,IAAU,EAAE,KAAwB;QACvF,MAAM,MAAM,GAAG,IAAI,qCAAgB,EAAE,CAAC;QAEtC,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACzB,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC;QAE3B,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC;QACvB,MAAM,CAAC,OAAO,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAChE,MAAM,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAEnC,MAAM,CAAC,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC;QAC9C,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC;QAE7B,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;CACJ,CAAA;AA7FY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAW4B,4BAAY;QACL,+CAAqB;GAXxD,wBAAwB,CA6FpC"}
|
|
@@ -11,8 +11,5 @@ export declare class SetEventQueueJob extends CommonJob {
|
|
|
11
11
|
constructor(eventQueueService: EventQueueService, queueService: QueueService, configService: ConfigService, sqlService: SqlService);
|
|
12
12
|
handle(): Promise<any>;
|
|
13
13
|
private pollQueue;
|
|
14
|
-
private setEvent;
|
|
15
|
-
private getPayload;
|
|
16
|
-
private typeCastParameter;
|
|
17
14
|
private removeCompletedEvents;
|
|
18
15
|
}
|
|
@@ -39,45 +39,10 @@ let SetEventQueueJob = class SetEventQueueJob extends common_job_1.CommonJob {
|
|
|
39
39
|
if (!events.length)
|
|
40
40
|
return;
|
|
41
41
|
for (const event of events) {
|
|
42
|
-
await this.
|
|
42
|
+
await this.eventQueueService.trigger(event);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
async setEvent(event) {
|
|
47
|
-
event.start_time = date_util_1.DateUtil.getDateTime();
|
|
48
|
-
try {
|
|
49
|
-
const payload = this.getPayload(event);
|
|
50
|
-
const job = await this.queueService.addJob(event.event.identifier, payload);
|
|
51
|
-
event.attributes = { ...event.attributes, job_id: job.id };
|
|
52
|
-
global.console.log('triggered event : ', event.event.identifier, payload, job.id);
|
|
53
|
-
}
|
|
54
|
-
catch (error) {
|
|
55
|
-
event.attributes = { ...event.attributes, no_trigger: true };
|
|
56
|
-
}
|
|
57
|
-
finally {
|
|
58
|
-
event.end_time = date_util_1.DateUtil.getDateTime();
|
|
59
|
-
return event.save();
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
getPayload(event) {
|
|
63
|
-
const { payload, parameter } = event;
|
|
64
|
-
if (Object.keys(payload || {}).length)
|
|
65
|
-
return payload;
|
|
66
|
-
return this.typeCastParameter(parameter);
|
|
67
|
-
}
|
|
68
|
-
typeCastParameter(value) {
|
|
69
|
-
if (!value.length)
|
|
70
|
-
return null;
|
|
71
|
-
if (!isNaN(+value))
|
|
72
|
-
return +value;
|
|
73
|
-
const str = value.toLowerCase();
|
|
74
|
-
if (['true', 'false'].includes(str)) {
|
|
75
|
-
if (str === 'true')
|
|
76
|
-
return true;
|
|
77
|
-
return false;
|
|
78
|
-
}
|
|
79
|
-
return value;
|
|
80
|
-
}
|
|
81
46
|
async removeCompletedEvents() {
|
|
82
47
|
const d = (0, date_fns_1.subDays)(new Date(), 7);
|
|
83
48
|
const sql = `delete from sys_event_queues where start_time is not null and start_time < '${date_util_1.DateUtil.getDateTimeInFormat(d)}'`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.event.queue.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.event.queue.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAC/C,uCAAmC;AACnC,kEAA8D;AAC9D,gEAA4D;AAC5D,gFAA4E;AAC5E,4EAAwE;
|
|
1
|
+
{"version":3,"file":"set.event.queue.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.event.queue.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAC/C,uCAAmC;AACnC,kEAA8D;AAC9D,gEAA4D;AAC5D,gFAA4E;AAC5E,4EAAwE;AACxE,yEAAoE;AAG7D,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,sBAAS;IAC3C,YACqB,iBAAoC,EAClC,YAA0B,EAC1B,aAA4B,EAC5B,UAAsB;QAEzC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QALzB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;IAG7C,CAAC;IAMD,KAAK,CAAC,MAAM;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAU,kBAAkB,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACxC,CAAC;IAQO,KAAK,CAAC,SAAS;QACnB,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,CAAC;YAC9D,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,OAAO;YAE3B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBACzB,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChD,CAAC;QACL,CAAC;IACL,CAAC;IAQO,KAAK,CAAC,qBAAqB;QAC/B,MAAM,CAAC,GAAG,IAAA,kBAAO,EAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QACjC,MAAM,GAAG,GAAG,+EAA+E,oBAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC;QAC9H,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAlDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAG+B,uCAAiB;QACpB,4BAAY;QACX,sBAAa;QAChB,wBAAU;GALpC,gBAAgB,CAkD5B"}
|
|
@@ -7,8 +7,7 @@ export declare class SetRecurringQueryEventJob extends CommonJob {
|
|
|
7
7
|
protected timeout: number;
|
|
8
8
|
constructor(queueService: QueueService, scheduledEventService: ScheduledEventService);
|
|
9
9
|
handle(): Promise<void>;
|
|
10
|
-
private handleAllActiveJobs;
|
|
11
10
|
private handleJob;
|
|
12
|
-
private
|
|
11
|
+
private getEligibleQueries;
|
|
13
12
|
private setNewEvent;
|
|
14
13
|
}
|
|
@@ -28,29 +28,26 @@ let SetRecurringQueryEventJob = class SetRecurringQueryEventJob extends common_j
|
|
|
28
28
|
this.timeout = 300000;
|
|
29
29
|
}
|
|
30
30
|
async handle() {
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
async handleAllActiveJobs() {
|
|
34
|
-
const scheduledJobs = await this.getEligibleScheduledEvents();
|
|
31
|
+
const queries = await this.getEligibleQueries();
|
|
35
32
|
const event = await event_detail_entity_1.EventDetailEntity.findOne({ where: { identifier: SourceHash.recurringQueryEvent } });
|
|
36
33
|
const startDate = (0, date_fns_1.subMinutes)(new Date(), 1);
|
|
37
34
|
const endDate = (0, date_fns_1.addYears)(new Date(), 1);
|
|
38
|
-
for (const
|
|
39
|
-
await this.handleJob(
|
|
35
|
+
for (const query of queries) {
|
|
36
|
+
await this.handleJob(query, startDate, endDate, event);
|
|
40
37
|
}
|
|
41
38
|
}
|
|
42
|
-
async handleJob(
|
|
43
|
-
const source = { source_type: SourceHash.recurringQuery, source_id:
|
|
44
|
-
const dates = await this.scheduledEventService.getSchedules(source,
|
|
39
|
+
async handleJob(query, startDate, endDate, event) {
|
|
40
|
+
const source = { source_type: SourceHash.recurringQuery, source_id: query.id };
|
|
41
|
+
const dates = await this.scheduledEventService.getSchedules(source, query.timing, startDate, endDate);
|
|
45
42
|
if (!dates?.length)
|
|
46
|
-
return
|
|
43
|
+
return query;
|
|
47
44
|
for (const date of dates) {
|
|
48
|
-
await this.setNewEvent(
|
|
45
|
+
await this.setNewEvent(query, date, event);
|
|
49
46
|
}
|
|
50
|
-
|
|
51
|
-
return
|
|
47
|
+
query.last_scheduled_time = dates.pop();
|
|
48
|
+
return query.save();
|
|
52
49
|
}
|
|
53
|
-
async
|
|
50
|
+
async getEligibleQueries() {
|
|
54
51
|
const d = (0, date_fns_1.addMinutes)(new Date(), 15);
|
|
55
52
|
return recurring_query_entity_1.RecurringQueryEntity.find({
|
|
56
53
|
where: {
|
|
@@ -60,14 +57,14 @@ let SetRecurringQueryEventJob = class SetRecurringQueryEventJob extends common_j
|
|
|
60
57
|
},
|
|
61
58
|
});
|
|
62
59
|
}
|
|
63
|
-
async setNewEvent(
|
|
60
|
+
async setNewEvent(query, date, event) {
|
|
64
61
|
const record = new event_queue_entity_1.EventQueueEntity();
|
|
65
62
|
record.name = event.name;
|
|
66
63
|
record.event_id = event.id;
|
|
67
|
-
record.parameter =
|
|
64
|
+
record.parameter = query.id.toString();
|
|
68
65
|
record.scheduled_start_time = date;
|
|
69
66
|
record.source_type = SourceHash.recurringQuery;
|
|
70
|
-
record.source_id =
|
|
67
|
+
record.source_id = query.id;
|
|
71
68
|
return record.save();
|
|
72
69
|
}
|
|
73
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.recurring.query.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.recurring.query.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA4D;AAC5D,qCAAuD;AACvD,kEAA8D;AAC9D,gFAA4E;AAC5E,yEAAoE;AACpE,uEAAkE;AAClE,+EAA0E;AAC1E,iFAA4E;AAC5E,uDAAwD;AAGjD,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,sBAAS;IAGpD,YACuB,YAA0B,EAC5B,qBAA4C;QAE7D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAJvD,YAAO,GAAW,MAAM,CAAC;IAOnC,CAAC;
|
|
1
|
+
{"version":3,"file":"set.recurring.query.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.recurring.query.event.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAsC;AACtC,qCAAyD;AACzD,kEAA8D;AAC9D,gEAA4D;AAC5D,gFAA4E;AAC5E,uEAAkE;AAClE,+EAA0E;AAC1E,iFAA4E;AAC5E,uDAAwD;AAGjD,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAS;IAG/C,YACuB,YAA0B,EAC5B,qBAA4C;QAE7D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAJvD,YAAO,GAAW,MAAM,CAAC;IAOnC,CAAC;IAMD,KAAK,CAAC,MAAM;QACR,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACtC,CAAC;IAQO,KAAK,CAAC,mBAAmB;QAC7B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAE9D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC;IACL,CAAC;IAQO,KAAK,CAAC,SAAS,CAAC,GAAyB;QAC7C,MAAM,MAAM,GAAG,EAAE,WAAW,EAAE,UAAU,CAAC,cAAc,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"set.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { EventQueueEntity } from '../entities/event.queue.entity';
|
|
2
|
+
import { QueueService } from '../../platformUtility/services/queue.service';
|
|
2
3
|
export declare class EventQueueService {
|
|
4
|
+
private readonly queueService;
|
|
5
|
+
constructor(queueService: QueueService);
|
|
3
6
|
getActiveEvents(): Promise<EventQueueEntity[]>;
|
|
4
7
|
setEvent(identifier: string, param: any, time: Date, options?: any): Promise<any>;
|
|
8
|
+
trigger(event: EventQueueEntity): Promise<EventQueueEntity>;
|
|
9
|
+
private getPayload;
|
|
10
|
+
private typeCastParameter;
|
|
5
11
|
}
|
|
@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
8
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
12
|
exports.EventQueueService = void 0;
|
|
10
13
|
const common_1 = require("@nestjs/common");
|
|
@@ -13,7 +16,11 @@ const date_util_1 = require("../../common/libraries/date.util");
|
|
|
13
16
|
const event_detail_entity_1 = require("../entities/event.detail.entity");
|
|
14
17
|
const event_queue_entity_1 = require("../entities/event.queue.entity");
|
|
15
18
|
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
19
|
+
const queue_service_1 = require("../../platformUtility/services/queue.service");
|
|
16
20
|
let EventQueueService = class EventQueueService {
|
|
21
|
+
constructor(queueService) {
|
|
22
|
+
this.queueService = queueService;
|
|
23
|
+
}
|
|
17
24
|
async getActiveEvents() {
|
|
18
25
|
const date = date_util_1.DateUtil.getDateTime();
|
|
19
26
|
return event_queue_entity_1.EventQueueEntity.find({
|
|
@@ -39,9 +46,45 @@ let EventQueueService = class EventQueueService {
|
|
|
39
46
|
record.scheduled_start_time = time;
|
|
40
47
|
return record.save();
|
|
41
48
|
}
|
|
49
|
+
async trigger(event) {
|
|
50
|
+
event.start_time = date_util_1.DateUtil.getDateTime();
|
|
51
|
+
try {
|
|
52
|
+
const payload = this.getPayload(event);
|
|
53
|
+
const job = await this.queueService.addJob(event.event.identifier, payload);
|
|
54
|
+
event.attributes = { ...event.attributes, job_id: job.id };
|
|
55
|
+
global.console.log('triggered event : ', event.event.identifier, payload, job.id);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
event.attributes = { ...event.attributes, no_trigger: true };
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
event.end_time = date_util_1.DateUtil.getDateTime();
|
|
62
|
+
return event.save();
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
getPayload(event) {
|
|
66
|
+
const { payload, parameter } = event;
|
|
67
|
+
if (Object.keys(payload || {}).length)
|
|
68
|
+
return payload;
|
|
69
|
+
return this.typeCastParameter(parameter);
|
|
70
|
+
}
|
|
71
|
+
typeCastParameter(value) {
|
|
72
|
+
if (!value.length)
|
|
73
|
+
return null;
|
|
74
|
+
if (!isNaN(+value))
|
|
75
|
+
return +value;
|
|
76
|
+
const str = value.toLowerCase();
|
|
77
|
+
if (['true', 'false'].includes(str)) {
|
|
78
|
+
if (str === 'true')
|
|
79
|
+
return true;
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
return value;
|
|
83
|
+
}
|
|
42
84
|
};
|
|
43
85
|
exports.EventQueueService = EventQueueService;
|
|
44
86
|
exports.EventQueueService = EventQueueService = __decorate([
|
|
45
|
-
(0, common_1.Injectable)()
|
|
87
|
+
(0, common_1.Injectable)(),
|
|
88
|
+
__metadata("design:paramtypes", [queue_service_1.QueueService])
|
|
46
89
|
], EventQueueService);
|
|
47
90
|
//# sourceMappingURL=event.queue.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.queue.service.js","sourceRoot":"","sources":["../../../src/system/services/event.queue.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event.queue.service.js","sourceRoot":"","sources":["../../../src/system/services/event.queue.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,9 +40,10 @@ let ScheduledEventService = class ScheduledEventService {
|
|
|
40
40
|
async getSchedules(source, timing, startDate, endDate) {
|
|
41
41
|
const now = new Date();
|
|
42
42
|
const dates = [];
|
|
43
|
+
const maxCount = await this.propertyService.get(`scheduled.job.max.count`, 100);
|
|
43
44
|
const summary = await this.getActiveEventsSummary(source);
|
|
44
45
|
const inQueueCount = summary?.count || 0;
|
|
45
|
-
if (inQueueCount >
|
|
46
|
+
if (inQueueCount > +maxCount)
|
|
46
47
|
return;
|
|
47
48
|
let lastRunTime = await this.getScheduleStartTime(summary);
|
|
48
49
|
lastRunTime = lastRunTime < startDate ? startDate : lastRunTime;
|
|
@@ -52,7 +53,7 @@ let ScheduledEventService = class ScheduledEventService {
|
|
|
52
53
|
currentDate: lastRunTime,
|
|
53
54
|
endDate,
|
|
54
55
|
});
|
|
55
|
-
while (dates.length <=
|
|
56
|
+
while (dates.length <= +maxCount) {
|
|
56
57
|
if (!nextTime.hasNext())
|
|
57
58
|
return;
|
|
58
59
|
const next = nextTime.next().toDate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,sCAAsC;AACtC,uCAAkD;AAClD,qCAAiE;AACjE,gEAA4D;AAE5D,4EAAwE;AACxE,uEAAkE;AAClE,+EAA0E;AAC1E,yDAAqD;
|
|
1
|
+
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DataSource } from 'typeorm';
|
|
1
|
+
import { DataSource, InsertEvent, UpdateEvent } from 'typeorm';
|
|
2
2
|
import { CommonSubscriber } from '../../common/libraries/common.subscriber';
|
|
3
3
|
import { CodeFixScriptEntity } from '../entities/code.fix.script.entity';
|
|
4
4
|
import { CodeFixScriptJob } from '../jobs/code.fix.script.job';
|
|
@@ -7,4 +7,6 @@ export declare class CodeFixScriptSubscriber extends CommonSubscriber<CodeFixScr
|
|
|
7
7
|
protected readonly entityJob: CodeFixScriptJob;
|
|
8
8
|
constructor(dataSource: DataSource, entityJob: CodeFixScriptJob);
|
|
9
9
|
listenTo(): typeof CodeFixScriptEntity;
|
|
10
|
+
beforeInsert(event: InsertEvent<CodeFixScriptEntity>): Promise<void>;
|
|
11
|
+
beforeUpdate(event: UpdateEvent<CodeFixScriptEntity>): Promise<void>;
|
|
10
12
|
}
|
|
@@ -14,6 +14,7 @@ const typeorm_1 = require("typeorm");
|
|
|
14
14
|
const common_subscriber_1 = require("../../common/libraries/common.subscriber");
|
|
15
15
|
const code_fix_script_entity_1 = require("../entities/code.fix.script.entity");
|
|
16
16
|
const code_fix_script_job_1 = require("../jobs/code.fix.script.job");
|
|
17
|
+
const date_fns_1 = require("date-fns");
|
|
17
18
|
let CodeFixScriptSubscriber = class CodeFixScriptSubscriber extends common_subscriber_1.CommonSubscriber {
|
|
18
19
|
constructor(dataSource, entityJob) {
|
|
19
20
|
super();
|
|
@@ -24,6 +25,18 @@ let CodeFixScriptSubscriber = class CodeFixScriptSubscriber extends common_subsc
|
|
|
24
25
|
listenTo() {
|
|
25
26
|
return code_fix_script_entity_1.CodeFixScriptEntity;
|
|
26
27
|
}
|
|
28
|
+
async beforeInsert(event) {
|
|
29
|
+
event.entity.attributes = {
|
|
30
|
+
...event.entity.attributes,
|
|
31
|
+
...{},
|
|
32
|
+
};
|
|
33
|
+
if (!event.entity?.last_scheduled_time)
|
|
34
|
+
event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
|
|
35
|
+
}
|
|
36
|
+
async beforeUpdate(event) {
|
|
37
|
+
if (!event.entity?.last_scheduled_time)
|
|
38
|
+
event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
|
|
39
|
+
}
|
|
27
40
|
};
|
|
28
41
|
exports.CodeFixScriptSubscriber = CodeFixScriptSubscriber;
|
|
29
42
|
exports.CodeFixScriptSubscriber = CodeFixScriptSubscriber = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.fix.script.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/code.fix.script.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"code.fix.script.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/code.fix.script.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgF;AAChF,gFAA4E;AAC5E,+EAAyE;AACzE,qEAA+D;AAC/D,uCAAsC;AAG/B,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,oCAAqC;IAC9E,YACqB,UAAsB,EACpB,SAA2B;QAE9C,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACpB,cAAS,GAAT,SAAS,CAAkB;QAG9C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,QAAQ;QACJ,OAAO,4CAAmB,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuC;QACtD,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG;YACtB,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU;YAC1B,GAAG,EAAE;SACR,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,mBAAmB;YAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuC;QACtD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,mBAAmB;YAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC;CACJ,CAAA;AAxBY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,yBAAe,GAAE;qCAGmB,oBAAU;QACT,sCAAgB;GAHzC,uBAAuB,CAwBnC"}
|
|
@@ -30,11 +30,11 @@ let RecurringQuerySubscriber = class RecurringQuerySubscriber extends common_sub
|
|
|
30
30
|
...event.entity.attributes,
|
|
31
31
|
...{},
|
|
32
32
|
};
|
|
33
|
-
if (event.entity.last_scheduled_time)
|
|
33
|
+
if (!event.entity.last_scheduled_time)
|
|
34
34
|
event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
|
|
35
35
|
}
|
|
36
36
|
async beforeUpdate(event) {
|
|
37
|
-
if (event.entity.last_scheduled_time)
|
|
37
|
+
if (!event.entity.last_scheduled_time)
|
|
38
38
|
event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
|
|
39
39
|
}
|
|
40
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recurring.query.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/recurring.query.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAsC;AACtC,qCAAgF;AAChF,gFAA4E;AAC5E,+EAA0E;AAC1E,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAsC;IAChF,YACqB,UAAsB,EACpB,SAA4B;QAE/C,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACpB,cAAS,GAAT,SAAS,CAAmB;QAG/C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;
|
|
1
|
+
{"version":3,"file":"recurring.query.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/recurring.query.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAsC;AACtC,qCAAgF;AAChF,gFAA4E;AAC5E,+EAA0E;AAC1E,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAsC;IAChF,YACqB,UAAsB,EACpB,SAA4B;QAE/C,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACpB,cAAS,GAAT,SAAS,CAAmB;QAG/C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,QAAQ;QACJ,OAAO,6CAAoB,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAwC;QACvD,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG;YACtB,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU;YAC1B,GAAG,EAAE;SACR,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB;YAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IACzG,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAwC;QACvD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB;YAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IACzG,CAAC;CACJ,CAAA;AAzBY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,yBAAe,GAAE;qCAGmB,oBAAU;QACT,uCAAiB;GAH1C,wBAAwB,CAyBpC"}
|
|
@@ -30,11 +30,11 @@ let ScheduledEventSubscriber = class ScheduledEventSubscriber extends common_sub
|
|
|
30
30
|
...event.entity.attributes,
|
|
31
31
|
...{},
|
|
32
32
|
};
|
|
33
|
-
if (event.entity
|
|
33
|
+
if (!event.entity?.last_scheduled_time)
|
|
34
34
|
event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
|
|
35
35
|
}
|
|
36
36
|
async beforeUpdate(event) {
|
|
37
|
-
if (event.entity
|
|
37
|
+
if (!event.entity?.last_scheduled_time)
|
|
38
38
|
event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
|
|
39
39
|
}
|
|
40
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled.event.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/scheduled.event.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAsC;AACtC,qCAAgF;AAChF,gFAA4E;AAC5E,+EAA0E;AAC1E,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAsC;IAChF,YACqB,UAAsB,EACpB,SAA4B;QAE/C,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACpB,cAAS,GAAT,SAAS,CAAmB;QAG/C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;
|
|
1
|
+
{"version":3,"file":"scheduled.event.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/scheduled.event.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAsC;AACtC,qCAAgF;AAChF,gFAA4E;AAC5E,+EAA0E;AAC1E,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAsC;IAChF,YACqB,UAAsB,EACpB,SAA4B;QAE/C,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACpB,cAAS,GAAT,SAAS,CAAmB;QAG/C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,QAAQ;QACJ,OAAO,6CAAoB,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAwC;QACvD,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG;YACtB,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU;YAC1B,GAAG,EAAE;SACR,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,mBAAmB;YAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAwC;QACvD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,mBAAmB;YAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC;CACJ,CAAA;AAzBY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,yBAAe,GAAE;qCAGmB,oBAAU;QACT,uCAAiB;GAH1C,wBAAwB,CAyBpC"}
|
package/package.json
CHANGED