@solidstarters/solid-core 1.2.92 → 1.2.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.92",
+  "version": "1.2.95",
   "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",
@@ -48,6 +48,7 @@
     "fast-csv": "^5.0.2",
     "handlebars": "^4.7.8",
     "ioredis": "^5.4.1",
+    "locale-codes": "^1.3.1",
     "lodash": "^4.17.21",
     "luxon": "^3.4.4",
     "mailgen": "^2.0.28",

package/src/controllers/import-transaction.controller.ts

@@ -108,9 +108,15 @@ export class ImportTransactionController {
   }
 
   @ApiBearerAuth("jwt")
-  @Post(':id/import-mapping')
-  async saveImportMapping(@Param('id') id: string) {
-    return this.service.saveImportMapping(+id);
+  @Post(':id/start-import/sync')
+  async startImportSync(@Param('id') id: string) {
+    return this.service.startImportSync(+id);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post(':id/start-import/async')
+  async startImportAsync(@Param('id') id: string) {
+    return this.service.startImportAsync(+id);
   }
 
   @ApiBearerAuth("jwt")

package/src/controllers/locale.controller.ts

@@ -0,0 +1,94 @@
+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 { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
+import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
+import { LocaleService } from 'src/services/locale.service';
+import { CreateLocaleDto } from 'src/dtos/create-locale.dto';
+import { UpdateLocaleDto } from 'src/dtos/update-locale.dto';
+
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
+@Controller('locale')
+export class LocaleController {
+  constructor(private readonly service: LocaleService) { }
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateLocaleDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateLocaleDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateLocaleDto, @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: UpdateLocaleDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk-recover')
+  async recoverMany(@Body() ids: number[]) {
+    return this.service.recoverMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/recover/:id')
+  async recover(@Param('id') id: number) {
+    return this.service.recover(id);
+  }
+
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
+  @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);
+  }
+
+  @ApiBearerAuth("jwt")
+  @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/basic-filters.dto.ts

@@ -2,6 +2,7 @@
 import { ApiProperty } from "@nestjs/swagger";
 import { IsEnum, IsOptional } from "class-validator";
 import { PaginationQueryDto } from "./pagination-query.dto";
+import { Timestamp } from "typeorm";
 
 export enum SoftDeleteFilter {
     INCLUSIVE = "inclusive",
@@ -32,7 +33,6 @@ export class BasicFilterDto extends PaginationQueryDto {
     @ApiProperty({ description: "populateMedia" })
     readonly populateMedia?: string[];
 
-
     // @IsOptional()
     // @ApiProperty({ description: "filters" })
     // readonly filters: any[];
@@ -52,4 +52,16 @@ export class BasicFilterDto extends PaginationQueryDto {
     @IsOptional()
     @ApiProperty({ description: "groupFilter" })
     groupFilter?: BasicFilterDto
+
+    @IsOptional()
+    @ApiProperty({ description: "locale" })
+    readonly locale?: string;
+
+    @IsOptional()
+    @ApiProperty({ description: "status publish draft" })
+    readonly status?: string;
+
+    // @IsOptional()
+    // @ApiProperty({ description: "default locale id" })
+    // readonly defaultEntityLocaleId?: number;
 }

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

@@ -0,0 +1,17 @@
+import { IsString, IsBoolean, IsOptional, IsNotEmpty } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class CreateLocaleDto {
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    locale: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    displayName: string;
+    @IsNotEmpty()
+    @IsBoolean()
+    @ApiProperty()
+    isDefault: boolean = true;
+}

package/src/dtos/create-menu-item-metadata.dto.ts

@@ -2,59 +2,67 @@ import { IsNumber, IsString } from 'class-validator';
 import { Matches } from 'class-validator';
 import { IsNotEmpty, IsInt, IsOptional, ValidateNested, IsArray } from 'class-validator';
 import { Transform, Type } from 'class-transformer';
-import { UpdateRoleMetadataDto } from './update-role-metadata.dto';
 import arrayTransformer from '../transformers/array-transformer';
+import { ApiProperty } from '@nestjs/swagger';
+import { UpdateRoleMetadataDto } from 'src/dtos/update-role-metadata.dto';
+
 export class CreateMenuItemMetadataDto {
     @IsNotEmpty()
     @Matches(/[a-z]+(-[a-z]+)*/)
     @IsString()
+    @ApiProperty()
     name: string;
-
     @IsNotEmpty()
     @IsString()
+    @ApiProperty()
     displayName: string;
-
     @IsOptional()
     @IsInt()
+    @ApiProperty()
     moduleId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     moduleUserKey: string;
-
     @IsOptional()
     @IsInt()
+    @ApiProperty()
     parentMenuItemId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     parentMenuItemUserKey: string;
-
     @IsOptional()
     @IsInt()
+    @ApiProperty()
     actionId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     actionUserKey: string;
-
+    @Transform(arrayTransformer)
     @IsOptional()
+    @ApiProperty()
     @IsArray()
-    @Transform(arrayTransformer)
     @ValidateNested({ each: true })
     @Type(() => UpdateRoleMetadataDto)
     roles: UpdateRoleMetadataDto[];
-
     @IsOptional()
     @IsArray()
+    @ApiProperty()
     rolesIds: number[];
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     rolesCommand: string;
-
     @IsOptional()
     @IsNumber()
+    @ApiProperty()
     sequenceNumber: number;
 
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    iconName: string;
+
 }

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

@@ -63,10 +63,14 @@ export class CreateModelMetadataDto {
     @IsBoolean()
     readonly enableAuditTracking: boolean
 
-    @ApiProperty({ description: "Enable Soft Delete" })
+    @ApiProperty({ description: "Internationalisation" })
     @IsBoolean()
     readonly internationalisation: boolean
 
+    @ApiProperty({ description: "Draft publish workflow" })
+    @IsBoolean()
+    readonly draftPublishWorkflow: boolean
+
     @ApiProperty({ description: "Related module id" })
     @IsInt()
     @IsOptional()

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

@@ -4,50 +4,53 @@ import { Type } from 'class-transformer';
 import { UpdatePermissionMetadataDto } from 'src/dtos/update-permission-metadata.dto';
 import { UpdateUserDto } from 'src/dtos/update-user.dto';
 import { UpdateMenuItemMetadataDto } from 'src/dtos/update-menu-item-metadata.dto';
-export class CreateRoleMetadataDto {
-@IsNotEmpty()
-@IsString()
-name: string;
-
-@IsOptional()
-@IsArray()
-@ValidateNested({ each : true })
-@Type(() => UpdatePermissionMetadataDto)
-permissions: UpdatePermissionMetadataDto[];
-
-@IsOptional()
-@IsArray()
-permissionsIds: number[];
-
-@IsString()
-@IsOptional()
-permissionsCommand: string;
-
-@IsOptional()
-@IsArray()
-@ValidateNested({ each : true })
-@Type(() => UpdateUserDto)
-users: UpdateUserDto[];
+import { ApiProperty } from '@nestjs/swagger';
 
-@IsOptional()
-@IsArray()
-usersIds: number[];
-
-@IsString()
-@IsOptional()
-usersCommand: string;
-
-@IsOptional()
-@IsArray()
-@ValidateNested({ each : true })
-@Type(() => UpdateMenuItemMetadataDto)
-menuItems: UpdateMenuItemMetadataDto[];
-
-@IsOptional()
-@IsArray()
-menuItemsIds: number[];
-
-@IsString()
-@IsOptional()
-menuItemsCommand: string;
+export class CreateRoleMetadataDto {
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    name: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdatePermissionMetadataDto)
+    permissions: UpdatePermissionMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    permissionsIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    permissionsCommand: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateUserDto)
+    users: UpdateUserDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    usersIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    usersCommand: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateMenuItemMetadataDto)
+    menuItems: UpdateMenuItemMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    menuItemsIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    menuItemsCommand: string;
 }

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

@@ -0,0 +1,23 @@
+import { IsString, IsBoolean, IsOptional, IsInt, IsNotEmpty } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdateLocaleDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    locale: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    displayName: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isDefault: boolean;
+}

package/src/dtos/update-menu-item-metadata.dto.ts

@@ -1,64 +1,71 @@
 import { IsInt, IsOptional, IsString, Matches, IsNotEmpty, ValidateNested, IsArray, IsNumber } from 'class-validator';
 import { Transform, Type } from 'class-transformer';
-import { UpdateRoleMetadataDto } from './update-role-metadata.dto';
 import arrayTransformer from '../transformers/array-transformer';
+import { ApiProperty } from '@nestjs/swagger';
+import { UpdateRoleMetadataDto } from 'src/dtos/update-role-metadata.dto';
+
 export class UpdateMenuItemMetadataDto {
     @IsOptional()
     @IsInt()
     id: number;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @Matches(/[a-z]+(-[a-z]+)*/)
     @IsString()
+    @ApiProperty()
     name: string;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsString()
+    @ApiProperty()
     displayName: string;
-
     @IsOptional()
     @IsInt()
+    @ApiProperty()
     moduleId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     moduleUserKey: string;
-
     @IsOptional()
     @IsInt()
+    @ApiProperty()
     parentMenuItemId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     parentMenuItemUserKey: string;
-
     @IsOptional()
     @IsInt()
+    @ApiProperty()
     actionId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     actionUserKey: string;
-
+    @Transform(arrayTransformer)
     @IsOptional()
+    @ApiProperty()
     @IsArray()
-    @Transform(arrayTransformer)
     @ValidateNested({ each: true })
     @Type(() => UpdateRoleMetadataDto)
     roles: UpdateRoleMetadataDto[];
-
     @IsOptional()
     @IsArray()
+    @ApiProperty()
     rolesIds: number[];
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     rolesCommand: string;
-
     @IsOptional()
     @IsNumber()
+    @ApiProperty()
     sequenceNumber: number;
 
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    iconName: string;
+
 }

package/src/dtos/update-role-metadata.dto.ts

@@ -3,55 +3,57 @@ import { Type } from 'class-transformer';
 import { UpdatePermissionMetadataDto } from 'src/dtos/update-permission-metadata.dto';
 import { UpdateUserDto } from 'src/dtos/update-user.dto';
 import { UpdateMenuItemMetadataDto } from 'src/dtos/update-menu-item-metadata.dto';
+import { ApiProperty } from '@nestjs/swagger';
+
 export class UpdateRoleMetadataDto {
     @IsOptional()
     @IsInt()
     id: number;
-
-@IsOptional()    
-@IsNotEmpty()
-@IsString()
-name: string;
-
-@IsOptional()
-@IsArray()
-@ValidateNested({ each : true })
-@Type(() => UpdatePermissionMetadataDto)
-permissions: UpdatePermissionMetadataDto[];
-
-@IsOptional()
-@IsArray()
-permissionsIds: number[];
-
-@IsString()
-@IsOptional()
-permissionsCommand: string;
-
-@IsOptional()
-@IsArray()
-@ValidateNested({ each : true })
-@Type(() => UpdateUserDto)
-users: UpdateUserDto[];
-
-@IsOptional()
-@IsArray()
-usersIds: number[];
-
-@IsString()
-@IsOptional()
-usersCommand: string;
-
-@IsOptional()
-@IsArray()
-@ValidateNested({ each : true })
-@Type(() => UpdateMenuItemMetadataDto)
-menuItems: UpdateMenuItemMetadataDto[];
-
-@IsOptional()
-@IsArray()
-menuItemsIds: number[];
-
-@IsString()
-@IsOptional()
-menuItemsCommand: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    name: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdatePermissionMetadataDto)
+    permissions: UpdatePermissionMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    permissionsIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    permissionsCommand: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateUserDto)
+    users: UpdateUserDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    usersIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    usersCommand: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateMenuItemMetadataDto)
+    menuItems: UpdateMenuItemMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    menuItemsIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    menuItemsCommand: string;
 }

