EUI-8987 Consolidate manage organisation pact tests

api/models/registrationData.ts

@@ -23,7 +23,7 @@ export type RegistrationData = {
     hasDxReference: boolean;
     dxNumber?: string;
     dxExchange?: string;
-    services: string[];
+    services: {key: string, value: string}[];
     otherServices?: string;
     hasPBA: boolean;
     contactDetails: ContactDetails;
@@ -72,10 +72,5 @@ export type RegistrationRequest = {
       }
     ],
     orgType: string,
-    orgAttributes?: [
-      {
-        key: string,
-        value: string
-      }
-    ]
+    orgAttributes?: {key: string, value: string}[]
 }

api/registerOrganisation/index.ts

@@ -27,8 +27,17 @@ export function mapRequestObject(requestBody: RegistrationData): RegistrationReq
         dxAddress: getDx(requestBody)
       }
     ],
-    orgType: requestBody.organisationType.key
+    orgType: requestBody.organisationType.key,
+    orgAttributes: [
+      ...requestBody.services.filter((service) => service.key !== undefined)
+    ]
   };
+  if (requestBody.otherServices && requestBody.otherServices !== '') {
+    request.orgAttributes.push({
+      key: 'otherServices',
+      value: requestBody.otherServices
+    });
+  }
   return request;
 }
 

api/test/pact/pact-tests/feePayApi/getAccounts.spec.ts

@@ -5,7 +5,7 @@ import { PactTestSetup } from '../settings/provider.mock';
 
 import { Matchers } from '@pact-foundation/pact';
 const { somethingLike, like } = Matchers;
-const pactSetUp = new PactTestSetup({ provider: 'payment_accounts', port: 8000 });
+const pactSetUp = new PactTestSetup({ provider: 'payment_creditAccountPayment', port: 8000 });
 
 const responsePaymentAccountDto =
 {

api/test/pact/pact-tests/pactFixtures.ts

@@ -122,3 +122,21 @@ export interface InviteUserResponse {
 export interface OrganisationCreatedResponse {
   organisationIdentifier: string;
 }
+
+export interface UserResponse {
+  organisationIdentifier: string;
+  users: User[]
+}
+
+export interface User {
+  userIdentifier: string,
+  firstName: string,
+  lastName: string,
+  email: string,
+  idamStatus: string,
+  roles: [
+    string
+  ],
+  idamStatusCode: string,
+  idamMessage: string
+}

api/test/pact/pact-tests/pactUtil.ts

@@ -129,3 +129,14 @@ export async function getDetails(idamUrl: string, token: string = null): Promise
   const response = await axios.get(`${idamUrl}/details`, axiosConfig);
   return response.data;
 }
+
+export async function getUsers(taskUrl: string): Promise<AxiosResponse<any>> {
+  const axiosConfig = {
+    headers: {
+      'Content-Type': 'application/json',
+      'ServiceAuthorization': 'serviceAuthToken',
+      'Authorization': 'Bearer some-access-token'
+    }
+  };
+  return axios.get(taskUrl, axiosConfig);
+}

api/test/pact/pact-tests/rdProfessionalApi/getUsers.spec.ts

@@ -0,0 +1,76 @@
+import { expect } from 'chai';
+import { UserResponse } from '../pactFixtures';
+import { getUsers } from '../pactUtil';
+import { PactTestSetup } from '../settings/provider.mock';
+
+import { Matchers } from '@pact-foundation/pact';
+const { somethingLike } = Matchers;
+const pactSetUp = new PactTestSetup({ provider: 'referenceData_professionalExternalUsers', port: 8000 });
+
+describe('RD Professional API', () => {
+  describe('Get Users', () => {
+    const mockResponse = {
+      organisationIdentifier: somethingLike('GCXGCY1'),
+      users: [
+        {
+          userIdentifier: somethingLike('71ac6370-8b69-4dfa-b150-80d43407ae13'),
+          firstName: somethingLike('ProbatePPThree'),
+          lastName: somethingLike('Org2'),
+          email: somethingLike('[email protected]'),
+          idamStatus: somethingLike('ACTIVE')
+        }
+      ]
+    };
+
+    before(async () => {
+      await pactSetUp.provider.setup();
+      const interaction = {
+        state: 'Get the list of users',
+        uponReceiving: 'A request to return the user list',
+        withRequest: {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': 'Bearer some-access-token',
+            'ServiceAuthorization': 'serviceAuthToken'
+          },
+          path: '/refdata/external/v1/organisations/users',
+          query: 'returnRoles=true&status=active'
+        },
+        willRespondWith: {
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          status: 201,
+          body: mockResponse
+        }
+      };
+      // @ts-ignore
+      pactSetUp.provider.addInteraction(interaction);
+    });
+
+    it('returns the correct response', async () => {
+      const taskUrl: string = `${pactSetUp.provider.mockService.baseUrl}/refdata/external/v1/organisations/users?returnRoles=true&status=active`;
+      const resp = getUsers(taskUrl);
+      resp.then((response) => {
+        const responseDto: UserResponse = <UserResponse>response.data;
+        assertResponse(responseDto);
+      }).then(() => {
+        pactSetUp.provider.verify();
+        pactSetUp.provider.finalize();
+      }).finally(() => {
+        pactSetUp.provider.verify();
+        pactSetUp.provider.finalize();
+      });
+    });
+  });
+});
+
+function assertResponse(dto: UserResponse): void {
+  expect(dto.organisationIdentifier).to.be.equal('GCXGCY1');
+  expect(dto.users[0].userIdentifier).to.be.equal('71ac6370-8b69-4dfa-b150-80d43407ae13');
+  expect(dto.users[0].firstName).to.be.equal('ProbatePPThree');
+  expect(dto.users[0].lastName).to.be.equal('Org2');
+  expect(dto.users[0].email).to.be.equal('[email protected]');
+  expect(dto.users[0].idamStatus).to.be.equal('ACTIVE');
+}

