Mes-9939: changes for new user service

src/app/pages/rekey-reason/__tests__/rekey-reason.effects.spec.ts

@@ -85,7 +85,7 @@ describe('RekeyReasonEffects', () => {
           asyncSuccess(
             new HttpResponse({
               status: HttpStatusCode.Ok,
-              statusText: 'OK',
+              statusText: 'User found with staff number 789',
             })
           )
         );
@@ -98,17 +98,16 @@ describe('RekeyReasonEffects', () => {
           done();
         });
       });
-      it('should return a failure action with a true payload when the staff number is not valid', (done) => {
+      it('should return a failure action with a true payload when the staff number is not found', (done) => {
         // ARRANGE
         store$.dispatch(testActions.StartTest(12345, TestCategory.B));
         store$.dispatch(SetExaminerBooked(333));
         store$.dispatch(SetExaminerConducted(57463524));
         spyOn(findUserProvider, 'userExists').and.returnValue(
-          asyncError(
-            new HttpErrorResponse({
-              error: 'Error message',
-              status: HttpStatusCode.NotFound,
-              statusText: 'Not Found',
+          asyncSuccess(
+            new HttpResponse({
+              status: HttpStatusCode.NoContent,
+              statusText: null,
             })
           )
         );
@@ -139,7 +138,7 @@ describe('RekeyReasonEffects', () => {
         actions$.next(rekeyReasonActions.ValidateTransferRekey());
         // ASSERT
         effects.rekeyReasonValidateTransferEffect$.subscribe((res) => {
-          expect(res).toEqual(rekeyReasonActions.ValidateTransferRekeyFailed(false));
+          expect(res).toEqual(rekeyReasonActions.ValidateTransferRekeyFailed(true));
           expect(findUserProvider.userExists).toHaveBeenCalled();
           done();
         });

src/app/pages/rekey-reason/rekey-reason.effects.ts

@@ -1,4 +1,4 @@
-import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
+import { HttpResponse, HttpStatusCode } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { TestResultCommonSchema } from '@dvsa/mes-test-schema/categories/common';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
@@ -33,10 +33,15 @@ export class RekeyReasonEffects {
         }
 
         return this.findUserProvider.userExists(test.examinerConducted).pipe(
-          switchMap(() => of(testActions.SendCurrentTest())),
-          catchError((error: HttpErrorResponse) =>
-            of(rekeyActions.ValidateTransferRekeyFailed(error.status === HttpStatusCode.NotFound))
-          )
+          switchMap((response: HttpResponse<any>) => {
+            if (response.status === HttpStatusCode.NoContent) {
+              // user does not exist
+              return of(rekeyActions.ValidateTransferRekeyFailed(true));
+            }
+            // user exists
+            return of(testActions.SendCurrentTest());
+          }),
+          catchError(() => of(rekeyActions.ValidateTransferRekeyFailed(true)))
         );
       })
     )