@servicelabsco/nestjs-utility-services 2.0.15 → 3.0.2

package/dist/system/jobs/refresh.material.view.job.js

@@ -14,10 +14,12 @@ const common_1 = require("@nestjs/common");
 const date_fns_1 = require("date-fns");
 const typeorm_1 = require("typeorm");
 const common_job_1 = require("../../common/libraries/common.job");
+const custom_logger_1 = require("../../common/libraries/custom.logger");
 const queue_service_1 = require("../../platformUtility/services/queue.service");
 const event_detail_entity_1 = require("../entities/event.detail.entity");
 const event_queue_entity_1 = require("../entities/event.queue.entity");
 const material_view_entity_1 = require("../entities/material.view.entity");
+const material_view_freshness_1 = require("../libraries/material.view.freshness");
 const scheduled_event_service_1 = require("../services/scheduled.event.service");
 const SourceHash = require("../../config/source.hash");
 let RefreshMaterialViewJob = class RefreshMaterialViewJob extends common_job_1.CommonJob {
@@ -28,6 +30,7 @@ let RefreshMaterialViewJob = class RefreshMaterialViewJob extends common_job_1.C
         this.timeout = 300000;
     }
     async handle() {
+        await this.alertStaleViews();
         const queries = await this.getEligibleQueries();
         const event = await event_detail_entity_1.EventDetailEntity.findOne({ where: { identifier: SourceHash.materialViewEvent } });
         const startDate = (0, date_fns_1.subMinutes)(new Date(), 1);
@@ -36,12 +39,25 @@ let RefreshMaterialViewJob = class RefreshMaterialViewJob extends common_job_1.C
             await this.handleJob(view, startDate, endDate, event);
         }
     }
+    async alertStaleViews() {
+        const views = await material_view_entity_1.MaterialViewEntity.find({
+            where: { active: true, timing: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) },
+        });
+        for (const view of views) {
+            if (!(0, material_view_freshness_1.isMaterialViewStale)(view))
+                continue;
+            custom_logger_1.CustomLogger.error(`[material-view] stale refresh: table=${view.table_name} last_run_time=${view.last_run_time} timing=${view.timing}`);
+        }
+    }
     async handleJob(view, startDate, endDate, event) {
         const source = { source_type: SourceHash.materialView, source_id: view.id };
         const dates = await this.scheduledEventService.getSchedules(source, view.timing, startDate, endDate);
         if (!dates?.length)
             return view;
+        const now = new Date();
         for (const date of dates) {
+            if (date < now)
+                continue;
             await this.setNewEvent(view, date, event);
         }
         view.last_scheduled_time = dates.pop();
@@ -66,14 +82,15 @@ let RefreshMaterialViewJob = class RefreshMaterialViewJob extends common_job_1.C
         });
     }
     async setNewEvent(view, date, event) {
-        const record = new event_queue_entity_1.EventQueueEntity();
-        record.name = event.name;
-        record.event_id = event.id;
-        record.parameter = view.id.toString();
-        record.scheduled_start_time = date;
-        record.source_type = SourceHash.materialView;
-        record.source_id = view.id;
-        return record.save();
+        return event_queue_entity_1.EventQueueEntity.firstOrCreate({
+            event_id: event.id,
+            source_type: SourceHash.materialView,
+            source_id: view.id,
+            scheduled_start_time: date,
+        }, {
+            name: event.name,
+            parameter: view.id.toString(),
+        });
     }
 };
 exports.RefreshMaterialViewJob = RefreshMaterialViewJob;

package/dist/system/jobs/refresh.material.view.job.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.material.view.job.js","sourceRoot":"","sources":["../../../src/system/jobs/refresh.material.view.job.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"refresh.material.view.job.js","sourceRoot":"","sources":["../../../src/system/jobs/refresh.material.view.job.ts"],"names":[],"mappings":"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"}

package/dist/system/jobs/refresh.property.cache.job.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshPropertyCacheJob = void 0;
 const common_1 = require("@nestjs/common");
 const common_job_1 = require("../../common/libraries/common.job");
-const custom_crypt_1 = require("../../common/libraries/custom.crypt");
 const date_util_1 = require("../../common/libraries/date.util");
 const queue_service_1 = require("../../platformUtility/services/queue.service");
 const cache_service_1 = require("../../platformUtility/services/cache.service");