package.json

@@ -76,7 +76,7 @@
     "@hmcts/frontend": "0.0.50-alpha",
     "@hmcts/nodejs-healthcheck": "1.7.0",
     "@hmcts/properties-volume": "0.0.13",
-    "@hmcts/rpx-xui-common-lib": "1.9.0-error-message-change",
+    "@hmcts/rpx-xui-common-lib": "1.9.0-address-inline-errors",
     "@hmcts/rpx-xui-node-lib": "2.27.1",
     "@ng-idle/core": "^10.0.0",
     "@ng-idle/keepalive": "^10.0.0",
@@ -85,7 +85,7 @@
     "@ngrx/store": "^11.1.1",
     "@ngrx/store-devtools": "^11.1.1",
     "@nicky-lenaers/ngx-scroll-to": "^9.0.0",
-    "@pact-foundation/pact": "^9.2.0",
+    "@pact-foundation/pact": "^9.11.1",
     "@pact-foundation/pact-node": "^10.9.7",
     "@rxweb/reactive-form-validators": "2.1.2",
     "@types/crypto-js": "^3.1.43",

src/app/components/terms-and-conditions-register-other-org/terms-and-conditions-register-other-org.component.html

@@ -17,8 +17,10 @@ <h3 class="govuk-heading-m">What's in these terms and conditions?</h3>
         <ul class="govuk-list govuk-list--bullet">
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#how-to-contact-us">Who we
               are and how to contact us.</a></li>
-          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#accept-these-terms">By using
-              our site you accept these terms.</a></li>
+          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#accept-these-terms">You
+              accept these terms and conditions by using our site.</a></li>
+          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#controllers-of-personal-data">
+              We are independent controllers of the personal data shared.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#other-terms">There are other
               terms that may apply to you.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#change-to-these-terms">We
