@solidxai/core 0.1.10-beta.2 → 0.1.10-beta.22

package/src/services/chatter-message.service.ts

@@ -1,18 +1,20 @@
 import { LocalDateTimeTransformer, serializeDate } from 'src/transformers/typeorm/local-date-time-transformer';
-import { BadRequestException, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ForbiddenException, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
-import { Brackets, EntityManager, EntityMetadata } from 'typeorm';
+import { Brackets, EntityManager, EntityMetadata, In } from 'typeorm';
 
 import { classify } from '@angular-devkit/core/src/utils/strings';
 import { CHATTER_MESSAGE_STATUS, CHATTER_MESSAGE_SUBTYPE, CHATTER_MESSAGE_TYPE } from 'src/constants/chatter-message.constants';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { PostChatterMessageDto } from 'src/dtos/post-chatter-message.dto';
+import { UpdateChatterNoteMessageDto } from 'src/dtos/update-chatter-note-message.dto';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { lowerFirst } from 'src/helpers/string.helper';
 import { ChatterMessageDetailsRepository } from 'src/repository/chatter-message-details.repository';
 import { ChatterMessageRepository } from 'src/repository/chatter-message.repository';
 import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
+import { MediaRepository } from 'src/repository/media.repository';
 import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
 import { CRUDService } from 'src/services/crud.service';
 import { MediaStorageProviderType } from '../dtos/create-media-storage-provider-metadata.dto';
@@ -33,6 +35,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         readonly repo: ChatterMessageRepository,
         // @InjectRepository(ChatterMessageDetailsRepository, 'default')
         readonly chatterMessageDetailsRepo: ChatterMessageDetailsRepository,
+        readonly mediaRepository: MediaRepository,
         // @InjectRepository(FieldMetadata, 'default')
         // readonly fieldMetadataRepo: Repository<FieldMetadata>,
         readonly fieldMetadataRepo: FieldMetadataRepository,
@@ -47,6 +50,41 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         super(entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);
     }
 
