@solidstarters/solid-core 1.2.140 → 1.2.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.140",
+  "version": "1.2.142",
   "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/dtos/create-ai-interaction.dto.ts

@@ -1,60 +1,56 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsInt } from 'class-validator';
 import { IsOptional } from 'class-validator';
-import { IsString, IsNotEmpty, IsJSON } from 'class-validator';
-export class CreateAiInteractionDto {
-@IsOptional()
-@IsInt()
-@ApiProperty()
-userId: number;
-
-@IsString()
-@IsOptional()
-@ApiProperty()
-userUserKey: string;
-
-@IsNotEmpty()
-@IsString()
-@ApiProperty()
-threadId: string;
-
-@IsNotEmpty()
-@IsString()
-@ApiProperty()
-role: string;
-
-@IsNotEmpty()
-@IsString()
-@ApiProperty()
-message: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-contentType: string;
+import { IsString, IsNotEmpty, IsJSON, IsBoolean } from 'class-validator';
 
-@IsOptional()
-@IsString()
-@ApiProperty()
-status: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-errorMessage: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-modelUsed: string;
-
-@IsOptional()
-@IsInt()
-@ApiProperty()
-responseTimeMs: number;
-
-@IsOptional()
-@IsJSON()
-@ApiProperty()
-metadata: any;
+export class CreateAiInteractionDto {
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    threadId: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    role: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    message: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    contentType: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    status: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    errorMessage: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    modelUsed: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    responseTimeMs: number;
+    @IsOptional()
+    @IsJSON()
+    @ApiProperty()
+    metadata: any;
+
+@IsOptional()
+@IsBoolean()
+@ApiProperty()
+isApplied: boolean = false;
 }

package/src/dtos/update-ai-interaction.dto.ts

@@ -1,65 +1,60 @@
-import { IsInt,IsOptional, IsString, IsNotEmpty, IsJSON } from 'class-validator';
+import { IsInt,IsOptional, IsString, IsNotEmpty, IsJSON, IsBoolean } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+
 export class UpdateAiInteractionDto {
     @IsOptional()
     @IsInt()
     id: number;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    threadId: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    role: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    message: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    contentType: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    status: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    errorMessage: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    modelUsed: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    responseTimeMs: number;
+    @IsOptional()
+    @IsJSON()
+    @ApiProperty()
+    metadata: any;
 
 @IsOptional()
-@IsInt()
-@ApiProperty()
-userId: number;
-
-@IsString()
-@IsOptional()
-@ApiProperty()
-userUserKey: string;
-
-@IsNotEmpty()
-@IsOptional()
-@IsString()
-@ApiProperty()
-threadId: string;
-
-@IsNotEmpty()
-@IsOptional()
-@IsString()
-@ApiProperty()
-role: string;
-
-@IsNotEmpty()
-@IsOptional()
-@IsString()
-@ApiProperty()
-message: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-contentType: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-status: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-errorMessage: string;
-
-@IsOptional()
-@IsString()
-@ApiProperty()
-modelUsed: string;
-
-@IsOptional()
-@IsInt()
-@ApiProperty()
-responseTimeMs: number;
-
-@IsOptional()
-@IsJSON()
+@IsBoolean()
 @ApiProperty()
-metadata: any;
+isApplied: boolean;
 }

package/src/entities/ai-interaction.entity.ts

@@ -1,39 +1,34 @@
 import { CommonEntity } from 'src/entities/common.entity'
 import {Entity, JoinColumn, ManyToOne, Index, Column} from 'typeorm';
 import { User } from 'src/entities/user.entity'
-@Entity("ss_ai_interactions")
-export class AiInteraction extends CommonEntity{
-@Index()
-@ManyToOne(() => User, { onDelete: "CASCADE", nullable: false })
-@JoinColumn()
-user: User;
-
-@Index()
-@Column({ type: "varchar" })
-threadId: string;
-
-@Column({ type: "varchar" })
-role: string;
-
-@Column({ type: "text" })
-message: string;
-
-@Column({ type: "varchar", nullable: true })
-contentType: string;
 
-@Index()
-@Column({ type: "varchar", nullable: true })
-status: string;
-
-@Column({ type: "text", nullable: true })
-errorMessage: string;
-
-@Column({ type: "varchar", nullable: true })
-modelUsed: string;
-
-@Column({ type: "integer", nullable: true })
-responseTimeMs: number;
-
-@Column({ type: "jsonb", nullable: true })
-metadata: any;
+@Entity("ss_ai_interactions")
+export class AiInteraction extends CommonEntity {
+    @Index()
+    @ManyToOne(() => User, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn()
+    user: User;
+    @Index()
+    @Column({ type: "varchar" })
+    threadId: string;
+    @Column({ type: "varchar" })
+    role: string;
+    @Column({ type: "text" })
+    message: string;
+    @Column({ type: "varchar", nullable: true })
+    contentType: string;
+    @Index()
+    @Column({ type: "varchar", nullable: true })
+    status: string;
+    @Column({ type: "text", nullable: true })
+    errorMessage: string;
+    @Column({ type: "varchar", nullable: true })
+    modelUsed: string;
+    @Column({ type: "integer", nullable: true })
+    responseTimeMs: number;
+    @Column({ type: "jsonb", nullable: true })
+    metadata: any;
+
+@Column({ type: "boolean", nullable: true, default: false })
+isApplied: boolean = false;
 }

package/src/entities/dashboard-question-sql-dataset-config.entity.ts

@@ -22,4 +22,7 @@ export class DashboardQuestionSqlDatasetConfig extends CommonEntity {
     question: DashboardQuestion;
     @Column({ type: "text", nullable: true })
     options: any;
+    @Index({ unique: true })
+    @Column({ type: "varchar", nullable: true })
+    externalId: string;
 }

package/src/entities/dashboard-question.entity.ts

@@ -29,4 +29,7 @@ export class DashboardQuestion extends CommonEntity {
     kpiSql: string;
     @Column({ type: "integer", nullable: true })
     sequenceNumber: number;
+    @Index({ unique: true })
+    @Column({ type: "varchar", nullable: true })
+    externalId: string;
 }

package/src/interfaces.ts

@@ -134,8 +134,8 @@ export interface IEntityComputedFieldProvider {
   name(): string;
 }
 
-export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue> extends IEntityComputedFieldProvider {
-  preComputeValue(entity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;
+export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue=void> extends IEntityComputedFieldProvider {
+  preComputeValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;
 }
 
 export interface IEntityPostComputeFieldProvider<TTriggerEntity, TContext> extends IEntityComputedFieldProvider {

package/src/jobs/database/trigger-mcp-client-subscriber-database.service.ts

@@ -62,7 +62,8 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
                 errorMessage: errorsStr,
                 modelUsed: aiResponse.model,
                 responseTimeMs: aiResponse.duration_ms,
-                metadata: JSON.stringify(aiResponse)
+                metadata: JSON.stringify(aiResponse),
+                isApplied: aiInteraction.isApplied
             });
 
             // update the job entry with failure... raising an error will lead the job to be marked as failed...
@@ -80,7 +81,8 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
                 errorMessage: '',
                 modelUsed: aiResponse.model,
                 responseTimeMs: aiResponse.duration_ms,
-                metadata: JSON.stringify(aiResponse)
+                metadata: JSON.stringify(aiResponse),
+                isApplied: aiInteraction.isApplied
             });
         }
 

package/src/mappers/dashboard-mapper.ts

@@ -28,7 +28,7 @@ export class DashboardMapper {
                 chartOptions: question.chartOptions ?? null,
                 labelSql: question.labelSql ?? null,
                 kpiSql: question.kpiSql ?? null,
-
+                externalId: question.externalId,
                 questionSqlDatasetConfigs: (question.questionSqlDatasetConfigs || []).map(config => ({
                     sql: config.sql,
                     datasetName: config.datasetName,
@@ -37,6 +37,7 @@ export class DashboardMapper {
                     labelColumnName: config.labelColumnName,
                     valueColumnName: config.valueColumnName,
                     options: this.safeParseJSON(config.options, {}),
+                    externalId: config.externalId
                 }))
             }))
         };