@@ -35,6 +37,8 @@ <h3 class="govuk-heading-m">What's in these terms and conditions?</h3>
               must keep your account details safe.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#materials-on-our-site">How
               you may use material on our site.</a></li>
+          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#web-scraping">No text or
+              data mining, or web scraping.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#information-on-this-site">Do
               not rely on information on our site.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#websites-we-link-to">We are
@@ -66,7 +70,7 @@ <h3 class="govuk-heading-m" id="how-to-contact-us">Who we are and how to contact
         <a class="govuk-link" target="_blank"
           href="https://hmcts-access.service.gov.uk/login?client_id=xuiwebapp&redirect_uri=https://manage-case.platform.hmcts.net/oauth2/callback&state=0MCD1z9Wt38-SpaXfhA2QJGPjdPaamCM-Fn8MpGqolI&nonce=0_ZPmm6a9E89V174hyfYbnKbHb7jBL-bTQqOwSyEGH4&response_type=code&scope=profile openid roles manage-user create-user search-user&prompt=">
           <i>MyHMCTS</i>
-        </a> is a site operated by His Majesty’s Courts and Tribunals Service ("We", "Our" or "Us").
+        </a> is a site operated by His Majesty's Courts and Tribunals Service ("We", "Our" or "Us").
       </p>
       <p class="govuk-body">Please <a class="govuk-link" href="mailto:[email protected]">contact us</a> if
         you require further information.</p>
@@ -77,25 +81,26 @@ <h3 class="govuk-heading-m" id="accept-these-terms">You accept these terms and c
       <p>If you do not agree to these terms, you must not use our site.</p>
       <p>You are also responsible for ensuring that all persons who access our site through your account, and any
         individual user accounts created by you, have read, understood and will abide by these terms and conditions and
-        other applicable terms and conditions such as our 
-        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/cookies">Cookie Policy
-        </a> and 
-        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/privacy-policy">Privacy Policy
-        </a>.
+        other applicable terms and conditions such as our
+        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/cookies">Cookie Policy</a> and
+        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/privacy-policy">Privacy Policy</a>.
+      </p>
+      <h3 class="govuk-heading-m" id="controllers-of-personal-data">We are independent controllers of the personal data shared
+      </h3>
+      <p class="govuk-body">You acknowledge that you are the controller of any shared personal data when it is in your
+        possession and that HMCTS is the controller of any shared personal data when it is in our possession.
       </p>
       <h3 class="govuk-heading-m" id="other-terms">There are other terms that may apply to you</h3>
       <div class="govuk-body">
         These terms of use refer to the following additional terms, which also apply to your use of our site:
         <ul class="govuk-list govuk-list--bullet">
           <li>
             <a class="govuk-link" href="https://hmcts-access.service.gov.uk/privacy-policy" target="_blank">
-              Our Privacy Policy
-            </a>, which sets out how we may use your personal information.
+              Our Privacy Policy</a>, which sets out how we may use your personal information.
           </li>
           <li>
             <a class="govuk-link" href="https://hmcts-access.service.gov.uk/cookies" target="_blank">
-              Our Cookie Policy
-            </a>, which sets out information about the cookies on our site.
+              Our Cookie Policy</a>, which sets out information about the cookies on our site.
           </li>
         </ul>
       </div>
@@ -250,10 +255,9 @@ <h3 class="govuk-heading-m" id="uploading-content-to-our-site">Uploading content
       <p class="govuk-body">Any content you upload to our site will be considered non-confidential and non-proprietary.
         You retain all ownership rights in your content, but you grant us and other users of our site a limited licence
         to use, store and copy that content and to distribute and make it available to third parties. The rights you
-        license to us are described in 
-        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#materials-on-our-site">
-          Rights you are giving us to use
-          material you upload</a>.</p>
+        license to us are described in
+        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#materials-on-our-site">Rights you
+          are giving us to use material you upload</a>.</p>
       <p class="govuk-body">We also have the right to disclose your identity to any third party who is claiming that any
         content posted or uploaded by you to our site constitutes a violation of their intellectual property rights
         or of their right to privacy.</p>
