@solidstarters/solid-core 1.2.47 → 1.2.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.47",
+  "version": "1.2.48",
   "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/email-template.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Header, Param, Patch, Post, Query } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Header, Param, Patch, Post, Put, Query, UploadedFiles, UseInterceptors } from '@nestjs/common';
 import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
 import { PaginationQueryDto } from 'src/dtos/pagination-query.dto';
 import { Roles } from 'src/decorators/roles.decorator';
@@ -12,48 +12,67 @@ import { Public } from 'src/decorators/public.decorator';
 // TODO: esInterop not working somehow, defaulted to using the require syntax to import Mailgen. Figure a better way to do this. 
 // import { Mailgen } from 'mailgen';
 import Mailgen = require('mailgen');
+import { AnyFilesInterceptor } from '@nestjs/platform-express';
 
 
-@Controller('email-templates')
+@Controller('email-template')
 @ApiTags("Common")
 export class EmailTemplateController {
-  constructor(private readonly emailTemplateService: EmailTemplateService) { }
-
-  @ApiBearerAuth("jwt")
-  @Roles('Admin')
-  @Post()
-  create(@Body() dto: CreateEmailTemplateDto) {
-    return this.emailTemplateService.create(dto);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Roles('Admin')
-  @ApiQuery({ name: 'limit', required: false, type: Number })
-  @ApiQuery({ name: 'offset', required: false, type: Number })
-  @Get()
-  findAll(@Query() paginationQuery: PaginationQueryDto) {
-    return this.emailTemplateService.findAll(paginationQuery);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Roles('Admin')
-  @Get(':id')
-  findOne(@Param('id') id: string) {
-    return this.emailTemplateService.findOne(+id);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Patch(':id')
-  update(@Param('id') id: string, @Body() dto: UpdateEmailTemplateDto) {
-    return this.emailTemplateService.update(+id, dto);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Delete(':id')
-  async delete(@Param('id') id: number) {
-    return this.emailTemplateService.remove(+id);
-  }
+  constructor(private readonly service: EmailTemplateService) { }
 
+   @Public()
+    @Post()
+    @UseInterceptors(AnyFilesInterceptor())
+    create(@Body() createDto: CreateEmailTemplateDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+      return this.service.create(createDto, files);
+    }
+  
+    @Public()
+    @Post('/bulk')
+    @UseInterceptors(AnyFilesInterceptor())
+    insertMany(@Body() createDtos: CreateEmailTemplateDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+      return this.service.insertMany(createDtos, filesArray);
+    }
+  
+    @Public()
+    @Put(':id')
+    @UseInterceptors(AnyFilesInterceptor())
+    update(@Param('id') id: number, @Body() updateDto: UpdateEmailTemplateDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+      return this.service.update(id, updateDto, files);
+    }
+  
+    @Public()
+    @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);
+    }
+  
+    @Public()
+    @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);
+    }
+  
+    @Public()
+    @Delete(':id')
+    async delete(@Param('id') id: number) {
+      return this.service.delete(id);
+    }
   // /api/email-templates/mailgen-template/otp-template
   // @ApiBearerAuth("jwt")
   // @Roles('Admin')

package/src/controllers/sms-template.controller.ts

@@ -1,49 +1,70 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post, Query } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query, UploadedFiles, UseInterceptors } from '@nestjs/common';
 import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
 import { PaginationQueryDto } from 'src/dtos/pagination-query.dto';
 import { Roles } from 'src/decorators/roles.decorator';
 import { SmsTemplateService } from '../services/sms-template.service';
 import { CreateSmsTemplateDto } from '../dtos/create-sms-template.dto';
 import { UpdateSmsTemplateDto } from '../dtos/update-sms-template.dto';
