Merge pull request #364 from andrechristikan/development

delete -> softdelete, update package

Author: andrechristikan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ack-nestjs-boilerplate",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Ack NestJs Boilerplate",
   "repository": {
     "type": "git",
@@ -80,13 +80,13 @@
     "morgan": "^1.10.0",
     "nest-winston": "^1.8.0",
     "nestjs-command": "^3.1.3",
-    "nestjs-i18n": "^10.2.5",
+    "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": "^3.0.2",
+    "rimraf": "^4.0.4",
     "rotating-file-stream": "^3.0.4",
     "rxjs": "^7.8.0",
     "ua-parser-js": "^1.0.32",
@@ -125,9 +125,9 @@
     "eslint-plugin-import": "^2.27.4",
     "husky": "^8.0.3",
     "jest": "^29.3.1",
-    "prettier": "^2.8.2",
+    "prettier": "^2.8.3",
     "supertest": "^6.3.3",
-    "ts-jest": "^29.0.4",
+    "ts-jest": "^29.0.5",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "ts-prune": "^0.10.3",

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

@@ -223,14 +223,14 @@ export class ApiKeyService implements IApiKeyService {
         _id: string,
         options?: IDatabaseSoftDeleteOptions
     ): Promise<ApiKeyEntity> {
-        return this.apiKeyRepository.deleteOneById(_id, options);
+        return this.apiKeyRepository.softDeleteOneById(_id, options);
     }
 
     async deleteOne(
         find: Record<string, any>,
         options?: IDatabaseSoftDeleteOptions
     ): Promise<ApiKeyEntity> {
-        return this.apiKeyRepository.deleteOne(find, options);
+        return this.apiKeyRepository.softDeleteOne(find, options);
     }
 
     async validateHashApiKey(

src/common/setting/services/setting.service.ts

@@ -95,14 +95,14 @@ export class SettingService implements ISettingService {
         _id: string,
         options?: IDatabaseSoftDeleteOptions
     ): Promise<SettingEntity> {
-        return this.settingRepository.deleteOneById(_id, options);
+        return this.settingRepository.softDeleteOneById(_id, options);
     }
 
     async deleteOne(
         find: Record<string, any>,
         options?: IDatabaseSoftDeleteOptions
     ): Promise<SettingEntity> {
-        return this.settingRepository.deleteOne(find, options);
+        return this.settingRepository.softDeleteOne(find, options);
     }
 
     async getValue<T>(setting: SettingEntity): Promise<T> {

src/modules/user/services/user.service.ts

@@ -112,14 +112,14 @@ export class UserService implements IUserService {
         _id: string,
         options?: IDatabaseSoftDeleteOptions
     ): Promise<UserEntity> {
-        return this.userRepository.deleteOneById(_id, options);
+        return this.userRepository.softDeleteOneById(_id, options);
     }
 
     async deleteOne(
         find: Record<string, any>,
         options?: IDatabaseSoftDeleteOptions
     ): Promise<UserEntity> {
-        return this.userRepository.deleteOne(find, options);
+        return this.userRepository.softDeleteOne(find, options);
     }
 
     async updateName(

test/e2e/user/user.grant-permission.e2e-spec.ts

@@ -232,7 +232,7 @@ describe('E2E User Grant Password Payload Encryption', () => {
         jest.clearAllMocks();
 
         try {
-            await userService.deleteOneById(user._id);
+            await userService.deleteMany({ _id: user._id });
         } catch (err: any) {
             console.error(err);
         }

test/unit/api-key/api-key.service.spec.ts

@@ -66,7 +66,7 @@ describe('ApiKeyService', () => {
         jest.clearAllMocks();
 
         try {
-            await apiKeyService.deleteOne({
+            await apiKeyService.deleteMany({
                 _id: apiKey._id,
             });
             await apiKeyService.deleteMany({
@@ -400,7 +400,7 @@ describe('ApiKeyService', () => {
         });
 
         it('should be not found', async () => {
-            await apiKeyService.deleteOneById(apiKey._id);
+            await apiKeyService.deleteMany({ _id: apiKey._id });
             const result: ApiKeyEntity = await apiKeyService.deleteOneById(
                 apiKey._id
             );
@@ -429,7 +429,7 @@ describe('ApiKeyService', () => {
         });
 
         it('should be not found', async () => {
-            await apiKeyService.deleteOne({
+            await apiKeyService.deleteMany({
                 _id: apiKey._id,
             });
             const result: ApiKeyEntity = await apiKeyService.deleteOne({

test/unit/logger/logger.service.spec.ts

@@ -97,7 +97,7 @@ describe('LoggerService', () => {
         jest.clearAllMocks();
 
         try {
-            await apiKeyService.deleteOneById(apiKey._id);
+            await apiKeyService.deleteMany({ _id: apiKey._id });
         } catch (err: any) {
             console.error(err);
         }

test/unit/setting/setting.service.spec.ts

@@ -57,8 +57,8 @@ describe('SettingService', () => {
         jest.clearAllMocks();
 
         try {
-            await settingService.deleteOneById(setting._id);
-            await settingService.deleteOne({
+            await settingService.deleteMany({ _id: setting._id });
+            await settingService.deleteMany({
                 name: {
                     $in: [
                         settingName1,
@@ -322,6 +322,21 @@ describe('SettingService', () => {
         });
     });
 
+    describe('deleteOneById', () => {
+        it('should be success', async () => {
+            const result: SettingEntity = await settingService.deleteOneById(
+                setting._id
+            );
+
+            jest.spyOn(settingService, 'deleteOneById').mockReturnValueOnce(
+                result as any
+            );
+
+            expect(result).toBeTruthy();
+            expect(result._id).toBe(setting._id);
+        });
+    });
+
     describe('deleteOne', () => {
         it('should be success', async () => {
             const result: SettingEntity = await settingService.deleteOne({