@@ -291,14 +295,13 @@ <h3 class="govuk-heading-m" id="linking-to-our-site">Rules about linking to our
       <p class="govuk-body">Your right to link to our home page will cease immediately on the expiration or termination,
         for any reason, of these terms and conditions.</p>
       <p class="govuk-body">The website in which you are linking must comply in all respects with the content standards
-        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#uploading-content-to-our-site">
-          set out here
-        </a>.</p>
+        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#uploading-content-to-our-site">set
+          out here</a>.</p>
       <p class="govuk-body">If you wish to link to or make any use of content on our site other than that set out above,
         please <a class="govuk-link" href="mailto:[email protected]">contact us</a>.</p>
       <h3 class="govuk-heading-m" id="dispute-laws">Which country's laws apply to any disputes?</h3>
       <p class="govuk-body">Please note that these terms of use, their subject matter and their formation, are governed
         by English law. You and we both agree that the courts of England and Wales will have exclusive jurisdiction.</p>
     </div>
   </div>
-</main>
+</main>

src/register-org/components/check-your-answers/check-your-answers.component.html

@@ -246,7 +246,7 @@ <h2 class="govuk-heading-m govuk-!-margin-top-8">Confirm your registration detai
               <input class="govuk-checkboxes__input" type="checkbox" id="confirm-terms-and-conditions"
               name="confirmTermsAndConditions" formControlName="confirmTermsAndConditions">
               <label class="govuk-label govuk-checkboxes__label" for="confirm-terms-and-conditions">
-                You have read and understood the
+                You have read, understood and will abide by the
                 <a href="javascript:void(0)" target="_blank"
                   routerLink="/terms-and-conditions">terms and conditions</a>
                 and are eligible for an account to manage your organisation and cases

src/register-org/components/check-your-answers/check-your-answers.component.spec.ts

