@servicelabsco/nestjs-utility-services 2.0.15 → 3.0.2

package/dist/system/services/event.queue.service.js

@@ -1,40 +1,104 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     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;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var EventQueueService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventQueueService = void 0;
 const common_1 = require("@nestjs/common");
+const Sentry = __importStar(require("@sentry/node"));
 const typeorm_1 = require("typeorm");
 const operation_exception_1 = require("../../common/exceptions/operation.exception");
 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_detail_entity_1 = require("../entities/event.detail.entity");
 const event_queue_entity_1 = require("../entities/event.queue.entity");
-let EventQueueService = class EventQueueService {
-    constructor(queueService) {
+let EventQueueService = EventQueueService_1 = class EventQueueService {
+    constructor(queueService, sqlService) {
         this.queueService = queueService;
+        this.sqlService = sqlService;
     }
     async getActiveEvents() {
         const date = date_util_1.DateUtil.getDateTime();
+        const ids = await this.claimDueEvents(date, EventQueueService_1.CLAIM_BATCH_SIZE);
+        if (!ids.length)
+            return [];
         return event_queue_entity_1.EventQueueEntity.find({
-            where: {
-                scheduled_start_time: (0, typeorm_1.LessThan)(date),
-                start_time: (0, typeorm_1.IsNull)(),
-            },
+            where: { id: (0, typeorm_1.In)(ids) },
             relations: ['event'],
             order: {
                 scheduled_start_time: 'ASC',
             },
-            take: 20,
         });
     }
+    async claimDueEvents(date, limit) {
+        const sql = `update sys_event_queues set start_time = $1
+                        where id in (
+                            select id from sys_event_queues
+                            where start_time is null and deleted_at is null and scheduled_start_time < $1
+                            order by scheduled_start_time asc
+                            limit $2
+                            for update skip locked
+                        )
+                     returning id`;
+        const result = await this.sqlService.boundSql(sql, [date, limit]);
+        return this.extractRows(result).map((row) => +row.id);
+    }
+    async claimEvent(event) {
+        const date = date_util_1.DateUtil.getDateTime();
+        const sql = `update sys_event_queues set start_time = $1 where id = $2 and start_time is null returning id, start_time`;
+        const rows = this.extractRows(await this.sqlService.boundSql(sql, [date, event.id]));
+        if (!rows.length)
+            return false;
+        event.start_time = rows[0].start_time ?? date;
+        return true;
+    }
+    extractRows(result) {
+        if (!Array.isArray(result))
+            return [];
+        const [first] = result;
+        return Array.isArray(first) ? first : result;
+    }
     async setEvent(identifier, param, time, options) {
         const job = await event_detail_entity_1.EventDetailEntity.findOne({ where: { identifier } });
         if (!job)
@@ -47,15 +111,15 @@ let EventQueueService = class EventQueueService {
         return record.save();
     }
     async trigger(event) {
-        event.start_time = date_util_1.DateUtil.getDateTime();
+        if (!event.start_time && !(await this.claimEvent(event)))
+            return event;
         try {
             const payload = this.getPayload(event);
             const job = await this.queueService.addJob(event.event.identifier, payload, { priority: 0 });
             event.attributes = { ...event.attributes, job_id: job.id };
-            global.console.log('triggered event : ', event.event.identifier, payload, job.id);
         }
-        catch {
-            event.attributes = { ...event.attributes, no_trigger: true };
+        catch (error) {
+            this.recordTriggerFailure(event, error);
         }
         finally {
             event.end_time = date_util_1.DateUtil.getDateTime();
@@ -64,21 +128,38 @@ let EventQueueService = class EventQueueService {
     }
     async triggerById(id) {
         const event = await event_queue_entity_1.EventQueueEntity.findOne({ where: { id }, relations: ['event'] });
-        event.start_time = date_util_1.DateUtil.getDateTime();
+        if (!event)
+            throw new operation_exception_1.OperationException(`Event queue ${id} does not exist in the system`);
+        if (!event.start_time && !(await this.claimEvent(event)))
+            return event;
         try {
             const payload = this.getPayload(event);
             const job = await this.queueService.addJob(event.event.identifier, payload, { priority: 0 });
             event.attributes = { ...event.attributes, job_id: job.id };
-            global.console.log('triggered event : ', event.event.identifier, payload, job.id);
         }
-        catch {
-            event.attributes = { ...event.attributes, no_trigger: true };
+        catch (error) {
+            this.recordTriggerFailure(event, error);
         }
         finally {
             event.end_time = date_util_1.DateUtil.getDateTime();
             return event.save();
         }
     }
+    recordTriggerFailure(event, error) {
+        event.attributes = { ...event.attributes, no_trigger: true };
+        const identifier = event.event?.identifier ?? 'unknown';
+        const message = error instanceof Error ? error.message : String(error);
+        global.console.error(`event-trigger-failed (event_id=${event.id}, identifier=${identifier}): ${message}`);
+        Sentry.captureException(error, {
+            level: 'error',
+            tags: { service: 'EventQueueService' },
+            extra: {
+                event_id: event.id,
+                event_identifier: identifier,
+                scheduled_start_time: event.scheduled_start_time,
+            },
+        });
+    }
     getPayload(event) {
         const { payload, parameter } = event;
         if (Object.keys(payload || {}).length)
@@ -100,8 +181,10 @@ let EventQueueService = class EventQueueService {
     }
 };
 exports.EventQueueService = EventQueueService;
-exports.EventQueueService = EventQueueService = __decorate([
+EventQueueService.CLAIM_BATCH_SIZE = 20;
+exports.EventQueueService = EventQueueService = EventQueueService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [queue_service_1.QueueService])
+    __metadata("design:paramtypes", [queue_service_1.QueueService,
+        sql_service_1.SqlService])
 ], EventQueueService);
 //# sourceMappingURL=event.queue.service.js.map

package/dist/system/services/event.queue.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.queue.service.js","sourceRoot":"","sources":["../../../src/system/services/event.queue.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAA2C;AAC3C,qFAAiF;AACjF,gEAA4D;AAC5D,gFAA4E;AAC5E,yEAAoE;AACpE,uEAAkE;AAS3D,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAK1B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAM3D,KAAK,CAAC,eAAe;QACjB,MAAM,IAAI,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QAEpC,OAAO,qCAAgB,CAAC,IAAI,CAAC;YACzB,KAAK,EAAE;gBACH,oBAAoB,EAAE,IAAA,kBAAQ,EAAC,IAAI,CAAC;gBACpC,UAAU,EAAE,IAAA,gBAAM,GAAE;aACvB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;YACpB,KAAK,EAAE;gBACH,oBAAoB,EAAE,KAAK;aAC9B;YACD,IAAI,EAAE,EAAE;SACX,CAAC,CAAC;IACP,CAAC;IAWD,KAAK,CAAC,QAAQ,CAAC,UAAkB,EAAE,KAAU,EAAE,IAAU,EAAE,OAAa;QACpE,MAAM,GAAG,GAAG,MAAM,uCAAiB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAEvE,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,wCAAkB,CAAC,eAAe,UAAU,+BAA+B,CAAC,CAAC;QAEjG,MAAM,MAAM,GAAG,qCAAgB,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACtD,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACvB,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;QAEzB,MAAM,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAEnC,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAOD,KAAK,CAAC,OAAO,CAAC,KAAuB;QACjC,KAAK,CAAC,UAAU,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YAC7F,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;YAE3D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACtF,CAAC;QAAC,MAAM,CAAC;YACL,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAGjE,CAAC;gBAAS,CAAC;YACP,KAAK,CAAC,QAAQ,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC;IACL,CAAC;IAOD,KAAK,CAAC,WAAW,CAAC,EAAU;QACxB,MAAM,KAAK,GAAG,MAAM,qCAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtF,KAAK,CAAC,UAAU,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QAE1C,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YAC7F,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;YAE3D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACtF,CAAC;QAAC,MAAM,CAAC;YACL,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAGjE,CAAC;gBAAS,CAAC;YACP,KAAK,CAAC,QAAQ,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC;IACL,CAAC;IASO,UAAU,CAAC,KAAuB;QACtC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAErC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM;YAAE,OAAO,OAAO,CAAC;QAEtD,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IASO,iBAAiB,CAAC,KAAa;QACnC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,KAAK,CAAC;QAElC,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAEhC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,IAAI,GAAG,KAAK,MAAM;gBAAE,OAAO,IAAI,CAAC;YAChC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAvIY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAMkC,4BAAY;GAL9C,iBAAiB,CAuI7B"}
+{"version":3,"file":"event.queue.service.js","sourceRoot":"","sources":["../../../src/system/services/event.queue.service.ts"],"names":[],"mappings":"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"}

package/dist/system/services/executable.script.service.d.ts

@@ -1,12 +1,6 @@
 import { ExecutableScriptPayloadDto } from '../dtos/executable.script.payload.dto';
-import { SystemLogEntity } from '../entities/system.log.entity';
-import { LoggerService } from './logger.service';
-import { UploadService } from './upload.service';
 export declare class ExecutableScriptService {
-    protected readonly loggerService: LoggerService;
-    protected readonly uploadService: UploadService;
-    constructor(loggerService: LoggerService, uploadService: UploadService);
-    execute(data: ExecutableScriptPayloadDto): Promise<SystemLogEntity>;
+    execute(data: ExecutableScriptPayloadDto): Promise<void>;
     private trigger;
     private getScript;
 }

package/dist/system/services/executable.script.service.js

@@ -5,44 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutableScriptService = void 0;
 const common_1 = require("@nestjs/common");
 const executable_script_entity_1 = require("../entities/executable.script.entity");
-const system_log_entity_1 = require("../entities/system.log.entity");
 const process_script_execution_1 = require("../libraries/process.script.execution");
-const logger_service_1 = require("./logger.service");
-const upload_service_1 = require("./upload.service");
-const SourceHash = require("../../config/source.hash");
 let ExecutableScriptService = class ExecutableScriptService {
-    constructor(loggerService, uploadService) {
-        this.loggerService = loggerService;
-        this.uploadService = uploadService;
-    }
     async execute(data) {
-        const start = new Date();
         const script = await this.getScript(data.identifier);
         await this.trigger(script, data);
-        const duration = new Date().getTime() - start.getTime();
-        this.loggerService.log(`Script executed in ${duration}ms`);
-        this.loggerService.log({ payload: data.payload });
-        const url = await this.loggerService.getFileUrl();
-        if (!url)
-            return;
-        const source = data.source || {
-            source_type: SourceHash.executableScript,
-            source_id: script.id,
-        };
-        const log = system_log_entity_1.SystemLogEntity.create({
-            ...source,
-            identifier: data.identifier,
-            url,
-            duration,
-        });
-        return log.save();
     }
     async trigger(script, data) {
         const ctx = {
@@ -53,17 +24,13 @@ let ExecutableScriptService = class ExecutableScriptService {
     }
     async getScript(identifier) {
         const script = await executable_script_entity_1.ExecutableScriptEntity.findOne({ where: { identifier }, relations: ['script'] });
-        if (!script?.script?.script) {
-            console.log(`given script ${identifier} script not found`);
+        if (!script?.script?.script)
             return;
-        }
         return script;
     }
 };
 exports.ExecutableScriptService = ExecutableScriptService;
 exports.ExecutableScriptService = ExecutableScriptService = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [logger_service_1.LoggerService,
-        upload_service_1.UploadService])
+    (0, common_1.Injectable)()
 ], ExecutableScriptService);
 //# sourceMappingURL=executable.script.service.js.map

package/dist/system/services/executable.script.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"executable.script.service.js","sourceRoot":"","sources":["../../../src/system/services/executable.script.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,mFAA8E;AAC9E,qEAAgE;AAChE,oFAA+E;AAC/E,qDAAiD;AACjD,qDAAiD;AACjD,uDAAwD;AASjD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAMhC,YACuB,aAA4B,EAC5B,aAA4B;QAD5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAe;IAChD,CAAC;IAQJ,KAAK,CAAC,OAAO,CAAC,IAAgC;QAC1C,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEjC,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;QAExD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,QAAQ,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAElD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QAElD,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,MAAM,GAAoB,IAAI,CAAC,MAAM,IAAI;YAC3C,WAAW,EAAE,UAAU,CAAC,gBAAgB;YACxC,SAAS,EAAE,MAAM,CAAC,EAAE;SACvB,CAAC;QAEF,MAAM,GAAG,GAAG,mCAAe,CAAC,MAAM,CAAC;YAC/B,GAAG,MAAM;YACT,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG;YACH,QAAQ;SACX,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IASO,KAAK,CAAC,OAAO,CAAC,MAA8B,EAAE,IAAgC;QAClF,MAAM,GAAG,GAAG;YACR,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;YACpB,IAAI,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;QACF,OAAO,IAAI,iDAAsB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3E,CAAC;IAQO,KAAK,CAAC,SAAS,CAAC,UAAkB;QACtC,MAAM,MAAM,GAAG,MAAM,iDAAsB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEtG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,gBAAgB,UAAU,mBAAmB,CAAC,CAAC;YAC3D,OAAO;QACX,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA7EY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAQ6B,8BAAa;QACb,8BAAa;GAR1C,uBAAuB,CA6EnC"}
+{"version":3,"file":"executable.script.service.js","sourceRoot":"","sources":["../../../src/system/services/executable.script.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,mFAA8E;AAC9E,oFAA+E;AASxE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAKhC,KAAK,CAAC,OAAO,CAAC,IAAgC;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IASO,KAAK,CAAC,OAAO,CAAC,MAA8B,EAAE,IAAgC;QAClF,MAAM,GAAG,GAAG;YACR,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;YACpB,IAAI,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;QACF,OAAO,IAAI,iDAAsB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3E,CAAC;IAQO,KAAK,CAAC,SAAS,CAAC,UAAkB;QACtC,MAAM,MAAM,GAAG,MAAM,iDAAsB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEtG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM;YAAE,OAAO;QAEpC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AAtCY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;GACA,uBAAuB,CAsCnC"}

package/dist/system/services/index.d.ts

@@ -13,7 +13,6 @@ export * from './executable.script.service';
 export * from './form.service';
 export * from './internal.server.connect.service';
 export * from './list.service';
-export * from './logger.service';
 export * from './mail.validation.service';
 export * from './menu.service';
 export * from './mobile.validation.service';

package/dist/system/services/index.js

@@ -29,7 +29,6 @@ __exportStar(require("./executable.script.service"), exports);
 __exportStar(require("./form.service"), exports);
 __exportStar(require("./internal.server.connect.service"), exports);
 __exportStar(require("./list.service"), exports);
-__exportStar(require("./logger.service"), exports);
 __exportStar(require("./mail.validation.service"), exports);
 __exportStar(require("./menu.service"), exports);
 __exportStar(require("./mobile.validation.service"), exports);

package/dist/system/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/system/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AAAA,iDAA+B;AAAA,0DAAwC;AAAA,8DAA4C;AAAA,0DAAwC;AAAA,0DAAwC;AAAA,mDAAiC;AAAA,oDAAkC;AAAA,qDAAmC;AAAA,yDAAuC;AAAA,wDAAsC;AAAA,8DAA4C;AAAA,iDAA+B;AAAA,oEAAkD;AAAA,iDAA+B;AAAA,mDAAiC;AAAA,4DAA0C;AAAA,iDAA+B;AAAA,8DAA4C;AAAA,kDAAgC;AAAA,uDAAqC;AAAA,qDAAmC;AAAA,mDAAiC;AAAA,4DAA0C;AAAA,0DAAwC;AAAA,oDAAkC;AAAA,sDAAoC;AAAA,mDAAiC;AAAA,4DAAyC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/system/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AAAA,iDAA+B;AAAA,0DAAwC;AAAA,8DAA4C;AAAA,0DAAwC;AAAA,0DAAwC;AAAA,mDAAiC;AAAA,oDAAkC;AAAA,qDAAmC;AAAA,yDAAuC;AAAA,wDAAsC;AAAA,8DAA4C;AAAA,iDAA+B;AAAA,oEAAkD;AAAA,iDAA+B;AAAA,4DAA0C;AAAA,iDAA+B;AAAA,8DAA4C;AAAA,kDAAgC;AAAA,uDAAqC;AAAA,qDAAmC;AAAA,mDAAiC;AAAA,4DAA0C;AAAA,0DAAwC;AAAA,oDAAkC;AAAA,sDAAoC;AAAA,mDAAiC;AAAA,4DAAyC"}

package/dist/system/services/internal.server.connect.service.js

@@ -42,7 +42,6 @@ let InternalServerConnectService = class InternalServerConnectService {
             url,
             headers,
         };
-        global.console.log('options', options);
         return this.remoteRequestService.getProxyResponse(options);
     }
     async getCredential(type) {

package/dist/system/services/internal.server.connect.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal.server.connect.service.js","sourceRoot":"","sources":["../../../src/system/services/internal.server.connect.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"internal.server.connect.service.js","sourceRoot":"","sources":["../../../src/system/services/internal.server.connect.service.ts"],"names":[],"mappings":"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"}

package/dist/system/services/menu.service.js

@@ -14,6 +14,7 @@ const common_1 = require("@nestjs/common");
 const class_transformer_1 = require("class-transformer");
 const typeorm_1 = require("typeorm");
 const access_service_1 = require("../../auth/services/access.service");
+const role_constants_1 = require("../../common/constants/role.constants");
 const operation_exception_1 = require("../../common/exceptions/operation.exception");
 const class_mapper_1 = require("../../common/libraries/class.mapper");
 const menu_entity_1 = require("../entities/menu.entity");
@@ -92,10 +93,10 @@ let MenuService = class MenuService {
         return data;
     }
     isMenuAllowed(roles) {
-        if (this.accessService.hasRoleId(1))
+        if (this.accessService.hasRoleId(role_constants_1.RoleConstants.SUPER_ADMIN))
             return true;
         if (!roles)
-            return this.accessService.hasRoleId(1);
+            return this.accessService.hasRoleId(role_constants_1.RoleConstants.SUPER_ADMIN);
         for (const role of roles) {
             if (!role.deleted_at && this.accessService.hasRoleId(role.role_id))
                 return true;

package/dist/system/services/menu.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/system/services/menu.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/system/services/menu.service.ts"],"names":[],"mappings":"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"}

package/dist/system/services/model.service.js

@@ -23,7 +23,8 @@ const property_service_1 = require("./property.service");
 const security_rule_service_1 = require("./security.rule.service");
 const ui_action_service_1 = require("./ui.action.service");
 const SourceHash = require("../../config/source.hash");
-const ROLEMAPPING = require("../../config/role.mapping");
+const role_constants_1 = require("../../common/constants/role.constants");
+const ui_action_constants_1 = require("../constants/ui.action.constants");
 let ModelService = class ModelService {
     constructor(uiActionService, accessService, securityRuleService, propertyService) {
         this.uiActionService = uiActionService;
@@ -34,18 +35,18 @@ let ModelService = class ModelService {
     async getUiActions(model) {
         const actions = [];
         if (await this.validateModelAccess(model, 'a')) {
-            actions.push(await ui_action_entity_1.UiActionEntity.first(1));
-            actions.push(await ui_action_entity_1.UiActionEntity.first(5));
+            actions.push(await ui_action_entity_1.UiActionEntity.first(ui_action_constants_1.UiActionConstants.ADD));
+            actions.push(await ui_action_entity_1.UiActionEntity.first(ui_action_constants_1.UiActionConstants.COPY));
         }
         if (await this.validateModelAccess(model, 'e')) {
-            actions.push(await ui_action_entity_1.UiActionEntity.first(2));
+            actions.push(await ui_action_entity_1.UiActionEntity.first(ui_action_constants_1.UiActionConstants.EDIT));
         }
         if (await this.validateModelAccess(model, 'd')) {
-            actions.push(await ui_action_entity_1.UiActionEntity.first(3));
+            actions.push(await ui_action_entity_1.UiActionEntity.first(ui_action_constants_1.UiActionConstants.DELETE));
         }
         const enableAuditLog = await this.propertyService.get('system.audit.enable', true);
         if (enableAuditLog && actions.length)
-            actions.push(await ui_action_entity_1.UiActionEntity.first(4));
+            actions.push(await ui_action_entity_1.UiActionEntity.first(ui_action_constants_1.UiActionConstants.AUDIT));
         const customActions = await this.uiActionService.getUiActions(SourceHash.model, model.id);
         return class_mapper_1.ClassMapper.removeArrayWhoColumns(actions.concat(customActions));
     }
@@ -102,7 +103,7 @@ let ModelService = class ModelService {
         return false;
     }
     validateUnRegulatedModelAccess(model, operation) {
-        if (!this.accessService.hasRoleId(ROLEMAPPING.internal))
+        if (!this.accessService.hasRoleId(role_constants_1.RoleConstants.INTERNAL))
             return false;
         return model.allowed_permissions.includes(operation);
     }

package/dist/system/services/model.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../src/system/services/model.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../src/system/services/model.service.ts"],"names":[],"mappings":"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"}

package/dist/system/services/property.service.d.ts

@@ -3,7 +3,6 @@ import { PropertyEntity } from '../entities/property.entity';
 import { CommonService } from '../../common/libraries/common.service';
 export declare class PropertyService extends CommonService {
     private readonly cacheService;
-    protected publicExposed: boolean;
     constructor(cacheService: CacheService);
     get(key: string, defaultValue?: any): Promise<string>;
     getFromDb(key: string, defaultValue?: any): Promise<string>;

package/dist/system/services/property.service.js

@@ -17,28 +17,31 @@ const property_entity_1 = require("../entities/property.entity");
 const custom_crypt_1 = require("../../common/libraries/custom.crypt");
 const class_transformer_1 = require("class-transformer");
 const common_service_1 = require("../../common/libraries/common.service");
+const public_exposed_decorator_1 = require("../../common/decorators/public.exposed.decorator");
 let PropertyService = class PropertyService extends common_service_1.CommonService {
     constructor(cacheService) {
         super();
         this.cacheService = cacheService;
-        this.publicExposed = true;
     }
     async get(key, defaultValue) {
         defaultValue = defaultValue ?? null;
         const index = `property.${key}`;
-        const value = await this.cacheService.get(index, null);
-        if (value)
-            return value;
+        const cached = await this.cacheService.get(index, null);
+        if (cached) {
+            if (typeof cached === 'object' && cached !== null && 'value' in cached) {
+                const value = cached.value;
+                return cached.is_encrypted ? custom_crypt_1.CustomCrypt.decrypt(value) : value;
+            }
+            return cached;
+        }
         const property = await property_entity_1.PropertyEntity.findOne({ where: { name: key } });
         if (!property)
             return defaultValue;
-        let pValue = property.value;
-        if (property.is_encrypted)
-            pValue = custom_crypt_1.CustomCrypt.decrypt(pValue);
         if (property.is_caching_enabled) {
-            await this.cacheService.set(index, pValue, 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));
         }
-        return pValue;
+        return property.is_encrypted ? custom_crypt_1.CustomCrypt.decrypt(property.value) : property.value;
     }
     async getFromDb(key, defaultValue) {
         defaultValue = defaultValue ?? null;
@@ -51,15 +54,26 @@ let PropertyService = class PropertyService extends common_service_1.CommonServi
         return pValue;
     }
     async set(property) {
-        const record = await property_entity_1.PropertyEntity.firstOrNew({
-            name: property.name,
-        });
-        const r = (0, class_transformer_1.plainToClassFromExist)(record, property, { exposeUnsetFields: false });
-        return r.save();
+        try {
+            const record = await property_entity_1.PropertyEntity.firstOrNew({ name: property.name });
+            const r = (0, class_transformer_1.plainToClassFromExist)(record, property, { exposeUnsetFields: false });
+            return await r.save();
+        }
+        catch (error) {
+            const code = error?.code ?? error?.driverError?.code;
+            if (code !== '23505')
+                throw error;
+            const record = await property_entity_1.PropertyEntity.findOne({ where: { name: property.name } });
+            if (!record)
+                throw error;
+            const r = (0, class_transformer_1.plainToClassFromExist)(record, property, { exposeUnsetFields: false });
+            return r.save();
+        }
     }
 };
 exports.PropertyService = PropertyService;
 exports.PropertyService = PropertyService = __decorate([
+    (0, public_exposed_decorator_1.PublicExposed)(),
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [cache_service_1.CacheService])
 ], PropertyService);

package/dist/system/services/property.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"property.service.js","sourceRoot":"","sources":["../../../src/system/services/property.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,gFAA4E;AAC5E,gEAA4D;AAC5D,iEAA6D;AAC7D,sEAAkE;AAClE,yDAA0D;AAC1D,0EAAsE;AAS/D,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,8BAAa;IAO9C,YAA6B,YAA0B;QACnD,KAAK,EAAE,CAAC;QADiB,iBAAY,GAAZ,YAAY,CAAc;QAN7C,kBAAa,GAAG,IAAI,CAAC;IAQ/B,CAAC;IASD,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,YAAkB;QACrC,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC;QAEpC,MAAM,KAAK,GAAG,YAAY,GAAG,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEvD,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QAExB,MAAM,QAAQ,GAAG,MAAM,gCAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ;YAAE,OAAO,YAAY,CAAC;QAEnC,IAAI,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC5B,IAAI,QAAQ,CAAC,YAAY;YAAE,MAAM,GAAG,0BAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAGhE,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAQD,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,YAAkB;QAC3C,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC;QAEpC,MAAM,QAAQ,GAAG,MAAM,gCAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ;YAAE,OAAO,YAAY,CAAC;QAEnC,IAAI,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC5B,IAAI,QAAQ,CAAC,YAAY;YAAE,MAAM,GAAG,0BAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAGhE,OAAO,MAAM,CAAC;IAClB,CAAC;IAQD,KAAK,CAAC,GAAG,CAAC,QAAiC;QACvC,MAAM,MAAM,GAAG,MAAM,gCAAc,CAAC,UAAU,CAAC;YAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,IAAA,yCAAqB,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEhF,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;CACJ,CAAA;AA1EY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAQkC,4BAAY;GAP9C,eAAe,CA0E3B"}
+{"version":3,"file":"property.service.js","sourceRoot":"","sources":["../../../src/system/services/property.service.ts"],"names":[],"mappings":"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"}

package/dist/system/services/report.service.js

@@ -18,7 +18,7 @@ const report_entity_1 = require("../entities/report.entity");
 const report_role_entity_1 = require("../entities/report.role.entity");
 const preference_service_1 = require("./preference.service");
 const ui_action_service_1 = require("./ui.action.service");
-const ROLEMAPPING = require("../../config/role.mapping");
+const role_constants_1 = require("../../common/constants/role.constants");
 const SourceHash = require("../../config/source.hash");
 let ReportService = class ReportService {
     constructor(accessService, preferenceService, uiActionService) {
@@ -31,7 +31,7 @@ let ReportService = class ReportService {
             where: { report_id: id },
         });
         if (assignments.length === 0) {
-            return this.accessService.hasRoleId(ROLEMAPPING.internal) || this.accessService.hasRoleId(ROLEMAPPING.super_admin);
+            return this.accessService.hasRoleId(role_constants_1.RoleConstants.INTERNAL) || this.accessService.hasRoleId(role_constants_1.RoleConstants.SUPER_ADMIN);
         }
         return this.accessService.hasRoleAssignments(assignments);
     }

package/dist/system/services/report.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/system/services/report.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uEAAmE;AACnE,qFAAiF;AACjF,2DAAuD;AACvD,6DAAyD;AACzD,uEAAkE;AAClE,6DAAyD;AACzD,2DAAsD;AACtD,yDAA0D;AAC1D,uDAAwD;AASjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAOtB,YACqB,aAA4B,EAC5B,iBAAoC,EACpC,eAAgC;QAFhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAOJ,KAAK,CAAC,SAAS,CAAC,EAAU;QACtB,MAAM,WAAW,GAAG,MAAM,qCAAgB,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;SAC3B,CAAC,CAAC;QAEH,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACvH,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAQD,KAAK,CAAC,gBAAgB,CAAC,EAAU;QAC7B,MAAM,MAAM,GAAG,MAAM,4BAAY,CAAC,KAAK,CAAC,EAAE,EAAE;YACxC,SAAS,EAAE,CAAC,QAAQ,CAAC;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,wCAAkB,CAAC,sBAAsB,CAAC,CAAC;QAElE,MAAM,CAAC,MAAM,GAAG,MAAM,0BAAW,CAAC,IAAI,CAAC;YACnC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE;YACxD,SAAS,EAAE,CAAC,cAAc,EAAE,gBAAgB,CAAC;SAChD,CAAC,CAAC;QAEH,MAAM,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAE7F,MAAM,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEnF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AArDY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAS2B,8BAAa;QACT,sCAAiB;QACnB,mCAAe;GAV5C,aAAa,CAqDzB"}
+{"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/system/services/report.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uEAAmE;AACnE,qFAAiF;AACjF,2DAAuD;AACvD,6DAAyD;AACzD,uEAAkE;AAClE,6DAAyD;AACzD,2DAAsD;AACtD,0EAAsE;AACtE,uDAAwD;AASjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAOtB,YACqB,aAA4B,EAC5B,iBAAoC,EACpC,eAAgC;QAFhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAOJ,KAAK,CAAC,SAAS,CAAC,EAAU;QACtB,MAAM,WAAW,GAAG,MAAM,qCAAgB,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;SAC3B,CAAC,CAAC;QAEH,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,8BAAa,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,8BAAa,CAAC,WAAW,CAAC,CAAC;QAC3H,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAQD,KAAK,CAAC,gBAAgB,CAAC,EAAU;QAC7B,MAAM,MAAM,GAAG,MAAM,4BAAY,CAAC,KAAK,CAAC,EAAE,EAAE;YACxC,SAAS,EAAE,CAAC,QAAQ,CAAC;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,wCAAkB,CAAC,sBAAsB,CAAC,CAAC;QAElE,MAAM,CAAC,MAAM,GAAG,MAAM,0BAAW,CAAC,IAAI,CAAC;YACnC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE;YACxD,SAAS,EAAE,CAAC,cAAc,EAAE,gBAAgB,CAAC;SAChD,CAAC,CAAC;QAEH,MAAM,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAE7F,MAAM,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEnF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AArDY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAS2B,8BAAa;QACT,sCAAiB;QACnB,mCAAe;GAV5C,aAAa,CAqDzB"}

package/dist/system/services/scheduled.event.service.js

@@ -26,8 +26,13 @@ let ScheduledEventService = class ScheduledEventService {
     }
     async getActiveEventsSummary(source) {
         const { source_type, source_id } = source;
-        const sql = `select count(1) count, max(a.scheduled_start_time) scheduled_start_time from sys_event_queues a where a.deleted_at is null and a.start_time is null and a.source_type = '${source_type}' and a.source_id = ${source_id}`;
-        return this.sqlService.readFirst(sql);
+        const sql = `select count(1) count, max(a.scheduled_start_time) scheduled_start_time
+                     from sys_event_queues a
+                     where a.deleted_at is null
+                       and a.start_time is null
+                       and a.source_type = $1
+                       and a.source_id = $2`;
+        return this.sqlService.boundReadFirst(sql, [source_type, source_id]);
     }
     async deleteActiveEvents(source) {
         const { source_type, source_id } = source;

package/dist/system/services/scheduled.event.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":"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"}