test: add controller tests

src/account/account.controller.spec.ts

@@ -2,20 +2,17 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { AccountController } from './account.controller';
 import { HttpService } from '@nestjs/axios';
 import { User } from '../auth/user.dto';
-import { of } from 'rxjs';
+import { of, throwError } from "rxjs";
 import { NotFoundException } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { KeycloakService } from './keycloak.service';
 import { KeycloakUser } from './keycloak-user.dto';
 
 describe('AccountController', () => {
   let controller: AccountController;
-  const mockHttp = {
-    put: jest.fn().mockReturnValue(of({ data: undefined })),
-    get: jest.fn().mockReturnValue(of({ data: undefined })),
-    post: jest.fn().mockReturnValue(of({ date: undefined })),
-    delete: jest.fn().mockReturnValue(of({ date: undefined })),
-  };
+
+  let mockHttp;
+
   const user: User = {
     sub: 'user-id',
     realm: 'ndb-dev',
@@ -24,6 +21,15 @@ describe('AccountController', () => {
   };
 
   beforeEach(async () => {
+    mockHttp = {
+      put: jest.fn().mockReturnValue(of({ data: undefined })),
+      get: jest.fn().mockReturnValue(of({ data: undefined })),
+      post: jest.fn().mockReturnValue(of({ date: undefined })),
+      delete: jest.fn().mockReturnValue(of({ date: undefined })),
+    }
+
+    jest.clearAllMocks();
+
     const module: TestingModule = await Test.createTestingModule({
       imports: [ConfigModule],
       controllers: [AccountController],
@@ -34,7 +40,6 @@ describe('AccountController', () => {
     }).compile();
 
     controller = module.get<AccountController>(AccountController);
-    jest.clearAllMocks();
   });
 
   it('should be defined', () => {
@@ -70,21 +75,43 @@ describe('AccountController', () => {
       });
   });
 
-  it('should delete a user account', (done) => {
+  it('should delete return 200 with bodyDeleted true', (done) => {
     mockHttp.delete.mockReturnValue(of(""));
     const id = 'my-id';
 
     controller
       .deleteAccount({ user }, id )
-      .subscribe(() => {
-        // delete user
-        expect(mockHttp.delete).toHaveBeenCalledWith(
-          expect.stringContaining("/ndb-dev/users/my-id"),
-        );
-        done();
+      .subscribe({
+        next: (value) => {
+          expect(value.userDeleted).toBeTruthy()
+          // delete user
+          expect(mockHttp.delete).toHaveBeenCalledWith(
+            expect.stringContaining("/ndb-dev/users/my-id"),
+          );
+          done()
+        }
       });
   });
 
+  it('should delete return 200 with bodyDeleted false', (done) => {
+    mockHttp.delete.mockReturnValue(throwError(() => new Error()));
+    const id = 'my-id';
+
+    controller
+      .deleteAccount({ user }, id )
+      .subscribe({
+        next: (value) => {
+          expect(value.userDeleted).toBeFalsy()
+          // delete user
+          expect(mockHttp.delete).toHaveBeenCalledWith(
+            expect.stringContaining("/ndb-dev/users/my-id"),
+          );
+          done()
+        }
+      })
+    ;
+  });
+
   it('should return a user with the assigned roles', async () => {
     const requestedUser: KeycloakUser = { username: 'my-user', id: 'user-id' };
     const roles = ['user-role-1', 'user-role-2'];

src/account/account.controller.ts

@@ -13,13 +13,16 @@ import {
 import { BearerGuard } from '../auth/bearer/bearer.guard';
 import { ApiBearerAuth, ApiHeader, ApiOperation } from '@nestjs/swagger';
 import {
+  catchError,
   concatMap,
   concatWith,
   firstValueFrom,
   last,
   Observable,
-  tap,
-} from 'rxjs';
+  of,
+  switchMap,
+  tap
+} from "rxjs";
 import { ForgotEmailReq } from './forgot-email-req.dto';
 import { SetEmailReq } from './set-email-req.dto';
 import { User } from '../auth/user.dto';
@@ -168,7 +171,18 @@ export class AccountController {
 
     return this.keycloak.deleteUser(
       user.realm,
-      userId,
+      userId
+    ).pipe(
+      switchMap(() => {
+        return of({
+          userDeleted: true
+        });
+      }),
+      catchError(() => {
+        return of({
+          userDeleted: false
+        });
+      }),
     )
   }
 

src/account/keycloak.service.ts

@@ -45,11 +45,7 @@ export class KeycloakService {
     return this.perform(
       this.http.delete,
       `${realm}/users/${id}`,
-    ).pipe(
-      catchError(() => {
-        return of("")
-      }),
-    );
+    )
   }
 
   /**