@solidstarters/solid-core 1.2.168 → 1.2.170

package/src/services/export-transaction.service.ts

@@ -29,6 +29,7 @@ import { SolidIntrospectService } from './solid-introspect.service';
 import { ModelMetadata } from 'src/entities/model-metadata.entity';
 import { UpdateExportTemplateDto } from 'src/dtos/update-export-template.dto';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 
 const EXPORT_CHUNK_SIZE = 100;
 enum ExportStatus {
@@ -71,20 +72,22 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
     @InjectRepository(FieldMetadata, 'default')
     readonly fieldRepo: Repository<FieldMetadata>,
     @InjectRepository(ModelMetadata, 'default')
-    readonly ModelMetadataRepo : Repository<ModelMetadata>,
-    readonly moduleRef: ModuleRef
+    readonly ModelMetadataRepo: Repository<ModelMetadata>,
+    readonly moduleRef: ModuleRef,
+    private readonly modelMetadataHelperService: ModelMetadataHelperService,
+
   ) {
-    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'exportTransaction', 'solid-core',moduleRef);
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'exportTransaction', 'solid-core', moduleRef);
   }
 
   // Return the export stream
-  async triggerExportSync(id: number, exportTransactionEntity: any, updateDto: UpdateExportTemplateDto , filters: any): Promise<ExportTransactionFileInfo> {
+  async triggerExportSync(id: number, exportTransactionEntity: any, updateDto: UpdateExportTemplateDto, filters: any): Promise<ExportTransactionFileInfo> {
     try {
       // const loadedExportTransaction = await this.loadExportTransaction(id);
       // from updateDto, get modelId and get modelMetadata
       const modeldata = await this.ModelMetadataRepo.findOne({
-        where: { id:  updateDto?.modelMetadataId},
-        relations: { fields: true},
+        where: { id: updateDto?.modelMetadataId },
+        relations: { fields: true },
       })
       const modelName = modeldata?.singularName;
       const modelTemplateName = modelName;
@@ -102,13 +105,13 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
   }
 
   // Store the export stream using the appropriate storage provider
-  async triggerExportAsync(id: number, exportTransactionEntity: any, updateDto: UpdateExportTemplateDto, filters:any): Promise<void> {
+  async triggerExportAsync(id: number, exportTransactionEntity: any, updateDto: UpdateExportTemplateDto, filters: any): Promise<void> {
     try {
       // const loadedExportTransaction = await this.loadExportTransaction(id)
       // from updateDto, get modelId and get modelMetadata
       const modeldata = await this.ModelMetadataRepo.findOne({
-        where: { id:  updateDto?.modelMetadataId},
-        relations: { fields: true},
+        where: { id: updateDto?.modelMetadataId },
+        relations: { fields: true },
       })
       const modelName = modeldata?.singularName;
       const modelTemplateName = modelName;
@@ -129,7 +132,7 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
   private async loadExportTransaction(id: number) {
     return await this.repo.findOne({
       where: { id: id },
-      relations: { exportTemplate: { modelMetadata: {fields: true} }},
+      relations: { exportTemplate: { modelMetadata: { fields: true } } },
     }
     );
   }
@@ -138,15 +141,15 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
     await this.repo.update(id, { status, error });
   }
 
-  private async getExportStreamDetails(modelName: string, templateName: string, fields:any, modelData:any, templateFormat:string, id:number, exportTransaction: any, filters: any) {
+  private async getExportStreamDetails(modelName: string, templateName: string, fields: any, modelData: any, templateFormat: string, id: number, exportTransaction: any, filters: any) {
     // Get the columns which need to be exported & the model id
     // const fields = JSON.parse(exportTransaction.exportTemplate.fields);
 
     // // Get the appropriate service for the model by trying to fetch a model service matching a particular name
     // const modelName = exportTransaction.exportTemplate.modelMetadata.singularName;
-     const modelService = this.introspectService.getProvider(`${classify(modelName)}Service`);
+    const modelService = this.introspectService.getProvider(`${classify(modelName)}Service`);
     // const templateName = exportTransaction.exportTemplate.templateName;
-     const uuid = String(id); //TODO can be renamed to exportTransactionUUID
+    const uuid = String(id); //TODO can be renamed to exportTransactionUUID
     // const modelData = exportTransaction.exportTemplate.modelMetadata;
 
     // Get the data records function
@@ -208,17 +211,21 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
     return (fileFormat === ExportFormat.EXCEL) ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' : 'text/csv';
   }
 
-  private async getDataRecordsFunc(fields: any, modelService: InstanceWrapper<any>, modelMetadata: any, filters:any): Promise<(chunkIndex: number, chunkSize: number) => Promise<any[]>> {
-    // Return a function which will take the chunkIndex & chunkSize and return the data
-    // Get the relation fields to populate
-    const relatedFieldNames = modelMetadata?.fields
-    .filter((field: { relationType: any; }) => field.relationType !== null)
-    .map((field: { name: any; }) => field.name);
+  private async getDataRecordsFunc(fields: any, modelService: InstanceWrapper<any>, modelMetadata: any, filters: any): Promise<(chunkIndex: number, chunkSize: number) => Promise<any[]>> {
+    //Load all possible fields for the model
+    const allModelFields = await this.modelMetadataHelperService.loadFieldHierarchy(
+      modelMetadata.singularName,
+    );
+
+    // Filter only the fields requested in the export payload
+    const modelFields = allModelFields.filter((f: any) =>
+      fields.includes(f.name),
+    );
 
     //Get the model metadata of relation field with userKey details
     const relatedModelsUserKeyMap = new Map<string, string>();
-    for (const field of modelMetadata?.fields || []) {
-      if (field.relationType && field.relationCoModelSingularName && fields.includes(field.name)) {
+    for (const field of modelFields) {
+      if (field.relationType && field.relationCoModelSingularName) {
         const relatedModelMetadata = await this.ModelMetadataRepo.findOne({
           where: { singularName: field.relationCoModelSingularName },
           relations: ['userKeyField'],
@@ -230,12 +237,24 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
       }
     }
 
+    // Build fieldName -> displayName map
+    const fieldNameToDisplayName = new Map<string, string>();
+    for (const field of modelFields || []) {
+      if (field.name) {
+        fieldNameToDisplayName.set(field.name, field.displayName ?? field.name);
+      }
+    }
+
+
     return async (chunkIndex: number, chunkSize: number) => {
       const offset = chunkIndex * chunkSize;
       const recordFilterDto: BasicFilterDto = {
         limit: chunkSize,
         offset,
-        populate: relatedFieldNames
+        //only contains relational fields (so TypeORM includes relations in the result).
+        populate: modelFields
+          .filter((f: any) => f.relationType !== null)
+          .map((f: any) => f.name),
       };
       const cleanedFilters = cleanNullsFromObject(filters);
 
@@ -243,43 +262,87 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
         recordFilterDto.filters = cleanedFilters;
       }
 
-      //Get the non relation fields which are in fields array passed to this function
-      const nonRelationalFieldSet = new Set(
-        modelMetadata?.fields
-          .filter((field: { name: any; relationType: any; }) => fields.includes(field.name) && field.relationType === null)
-          .map((field: { name: any; }) => field.name)
-      );
       const data = await modelService.instance.find(recordFilterDto);
       const records = data.records ?? [];
-    const cleanedRecords = records.map((record: Record<string, any>) => {
-      const newRecord: Record<string, any> = {};
-    
-      // Include non-relational fields
-      for (const key of nonRelationalFieldSet as Set<string>) {
-        newRecord[key] = record[key];
-      }
-    
-      // Include userKey from each related field
-      for (const [relatedFieldName, userKeyFieldName] of relatedModelsUserKeyMap.entries()) {
-        const relatedData = record[relatedFieldName];
-    
-        if (Array.isArray(relatedData)) {
-          // For many-to-many or one-to-many
-          const values = relatedData.map(item => item?.[userKeyFieldName]).filter(Boolean);
-          newRecord[relatedFieldName] = values.join(', ');
-        } else if (relatedData && typeof relatedData === 'object') {
-          // For many-to-one or one-to-one
-          newRecord[relatedFieldName] = relatedData?.[userKeyFieldName] ?? null;
-        } else {
-          newRecord[relatedFieldName] = null;
+      const cleanedRecords = records.map((record: Record<string, any>) => {
+        const newRecord: Record<string, any> = {};
+
+        // Include non-relational fields
+        for (const field of modelFields) {
+          if (!field.relationType) {
+            // newRecord[field.name] = record[field.name];
+            const displayKey = fieldNameToDisplayName.get(field.name) ?? field.name;
+            const fieldMeta = modelFields.find(f => f.name === field.name);
+
+            if ((fieldMeta?.type === 'datetime' || fieldMeta?.type === 'date') && record[field.name]) {
+              newRecord[displayKey] = new Date(record[field.name]).toISOString();
+            } else {
+              newRecord[displayKey] = record[field.name];
+            }
+          }
         }
-      }
-    
-      return newRecord;
-    });
-    return cleanedRecords
+
+        // Include userKey from each related field
+        for (const [relatedFieldName, userKeyFieldName] of relatedModelsUserKeyMap.entries()) {
+          const relatedData = record[relatedFieldName];
+          const displayKey = fieldNameToDisplayName.get(relatedFieldName) ?? relatedFieldName;
+
+          if (Array.isArray(relatedData)) {
+            // For many-to-many or one-to-many
+            const values = relatedData
+              .map(item => {
+                let val = item?.[userKeyFieldName];
+                const relatedFieldMeta = modelFields.find(f => f.name === relatedFieldName);
+                if ((relatedFieldMeta?.type === 'datetime' || relatedFieldMeta?.type === 'date') && val) {
+                  val = new Date(val).toISOString();
+                }
+                return val;
+              })
+              .filter(Boolean);
+            newRecord[displayKey] = values.join(', ');
+          } else if (relatedData && typeof relatedData === 'object') {
+            // For many-to-one or one-to-one
+            newRecord[relatedFieldName] = relatedData?.[userKeyFieldName] ?? null;
+          } else {
+            newRecord[displayKey] = null;
+          }
+        }
+
+        // Include userKey from each related field (with displayName)
+        for (const [relatedFieldName, userKeyFieldName] of relatedModelsUserKeyMap.entries()) {
+          const relatedData = record[relatedFieldName];
+          const displayKey = fieldNameToDisplayName.get(relatedFieldName) ?? relatedFieldName;
+
+          if (Array.isArray(relatedData)) {
+            // For many-to-many or one-to-many
+            const values = relatedData
+              .map(item => {
+                const val = item?.[userKeyFieldName];
+                // Convert datetime to ISO if needed
+                const relatedFieldMeta = modelFields.find(f => f.name === relatedFieldName);
+                if ((relatedFieldMeta?.type === 'datetime' || relatedFieldMeta?.type === 'date') && val) {
+                  return new Date(val).toISOString();
+                }
+                return val;
+              })
+              .filter(Boolean);
+            newRecord[displayKey] = values.join(', ');
+          } else if (relatedData && typeof relatedData === 'object') {
+            let val = relatedData?.[userKeyFieldName] ?? null;
+            const relatedFieldMeta = modelFields.find(f => f.name === relatedFieldName);
+            if ((relatedFieldMeta?.type === 'datetime' || relatedFieldMeta?.type === 'date') && val) {
+              val = new Date(val).toISOString();
+            }
+            newRecord[displayKey] = val;
+          } else {
+            newRecord[displayKey] = null;
+          }
+        }
+        return newRecord;
+      });
+      return cleanedRecords
+    }
   }
-}
 
   async toDto(data: Partial<CreateExportTransactionDto>): Promise<CreateExportTransactionDto> {
     const dto = new CreateExportTransactionDto(data);

package/src/services/mcp-tool-response-handlers/solid-create-module-mcp-tool-response-handler.service.ts

@@ -18,7 +18,7 @@ export class SolidCreateModuleMcpToolResponseHandler implements IMcpToolResponse
     async apply(aiInteraction: AiInteraction) {
         const aiResponse = JSON.parse(aiInteraction.message);
 
-        const moduleMetadata = aiResponse['moduleMetadata'];
+        const moduleMetadata = aiResponse?.data?.moduleMetadata ?? {};
 
         // TODO: Validate if another module with same name exists, if it does then raise an error...
 

package/src/solid-core.module.ts

@@ -68,15 +68,12 @@ import { OTPAuthenticationController } from './controllers/otp-authentication.co
 import { ServiceController } from './controllers/service.controller';
 import { SmsTemplateController } from './controllers/sms-template.controller';
 import { TestQueueController } from './controllers/test-queue.controller';
-// import { UserController } from './controllers/user.controller';
 import { EmailAttachment } from './entities/email-attachment.entity';
 import { EmailTemplate } from './entities/email-template.entity';
 import { MenuItemMetadata } from './entities/menu-item-metadata.entity';
 import { MqMessageQueue } from './entities/mq-message-queue.entity';
 import { MqMessage } from './entities/mq-message.entity';
 import { SmsTemplate } from './entities/sms-template.entity';
-import { UserPasswordHistory } from './entities/user-password-history.entity';
-// import { User } from './entities/user.entity';
 import { AccessTokenGuard } from './guards/access-token.guard';
 import { AuthenticationGuard } from './guards/authentication.guard';
 import { PermissionsGuard } from './guards/permissions.guard';
@@ -94,10 +91,6 @@ import { SmsQueuePublisher } from './jobs/sms-publisher.service';
 import { SmsQueueSubscriber } from './jobs/sms-subscriber.service';
 import { TestQueuePublisher } from './jobs/test-queue-publisher.service';
 import { TestQueueSubscriber } from './jobs/test-queue-subscriber.service';
-
-// import { ChatterQueuePublisher } from './jobs/chatter-queue-publisher.service';
-// import { ChatterQueueSubscriber } from './jobs/chatter-queue-subscriber.service';
-
 import { Msg91WhatsappQueuePublisher } from './jobs/msg91-whatsapp-publisher.service';
 import { Msg91WhatsappQueueSubscriber } from './jobs/msg91-whatsapp-subscriber.service';
 import { UserRegistrationListener } from './listeners/user-registration.listener';
@@ -317,7 +310,6 @@ import { SolidCoreErrorCodesProvider } from './helpers/solid-core-error-codes-pr
       SmsTemplate,
       EmailAttachment,
       User,
-      UserPasswordHistory,
       ViewMetadata,
       ActionMetadata,
       MenuItemMetadata,

package/dist/entities/user-password-history.entity.d.ts

@@ -1,7 +0,0 @@
-import { CommonEntity } from 'src/entities/common.entity';
-import { User } from 'src/entities/user.entity';
-export declare class UserPasswordHistory extends CommonEntity {
-    passwordHash: string;
-    user: User;
-}
-//# sourceMappingURL=user-password-history.entity.d.ts.map

package/dist/entities/user-password-history.entity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"user-password-history.entity.d.ts","sourceRoot":"","sources":["../../src/entities/user-password-history.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAGhD,qBACa,mBAAoB,SAAQ,YAAY;IAEjD,YAAY,EAAE,MAAM,CAAC;IAIrB,IAAI,EAAE,IAAI,CAAC;CAEd"}

package/dist/entities/user-password-history.entity.js

@@ -1,35 +0,0 @@
-"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.UserPasswordHistory = void 0;
-const openapi = require("@nestjs/swagger");
-const common_entity_1 = require("./common.entity");
-const user_entity_1 = require("./user.entity");
-const typeorm_1 = require("typeorm");
-let UserPasswordHistory = class UserPasswordHistory extends common_entity_1.CommonEntity {
-    static _OPENAPI_METADATA_FACTORY() {
-        return { passwordHash: { required: true, type: () => String }, user: { required: true, type: () => require("./user.entity").User } };
-    }
-};
-exports.UserPasswordHistory = UserPasswordHistory;
-__decorate([
-    (0, typeorm_1.Column)({ unique: true }),
-    __metadata("design:type", String)
-], UserPasswordHistory.prototype, "passwordHash", void 0);
-__decorate([
-    (0, typeorm_1.Index)(),
-    (0, typeorm_1.ManyToOne)(() => user_entity_1.User, { onDelete: "CASCADE" }),
-    __metadata("design:type", user_entity_1.User)
-], UserPasswordHistory.prototype, "user", void 0);
-exports.UserPasswordHistory = UserPasswordHistory = __decorate([
-    (0, typeorm_1.Entity)("ss_user_password_history")
-], UserPasswordHistory);
-//# sourceMappingURL=user-password-history.entity.js.map

package/dist/entities/user-password-history.entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"user-password-history.entity.js","sourceRoot":"","sources":["../../src/entities/user-password-history.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mDAA0D;AAC1D,+CAAgD;AAChD,qCAA2D;AAGpD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,4BAAY;;;;CAQpD,CAAA;AARY,kDAAmB;AAE5B;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;yDACJ;AAIrB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kBAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACzC,kBAAI;iDAAC;8BANF,mBAAmB;IAD/B,IAAA,gBAAM,EAAC,0BAA0B,CAAC;GACtB,mBAAmB,CAQ/B","sourcesContent":["import { CommonEntity } from 'src/entities/common.entity';\nimport { User } from 'src/entities/user.entity';\nimport { Column, Entity, Index, ManyToOne } from 'typeorm';\n\n@Entity(\"ss_user_password_history\")\nexport class UserPasswordHistory extends CommonEntity {\n    @Column({ unique: true })\n    passwordHash: string;\n\n    @Index()\n    @ManyToOne(() => User, { onDelete: \"CASCADE\" })\n    user: User;\n\n}"]}

package/src/entities/user-password-history.entity.ts

@@ -1,14 +0,0 @@
-import { CommonEntity } from 'src/entities/common.entity';
-import { User } from 'src/entities/user.entity';
-import { Column, Entity, Index, ManyToOne } from 'typeorm';
-
-@Entity("ss_user_password_history")
-export class UserPasswordHistory extends CommonEntity {
-    @Column({ unique: true })
-    passwordHash: string;
-
-    @Index()
-    @ManyToOne(() => User, { onDelete: "CASCADE" })
-    user: User;
-
-}