+    private resolveMessageUserId(userId?: number | null): number | null {
+        if (userId) {
+            return userId;
+        }
+
+        return this.requestContextService.getActiveUser()?.sub ?? null;
+    }
+
+    private resolveMessageUser(userId?: number | null) {
+        const resolvedUserId = this.resolveMessageUserId(userId);
+        return resolvedUserId ? ({ id: resolvedUserId } as any) : null;
+    }
+
+    private stampMessageAuditFields(chatterMessage: ChatterMessage, userId?: number | null) {
+        const resolvedUserId = this.resolveMessageUserId(userId);
+        chatterMessage.user = resolvedUserId ? ({ id: resolvedUserId } as any) : null;
+        chatterMessage.createdBy = resolvedUserId;
+        chatterMessage.updatedBy = resolvedUserId;
+    }
+
+    private isEditableCustomNoteMessage(message: ChatterMessage): boolean {
+        if (message.messageType !== CHATTER_MESSAGE_TYPE.CUSTOM) {
+            return false;
+        }
+        return [CHATTER_MESSAGE_SUBTYPE.CUSTOM, CHATTER_MESSAGE_SUBTYPE.NOTE].includes(message.messageSubType as any);
+    }
+
+    private parseAttachmentIds(value?: string): number[] {
+        if (!value || typeof value !== 'string') return [];
+        return value
+            .split(',')
+            .map(v => Number(v.trim()))
+            .filter(v => Number.isInteger(v) && v > 0);
+    }
+
     async markCompleted(id: number) {
         const activeUser = this.requestContextService.getActiveUser();
         if (!activeUser) {
@@ -62,6 +100,98 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         return this.repo.save(message);
     }
 
+    async updateCustomNoteMessage(id: number, updateDto: UpdateChatterNoteMessageDto, files: Express.Multer.File[] = []) {
+        const activeUser = this.requestContextService.getActiveUser();
+        if (!activeUser) {
+            throw new ForbiddenException(ERROR_MESSAGES.FORBIDDEN);
+        }
+
+        const message = await this.repo.findOne({ where: { id }, relations: { user: true } });
+        if (!message) {
+            throw new NotFoundException(`Entity [solid-core.chatterMessage] with id ${id} not found`);
+        }
+
+        if (!this.isEditableCustomNoteMessage(message)) {
+            throw new BadRequestException('Only custom note messages can be edited.');
+        }
+
+        if (!message.user?.id || message.user.id !== activeUser.sub) {
+            throw new ForbiddenException('You can only edit your own custom note messages.');
+        }
+
+        const removeAttachmentIds = this.parseAttachmentIds(updateDto?.removeAttachmentIds);
+        const hasMessageBody = typeof updateDto?.messageBody === 'string';
+        const trimmedMessageBody = (updateDto?.messageBody ?? '').trim();
+        const hasNewFiles = Array.isArray(files) && files.length > 0;
+
+        if (!hasMessageBody && removeAttachmentIds.length === 0 && !hasNewFiles) {
+            throw new BadRequestException('No note changes submitted.');
+        }
+
+        if (hasMessageBody && trimmedMessageBody.length === 0) {
+            throw new BadRequestException('Message body cannot be empty.');
+        }
+
+        if (hasMessageBody) {
+            message.messageBody = trimmedMessageBody;
+        }
+        message.updatedBy = activeUser.sub;
+        // Ensure updatedAt changes even for attachment-only edits.
+        message.updatedAt = new Date();
+        const savedMessage = await this.repo.save(message);
+
+        if (removeAttachmentIds.length > 0 || hasNewFiles) {
+            const model = await this.modelMetadataService.findOneBySingularName('chatterMessage', {
+                fields: {
+                    model: true,
+                    mediaStorageProvider: true,
+                },
+                module: true,
+            });
+
+            const mediaFields = model.fields.filter(field => field.type === 'mediaSingle' || field.type === 'mediaMultiple');
+            const attachmentFieldIds = mediaFields.map(field => field.id);
+
+            if (removeAttachmentIds.length > 0 && attachmentFieldIds.length > 0) {
+                const mediaToRemove = await this.mediaRepository.find({
+                    where: {
+                        id: In(removeAttachmentIds),
+                        entityId: savedMessage.id,
+                        modelMetadata: { id: model.id },
+                        fieldMetadata: { id: In(attachmentFieldIds) },
+                    },
+                    relations: {
+                        mediaStorageProviderMetadata: true,
+                        fieldMetadata: true,
+                    },
+                });
+
+                for (const media of mediaToRemove) {
+                    const storageType = media.mediaStorageProviderMetadata?.type as MediaStorageProviderType;
+                    const storageProvider = await getMediaStorageProvider(this.moduleRef, storageType);
+                    await storageProvider.deleteByMediaRecord(media);
+                }
+
+                if (mediaToRemove.length > 0) {
+                    await this.mediaRepository.remove(mediaToRemove);
+                }
+            }
+
+            for (const mediaField of mediaFields) {
+                const storageProviderMetadata = mediaField.mediaStorageProvider;
+                const storageProviderType = storageProviderMetadata.type as MediaStorageProviderType;
+                const storageProvider = await getMediaStorageProvider(this.moduleRef, storageProviderType);
+
+                const media = files.filter(multerFile => multerFile.fieldname === mediaField.name);
+                if (media.length > 0) {
+                    await storageProvider.store(media, savedMessage, mediaField);
+                }
+            }
+        }
+
+        return savedMessage;
+    }
+
     async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.CUSTOM;
@@ -78,14 +208,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         });
         chatterMessage.modelDisplayName = model?.displayName ?? null;
 
-        const activeUser = this.requestContextService.getActiveUser();
-
-        if (activeUser) {
-            const userId = activeUser?.sub;
-            chatterMessage.user = { id: userId } as any;
-        } else {
-            chatterMessage.user = null;
-        }
+        this.stampMessageAuditFields(chatterMessage);
 
         const savedMessage = await this.repo.save(chatterMessage);
 
@@ -114,7 +237,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         return savedMessage;
     }
 
