@solidxai/core 0.1.11-beta.0 → 0.1.11-beta.2

package/dist/subscribers/created-by-updated-by.subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"created-by-updated-by.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/created-by-updated-by.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmD;AACnD,6CAAmD;AACnD,iFAA6E;AAC7E,qCAA0F;AAInF,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAErC,YAEqB,iBAA6B,EAC7B,qBAA4C;QAD5C,sBAAiB,GAAjB,iBAAiB,CAAY;QAC7B,0BAAqB,GAArB,qBAAqB,CAAuB;IAGjE,CAAC;IAED,gBAAgB,CAAC,UAAsB;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAA0C,EAAE,QAAiB;QACtF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QACzE,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAWD,IAAI,QAAQ,EAAE,CAAC;YACX,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;YACpD,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;QACxD,CAAC;aACI,CAAC;YACF,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;QACxD,CAAC;IACL,CAAC;CASJ,CAAA;AA1DY,oEAA4B;uCAA5B,4BAA4B;IAFxC,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,cAAK,CAAC,SAAS,EAAE,CAAC;IAK9B,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACiB,oBAAU;QACN,+CAAqB;GALxD,4BAA4B,CA0DxC","sourcesContent":["import { Injectable, Scope } from \"@nestjs/common\";\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport { RequestContextService } from \"src/services/request-context.service\";\nimport { DataSource, EntitySubscriberInterface, InsertEvent, UpdateEvent } from \"typeorm\";\n\n@Injectable({ scope: Scope.TRANSIENT })\n// @EventSubscriber()\nexport class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {\n    private dataSource: DataSource;\n    constructor(\n        @InjectDataSource()\n        private readonly defaultDataSource: DataSource,\n        private readonly requestContextService: RequestContextService,\n    ) {\n        // this.dataSource.subscribers.push(this);\n    }\n\n    bindToDataSource(dataSource: DataSource) {\n        this.dataSource = dataSource;\n        this.dataSource.subscribers.push(this);\n    }\n\n    async beforeInsert(event: InsertEvent<any>) {\n        await this.stampUserField(event, true);\n    }\n\n    async beforeUpdate(event: UpdateEvent<any>) {\n        await this.stampUserField(event, false);\n    }\n\n    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean) {\n        if (!event.entity) {\n            return;\n        }\n        // Get the current active user details from the request context\n        const activeUserOrUndefined = this.requestContextService.getActiveUser();\n        if (!activeUserOrUndefined) {\n            return;\n        }\n\n        // const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);\n        // if (isInsert) {\n        //     event.entity.createdBy = loadedUser?.id;\n        //     event.entity.updatedBy = loadedUser?.id; // For insert, we set both createdBy and updatedBy to the same user\n        // }\n        // else {\n        //     event.entity.updatedBy = loadedUser?.id;\n        // }\n\n        if (isInsert) {\n            event.entity.createdBy = activeUserOrUndefined?.sub;\n            event.entity.updatedBy = activeUserOrUndefined?.sub; // For insert, we set both createdBy and updatedBy to the same user\n        }\n        else {\n            event.entity.updatedBy = activeUserOrUndefined?.sub;\n        }\n    }\n\n    // private async loadUser(activeUser: ActiveUserData): Promise<User> {\n    //     const userRepo = this.defaultDataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application\n    //     const loadedUser = await userRepo.findOne({\n    //         where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token\n    //     });\n    //     return loadedUser;;\n    // }\n}"]}
+{"version":3,"file":"created-by-updated-by.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/created-by-updated-by.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmD;AACnD,6CAAmD;AACnD,iFAA6E;AAC7E,qCAA0F;AAInF,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAErC,YAEqB,iBAA6B,EAC7B,qBAA4C;QAD5C,sBAAiB,GAAjB,iBAAiB,CAAY;QAC7B,0BAAqB,GAArB,qBAAqB,CAAuB;IAGjE,CAAC;IAED,gBAAgB,CAAC,UAAsB;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAuB;QACtC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAA0C,EAAE,QAAiB;QACtF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QACzE,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAcD,IAAI,QAAQ,EAAE,CAAC;YACX,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;YACpD,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;QACxD,CAAC;aACI,CAAC;YACF,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,qBAAqB,EAAE,GAAG,CAAC;QACxD,CAAC;IACL,CAAC;CASJ,CAAA;AA7DY,oEAA4B;uCAA5B,4BAA4B;IAFxC,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,cAAK,CAAC,SAAS,EAAE,CAAC;IAK9B,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACiB,oBAAU;QACN,+CAAqB;GALxD,4BAA4B,CA6DxC","sourcesContent":["import { Injectable, Scope } from \"@nestjs/common\";\nimport { InjectDataSource } from \"@nestjs/typeorm\";\nimport { RequestContextService } from \"src/services/request-context.service\";\nimport { DataSource, EntitySubscriberInterface, InsertEvent, UpdateEvent } from \"typeorm\";\n\n@Injectable({ scope: Scope.TRANSIENT })\n// @EventSubscriber()\nexport class CreatedByUpdatedBySubscriber implements EntitySubscriberInterface {\n    private dataSource: DataSource;\n    constructor(\n        @InjectDataSource()\n        private readonly defaultDataSource: DataSource,\n        private readonly requestContextService: RequestContextService,\n    ) {\n        // this.dataSource.subscribers.push(this);\n    }\n\n    bindToDataSource(dataSource: DataSource) {\n        this.dataSource = dataSource;\n        this.dataSource.subscribers.push(this);\n    }\n\n    async beforeInsert(event: InsertEvent<any>) {\n        await this.stampUserField(event, true);\n    }\n\n    async beforeUpdate(event: UpdateEvent<any>) {\n        await this.stampUserField(event, false);\n    }\n\n    private async stampUserField(event: InsertEvent<any> | UpdateEvent<any>, isInsert: boolean) {\n        if (!event.entity) {\n            return;\n        }\n        // Get the current active user details from the request context\n        const activeUserOrUndefined = this.requestContextService.getActiveUser();\n        if (!activeUserOrUndefined) {\n            return;\n        }\n\n        // NOTE: If re-enabling loadUser below, query via `event.queryRunner.manager`, NOT\n        // `this.defaultDataSource.getRepository(...)`. A second connection opened mid-transaction\n        // deadlocks single-threaded engines (PGlite).\n        // const loadedUser = await this.loadUser(activeUserOrUndefined as unknown as ActiveUserData);\n        // if (isInsert) {\n        //     event.entity.createdBy = loadedUser?.id;\n        //     event.entity.updatedBy = loadedUser?.id; // For insert, we set both createdBy and updatedBy to the same user\n        // }\n        // else {\n        //     event.entity.updatedBy = loadedUser?.id;\n        // }\n\n        if (isInsert) {\n            event.entity.createdBy = activeUserOrUndefined?.sub;\n            event.entity.updatedBy = activeUserOrUndefined?.sub; // For insert, we set both createdBy and updatedBy to the same user\n        }\n        else {\n            event.entity.updatedBy = activeUserOrUndefined?.sub;\n        }\n    }\n\n    // private async loadUser(activeUser: ActiveUserData): Promise<User> {\n    //     const userRepo = this.defaultDataSource.getRepository(User); // Assuming 'User' is the entity name for users in your application\n    //     const loadedUser = await userRepo.findOne({\n    //         where: { id: activeUser.sub }, // Assuming 'sub' is the user ID in the JWT token\n    //     });\n    //     return loadedUser;;\n    // }\n}"]}