package/src/repository/view-metadata.repository.ts

@@ -0,0 +1,31 @@
+import { Injectable, Logger } from "@nestjs/common";
+import { Dashboard } from "src/entities/dashboard.entity";
+import { ViewMetadata } from "src/entities/view-metadata.entity";
+import { DataSource, Repository, View } from "typeorm";
+
+@Injectable()
+export class ViewMetadataRepository extends Repository<ViewMetadata> {
+    private readonly logger = new Logger(this.constructor.name);
+
+    constructor(
+        private dataSource: DataSource,
+    ) {
+        super(ViewMetadata, dataSource.createEntityManager());
+    }
+
+    // Custom repository methods can be added here if needed
+    async findByNameAndModelNameAndModuleName(name: string, modelUserKey: string, moduleUserKey: string): Promise<ViewMetadata | null> {
+        const viewMetadata = await this.findOne({
+            where: {
+                name,
+                model: {
+                    singularName: modelUserKey,
+                    module: {
+                        name: moduleUserKey
+                    }
+                }
+            }
+        });
+        return viewMetadata;
+    }
+}

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

@@ -189,7 +189,7 @@ export class ModuleMetadataSeederService {
             // Email templates 
             this.logger.debug(`[Start] Processing email templates for ${moduleMetadata.name}`);
             const emailTemplates: CreateEmailTemplateDto[] = overallMetadata.emailTemplates;
-            await this.seedEmailTemplates(emailTemplates);
+            await this.seedEmailTemplates(emailTemplates, moduleMetadata);
             this.logger.debug(`[End] Processing email templates for ${moduleMetadata.name}`);
 
             // Sms templates
@@ -255,10 +255,11 @@ export class ModuleMetadataSeederService {
             'SavedFiltersController.partialUpdate',
             'SavedFiltersController.update',
             'SavedFiltersController.insertMany',
-            'SavedFiltersController.create'
+            'SavedFiltersController.create',
+            'AuthenticationController.logout'
         ]
         await this.roleService.addPermissionToRole('Internal User', internalRolePermission);
-        await this.roleService.addPermissionToRole('Public', ['SettingController.wrapSettings']);
+        await this.roleService.addPermissionToRole('Public', ['SettingController.wrapSettings','AuthenticationController.logout']);
         this.logger.log(`All Seeders finished`);
         this.logger.log(`Newly created username is: ${usersDetail?.length > 0 ? usersDetail[0]?.username : ''} and password is ${usersDetail?.length > 0 ? usersDetail[0]?.password : ''}`);
     }
