Merge pull request #15 from hebertsanto/main

merge

package.json

@@ -25,6 +25,7 @@
     "@nestjs/common": "^10.3.3",
     "@nestjs/core": "^10.3.3",
     "@nestjs/jwt": "^10.2.0",
+    "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/sequelize": "^10.0.0",
     "@nestjs/swagger": "^7.3.0",

src/comments/controller/comments/comments.controller.ts

@@ -18,16 +18,17 @@ import {
 import { Response } from 'express';
 import { CommentDTO } from 'src/comments/dto/comments.dto';
 import { CommentsService } from 'src/comments/services/comments/comments.service';
+import { i18n } from 'src/i18n';
 
 @ApiTags('Comments')
 @Controller('comments')
 export class CommentsController {
   constructor(private commentsServices: CommentsService) {}
 
-  @ApiResponse({ status: 200, description: 'comment found successfully' })
+  @ApiResponse({ status: 200, description: i18n()['message.comment.get'] })
   @ApiBadRequestResponse({
     status: 400,
-    description: 'Bad Request : comment dos not exist',
+    description: 'Bad Request ',
   })
   @ApiInternalServerErrorResponse({
     status: 500,
@@ -38,15 +39,15 @@ export class CommentsController {
     const commentFound = await this.commentsServices.findCommentById(id);
 
     return res.status(200).json({
-      message: 'comment found successfully',
+      message: i18n()['message.comment.get'],
       comment: commentFound,
     });
   }
 
-  @ApiResponse({ status: 201, description: 'comment created successfully' })
+  @ApiResponse({ status: 201, description: i18n()['message.comment.created'] })
   @ApiBadRequestResponse({
     status: 400,
-    description: 'Bad Request : userID or postId or questionID does not exist',
+    description: 'Bad Request',
   })
   @ApiInternalServerErrorResponse({
     status: 500,
@@ -58,12 +59,12 @@ export class CommentsController {
       await this.commentsServices.createComment(commentDTO);
 
     return res.status(201).json({
-      message: 'comment created successfully',
+      message: i18n()['message.comment.created'],
       comment: commentCreated,
     });
   }
 
-  @ApiResponse({ status: 200, description: 'comment updated successfully' })
+  @ApiResponse({ status: 200, description: i18n()['message.comment.update'] })
   @ApiBadRequestResponse({
     status: 400,
     description: 'Bad Request : user or post or question does not exist',
@@ -84,12 +85,12 @@ export class CommentsController {
     );
 
     return res.status(200).json({
-      message: 'comement update sucessfully',
+      message: i18n()['message.comment.update'],
       comment: updated,
     });
   }
 
-  @ApiResponse({ status: 200, description: 'comment deleted successfully' })
+  @ApiResponse({ status: 200, description: i18n()['message.comment.deleted'] })
   @ApiBadRequestResponse({
     status: 400,
     description: 'Bad Request : comment does not exist',
@@ -103,7 +104,7 @@ export class CommentsController {
     await this.commentsServices.findByIdAndDeleteComment(id);
 
     return res.status(200).json({
-      msg: 'comment deleted',
+      message: i18n()['message.comment.deleted'],
     });
   }
 }

src/comments/services/comments/comments.service.ts

@@ -4,8 +4,8 @@ import { PrismaService } from 'src/database/prisma.service';
 import { UserService } from 'src/user/services/user/user.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
 import { Comments } from '@prisma/client';
-import { Errors } from 'src/helpers/errors';
 import { LoggerService } from 'src/logger/logger.service';
+import { i18n } from 'src/i18n';
 
 @Injectable()
 export class CommentsService {
@@ -47,7 +47,7 @@ export class CommentsService {
       return comment;
     } catch (error) {
       if (error instanceof NotFoundException) {
-        throw new NotFoundException(Errors.RESOURCE_NOT_FOUND, comment_id);
+        throw new NotFoundException(i18n()['exception.notFound'], comment_id);
       }
 
       this.logger.error(`some error ocurred : ${error.message}`);

src/core/controller.core.ts

@@ -0,0 +1,15 @@
+import { i18n } from 'src/i18n';
+import { Exception } from './exception/exception.type';
+
+export class ControllerCore {
+  protected getMessage(message?: string, statusCode?: number): Exception {
+    return {
+      message: this.getDefaultMessage(message),
+      statusCode: statusCode | 500,
+    };
+  }
+
+  private getDefaultMessage(message?: string): string {
+    return message || i18n()['message.ok'];
+  }
+}

src/core/exception/exception.type.ts

@@ -0,0 +1,6 @@
+export type ExceptionMessage = string | { key: string; value: string }[];
+
+export type Exception = {
+  message: ExceptionMessage;
+  statusCode: number;
+};

src/decisions/controller/decisions/decisions.controller.ts

@@ -17,16 +17,20 @@ import {
 import { Response } from 'express';
 import { DecisionDTO } from 'src/decisions/dto/decisions.dto';
 import { DecisionsService } from 'src/decisions/services/decisions/decisions.service';
+import { i18n } from 'src/i18n';
 
 @ApiTags('Decisions')
 @Controller('decisions')
 export class DecisionsController {
   constructor(private decisionService: DecisionsService) {}
 
-  @ApiResponse({ status: 201, description: 'Decision created successfully' })
+  @ApiResponse({
+    status: 201,
+    description: i18n()['message.decisions.created'],
+  })
   @ApiBadRequestResponse({
     status: 400,
-    description: 'Bad Request : user or project does not exist',
+    description: 'Bad Request',
   })
   @ApiInternalServerErrorResponse({
     status: 500,
@@ -40,15 +44,18 @@ export class DecisionsController {
     const desicion = await this.decisionService.create(createDecision);
 
     return res.status(201).json({
-      message: 'Decision created successfully',
+      message: i18n()['message.decisions.created'],
       desicion,
     });
   }
 
-  @ApiResponse({ status: 200, description: 'Decision found successfully' })
+  @ApiResponse({
+    status: 200,
+    description: i18n()['message.decisions.get'],
+  })
   @ApiBadRequestResponse({
     status: 400,
-    description: 'Bad Request : decision does not exist',
+    description: 'Bad Request',
   })
   @ApiInternalServerErrorResponse({
     status: 500,
@@ -59,15 +66,18 @@ export class DecisionsController {
     const decision = await this.decisionService.findDecisionById(id);
 
     return res.status(200).json({
-      msg: 'decision found',
+      message: i18n()['message.decisions.get'],
       decision,
     });
   }
 
-  @ApiResponse({ status: 200, description: 'Decision deleted successfully' })
+  @ApiResponse({
+    status: 200,
+    description: i18n()['message.decisions.deleted'],
+  })
   @ApiBadRequestResponse({
     status: 400,
-    description: 'Bad Request : decision does not exist',
+    description: 'Bad Request',
   })
   @ApiInternalServerErrorResponse({
     status: 500,
@@ -78,14 +88,17 @@ export class DecisionsController {
     await this.decisionService.findDecisionByIdAndDelete(id);
 
     return res.status(200).json({
-      message: 'decision was deleted successfully',
+      message: i18n()['message.decisions.deleted'],
     });
   }
 
-  @ApiResponse({ status: 200, description: 'Decision updated successfully' })
+  @ApiResponse({
+    status: 200,
+    description: i18n()['message.decisions.update'],
+  })
   @ApiBadRequestResponse({
     status: 400,
-    description: 'Bad Request : decision or user or project does not exist',
+    description: 'Bad Request',
   })
   @ApiInternalServerErrorResponse({
     status: 500,
@@ -103,7 +116,7 @@ export class DecisionsController {
     );
 
     return res.status(200).json({
-      msg: 'descion updated successfully',
+      message: i18n()['message.decisions.update'],
       decision: updateDecision,
     });
   }

src/decisions/services/decisions/decisions.service.ts

@@ -4,8 +4,8 @@ import { Decision } from 'src/decisions/types/decision';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
 import { UserService } from 'src/user/services/user/user.service';
 import { Decisions } from '@prisma/client';
-import { Errors } from 'src/helpers/errors';
 import { LoggerService } from 'src/logger/logger.service';
+import { i18n } from 'src/i18n';
 
 @Injectable()
 export class DecisionsService {
@@ -45,7 +45,7 @@ export class DecisionsService {
       return decision;
     } catch (error) {
       if (error instanceof NotFoundException) {
-        throw new NotFoundException(Errors.RESOURCE_NOT_FOUND, decision_id);
+        throw new NotFoundException(i18n()['exception.notFound'], decision_id);
       }
       this.logger.error(`some error ocurred : ${error.message}`);
       throw error;

src/follow-project/controller/follow-project/follow-project.controller.ts

@@ -9,13 +9,31 @@ import {
 } from '@nestjs/common';
 import { FollowProjectService } from 'src/follow-project/service/follow-project/follow-project.service';
 import { Response } from 'express';
-import { ApiTags } from '@nestjs/swagger';
+import {
+  ApiBadRequestResponse,
+  ApiInternalServerErrorResponse,
+  ApiResponse,
+  ApiTags,
+} from '@nestjs/swagger';
+import { i18n } from 'src/i18n';
 
 @ApiTags('Follow-project')
 @Controller('follow-project')
 export class FollowProjectController {
   constructor(private followProjectService: FollowProjectService) {}
 
+  @ApiResponse({
+    status: 200,
+    description: i18n()['message.followProject.created'],
+  })
+  @ApiBadRequestResponse({
+    status: 400,
+    description: 'Bad Request',
+  })
+  @ApiInternalServerErrorResponse({
+    status: 500,
+    description: 'Internal server error',
+  })
   @Post('/:projectId/follow')
   async followProject(
     @Body() data: any,
@@ -28,11 +46,23 @@ export class FollowProjectController {
     );
 
     return res.status(200).json({
-      msg: 'you started follow project',
+      msg: i18n()['message.followProject.created'],
       follow,
     });
   }
 
+  @ApiResponse({
+    status: 200,
+    description: i18n()['message.followProject.all'],
+  })
+  @ApiBadRequestResponse({
+    status: 400,
+    description: 'Bad Request',
+  })
+  @ApiInternalServerErrorResponse({
+    status: 500,
+    description: 'Internal server error',
+  })
   @Get('/:projectId/all-followers')
   async allFollowers(
     @Res() res: Response,
@@ -41,15 +71,28 @@ export class FollowProjectController {
     const all =
       await this.followProjectService.getProjectsUserFollow(projectId);
     return res.status(200).json({
-      msg: 'all followers of this project',
+      msg: i18n()['message.followProject.all'],
       all,
     });
   }
+
+  @ApiResponse({
+    status: 200,
+    description: i18n()['message.followProject.deleted'],
+  })
+  @ApiBadRequestResponse({
+    status: 400,
+    description: 'Bad Request',
+  })
+  @ApiInternalServerErrorResponse({
+    status: 500,
+    description: 'Internal server error',
+  })
   @Delete('/:id/stop')
   async stopFollowProject(@Res() res: Response, @Param('id') id: string) {
     await this.followProjectService.stopFollowProject(id);
     return res.status(200).json({
-      msg: 'you stop follow this project',
+      msg: i18n()['message.followProject.deleted'],
     });
   }
 }

src/follow-project/service/follow-project/follow-project.service.ts

@@ -1,7 +1,7 @@
 import { ConflictException, Injectable } from '@nestjs/common';
 import { PrismaService } from 'src/database/prisma.service';
 import { Data } from 'src/follow-project/types/follow';
-import { Errors } from 'src/helpers/errors';
+import { i18n } from 'src/i18n';
 import { LoggerService } from 'src/logger/logger.service';
 import { ProjectsService } from 'src/projects/services/projects/projects.service';
 import { UserService } from 'src/user/services/user/user.service';
@@ -36,7 +36,7 @@ export class FollowProjectService {
     } catch (error) {
       if (error instanceof ConflictException) {
         throw new ConflictException(
-          Errors.RESOURCE_ALREADY_EXISTS,
+          i18n()['exception.conflict'],
           `${userId} - ${projectId}`,
         );
       }