@solidstarters/solid-core 1.2.6 → 1.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.6",
+  "version": "1.2.9",
   "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/commands/refresh-model.command.ts

@@ -4,8 +4,8 @@ import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { CommandError } from './helper';
 
 interface CommandOptions {
-  modelName: string;
-  modelId: number;
+  name: string;
+  id: number;
   dryRun: boolean;
 }
 
@@ -29,45 +29,45 @@ export class RefreshModelCommand extends CommandRunner {
     }
 
     const codeGenerationOptions = {
-      modelId: options.modelId,
-      modelUserKey: options.modelName,
+      modelId: options.id,
+      modelUserKey: options.name,
       dryRun: options.dryRun,
     };
     await this.modelMetadataService.generateCode(codeGenerationOptions);
   }
 
   @Option({
-    flags: '-id, --id [model ID]',
+    flags: '-i, --id [model ID]',
     description: 'Model ID from the ss_model_metadata table',
   })
-  parseModelId(val: string): number {
+  parseId(val: string): number {
     return +val;
   }
 
-    // Accept the module name as an argument
-    @Option({
-      flags: '-n, --name [model name]',
-      description: 'Model Name from the ss_model_metadata table',
-    })
-    parseModelName(val: string): string {
-      return val;
-    }
-  
-    @Option({
-      flags: '-d, --dryRun [dry run]',
-      description: 'Dry run the command',
-    })
-    parseDryRun(val: string): boolean {
-      this.logger.debug(`Dry run : ${val}`);
-      return (val === 'false')? false : true;
-    }
-  
-    // Validate the options passed
-    validate(options: CommandOptions): CommandError[] {
-      if (!options.modelId && !options.modelName) {
-        return [new CommandError('Model ID or Model Name is required')];
-      }
-      return [];
+  // Accept the module name as an argument
+  @Option({
+    flags: '-n, --name [model name]',
+    description: 'Model Name from the ss_model_metadata table',
+  })
+  parseName(val: string): string {
+    return val;
+  }
+
+  @Option({
+    flags: '-d, --dryRun [dry run]',
+    description: 'Dry run the command',
+  })
+  parseDryRun(val: string): boolean {
+    this.logger.debug(`Dry run : ${val}`);
+    return (val === 'false') ? false : true;
+  }
+
+  // Validate the options passed
+  validate(options: CommandOptions): CommandError[] {
+    if (!options.id && !options.name) {
+      return [new CommandError('Model ID or Model Name is required')];
     }
-  
+    return [];
+  }
+
 }

package/src/commands/refresh-module.command.ts

@@ -4,8 +4,8 @@ import { ModuleMetadataService } from '../services/module-metadata.service';
 import { CommandError } from './helper';
 
 interface CommandOptions {
-  moduleId: number;
-  moduleName: string;
+  id: number;
+  name: string;
   dryRun: boolean;
 }
 
@@ -13,7 +13,7 @@ interface CommandOptions {
   name: 'refresh-module',
   description: 'Refreshes a module and its model and fields i.e (entity,dto,service,controller files)',
 })
