@solidstarters/solid-core 1.2.46 → 1.2.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.46",
+  "version": "1.2.47",
   "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",
@@ -50,13 +50,13 @@
     "luxon": "^3.4.4",
     "mailgen": "^2.0.28",
     "mongoose": "^8.7.0",
+    "mysql2": "^3.13.0",
     "nodemailer": "^6.9.13",
     "passport": "^0.7.0",
     "passport-google-oauth2": "^0.2.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
     "pg": "^8.11.3",
-    "mysql2": "^3.13.0",
     "pluralize": "^8.0.0",
     "puppeteer": "^23.2.0",
     "reflect-metadata": "^0.1.13",
@@ -87,6 +87,8 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
+    "@angular-devkit/schematics": "^19.2.6",
+    "@angular-devkit/schematics-cli": "^19.2.6",
     "@nestjs/axios": "^3.0.2",
     "@nestjs/cache-manager": "^2.2.2",
     "@nestjs/cli": "^10.0.0",
@@ -103,8 +105,7 @@
     "@nestjs/swagger": "^7.2.0",
     "@nestjs/testing": "^10.0.0",
     "@nestjs/typeorm": "^10.0.1",
-    "nest-commander": "^3.12.5",
-    "nest-winston": "^1.9.7",
+    "@solidstarters/solid-code-builder": "^1.0.2",
     "@types/express": "^4.17.17",
     "@types/hapi__joi": "^17.1.12",
     "@types/jest": "^29.5.2",
@@ -126,6 +127,8 @@
     "eslint-plugin-prettier": "^5.0.0",
     "jest": "^29.5.0",
     "nest-cli": "^0.0.5",
+    "nest-commander": "^3.12.5",
+    "nest-winston": "^1.9.7",
     "prettier": "^3.0.0",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.3",
@@ -136,8 +139,7 @@
     "typeorm": "^0.3.20",
     "typeorm-naming-strategies": "^4.1.0",
     "typescript": "^5.1.3",
-    "winston": "^3.17.0",
-    "@solidstarters/solid-code-builder": "^1.0.2"
+    "winston": "^3.17.0"
   },
   "jest": {
     "moduleFileExtensions": [

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

@@ -0,0 +1,99 @@
+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 { 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';
+
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
+@Controller('user-view-metadata')
+export class UserViewMetadataController {
+  constructor(private readonly service: UserViewMetadataService) { }
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateUserViewMetadataDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateUserViewMetadataDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateUserViewMetadataDto, @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: UpdateUserViewMetadataDto, @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);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/upsert')
+  async upsert(@Body() query: UpsertUserViewMetadataDto) {
+    return this.service.upsert(query);
+  }
+
+}

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

@@ -0,0 +1,27 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsInt } from 'class-validator';
+import { IsOptional } from 'class-validator';
+import { IsString, IsJSON } from 'class-validator';
+
+export class CreateUserViewMetadataDto {
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+    @IsOptional()
+    @IsJSON()
+    @ApiProperty()
+    layout: any = "{}";
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    viewMetadataId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    viewMetadataUserKey: string;
+}

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

@@ -1,121 +1,155 @@
 import { IsString } from 'class-validator';
-import { IsOptional, IsNotEmpty, Matches, IsBoolean, IsDate } from 'class-validator';
+import { IsOptional, IsNotEmpty, Matches, IsBoolean, IsDate, ValidateNested, IsArray } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { UpdateRoleMetadataDto } from 'src/dtos/update-role-metadata.dto';
+import { UpdateUserViewMetadataDto } from 'src/dtos/update-user-view-metadata.dto';
+
 export class CreateUserDto {
     @IsOptional()
     @IsString()
+    @ApiProperty()
     fullName: string;
-
     @IsNotEmpty()
     @IsString()
+    @ApiProperty()
     username: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     email: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     mobile: string;
-
-    @IsNotEmpty()
+    @IsOptional()
     @Matches(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).*$/)
     @IsString()
+    @ApiProperty()
     password: string;
-
-    @IsString()
+    @IsOptional()
     @Matches(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).*$/)
-    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
     passwordConfirm: string;
-
     @IsOptional()
     @IsBoolean()
-    forcePasswordChange: boolean = false;
-
+    @ApiProperty()
+    forcePasswordChange: boolean = true;
     @IsNotEmpty()
     @IsString()
+    @ApiProperty()
     lastLoginProvider: string = "local";
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     accessCode: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     googleAccessToken: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     googleId: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     googleProfilePicture: string;
-
     @IsNotEmpty()
     @IsBoolean()
+    @ApiProperty()
     active: boolean = true;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     forgotPasswordConfirmedAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     verificationTokenOnForgotPassword: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     verificationTokenOnForgotPasswordExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerifiedOnRegistrationAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     emailVerificationTokenOnRegistration: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerificationTokenOnRegistrationExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerifiedOnRegistrationAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     mobileVerificationTokenOnRegistration: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerificationTokenOnRegistrationExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerifiedOnLoginAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     emailVerificationTokenOnLogin: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerificationTokenOnLoginExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerifiedOnLoginAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     mobileVerificationTokenOnLogin: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerificationTokenOnLoginExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     customPayload: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateRoleMetadataDto)
