Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 43 additions & 6 deletions src/user/user.controller.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { Body, Controller, Get, Post, Query } from '@nestjs/common';
import {
BadRequestException,
Body,
Controller,
Get,
Post,
Query,
} from '@nestjs/common';
import { UserService } from './user.service';
import {
EditVoteDto,
Expand All @@ -21,30 +28,60 @@ export class UserController {
async getUserData(
@Query() query: GetUserDataDto,
): Promise<UserDataResponseDto> {
return this.userService.getUserData(query);
try {
return this.userService.getUserData(query);
} catch (error: unknown) {
const errorMessage =
error instanceof Error ? error.message : 'An unexpected error occurred';
throw new BadRequestException(errorMessage);
}
}

@Get('getUserActivities')
async getUserActivities(
@Query() query: GetUserActivitiesDto,
): Promise<UserActivitiesResponseDto> {
return this.userService.getUserActivities(query);
try {
return this.userService.getUserActivities(query);
} catch (error: unknown) {
const errorMessage =
error instanceof Error ? error.message : 'An unexpected error occurred';
throw new BadRequestException(errorMessage);
}
}

@Post('getUserVotes')
async getUserVotes(
@Body() body: GetUserVotesDto,
): Promise<UserVotesResponseDto> {
return this.userService.getUserVotes(body);
try {
return await this.userService.getUserVotes(body);
} catch (error: unknown) {
const errorMessage =
error instanceof Error ? error.message : 'An unexpected error occurred';
throw new BadRequestException(errorMessage);
}
}

@Post('setVote')
async setVote(@Body() dto: SetVoteDto): Promise<SetVoteResponseDto> {
return this.userService.setVote(dto);
try {
return this.userService.setVote(dto);
} catch (error: unknown) {
const errorMessage =
error instanceof Error ? error.message : 'An unexpected error occurred';
throw new BadRequestException(errorMessage);
}
}

@Post('editVote')
async editVote(@Body() dto: EditVoteDto): Promise<EditVoteResponseDto> {
return this.userService.editVote(dto);
try {
return this.userService.editVote(dto);
} catch (error: unknown) {
const errorMessage =
error instanceof Error ? error.message : 'An unexpected error occurred';
throw new BadRequestException(errorMessage);
}
}
}
2 changes: 1 addition & 1 deletion src/user/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export class UserService {
select: { endDate: true, options: true },
});
if (!poll || poll.endDate < new Date()) {
throw new Error('Poll is not active or does not exist');
throw new Error('Poll is not active or does not exist!');
}
const votes = await this.databaseService.vote.findMany({
where: {
Expand Down