Skip to content

Commit 66828a2

Browse files
PhilipGloverPhilipGlover
authored
Merge pull request #746 from companieshouse/feature/psc-verification-remove-rle
Removing RLE types and tests
2 parents 519ecf3 + 6268ce0 commit 66828a2

File tree

5 files changed

+2
-167
lines changed

5 files changed

+2
-167
lines changed

‎src/services/psc-verification-link/index.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
import service from "./service";
2-
31
export * from "./types";
42
export { default as PscVerificationService } from "./service";

‎src/services/psc-verification-link/types.ts‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,6 @@ export interface Identification {
130130
countryRegistered?: string
131131
};
132132

133-
export interface RelevantOfficerResource {
134-
name_elements?: NameElementsResource,
135-
date_of_birth?: Date,
136-
is_employee?: boolean,
137-
is_director?: boolean
138-
}
139-
140-
export interface RelevantOfficer {
141-
nameElements?: NameElements,
142-
dateOfBirth?: Date,
143-
isEmployee?: boolean,
144-
isDirector?: boolean
145-
}
146-
147133
export interface PscVerificationResource {
148134
created_at: Date,
149135
updated_at: Date,
@@ -154,7 +140,6 @@ export interface PscVerificationResource {
154140
export interface PscVerificationDataResource {
155141
company_number?: string,
156142
psc_appointment_id?: string,
157-
relevant_officer?: RelevantOfficerResource,
158143
verification_details?: VerificationDetailsResource
159144
}
160145

@@ -167,7 +152,6 @@ export interface PscVerification {
167152
export interface PscVerificationData {
168153
companyNumber?: string,
169154
pscAppointmentId?: string,
170-
relevantOfficer?: RelevantOfficer,
171155
verificationDetails?: VerificationDetails
172156
}
173157

@@ -200,9 +184,6 @@ export enum NameMismatchReasonEnum {
200184

201185
export enum VerificationStatementEnum {
202186
INDIVIDUAL_VERIFIED = "INDIVIDUAL_VERIFIED",
203-
RO_IDENTIFIED = "RO_IDENTIFIED",
204-
RO_VERIFIED= "RO_VERIFIED",
205-
RO_DECLARATION = "RO_DECLARATION"
206187
}
207188
export interface ValidationStatusError {
208189
error: string;

‎test/services/psc-verification-link/service.mock.ts‎

Lines changed: 1 addition & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ReasonPhrases, StatusCodes } from "http-status-codes";
22
import { RequestClient } from "../../../src";
3-
import { NameElements, NameMismatchReasonEnum, PlannedMaintenance, PscVerification, PscVerificationData, PscVerificationDataResource, PscVerificationResource, ValidationStatusError, ValidationStatusErrorResource, ValidationStatusResponse, ValidationStatusResponseResource, VerificationStatementEnum } from "../../../src/services/psc-verification-link/types";
3+
import { NameMismatchReasonEnum, PlannedMaintenance, PscVerification, PscVerificationData, PscVerificationDataResource, PscVerificationResource, ValidationStatusError, ValidationStatusErrorResource, ValidationStatusResponse, ValidationStatusResponseResource, VerificationStatementEnum } from "../../../src/services/psc-verification-link/types";
44

55
export const requestClient = new RequestClient({ baseUrl: "URL_NOT_USED", oauthToken: "123" });
66

@@ -26,30 +26,6 @@ export const PSC_VERIFICATION_IND: PscVerificationData = {
2626
}
2727
};
2828

29-
const NAME_ELEMENTS: NameElements = {
30-
title: "Sir",
31-
forename: "Forename",
32-
middleName: "Middlename",
33-
surname: "Surname"
34-
};
35-
36-
export const PSC_VERIFICATION_RLE: PscVerificationData = {
37-
companyNumber: COMPANY_NUMBER,
38-
pscAppointmentId: PSC_VERIFICATION_ID,
39-
relevantOfficer: {
40-
nameElements: NAME_ELEMENTS,
41-
dateOfBirth: DOB_DATE,
42-
isDirector: true,
43-
isEmployee: true
44-
},
45-
verificationDetails: {
46-
nameMismatchReason: NameMismatchReasonEnum.LEGAL_NAME_CHANGE,
47-
verificationStatements: [VerificationStatementEnum.RO_DECLARATION,
48-
VerificationStatementEnum.RO_IDENTIFIED,
49-
VerificationStatementEnum.RO_VERIFIED]
50-
}
51-
};
52-
5329
const PSC_VERIFICATION_CREATED_RESOURCE: PscVerificationDataResource = {
5430
company_number: COMPANY_NUMBER
5531
}
@@ -92,40 +68,6 @@ export const mockPscVerificationPatchedResource: PscVerificationResource = {
9268
}
9369
};
9470

95-
const PSC_VERIFICATION_RO_PATCH: PscVerificationDataResource = {
96-
psc_appointment_id: PSC_VERIFICATION_ID,
97-
relevant_officer: {
98-
name_elements: NAME_ELEMENTS
99-
}
100-
};
101-
102-
export const mockPscVerificationPatchRleRoResource: PscVerificationResource = {
103-
created_at: FIRST_DATE,
104-
updated_at: UPDATE_DATE,
105-
data: PSC_VERIFICATION_RO_PATCH,
106-
links: {
107-
self: SELF_LINK,
108-
validation_status: `${SELF_LINK}/validation_status`
109-
}
110-
};
111-
112-
const PSC_VERIFICATION_RO_PATCH_CAMEL: PscVerificationData = {
113-
pscAppointmentId: PSC_VERIFICATION_ID,
114-
relevantOfficer: {
115-
nameElements: NAME_ELEMENTS
116-
}
117-
};
118-
119-
export const mockPscVerificationPatchRleRo: PscVerification = {
120-
createdAt: FIRST_DATE,
121-
updatedAt: UPDATE_DATE,
122-
data: PSC_VERIFICATION_RO_PATCH_CAMEL,
123-
links: {
124-
self: SELF_LINK,
125-
validationStatus: `${SELF_LINK}/validation_status`
126-
}
127-
};
128-
12971
export const mockPscVerificationPatchIndResource: PscVerificationResource = {
13072
created_at: FIRST_DATE,
13173
updated_at: UPDATE_DATE,
@@ -194,33 +136,6 @@ export const mockPscVerificationInd: PscVerification = {
194136
}
195137
};
196138

197-
export const PSC_VERIFICATION_RLE_RESOURCE: PscVerificationDataResource = {
198-
company_number: COMPANY_NUMBER,
199-
psc_appointment_id: PSC_VERIFICATION_ID,
200-
relevant_officer: {
201-
name_elements: NAME_ELEMENTS,
202-
date_of_birth: DOB_DATE,
203-
is_director: true,
204-
is_employee: true
205-
},
206-
verification_details: {
207-
name_mismatch_reason: NameMismatchReasonEnum.LEGAL_NAME_CHANGE,
208-
verification_statements: [VerificationStatementEnum.RO_DECLARATION,
209-
VerificationStatementEnum.RO_IDENTIFIED,
210-
VerificationStatementEnum.RO_VERIFIED]
211-
}
212-
};
213-
214-
export const mockPscVerificationRleResource: PscVerificationResource = {
215-
created_at: FIRST_DATE,
216-
updated_at: FIRST_DATE,
217-
data: PSC_VERIFICATION_RLE_RESOURCE,
218-
links: {
219-
self: SELF_LINK,
220-
validation_status: `${SELF_LINK}/validation_status`
221-
}
222-
};
223-
224139
export const mockPlannedMaintenanceResource: PlannedMaintenance = {
225140
status: "UP",
226141
message: "",
@@ -267,19 +182,6 @@ export const mockPscVerificationIndResponse = {
267182
401: { status: StatusCodes.UNAUTHORIZED, error: ReasonPhrases.UNAUTHORIZED },
268183
404: { status: StatusCodes.NOT_FOUND, error: ReasonPhrases.NOT_FOUND }
269184
};
270-
export const mockPscVerificationRleResponse = {
271-
200: { status: StatusCodes.OK, body: mockPscVerificationRleResource },
272-
401: { status: StatusCodes.UNAUTHORIZED, error: ReasonPhrases.UNAUTHORIZED },
273-
404: { status: StatusCodes.NOT_FOUND, error: ReasonPhrases.NOT_FOUND }
274-
};
275-
276-
export const mockPscVerificationPatchRleResponse = {
277-
200: { status: StatusCodes.OK, body: mockPscVerificationPatchRleRoResource },
278-
400: { status: StatusCodes.BAD_REQUEST, error: ReasonPhrases.BAD_REQUEST },
279-
401: { status: StatusCodes.UNAUTHORIZED, error: ReasonPhrases.UNAUTHORIZED },
280-
404: { status: StatusCodes.NOT_FOUND, error: ReasonPhrases.NOT_FOUND },
281-
415: { status: StatusCodes.UNSUPPORTED_MEDIA_TYPE, error: ReasonPhrases.UNSUPPORTED_MEDIA_TYPE }
282-
};
283185

284186
export const mockPscVerificationPatchIndResponse = {
285187
200: { status: StatusCodes.OK, body: mockPscVerificationPatchIndResource },

‎test/services/psc-verification-link/service.spec.ts‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as sinon from "sinon";
55
import PscVerificationService from "../../../src/services/psc-verification-link/service";
66
import { PlannedMaintenance, PscVerification, ValidationStatusResponse } from "../../../src/services/psc-verification-link/types";
77
import Resource, { ApiErrorResponse, ApiResponse } from "../../../src/services/resource";
8-
import { COMPANY_NUMBER, FILING_ID, PSC_VERIFICATION_CREATED, PSC_VERIFICATION_ID, PSC_VERIFICATION_IND, PSC_VERIFICATION_RLE, TRANSACTION_ID, mockPlannedMaintenanceResource, mockPlannedMaintenanceResponse, mockGetValidationStatusResponseErrors, mockGetValidationStatusResponse, mockPscVerificationCreated, mockPscVerificationCreatedResponse, mockPscVerificationInd, mockPscVerificationIndResponse, mockPscVerificationPatchInd, mockPscVerificationPatchIndResponse, mockPscVerificationPatchRleResponse, mockPscVerificationPatchRleRo, requestClient, mockValidationStatusResponseValid, mockValidationStatusResponseErrors } from "./service.mock";
8+
import { COMPANY_NUMBER, FILING_ID, PSC_VERIFICATION_CREATED, PSC_VERIFICATION_ID, PSC_VERIFICATION_IND, TRANSACTION_ID, mockPlannedMaintenanceResource, mockPlannedMaintenanceResponse, mockGetValidationStatusResponseErrors, mockGetValidationStatusResponse, mockPscVerificationCreated, mockPscVerificationCreatedResponse, mockPscVerificationInd, mockPscVerificationIndResponse, mockPscVerificationPatchInd, mockPscVerificationPatchIndResponse, requestClient, mockValidationStatusResponseValid, mockValidationStatusResponseErrors } from "./service.mock";
99

1010
describe("PSC Verification Link", () => {
1111
const pscService = new PscVerificationService(requestClient);
@@ -92,19 +92,6 @@ describe("PSC Verification Link", () => {
9292
expect(response.resource).to.eql(mockPscVerificationPatchInd);
9393
});
9494

95-
it("should return a status 200 OK and patched PSC RLE verification filing", async () => {
96-
sinon.stub(requestClient, "httpPatch").resolves(mockPscVerificationPatchRleResponse[200]);
97-
98-
const response = (await pscService.patchPscVerification(
99-
TRANSACTION_ID,
100-
FILING_ID,
101-
PSC_VERIFICATION_RLE
102-
)) as Resource<PscVerification>;
103-
104-
expect(response.httpStatusCode).to.equal(StatusCodes.OK);
105-
expect(response.resource).to.eql(mockPscVerificationPatchRleRo);
106-
});
107-
10895
it("should return a status 401 Unauthorised on unauthorised access", async () => {
10996
sinon.stub(requestClient, "httpPatch").resolves(mockPscVerificationPatchIndResponse[401]);
11097

@@ -117,32 +104,6 @@ describe("PSC Verification Link", () => {
117104
expect(response.httpStatusCode).to.equal(StatusCodes.UNAUTHORIZED);
118105
expect(response.errors?.[0]).to.equal(ReasonPhrases.UNAUTHORIZED);
119106
});
120-
121-
it("should return a status 404 Not Found if resource id not found", async () => {
122-
sinon.stub(requestClient, "httpPatch").resolves(mockPscVerificationPatchRleResponse[404]);
123-
124-
const response = await pscService.patchPscVerification(
125-
TRANSACTION_ID,
126-
FILING_ID,
127-
PSC_VERIFICATION_RLE
128-
) as ApiErrorResponse;
129-
130-
expect(response.httpStatusCode).to.equal(StatusCodes.NOT_FOUND);
131-
expect(response.errors?.[0]).to.equal(ReasonPhrases.NOT_FOUND);
132-
});
133-
134-
it("should return a status 415 unsupported media type when the 'content-type' is not 'application/merge-patch+json'", async () => {
135-
sinon.stub(requestClient, "httpPatch").resolves(mockPscVerificationPatchRleResponse[415]);
136-
137-
const response = await pscService.patchPscVerification(
138-
TRANSACTION_ID,
139-
FILING_ID,
140-
PSC_VERIFICATION_RLE
141-
) as ApiErrorResponse;
142-
143-
expect(response.httpStatusCode).to.equal(StatusCodes.UNSUPPORTED_MEDIA_TYPE);
144-
expect(response.errors?.[0]).to.equal(ReasonPhrases.UNSUPPORTED_MEDIA_TYPE);
145-
});
146107
});
147108

148109
describe("Validation status GET endpoint", () => {

‎test/services/psc/service.mock.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,6 @@ export const PSC_VERIFICATION_INDV_PATCH: PscVerificationDataResource = {
7171
psc_appointment_id: PSC_ID
7272
};
7373

74-
export const PSC_VERIFICATION_RO_PATCH: PscVerificationDataResource = {
75-
psc_appointment_id: PSC_ID,
76-
relevant_officer: {
77-
name_elements: NAME_ELEMENTS
78-
}
79-
};
80-
8174
export const mockPscVerificationCreatedResponse = {
8275
201: { status: StatusCodes.CREATED, body: mockPscVerificationCreatedResource },
8376
400: { status: StatusCodes.BAD_REQUEST, error: ReasonPhrases.BAD_REQUEST },

0 commit comments

Comments
 (0)