@solidstarters/solid-core 1.2.91 → 1.2.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.91",
+  "version": "1.2.93",
   "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/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/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-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-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/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;
+
 }