Merge pull request #234 from souravbhowmik1999/deleteUser

Task PS-1226 Update user status with reason
tekdi · Jul 9, 2024 · 3ac02b5 · 3ac02b5
2 parents d9bee7a + 9556dab
commit 3ac02b5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/user/dto/user-update.dto.ts b/src/user/dto/user-update.dto.ts
@@ -1,77 +1,99 @@
 import { IsString, IsOptional, IsArray, ValidateNested, IsNotEmpty, IsEnum, ValidateIf } from 'class-validator';
 import { Expose, Type } from 'class-transformer';
 import { UserStatus } from '../entities/user-entity';
+import { ApiProperty } from '@nestjs/swagger';
 
 class UserDataDTO {
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     username: string;
 
+    @ApiProperty({ type: () => String })
     @IsString()
-    @IsNotEmpty()
+    @IsOptional()
     name: string;
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     role: string;
 
+    @ApiProperty({ type: () => String })
     @IsOptional()
     @IsString()
     dob: string | null;
 
+    @ApiProperty({ type: () => String })
     @IsOptional()
     @IsString()
     email: string | null;
 
+    @ApiProperty({ type: () => String })
     @IsOptional()
     @IsString()
     district: string | null;
 
+    @ApiProperty({ type: () => String })
     @IsOptional()
     @IsString()
     state: string | null;
 
+    @ApiProperty({ type: () => String })
     @IsOptional()
     @IsString()
     address: string | null;
 
+    @ApiProperty({ type: () => String })
     @IsOptional()
     @IsString()
     pincode: string | null;
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     createdAt: string;
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     updatedAt: string;
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     createdBy: string;
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     updatedBy: string;
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     tenantId: string;
 
+    @ApiProperty({ type: () => String })
     @IsString()
     @IsOptional()
     @IsEnum(UserStatus)
     status: UserStatus;
+
+    @ApiProperty({ type: () => String })
+    @IsString()
+    @IsOptional()
+    reason: string;
 }
 class CustomFieldDTO {
-
+    @ApiProperty({ type: () => String })
     @IsString()
     @Expose()
     @IsNotEmpty()
     fieldId: string;
 
+    @ApiProperty({ type: () => String })
     @ValidateIf(o => o.value !== '')
     @IsNotEmpty()
     @Expose()
@@ -82,12 +104,14 @@ export class UserUpdateDTO {
 
     userId: string;
 
+    @ApiProperty({ type: () => [UserDataDTO] })
     @Expose()
     @ValidateNested()
     @IsNotEmpty()
     @Type(() => UserDataDTO)
     userData: UserDataDTO;
 
+    @ApiProperty({ type: () => [CustomFieldDTO] })
     @IsArray()
     @IsOptional()
     @ValidateNested({ each: true })

diff --git a/src/user/entities/user-entity.ts b/src/user/entities/user-entity.ts
@@ -71,6 +71,9 @@ export class User {
   })
   status: UserStatus;
 
+  @Column({ nullable: true })
+  reason: string;
+
   userRoleMappings: User;
 
   // @OneToMany(() => CohortMembers, cohortMember => cohortMember.cohort)