@@ -30,10 +29,8 @@ let RefreshPropertyCacheJob = class RefreshPropertyCacheJob extends common_job_1
     }
     async setCache(property) {
         const index = `property.${property.name}`;
-        let value = property.value;
-        if (property.is_encrypted)
-            value = custom_crypt_1.CustomCrypt.decrypt(value);
-        await this.cacheService.set(index, value, date_util_1.DateUtil.getFutureDateTime(15));
+        const envelope = { value: property.value, is_encrypted: !!property.is_encrypted };
+        await this.cacheService.set(index, envelope, date_util_1.DateUtil.getFutureDateTime(15));
     }
 };
 exports.RefreshPropertyCacheJob = RefreshPropertyCacheJob;

package/dist/system/jobs/refresh.property.cache.job.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.property.cache.job.js","sourceRoot":"","sources":["../../../src/system/jobs/refresh.property.cache.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,sEAAkE;AAClE,gEAA4D;AAC5D,gFAA4E;AAC5E,gFAA4E;AAC5E,iEAA6D;AAEtD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,sBAAS;IAClD,YACuB,YAA0B,EAC5B,YAA0B;QAE3C,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,iBAAY,GAAZ,YAAY,CAAc;IAG/C,CAAC;IACD,KAAK,CAAC,MAAM;QACR,MAAM,OAAO,GAAG,MAAM,gCAAc,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAEnF,KAAK,MAAM,MAAM,IAAI,OAAO;YAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAwB;QAC3C,MAAM,KAAK,GAAG,YAAY,QAAQ,CAAC,IAAI,EAAE,CAAC;QAE1C,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC3B,IAAI,QAAQ,CAAC,YAAY;YAAE,KAAK,GAAG,0BAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE9D,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;CACJ,CAAA;AArBY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAG4B,4BAAY;QACd,4BAAY;GAHtC,uBAAuB,CAqBnC"}
+{"version":3,"file":"refresh.property.cache.job.js","sourceRoot":"","sources":["../../../src/system/jobs/refresh.property.cache.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gEAA4D;AAC5D,gFAA4E;AAC5E,gFAA4E;AAC5E,iEAA6D;AAgBtD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,sBAAS;IAClD,YACuB,YAA0B,EAC5B,YAA0B;QAE3C,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,iBAAY,GAAZ,YAAY,CAAc;IAG/C,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,OAAO,GAAG,MAAM,gCAAc,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAEnF,KAAK,MAAM,MAAM,IAAI,OAAO;YAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAwB;QAC3C,MAAM,KAAK,GAAG,YAAY,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;QAClF,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC;CACJ,CAAA;AAnBY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAG4B,4BAAY;QACd,4BAAY;GAHtC,uBAAuB,CAmBnC"}

package/dist/system/jobs/relationship.mapper.job.d.ts

@@ -1,11 +1,13 @@
+import { DatabaseEventDto } from '../../common/dtos/database.event.dto';
 import { CommonJob } from '../../common/libraries/common.job';
 import { QueueService } from '../../platformUtility/services/queue.service';
+import { ModelRelationshipEntity } from '../entities/model.relationship.entity';
 import { RelationshipEntity } from '../entities/relationship.entity';
 export declare class RelationshipMapperJob extends CommonJob {
     protected readonly queueService: QueueService;
     private mapping;
     constructor(queueService: QueueService);
-    handle(data: RelationshipEntity): Promise<any>;
-    addMapping(data: RelationshipEntity): Promise<any>;
-    removeMapping(data: RelationshipEntity): Promise<any>;
+    handle(evt: DatabaseEventDto<RelationshipEntity>): Promise<ModelRelationshipEntity | ModelRelationshipEntity[]>;
+    addMapping(data: RelationshipEntity): Promise<ModelRelationshipEntity>;
+    removeMapping(data: RelationshipEntity): Promise<ModelRelationshipEntity[]>;
 }

package/dist/system/jobs/relationship.mapper.job.js

@@ -12,25 +12,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationshipMapperJob = void 0;
 const common_1 = require("@nestjs/common");
 const common_job_1 = require("../../common/libraries/common.job");
+const subscriber_registry_1 = require("../../common/libraries/subscriber.registry");
 const queue_service_1 = require("../../platformUtility/services/queue.service");
 const report_relationship_entity_1 = require("../entities/report.relationship.entity");
 const model_relationship_entity_1 = require("../entities/model.relationship.entity");
+const relationship_entity_1 = require("../entities/relationship.entity");
+const SourceHash = require("../../config/source.hash");
 let RelationshipMapperJob = class RelationshipMapperJob extends common_job_1.CommonJob {
     constructor(queueService) {
         super('64724c02cc076f23566976dc765eb6b6');
         this.queueService = queueService;
         this.mapping = {
-            ab60ad4e1a51c7d593e957b7857662c1: {
+            [SourceHash.report]: {
                 column: 'report_id',
                 entity: report_relationship_entity_1.ReportRelationshipEntity,
             },
-            a8855b02f7117b89181e846818251b37: {
+            [SourceHash.model]: {
                 column: 'model_id',
                 entity: model_relationship_entity_1.ModelRelationshipEntity,
             },
         };
     }
-    async handle(data) {
+    async handle(evt) {
+        const data = evt.entity;
         if (data.deleted_at)
             return this.removeMapping(data);
         return this.addMapping(data);
@@ -55,6 +59,7 @@ let RelationshipMapperJob = class RelationshipMapperJob extends common_job_1.Com
 exports.RelationshipMapperJob = RelationshipMapperJob;
 exports.RelationshipMapperJob = RelationshipMapperJob = __decorate([
     (0, common_1.Injectable)(),
+    (0, subscriber_registry_1.SubscribeFor)(relationship_entity_1.RelationshipEntity),
     __metadata("design:paramtypes", [queue_service_1.QueueService])
 ], RelationshipMapperJob);
 //# sourceMappingURL=relationship.mapper.job.js.map

package/dist/system/jobs/relationship.mapper.job.js.map

@@ -1 +1 @@
-{"version":3,"file":"relationship.mapper.job.js","sourceRoot":"","sources":["../../../src/system/jobs/relationship.mapper.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gFAA4E;AAE5E,uFAAkF;AAClF,qFAAgF;AAGzE,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,sBAAS;IAYhD,YAA+B,YAA0B;QACrD,KAAK,CAAC,kCAAkC,CAAC,CAAC;QADf,iBAAY,GAAZ,YAAY,CAAc;QAXjD,YAAO,GAAG;YACd,gCAAgC,EAAE;gBAC9B,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,qDAAwB;aACnC;YACD,gCAAgC,EAAE;gBAC9B,MAAM,EAAE,UAAU;gBAClB,MAAM,EAAE,mDAAuB;aAClC;SACJ,CAAC;IAIF,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAwB;QACjC,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IASD,KAAK,CAAC,UAAU,CAAC,IAAwB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,MAAM,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QAExC,OAAO,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAQD,KAAK,CAAC,aAAa,CAAC,IAAwB;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,MAAM,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QAExC,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAA;AArDY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAaoC,4BAAY;GAZhD,qBAAqB,CAqDjC"}
+{"version":3,"file":"relationship.mapper.job.js","sourceRoot":"","sources":["../../../src/system/jobs/relationship.mapper.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,kEAA8D;AAC9D,oFAA0E;AAC1E,gFAA4E;AAE5E,uFAAkF;AAClF,qFAAgF;AAChF,yEAAqE;AACrE,uDAAwD;AAIjD,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,sBAAS;IAYhD,YAA+B,YAA0B;QACrD,KAAK,CAAC,kCAAkC,CAAC,CAAC;QADf,iBAAY,GAAZ,YAAY,CAAc;QAXjD,YAAO,GAAG;YACd,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACjB,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,qDAAwB;aACnC;YACD,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;gBAChB,MAAM,EAAE,UAAU;gBAClB,MAAM,EAAE,mDAAuB;aAClC;SACJ,CAAC;IAIF,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,GAAyC;QAClD,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC;QACxB,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IASD,KAAK,CAAC,UAAU,CAAC,IAAwB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,MAAM,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QAExC,OAAO,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAQD,KAAK,CAAC,aAAa,CAAC,IAAwB;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,MAAM,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QAExC,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAA;AAtDY,sDAAqB;gCAArB,qBAAqB;IAFjC,IAAA,mBAAU,GAAE;IACZ,IAAA,kCAAY,EAAC,wCAAkB,CAAC;qCAagB,4BAAY;GAZhD,qBAAqB,CAsDjC"}

package/dist/system/jobs/report.column.sync.job.js

@@ -66,23 +66,26 @@ let ReportColumnSyncJob = class ReportColumnSyncJob extends common_job_1.CommonJ
     async getQueryResults(report) {
         let query = report.query.script;
         const params = await report_param_entity_1.ReportParamEntity.find({ where: { report_id: report.id } });
-        for (const param of params) {
+        const bindValues = [];
+        for (let i = 0; i < params.length; i++) {
+            const param = params[i];
             if (param.default_value === null)
-                return {};
-            const key = `:${param.name}`;
-            query = query.replace(new RegExp(key, 'ig'), param.default_value);
+                return null;
+            bindValues.push(param.default_value);
+            const placeholderRegex = new RegExp(`:${this.sqlService.escapeRegex(param.name)}\\b`, 'ig');
+            query = query.replace(placeholderRegex, `$${i + 1}`);
         }
         query += ` LIMIT 1`;
         try {
-            return await this.sqlService.read(query);
+            return await this.sqlService.boundRead(query, bindValues);
         }
         catch (error) {
-            global.console.log(`error`, error);
-            return {};
+            global.console.error(`report.column.sync.job: query failed for report=${report.id}:`, error instanceof Error ? error.message : String(error));
+            return null;
         }
     }
     getDisplayName(str) {
-        const lastChar = str.substr(0, -3);
+        const lastChar = str.slice(-3);
         if (lastChar === '_id')
             str = str.slice(0, -3);
         str = str.replace(/_/g, ' ');

package/dist/system/jobs/report.column.sync.job.js.map

@@ -1 +1 @@
-{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":"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"}

package/dist/system/jobs/report.sheet.job.js

@@ -11,7 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportSheetJob = void 0;
 const common_1 = require("@nestjs/common");
+const report_sheet_entity_1 = require("../entities/report.sheet.entity");
 const common_job_1 = require("../../common/libraries/common.job");
+const subscriber_registry_1 = require("../../common/libraries/subscriber.registry");
 const queue_service_1 = require("../../platformUtility/services/queue.service");
 let ReportSheetJob = class ReportSheetJob extends common_job_1.CommonJob {
     constructor(queueService) {
@@ -25,6 +27,7 @@ let ReportSheetJob = class ReportSheetJob extends common_job_1.CommonJob {
 exports.ReportSheetJob = ReportSheetJob;
 exports.ReportSheetJob = ReportSheetJob = __decorate([
     (0, common_1.Injectable)(),
+    (0, subscriber_registry_1.SubscribeFor)(report_sheet_entity_1.ReportSheetEntity),
     __metadata("design:paramtypes", [queue_service_1.QueueService])
 ], ReportSheetJob);
 //# sourceMappingURL=report.sheet.job.js.map

package/dist/system/jobs/report.sheet.job.js.map

@@ -1 +1 @@
-{"version":3,"file":"report.sheet.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.sheet.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,kEAA8D;AAC9D,gFAA4E;AAErE,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,sBAAS;IACzC,YAA+B,YAA0B;QACrD,KAAK,CAAC,kCAAkC,CAAC,CAAC;QADf,iBAAY,GAAZ,YAAY,CAAc;IAEzD,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,GAAwC;QACjD,OAAO,GAAG,CAAC,MAAM,CAAC;IACtB,CAAC;CACJ,CAAA;AAPY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAEoC,4BAAY;GADhD,cAAc,CAO1B"}
+{"version":3,"file":"report.sheet.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.sheet.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAAoE;AAEpE,kEAA8D;AAC9D,oFAA0E;AAC1E,gFAA4E;AAIrE,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,sBAAS;IACzC,YAA+B,YAA0B;QACrD,KAAK,CAAC,kCAAkC,CAAC,CAAC;QADf,iBAAY,GAAZ,YAAY,CAAc;IAEzD,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,GAAwC;QACjD,OAAO,GAAG,CAAC,MAAM,CAAC;IACtB,CAAC;CACJ,CAAA;AAPY,wCAAc;yBAAd,cAAc;IAF1B,IAAA,mBAAU,GAAE;IACZ,IAAA,kCAAY,EAAC,uCAAiB,CAAC;qCAEiB,4BAAY;GADhD,cAAc,CAO1B"}

package/dist/system/jobs/scheduled.event.job.d.ts

@@ -1,3 +1,4 @@
+import { InsertEvent, UpdateEvent } from 'typeorm';
 import { DatabaseEventDto } from '../../common/dtos/database.event.dto';
 import { CommonJob } from '../../common/libraries/common.job';
 import { QueueService } from '../../platformUtility/services/queue.service';
@@ -9,6 +10,9 @@ export declare class ScheduledEventJob extends CommonJob {
     private readonly scheduledEventService;
     private readonly setScheduledEventJob;
     constructor(queueService: QueueService, scheduledEventService: ScheduledEventService, setScheduledEventJob: SetScheduledEventJob);
+    beforeInsert(event: InsertEvent<ScheduledEventEntity>): Promise<void>;
+    beforeUpdate(event: UpdateEvent<ScheduledEventEntity>): Promise<void>;
+    private validateTiming;
     handle(event: DatabaseEventDto<ScheduledEventEntity>): Promise<void>;
     private setSchedule;
     private cleanRecord;

package/dist/system/jobs/scheduled.event.job.js

@@ -11,8 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScheduledEventJob = void 0;
 const common_1 = require("@nestjs/common");
+const typeorm_1 = require("typeorm");
+const form_exception_1 = require("../../common/exceptions/form.exception");
 const common_job_1 = require("../../common/libraries/common.job");
+const platform_utility_1 = require("../../common/libraries/platform.utility");
+const subscriber_registry_1 = require("../../common/libraries/subscriber.registry");
 const queue_service_1 = require("../../platformUtility/services/queue.service");
+const event_queue_entity_1 = require("../entities/event.queue.entity");
 const scheduled_event_entity_1 = require("../entities/scheduled.event.entity");
 const scheduled_event_service_1 = require("../services/scheduled.event.service");
 const set_scheduled_event_job_1 = require("./set.scheduled.event.job");
@@ -25,6 +30,25 @@ let ScheduledEventJob = class ScheduledEventJob extends common_job_1.CommonJob {
         this.scheduledEventService = scheduledEventService;
         this.setScheduledEventJob = setScheduledEventJob;
     }
+    async beforeInsert(event) {
+        event.entity.attributes = {
+            ...event.entity.attributes,
+            ...{},
+        };
+        this.validateTiming(event.entity?.timing);
+        if (!event.entity?.last_scheduled_time)
+            event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
+    }
+    async beforeUpdate(event) {
+        this.validateTiming(event.entity?.timing);
+        if (!event.entity?.last_scheduled_time)
+            event.entity.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 15);
+    }
+    validateTiming(timing) {
+        if (timing && !platform_utility_1.PlatformUtility.isValidCronExpression(timing)) {
+            throw new form_exception_1.FormException({ column: 'timing', err: `Invalid cron expression: ${timing}` });
+        }
+    }
     async handle(event) {
         await this.setSchedule(event);
     }
@@ -36,15 +60,23 @@ let ScheduledEventJob = class ScheduledEventJob extends common_job_1.CommonJob {
         return this.setScheduledEventJob.dispatch(event.entity.id);
     }
     async cleanRecord(event) {
-        await this.scheduledEventService.deleteActiveEvents({ source_type: SourceHash.scheduledEvent, source_id: event.entity.id });
-        const r = await scheduled_event_entity_1.ScheduledEventEntity.first(event.entity.id);
-        r.last_scheduled_time = (0, date_fns_1.subMinutes)(new Date(), 1);
-        return r.save();
+        const connection = scheduled_event_entity_1.ScheduledEventEntity.getRepository().manager.connection;
+        await connection.transaction(async (manager) => {
+            await manager.softDelete(event_queue_entity_1.EventQueueEntity, {
+                source_type: SourceHash.scheduledEvent,
+                source_id: event.entity.id,
+                start_time: (0, typeorm_1.IsNull)(),
+            });
+            await manager.update(scheduled_event_entity_1.ScheduledEventEntity, event.entity.id, {
+                last_scheduled_time: (0, date_fns_1.subMinutes)(new Date(), 1),
+            });
+        });
     }
 };
 exports.ScheduledEventJob = ScheduledEventJob;
 exports.ScheduledEventJob = ScheduledEventJob = __decorate([
     (0, common_1.Injectable)(),
+    (0, subscriber_registry_1.SubscribeFor)(scheduled_event_entity_1.ScheduledEventEntity),
     __metadata("design:paramtypes", [queue_service_1.QueueService,
         scheduled_event_service_1.ScheduledEventService,
         set_scheduled_event_job_1.SetScheduledEventJob])

package/dist/system/jobs/scheduled.event.job.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,kEAA8D;AAC9D,gFAA4E;AAC5E,+EAA0E;AAC1E,iFAA4E;AAC5E,uEAAiE;AACjE,uDAAwD;AACxD,uCAAsC;AAG/B,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,sBAAS;IAC5C,YACuB,YAA0B,EAC5B,qBAA4C,EAC5C,oBAA0C;QAE3D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAJvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,yBAAoB,GAApB,oBAAoB,CAAsB;IAG/D,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,KAA6C;QACtD,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,KAA6C;QACnE,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAC3G,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC;YAAE,OAAO;QAE1D,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,KAA6C;QACnE,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,cAAc,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAE5H,MAAM,CAAC,GAAG,MAAM,6CAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5D,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,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAG4B,4BAAY;QACL,+CAAqB;QACtB,8CAAoB;GAJtD,iBAAiB,CA4B7B"}
+{"version":3,"file":"scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/scheduled.event.job.ts"],"names":[],"mappings":"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"}

package/dist/system/jobs/set.codefix.script.event.job.js

@@ -58,15 +58,16 @@ let SetCodefixScriptEventJob = class SetCodefixScriptEventJob extends common_job
         });
     }
     async setNewEvent(script, date, event) {
-        const record = new event_queue_entity_1.EventQueueEntity();
-        record.name = event.name;
-        record.event_id = event.id;
-        record.parameter = '1';
-        record.payload = { identifier: script.identifier, context: {} };
-        record.scheduled_start_time = date;
-        record.source_type = SourceHash.codeFixScript;
-        record.source_id = script.id;
-        return record.save();
+        return event_queue_entity_1.EventQueueEntity.firstOrCreate({
+            event_id: event.id,
+            source_type: SourceHash.codeFixScript,
+            source_id: script.id,
+            scheduled_start_time: date,
+        }, {
+            name: event.name,
+            parameter: '1',
+            payload: { identifier: script.identifier, context: {} },
+        });
     }
 };
 exports.SetCodefixScriptEventJob = SetCodefixScriptEventJob;

package/dist/system/jobs/set.codefix.script.event.job.js.map

@@ -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;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"}
+{"version":3,"file":"set.codefix.script.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.codefix.script.event.job.ts"],"names":[],"mappings":"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"}

package/dist/system/jobs/set.event.queue.job.d.ts

@@ -11,6 +11,7 @@ export declare class SetEventQueueJob extends CommonJob {
     disableDraining: boolean;
     constructor(eventQueueService: EventQueueService, queueService: QueueService, configService: ConfigService, sqlService: SqlService);
     handle(): Promise<any>;
+    private static readonly MAX_POLL_ITERATIONS;
     private pollQueue;
     private removeCompletedEvents;
     private shouldPoll;

package/dist/system/jobs/set.event.queue.job.js

@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var SetEventQueueJob_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetEventQueueJob = void 0;
 const common_1 = require("@nestjs/common");
@@ -18,7 +19,7 @@ const date_util_1 = require("../../common/libraries/date.util");
 const queue_service_1 = require("../../platformUtility/services/queue.service");
 const sql_service_1 = require("../../platformUtility/services/sql.service");
 const event_queue_service_1 = require("../services/event.queue.service");
-let SetEventQueueJob = class SetEventQueueJob extends common_job_1.CommonJob {
+let SetEventQueueJob = SetEventQueueJob_1 = class SetEventQueueJob extends common_job_1.CommonJob {
     constructor(eventQueueService, queueService, configService, sqlService) {
         super('eedbbd37e8ca956ab13f24b5028aaa83');
         this.eventQueueService = eventQueueService;
@@ -35,19 +36,30 @@ let SetEventQueueJob = class SetEventQueueJob extends common_job_1.CommonJob {
         return this.removeCompletedEvents();
     }
     async pollQueue() {
-        while (true) {
+        let previousBatchKey = '';
+        for (let i = 0; i < SetEventQueueJob_1.MAX_POLL_ITERATIONS; i++) {
             const events = await this.eventQueueService.getActiveEvents();
             if (!events.length)
                 return;
+            const batchKey = events
+                .map((e) => e.id)
+                .sort()
+                .join(',');
+            if (batchKey === previousBatchKey) {
+                global.console.warn(`set.event.queue.job: same batch returned twice — likely poison; aborting (event_ids=${batchKey})`);
+                return;
+            }
+            previousBatchKey = batchKey;
             for (const event of events) {
                 await this.eventQueueService.trigger(event);
             }
         }
+        global.console.warn(`set.event.queue.job: hit MAX_POLL_ITERATIONS (${SetEventQueueJob_1.MAX_POLL_ITERATIONS}); aborting to avoid spin`);
     }
     async removeCompletedEvents() {
-        const d = (0, date_fns_1.subDays)(new Date(), 7);
-        const sql = `delete from sys_event_queues where start_time is not null and start_time < '${date_util_1.DateUtil.getDateTimeInFormat(d)}'`;
-        return this.sqlService.sql(sql);
+        const cutoff = date_util_1.DateUtil.getDateTimeInFormat((0, date_fns_1.subDays)(new Date(), 7));
+        const sql = `delete from sys_event_queues where start_time is not null and start_time < $1`;
+        return this.sqlService.boundSql(sql, [cutoff]);
     }
     async shouldPoll() {
         const pollQueue = this.configService.get('EVENT_QUEUE_POLL');
@@ -60,7 +72,8 @@ let SetEventQueueJob = class SetEventQueueJob extends common_job_1.CommonJob {
     }
 };
 exports.SetEventQueueJob = SetEventQueueJob;
-exports.SetEventQueueJob = SetEventQueueJob = __decorate([
+SetEventQueueJob.MAX_POLL_ITERATIONS = 100;
+exports.SetEventQueueJob = SetEventQueueJob = SetEventQueueJob_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [event_queue_service_1.EventQueueService,
         queue_service_1.QueueService,

package/dist/system/jobs/set.event.queue.job.js.map

@@ -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;AACxE,yEAAoE;AAG7D,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,sBAAS;IAE3C,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;QAL7C,oBAAe,GAAY,IAAI,CAAC;IAQhC,CAAC;IAMD,KAAK,CAAC,MAAM;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1C,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;IASO,KAAK,CAAC,UAAU;QACpB,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAU,kBAAkB,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAE7B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;QAChG,IAAI,CAAC,YAAY,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAEtC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AApEY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAI+B,uCAAiB;QACpB,4BAAY;QACX,sBAAa;QAChB,wBAAU;GANpC,gBAAgB,CAoE5B"}
+{"version":3,"file":"set.event.queue.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.event.queue.job.ts"],"names":[],"mappings":"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"}

package/dist/system/jobs/set.recurring.query.event.job.js

@@ -58,14 +58,15 @@ let SetRecurringQueryEventJob = class SetRecurringQueryEventJob extends common_j
         });
     }
     async setNewEvent(query, date, event) {
-        const record = new event_queue_entity_1.EventQueueEntity();
-        record.name = event.name;
-        record.event_id = event.id;
-        record.parameter = query.id.toString();
-        record.scheduled_start_time = date;
-        record.source_type = SourceHash.recurringQuery;
-        record.source_id = query.id;
-        return record.save();
+        return event_queue_entity_1.EventQueueEntity.firstOrCreate({
+            event_id: event.id,
+            source_type: SourceHash.recurringQuery,
+            source_id: query.id,
+            scheduled_start_time: date,
+        }, {
+            name: event.name,
+            parameter: query.id.toString(),
+        });
     }
 };
 exports.SetRecurringQueryEventJob = SetRecurringQueryEventJob;

package/dist/system/jobs/set.recurring.query.event.job.js.map

@@ -1 +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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"}
+{"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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"}

package/dist/system/jobs/set.scheduled.event.job.js

@@ -62,16 +62,16 @@ let SetScheduledEventJob = class SetScheduledEventJob extends common_job_1.Commo
         const now = new Date();
         if (now > date)
             return;
-        const record = new event_queue_entity_1.EventQueueEntity();
-        record.name = job.event.name;
-        record.event_id = job.event_id;
-        record.parameter = job.parameter;
-        record.payload = job.payload || {};
-        record.scheduled_start_time = date;
-        record.source_type = SourceHash.scheduledEvent;
-        record.source_id = job.id;
-        await record.save();
-        return record;
+        return event_queue_entity_1.EventQueueEntity.firstOrCreate({
+            event_id: job.event_id,
+            source_type: SourceHash.scheduledEvent,
+            source_id: job.id,
+            scheduled_start_time: date,
+        }, {
+            name: job.event.name,
+            parameter: job.parameter,
+            payload: job.payload || {},
+        });
     }
 };
 exports.SetScheduledEventJob = SetScheduledEventJob;

package/dist/system/jobs/set.scheduled.event.job.js.map

@@ -1 +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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"}
+{"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;QAE7E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE9G,IAAI,CAAC,KAAK,EAAE,MAAM;YAAE,OAAO,GAAG,CAAC;QAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QAED,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACtC,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAWO,KAAK,CAAC,0BAA0B;QACpC,MAAM,CAAC,GAAG,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAErC,OAAO,6CAAoB,CAAC,IAAI,CAAC;YAC7B,SAAS,EAAE,CAAC,OAAO,CAAC;YACpB,KAAK,EAAE;gBACH,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAA,aAAG,EAAC,IAAA,kBAAQ,EAAC,oBAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/C,mBAAmB,EAAE,IAAA,yBAAe,EAAC,CAAC,CAAC;aAC1C;SACJ,CAAC,CAAC;IACP,CAAC;IASO,KAAK,CAAC,WAAW,CAAC,GAAyB,EAAE,IAAU;QAC3D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,GAAG,IAAI;YAAE,OAAO;QAEvB,OAAO,qCAAgB,CAAC,aAAa,CACjC;YACI,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,WAAW,EAAE,UAAU,CAAC,cAAc;YACtC,SAAS,EAAE,GAAG,CAAC,EAAE;YACjB,oBAAoB,EAAE,IAAI;SAC7B,EACD;YACI,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI;YACpB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;SAC7B,CACJ,CAAC;IACN,CAAC;CACJ,CAAA;AApGY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAK4B,4BAAY;QACL,+CAAqB;GALxD,oBAAoB,CAoGhC"}

package/dist/system/jobs/sms.message.job.js

@@ -12,7 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SmsMessageJob = void 0;
 const common_1 = require("@nestjs/common");
 const common_job_1 = require("../../common/libraries/common.job");
+const subscriber_registry_1 = require("../../common/libraries/subscriber.registry");
 const queue_service_1 = require("../../platformUtility/services/queue.service");
+const sms_message_entity_1 = require("../entities/sms.message.entity");
 let SmsMessageJob = class SmsMessageJob extends common_job_1.CommonJob {
     constructor(queueService) {
         super('568a28e3b79c7a722c9ec0d0b55515c6');
@@ -23,6 +25,7 @@ let SmsMessageJob = class SmsMessageJob extends common_job_1.CommonJob {
 exports.SmsMessageJob = SmsMessageJob;
 exports.SmsMessageJob = SmsMessageJob = __decorate([
     (0, common_1.Injectable)(),
+    (0, subscriber_registry_1.SubscribeFor)(sms_message_entity_1.SmsMessageEntity),
     __metadata("design:paramtypes", [queue_service_1.QueueService])
 ], SmsMessageJob);
 //# sourceMappingURL=sms.message.job.js.map