-export class RefreshModuleCommand extends CommandRunner { 
+export class RefreshModuleCommand extends CommandRunner {
   constructor(
     private readonly moduleMetadataService: ModuleMetadataService,
   ) {
@@ -28,8 +28,8 @@ export class RefreshModuleCommand extends CommandRunner {
       return;
     }
     const codeGenerationOptions = {
-      moduleId: options.moduleId,
-      moduleUserKey: options.moduleName,
+      moduleId: options.id,
+      moduleUserKey: options.name,
       dryRun: options.dryRun,
     };
     await this.moduleMetadataService.generateCode(codeGenerationOptions);
@@ -37,38 +37,38 @@ export class RefreshModuleCommand extends CommandRunner {
 
 
   @Option({
-    flags: '-id, --id [module ID]',
+    flags: '-i, --id [module ID]',
     description: 'Module ID from the ss_module_metadata table',
   })
-  parseModuleId(val: string): number {
+  parseId(val: string): number {
     return +val;
   }
 
-    // Accept the module name as an argument
-    @Option({
-      flags: '-n, --name [module name]',
-      description: 'Module Name from the ss_module_metadata table',
-    })
-    parseModuleName(val: string): string {
-      return val;
-    }
-    
-    @Option({
-      flags: '-d, --dryRun [dry run]',
-      description: 'Dry run the command',
-    })
-    parseDryRun(val: string): boolean {
-      this.logger.debug(`Dry run : ${val}`);
-      return (val === 'false')? false : true;
-    }
-  
+  // Accept the module name as an argument
+  @Option({
+    flags: '-n, --name [module name]',
+    description: 'Module Name from the ss_module_metadata table',
+  })
+  parseName(val: string): string {
+    return val;
+  }
+
+  @Option({
+    flags: '-d, --dryRun [dry run]',
+    description: 'Dry run the command',
+  })
+  parseDryRun(val: string): boolean {
+    this.logger.debug(`Dry run : ${val}`);
+    return (val === 'false') ? false : true;
+  }
 
-    // Validate the options passed
-    validate(options: CommandOptions): CommandError[] {
-      if (!options.moduleId && !options.moduleName) {
-        return [new CommandError('Module ID or Module Name is required')];
-      }
-      return [];
+
+  // Validate the options passed
+  validate(options: CommandOptions): CommandError[] {
+    if (!options.id && !options.name) {
+      return [new CommandError('Module ID or Module Name is required')];
     }
-  
+    return [];
+  }
+
 }

package/src/controllers/setting.controller.ts

@@ -0,0 +1,80 @@
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { AnyFilesInterceptor } from "@nestjs/platform-express";
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { SettingService } from '../services/setting.service';
+import { CreateSettingDto } from '../dtos/create-setting.dto';
+import { UpdateSettingDto } from '../dtos/update-setting.dto';
+
+@ApiTags('Solid') 
+@Controller('setting') //FIXME: Change this to the model plural name 
+export class SettingController {
+  constructor(private readonly service: SettingService) {}
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateSettingDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Patch(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/getSettings')
+  async getAllSettings() {
+    return this.service.getAllSettings();
+  }
+    
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })
+  @ApiQuery({ name: 'showOnlySoftDeleted', required: false, type: Boolean })
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array }) 
+  @ApiQuery({ name: 'groupBy', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  @Get()
+  async findMany(@Query() query: any) { 
+    return this.service.find(query);  
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get(':id')
+  async findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @Delete('/bulk')
+  async deleteMany(@Body() ids: number[]) {
+    return this.service.deleteMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete(':id')
+  async delete(@Param('id') id: number) {
+    return this.service.delete(id);
+  }
+}

package/src/dtos/create-field-metadata.dto.ts

@@ -382,4 +382,9 @@ export class CreateFieldMetadataDto {
   @IsString()
   @IsOptional()
   columnName: string
+
+  @ApiProperty({ description: "Is User Key" })
+  @IsOptional()
+  @IsBoolean()
+  readonly isUserKey: boolean
 }

package/src/dtos/create-model-metadata.dto.ts

@@ -91,10 +91,6 @@ export class CreateModelMetadataDto {
     @Type(() => CreateFieldMetadataDto)
     fields: CreateFieldMetadataDto[];
 
-    @ApiProperty({ description: "Is Exportable" })
-    @IsBoolean()
-    readonly isExportable: boolean
-
     @ApiProperty({ description: 'System models are not included in the code generation, the assumption being that system models have manually written code.', })
     @IsBoolean()
     isSystem: boolean;

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

@@ -0,0 +1,63 @@
+import { IsString } from 'class-validator';
+import { IsOptional, IsBoolean } from 'class-validator';
+export class CreateSettingDto {
+@IsOptional()
+@IsString()
+authPagesLayout: string;
+
+@IsOptional()
+@IsString()
+authPagesTheme: string;
+
+@IsOptional()
+@IsString()
+appTitle: string;
+
+@IsOptional()
+@IsString()
+appLogo: string;
+
+@IsOptional()
+@IsString()
+appDescription: string;
+
+@IsOptional()
+@IsString()
+appTnc: string;
+
+@IsOptional()
+@IsString()
+appPrivacyPolicy: string;
+
+@IsOptional()
+@IsBoolean()
+iamAllowPublicRegistration: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+iamPasswordRegistrationEnabled: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+iamPasswordLessRegistrationEnabled: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+iamActivateUserOnRegistration: boolean = false;
+
+@IsOptional()
+@IsString()
+iamDefaultRole: string;
+
+@IsOptional()
+@IsBoolean()
+iamGoogleOAuthEnabled: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+shouldQueueEmails: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+shouldQueueSms: boolean = false;
+}

package/src/dtos/update-setting.dto.ts

@@ -0,0 +1,66 @@
+import { IsInt,IsOptional, IsString, IsBoolean } from 'class-validator';
+export class UpdateSettingDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+
+@IsOptional()
+@IsString()
+authPagesLayout: string;
+
+@IsOptional()
+@IsString()
+authPagesTheme: string;
+
+@IsOptional()
+@IsString()
+appTitle: string;
+
+@IsOptional()
+@IsString()
+appLogo: string;
+
+@IsOptional()
+@IsString()
+appDescription: string;
+
+@IsOptional()
+@IsString()
+appTnc: string;
+
+@IsOptional()
+@IsString()
+appPrivacyPolicy: string;
+
+@IsOptional()
+@IsBoolean()
+iamAllowPublicRegistration: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+iamPasswordRegistrationEnabled: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+iamPasswordLessRegistrationEnabled: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+iamActivateUserOnRegistration: boolean = false;
+
+@IsOptional()
+@IsString()
+iamDefaultRole: string;
+
+@IsOptional()
+@IsBoolean()
+iamGoogleOAuthEnabled: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+shouldQueueEmails: boolean = false;
+
+@IsOptional()
+@IsBoolean()
+shouldQueueSms: boolean = false;
+}

package/src/entities/field-metadata.entity.ts

@@ -135,4 +135,6 @@ export class FieldMetadata extends CommonEntity {
     @Column({ name: 'column_name', nullable: true })
     columnName: string;
 
+    @Column({ name: "isUserKey", default: false })
+    isUserKey: boolean;
 }

package/src/entities/model-metadata.entity.ts

@@ -47,9 +47,6 @@ export class ModelMetadata extends CommonEntity {
     @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
     module: ModuleMetadata;
 
-    @Column({ name: "is_exportable", default: false })
-    isExportable: boolean;
-
     // ExternalId
     // 1. Single field. 
     // 2. Composite field. 

package/src/entities/setting.entity.ts

@@ -0,0 +1,49 @@
+import { CommonEntity } from 'src/entities/common.entity'
+import {Entity, Column} from 'typeorm'
+@Entity("ss_setting")
+export class Setting extends CommonEntity{
+@Column({ type: "varchar", nullable: true })
+authPagesLayout: string;
+
+@Column({ type: "varchar", nullable: true })
+authPagesTheme: string;
+
+@Column({ type: "varchar", nullable: true })
+appTitle: string;
+
+@Column({ type: "varchar", nullable: true })
+appLogo: string;
+
+@Column({ type: "varchar", nullable: true })
+appDescription: string;
+
+@Column({ type: "varchar", nullable: true })
+appTnc: string;
+
+@Column({ type: "varchar", nullable: true })
+appPrivacyPolicy: string;
+
+@Column({ type: "boolean", nullable: true, default: false })
+iamAllowPublicRegistration: boolean = false;
+
+@Column({ type: "boolean", nullable: true, default: false })
+iamPasswordRegistrationEnabled: boolean = false;
+
+@Column({ type: "boolean", nullable: true, default: false })
+iamPasswordLessRegistrationEnabled: boolean = false;
+
+@Column({ type: "boolean", nullable: true, default: false })
+iamActivateUserOnRegistration: boolean = false;
+
+@Column({ type: "varchar", nullable: true })
+iamDefaultRole: string;
+
+@Column({ type: "boolean", nullable: true, default: false })
+iamGoogleOAuthEnabled: boolean = false;
+
+@Column({ type: "boolean", nullable: true, default: false })
+shouldQueueEmails: boolean = false;
+
+@Column({ type: "boolean", nullable: true, default: false })
+shouldQueueSms: boolean = false;
+}

package/src/index.ts

@@ -76,6 +76,9 @@ export * from './dtos/update-role-metadata.dto'
 export * from './dtos/update-sms-template.dto'
 export * from './dtos/update-user.dto'
 export * from './dtos/update-view-metadata.dto'
+export * from './dtos/create-setting.dto'
+export * from './dtos/update-setting.dto'
+
 
 export * from './entities/action-metadata.entity'
 export * from './entities/common.entity'
@@ -96,6 +99,7 @@ export * from './entities/sms-template.entity'
 export * from './entities/user-password-history.entity'
 export * from './entities/user.entity'
 export * from './entities/view-metadata.entity'
+export * from './entities/setting.entity'
 
 export * from './enums/auth-type.enum'
 
@@ -208,6 +212,7 @@ export * from './services/solid-introspect.service'
 export * from './services/user.service'
 export * from './services/view-metadata.service'
 export * from './services/whatsapp/Msg91WhatsappService' //rename
+export * from './services/setting.service'
 
 
 //softDeleteAwareEventSubscriber.subscriber.ts