@@ -25,8 +25,8 @@ describe('CheckYourAnswersComponent', () => {
       'PBA1234568'
     ],
     services: [
-      'AAA7',
-      'ABA3'
+      { key: 'AAA7', value: 'Damages' },
+      { key: 'ABA3', value: 'Divorce' }
     ],
     otherServices: 'test service',
     contactDetails: {

src/register-org/components/check-your-answers/check-your-answers.component.ts

@@ -34,9 +34,8 @@ export class CheckYourAnswersComponent extends RegisterComponent implements OnIn
     this.cyaFormGroup = new FormGroup({
       confirmTermsAndConditions: new FormControl(null, [Validators.required, this.getCustomValidationForTermsAndConditions()])
     });
-
-    this.registrationData.services?.forEach((serviceKey) => {
-      const service = ORGANISATION_SERVICES.find((service) => service.key === serviceKey).value;
+    this.registrationData.services?.forEach((thisService) => {
+      const service = ORGANISATION_SERVICES.find((service) => service.key === thisService.key).value;
       this.services.push(service);
     });
     if (this.registrationData.otherServices) {

src/register-org/components/company-house-details/company-house-details.component.html

@@ -4,7 +4,7 @@
       <a class="govuk-back-link" href="javascript:void(0)" (click)="onBack()">Back</a>
       <xuilib-hmcts-error-summary [errorMessages]="validationErrors" [header]="'There is a problem'"></xuilib-hmcts-error-summary>
       <span class="govuk-caption-xl">Register an organisation</span>
-      <h1 class="govuk-heading-xl">What is your company name and Companies House number?</h1>
+      <h1 class="govuk-heading-xl">What is your organisation name and Companies House number?</h1>
       <hr>
       <p class="govuk-hint">
         If your company is registered with Companies House,
@@ -28,10 +28,10 @@ <h1 class="govuk-heading-xl">What is your company name and Companies House numbe
             Enter the 8-digit Companies House Number (optional)
           </label>
           <div id="company-house-number-hint" class="govuk-hint">
-            This helps HMCTS to verify your company on our System
+            This helps HMCTS to verify your organisation on our system
           </div>
           <p class="govuk-error-message" *ngIf="companyNumberError">
-            <span class="govuk-visually-hidden">Error:</span> {{ companyNumberError.description }}
+            <span class="govuk-visually-hidden">Error:</span> {{ companyNumberError.message }}
           </p>
           <input class="govuk-input" id="company-house-number" name="companyHouseNumber" type="text"
             formControlName="companyHouseNumber" aria-describedby="company-house-number-hint">
@@ -41,9 +41,8 @@ <h1 class="govuk-heading-xl">What is your company name and Companies House numbe
           <button class="govuk-button" data-module="govuk-button" (click)="onContinue()">
             Continue
           </button>
+          <a class="govuk-link" href="javascript:void(0)" (click)="onCancel()">Cancel</a>
         </div>
-
-        <a class="govuk-link" href="javascript:void(0)" (click)="onCancel()">Cancel</a>
       </form>
     </div>
   </div>

src/register-org/components/company-house-details/company-house-details.component.spec.ts

@@ -46,13 +46,27 @@ describe('CompanyHouseDetailsComponent', () => {
     component.companyHouseFormGroup.get('companyName').setValue(null);
     component.onContinue();
     expect(component.companyNameError).toEqual(companyNameError);
+    expect(component.validationErrors.length).toEqual(1);
   });
 
   it('should set the error message if company number is invalid', () => {
     const companyNumberError = { id: 'company-house-number', message: CompanyHouseDetailsMessage.INVALID_COMPANY_NUMBER };
+    component.companyHouseFormGroup.get('companyName').setValue('Company Name');
+    component.companyHouseFormGroup.get('companyHouseNumber').setValue('1234');
+    component.onContinue();
+    expect(component.companyNumberError).toEqual(companyNumberError);
+    expect(component.validationErrors.length).toEqual(1);
+  });
+
+  it('should set the error message if company name is null and company number is invalid', () => {
+    const companyNameError = { id: 'company-name', message: CompanyHouseDetailsMessage.NO_ORG_NAME };
+    const companyNumberError = { id: 'company-house-number', message: CompanyHouseDetailsMessage.INVALID_COMPANY_NUMBER };
+    component.companyHouseFormGroup.get('companyName').setValue(null);
     component.companyHouseFormGroup.get('companyHouseNumber').setValue('1234');
     component.onContinue();
+    expect(component.companyNameError).toEqual(companyNameError);
     expect(component.companyNumberError).toEqual(companyNumberError);
+    expect(component.validationErrors.length).toEqual(2);
   });
 
   it('should navigate the next page if values are correct', () => {
@@ -61,6 +75,9 @@ describe('CompanyHouseDetailsComponent', () => {
     component.onContinue();
     expect(component.registrationData.companyName).toEqual('Company Name');
     expect(component.registrationData.companyHouseNumber).toEqual('12345678');
+    expect(component.companyNameError).toBeNull();
+    expect(component.companyNumberError).toBeNull();
+    expect(component.validationErrors.length).toEqual(0);
     expect(router.navigate).toHaveBeenCalledWith(['register-org-new', 'registered-address', 'external']);
   });
 

src/register-org/components/company-house-details/company-house-details.component.ts

@@ -58,7 +58,8 @@ export class CompanyHouseDetailsComponent extends RegisterComponent implements O
 
   private validateForm(): boolean {
     this.validationErrors = [];
-
+    this.companyNameError = null;
+    this.companyNumberError = null;
     if (this.companyHouseFormGroup.invalid) {
       if (this.companyHouseFormGroup.get('companyName').invalid) {
         this.companyNameError = { id: 'company-name', message: CompanyHouseDetailsMessage.NO_ORG_NAME };