@@ -313,7 +314,7 @@ export class ModuleMetadataSeederService {
         }
     }
 
-    async seedEmailTemplates(emailTemplates: CreateEmailTemplateDto[]) {
+    async seedEmailTemplates(emailTemplates: CreateEmailTemplateDto[], moduleMetadata: CreateModuleMetadataDto) {
         if (!emailTemplates) {
             return;
         }
@@ -323,19 +324,24 @@ export class ModuleMetadataSeederService {
             this.logger.log(`Found ${emailTemplate.name} email template`);
 
             // We need to load the actual template contents. 
-            // const emailTemplateFilePath = path.join(process.cwd(), emailTemplate.body);
-
-            // emailTemplate.body = fs.readFileSync(emailTemplateFilePath, 'utf-8').toString()
-            const modulePath = path.dirname(require.resolve('@solidstarters/solid-core'));
-
-            // Resolve the `src` folder
-            const seedDataPath = path.join(modulePath, '../src/seeders/seed-data/email-templates');
-
-            // Example usage
-            const filePath = path.join(seedDataPath, emailTemplate.body);
-
-
-            emailTemplate.body = fs.readFileSync(filePath, 'utf-8').toString();
+            if (moduleMetadata.name === 'solid-core') {
+                const modulePath = path.dirname(require.resolve('@solidstarters/solid-core'));
+                const seedDataPath = path.join(modulePath, '../src/seeders/seed-data/email-templates');
+                const filePath = path.join(seedDataPath, emailTemplate.body);
+                this.logger.log(`Seeding email template from solid-core at path: ${filePath}`);
+                if (fs.existsSync(filePath)) {
+                    emailTemplate.body = fs.readFileSync(filePath, 'utf-8').toString();
+                }
+            }
+            else {
+                // Check if file exists
+                const emailTemplateHandlebar = `module-metadata/${moduleMetadata.name}/email-templates/${emailTemplate.body}`
+                const fullPath = path.join(process.cwd(), emailTemplateHandlebar);
+                this.logger.log(`Seeding custom email template from consuming model at path: ${fullPath}`);
+                if (fs.existsSync(fullPath)) {
+                    emailTemplate.body = fs.readFileSync(fullPath, 'utf-8').toString();
+                }
+            }
 
             // Save to DB.
             await this.emailTemplateService.removeByName(emailTemplate.name);

package/src/seeders/seed-data/solid-core-metadata.json

@@ -4736,6 +4736,31 @@
             "index": false,
             "private": false,
             "encrypt": false
+          },
+          {
+            "name": "externalId",
+            "displayName": "External ID",
+            "type": "computed",
+            "ormType": "varchar",
+            "length": 128,
+            "required": false,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true,
+            "computedFieldValueType": "string",
+            "computedFieldValueProvider": "AlphaNumExternalIdComputationProvider",
+            "computedFieldValueProviderCtxt": "{\"prefix\": \"DQ\"}",
+            "computedFieldTriggerConfig": [
+              {
+                "modelName": "dashboardQuestion",
+                "moduleName": "fees-portal",
+                "operations": [
+                  "before-insert"
+                ]
+              }
+            ]
           }
         ]
       },
@@ -4858,6 +4883,31 @@
             "index": false,
             "private": false,
             "encrypt": false
