fix: add & update user logic (#150)

Author: lamngockhuong

apps/realworld-graphql/src/modules/user/dto/user.dto.ts

@@ -1,19 +1,40 @@
-import { Field, InputType, PartialType } from '@nestjs/graphql';
+import { InputType } from '@nestjs/graphql';
+import {
+  EmailField,
+  EmailFieldOptional,
+  PasswordField,
+  StringField,
+  StringFieldOptional,
+  URLFieldOptional,
+} from '@repo/graphql';
+import { lowerCaseTransformer } from '@repo/nest-common';
+import { Transform } from 'class-transformer';
 
-@InputType()
+@InputType({ description: 'User register request' })
 export class CreateUserInput {
-  @Field(() => String)
+  @EmailField()
   email: string;
 
-  @Field(() => String)
+  @StringField()
+  @Transform(lowerCaseTransformer)
   username: string;
 
-  @Field(() => String)
+  @PasswordField()
   password: string;
 }
 
-@InputType()
-export class UpdateUserInput extends PartialType(CreateUserInput) {
-  @Field(() => Number)
-  id: number;
+@InputType({ description: 'User update request' })
+export class UpdateUserInput {
+  @EmailFieldOptional()
+  email?: string;
+
+  @StringFieldOptional()
+  @Transform(lowerCaseTransformer)
+  username?: string;
+
+  @StringFieldOptional()
+  bio?: string;
+
+  @URLFieldOptional()
+  image?: string;
 }

apps/realworld-graphql/src/modules/user/model/user.model.ts

@@ -1,18 +1,21 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 @ObjectType()
 export class User {
-  @Field(() => String)
-  email: string;
+  @Field(() => Number, { nullable: true })
+  id?: number;
 
-  @Field(() => String)
-  token: string;
+  @Field(() => String, { nullable: true })
+  email?: string;
 
-  @Field(() => String)
-  username: string;
+  @Field(() => String, { nullable: true })
+  token?: string;
 
-  @Field(() => String)
-  bio: string;
+  @Field(() => String, { nullable: true })
+  username?: string;
 
-  @Field(() => String)
-  image: string;
+  @Field(() => String, { nullable: true })
+  bio?: string;
+
+  @Field(() => String, { nullable: true })
+  image?: string;
 }

apps/realworld-graphql/src/modules/user/user.resolver.ts

@@ -1,12 +1,24 @@
-import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import {
+  Args,
+  Mutation,
+  Parent,
+  Query,
+  ResolveField,
+  Resolver,
+} from '@nestjs/graphql';
 import { CurrentUser } from '@repo/graphql';
+import { Public } from '@repo/nest-common';
+import { AuthService } from '../auth/auth.service';
 import { CreateUserInput, UpdateUserInput } from './dto/user.dto';
 import { User } from './model/user.model';
 import { UserService } from './user.service';
 
-@Resolver()
+@Resolver(() => User)
 export class UserResolver {
-  constructor(private readonly userService: UserService) {}
+  constructor(
+    private readonly userService: UserService,
+    private readonly authService: AuthService,
+  ) {}
 
   @Query(() => User)
   async currentUser(
@@ -15,13 +27,22 @@ export class UserResolver {
     return this.userService.get(user);
   }
 
+  @Public()
   @Mutation(() => User)
   async createUser(@Args('user') userInput: CreateUserInput): Promise<User> {
     return await this.userService.create(userInput);
   }
 
   @Mutation(() => User)
-  async updateUser(@Args('user') userInput: UpdateUserInput): Promise<User> {
-    return await this.userService.update(userInput);
+  async updateUser(
+    @CurrentUser('id') userId: number,
+    @Args('user') userInput: UpdateUserInput,
+  ): Promise<User> {
+    return await this.userService.update(userId, userInput);
+  }
+
+  @ResolveField()
+  async token(@Parent() user: User) {
+    return await this.authService.createToken({ id: user.id });
   }
 }

apps/realworld-graphql/src/modules/user/user.service.ts

@@ -39,27 +39,24 @@ export class UserService {
     const newUser = this.userRepository.create({ username, email, password });
     const savedUser = await this.userRepository.save(newUser);
 
-    return {
-      ...savedUser,
-      token: await this.authService.createToken({ id: savedUser.id }),
-    };
+    return savedUser;
   }
 
-  async update(dto: UpdateUserInput) {
-    const user = await this.userRepository.findOneBy({ id: dto.id });
+  async update(userId: number, dto: UpdateUserInput) {
+    const user = await this.userRepository.findOneBy({ id: userId });
 
     if (!user) {
       throw new ValidationException(ErrorCode.E002);
     }
 
     const savedUser = await this.userRepository.save({
-      id: user.id,
+      id: userId,
       ...dto,
     });
 
     return {
+      ...user,
       ...savedUser,
-      token: await this.authService.createToken({ id: savedUser.id }),
     };
   }
 }

apps/realworld-graphql/src/schema.gql

@@ -2,6 +2,7 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
 # ------------------------------------------------------
 
+"""User register request"""
 input CreateUserInput {
   email: String!
   password: String!
@@ -30,17 +31,19 @@ type Query {
   getHello: String!
 }
 
+"""User update request"""
 input UpdateUserInput {
+  bio: String
   email: String
-  id: Float!
-  password: String
+  image: String
   username: String
 }
 
 type User {
-  bio: String!
-  email: String!
-  image: String!
-  token: String!
-  username: String!
+  bio: String
+  email: String
+  id: Float
+  image: String
+  token: String
+  username: String
 }

apps/realworldx-api/src/filters/global-exception.filter.ts

@@ -45,13 +45,13 @@ export class GlobalExceptionFilter implements ExceptionFilter {
     } else if (exception instanceof HttpException) {
       error = handleHttpException(exception);
     } else if (exception instanceof QueryFailedError) {
-      this.logger.error(error);
+      this.logger.error(exception);
       error = this.handleQueryFailedError(exception);
     } else if (exception instanceof EntityNotFoundError) {
       this.logger.debug(exception);
       error = this.handleEntityNotFoundError(exception);
     } else {
-      this.logger.error(error);
+      this.logger.error(exception);
       error = handleError(exception);
     }
 

packages/graphql/src/decorators/field.decorators.ts

@@ -77,7 +77,10 @@ export function NumberField(
 export function NumberFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & INumberFieldOptions = {},
 ): PropertyDecorator {
-  return NumberField({ nullable: true, ...options });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    NumberField({ nullable: true, ...options }),
+  );
 }
 
 export function StringField(
@@ -108,7 +111,10 @@ export function StringField(
 export function StringFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & IStringFieldOptions = {},
 ): PropertyDecorator {
-  return StringField({ nullable: true, ...options });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    StringField({ nullable: true, ...options }),
+  );
 }
 
 export function TokenField(
@@ -136,7 +142,10 @@ export function PasswordField(
 export function PasswordFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & IStringFieldOptions = {},
 ): PropertyDecorator {
-  return PasswordField({ nullable: true, ...options });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    PasswordField({ nullable: true, ...options }),
+  );
 }
 
 export function BooleanField(
@@ -157,7 +166,10 @@ export function BooleanField(
 export function BooleanFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & IBooleanFieldOptions = {},
 ): PropertyDecorator {
-  return BooleanField({ nullable: true, ...options });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    BooleanField({ nullable: true, ...options }),
+  );
 }
 
 export function EmailField(
@@ -173,7 +185,10 @@ export function EmailField(
 export function EmailFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & IStringFieldOptions = {},
 ): PropertyDecorator {
-  return EmailField({ nullable: true, ...options });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    EmailField({ nullable: true, ...options }),
+  );
 }
 
 export function UUIDField(
@@ -189,7 +204,10 @@ export function UUIDField(
 export function UUIDFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & IFieldOptions = {},
 ): PropertyDecorator {
-  return UUIDField({ nullable: true, ...options });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    UUIDField({ nullable: true, ...options }),
+  );
 }
 
 export function URLField(
@@ -207,7 +225,10 @@ export function URLField(
 export function URLFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & IStringFieldOptions = {},
 ): PropertyDecorator {
-  return URLField({ nullable: true, ...options });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    URLField({ nullable: true, ...options }),
+  );
 }
 
 export function DateField(
@@ -223,7 +244,10 @@ export function DateField(
 export function DateFieldOptional(
   options: Omit<FieldOptions, 'nullable'> & IFieldOptions = {},
 ): PropertyDecorator {
-  return DateField({ ...options, nullable: true });
+  return applyDecorators(
+    IsOptional({ each: options.each }),
+    DateField({ ...options, nullable: true }),
+  );
 }
 
 export function EnumField<TEnum extends object>(