package/dist/subscribers/field-metadata.subscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-metadata.subscriber.d.ts","sourceRoot":"","sources":["../../src/subscribers/field-metadata.subscriber.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAgC,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3G,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,qBACa,uBAAwB,YAAW,yBAAyB,CAAC,aAAa,CAAC;IAKpF,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJ7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAIhD,UAAU,EAAE,UAAU;IAKzC,QAAQ;IAIF,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CA6BpE"}
+{"version":3,"file":"field-metadata.subscriber.d.ts","sourceRoot":"","sources":["../../src/subscribers/field-metadata.subscriber.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAgC,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3G,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,qBACa,uBAAwB,YAAW,yBAAyB,CAAC,aAAa,CAAC;IAKpF,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJ7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAIhD,UAAU,EAAE,UAAU;IAKzC,QAAQ;IAIF,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAgCpE"}

package/dist/subscribers/field-metadata.subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"field-metadata.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/field-metadata.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAuE;AACvE,6CAAmD;AAEnD,qCAA2G;AAC3G,6EAAkE;AAI3D,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAGlC,YAEE,UAAuC;QAAtB,eAAU,GAAV,UAAU,CAAY;QAJxB,WAAM,GAAG,IAAI,eAAM,CAAC,yBAAuB,CAAC,IAAI,CAAC,CAAC;QAMjE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ;QACN,OAAO,qCAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAiC;IA4BnD,CAAC;CACF,CAAA;AA3CY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACU,oBAAU;GAL9B,uBAAuB,CA2CnC","sourcesContent":["import { Injectable, Logger, NotFoundException } from '@nestjs/common';\nimport { InjectDataSource } from '@nestjs/typeorm';\nimport { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';\nimport { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from 'typeorm';\nimport { FieldMetadata } from '../entities/field-metadata.entity';\n\n// @EventSubscriber()\n@Injectable()\nexport class FieldMetadataSubscriber implements EntitySubscriberInterface<FieldMetadata> {\n  private readonly logger = new Logger(FieldMetadataSubscriber.name);\n\n  constructor(\n    @InjectDataSource()\n    private readonly dataSource: DataSource,\n  ) {\n    this.dataSource.subscribers.push(this);\n  }\n\n  listenTo() {\n    return FieldMetadata;\n  }\n\n  async afterUpdate(event: UpdateEvent<FieldMetadata>): Promise<void> {\n    // If a field of type relation.many-to-one is marked for removal, and this field had an inverse relation created \n    // It means there is a field of type relation.one-to-many in the co-model, which needs to be removed\n    // if (event.entity && event.entity.isMarkedForRemoval && event.entity.type === 'relation' && event.entity.relationType === 'many-to-one' && event.entity.relationCreateInverse === true) {\n    //   const relationCoModelSingularName = event.entity.relationCoModelSingularName;\n    //   const relationCoModelFieldName = event.entity.relationCoModelFieldName;\n\n    //   // Load the field metadata for the co-model.\n    //   const coModelFieldMetadata = await this.dataSource\n    //     .getRepository(FieldMetadata)\n    //     .findOne({\n    //       where: {\n    //         name: relationCoModelFieldName,\n    //         type: 'relation',\n    //         relationType: 'one-to-many',\n    //         model: {\n    //           singularName: relationCoModelSingularName\n    //         }\n    //       },\n    //     });\n\n    //   // Mark the co-model isMarkedForRemoval field for removal.\n    //   if (coModelFieldMetadata) {\n    //     coModelFieldMetadata.isMarkedForRemoval = true;\n    //     await this.dataSource.getRepository(FieldMetadata).save(coModelFieldMetadata);\n    //     this.logger.debug(`Marked field ${coModelFieldMetadata.name} in model ${relationCoModelSingularName} for removal.`);\n    //   }\n    // }\n  }\n}\n"]}
+{"version":3,"file":"field-metadata.subscriber.js","sourceRoot":"","sources":["../../src/subscribers/field-metadata.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAuE;AACvE,6CAAmD;AAEnD,qCAA2G;AAC3G,6EAAkE;AAI3D,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAGlC,YAEE,UAAuC;QAAtB,eAAU,GAAV,UAAU,CAAY;QAJxB,WAAM,GAAG,IAAI,eAAM,CAAC,yBAAuB,CAAC,IAAI,CAAC,CAAC;QAMjE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ;QACN,OAAO,qCAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAiC;IA+BnD,CAAC;CACF,CAAA;AA9CY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCACU,oBAAU;GAL9B,uBAAuB,CA8CnC","sourcesContent":["import { Injectable, Logger, NotFoundException } from '@nestjs/common';\nimport { InjectDataSource } from '@nestjs/typeorm';\nimport { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';\nimport { DataSource, EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent } from 'typeorm';\nimport { FieldMetadata } from '../entities/field-metadata.entity';\n\n// @EventSubscriber()\n@Injectable()\nexport class FieldMetadataSubscriber implements EntitySubscriberInterface<FieldMetadata> {\n  private readonly logger = new Logger(FieldMetadataSubscriber.name);\n\n  constructor(\n    @InjectDataSource()\n    private readonly dataSource: DataSource,\n  ) {\n    this.dataSource.subscribers.push(this);\n  }\n\n  listenTo() {\n    return FieldMetadata;\n  }\n\n  async afterUpdate(event: UpdateEvent<FieldMetadata>): Promise<void> {\n    // NOTE: If re-enabling the block below, use `event.queryRunner.manager` (the active\n    // transaction's connection), NOT `this.dataSource.getRepository(...)`. A second\n    // connection opened here mid-transaction deadlocks single-threaded engines (PGlite).\n    // If a field of type relation.many-to-one is marked for removal, and this field had an inverse relation created \n    // It means there is a field of type relation.one-to-many in the co-model, which needs to be removed\n    // if (event.entity && event.entity.isMarkedForRemoval && event.entity.type === 'relation' && event.entity.relationType === 'many-to-one' && event.entity.relationCreateInverse === true) {\n    //   const relationCoModelSingularName = event.entity.relationCoModelSingularName;\n    //   const relationCoModelFieldName = event.entity.relationCoModelFieldName;\n\n    //   // Load the field metadata for the co-model.\n    //   const coModelFieldMetadata = await this.dataSource\n    //     .getRepository(FieldMetadata)\n    //     .findOne({\n    //       where: {\n    //         name: relationCoModelFieldName,\n    //         type: 'relation',\n    //         relationType: 'one-to-many',\n    //         model: {\n    //           singularName: relationCoModelSingularName\n    //         }\n    //       },\n    //     });\n\n    //   // Mark the co-model isMarkedForRemoval field for removal.\n    //   if (coModelFieldMetadata) {\n    //     coModelFieldMetadata.isMarkedForRemoval = true;\n    //     await this.dataSource.getRepository(FieldMetadata).save(coModelFieldMetadata);\n    //     this.logger.debug(`Marked field ${coModelFieldMetadata.name} in model ${relationCoModelSingularName} for removal.`);\n    //   }\n    // }\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core",
-  "version": "0.1.11-beta.0",
+  "version": "0.1.11-beta.2",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/controllers/service.controller.ts

@@ -10,6 +10,7 @@ import { SolidRegistry } from '../helpers/solid-registry';
 export interface PostProcessCodeGenConfig {
     runModuleMetadataSeeder?: boolean; // If true, regenerate module metadata
     runSolidIngestion?: boolean; // If true, run solid ingestion command
+    modulesToSeed?: string[]; // If provided, only seed these specific modules
 }
 @Controller('')
 @ApiTags("Solid Core")
@@ -101,7 +102,7 @@ export class ServiceController {
             return;
         }
         this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);
-        await seeder.seed();
+        await seeder.seed({ modulesToSeed: seedData?.modulesToSeed });
         return { message: `seed data for ${seederName}` };
     }
 
@@ -123,7 +124,7 @@ export class ServiceController {
             if (!seeder) {
                 this.logger.error(`Seeder service ModuleMetadataSeederService not found. Does your service have a seed() method?`);
             } else {
-                await seeder.seed();
+                await seeder.seed({ modulesToSeed: config.modulesToSeed });
             }
         } else {
             this.logger.debug(`Skipping the Module Metadata Seeder Service as part of post-process code generation`);

package/src/helpers/field-crud-managers/IntFieldCrudManager.ts

@@ -15,7 +15,10 @@ export class IntFieldCrudManager implements FieldCrudManager {
 
     validate(createDto: any): ValidationError[] {
         const fieldValue: any = createDto[this.options.fieldName];
-        return this.applyValidations(fieldValue);
+        if (typeof fieldValue === 'string' && /^\d+$/.test(fieldValue.trim())) {
+            createDto[this.options.fieldName] = Number.parseInt(fieldValue, 10);
+        }
+        return this.applyValidations(createDto[this.options.fieldName]);
     }
 
     private applyValidations(fieldValue: any): ValidationError[] {

package/src/helpers/solid-registry.ts

@@ -8,7 +8,7 @@ import { Locale } from 'src/entities/locale.entity';
 import { SecurityRule } from 'src/entities/security-rule.entity';
 import { IScheduledJob } from 'src/services/scheduled-jobs/scheduled-job.interface';
 import { IDashboardWidgetDataProvider, IErrorCodeProvider, ISecurityRuleConfigProvider, ISelectionProvider, ISelectionProviderContext, ISolidDatabaseModule } from "../interfaces";
-import { ObjectLiteral } from 'typeorm';
+import { EntityManager, ObjectLiteral } from 'typeorm';
 
 type ControllerMetadata = {
   name: string;
@@ -49,6 +49,12 @@ export interface TypeOrmEventContext {
   metadataName?: string;
   updatedColumns?: string[];
   updatedRelations?: string[];
+  // Transaction-bound EntityManager from the originating TypeORM event. Providers that
+  // need to query the DB during a pre-compute hook must use this (not an injected
+  // DataSource/EntityManager) so the query runs on the active transaction's connection.
+  // On single-threaded embedded engines (PGlite), a second connection mid-transaction
+  // can deadlock.
+  manager?: EntityManager;
 }
 
 export interface ComputedFieldMetadata<TContext = any> {

package/src/repository/scheduled-job.repository.ts

@@ -34,6 +34,71 @@ export class ScheduledJobRepository extends SolidBaseRepository<ScheduledJob> {
         super(ScheduledJob, dataSource, requestContextService, securityRuleRepository);
     }
 
+  private normalizeComparableValue(value: any): any {
+    if (value instanceof Date) {
+      return value.toISOString();
+    }
+
+    if (typeof value === "string") {
+      const trimmedValue = value.trim();
+      if (
+        (trimmedValue.startsWith("{") && trimmedValue.endsWith("}")) ||
+        (trimmedValue.startsWith("[") && trimmedValue.endsWith("]"))
+      ) {
+        try {
+          return this.normalizeComparableValue(JSON.parse(trimmedValue));
+        } catch {
+          return value;
+        }
+      }
+      return value;
+    }
+
+    if (Array.isArray(value)) {
+      return value.map((item) => this.normalizeComparableValue(item));
+    }
+
+    if (value && typeof value === "object") {
+      return Object.keys(value)
+        .sort()
+        .reduce((result, key) => {
+          result[key] = this.normalizeComparableValue(value[key]);
+          return result;
+        }, {} as Record<string, any>);
+    }
+
+    return value;
+  }
+
+  private areValuesDifferent(currentValue: any, nextValue: any): boolean {
+    const normalizedCurrentValue = this.normalizeComparableValue(currentValue);
+    const normalizedNextValue = this.normalizeComparableValue(nextValue);
+
+    if (
+      (normalizedCurrentValue && typeof normalizedCurrentValue === "object") ||
+      (normalizedNextValue && typeof normalizedNextValue === "object")
+    ) {
+      return JSON.stringify(normalizedCurrentValue ?? null) !== JSON.stringify(normalizedNextValue ?? null);
+    }
+
+    return normalizedCurrentValue !== normalizedNextValue;
+  }
+
+  private hasChanges(existing: ScheduledJob, dto: CreateScheduledJobDto, moduleEntity: ModuleMetadata): boolean {
+    return existing.scheduleName !== dto.scheduleName
+      || existing.isActive !== dto.isActive
+      || this.areValuesDifferent(existing.frequency, dto.frequency)
+      || this.areValuesDifferent(existing.startTime, dto.startTime)
+      || this.areValuesDifferent(existing.endTime, dto.endTime)
+      || this.areValuesDifferent(existing.startDate, dto.startDate)
+      || this.areValuesDifferent(existing.endDate, dto.endDate)
+      || this.areValuesDifferent(existing.dayOfMonth, dto.dayOfMonth)
+      || this.areValuesDifferent(existing.dayOfWeek, dto.dayOfWeek)
+      || this.areValuesDifferent(existing.job, dto.job)
+      || this.areValuesDifferent(existing.cronExpression, dto.cronExpression)
+      || existing.module?.id !== moduleEntity.id;
+  }
+
   /**
    * Converts an entity to a plain DTO object.
    */
@@ -91,9 +156,17 @@ export class ScheduledJobRepository extends SolidBaseRepository<ScheduledJob> {
     };
     const existing = await this.findOne({
       where: { scheduleName: dto.scheduleName },
+      relations: {
+        module: true,
+      },
     });
 
     if (existing) {
+      if (!this.hasChanges(existing, dto, moduleEntity)) {
+        this.logger.debug(`Skipping scheduled job upsert for ${dto.scheduleName}; no changes detected.`);
+        return existing;
+      }
+
       const merged = this.merge(existing, jobData);
       this.logger.debug(`Updating scheduled job: ${dto.scheduleName}`);
       return this.save(merged);