Merge pull request #56 from CS3219-AY2425S1/ms3-jared/user-service

Add user service endpoints

Author: evanyan13

backend/gateway-service/src/app.module.ts

@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 import { ClientsModule, Transport } from '@nestjs/microservices';
 import { UserController } from './modules/user/user.controller';
 import { AuthController } from './modules/auth/auth.controller';
-import { UserService } from './modules/user/user.service';
 import { QuestionController } from './modules/question/question.controller';
 import { APP_GUARD } from '@nestjs/core';
 import { AtAuthGuard, RtAuthGuard } from './common/guards';
@@ -38,7 +37,6 @@ import { AtAuthGuard, RtAuthGuard } from './common/guards';
   ],
   controllers: [UserController, QuestionController, AuthController],
   providers: [
-    UserService,
     RtAuthGuard,
     {
       provide: APP_GUARD,

backend/gateway-service/src/common/interceptors/response.interceptor.ts

@@ -29,22 +29,30 @@ export class ResponseInterceptor<T> implements NestInterceptor {
         data,
       })),
       catchError((error) => {
-        // Handle errors and format the response
         const statusCode =
           error instanceof HttpException
             ? error.getStatus()
             : HttpStatus.INTERNAL_SERVER_ERROR;
 
-        const message = error.message || 'Internal Server Error';
-
+        // Custom handling for BadRequestException
+        let message = 'Internal Server Error';
+        if (statusCode === HttpStatus.BAD_REQUEST) {
+          if (Array.isArray(error.response?.message)) {
+            message = error.response.message.join(', ');
+          } else {
+            message = error.response.message || 'Validation Error';
+          }
+        } else {
+          message = error.message || 'Internal Server Error';
+        }
         const response = {
           statusCode,
           message,
-          error: error.response || error.stack || null,
         };
 
         return throwError(() => response);
       }),
     );
   }
 }
+

backend/gateway-service/src/constants/account-provider.enum.ts

@@ -0,0 +1,5 @@
+export enum AccountProvider {
+  LOCAL = 'local',
+  GOOGLE = 'google',
+  GITHUB = 'github',
+}

backend/gateway-service/src/constants/coding-languages.enum.ts

@@ -0,0 +1,5 @@
+export enum Languages {
+  PYTHON = 'Python',
+  JAVA = 'Java',
+  CPLUSPLUS = 'C++',
+}

backend/gateway-service/src/constants/index.ts

@@ -0,0 +1,3 @@
+export {Proficiency} from './proficiency-level.enum';
+export {Languages} from './coding-languages.enum';
+export {AccountProvider} from './account-provider.enum';

backend/gateway-service/src/constants/proficiency-level.enum.ts

@@ -0,0 +1,5 @@
+export enum Proficiency {
+  BEGINNER = 'Beginner',
+  INTERMEDIATE = 'Intermediate',
+  ADVANCED = 'Advanced',
+}

backend/gateway-service/src/main.ts

@@ -1,6 +1,6 @@
-import { NestFactory } from '@nestjs/core';
+import { NestFactory, Reflector } from '@nestjs/core';
 import { AppModule } from './app.module';
-import { ValidationPipe } from '@nestjs/common';
+import { ClassSerializerInterceptor, ValidationPipe } from '@nestjs/common';
 import { ResponseInterceptor } from './common/interceptors/response.interceptor';
 import { setupSwagger } from './common/configs/swagger.config';
 
@@ -23,7 +23,7 @@ async function bootstrap() {
     allowedHeaders: 'Content-Type, Accept',
   });
   app.useGlobalInterceptors(new ResponseInterceptor());
-
+  app.useGlobalInterceptors(new ClassSerializerInterceptor(app.get(Reflector)));
   setupSwagger(app);
 
   await app.listen(4000);

backend/gateway-service/src/modules/question/question.controller.ts

@@ -20,7 +20,6 @@ import { ClientProxy } from '@nestjs/microservices';
 import { Public } from 'src/common/decorators';
 
 @ApiTags('questions')
-@Public()
 @Controller('questions')
 export class QuestionController {
   constructor(

backend/gateway-service/src/modules/user/dto/index.ts

@@ -1 +1,3 @@
 export { CreateUserDto } from './create-user.dto';
+export { UpdateUserDto } from './update-user.dto';
+export { UsersResponseDto } from './user-response.dto';

backend/gateway-service/src/modules/user/dto/update-user.dto.ts

@@ -0,0 +1,41 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty, IsString, IsEnum, IsBoolean, IsOptional } from 'class-validator';
+import { Languages, Proficiency } from 'src/constants';
+
+export class UpdateUserDto {
+
+  @ApiProperty({
+    example: 'testUsername',
+  })
+  @IsString()
+  @IsOptional()
+  username: string;
+
+  @ApiProperty({
+    example: 'testDisplayname',
+  })
+  @IsString()
+  @IsOptional()
+  displayName: string;
+
+  @ApiProperty({
+    example: Proficiency.BEGINNER,
+  })
+  @IsEnum(Proficiency)
+  @IsOptional()
+  proficiency: Proficiency;
+
+  @ApiProperty({
+    example: [Languages.JAVA],
+  })
+  @IsEnum(Languages, { each: true })
+  @IsOptional()
+  languages: Languages[];
+
+  @ApiProperty({
+    example: true,
+  })
+  @IsBoolean()
+  @IsOptional()
+  isOnboarded: boolean;
+}