DTSCCI-313 check defendant is linked for civil claims

src/main/app/client/civilServiceClient.ts

@@ -8,7 +8,7 @@ import {
   CIVIL_SERVICE_AGREED_RESPONSE_DEADLINE_DATE,
   CIVIL_SERVICE_CALCULATE_DEADLINE,
   CIVIL_SERVICE_CASES_URL,
-  CIVIL_SERVICE_CHECK_OCMC_DEFENDENT_LINKED_URL,
+  CIVIL_SERVICE_CHECK_DEFENDENT_LINKED_URL,
   CIVIL_SERVICE_CLAIM_AMOUNT_URL,
   CIVIL_SERVICE_AIRLINES_URL,
   CIVIL_SERVICE_COURT_DECISION,
@@ -58,6 +58,7 @@ import {DashboardNotification} from 'models/dashboard/dashboardNotification';
 import {TaskStatusColor} from 'models/dashboard/taskList/dashboardTaskStatus';
 import { GAFeeRequestBody } from 'services/features/generalApplication/feeDetailsService';
 import {CCDGeneralApplication} from 'models/gaEvents/eventDto';
+import {DefendantLinkStatus} from 'models/DefendantLinkStatus';
 
 const {Logger} = require('@hmcts/nodejs-logging');
 const logger = Logger.getLogger('civilServiceClient');
@@ -248,14 +249,14 @@ export class CivilServiceClient {
     }
   }
 
