Merge pull request #71 from GeneralMagicio/remove-handleError

remove handleError

Author: RamRamez

src/auth/auth.controller.ts

@@ -1,7 +1,14 @@
-import { Body, Controller, Get, Post, Req, Res } from '@nestjs/common';
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  Get,
+  Post,
+  Req,
+  Res,
+} from '@nestjs/common';
 import { MiniAppWalletAuthSuccessPayload } from '@worldcoin/minikit-js';
 import { Request, Response } from 'express';
-import { handleError } from '../common/helpers';
 import { AuthService } from './auth.service';
 
 interface IRequestPayload {
@@ -34,32 +41,20 @@ export class AuthController {
       maxAge: 2 * 60 * 1000, //2 minutes
     });
 
-    return res.json({ nonce });
+    return { nonce };
   }
 
   @Post('verifyPayload')
   async verifyPayload(
     @Req() req: RequestWithCookies,
     @Body() body: IRequestPayload,
-    @Res() res: Response,
   ) {
     const { payload } = body;
     const storedNonce = req.cookies.siwe;
     if (!storedNonce) {
-      return res.status(400).json({
-        status: 'error',
-        isValid: false,
-        message: 'No nonce found in cookies',
-      });
-    }
-    try {
-      const validMessage = await this.authService.verifyPayload(
-        payload,
-        storedNonce,
-      );
-      return res.status(200).json({ isValid: validMessage });
-    } catch (error: unknown) {
-      return handleError(error);
+      throw new BadRequestException('No nonce found in cookies');
     }
+    const isValid = await this.authService.verifyPayload(payload, storedNonce);
+    return { isValid };
   }
 }

src/common/exceptions.ts

@@ -26,7 +26,7 @@ export class VoteNotFoundException extends HttpException {
 
 export class DuplicateVoteException extends HttpException {
   constructor(message = 'User has already voted in this poll') {
-    super(message, HttpStatus.CONFLICT);
+    super(message, HttpStatus.BAD_REQUEST);
   }
 }
 

src/common/helpers.ts

@@ -6,11 +6,7 @@ import {
   Param,
   Post,
   Query,
-  Req,
-  Res,
 } from '@nestjs/common';
-import { Response } from 'express';
-import { handleError } from '../common/helpers';
 import { CreatePollDto, DeletePollDto, GetPollsDto } from './Poll.dto';
 import { PollService } from './poll.service';
 
@@ -20,48 +16,22 @@ export class PollController {
 
   @Post()
   async createPoll(@Body() dto: CreatePollDto) {
-    try {
-      return await this.pollService.createPoll(dto);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+    return await this.pollService.createPoll(dto);
   }
 
   @Get()
-  async getPolls(
-    @Req() req,
-    @Query() query: GetPollsDto,
-    @Res() res: Response,
-  ) {
-    try {
-      const polls = await this.pollService.getPolls(query);
-      return res.status(200).json(polls);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+  async getPolls(@Query() query: GetPollsDto) {
+    return await this.pollService.getPolls(query);
   }
 
   @Get(':id')
-  async getPollDetails(@Param('id') id: number, @Res() res: Response) {
-    try {
-      const poll = await this.pollService.getPollDetails(Number(id));
-      return res.status(200).json(poll);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+  async getPollDetails(@Param('id') id: number) {
+    return await this.pollService.getPollDetails(Number(id));
   }
 
   @Delete(':id')
-  async deletePoll(
-    @Param('id') id: number,
-    @Body() query: DeletePollDto,
-    @Res() res: Response,
-  ) {
-    try {
-      const poll = await this.pollService.deletePoll(Number(id), query);
-      return res.status(200).json({ message: 'Poll deleted', poll: poll });
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+  async deletePoll(@Param('id') id: number, @Body() query: DeletePollDto) {
+    const poll = await this.pollService.deletePoll(Number(id), query);
+    return { message: 'Poll deleted', poll };
   }
 }

src/poll/poll.controller.ts

@@ -1,5 +1,4 @@
 import { Body, Controller, Get, Post, Query } from '@nestjs/common';
-import { handleError } from '../common/helpers';
 import {
   CreateUserDto,
   CreateUserResponseDto,
@@ -24,59 +23,35 @@ export class UserController {
   async getUserData(
     @Query() query: GetUserDataDto,
   ): Promise<UserDataResponseDto> {
-    try {
-      return await this.userService.getUserData(query);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+    return await this.userService.getUserData(query);
   }
 
   @Get('getUserActivities')
   async getUserActivities(
     @Query() query: GetUserActivitiesDto,
   ): Promise<UserActivitiesResponseDto> {
-    try {
-      return await this.userService.getUserActivities(query);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+    return await this.userService.getUserActivities(query);
   }
 
   @Get('getUserVotes')
   async getUserVotes(
     @Query() query: GetUserVotesDto,
   ): Promise<UserVotesResponseDto> {
-    try {
-      return await this.userService.getUserVotes(query);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+    return await this.userService.getUserVotes(query);
   }
 
   @Post('setVote')
   async setVote(@Body() dto: SetVoteDto): Promise<SetVoteResponseDto> {
-    try {
-      return await this.userService.setVote(dto);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+    return await this.userService.setVote(dto);
   }
 
   @Post('editVote')
   async editVote(@Body() dto: EditVoteDto): Promise<EditVoteResponseDto> {
-    try {
-      return await this.userService.editVote(dto);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+    return await this.userService.editVote(dto);
   }
 
   @Post('createUser')
   async createUser(@Body() dto: CreateUserDto): Promise<CreateUserResponseDto> {
-    try {
-      return await this.userService.createUser(dto);
-    } catch (error: unknown) {
-      return handleError(error);
-    }
+    return await this.userService.createUser(dto);
   }
 }