package/src/entities/common.entity.ts

@@ -1,4 +1,5 @@
-import { PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn } from "typeorm"
+import { PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn } from "typeorm"
+import { Locale } from "./locale.entity";
 
 export abstract class CommonEntity {
     @PrimaryGeneratedColumn({ type: 'integer' })
@@ -15,4 +16,13 @@ export abstract class CommonEntity {
 
     @Column({ name: "deletedTracker", default: "not-deleted" })
     deletedTracker: string;
+
+    @Column({ type: "timestamp", name: 'published_at', default: null ,nullable: true})
+    publishedAt: Date;
+
+    @Column({ type: "varchar", name: 'locale_name', default: null })
+    localeName: string;
+
+    @Column({ type: "int", name: 'default_entity_locale_id', default: null })
+    defaultEntityLocaleId: number;
 }

package/src/entities/locale.entity.ts

@@ -0,0 +1,14 @@
+import { CommonEntity } from 'src/entities/common.entity'
+import { Entity, Column, Index, ManyToOne } from 'typeorm';
+
+@Entity("ss_locale")
+export class Locale extends CommonEntity {
+    @Index({ unique: true })
+    @Column({ type: "varchar" })
+    locale: string;
+    @Column({ type: "varchar" })
+    displayName: string;
+    @Index()
+    @Column({ type: "boolean", default: true })
+    isDefault: boolean = true;
+}

package/src/entities/menu-item-metadata.entity.ts

@@ -2,34 +2,34 @@ import { CommonEntity } from "src/entities/common.entity"
 import { Entity, Column, ManyToOne, Index, JoinTable, ManyToMany, JoinColumn } from "typeorm";
 import { ModuleMetadata } from 'src/entities/module-metadata.entity';
 import { ActionMetadata } from 'src/entities/action-metadata.entity';
-import { RoleMetadata } from "./role-metadata.entity";
+import { RoleMetadata } from 'src/entities/role-metadata.entity';
+
 @Entity("ss_menu_item_metadata")
 export class MenuItemMetadata extends CommonEntity {
+    @Index({ unique: true })
     @Column({ name: "name", type: "varchar", unique: true })
     name: string;
-
     @Column({ name: "display_name", type: "varchar" })
     displayName: string;
-
-    @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
     @Index()
-    @ManyToOne(() => ModuleMetadata, { onDelete: "CASCADE" })
+    @ManyToOne(() => ModuleMetadata, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn({ referencedColumnName: 'id' })
     module: ModuleMetadata;
-
-    @JoinColumn({ name: 'parent_menu_item_id', referencedColumnName: 'id' })
     @Index()
-    @ManyToOne(() => MenuItemMetadata, { onDelete: "CASCADE" })
+    @ManyToOne(() => MenuItemMetadata, { onDelete: "CASCADE", nullable: true })
+    @JoinColumn({ referencedColumnName: 'id' })
     parentMenuItem: MenuItemMetadata;
-
-    @JoinColumn({ name: 'action_id', referencedColumnName: 'id' })
     @Index()
-    @ManyToOne(() => ActionMetadata, { onDelete: "CASCADE" })
+    @ManyToOne(() => ActionMetadata, { onDelete: "CASCADE", nullable: true })
+    @JoinColumn({ referencedColumnName: 'id' })
     action: ActionMetadata;
-
-    @ManyToMany(() => RoleMetadata, roleMetadata => roleMetadata.menuItems, { cascade: true })
+    @ManyToMany(() => RoleMetadata, roleMetadata => roleMetadata.users, { cascade: true })
     @JoinTable()
     roles: RoleMetadata[];
-
     @Column({ name: "sequence_number", type: "int", nullable: true })
     sequenceNumber: number;
+
+    @Column({ name: "icon_name", type: "varchar", nullable: true })
+    iconName: string;
+
 }