Merge pull request #365 from andrechristikan/development

Development

Author: andrechristikan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ack-nestjs-boilerplate",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "Ack NestJs Boilerplate",
   "repository": {
     "type": "git",

src/common/api-key/serializations/api-key.get.serialization.ts

@@ -57,5 +57,5 @@ export class ApiKeyGetSerialization {
     readonly updatedAt: Date;
 
     @Exclude()
-    readonly deletedAt: Date;
+    readonly deletedAt?: Date;
 }

src/common/database/abstracts/mongo/repositories/database.mongo.object-id.repository.abstract.ts

@@ -198,7 +198,7 @@ export abstract class DatabaseMongoObjectIdRepositoryAbstract<T>
         _id: string,
         options?: IDatabaseFindOneOptions<ClientSession>
     ): Promise<Y> {
-        const findOne = this._repository.findById(_id);
+        const findOne = this._repository.findById(new Types.ObjectId(_id));
 
         if (options?.withDeleted) {
             findOne.or([
@@ -343,7 +343,7 @@ export abstract class DatabaseMongoObjectIdRepositoryAbstract<T>
     ): Promise<T> {
         const update = this._repository
             .findByIdAndUpdate(
-                _id,
+                new Types.ObjectId(_id),
                 {
                     $set: data,
                 },
@@ -425,9 +425,12 @@ export abstract class DatabaseMongoObjectIdRepositoryAbstract<T>
         _id: string,
         options?: IDatabaseDeleteOptions<ClientSession>
     ): Promise<T> {
-        const del = this._repository.findByIdAndDelete(_id, {
-            new: true,
-        });
+        const del = this._repository.findByIdAndDelete(
+            new Types.ObjectId(_id),
+            {
+                new: true,
+            }
+        );
 
         if (options?.join) {
             del.populate(
@@ -450,7 +453,7 @@ export abstract class DatabaseMongoObjectIdRepositoryAbstract<T>
     ): Promise<T> {
         const del = this._repository
             .findByIdAndUpdate(
-                _id,
+                new Types.ObjectId(_id),
                 {
                     $set: { deletedAt: new Date() },
                 },
@@ -510,7 +513,7 @@ export abstract class DatabaseMongoObjectIdRepositoryAbstract<T>
     ): Promise<T> {
         const rest = this._repository
             .findByIdAndUpdate(
-                _id,
+                new Types.ObjectId(_id),
                 {
                     $set: { deletedAt: undefined },
                 },
@@ -539,7 +542,7 @@ export abstract class DatabaseMongoObjectIdRepositoryAbstract<T>
         options?: IDatabaseRestoreOptions<ClientSession>
     ): Promise<T> {
         const rest = this._repository
-            .findByIdAndUpdate(
+            .findOneAndUpdate(
                 find,
                 {
                     $set: { deletedAt: undefined },

src/common/database/abstracts/mongo/repositories/database.mongo.uuid.repository.abstract.ts

@@ -537,7 +537,7 @@ export abstract class DatabaseMongoUUIDRepositoryAbstract<T>
         options?: IDatabaseRestoreOptions<ClientSession>
     ): Promise<T> {
         const rest = this._repository
-            .findByIdAndUpdate(
+            .findOneAndUpdate(
                 find,
                 {
                     $set: { deletedAt: undefined },

src/common/error/filters/error.http.filter.ts

@@ -10,6 +10,7 @@ import { HttpArgumentsHost } from '@nestjs/common/interfaces';
 import { ConfigService } from '@nestjs/config';
 import { ValidationError } from 'class-validator';
 import { Response } from 'express';
+import { DatabaseDefaultUUID } from 'src/common/database/constants/database.function.constant';
 import { DebuggerService } from 'src/common/debugger/services/debugger.service';
 import { ERROR_TYPE } from 'src/common/error/constants/error.enum.constant';
 import {
@@ -24,7 +25,6 @@ import { HelperDateService } from 'src/common/helper/services/helper.date.servic
 import { IMessage } from 'src/common/message/interfaces/message.interface';
 import { MessageService } from 'src/common/message/services/message.service';
 import { IRequestApp } from 'src/common/request/interfaces/request.interface';
-import { v4 } from 'uuid';
 
 // If we throw error with HttpException, there will always return object
 // The exception filter only catch HttpException
@@ -53,7 +53,7 @@ export class ErrorHttpFilter implements ExceptionFilter {
         // get _metadata
         const __class = request.__class ?? ErrorHttpFilter.name;
         const __function = request.__function ?? this.catch.name;
-        const __requestId = request.id ?? v4();
+        const __requestId = request.id ?? DatabaseDefaultUUID();
         const __path = request.path;
         const __timestamp =
             request.timestamp ?? this.helperDateService.timestamp();

src/common/pagination/pipes/pagination.filter-contain.pipe.ts

@@ -1,6 +1,5 @@
 import { Injectable, mixin, Type } from '@nestjs/common';
 import { ArgumentMetadata, PipeTransform } from '@nestjs/common/interfaces';
-import { HelperNumberService } from 'src/common/helper/services/helper.number.service';
 import { ENUM_PAGINATION_FILTER_CASE_OPTIONS } from 'src/common/pagination/constants/pagination.enum.constant';
 import { IPaginationFilterStringContainOptions } from 'src/common/pagination/interfaces/pagination.interface';
 import { PaginationService } from 'src/common/pagination/services/pagination.service';
@@ -10,10 +9,7 @@ export function PaginationFilterContainPipe(
 ): Type<PipeTransform> {
     @Injectable()
     class MixinPaginationFilterContainPipe implements PipeTransform {
-        constructor(
-            private readonly paginationService: PaginationService,
-            private readonly helperNumberService: HelperNumberService
-        ) {}
+        constructor(private readonly paginationService: PaginationService) {}
 
         async transform(
             value: string,

src/common/request/middleware/id/request.id.middleware.ts

@@ -1,7 +1,7 @@
 import { Injectable, NestMiddleware } from '@nestjs/common';
 import { Response, NextFunction } from 'express';
+import { DatabaseDefaultUUID } from 'src/common/database/constants/database.function.constant';
 import { IRequestApp } from 'src/common/request/interfaces/request.interface';
-import { v4 } from 'uuid';
 
 @Injectable()
 export class RequestIdMiddleware implements NestMiddleware {
@@ -10,7 +10,7 @@ export class RequestIdMiddleware implements NestMiddleware {
         res: Response,
         next: NextFunction
     ): Promise<void> {
-        const uuid: string = v4();
+        const uuid: string = DatabaseDefaultUUID();
         req.headers['x-request-id'] = uuid;
         req.id = uuid;
         next();

src/common/setting/serializations/setting.get.serialization.ts

@@ -77,5 +77,5 @@ export class SettingGetSerialization {
     readonly updatedAt: Date;
 
     @Exclude()
-    readonly deletedAt: Date;
+    readonly deletedAt?: Date;
 }

src/modules/permission/serializations/permission.get.serialization.ts

@@ -54,5 +54,5 @@ export class PermissionGetSerialization {
     readonly updatedAt: Date;
 
     @Exclude()
-    readonly deletedAt: Date;
+    readonly deletedAt?: Date;
 }

src/modules/role/serializations/role.get.serialization.ts

@@ -58,5 +58,5 @@ export class RoleGetSerialization {
     readonly updatedAt: Date;
 
     @Exclude()
-    readonly deletedAt: Date;
+    readonly deletedAt?: Date;
 }