-  async isOcmcDefendantLinked(caseReference: string): Promise<boolean> {
+  async isDefendantLinked(caseReference: string): Promise<DefendantLinkStatus> {
     try {
-      const response = await this.client.get(CIVIL_SERVICE_CHECK_OCMC_DEFENDENT_LINKED_URL //nosonar
+      const response = await this.client.get(CIVIL_SERVICE_CHECK_DEFENDENT_LINKED_URL //nosonar
         .replace(':caseReference', caseReference), {headers: {'Content-Type': 'application/json'}});// no-sonar
       if (!response.data) {
-        return false;
+        return new DefendantLinkStatus(false, false);
       }
-      return response.data as boolean;
+      return response.data as DefendantLinkStatus;
     } catch (err: unknown) {
       logger.error(`Error when checking a claim ${caseReference} is linked to a defendant`);
       throw err;

src/main/app/client/civilServiceUrls.ts

@@ -20,7 +20,7 @@ export const CIVIL_SERVICE_AGREED_RESPONSE_DEADLINE_DATE =`${CIVIL_SERVICE_CASES
 export const CIVIL_SERVICE_USER_CASE_ROLE = `${CIVIL_SERVICE_CASES_URL}:claimId/userCaseRoles`;
 export const CIVIL_SERVICE_COURT_DECISION =  `${CIVIL_SERVICE_CASES_URL}:claimId/courtDecision`;
 export const CIVIL_SERVICE_VALIDATE_OCMC_PIN_URL = `${CIVIL_SERVICE_ASSIGNMENT_URL}/reference/:caseReference/ocmc`;
-export const CIVIL_SERVICE_CHECK_OCMC_DEFENDENT_LINKED_URL = `${CIVIL_SERVICE_ASSIGNMENT_URL}/reference/:caseReference/ocmc`;
+export const CIVIL_SERVICE_CHECK_DEFENDENT_LINKED_URL = `${CIVIL_SERVICE_ASSIGNMENT_URL}/reference/:caseReference/defendant-link-status`;
 export const CIVIL_SERVICE_FEES_PAYMENT_URL= `${CIVIL_SERVICE_FEES_URL}/:feeType/case/:claimId/payment`;
 export const CIVIL_SERVICE_FEES_PAYMENT_STATUS_URL= `${CIVIL_SERVICE_FEES_URL}/:feeType/case/:claimId/payment/:paymentReference/status`;
 export const CIVIL_SERVICE_DASHBOARD_TASKLIST_URL= `${CIVIL_SERVICE_DASHBOARD_URL}/taskList/:ccd-case-identifier/role/:role-type`;

src/main/common/models/DefendantLinkStatus.ts

@@ -0,0 +1,9 @@
+export class DefendantLinkStatus {
+  isOcmcCase: boolean;
+  linked: boolean;
+
+  constructor(isOcmcCase: boolean, linked: boolean) {
+    this.isOcmcCase = isOcmcCase;
+    this.linked = linked;
+  }
+}

src/main/routes/features/public/firstContact/claimReferenceController.ts

@@ -30,11 +30,13 @@ claimReferenceController.post(FIRST_CONTACT_CLAIM_REFERENCE_URL, (async (req: Re
   } else {
     try {
       req.session = saveFirstContactData(req.session as AppSession, {claimReference: req.body.claimReferenceValue});
-      if (req.body.claimReferenceValue?.includes('MC') && await civilServiceClient.isOcmcDefendantLinked(req.body.claimReferenceValue)) {
-        res.redirect(ocmcBaseUrl + DASHBOARD_URL);
-      } else {
-        res.redirect(FIRST_CONTACT_PIN_URL);
+      if (req.body.claimReferenceValue?.includes('MC')) {
+        const results = await civilServiceClient.isDefendantLinked(req.body.claimReferenceValue);
+        if (results.linked) {
+          return res.redirect((results.isOcmcCase ? ocmcBaseUrl : '') + DASHBOARD_URL);
+        }
       }
+      return res.redirect(FIRST_CONTACT_PIN_URL);
     } catch (error) {
       next(error);
     }

src/test/unit/app/client/civilServiceClient.test.ts

@@ -1260,14 +1260,14 @@ describe('Civil Service Client', () => {
   });
 
   describe('Throw errors', ()=> {
-    it('should throw error isOcmcDefendantLinked ', async () => {
+    it('should throw error isDefendantLinked ', async () => {
       const mockGet = jest.fn().mockImplementation(() => {
         throw new Error('error');
       });
       mockedAxios.create.mockReturnValueOnce({get: mockGet} as unknown as AxiosInstance);
       const civilServiceClient = new CivilServiceClient(baseUrl);
       //Then
-      await expect(civilServiceClient.isOcmcDefendantLinked('123')).rejects.toThrow('error');
+      await expect(civilServiceClient.isDefendantLinked('123')).rejects.toThrow('error');
     });
     it('should throw error getFeeRanges ', async () => {
       const mockGet = jest.fn().mockImplementation(() => {

src/test/unit/routes/features/public/firstContact/claimReferenceController.test.ts

@@ -11,6 +11,7 @@ import { Session } from 'express-session';
 import { AppSession } from 'common/models/AppRequest';
 import nock from 'nock';
 import config from 'config';
+import {DefendantLinkStatus} from 'models/DefendantLinkStatus';
 
 jest.mock('../../../../../../main/modules/oidc');
 jest.mock('../../../../../../main/modules/draft-store');
@@ -68,8 +69,8 @@ describe('Respond to Claim - Claim Reference Controller', () => {
     it('should redirect and set cookie value for OCMC case when case ia already linked', async () => {
       app.request.cookies = {firstContact: {foo: 'blah'}};
       nock(civilServiceUrl)
-        .get('/assignment/reference/' + validClaimNumberV1 + '/ocmc')
-        .reply(200, 'true');
+        .get('/assignment/reference/' + validClaimNumberV1 + '/defendant-link-status')
+        .reply(200, new DefendantLinkStatus(true, true));
       await request(app).post(FIRST_CONTACT_CLAIM_REFERENCE_URL).send({claimReferenceValue: validClaimNumberV1}).expect((res) => {
         expect(res.status).toBe(302);
         expect(res.header.location).toBe(ocmcBaseUrl + DASHBOARD_URL);
@@ -80,8 +81,32 @@ describe('Respond to Claim - Claim Reference Controller', () => {
     it('should redirect and set cookie value for OCMC case when case ia not linked', async () => {
       app.request.cookies = {firstContact: {foo: 'blah'}};
       nock(civilServiceUrl)
-        .get('/assignment/reference/' + validClaimNumberV1 + '/ocmc')
-        .reply(200, 'false');
+        .get('/assignment/reference/' + validClaimNumberV1 + '/defendant-link-status')
+        .reply(200, new DefendantLinkStatus(true, false));
+      await request(app).post(FIRST_CONTACT_CLAIM_REFERENCE_URL).send({claimReferenceValue: validClaimNumberV1}).expect((res) => {
+        expect(res.status).toBe(302);
+        expect(res.header.location).toBe(FIRST_CONTACT_PIN_URL);
+        expect((app.request.session as AppSession).firstContact.claimReference).toBe(validClaimNumberV1);
+      });
+    });
+
+    it('should redirect and set cookie value for Civil case when case ia already linked', async () => {
+      app.request.cookies = {firstContact: {foo: 'blah'}};
+      nock(civilServiceUrl)
+        .get('/assignment/reference/' + validClaimNumberV1 + '/defendant-link-status')
+        .reply(200, new DefendantLinkStatus(false, true));
+      await request(app).post(FIRST_CONTACT_CLAIM_REFERENCE_URL).send({claimReferenceValue: validClaimNumberV1}).expect((res) => {
+        expect(res.status).toBe(302);
+        expect(res.header.location).toBe(DASHBOARD_URL);
+        expect((app.request.session as AppSession).firstContact.claimReference).toBe(validClaimNumberV1);
+      });
+    });
+
+    it('should redirect and set cookie value for Civil case when case ia not linked', async () => {
+      app.request.cookies = {firstContact: {foo: 'blah'}};
+      nock(civilServiceUrl)
+        .get('/assignment/reference/' + validClaimNumberV1 + '/defendant-link-status')
+        .reply(200, new DefendantLinkStatus(false, false));
       await request(app).post(FIRST_CONTACT_CLAIM_REFERENCE_URL).send({claimReferenceValue: validClaimNumberV1}).expect((res) => {
         expect(res.status).toBe(302);
         expect(res.header.location).toBe(FIRST_CONTACT_PIN_URL);