Merge pull request #98 from bakaqc/dev

Dev

backend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "evora-backend",
-	"version": "1.4.5",
+	"version": "1.5.4",
 	"description": "Evora connects customers with event organizers quickly through detailed online booking.",
 	"repository": "https://github.com/bakaqc/evora-17c",
 	"author": "Quốc Chương",

backend/src/domains/auth/auth.controller.ts

@@ -33,6 +33,13 @@ export class AuthController {
 		return await this.authService.login(user);
 	}
 
+	@Public()
+	@HttpCode(HttpStatus.OK)
+	@Post('forgot-password')
+	async forgotPassword(@Body() loginDto: LoginDto) {
+		return this.authService.forgotPassword(loginDto);
+	}
+
 	@Public()
 	@HttpCode(HttpStatus.OK)
 	@ApiOperation({

backend/src/domains/auth/auth.service.ts

@@ -10,6 +10,7 @@ import { Model } from 'mongoose';
 
 import { LoginDto } from '@/domains/auth/dto/login.dto';
 import { User } from '@/schemas/user.schema';
+import { hash } from '@/utils/hash.util';
 import { verify } from '@/utils/verify.util';
 
 @Injectable()
@@ -70,6 +71,23 @@ export class AuthService {
 		};
 	}
 
+	async forgotPassword(loginDto: LoginDto) {
+		const user = await this.userModel.findOne({ email: loginDto.email });
+
+		if (!user) {
+			throw new NotFoundException(
+				`Account with email: ${loginDto.email} does not exist`,
+			);
+		}
+
+		user.hashedPassword = await hash(loginDto.password);
+		await user.save();
+
+		return {
+			message: 'Password has been reset',
+		};
+	}
+
 	async verifyJwt(token: string) {
 		try {
 			return this.jwtService.verify(token);

backend/src/domains/auth/decorators/pagination.decorator.ts

@@ -0,0 +1,21 @@
+import { applyDecorators } from '@nestjs/common';
+import { ApiQuery } from '@nestjs/swagger';
+
+export function ApiPagination() {
+	return applyDecorators(
+		ApiQuery({
+			name: 'page',
+			required: false,
+			type: Number,
+			example: 1,
+			description: 'Page number, starts from 1',
+		}),
+		ApiQuery({
+			name: 'limit',
+			required: false,
+			type: Number,
+			example: 10,
+			description: 'Number of items per page',
+		}),
+	);
+}

backend/src/domains/bookings/bookings.controller.ts

@@ -6,6 +6,7 @@ import {
 	Param,
 	Post,
 	Put,
+	Query,
 } from '@nestjs/common';
 import {
 	ApiBearerAuth,
@@ -14,6 +15,7 @@ import {
 	ApiTags,
 } from '@nestjs/swagger';
 
+import { ApiPagination } from '@/domains/auth/decorators/pagination.decorator';
 import { Roles } from '@/domains/auth/decorators/roles.decorator';
 import { Role } from '@/domains/auth/enums/role.enum';
 import { BookingsService } from '@/domains/bookings/bookings.service';
@@ -33,10 +35,16 @@ export class BookingsController {
 	}
 
 	@Roles(Role.SUPER_ADMIN)
-	@ApiOperation({ summary: 'Fetch all bookings - Super Amin only' })
+	@ApiOperation({
+		summary: 'Fetch all bookings with pagination - Super Admin only',
+	})
+	@ApiPagination()
 	@Get()
-	async getAll() {
-		return this.bookingsService.getAll();
+	async getAll(
+		@Query('page') page: number = 1,
+		@Query('limit') limit: number = 10,
+	) {
+		return this.bookingsService.getAllWithPagination(page, limit);
 	}
 
 	@ApiOperation({ summary: 'Fetch a booking by ID' })

backend/src/domains/bookings/bookings.service.ts

@@ -57,6 +57,38 @@ export class BookingsService {
 		};
 	}
 
+	async getAllWithPagination(page: number, limit: number) {
+		if (page < 1) page = 1;
+		if (limit < 1) limit = 10;
+
+		const skip = (page - 1) * limit;
+
+		const [bookings, total] = await Promise.all([
+			this.bookingModel.find().skip(skip).limit(limit).exec(),
+			this.bookingModel.countDocuments().exec(),
+		]);
+
+		const totalPages = Math.ceil(total / limit);
+
+		this.logger.debug(
+			`Fetched bookings with pagination: page ${page}, limit ${limit}`,
+		);
+
+		return {
+			success: true,
+			message: 'Bookings fetched successfully.',
+			data: {
+				bookings,
+				pagination: {
+					total,
+					page,
+					limit,
+					totalPages,
+				},
+			},
+		};
+	}
+
 	async getById(id: string) {
 		const booking = await this.bookingModel.findById(id).select('-__v');
 

backend/src/domains/parties/parties.controller.ts

@@ -6,9 +6,11 @@ import {
 	Param,
 	Post,
 	Put,
+	Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
+import { ApiPagination } from '@/domains/auth/decorators/pagination.decorator';
 import { Public } from '@/domains/auth/decorators/public.decorator';
 import { Roles } from '@/domains/auth/decorators/roles.decorator';
 import { Role } from '@/domains/auth/enums/role.enum';
@@ -30,10 +32,14 @@ export class PartiesController {
 	}
 
 	@Public()
-	@ApiOperation({ summary: 'Fetch all parties' })
+	@ApiOperation({ summary: 'Fetch all parties with pagination' })
+	@ApiPagination()
 	@Get()
-	async getAll() {
-		return await this.partiesService.getAll();
+	async getAll(
+		@Query('page') page: number = 1,
+		@Query('limit') limit: number = 10,
+	) {
+		return await this.partiesService.getAllWithPagination(page, limit);
 	}
 
 	@Public()

backend/src/domains/parties/parties.service.ts

@@ -90,6 +90,36 @@ export class PartiesService {
 		};
 	}
 
+	async getAllWithPagination(page: number, limit: number) {
+		if (page < 1) page = 1;
+		if (limit < 1) limit = 10;
+
+		const skip = (page - 1) * limit;
+
+		const [parties, total] = await Promise.all([
+			this.partyModel.find().skip(skip).limit(limit).exec(),
+			this.partyModel.countDocuments().exec(),
+		]);
+
+		this.logger.debug('Fetching all parties with pagination', parties);
+
+		const totalPages = Math.ceil(total / limit);
+
+		return {
+			success: true,
+			message: 'Parties fetched successfully.',
+			data: {
+				parties,
+				pagination: {
+					total,
+					page,
+					limit,
+					totalPages,
+				},
+			},
+		};
+	}
+
 	async getOne(identifier: string) {
 		const party = await this.findPartyByIdentifier(identifier);
 

backend/src/domains/users/users.controller.ts

@@ -1,6 +1,15 @@
-import { Body, Controller, Delete, Get, Param, Put } from '@nestjs/common';
+import {
+	Body,
+	Controller,
+	Delete,
+	Get,
+	Param,
+	Put,
+	Query,
+} from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
+import { ApiPagination } from '@/domains/auth/decorators/pagination.decorator';
 import { Public } from '@/domains/auth/decorators/public.decorator';
 import { Roles } from '@/domains/auth/decorators/roles.decorator';
 import { Role } from '@/domains/auth/enums/role.enum';
@@ -14,11 +23,17 @@ import { UsersService } from '@/domains/users/users.service';
 export class UsersController {
 	constructor(private readonly usersService: UsersService) {}
 
-	@Roles(Role.SUPER_ADMIN, Role.ADMIN)
-	@ApiOperation({ summary: 'Fetch all users - Super Admin & Admin only' })
+	@Roles(Role.SUPER_ADMIN)
+	@ApiOperation({
+		summary: 'Fetch all users with pagination - Super Admin only',
+	})
+	@ApiPagination()
 	@Get()
-	async getAll() {
-		return await this.usersService.getAll();
+	async getAll(
+		@Query('page') page: number = 1,
+		@Query('limit') limit: number = 10,
+	) {
+		return await this.usersService.getAllWithPagination(page, limit);
 	}
 
 	@Public()

backend/src/domains/users/users.service.ts

@@ -68,6 +68,38 @@ export class UsersService {
 		};
 	}
 
+	async getAllWithPagination(page: number, limit: number) {
+		if (page < 1) page = 1;
+		if (limit < 1) limit = 10;
+
+		const skip = (page - 1) * limit;
+
+		const [users, total] = await Promise.all([
+			this.userModel.find().skip(skip).limit(limit).exec(),
+			this.userModel.countDocuments().exec(),
+		]);
+
+		const totalPages = Math.ceil(total / limit);
+
+		this.logger.debug(
+			`Fetched users with pagination: page ${page}, limit ${limit}`,
+		);
+
+		return {
+			success: true,
+			message: 'Users fetched successfully.',
+			data: {
+				users,
+				pagination: {
+					total,
+					page,
+					limit,
+					totalPages,
+				},
+			},
+		};
+	}
+
 	async getOne(identifier: string, isEmail = false) {
 		const user = await this.findUser(identifier, isEmail);
 

backend/src/domains/vouchers/vouchers.controller.ts

@@ -6,9 +6,11 @@ import {
 	Param,
 	Post,
 	Put,
+	Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
+import { ApiPagination } from '@/domains/auth/decorators/pagination.decorator';
 import { Public } from '@/domains/auth/decorators/public.decorator';
 import { Roles } from '@/domains/auth/decorators/roles.decorator';
 import { Role } from '@/domains/auth/enums/role.enum';
@@ -30,10 +32,14 @@ export class VouchersController {
 	}
 
 	@Public()
-	@ApiOperation({ summary: 'Fetch all vouchers' })
+	@ApiOperation({ summary: 'Fetch all vouchers with pagination' })
+	@ApiPagination()
 	@Get()
-	async getAll() {
-		return await this.vouchersService.getAll();
+	async getAll(
+		@Query('page') page: number = 1,
+		@Query('limit') limit: number = 10,
+	) {
+		return await this.vouchersService.getAllWithPagination(page, limit);
 	}
 
 	@Public()

backend/src/domains/vouchers/vouchers.service.ts

@@ -62,6 +62,38 @@ export class VouchersService {
 		};
 	}
 
+	async getAllWithPagination(page: number, limit: number) {
+		if (page < 1) page = 1;
+		if (limit < 1) limit = 10;
+
+		const skip = (page - 1) * limit;
+
+		const [vouchers, total] = await Promise.all([
+			this.voucherModel.find().skip(skip).limit(limit).exec(),
+			this.voucherModel.countDocuments().exec(),
+		]);
+
+		const totalPages = Math.ceil(total / limit);
+
+		this.logger.debug(
+			`Fetched vouchers with pagination: page ${page}, limit ${limit}`,
+		);
+
+		return {
+			success: true,
+			message: 'Vouchers fetched successfully.',
+			data: {
+				vouchers,
+				pagination: {
+					total,
+					page,
+					limit,
+					totalPages,
+				},
+			},
+		};
+	}
+
 	async getOne(identifier: string) {
 		const voucher = await this.findVoucherByIdentifier(identifier);
 

backend/src/utils/hash.util.ts

@@ -3,10 +3,3 @@ import * as argon2 from 'argon2';
 export const hash = async (plainPassword: string): Promise<string> => {
 	return await argon2.hash(plainPassword);
 };
-
-export const verify = async (
-	hashedPassword: string,
-	plainPassword: string,
-): Promise<boolean> => {
-	return await argon2.verify(hashedPassword, plainPassword);
-};