@solidstarters/solid-core 1.2.151 → 1.2.153

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.151",
+  "version": "1.2.153",
   "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/rebuild.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 npm i
 npm run build 
-#rm /Users/oswald/.nvm/versions/node/v21.7.3/bin/solid
+rm ~/.nvm/versions/node/v22.13.1/bin/solidCore
 npm i -g
 chmod +x dist/cli.js

package/src/dtos/create-scheduled-job.dto.ts

@@ -7,62 +7,56 @@ export class CreateScheduledJobDto {
     @IsString()
     @ApiProperty()
     scheduleName: string;
-
     @IsNotEmpty()
     @IsBoolean()
     @ApiProperty()
     isActive: boolean = false;
-
     @IsNotEmpty()
     @IsString()
     @ApiProperty()
     frequency: string;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     startTime: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     endTime: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     startDate: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     endDate: Date;
-
     @IsOptional()
     @IsInt()
     @ApiProperty()
     dayOfMonth: number;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     lastRunAt: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     nextRunAt: Date;
-
     @IsOptional()
     @IsString()
     @ApiProperty()
     dayOfWeek: string;
-
     @IsNotEmpty()
     @IsString()
     @ApiProperty()
     job: string;
-
-    @IsNotEmpty()
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
     moduleId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    moduleUserKey: string;
 }

package/src/dtos/update-scheduled-job.dto.ts

@@ -5,71 +5,64 @@ export class UpdateScheduledJobDto {
     @IsOptional()
     @IsInt()
     id: number;
-
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     scheduleName: string;
-
     @IsNotEmpty()
     @IsOptional()
     @IsBoolean()
     @ApiProperty()
     isActive: boolean;
-
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     frequency: string;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     startTime: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     endTime: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     startDate: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     endDate: Date;
-
     @IsOptional()
     @IsInt()
     @ApiProperty()
     dayOfMonth: number;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     lastRunAt: Date;
-
     @IsOptional()
     @IsDate()
     @ApiProperty()
     nextRunAt: Date;
-
     @IsOptional()
     @IsString()
     @ApiProperty()
     dayOfWeek: string;
-
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     job: string;
-    
-    @IsNotEmpty()
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
     moduleId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    moduleUserKey: string;
 }

package/src/entities/scheduled-job.entity.ts