+import { Public } from 'src/decorators/public.decorator';
+import { AnyFilesInterceptor } from '@nestjs/platform-express';
 
 
-@Controller('sms-templates')
+@Controller('sms-template')
 @ApiTags("Common")
 export class SmsTemplateController {
-  constructor(private readonly smsTemplateService: SmsTemplateService) { }
+  constructor(private readonly service: SmsTemplateService) { }
 
-  @ApiBearerAuth("jwt")
-  @Roles('Admin')
-  @Post()
-  create(@Body() dto: CreateSmsTemplateDto) {
-    return this.smsTemplateService.create(dto);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Roles('Admin')
-  @ApiQuery({ name: 'limit', required: false, type: Number })
-  @ApiQuery({ name: 'offset', required: false, type: Number })    
-  @Get()
-  findAll(@Query() paginationQuery: PaginationQueryDto) {
-    return this.smsTemplateService.findAll(paginationQuery);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Roles('Admin')
-  @Get(':id')
-  findOne(@Param('id') id: string) {
-    return this.smsTemplateService.findOne(+id);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Patch(':id')
-  update(@Param('id') id: string, @Body() dto: UpdateSmsTemplateDto) {
-    return this.smsTemplateService.update(+id, dto);
-  }
-
-  @ApiBearerAuth("jwt")
-  @Delete(':id')
-  async delete(@Param('id') id: number) {
-    return this.smsTemplateService.remove(+id);
-  }
+   @Public()
+    @Post()
+    @UseInterceptors(AnyFilesInterceptor())
+    create(@Body() createDto: CreateSmsTemplateDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+      return this.service.create(createDto, files);
+    }
+  
+    @Public()
+    @Post('/bulk')
+    @UseInterceptors(AnyFilesInterceptor())
+    insertMany(@Body() createDtos: CreateSmsTemplateDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+      return this.service.insertMany(createDtos, filesArray);
+    }
+  
+    @Public()
+    @Put(':id')
+    @UseInterceptors(AnyFilesInterceptor())
+    update(@Param('id') id: number, @Body() updateDto: UpdateSmsTemplateDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+      return this.service.update(id, updateDto, files);
+    }
+  
+    @Public()
+    @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);
+    }
+  
+    @Public()
+    @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);
+    }
+  
+    @Public()
+    @Delete(':id')
+    async delete(@Param('id') id: number) {
+      return this.service.delete(id);
+    }
 }

package/src/controllers/user-view-metadata.controller.ts

@@ -5,6 +5,8 @@ import { UserViewMetadataService } from '../services/user-view-metadata.service'
 import { CreateUserViewMetadataDto } from '../dtos/create-user-view-metadata.dto';
 import { UpdateUserViewMetadataDto } from '../dtos/update-user-view-metadata.dto';
 import { UpsertUserViewMetadataDto } from 'src/dtos/upsert-user-view-metadata.dto';