+    roles: UpdateRoleMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    rolesIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    rolesCommand: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateUserViewMetadataDto)
+    userViewMetadata: UpdateUserViewMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    userViewMetadataIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userViewMetadataCommand: string;
 }

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

@@ -1,39 +1,60 @@
 import { IsOptional, IsString } from 'class-validator';
 import { Matches } from 'class-validator';
-import { IsNotEmpty, IsJSON } from 'class-validator';
+import { IsNotEmpty, IsJSON, IsInt, ValidateNested, IsArray } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { UpdateUserViewMetadataDto } from 'src/dtos/update-user-view-metadata.dto';
+
 export class CreateViewMetadataDto {
     @IsNotEmpty()
     @Matches(/[a-z]+(-[a-z]+)*/, { message: "Only kebab case allowed for module name, also only lower case." })
     @IsString()
+    @ApiProperty()
     name: string;
-
     @IsNotEmpty()
     @IsString()
+    @ApiProperty()
     displayName: string;
-
     @IsNotEmpty()
     @IsString()
+    @ApiProperty()
     type: string;
-
     @IsNotEmpty()
     @IsJSON()
-    context: any;
-
+    @ApiProperty()
+    context: any = "{}";
     @IsNotEmpty()
     @IsJSON()
+    @ApiProperty()
     layout: any;
-
-    @IsNotEmpty()
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
     moduleId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     moduleUserKey: string;
-
-    @IsNotEmpty()
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
     modelId: number;
-
     @IsString()
     @IsOptional()
+    @ApiProperty()
     modelUserKey: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateUserViewMetadataDto)
+    userViewMetadata: UpdateUserViewMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    userViewMetadataIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userViewMetadataCommand: string;
 }

package/src/dtos/selection-dynamic-query.dto.ts

@@ -20,7 +20,7 @@ export class SelectionDynamicQueryDto extends PaginationQueryDto {
     @ApiProperty({ description: "Search query string", type: String })
     @IsString()
     @IsOptional()
-    query?: string = '';
+    query?: any;
 
     @ApiProperty({ description: "Value of a single dynamic option", type: String })
     @IsString()

package/src/dtos/update-user-view-metadata.dto.ts

@@ -0,0 +1,28 @@
+import { IsInt,IsOptional, IsString, IsJSON } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdateUserViewMetadataDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userUserKey: string;
+    @IsOptional()
+    @IsJSON()
+    @ApiProperty()
+    layout: any;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    viewMetadataId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    viewMetadataUserKey: string;
+}

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

@@ -1,129 +1,160 @@
-import { IsInt, IsOptional, IsString, IsNotEmpty, Matches, IsBoolean, IsDate } from 'class-validator';
+import { IsInt, IsOptional, IsString, IsNotEmpty, Matches, IsBoolean, IsDate, ValidateNested, IsArray } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { UpdateRoleMetadataDto } from 'src/dtos/update-role-metadata.dto';
+import { UpdateUserViewMetadataDto } from 'src/dtos/update-user-view-metadata.dto';
+
 export class UpdateUserDto {
     @IsOptional()
     @IsInt()
     id: number;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     fullName: string;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsString()
+    @ApiProperty()
     username: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     email: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     mobile: string;
-
     @IsOptional()
-    @IsNotEmpty()
     @Matches(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).*$/)
     @IsString()
+    @ApiProperty()
     password: string;
-
     @IsOptional()
-    @IsString()
     @Matches(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).*$/)
-    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
     passwordConfirm: string;
-
     @IsOptional()
     @IsBoolean()
+    @ApiProperty()
     forcePasswordChange: boolean = true;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsString()
+    @ApiProperty()
     lastLoginProvider: string = "local";
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     accessCode: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     googleAccessToken: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     googleId: string;
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     googleProfilePicture: string;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsBoolean()
+    @ApiProperty()
     active: boolean = true;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     forgotPasswordConfirmedAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     verificationTokenOnForgotPassword: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     verificationTokenOnForgotPasswordExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerifiedOnRegistrationAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     emailVerificationTokenOnRegistration: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerificationTokenOnRegistrationExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerifiedOnRegistrationAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     mobileVerificationTokenOnRegistration: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerificationTokenOnRegistrationExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerifiedOnLoginAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     emailVerificationTokenOnLogin: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     emailVerificationTokenOnLoginExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerifiedOnLoginAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     mobileVerificationTokenOnLogin: string;
-
     @IsOptional()
     @IsDate()
+    @ApiProperty()
     mobileVerificationTokenOnLoginExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
-
     @IsOptional()
     @IsString()
+    @ApiProperty()
     customPayload: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateRoleMetadataDto)
+    roles: UpdateRoleMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    rolesIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    rolesCommand: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateUserViewMetadataDto)
+    userViewMetadata: UpdateUserViewMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    userViewMetadataIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userViewMetadataCommand: string;
 }