resolve conflict

Author: andrechristikan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ack-nestjs-boilerplate-kafka",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "description": "Ack NestJs Boilerplate Kafka",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "rollback": "yarn rollback:setting && yarn rollback:apikey"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.279.0",
+    "@aws-sdk/client-s3": "^3.282.0",
     "@faker-js/faker": "^7.6.0",
     "@joi/date": "^2.1.0",
     "@nestjs/axios": "^2.0.0",
@@ -76,15 +76,15 @@
     "moment": "^2.29.4",
     "mongoose": "^7.0.0",
     "morgan": "^1.10.0",
-    "nest-winston": "^1.8.0",
+    "nest-winston": "^1.9.0",
     "nestjs-command": "^3.1.3",
     "nestjs-i18n": "^10.2.6",
     "passport": "^0.6.0",
     "passport-headerapikey": "^1.2.2",
     "passport-jwt": "^4.0.1",
     "reflect-metadata": "^0.1.13",
     "response-time": "^2.3.2",
-    "rimraf": "^4.1.2",
+    "rimraf": "^4.2.0",
     "rotating-file-stream": "^3.1.0",
     "rxjs": "^7.8.0",
     "ua-parser-js": "^1.0.33",
@@ -109,7 +109,7 @@
     "@types/morgan": "^1.9.4",
     "@types/ms": "^0.7.31",
     "@types/multer": "^1.4.7",
-    "@types/node": "^18.14.2",
+    "@types/node": "^18.14.5",
     "@types/passport-jwt": "^3.0.8",
     "@types/supertest": "^2.0.12",
     "@types/ua-parser-js": "^0.7.36",

src/common/api-key/services/api-key.service.ts

@@ -90,12 +90,11 @@ export class ApiKeyService implements IApiKeyService {
         _id: string,
         options?: IDatabaseOptions
     ): Promise<ApiKeyEntity> {
-        const dto: ApiKeyActiveDto = new ApiKeyActiveDto();
-        dto.isActive = true;
-
         return this.apiKeyRepository.updateOneById<ApiKeyActiveDto>(
             _id,
-            dto,
+            {
+                isActive: true,
+            },
             options
         );
     }
@@ -104,12 +103,11 @@ export class ApiKeyService implements IApiKeyService {
         _id: string,
         options?: IDatabaseOptions
     ): Promise<ApiKeyEntity> {
-        const dto: ApiKeyActiveDto = new ApiKeyActiveDto();
-        dto.isActive = false;
-
         return this.apiKeyRepository.updateOneById<ApiKeyActiveDto>(
             _id,
-            dto,
+            {
+                isActive: false,
+            },
             options
         );
     }
@@ -206,13 +204,12 @@ export class ApiKeyService implements IApiKeyService {
         const secret: string = await this.createSecret();
         const hash: string = await this.createHashApiKey(key, secret);
 
-        const dto: ApiKeyResetDto = new ApiKeyResetDto();
-        dto.hash = hash;
-
         const apiKey: ApiKeyEntity =
             await this.apiKeyRepository.updateOneById<ApiKeyResetDto>(
                 _id,
-                dto,
+                {
+                    hash: hash,
+                },
                 options
             );
 
@@ -269,15 +266,15 @@ export class ApiKeyService implements IApiKeyService {
     async inactiveManyByEndDate(
         options?: IDatabaseManyOptions
     ): Promise<boolean> {
-        return this.apiKeyRepository.updateMany(
+        return this.apiKeyRepository.updateMany<ApiKeyActiveDto>(
             {
-                end_date: {
+                endDate: {
                     $lte: this.helperDateService.create(),
                 },
-                is_active: true,
+                isActive: true,
             },
             {
-                is_active: false,
+                isActive: false,
             },
             options
         );