@@ -29,6 +29,7 @@ export class ScheduledJob extends CommonEntity {
     dayOfWeek: string;
     @Column({ type: "varchar" })
     job: string;
+    @Index()
     @ManyToOne(() => ModuleMetadata, { onDelete: "CASCADE", nullable: false })
     @JoinColumn({ referencedColumnName: 'id' })
     module: ModuleMetadata;

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

@@ -1,4 +1,5 @@
 import { Injectable, Logger } from "@nestjs/common";
+import { CreateScheduledJobDto } from "src/dtos/create-scheduled-job.dto";
 import { ModuleMetadata } from "src/entities/module-metadata.entity";
 import { ScheduledJob } from "src/entities/scheduled-job.entity";
 import { SolidRegistry } from "src/helpers/solid-registry";
@@ -6,21 +7,21 @@ import { CrudHelperService } from "src/services/crud-helper.service";
 import { DataSource, Repository } from "typeorm";
 
 // This should match whatever DTO structure you’re using in your seeding logic
-export type CreateScheduledJobDto = {
-  scheduleName: string;
-  isActive?: boolean;
-  frequency: string;
-  startTime?: Date;
-  endTime?: Date;
-  startDate?: Date;
-  endDate?: Date;
-  dayOfMonth?: number;
-  lastRunAt?: Date;
-  nextRunAt?: Date;
-  dayOfWeek?: string;
-  job: string;
-  moduleUserKey: string;
-};
+// export type CreateScheduledJobDto = {
+//   scheduleName: string;
+//   isActive?: boolean;
+//   frequency: string;
+//   startTime?: Date;
+//   endTime?: Date;
+//   startDate?: Date;
+//   endDate?: Date;
+//   dayOfMonth?: number;
+//   lastRunAt?: Date;
+//   nextRunAt?: Date;
+//   dayOfWeek?: string;
+//   job: string;
+//   moduleUserKey: string;
+// };
 
 @Injectable()
 export class ScheduledJobRepository extends Repository<ScheduledJob> {
@@ -38,28 +39,38 @@ export class ScheduledJobRepository extends Repository<ScheduledJob> {
    * Converts an entity to a plain DTO object.
    */
   async toDto(scheduledJob: ScheduledJob): Promise<CreateScheduledJobDto> {
-    const moduleRepo = this.dataSource.getRepository(ModuleMetadata);
-    const moduleEntity = await moduleRepo.findOne({
-      where: { id: scheduledJob.module?.id },
-    });
+    let populatedScheduledJob: ScheduledJob = scheduledJob;
+    // If the scheduled job does not have the module relation loaded, load it
+    if (!scheduledJob.module) {
+        populatedScheduledJob = await this.findOne({
+            where: {
+                id: scheduledJob.id,
+            },
+            relations: {
+                module: true,
+            },
+        });
+    }
 
-    if (!moduleEntity) {
-      throw new Error(`Module with ID ${scheduledJob.module?.id} not found`);
+    if (!populatedScheduledJob.module) {
+        throw new Error(`Module not found for scheduled job ID ${populatedScheduledJob.id}`);
     }
+
     return {
-      scheduleName: scheduledJob.scheduleName,
-      isActive: scheduledJob.isActive,
-      frequency: scheduledJob.frequency,
-      startTime: scheduledJob.startTime,
-      endTime: scheduledJob.endTime,
-      startDate: scheduledJob.startDate,
-      endDate: scheduledJob.endDate,
-      dayOfMonth: scheduledJob.dayOfMonth,
-      lastRunAt: scheduledJob.lastRunAt,
-      nextRunAt: scheduledJob.nextRunAt,
-      dayOfWeek: scheduledJob.dayOfWeek,
-      job: scheduledJob.job,
-      moduleUserKey: moduleEntity.name,
+      scheduleName: populatedScheduledJob.scheduleName,
+      isActive: populatedScheduledJob.isActive,
+      frequency: populatedScheduledJob.frequency,
+      startTime: populatedScheduledJob.startTime,
+      endTime: populatedScheduledJob.endTime,
+      startDate: populatedScheduledJob.startDate,
+      endDate: populatedScheduledJob.endDate,
+      dayOfMonth: populatedScheduledJob.dayOfMonth,
+      lastRunAt: populatedScheduledJob.lastRunAt,
+      nextRunAt: populatedScheduledJob.nextRunAt,
+      dayOfWeek: populatedScheduledJob.dayOfWeek,
+      job: populatedScheduledJob.job,
+      moduleUserKey: populatedScheduledJob.module.name,
+      moduleId: populatedScheduledJob.module.id,
     };
   }
 
@@ -71,7 +82,7 @@ export class ScheduledJobRepository extends Repository<ScheduledJob> {
     });
 
     if (!moduleEntity) {
-      throw new Error(`Module with ID ${dto.moduleUserKey} not found`);
+      throw new Error(`Module with userKey ${dto.moduleUserKey} not found`);
     }
 
     const jobData = {

package/src/seeders/module-metadata-seeder.service.ts

@@ -40,7 +40,8 @@ import { SystemFieldsSeederService } from './system-fields-seeder.service';
 import { CreateDashboardDto } from 'src/dtos/create-dashboard.dto';
 import { DashboardRepository } from 'src/repository/dashboard.repository';
 // import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
-import { ScheduledJobRepository, CreateScheduledJobDto } from 'src/repository/scheduled-job.repository';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
+import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
 
 @Injectable()
 export class ModuleMetadataSeederService {

package/src/services/computed-fields/entity/alpha-num-external-id-computed-field-provider.ts

@@ -5,15 +5,17 @@ import { CommonEntity } from 'src/entities/common.entity';
 import { ComputedFieldMetadata } from 'src/helpers/solid-registry';
 import { IEntityPreComputeFieldProvider } from 'src/interfaces';
 import { EntityManager } from 'typeorm';
-
+import { get } from "lodash";
 export interface AlphaNumExternalIdContext {
-  prefix: string; // The prefix to use for the external ID
-  length?: number; // Optional: length of the unique code to generate, default is 5
+  prefix?: string;              // alias -> staticPrefix
+  length?: number;              // Optional: length of the unique code to generate, default is 5
+  dynamicFieldPrefix?: string;  // NEW: field name on the entity
 }
 
 @ComputedFieldProvider()
 @Injectable()
-export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, AlphaNumExternalIdContext> {
+export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, AlphaNumExternalIdContext>
+{
   constructor(
     @InjectEntityManager()
     private readonly entityManager: EntityManager
@@ -24,14 +26,28 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
   }
 
   help(): string {
-    return 'Provider used to compute external ID for a CommonEntity.';
+    return 'Provider used to compute external ID for a CommonEntity with support for static or dynamic prefix.';
   }
 
-  async preComputeValue(triggerEntity: T, computedFieldMetadata: ComputedFieldMetadata<AlphaNumExternalIdContext>) {
-    const prefix = computedFieldMetadata.computedFieldValueProviderCtxt.prefix;
-    const codeLength = computedFieldMetadata.computedFieldValueProviderCtxt.length || 5;
-    const uniqueCode = await this.generateUniqueExternalId(codeLength, triggerEntity, computedFieldMetadata.fieldName);
-    triggerEntity[computedFieldMetadata.fieldName] = `${prefix}-${uniqueCode}`;
+  async preComputeValue( triggerEntity: T, computedFieldMetadata: ComputedFieldMetadata<AlphaNumExternalIdContext>
+ ) {
+    const { prefix, length, dynamicFieldPrefix } =
+      computedFieldMetadata.computedFieldValueProviderCtxt;
+
+    const codeLength = length || 5;
+
+    // Determine prefix
+    let resolvedPrefix = prefix || '';
+
+    if (dynamicFieldPrefix) {
+      const dynamicValue = get(triggerEntity as any, dynamicFieldPrefix);
+      if (dynamicValue) {
+        resolvedPrefix = String(dynamicValue).trim().toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9\-]/g, '');
+      }
+    }
+
+    const uniqueCode = await this.generateUniqueExternalId( codeLength, triggerEntity, computedFieldMetadata.fieldName );
+    triggerEntity[computedFieldMetadata.fieldName] = resolvedPrefix ? `${resolvedPrefix}-${uniqueCode}` : uniqueCode;
   }
 
   private generateRandomCode(length = 5): string {
@@ -43,10 +59,12 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return result;
   }
 
-  private async isExternalIdUnique(externalId: string, triggerEntity: T, fieldName: string): Promise<boolean> {
-    const count = await this.entityManager.count(triggerEntity.constructor.name, {
-      where: { [fieldName]: externalId },
-    });
+  private async isExternalIdUnique( externalId: string, triggerEntity: T, fieldName: string ): Promise<boolean> {
+    const count = await this.entityManager.count(triggerEntity.constructor as any,
+      {
+        where: { [fieldName]: externalId },
+      }
+    );
     return count === 0;
   }
 
@@ -56,7 +74,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       const newId = this.generateRandomCode(codeLength);
 
-      const isUnique = await this.isExternalIdUnique(newId, triggerEntity, fieldName);
+      const isUnique = await this.isExternalIdUnique(newId,triggerEntity,fieldName);
 
       if (isUnique) {
         return newId;
@@ -65,4 +83,4 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
 
     throw new Error('Failed to generate a unique external ID after multiple attempts');
   }
-}
+}

package/src/subscribers/scheduled-job.subscriber.ts

@@ -1,19 +1,18 @@
 import { Injectable, Logger } from "@nestjs/common";
 import { InjectDataSource } from "@nestjs/typeorm";
 import * as fs from "fs/promises";
+import { ModuleMetadata } from "src/entities/module-metadata.entity";
+import { ScheduledJob } from "src/entities/scheduled-job.entity";
+import { ModuleMetadataHelperService } from "src/helpers/module-metadata-helper.service";
+import { ScheduledJobRepository } from "src/repository/scheduled-job.repository";
 import {
   DataSource,
+  EntityManager,
   EntitySubscriberInterface,
   InsertEvent,
-  UpdateEvent,
   RemoveEvent,
-  EntityManager,
+  UpdateEvent,
 } from "typeorm";
-import { ScheduledJob } from "src/entities/scheduled-job.entity";
-import { ModuleMetadataHelperService } from "src/helpers/module-metadata-helper.service";
-import { CreateScheduledJobDto, ScheduledJobRepository } from "src/repository/scheduled-job.repository";
-import { ModuleMetadata } from "src/entities/module-metadata.entity";
-import { where } from "locale-codes";
 
 @Injectable()
 export class ScheduledJobSubscriber
@@ -161,11 +160,12 @@ export class ScheduledJobSubscriber
     );
     // Insert or update job in metadata
     const jobDto = await this.scheduledJobRepo.toDto(populatedScheduleJob as ScheduledJob);
+    const {moduleId, ...dtoToWrite} = jobDto
     if (existingIndex !== -1) {
-      metaData.scheduledJobs[existingIndex] = jobDto;
+      metaData.scheduledJobs[existingIndex] = dtoToWrite;
       this.logger.log(`Updated scheduled job ${jobName} in metadata`);
     } else {
-      metaData.scheduledJobs.push(jobDto);
+      metaData.scheduledJobs.push(dtoToWrite);
       this.logger.log(`Added scheduled job ${jobName} to metadata`);
     }