-    async postAuditMessageOnInsert(entity: any, modelName: string, messageQueue: boolean = false) {
+    async postAuditMessageOnInsert(entity: any, modelName: string, messageQueue: boolean = false, userId?: number | null) {
         if (!entity) {
             return;
         }
@@ -139,8 +262,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             !(field.type === 'relation' && field.relationType === 'one-to-many')
         );
 
-        const activeUser = this.requestContextService.getActiveUser();
-
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
         chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_INSERT;
@@ -150,13 +271,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         chatterMessage.modelDisplayName = model?.displayName;
         chatterMessage.modelUserKey = entity[model?.userKeyField?.name];
         chatterMessage.messageBody = `New ${model?.displayName} created`;
-
-        if (activeUser) {
-            const userId = activeUser?.sub;
-            chatterMessage.user = { id: userId } as any;
-        } else {
-            chatterMessage.user = null;
-        }
+        this.stampMessageAuditFields(chatterMessage, userId);
 
         const savedMessage = await this.repo.save(chatterMessage);
 
@@ -177,7 +292,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         }
     }
 
-    async postAuditMessageOnUpdate(entity: any, modelName: string, databaseEntity: any, updatedColumns: any[] = [], messageQueue: boolean = false) {
+    async postAuditMessageOnUpdate(entity: any, modelName: string, databaseEntity: any, updatedColumns: any[] = [], messageQueue: boolean = false, userId?: number | null) {
         if (!databaseEntity || !entity) {
             return;
         }
@@ -259,8 +374,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             return;
         }
 
-        const activeUser = this.requestContextService.getActiveUser();
-
         const chatterMessage = new ChatterMessage();
         chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
         chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_UPDATE;
@@ -270,13 +383,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         chatterMessage.modelDisplayName = model.displayName;
         chatterMessage.modelUserKey = entity[model?.userKeyField?.name];
         chatterMessage.messageBody = `${model?.displayName} updated`;
-
-        if (activeUser) {
-            const userId = activeUser?.sub;
-            chatterMessage.user = { id: userId } as any;
-        } else {
-            chatterMessage.user = null;
-        }
+        this.stampMessageAuditFields(chatterMessage, userId);
 
         const savedMessage = await this.repo.save(chatterMessage);
 
@@ -294,7 +401,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         }
     }
 