+import { ActiveUser } from 'src/decorators/active-user.decorator';
+import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 
 enum ShowSoftDeleted {
   INCLUSIVE = "inclusive",
@@ -92,8 +94,8 @@ export class UserViewMetadataController {
 
   @ApiBearerAuth("jwt")
   @Post('/upsert')
-  async upsert(@Body() query: UpsertUserViewMetadataDto) {
-    return this.service.upsert(query);
+  async upsert(@Body() query: UpsertUserViewMetadataDto, @ActiveUser() activeUser: ActiveUserData) {
+    return this.service.upsert(query, activeUser);
   }
 
 }

package/src/controllers/view-metadata.controller.ts

@@ -6,6 +6,8 @@ import { CreateViewMetadataDto } from '../dtos/create-view-metadata.dto';
 import { UpdateViewMetadataDto } from '../dtos/update-view-metadata.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
+import { ActiveUser } from 'src/decorators/active-user.decorator';
+import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 
 @ApiTags('App')
 @Controller('view-metadata') //FIXME: Change this to the model plural name 
@@ -15,23 +17,23 @@ export class ViewMetadataController {
   @ApiBearerAuth("jwt")
   @Post()
   @UseInterceptors(AnyFilesInterceptor())
-  create(@Body() createDto: CreateViewMetadataDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.create(createDto, files,solidRequestContext);
+  create(@Body() createDto: CreateViewMetadataDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.create(createDto, files, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Post('/bulk')
   @UseInterceptors(AnyFilesInterceptor())
-  insertMany(@Body() createDtos: CreateViewMetadataDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [],@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.insertMany(createDtos, filesArray,solidRequestContext);
+  insertMany(@Body() createDtos: CreateViewMetadataDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [], @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.insertMany(createDtos, filesArray, solidRequestContext);
   }
 
 
   @ApiBearerAuth("jwt")
   @Put(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateViewMetadataDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.update(id, updateDto, files,false,solidRequestContext);
+  update(@Param('id') id: number, @Body() updateDto: UpdateViewMetadataDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.update(id, updateDto, files, false, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
@@ -46,31 +48,31 @@ export class ViewMetadataController {
   @ApiQuery({ name: 'populateMedia', required: false, type: Array })
   @ApiQuery({ name: 'filters', required: false, type: Array })
   @Get()
-  async findMany(@Query() query: any,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.find(query,solidRequestContext);
+  async findMany(@Query() query: any, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.find(query, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Get(':id')
-  async findOne(@Param('id') id: string, @Query() query: any,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.findOne(+id, query,solidRequestContext);
+  async findOne(@Param('id') id: string, @Query() query: any, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.findOne(+id, query, solidRequestContext);
   }
 
   @Delete('/bulk')
-  async deleteMany(@Body() ids: number[],@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.deleteMany(ids,solidRequestContext);
+  async deleteMany(@Body() ids: number[], @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.deleteMany(ids, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Delete(':id')
-  async delete(@Param('id') id: number,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.delete(id,solidRequestContext);
+  async delete(@Param('id') id: number, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.delete(id, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Get('/custom/layout')
-  getLayout(@Query() query: any) {
-    return this.service.getLayout(query);
+  getLayout(@Query() query: any, @ActiveUser() activeUser: ActiveUserData) {
+    return this.service.getLayout(query, activeUser);
   }
 
 }

package/src/dtos/create-email-attachment.dto.ts

@@ -1,26 +1,28 @@
-import { IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
+import { IsInt, IsNotEmpty, IsOptional, IsString, Matches } from "class-validator";
+import { ApiProperty } from '@nestjs/swagger';
 
 export class CreateEmailAttachmentDto {
     @IsNotEmpty()
+    @Matches(/[a-z]+(-[a-z]+)*/)
     @IsString()
+    @ApiProperty()
     name: string;
-
     @IsNotEmpty()
     @IsString()
+    @ApiProperty()
     displayName: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     relativePath: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     url: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     template: string;
-
     @IsOptional()
     @IsInt()
     emailTemplateId: number;

package/src/dtos/create-email-template.dto.ts

@@ -1,30 +1,41 @@
-import { IsArray, IsBoolean, IsEmail, IsNotEmpty, IsOptional, MaxLength, MinLength, ValidateNested } from 'class-validator';
+import { IsArray, IsBoolean, IsEmail, IsNotEmpty, IsOptional, MaxLength, MinLength, ValidateNested, Matches, IsString } from 'class-validator';
 import { CreateEmailAttachmentDto } from './create-email-attachment.dto';
 import { Type } from 'class-transformer';
+import { ApiProperty } from '@nestjs/swagger';
 
 export class CreateEmailTemplateDto {
     @IsNotEmpty()
+    @Matches(/[a-z]+(-[a-z]+)*/)
+    @IsString()
+    @ApiProperty()
     name: string;
-
     @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
     displayName: string;
-
     @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
     body: string;
-
-    @IsNotEmpty()
-    @MaxLength(128)
-    subject: string;
-
     @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    subject: string = "{}";
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
     description: string;
-
+    @IsOptional()
     @IsBoolean()
-    active: boolean;
-
+    @ApiProperty()
+    active: boolean = true;
     @IsOptional()
     @IsArray()
     @ValidateNested({ each: true })
     @Type(() => CreateEmailAttachmentDto)
     attachments: CreateEmailAttachmentDto[];
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    type: string;
 }

package/src/dtos/create-sms-template.dto.ts

@@ -1,20 +1,34 @@
-import { IsEmail, IsNotEmpty, IsOptional, MaxLength, MinLength } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsOptional, MaxLength, MinLength, IsString, Matches, IsBoolean } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
 
 export class CreateSmsTemplateDto {
     @IsNotEmpty()
+    @Matches(/[a-z]+(-[a-z]+)*/)
+    @IsString()
+    @ApiProperty()
     name: string;
-
     @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
     displayName: string;
-
     @IsOptional()
+    @IsString()
+    @ApiProperty()
     body: string;
-
     @IsOptional()
+    @IsString()
+    @ApiProperty()
     smsProviderTemplateId: string;
-
-    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
     description: string;
-
-    active: boolean;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    active: boolean = true;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    type: string;
 }

package/src/dtos/update-email-attachment.dto.ts

@@ -0,0 +1,36 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+import { Matches } from 'class-validator';
+import { IsOptional } from 'class-validator';
+import { IsNotEmpty } from 'class-validator';
+export class UpdateEmailAttachmentDto {
+
+
+@IsNotEmpty()
+@IsOptional()
+@Matches(/[a-z]+(-[a-z]+)*/)
+@IsString()
+@ApiProperty()
+name: string;
+
+@IsNotEmpty()
+@IsOptional()
+@IsString()
+@ApiProperty()
+displayName: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+relativePath: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+url: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+template: string;
+}

package/src/dtos/update-email-template.dto.ts

@@ -1,4 +1,42 @@
-import { PartialType } from '@nestjs/swagger';
+import { PartialType, ApiProperty } from '@nestjs/swagger';
 import { CreateEmailTemplateDto } from './create-email-template.dto';
+import { IsString } from 'class-validator';
+import { Matches } from 'class-validator';
+import { IsOptional } from 'class-validator';
+import { IsNotEmpty, IsBoolean } from 'class-validator';
 
-export class UpdateEmailTemplateDto extends PartialType(CreateEmailTemplateDto) { } { }
+export class UpdateEmailTemplateDto extends PartialType(CreateEmailTemplateDto) {
+    @IsNotEmpty()
+    @IsOptional()
+    @Matches(/[a-z]+(-[a-z]+)*/)
+    @IsString()
+    @ApiProperty()
+    name: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    displayName: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    body: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    type: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    subject: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    description: string;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    active: boolean;
+} { }

package/src/dtos/update-sms-template.dto.ts

@@ -1,4 +1,44 @@
-import { PartialType } from '@nestjs/swagger';
+import { PartialType, ApiProperty } from '@nestjs/swagger';
 import { CreateSmsTemplateDto } from './create-sms-template.dto';
+import { IsString } from 'class-validator';
+import { IsOptional, Matches, IsNotEmpty, IsBoolean } from 'class-validator';
 
-export class UpdateSmsTemplateDto extends PartialType(CreateSmsTemplateDto) { } { }
+export class UpdateSmsTemplateDto extends PartialType(CreateSmsTemplateDto) { 
+@IsOptional()
+@IsString()
+@ApiProperty()
+type: string;
+
+@IsNotEmpty()
+@IsOptional()
+@Matches(/[a-z]+(-[a-z]+)*/)
+@IsString()
+@ApiProperty()
+name: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+smsProviderTemplateId: string;
+
+@IsNotEmpty()
+@IsOptional()
+@IsString()
+@ApiProperty()
+displayName: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+body: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+description: string;
+
+@IsOptional()
+@IsBoolean()
+@ApiProperty()
+active: boolean;
+} { }

package/src/entities/email-attachment.entity.ts

@@ -5,21 +5,17 @@ import { IndentLogger } from "@angular-devkit/core/src/logger";
 
 @Entity("ss_email_attachment")
 export class EmailAttachment extends CommonEntity {
-    @Column()
+    @Index({ unique: true })
+    @Column({ name: "name", type: "varchar" })
     name: string;
-
-    @Column()
+    @Column({ name: "display_name", type: "varchar" })
     displayName: string;
-    
-    @Column({ nullable: true })
+    @Column({ name: "relativePath", type: "varchar", nullable: true })
     relativePath: string; // This is the path relative to the email service being used. For e.g if the attahchment is uploaded in the media manager of elastic email service
-
-    @Column({ nullable: true })
+    @Column({ name: "url", type: "varchar", nullable: true })
     url: string;
-    
-    @Column({ nullable: true })
+    @Column({ name: "template", type: "text", nullable: true })
     template: string;
-
     @Index()
     @ManyToOne(() => EmailTemplate, (template) => template.attachments, { onDelete: 'CASCADE' })
     @JoinColumn()

package/src/entities/email-template.entity.ts

@@ -1,28 +1,24 @@
 import { CommonEntity } from 'src/entities/common.entity';
-import { Column, Entity, OneToMany } from 'typeorm';
+import { Column, Entity, OneToMany, Index } from 'typeorm';
 import { EmailAttachment } from './email-attachment.entity';
 
-
 @Entity("ss_email_template")
 export class EmailTemplate extends CommonEntity {
-    @Column({ unique: true })
+    @Index({ unique: true })
+    @Column({ name: "name", type: "varchar", unique: true })
     name: string;
-
-    @Column()
+    @Column({ name: "display_name", type: "varchar" })
     displayName: string;
-
-    @Column({ type: 'text' })
+    @Column({ name: "body", type: "varchar" })
     body: string;
-
-    @Column({ length: 128 })
-    subject: string;
-
-    @Column({ type: 'text', nullable: true })
+    @Column({ name: "subject", type: "varchar", default: "{}" })
+    subject: string = "{}";
+    @Column({ name: "description", type: "text", nullable: true })
     description: string;
-
-    @Column({ default: false })
-    active: boolean;
-
+    @Column({ name: "active", type: "boolean", nullable: true, default: true })
+    active: boolean = true;
     @OneToMany(() => EmailAttachment, (attachment) => attachment.emailTemplate, { cascade: true })
     attachments: EmailAttachment[];
+    @Column({ name: "type", type: "varchar", nullable: true })
+    type: string;
 }