+          },
+          {
+            "name": "externalId",
+            "displayName": "External ID",
+            "type": "computed",
+            "ormType": "varchar",
+            "length": 128,
+            "required": false,
+            "unique": true,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true,
+            "computedFieldValueType": "string",
+            "computedFieldValueProvider": "AlphaNumExternalIdComputationProvider",
+            "computedFieldValueProviderCtxt": "{\"prefix\": \"DQSDC\"}",
+            "computedFieldTriggerConfig": [
+              {
+                "modelName": "dashboardQuestionSqlDatasetConfig",
+                "moduleName": "fees-portal",
+                "operations": [
+                  "before-insert"
+                ]
+              }
+            ]
           }
         ]
       },
@@ -4996,6 +5046,17 @@
             "index": false,
             "private": false,
             "encrypt": false
+          },
+          {
+            "name": "isApplied",
+            "displayName": "Is Applied",
+            "type": "boolean",
+            "ormType": "boolean",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false
           }
         ]
       }

package/src/services/ai-interaction.service.ts

@@ -205,6 +205,9 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
 
     // TODO: This provider to implement an interface - IMcpToolResponseHandler ... apply(aiInteraction: AiInteraction)
     // throw new Error('Method not implemented.');
+    
+    // Mark the interaction as applied
+    await this.update(aiInteraction.id, { isApplied: true }, [], true);
 
     return handlerApplicationResponse;
   }

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

@@ -0,0 +1,68 @@
+import { Injectable } from '@nestjs/common';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { ComputedFieldProvider } from 'src/decorators/computed-field-provider.decorator';
+import { CommonEntity } from 'src/entities/common.entity';
+import { ComputedFieldMetadata } from 'src/helpers/solid-registry';
+import { IEntityPreComputeFieldProvider } from 'src/interfaces';
+import { EntityManager } from 'typeorm';
+
+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
+}
+
+@ComputedFieldProvider()
+@Injectable()
+export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, AlphaNumExternalIdContext> {
+  constructor(
+    @InjectEntityManager()
+    private readonly entityManager: EntityManager
+  ) { }
+
+  name(): string {
+    return this.constructor.name;
+  }
+
+  help(): string {
+    return 'Provider used to compute external ID for a CommonEntity.';
+  }
+
+  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}`;
+  }
+
+  private generateRandomCode(length = 5): string {
+    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let result = '';
+    for (let i = 0; i < length; i++) {
+      result += chars.charAt(Math.floor(Math.random() * chars.length));
+    }
+    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 },
+    });
+    return count === 0;
+  }
+
+  private async generateUniqueExternalId(codeLength: number, triggerEntity: T, fieldName: string): Promise<string> {
+    const maxAttempts = 10;
+
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+      const newId = this.generateRandomCode(codeLength);
+
+      const isUnique = await this.isExternalIdUnique(newId, triggerEntity, fieldName);
+
+      if (isUnique) {
+        return newId;
+      }
+    }
+
+    throw new Error('Failed to generate a unique external ID after multiple attempts');
+  }
+}

package/src/services/computed-fields/entity/concat-entity-computed-field-provider.service.ts

@@ -14,7 +14,7 @@ export interface ConcatComputedFieldContext {
 
 @ComputedFieldProvider()
 @Injectable()
-export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, ConcatComputedFieldContext, string> {
+export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implements IEntityPreComputeFieldProvider<T, ConcatComputedFieldContext> {
 
     name(): string {
         return "ConcatEntityComputedFieldProvider";
@@ -24,7 +24,7 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
         return "Computed field provider used to create fields whose value is a concatenation of other fields in the same model.";
     }
 
-    async preComputeValue(entity: T, computedFieldMetadata: ComputedFieldMetadata<ConcatComputedFieldContext>): Promise<string> {
+    async preComputeValue(triggerEntity: T, computedFieldMetadata: ComputedFieldMetadata<ConcatComputedFieldContext>){
         const { computedFieldValueProviderCtxt } = computedFieldMetadata;
         const separator = computedFieldValueProviderCtxt.separator || ' '; // Default to space if no separator is provided
         const fields = computedFieldValueProviderCtxt.fields || [];
@@ -35,7 +35,7 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
             const field = fields[i];
 
             // if slugify then each field val to be converted to a slug before concatenation
-            let fieldVal = entity[field];
+            let fieldVal = triggerEntity[field];
             if (slugify && typeof fieldVal === 'string') {
                 fieldVal = kebabCase(fieldVal);
             }
@@ -45,8 +45,7 @@ export class ConcatEntityComputedFieldProvider<T extends CommonEntity> implement
             }
             concatenatedString += fieldVal;
         }
-
-        return concatenatedString;
+        triggerEntity[computedFieldMetadata.fieldName] = concatenatedString; //This set the computed value on the entity, since for pre-compute, entity and triggerEntity are the same
     }
 
 }