-    async postAuditMessageOnDelete(modelName: string, databaseEntity: any, messageQueue: boolean = false) {
+    async postAuditMessageOnDelete(modelName: string, databaseEntity: any, messageQueue: boolean = false, userId?: number | null) {
         const model = await this.modelMetadataRepo.findOne({
             where: {
                 singularName: lowerFirst(modelName)
@@ -335,14 +442,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         chatterMessage.modelUserKey = databaseEntity[model?.userKeyField?.name];
         chatterMessage.messageBody = `${model?.displayName} deleted`;
 
-        const activeUser = this.requestContextService.getActiveUser();
-
-        if (activeUser) {
-            const userId = activeUser?.sub;
-            chatterMessage.user = { id: userId } as any;
-        } else {
-            chatterMessage.user = null;
-        }
+        this.stampMessageAuditFields(chatterMessage, userId);
 
         const savedMessage = await this.repo.save(chatterMessage);
 
@@ -421,7 +521,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
                     if (value.id) {
                         return value.id.toString();
                     }
-                } catch (error) {
+                } catch (error: any) {
                     console.error('Error fetching related model metadata:', error);
                     return value.id ? value.id.toString() : '';
                 }

package/src/services/crud.service.ts

@@ -129,7 +129,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
                 await this.saveMedia(model, files, savedEntity);
             }
             return savedEntity;
-        } catch (error) {
+        } catch (error: any) {
             if (error instanceof QueryFailedError && error.message.includes('duplicate key value violates unique constraint')) {
                 throw new BadRequestException(ERROR_MESSAGES.DUPLICATE_ENTRY);
             }

package/src/services/csv.service.ts

@@ -68,7 +68,7 @@ export class CsvService {
       }
 
       csvStream.end(); // ✅ Ensure CSV stream is finalized
-    } catch (error) {
+    } catch (error: any) {
       this.logger.error(`❌ Error writing CSV: ${error.message}`);
       passThrough.destroy(error); // ✅ Properly destroy stream on error
       throw error;

package/src/services/dashboard.service.ts

@@ -117,7 +117,7 @@ export class DashboardService extends CRUDService<Dashboard> {
     const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(moduleName);
     try {
       await fs.access(filePath);
-    } catch (error) {
+    } catch (error: any) {
       throw new Error(`Configuration file not found for module: ${moduleName}`);
     }
     const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);

package/src/services/database/database-bootstrap.service.ts

@@ -80,7 +80,7 @@ export class DatabaseBootstrapService implements OnModuleInit {
       await this.dataSource.query(sql);
 
       this.logger.debug(`[${this.dataSource.name}] Applied ${fileName}`);
-    } catch (error) {
+    } catch (error: any) {
       // DO NOT THROW — continue with next file
       this.logger.error(
         `[${this.dataSource.name}] Failed ${fileName}`,

package/src/services/excel.service.ts

@@ -93,7 +93,7 @@ export class ExcelService {
 
       workbook.commit();
       // passThrough.end(); // ✅ Properly close the stream
-    } catch (error) {
+    } catch (error: any) {
       this.logger.error(`❌ Error writing Excel: ${error.message}`);
       passThrough.destroy(error); // Destroy stream
       throw error;

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

@@ -90,7 +90,7 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
       const fileName = this.getFileName(templateName, uuid, templateFormat);
       const mimeType = this.getMimeType(templateFormat);
       return { exportStream, fileName, mimeType, exportTransaction };
-    } catch (error) {
+    } catch (error: any) {
       this.updateExportTransaction(id, ExportStatus.FAILED, error.message);
       throw error;
     }
@@ -114,7 +114,7 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
       // Store the file using the appropriate storage provider
       await this.storeExportStream(exportStream, exportTransaction, this.getFileName(templateName, uuid, templateFormat));
       this.updateExportTransaction(id, ExportStatus.COMPLETED);
-    } catch (error) {
+    } catch (error: any) {
       this.updateExportTransaction(id, ExportStatus.FAILED, error.message);
       throw error;
 

package/src/services/field-metadata.service.ts

@@ -1256,7 +1256,7 @@ export class FieldMetadataService implements OnApplicationBootstrap {
             // Write the updated object back to the file
             const updatedContent = JSON.stringify(metaData, null, 2);
             await fs.writeFile(filePath, updatedContent);
-        } catch (error) {
+        } catch (error: any) {
             this.logger.error('File creation failed:', error);
             throw new Error(ERROR_MESSAGES.FILE_WRITE_FAILED); // Trigger rollback
         }

package/src/services/fixtures.service.ts

@@ -35,7 +35,7 @@ export class FixturesService {
                 // Create the model instance in the database
                 const createdInstance = await modelServiceInstance.create(modelFixture.data);
                 this.logger.log(`Successfully created fixture for model: ${modelFixture.singularName} with ID: ${createdInstance.id}`);
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`Error creating fixture for model: ${modelFixture.singularName} - ${error.message}`);
             }
         }
@@ -59,7 +59,7 @@ export class FixturesService {
                 const deleteCriteria = modelFixture.data; // This should be adjusted based on actual criteria
                 await modelServiceInstance.delete(deleteCriteria);
                 this.logger.log(`Successfully deleted fixture for model: ${modelFixture.singularName}`);
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`Error deleting fixture for model: ${modelFixture.singularName} - ${error.message}`);
             }
         }

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

@@ -25,7 +25,7 @@ import { SolidIntrospectService } from './solid-introspect.service';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { getUserExcludedFields } from 'src/helpers/user-helper';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
-import {upperFirst, camelCase} from 'lodash';
+import { upperFirst, camelCase } from 'lodash';
 import { classify } from '../helpers/string.helper';
 
 interface ImportTemplateFileInfo {
@@ -557,7 +557,7 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
         const createdRecord = await this.insertRecord(record, JSON.parse(importTransaction.mapping) as ImportMapping[], importTransaction.modelMetadata, modelService);
         ids.push(createdRecord.id); // Add the ID of the created record to the ids array
       }
-      catch (error) {
+      catch (error: any) {
         this.logger.debug(`Error inserting record: ${JSON.stringify(record)}. Error: ${error.message}`);
         // Get the Import transaction error log repo
         const errorLog = await this.createErrorLogEntry(importTransaction, record, error);

package/src/services/list-of-values.service.ts

@@ -140,7 +140,7 @@ export class ListOfValuesService extends CRUDService<ListOfValues> {
     const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(moduleName);
     try {
       await fs.access(filePath);
-    } catch (error) {
+    } catch (error: any) {
       throw new Error(`Configuration file not found for module: ${moduleName}`);
     }
     const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);

package/src/services/mcp-audit-log.service.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { McpAuditLog } from 'src/entities/mcp-audit-log.entity';
+import { McpAuditLogRepository } from 'src/repository/mcp-audit-log.repository';
+import { EntityManager } from 'typeorm';
+import { CRUDService } from './crud.service';
+
+@Injectable()
+export class McpAuditLogService extends CRUDService<McpAuditLog> {
+  constructor(
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    readonly repo: McpAuditLogRepository,
+    readonly moduleRef: ModuleRef,
+  ) {
+    super(entityManager, repo, 'mcpAuditLog', 'solid-core', moduleRef);
+  }
+}

package/src/services/mediaStorageProviders/file-s3-storage-provider.ts

@@ -120,6 +120,18 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
         }
     }
 
+    async deleteByMediaRecord(media: Media): Promise<void> {
+        const storageProvider = media?.mediaStorageProviderMetadata;
+        if (!storageProvider) {
+            throw new Error(`mediaStorageProviderMetadata is not populated for media id ${media?.id ?? 'unknown'}`);
+        }
+        if (!storageProvider?.bucketName || !media?.relativeUri) {
+            return;
+        }
+        const region = this.getEffectiveRegion(storageProvider.region);
+        await this.s3FileService.delete(`${storageProvider.bucketName}:${media.relativeUri}`, { region });
+    }
+
     /**
      * Get the effective region to use for S3 operations.
      * Uses the provider-specific region if configured, otherwise falls back to env variable.

package/src/services/mediaStorageProviders/file-storage-provider.ts

@@ -110,6 +110,13 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
         // });
     }
 
+    async deleteByMediaRecord(media: Media): Promise<void> {
+        if (!media?.relativeUri) {
+            return;
+        }
+        await this.fileService.delete(this.getFullFilePath(media.relativeUri));
+    }
+
     private getFullFilePath(fileName: string): string {
         const base = this.settingService.getConfigValue<SolidCoreSetting>("fileStorageDir")
             || DEFAULT_MEDIA_FILE_STORAGE_DIR;
@@ -122,4 +129,4 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
     private getFileName(file: Express.Multer.File): string {
         return `${file.filename}-${file.originalname}`;
     }
-}
+}

package/src/services/model-metadata.service.ts

@@ -27,6 +27,7 @@ import {
   REMOVE_FIELDS_COMMAND,
   SchematicService
 } from '../helpers/schematic.service';
+import { CommandService } from '../helpers/command.service';
 import { CodeGenerationOptions } from '../interfaces';
 import { CrudHelperService } from './crud-helper.service';
 import { FieldMetadataService } from './field-metadata.service';
@@ -49,6 +50,7 @@ export class ModelMetadataService {
     private readonly modelMetadataRepo: ModelMetadataRepository,
     private readonly fieldMetadataRepo: FieldMetadataRepository,
     private readonly schematicService: SchematicService,
+    private readonly commandService: CommandService,
     @InjectDataSource()
     private readonly dataSource: DataSource,
     private readonly crudHelperService: CrudHelperService,
@@ -154,7 +156,7 @@ export class ModelMetadataService {
 
         return model
       });
-    } catch (error) {
+    } catch (error: any) {
       // console.error('Transaction failed:', error);
       this.logger.error('Transaction failed:', error);
       throw error;
@@ -189,7 +191,7 @@ export class ModelMetadataService {
 
         // return model
       });
-    } catch (error) {
+    } catch (error: any) {
       // console.error('Transaction failed:', error);
       this.logger.error('Transaction failed:', error);
       throw error;
@@ -309,7 +311,7 @@ export class ModelMetadataService {
       const updatedContent = JSON.stringify(metaData, null, 2);
       await fs.writeFile(filePath, updatedContent);
 
-    } catch (error) {
+    } catch (error: any) {
       // console.error('File creation failed:', error);
       this.logger.error('File creation failed:', error);
       throw new Error(ERROR_MESSAGES.FILE_WRITE_FAILED); // Trigger rollback
@@ -490,7 +492,7 @@ export class ModelMetadataService {
       const updatedContent = JSON.stringify(metaData, null, 2);
       await fs.writeFile(filePath, updatedContent);
 
-    } catch (error) {
+    } catch (error: any) {
       // console.error('File creation failed:', error);
       this.logger.error('File creation failed:', error);
       throw new Error(ERROR_MESSAGES.FILE_WRITE_FAILED); // Trigger rollback
@@ -524,7 +526,7 @@ export class ModelMetadataService {
       await this.cleanupOnDelete(entity.id);
       const r = await this.modelMetadataRepo.remove(entity);
       return r;
-    } catch (error) {
+    } catch (error: any) {
     }
   }
 
@@ -621,7 +623,7 @@ export class ModelMetadataService {
         try {
           await fs.unlink(fileToDelete);
           this.logger.log(`Deleted file: ${fileToDelete}`);
-        } catch (error) {
+        } catch (error: any) {
           this.logger.error(`Error deleting file: ${fileToDelete}`, error);
         }
       }
@@ -725,7 +727,7 @@ export class ModelMetadataService {
         );
         this.solidTsMorphService.removeModuleMembers(moduleFilePath, removedIdentifiers);
         await this.solidTsMorphService.commit();
-      } catch (error) {
+      } catch (error: any) {
         this.solidTsMorphService.rollback();
         this.logger.error(`Failed to clean up module file for model '${modelEntity.singularName}':`, error);
       }
@@ -735,6 +737,16 @@ export class ModelMetadataService {
 
   }
 
+  @DisallowInProduction()
+  async generateCodeViaCtl(modelId: number): Promise<string> {
+    const model = await this.findOne(modelId);
+    return this.commandService.executeCommandWithArgs({
+      command: 'npx',
+      args: ['@solixai/solidctl@latest', 'generate', 'model', `--name=${model.singularName}`],
+      cwd: path.join(process.cwd(), '..'),
+    });
+  }
+
   @DisallowInProduction()
   async handleGenerateCode(options: CodeGenerationOptions): Promise<any> {
     const affectedModelIds = [], refreshModelCodeOutputLines = [], removeFieldCodeOutputLines = [];
@@ -789,7 +801,7 @@ export class ModelMetadataService {
         await this.populateVAMConfigInDb(model);
         await this.populateVAMConfigInFile(model);
       });
-    } catch (error) {
+    } catch (error: any) {
       this.logger.error('generateVAMConfig Transaction failed:', error);
       throw error;
     }
@@ -816,7 +828,7 @@ export class ModelMetadataService {
       const updatedContent = JSON.stringify(metaData, null, 2);
       await fs.writeFile(filePath, updatedContent);
 
-    } catch (error) {
+    } catch (error: any) {
       // console.error('File creation failed:', error);
       this.logger.error('File updation failed for View, action, menus config:', error);
       throw new Error('File updation failed for View, action, menus config'); // Trigger rollback
@@ -826,15 +838,15 @@ export class ModelMetadataService {
   // Populate the View, Actions and Menus in the config file
   private populateVAMConfigInFileInternal(formViewLayoutFields: any[], model: ModelMetadata, listViewLayoutFields: { type: string; attrs: { name: string; }; }[], treeViewLayoutFields: { type: string; attrs: { name: string; }; }[], metaData: any) {
     const column1Fields = [];
-    const column2Fields = [];
+    // const column2Fields = [];
 
     // Distribute fields between two columns
     for (let i = 0; i < formViewLayoutFields.length; i++) {
-      if (i % 2 === 0) {
-        column1Fields.push(formViewLayoutFields[i]);
-      } else {
-        column2Fields.push(formViewLayoutFields[i]);
-      }
+      // if (i % 2 === 0) {
+      column1Fields.push(formViewLayoutFields[i]);
+      // } else {
+      // column2Fields.push(formViewLayoutFields[i]);
+      // }
     }
     const actionName = `${model.singularName}-list-action`;
     const treeViewActionName = `${model.singularName}-tree-action`;
@@ -842,6 +854,7 @@ export class ModelMetadataService {
     const treeViewName = `${model.singularName}-tree-view`;
     const formViewName = `${model.singularName}-form-view`;
     const menuName = `${model.singularName}-menu-item`;
+    const nextMenuSequenceNumber = (metaData.menus?.length ?? 0) + 1;
 
     const action = {
       displayName: `${model.displayName} List Action`,
@@ -874,7 +887,7 @@ export class ModelMetadataService {
     const menu = {
       displayName: `${model.displayName}`,
       name: menuName,
-      sequenceNumber: 1,
+      sequenceNumber: nextMenuSequenceNumber,
       actionUserKey: actionName,
       moduleUserKey: `${model.module.name}`,
       parentMenuItemUserKey: "",
@@ -955,11 +968,11 @@ export class ModelMetadataService {
                     attrs: { name: "group-1", label: "", className: "col-12 sm:col-12 md:col-6 lg:col-6" },
                     children: column1Fields
                   },
-                  {
-                    type: "column",
-                    attrs: { name: "group-2", label: "", className: "col-12 sm:col-12 md:col-6 lg:col-6" },
-                    children: column2Fields
-                  }
+                  // {
+                  //   type: "column",
+                  //   attrs: { name: "group-2", label: "", className: "col-12 sm:col-12 md:col-6 lg:col-6" },
+                  //   children: column2Fields
+                  // }
                 ]
               },
             ]
@@ -1274,24 +1287,13 @@ export class ModelMetadataService {
     };
     const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
 
-    let fieldsForRefresh = model.fields.filter((field) => !field.isMarkedForRemoval);
-
-    // If a list of field ids or field names is passed for refresh, use these fields only
-    if (options.fieldIdsForRefresh && options.fieldIdsForRefresh.length > 0) {
-      fieldsForRefresh = fieldsForRefresh.filter((field) => options.fieldIdsForRefresh.includes(+field.id));
-    } else if (options.fieldNamesForRefresh && options.fieldNamesForRefresh.length > 0) {
-      fieldsForRefresh = fieldsForRefresh.filter((field) => options.fieldNamesForRefresh.includes(field.name));
-    }
-    // const fieldsForRefresh = model.fields.filter((field) => !field.isMarkedForRemoval);
-
     //Execute the schematic command to refresh the model
-    const refreshOuput = await this.executeRefreshModelCommand(model, fieldsForRefresh, options.dryRun);
+    const refreshOuput = await this.executeRefreshModelCommand(model, options.dryRun);
 
     return `${refreshOuput}`;
   }
 
-  private async executeRefreshModelCommand(model: ModelMetadata, fieldsForRefresh: FieldMetadata[], dryRun: boolean = false): Promise<string> {
-    // const fieldsForRefresh = model.fields.filter((field) => !field.isMarkedForRemoval);
+  private async executeRefreshModelCommand(model: ModelMetadata, dryRun: boolean = false): Promise<string> {
     const output = await this.schematicService.executeSchematicCommand(
       REFRESH_MODEL_COMMAND,
       {