@servicelabsco/nestjs-utility-services 1.2.29 → 1.2.31

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

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormService = void 0;
 const common_1 = require("@nestjs/common");
-const SOURCEHASH = require("../../config/source.hash");
+const SourceHash = require("../../config/source.hash");
 const column_manager_1 = require("../libraries/column.manager");
 const security_rule_service_1 = require("./security.rule.service");
 let FormService = class FormService {
@@ -21,7 +21,7 @@ let FormService = class FormService {
     async getDictionary(form) {
         const rules = await this.securityRuleService.getFormSecurityRules(form);
         const columnManager = new column_manager_1.ColumnManager();
-        await columnManager.process(SOURCEHASH.form, form.id, {
+        await columnManager.process(SourceHash.form, form.id, {
             rules,
         });
         return columnManager.allowed;

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

@@ -24,7 +24,7 @@ const menu_list_modifier_1 = require("../modifiers/menu.list.modifier");
 const module_list_modifier_1 = require("../modifiers/module.list.modifier");
 const preference_service_1 = require("./preference.service");
 const ui_action_service_1 = require("./ui.action.service");
-const SOURCEHASH = require("../../config/source.hash");
+const SourceHash = require("../../config/source.hash");
 let MenuService = class MenuService {
     constructor(accessManager, preferenceService, uiActionService) {
         this.accessManager = accessManager;
@@ -42,7 +42,7 @@ let MenuService = class MenuService {
         if (!menu)
             throw new operation_exception_1.OperationException('Menu doesnot exist');
         menu.list_layouts = await this.preferenceService.getMenuListPreferences(id);
-        menu.ui_actions = await this.uiActionService.getUiActions(SOURCEHASH.menu, id);
+        menu.ui_actions = await this.uiActionService.getUiActions(SourceHash.menu, id);
         return menu;
     }
     async getPageDefinitions() {

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

@@ -22,7 +22,7 @@ const ui_action_entity_1 = require("../entities/ui.action.entity");
 const column_manager_1 = require("../libraries/column.manager");
 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 SourceHash = require("../../config/source.hash");
 const ROLEMAPPING = require("../../config/role.mapping");
 let ModelService = class ModelService {
     constructor(uiActionService, accessManager, securityRuleService, propertyService) {
@@ -46,7 +46,7 @@ let ModelService = class ModelService {
         const enableAuditLog = await this.propertyService.get('system.audit.enable', true);
         if (enableAuditLog && actions.length)
             actions.push(await ui_action_entity_1.UiActionEntity.first(4));
-        const customActions = await this.uiActionService.getUiActions(SOURCEHASH.model, model.id);
+        const customActions = await this.uiActionService.getUiActions(SourceHash.model, model.id);
         return class_mapper_1.ClassMapper.removeArrayWhoColumns(actions.concat(customActions));
     }
     async validateHashAccess(hash, operation) {
@@ -81,7 +81,7 @@ let ModelService = class ModelService {
     async getDictionary(model, operation, data) {
         const rules = await this.securityRuleService.getModelSecurityRules(model, operation);
         const columnManager = new column_manager_1.ColumnManager();
-        await columnManager.process(SOURCEHASH.model, model.id, { rules, data });
+        await columnManager.process(SourceHash.model, model.id, { rules, data });
         return columnManager;
     }
     async validateModelAccess(model, operation) {

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

@@ -13,16 +13,16 @@ const auth_1 = require("../../common/libraries/auth");
 const class_mapper_1 = require("../../common/libraries/class.mapper");
 const list_preference_entity_1 = require("../entities/list.preference.entity");
 const form_preference_entity_1 = require("../entities/form.preference.entity");
-const SOURCEHASH = require("../../config/source.hash");
+const SourceHash = require("../../config/source.hash");
 let PreferenceService = class PreferenceService {
     async getMenuListPreferences(id) {
-        return this.getListPreferences(SOURCEHASH.menu, id);
+        return this.getListPreferences(SourceHash.menu, id);
     }
     async getTabListPreferences(id) {
-        return this.getListPreferences(SOURCEHASH.relationship, id);
+        return this.getListPreferences(SourceHash.relationship, id);
     }
     async getTabFormPreferences(id) {
-        return this.getFormPreferences(SOURCEHASH.relationship, id);
+        return this.getFormPreferences(SourceHash.relationship, id);
     }
     async getListPreferences(source_type, source_id) {
         const user = auth_1.Auth.user();
@@ -50,7 +50,7 @@ let PreferenceService = class PreferenceService {
     async getModelFormPreferences(id) {
         const preferences = await form_preference_entity_1.FormPreferenceEntity.find({
             where: {
-                source_type: SOURCEHASH.model,
+                source_type: SourceHash.model,
                 source_id: id,
             },
         });

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

@@ -19,7 +19,7 @@ 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 SOURCEHASH = require("../../config/source.hash");
+const SourceHash = require("../../config/source.hash");
 let ReportService = class ReportService {
     constructor(accessManager, preferenceService, uiActionService) {
         this.accessManager = accessManager;
@@ -42,11 +42,11 @@ let ReportService = class ReportService {
         if (!report)
             throw new operation_exception_1.OperationException('Report doesnot exist');
         report.charts = await chart_entity_1.ChartEntity.find({
-            where: { source_type: SOURCEHASH.report, source_id: id },
+            where: { source_type: SourceHash.report, source_id: id },
             relations: ['primary_axis', 'secondary_axis'],
         });
-        report.list_layouts = await this.preferenceService.getListPreferences(SOURCEHASH.report, id);
-        report.ui_actions = await this.uiActionService.getUiActions(SOURCEHASH.report, id);
+        report.list_layouts = await this.preferenceService.getListPreferences(SourceHash.report, id);
+        report.ui_actions = await this.uiActionService.getUiActions(SourceHash.report, id);
         return report;
     }
 };

package/dist/system/services/scheduled.event.service.d.ts

@@ -1,10 +1,16 @@
 import { EventQueueEntity } from '../entities/event.queue.entity';
 import { ScheduledEventEntity } from '../entities/scheduled.event.entity';
+import { PropertyService } from './property.service';
 export declare class ScheduledEventService {
+    private readonly propertyService;
+    constructor(propertyService: PropertyService);
     getActiveEvents(id: number): Promise<EventQueueEntity[]>;
     getCompletedEvents(id: number): Promise<EventQueueEntity[]>;
-    deleteActiveEvents(id: number): Promise<void>;
-    setNewEvent(job: ScheduledEventEntity, scheduledTime?: Date): Promise<EventQueueEntity>;
+    deleteActiveEvents(id: number): Promise<EventQueueEntity[]>;
+    setNewEvent(job: ScheduledEventEntity, scheduledTime: Date): Promise<EventQueueEntity>;
     createEventsForJob(job: ScheduledEventEntity): Promise<ScheduledEventEntity>;
     getActiveSchedules(): Promise<ScheduledEventEntity[]>;
+    private getLastScheduledJob;
+    private withTimezoneOffset;
+    private reverseTimezoneOffset;
 }

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

@@ -5,20 +5,28 @@ 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.ScheduledEventService = void 0;
 const common_1 = require("@nestjs/common");
 const parser = require("cron-parser");
+const date_fns_1 = require("date-fns");
 const typeorm_1 = require("typeorm");
 const date_util_1 = require("../../common/libraries/date.util");
 const event_queue_entity_1 = require("../entities/event.queue.entity");
 const scheduled_event_entity_1 = require("../entities/scheduled.event.entity");
-const SOURCEHASH = require("../../config/source.hash");
+const property_service_1 = require("./property.service");
+const SourceHash = require("../../config/source.hash");
 let ScheduledEventService = class ScheduledEventService {
+    constructor(propertyService) {
+        this.propertyService = propertyService;
+    }
     async getActiveEvents(id) {
         return event_queue_entity_1.EventQueueEntity.find({
             where: {
-                source_type: SOURCEHASH.scheduledEvent,
+                source_type: SourceHash.scheduledEvent,
                 source_id: id,
                 start_time: (0, typeorm_1.IsNull)(),
             },
@@ -30,7 +38,7 @@ let ScheduledEventService = class ScheduledEventService {
     async getCompletedEvents(id) {
         return event_queue_entity_1.EventQueueEntity.find({
             where: {
-                source_type: SOURCEHASH.scheduledEvent,
+                source_type: SourceHash.scheduledEvent,
                 source_id: id,
                 start_time: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
             },
@@ -41,22 +49,19 @@ let ScheduledEventService = class ScheduledEventService {
         });
     }
     async deleteActiveEvents(id) {
-        const records = await this.getActiveEvents(id);
-        const promises = [];
-        records.forEach((record) => {
-            promises.push(record.softRemove());
-        });
-        Promise.all(promises).then(() => {
-            return;
+        return event_queue_entity_1.EventQueueEntity.softDelete({
+            source_type: SourceHash.scheduledEvent,
+            source_id: id,
+            start_time: (0, typeorm_1.IsNull)(),
         });
     }
-    async setNewEvent(job, scheduledTime = new Date()) {
+    async setNewEvent(job, scheduledTime) {
         const record = new event_queue_entity_1.EventQueueEntity();
         record.name = job.event.name;
         record.event_id = job.event_id;
         record.parameter = job.parameter;
         record.scheduled_start_time = scheduledTime;
-        record.source_type = SOURCEHASH.scheduledEvent;
+        record.source_type = SourceHash.scheduledEvent;
         record.source_id = job.id;
         await record.save();
         return record;
@@ -65,10 +70,10 @@ let ScheduledEventService = class ScheduledEventService {
         if (!(job && job.event))
             return job;
         const events = await this.getActiveEvents(job.id);
-        let inQueue = events.length;
-        if (inQueue > 6)
+        let inQueueCount = events.length;
+        if (inQueueCount > 6)
             return job;
-        let lastRunTime = inQueue ? events.slice(-1)[0].scheduled_start_time : date_util_1.DateUtil.getDateTime();
+        let lastRunTime = await this.getLastScheduledJob(events);
         lastRunTime = lastRunTime < job.start_time ? job.start_time : lastRunTime;
         if (lastRunTime > job.end_time)
             return;
@@ -76,12 +81,14 @@ let ScheduledEventService = class ScheduledEventService {
             currentDate: lastRunTime,
             endDate: job.end_time,
         });
-        while (inQueue <= 10) {
+        while (inQueueCount <= 10) {
             if (!nextTime.hasNext())
                 return;
-            const event = await this.setNewEvent(job, nextTime.next().toDate());
-            job.last_scheduled_time = event.scheduled_start_time;
-            ++inQueue;
+            const next = nextTime.next().toDate();
+            const date = await this.withTimezoneOffset(next);
+            await this.setNewEvent(job, date);
+            job.last_scheduled_time = date;
+            ++inQueueCount;
         }
         await job.save();
         return job;
@@ -92,13 +99,31 @@ let ScheduledEventService = class ScheduledEventService {
             where: {
                 active: true,
                 end_time: (0, typeorm_1.Not)((0, typeorm_1.LessThan)(date_util_1.DateUtil.getDateTime())),
-                last_scheduled_time: (0, typeorm_1.LessThan)(date_util_1.DateUtil.getFutureDateTime(10)),
             },
         });
     }
+    async getLastScheduledJob(events) {
+        if (!events.length)
+            return new Date();
+        const lastEvent = events.pop();
+        return this.reverseTimezoneOffset(lastEvent.scheduled_start_time);
+    }
+    async withTimezoneOffset(date) {
+        const offset = await this.propertyService.get(`scheduled.job.timezone.offset`, 0);
+        if (!offset)
+            return date;
+        return (0, date_fns_1.subMinutes)(date, +offset);
+    }
+    async reverseTimezoneOffset(date) {
+        const offset = await this.propertyService.get(`scheduled.job.timezone.offset`, 0);
+        if (!offset)
+            return date;
+        return (0, date_fns_1.addMinutes)(date, +offset);
+    }
 };
 exports.ScheduledEventService = ScheduledEventService;
 exports.ScheduledEventService = ScheduledEventService = __decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [property_service_1.PropertyService])
 ], ScheduledEventService);
 //# sourceMappingURL=scheduled.event.service.js.map

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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"}

package/dist/system/services/security.rule.service.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityRuleService = void 0;
 const common_1 = require("@nestjs/common");
-const SOURCEHASH = require("../../config/source.hash");
+const SourceHash = require("../../config/source.hash");
 const sql_service_1 = require("../../platformUtility/services/sql.service");
 const system_script_entity_1 = require("../entities/system.script.entity");
 let SecurityRuleService = class SecurityRuleService {
@@ -19,10 +19,10 @@ let SecurityRuleService = class SecurityRuleService {
         this.sqlService = sqlService;
     }
     async getModelSecurityRules(model, operation) {
-        return this.getSecurityRules(model.id, model.table_name, operation, SOURCEHASH.model);
+        return this.getSecurityRules(model.id, model.table_name, operation, SourceHash.model);
     }
     async getFormSecurityRules(form) {
-        return this.getSecurityRules(form.id, form.identifier, '-', SOURCEHASH.form);
+        return this.getSecurityRules(form.id, form.identifier, '-', SourceHash.form);
     }
     getSecurityObjectNotation(identifier, name) {
         if (name === identifier || name === `${identifier}.*`)

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

@@ -4,6 +4,8 @@ export * from './column.subscriber';
 export * from './comment.subscriber';
 export * from './credential.ip.subscriber';
 export * from './document.subscriber';
+export * from './mail.event.subscriber';
+export * from './mail.recipient.subscriber';
 export * from './mail.validation.subscriber';
 export * from './mobile.validation.subscriber';
 export * from './property.subscriber';

package/dist/system/subscribers/index.js

@@ -20,6 +20,8 @@ __exportStar(require("./column.subscriber"), exports);
 __exportStar(require("./comment.subscriber"), exports);
 __exportStar(require("./credential.ip.subscriber"), exports);
 __exportStar(require("./document.subscriber"), exports);
+__exportStar(require("./mail.event.subscriber"), exports);
+__exportStar(require("./mail.recipient.subscriber"), exports);
 __exportStar(require("./mail.validation.subscriber"), exports);
 __exportStar(require("./mobile.validation.subscriber"), exports);
 __exportStar(require("./property.subscriber"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/system/subscribers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA+C;AAAA,sDAAoC;AAAA,sDAAoC;AAAA,uDAAqC;AAAA,6DAA2C;AAAA,wDAAsC;AAAA,+DAA6C;AAAA,iEAA+C;AAAA,wDAAsC;AAAA,4DAA0C;AAAA,+DAA6C;AAAA,2DAAyC;AAAA,iEAA+C;AAAA,qEAAmD;AAAA,+DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/system/subscribers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA+C;AAAA,sDAAoC;AAAA,sDAAoC;AAAA,uDAAqC;AAAA,6DAA2C;AAAA,wDAAsC;AAAA,0DAAwC;AAAA,8DAA4C;AAAA,+DAA6C;AAAA,iEAA+C;AAAA,wDAAsC;AAAA,4DAA0C;AAAA,+DAA6C;AAAA,2DAAyC;AAAA,iEAA+C;AAAA,qEAAmD;AAAA,+DAA4C"}

package/dist/system/subscribers/mail.event.subscriber.d.ts

@@ -0,0 +1,12 @@
+import { DataSource, InsertEvent, UpdateEvent } from 'typeorm';
+import { MailEventEntity } from '../entities/mail.event.entity';
+import { MailEventJob } from '../jobs/mail.event.job';
+import { CommonSubscriber } from '../../common/libraries/common.subscriber';
+export declare class MailEventSubscriber extends CommonSubscriber<MailEventEntity> {
+    private readonly dataSource;
+    private readonly mailEventJob;
+    constructor(dataSource: DataSource, mailEventJob: MailEventJob);
+    listenTo(): typeof MailEventEntity;
+    afterInsert(evt: InsertEvent<MailEventEntity>): Promise<void>;
+    afterUpdate(evt: UpdateEvent<MailEventEntity>): Promise<void>;
+}

package/dist/system/subscribers/mail.event.subscriber.js

@@ -0,0 +1,40 @@
+"use strict";
+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 __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.MailEventSubscriber = void 0;
+const typeorm_1 = require("typeorm");
+const mail_event_entity_1 = require("../entities/mail.event.entity");
+const mail_event_job_1 = require("../jobs/mail.event.job");
+const common_subscriber_1 = require("../../common/libraries/common.subscriber");
+let MailEventSubscriber = class MailEventSubscriber extends common_subscriber_1.CommonSubscriber {
+    constructor(dataSource, mailEventJob) {
+        super();
+        this.dataSource = dataSource;
+        this.mailEventJob = mailEventJob;
+        dataSource.subscribers.push(this);
+    }
+    listenTo() {
+        return mail_event_entity_1.MailEventEntity;
+    }
+    async afterInsert(evt) {
+        await this.mailEventJob.delayedDispatch(this.getEventData(evt));
+    }
+    async afterUpdate(evt) {
+        await this.mailEventJob.delayedDispatch(this.getEventData(evt));
+    }
+};
+exports.MailEventSubscriber = MailEventSubscriber;
+exports.MailEventSubscriber = MailEventSubscriber = __decorate([
+    (0, typeorm_1.EventSubscriber)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource,
+        mail_event_job_1.MailEventJob])
+], MailEventSubscriber);
+//# sourceMappingURL=mail.event.subscriber.js.map

package/dist/system/subscribers/mail.event.subscriber.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mail.event.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/mail.event.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgF;AAChF,qEAAgE;AAChE,2DAAsD;AACtD,gFAA4E;AAGrE,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,oCAAiC;IACtE,YACqB,UAAsB,EACtB,YAA0B;QAE3C,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QAG3C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,QAAQ;QACJ,OAAO,mCAAe,CAAC;IAC3B,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,GAAiC;QAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAiC;QAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ,CAAA;AAlBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,yBAAe,GAAE;qCAGmB,oBAAU;QACR,6BAAY;GAHtC,mBAAmB,CAkB/B"}

package/dist/system/subscribers/mail.recipient.subscriber.d.ts

@@ -0,0 +1,12 @@
+import { DataSource, InsertEvent, UpdateEvent } from 'typeorm';
+import { CommonSubscriber } from '../../common/libraries/common.subscriber';
+import { MailRecipientEntity } from '../entities/mail.recipient.entity';
+import { MailRecipientJob } from '../jobs/mail.recipient.job';
+export declare class MailRecipientSubscriber extends CommonSubscriber<MailRecipientEntity> {
+    private readonly dataSource;
+    private readonly mailRecipientJob;
+    constructor(dataSource: DataSource, mailRecipientJob: MailRecipientJob);
+    listenTo(): typeof MailRecipientEntity;
+    afterInsert(evt: InsertEvent<MailRecipientEntity>): Promise<void>;
+    afterUpdate(evt: UpdateEvent<MailRecipientEntity>): Promise<void>;
+}

package/dist/system/subscribers/mail.recipient.subscriber.js

@@ -0,0 +1,40 @@
+"use strict";
+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 __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.MailRecipientSubscriber = void 0;
+const typeorm_1 = require("typeorm");
+const common_subscriber_1 = require("../../common/libraries/common.subscriber");
+const mail_recipient_entity_1 = require("../entities/mail.recipient.entity");
+const mail_recipient_job_1 = require("../jobs/mail.recipient.job");
+let MailRecipientSubscriber = class MailRecipientSubscriber extends common_subscriber_1.CommonSubscriber {
+    constructor(dataSource, mailRecipientJob) {
+        super();
+        this.dataSource = dataSource;
+        this.mailRecipientJob = mailRecipientJob;
+        dataSource.subscribers.push(this);
+    }
+    listenTo() {
+        return mail_recipient_entity_1.MailRecipientEntity;
+    }
+    async afterInsert(evt) {
+        await this.mailRecipientJob.delayedDispatch(this.getEventData(evt));
+    }
+    async afterUpdate(evt) {
+        await this.mailRecipientJob.delayedDispatch(this.getEventData(evt));
+    }
+};
+exports.MailRecipientSubscriber = MailRecipientSubscriber;
+exports.MailRecipientSubscriber = MailRecipientSubscriber = __decorate([
+    (0, typeorm_1.EventSubscriber)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource,
+        mail_recipient_job_1.MailRecipientJob])
+], MailRecipientSubscriber);
+//# sourceMappingURL=mail.recipient.subscriber.js.map

package/dist/system/subscribers/mail.recipient.subscriber.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mail.recipient.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/mail.recipient.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgF;AAChF,gFAA4E;AAC5E,6EAAwE;AACxE,mEAA8D;AAGvD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,oCAAqC;IAC9E,YACqB,UAAsB,EACtB,gBAAkC;QAEnD,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACtB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAGnD,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,QAAQ;QACJ,OAAO,2CAAmB,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,GAAqC;QACnD,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAqC;QACnD,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAA;AAlBY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,yBAAe,GAAE;qCAGmB,oBAAU;QACJ,qCAAgB;GAH9C,uBAAuB,CAkBnC"}

package/dist/system/subscribers/scheduled.event.subscriber.d.ts

@@ -1,14 +1,13 @@
 import { DataSource, InsertEvent, UpdateEvent } from 'typeorm';
 import { CommonSubscriber } from '../../common/libraries/common.subscriber';
 import { ScheduledEventEntity } from '../entities/scheduled.event.entity';
-import { CleanScheduledEventJob } from '../jobs/clean.scheduled.event.job';
 import { ScheduledEventJob } from '../jobs/scheduled.event.job';
 export declare class ScheduledEventSubscriber extends CommonSubscriber<ScheduledEventEntity> {
     private readonly dataSource;
     private readonly scheduledEventJob;
-    private readonly cleanScheduledEventJob;
-    constructor(dataSource: DataSource, scheduledEventJob: ScheduledEventJob, cleanScheduledEventJob: CleanScheduledEventJob);
+    constructor(dataSource: DataSource, scheduledEventJob: ScheduledEventJob);
     listenTo(): typeof ScheduledEventEntity;
+    beforeInsert(event: InsertEvent<ScheduledEventEntity>): Promise<void>;
     afterInsert(event: InsertEvent<ScheduledEventEntity>): Promise<void>;
     afterUpdate(event: UpdateEvent<ScheduledEventEntity>): Promise<void>;
 }

package/dist/system/subscribers/scheduled.event.subscriber.js

@@ -13,33 +13,34 @@ exports.ScheduledEventSubscriber = void 0;
 const typeorm_1 = require("typeorm");
 const common_subscriber_1 = require("../../common/libraries/common.subscriber");
 const scheduled_event_entity_1 = require("../entities/scheduled.event.entity");
-const clean_scheduled_event_job_1 = require("../jobs/clean.scheduled.event.job");
 const scheduled_event_job_1 = require("../jobs/scheduled.event.job");
 let ScheduledEventSubscriber = class ScheduledEventSubscriber extends common_subscriber_1.CommonSubscriber {
-    constructor(dataSource, scheduledEventJob, cleanScheduledEventJob) {
+    constructor(dataSource, scheduledEventJob) {
         super();
         this.dataSource = dataSource;
         this.scheduledEventJob = scheduledEventJob;
-        this.cleanScheduledEventJob = cleanScheduledEventJob;
         dataSource.subscribers.push(this);
     }
     listenTo() {
         return scheduled_event_entity_1.ScheduledEventEntity;
     }
+    async beforeInsert(event) {
+        event.entity.attributes = {
+            ...event.entity.attributes,
+            ...{},
+        };
+    }
     async afterInsert(event) {
-        await this.scheduledEventJob.dispatch(event.entity.id);
+        await this.scheduledEventJob.dispatch(this.getEventData(event));
     }
     async afterUpdate(event) {
-        const trackingColumns = ['event_id', 'parameter', 'timing', 'active', 'start_time', 'end_time'];
-        if (this.isColumnUpdated(event, trackingColumns))
-            await this.cleanScheduledEventJob.dispatch(event.entity);
+        await this.scheduledEventJob.dispatch(this.getEventData(event));
     }
 };
 exports.ScheduledEventSubscriber = ScheduledEventSubscriber;
 exports.ScheduledEventSubscriber = ScheduledEventSubscriber = __decorate([
     (0, typeorm_1.EventSubscriber)(),
     __metadata("design:paramtypes", [typeorm_1.DataSource,
-        scheduled_event_job_1.ScheduledEventJob,
-        clean_scheduled_event_job_1.CleanScheduledEventJob])
+        scheduled_event_job_1.ScheduledEventJob])
 ], ScheduledEventSubscriber);
 //# sourceMappingURL=scheduled.event.subscriber.js.map

package/dist/system/subscribers/scheduled.event.subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled.event.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/scheduled.event.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgF;AAChF,gFAA4E;AAC5E,+EAA0E;AAC1E,iFAA2E;AAC3E,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAsC;IAChF,YACqB,UAAsB,EACtB,iBAAoC,EACpC,sBAA8C;QAE/D,KAAK,EAAE,CAAC;QAJS,eAAU,GAAV,UAAU,CAAY;QACtB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAG/D,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,QAAQ;QACJ,OAAO,6CAAoB,CAAC;IAChC,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,KAAwC;QACtD,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,KAAwC;QACtD,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAEhG,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC;YAAE,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/G,CAAC;CACJ,CAAA;AApBY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,yBAAe,GAAE;qCAGmB,oBAAU;QACH,uCAAiB;QACZ,kDAAsB;GAJ1D,wBAAwB,CAoBpC"}
+{"version":3,"file":"scheduled.event.subscriber.js","sourceRoot":"","sources":["../../../src/system/subscribers/scheduled.event.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgF;AAChF,gFAA4E;AAC5E,+EAA0E;AAC1E,qEAAgE;AAGzD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAsC;IAChF,YACqB,UAAsB,EACtB,iBAAoC;QAErD,KAAK,EAAE,CAAC;QAHS,eAAU,GAAV,UAAU,CAAY;QACtB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAGrD,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,QAAQ;QACJ,OAAO,6CAAoB,CAAC;IAChC,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,KAAwC;QACvD,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG;YACtB,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU;YAC1B,GAAG,EAAE;SACR,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAwC;QACtD,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,KAAwC;QACtD,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ,CAAA;AAxBY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,yBAAe,GAAE;qCAGmB,oBAAU;QACH,uCAAiB;GAHhD,wBAAwB,CAwBpC"}