Merge pull request #379 from andrechristikan/development

Development

Author: andrechristikan

src/common/dashboard/interfaces/dashboard.service.interface.ts

@@ -19,4 +19,6 @@ export interface IDashboardService {
         month,
         year,
     }: IDashboardStartAndEnd): Promise<IDashboardStartAndEndDate>;
+
+    getPercentage(value: number, total: number): Promise<number>;
 }

src/common/dashboard/services/dashboard.service.ts

@@ -6,9 +6,13 @@ import {
 } from 'src/common/dashboard/interfaces/dashboard.interface';
 import { IDashboardService } from 'src/common/dashboard/interfaces/dashboard.service.interface';
 import { HelperDateService } from 'src/common/helper/services/helper.date.service';
+import { HelperNumberService } from 'src/common/helper/services/helper.number.service';
 
 export class DashboardService implements IDashboardService {
-    constructor(private readonly helperDateService: HelperDateService) {}
+    constructor(
+        private readonly helperDateService: HelperDateService,
+        private readonly helperNumberService: HelperNumberService
+    ) {}
 
     async getStartAndEndDate(
         date: DashboardDto
@@ -70,4 +74,8 @@ export class DashboardService implements IDashboardService {
             endDate,
         };
     }
+
+    async getPercentage(value: number, total: number): Promise<number> {
+        return this.helperNumberService.percent(value, total);
+    }
 }

src/modules/user/controllers/user.controller.ts

@@ -114,16 +114,27 @@ export class UserController {
             user.password
         );
         if (!validate) {
-            if (passwordAttempt) {
+            try {
                 await this.userService.increasePasswordAttempt(user);
+            } catch (err: any) {
+                throw new InternalServerErrorException({
+                    statusCode: ENUM_ERROR_STATUS_CODE_ERROR.ERROR_UNKNOWN,
+                    message: 'http.serverError.internalServerError',
+                    _error: err.message,
+                });
             }
 
             throw new BadRequestException({
                 statusCode:
                     ENUM_USER_STATUS_CODE_ERROR.USER_PASSWORD_NOT_MATCH_ERROR,
                 message: 'user.error.passwordNotMatch',
             });
-        } else if (!user.isActive) {
+        } else if (user.blocked) {
+            throw new ForbiddenException({
+                statusCode: ENUM_USER_STATUS_CODE_ERROR.USER_BLOCKED_ERROR,
+                message: 'user.error.blocked',
+            });
+        } else if (!user.isActive || user.inactivePermanent) {
             throw new ForbiddenException({
                 statusCode: ENUM_USER_STATUS_CODE_ERROR.USER_INACTIVE_ERROR,
                 message: 'user.error.inactive',
@@ -135,16 +146,14 @@ export class UserController {
             });
         }
 
-        if (passwordAttempt) {
-            try {
-                await this.userService.resetPasswordAttempt(user._id);
-            } catch (err: any) {
-                throw new InternalServerErrorException({
-                    statusCode: ENUM_ERROR_STATUS_CODE_ERROR.ERROR_UNKNOWN,
-                    message: 'http.serverError.internalServerError',
-                    _error: err.message,
-                });
-            }
+        try {
+            await this.userService.resetPasswordAttempt(user._id);
+        } catch (err: any) {
+            throw new InternalServerErrorException({
+                statusCode: ENUM_ERROR_STATUS_CODE_ERROR.ERROR_UNKNOWN,
+                message: 'http.serverError.internalServerError',
+                _error: err.message,
+            });
         }
 
         const payload: UserPayloadSerialization =
@@ -235,7 +244,12 @@ export class UserController {
                 statusCode: ENUM_USER_STATUS_CODE_ERROR.USER_NOT_FOUND_ERROR,
                 message: 'user.error.notFound',
             });
-        } else if (!user.isActive) {
+        } else if (user.blocked) {
+            throw new ForbiddenException({
+                statusCode: ENUM_USER_STATUS_CODE_ERROR.USER_BLOCKED_ERROR,
+                message: 'user.error.blocked',
+            });
+        } else if (!user.isActive || user.inactivePermanent) {
             throw new ForbiddenException({
                 statusCode: ENUM_USER_STATUS_CODE_ERROR.USER_INACTIVE_ERROR,
                 message: 'user.error.inactive',
@@ -326,8 +340,14 @@ export class UserController {
             user.password
         );
         if (!matchPassword) {
-            if (passwordAttempt) {
+            try {
                 await this.userService.increasePasswordAttempt(user);
+            } catch (err: any) {
+                throw new InternalServerErrorException({
+                    statusCode: ENUM_ERROR_STATUS_CODE_ERROR.ERROR_UNKNOWN,
+                    message: 'http.serverError.internalServerError',
+                    _error: err.message,
+                });
             }
 
             throw new BadRequestException({
@@ -349,16 +369,14 @@ export class UserController {
             });
         }
 
-        if (passwordAttempt) {
-            try {
-                await this.userService.increasePasswordAttempt(user);
-            } catch (err: any) {
-                throw new InternalServerErrorException({
-                    statusCode: ENUM_ERROR_STATUS_CODE_ERROR.ERROR_UNKNOWN,
-                    message: 'http.serverError.internalServerError',
-                    _error: err.message,
-                });
-            }
+        try {
+            await this.userService.resetPasswordAttempt(user._id);
+        } catch (err: any) {
+            throw new InternalServerErrorException({
+                statusCode: ENUM_ERROR_STATUS_CODE_ERROR.ERROR_UNKNOWN,
+                message: 'http.serverError.internalServerError',
+                _error: err.message,
+            });
         }
 
         try {