@solidstarters/solid-core 1.2.21 → 1.2.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "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/model-metadata.controller.ts

@@ -60,6 +60,12 @@ export class ModelMetadataController {
         return this.modelMetadataService.create(createDto);
     }
 
+    @Public()
+    @Post('/update-user-key')
+    updateUserKey(@Body() data: any) {
+        return this.modelMetadataService.updateUserKey(data);
+    }
+
     @ApiBearerAuth("jwt")
     @Post(':id/generate-code')
     generateCode(@Param('id', ParseIntPipe) id: number) {

package/src/controllers/test.controller.ts

@@ -27,8 +27,10 @@ export class TestController {
   @Post('upload')
   @UseInterceptors(FileInterceptor('file')) // 'file' here is the name of the field in the form
   uploadFile(@UploadedFile() file: Express.Multer.File, @Body() body: any) {
-    console.log(file);
-    console.log(body);
+    // console.log(file);
+    this.logger.debug(file);
+    // console.log(body);
+    this.logger.debug(body);
     return { filename: file.originalname };
   }
 

package/src/dtos/basic-filters.dto.ts

@@ -1,8 +1,12 @@
 
 import { ApiProperty } from "@nestjs/swagger";
-import { IsOptional } from "class-validator";
+import { IsEnum, IsOptional } from "class-validator";
 import { PaginationQueryDto } from "./pagination-query.dto";
 
+export enum SoftDeleteFilter {
+    INCLUSIVE = "inclusive",
+    EXCLUSIVE = "exclusive",
+}
 
 export class BasicFilterDto extends PaginationQueryDto {
 
@@ -34,12 +38,12 @@ export class BasicFilterDto extends PaginationQueryDto {
     // readonly filters: any[];
 
     @IsOptional()
-    @ApiProperty({ description: "showSoftDeleted" })
-    readonly showSoftDeleted?: boolean;
-
-    @IsOptional()
-    @ApiProperty({ description: "showOnlySoftDeleted" })
-    readonly showOnlySoftDeleted?: boolean;
+    @IsEnum(SoftDeleteFilter)
+    @ApiProperty({
+        description: "showSoftDeleted",
+        enum: SoftDeleteFilter,
+    })
+    readonly showSoftDeleted?: SoftDeleteFilter;
 
     @IsOptional()
     @ApiProperty({ description: "populateGroup" })

package/src/dtos/create-user.dto.ts

@@ -29,7 +29,7 @@ export class CreateUserDto {
 
     @IsOptional()
     @IsBoolean()
-    forcePasswordChange: boolean = true;
+    forcePasswordChange: boolean = false;
 
     @IsNotEmpty()
     @IsString()

package/src/helpers/schematic.service.ts

@@ -82,7 +82,7 @@ export class SchematicService {
       // console.log('moduleOptions', moduleOptions);
       const schematicCommand =  ` ${baseCommand} --module=${moduleOptions.module}`;
       // console.log('schematicCommand', schematicCommand);
-      this.logger.log('schematicCommand', schematicCommand);
+      this.logger.debug('schematicCommand', schematicCommand);
       return schematicCommand;
     } else {
       throw new Error('Schematic command not supported.');

package/src/index.ts

@@ -1,4 +1,3 @@
-export * from './commands/basic.command'
 export * from './commands/helper'
 export * from './commands/refresh-model.command'
 export * from './commands/refresh-module.command'

package/src/jobs/queue-test-subscriber.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 
 import { RabbitMqSubscriber } from 'src/services/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
@@ -9,6 +9,7 @@ import { QueuesModuleOptions } from "../interfaces";
 
 @Injectable()
 export class TestQueueSubscriber extends RabbitMqSubscriber<any> {
+    private readonly testQueueLogger = new Logger(TestQueueSubscriber.name);
     constructor(
         readonly mqMessageService: MqMessageService,
         readonly mqMessageQueueService: MqMessageQueueService,
@@ -23,6 +24,7 @@ export class TestQueueSubscriber extends RabbitMqSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        console.log(`Received message ${JSON.stringify(message)}`);
+        // console.log(`Received message ${JSON.stringify(message)}`);
+        this.testQueueLogger.debug(`Received message: ${JSON.stringify(message)}`);
     }
 }

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

@@ -88,9 +88,11 @@ export class ModuleMetadataSeederService {
 
         // Run the permissions seeder. 
         // await this.permissionsSeederService.seed();
+        this.logger.log(`Seeding permissions`);
         await this.seedPermissions();
 
         // TODO: move this also the main loop processing. Generate the media storage providers required by default
+        this.logger.log(`Seeding media storage providers`);
         await this.mediaStorageProviderSeederService.seed();
 
         // Read the module metadata from a file specified in the .env 
@@ -105,8 +107,9 @@ export class ModuleMetadataSeederService {
             // ...coreModules.map(module => `src/${module}/seeders/seed-data/${module}-metadata.json`),
             typedSolidCoreMetadata
         ];
-
+        this.logger.debug(`getting dynamics modules`);
         const enabledModules = getDynamicModuleNames();
+        this.logger.log(`Seeding metadata`);
 
         for (let i = 0; i < enabledModules.length; i++) {
             const enabledModule = enabledModules[i];
@@ -119,8 +122,8 @@ export class ModuleMetadataSeederService {
             }
         }
 
-        this.logger.log(`Seed data files are: ${seedDataFiles}`);
-
+        this.logger.debug(`Seed data files are: ${seedDataFiles}`);
+        let usersDetail;
         for (let i = 0; i < seedDataFiles.length; i++) {
 
             // Module, model & field handling.
@@ -134,76 +137,77 @@ export class ModuleMetadataSeederService {
 
             // Process module metadata first. 
             const moduleMetadata: CreateModuleMetadataDto = overallMetadata.moduleMetadata;
-            this.logger.log(`[Start] Processing module metadata for ${moduleMetadata.name}`)
+            this.logger.debug(`[Start] Processing module metadata for ${moduleMetadata.name}`)
             await this.seedModuleModelFields(moduleMetadata);
-            this.logger.log(`[End] Processing module metadata for ${moduleMetadata.name}`)
+            this.logger.debug(`[End] Processing module metadata for ${moduleMetadata.name}`)
 
             // Media Storage provider templates
-            this.logger.log(`[Start] Processing Media Storage Provider for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing Media Storage Provider for ${moduleMetadata.name}`);
             const mediaStorageProviders = overallMetadata.mediaStorageProviders;
             await this.seedMediaStorageProviders(mediaStorageProviders);
-            this.logger.log(`[End] Processing Media Storage Provider for ${moduleMetadata.name}`);
+            this.logger.debug(`[End] Processing Media Storage Provider for ${moduleMetadata.name}`);
 
             // TODO: Custom role handling
-            this.logger.log(`[End] Processing roles for ${moduleMetadata.name}`)
+            this.logger.debug(`[End] Processing roles for ${moduleMetadata.name}`)
             const roles = overallMetadata.roles;
             await this.roleService.createRolesIfNotExists(roles);
-            this.logger.log(`[End] Processing roles for ${moduleMetadata.name}`)
+            this.logger.debug(`[End] Processing roles for ${moduleMetadata.name}`)
 
             // Custom user handling
-            this.logger.log(`[Start] Processing users for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing users for ${moduleMetadata.name}`);
             const users = overallMetadata.users;
+            usersDetail = users;
             await this.seedUsers(users);
-            this.logger.log(`[End] Processing users for ${moduleMetadata.name}`)
+            this.logger.debug(`[End] Processing users for ${moduleMetadata.name}`)
 
             // Application Module View handling 
-            this.logger.log(`[Start] Processing views for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing views for ${moduleMetadata.name}`);
             const views = overallMetadata.views;
             await this.seedViews(views);
-            this.logger.log(`[End] Processing views for ${moduleMetadata.name}`)
+            this.logger.debug(`[End] Processing views for ${moduleMetadata.name}`)
 
             // Application Module Action handling
-            this.logger.log(`[Start] Processing actions for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing actions for ${moduleMetadata.name}`);
             const actions = overallMetadata.actions;
             await this.seedActions(actions);
-            this.logger.log(`[End] Processing actions for ${moduleMetadata.name}`)
+            this.logger.debug(`[End] Processing actions for ${moduleMetadata.name}`)
 
             // Application Module Menu handling 
-            this.logger.log(`[Start] Processing menus for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing menus for ${moduleMetadata.name}`);
             const menus = overallMetadata.menus;
             await this.seedMenus(menus);
-            this.logger.log(`[End] Processing menus for ${moduleMetadata.name}`)
+            this.logger.debug(`[End] Processing menus for ${moduleMetadata.name}`)
 
             // Email templates 
-            this.logger.log(`[Start] Processing email templates for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing email templates for ${moduleMetadata.name}`);
             const emailTemplates: CreateEmailTemplateDto[] = overallMetadata.emailTemplates;
             await this.seedEmailTemplates(emailTemplates);
-            this.logger.log(`[End] Processing email templates for ${moduleMetadata.name}`);
+            this.logger.debug(`[End] Processing email templates for ${moduleMetadata.name}`);
 
             // Sms templates
-            this.logger.log(`[Start] Processing sms templates for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing sms templates for ${moduleMetadata.name}`);
             const smsTemplates: CreateSmsTemplateDto[] = overallMetadata.smsTemplates;
             await this.seedSmsTemplates(smsTemplates);
-            this.logger.log(`[End] Processing sms templates for ${moduleMetadata.name}`);
+            this.logger.debug(`[End] Processing sms templates for ${moduleMetadata.name}`);
 
             // Sms templates
-            this.logger.log(`[Start] Processing settings for ${moduleMetadata.name}`);
+            this.logger.debug(`[Start] Processing settings for ${moduleMetadata.name}`);
             await this.seedSettings(settingsSeederData);
-            this.logger.log(`[End] Processing settings for ${moduleMetadata.name}`);
+            this.logger.debug(`[End] Processing settings for ${moduleMetadata.name}`);
 
-            this.logger.log(`[End] module seed data: ${overallMetadata}`);
+            this.logger.debug(`[End] module seed data: ${overallMetadata}`);
 
         }
 
         // Post seed data file processing. 
 
         // 1. Give all permissions to the Admin role.
-        this.logger.log(`About to add all permissions to the Admin role`);
+        this.logger.debug(`About to add all permissions to the Admin role`);
         await this.roleService.addAllPermissionsToRole("Admin");
         // 2. Give wrapSettings permissions to the Public role.
         await this.roleService.addPermissionToRole('Public', 'SettingController.wrapSettings');
         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 : ''}`);
     }
 
 
@@ -300,16 +304,16 @@ export class ModuleMetadataSeederService {
             if (smsTemplate.body) {
                 // const smsTemplateFilePath = path.join(process.cwd(), smsTemplate.body);
                 // smsTemplate.body = fs.readFileSync(smsTemplateFilePath, '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/sms-templates');
-    
+
                 // Example usage
                 const filePath = path.join(seedDataPath, smsTemplate.body);
-    
-    
+
+
                 smsTemplate.body = fs.readFileSync(filePath, 'utf-8').toString();
 
             }
@@ -372,7 +376,10 @@ export class ModuleMetadataSeederService {
 
             viewData['module'] = await this.moduleMetadataService.findOneByUserKey(viewData.moduleUserKey);
             viewData['model'] = await this.modelMetadataService.findOneByUserKey(viewData.modelUserKey);
-            await this.solidViewService.upsert(viewData);
+            // await this.solidViewService.upsert(viewData);
+            // First check if module already exists using name
+             await this.solidViewService.createIfNotPresent(viewData);
+
         }
     }
 

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

@@ -2417,7 +2417,7 @@
       "username": "admin@example.service.com",
       "email": "admin@example.service.com",
       "password": "Admin@3214$",
-      "forcePasswordChange": false,
+      "forcePasswordChange": true,
       "fullName": "Default Admin"
     }
   ],
@@ -2802,7 +2802,7 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": ""
+                "label": "Generate Code"
               },
               "action": {
                 "title": "",
@@ -2819,7 +2819,7 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": ""
+                "label": "Generate Code"
               },
               "action": {
                 "title": "",
@@ -2987,6 +2987,7 @@
             50
           ],
           "enableGlobalSearch": true,
+          "truncateAfter": 50,
           "create": true,
           "edit": true,
           "delete": true,
@@ -2994,7 +2995,7 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": ""
+                "label": "Generate Code"
               },
               "action": {
                 "title": "",
@@ -3011,7 +3012,7 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": ""
+                "label": "Generate Code"
               },
               "action": {
                 "title": "",

package/src/services/crud-helper.service.ts

@@ -149,7 +149,7 @@ export class CrudHelperService {
     }
 
     buildFilterQuery(qb: SelectQueryBuilder<any>, basicFilterDto: BasicFilterDto, entityAlias: string): SelectQueryBuilder<any> { //TODO : Check how to pass a type to SelectQueryBuilder instead of any
-        let { limit, offset, showSoftDeleted, showOnlySoftDeleted, filters } = basicFilterDto;
+        let { limit, offset, showSoftDeleted, filters } = basicFilterDto;
         const { fields, sort, groupBy, populate = [] } = basicFilterDto; 
 
         // Normalize the fields, sort, groupBy and populate options i.e (since they can be either a string or an array of strings, when coming from the request)
@@ -197,11 +197,14 @@ export class CrudHelperService {
         }
 
 
-        // Apply the soft delete options
-        if (showSoftDeleted || showOnlySoftDeleted) qb.withDeleted(); // Display the soft deleted records default condition    
-        if (showOnlySoftDeleted) { // Add the condition to show only soft deleted records
-            qb.andWhere(`${entityAlias}.deletedAt IS NOT NULL`);
+        if (showSoftDeleted === 'inclusive') {
+            qb.withDeleted();
         }
+        
+        if (showSoftDeleted === 'exclusive') {
+            qb.withDeleted();
+            qb.where(`${entityAlias}.deletedAt IS NOT NULL`);
+        }        
 
         // Apply the group by options
         if (normalizedGroupBy && normalizedGroupBy.length) {
@@ -209,7 +212,6 @@ export class CrudHelperService {
                 qb.addGroupBy(`${entityAlias}.${field}`);
             });
         }
-
         // Apply the pagination options
         if (limit) qb.limit(limit);
         if (offset) qb.offset(offset);

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

@@ -12,6 +12,7 @@ import { FieldMetadata } from '../entities/field-metadata.entity';
 import { ModelMetadata } from '../entities/model-metadata.entity';
 import { ISelectionProviderValues } from '../interfaces';
 import { CrudHelperService } from './crud-helper.service';
+import { classify } from '@angular-devkit/core/src/utils/strings';
 
 
 @Injectable()
@@ -47,11 +48,12 @@ export class FieldMetadataService {
         // const {id, createdAt, updatedAt, deletedAt, ...fieldKeys} = field;
         switch (field.relationType) {
             case RelationType.manyToOne: {
+                const fieldName = field.relationModelFieldName || `${modelName}s`;
                 const inverseField: FieldMetadata = {
                     ...field,
-                    name: field.relationModelFieldName ?? `${modelName}s`,
-                    displayName: `Inverse ${field.displayName}`,
-                    description: `Inverse field for ${field.displayName}`,
+                    name: fieldName,
+                    displayName: classify(fieldName),
+                    description: classify(fieldName),
                     type: SolidFieldType.relation,
                     isSystem: field.isSystem,
                     relationType: RelationType.oneToMany,
@@ -71,9 +73,38 @@ export class FieldMetadataService {
                     relationJoinColumnName: null,
                     joinColumnName: null,
                     id : null,
-                    // createdAt: null,
-                    // updatedAt: null,
-                    // deletedAt: null,
+                }
+
+                // Load the inverse field, 
+                const savedField = await this.saveInverseField(fieldRepository, relationModel, inverseField);
+                return savedField;
+            }
+            case RelationType.oneToMany: {
+                const fieldName = field.relationModelFieldName || `${modelName}`;
+                const inverseField: FieldMetadata = {
+                    ...field,
+                    name: fieldName,
+                    displayName: classify(fieldName),
+                    description: classify(fieldName),
+                    type: SolidFieldType.relation,
+                    isSystem: field.isSystem,
+                    relationType: RelationType.manyToOne,
+                    relationModelSingularName: modelName,
+                    relationCreateInverse: true,
+                    relationCascade: null,
+                    relationModelModuleName: moduleName,
+                    relationModelFieldName: field.name,
+                    required: false,
+                    unique: false,
+                    index: false,
+                    private: false,
+                    encrypt: false,
+                    model: relationModel,
+                    columnName:null,
+                    relationJoinTableName: null,
+                    relationJoinColumnName: null,
+                    joinColumnName: null,
+                    id : null,
                 }
 
                 // Load the inverse field, 
@@ -81,18 +112,19 @@ export class FieldMetadataService {
                 return savedField;
             }
             case RelationType.manyTomany: {
+                const fieldName = field.relationModelFieldName;
                 // Logic to create a manyToMany inverse field definition
                 const inverseFieldManyToMany: FieldMetadata = {
                     ...field,
-                    name: field.relationModelFieldName,
-                    displayName: `Inverse ${field.displayName}`,
-                    description: `Inverse field for ${field.displayName}`,
+                    name: fieldName,
+                    displayName: classify(fieldName),
+                    description: classify(fieldName),
                     type: SolidFieldType.relation,
                     isSystem: field.isSystem,
                     relationType: RelationType.manyTomany,
                     relationModelSingularName: modelName,
                     relationCreateInverse: true,
-                    relationCascade: field.relationCascade,
+                    relationCascade: null,
                     relationModelModuleName: moduleName,
                     relationModelFieldName: field.name,
                     required: false,
@@ -107,9 +139,6 @@ export class FieldMetadataService {
                     joinColumnName: null,
                     isRelationManyToManyOwner: false,
                     id : null,
-                    // createdAt: null,
-                    // updatedAt: null,
-                    // deletedAt: null,
                 }
                 const savedField = await this.saveInverseField(fieldRepository, relationModel, inverseFieldManyToMany);
                 return savedField;

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

@@ -67,7 +67,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
     }
 
     private getFullFilePath(fileName: string): string {
-        return `${this.configService.get('app-builder.fileStorageDir')}/${fileName}`;
+        return `${process.env.BASE_URL}/${this.configService.get('app-builder.fileStorageDir')}/${fileName}`;
     }
 
     private getFileName(file: Express.Multer.File): string {