Skip to content

Commit

Permalink
Commented logic and unit tests regarding checking for NHS Prefix.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MohammadIqbalAD-NHS
MohammadIqbalAD-NHS committed Dec 4, 2023
1 parent fa0a6a0 commit 3da4063
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 74 deletions.
35 changes: 18 additions & 17 deletions src/api/health-record-requests/__tests__/health-record-requests.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,23 +128,24 @@ describe('POST /health-record-requests/:nhsNumber', () => {
});

describe('NHS Number prefix checks', () => {
it('should not allow a health record request and return 404 when nhs number prefix is empty', async () => {
initializeConfig.mockReturnValueOnce({ nhsNumberPrefix: '' });
const res = await request(app).post('/health-record-requests/1234567890').send(body);
expect(res.status).toBe(422);
expect(logWarning).toHaveBeenCalledWith(
'Health record request failed as no nhs number prefix env variable has been set'
);
});

it('should not allow a health record request and return 404 when nhs number prefix is undefined', async () => {
initializeConfig.mockReturnValueOnce({});
const res = await request(app).post('/health-record-requests/1234567890').send(body);
expect(res.status).toBe(422);
expect(logWarning).toHaveBeenCalledWith(
'Health record request failed as no nhs number prefix env variable has been set'
);
});
// TODO: REMOVE THESE TESTS
// it('should not allow a health record request and return 404 when nhs number prefix is empty', async () => {
// initializeConfig.mockReturnValueOnce({ nhsNumberPrefix: '' });
// const res = await request(app).post('/health-record-requests/1234567890').send(body);
// expect(res.status).toBe(422);
// expect(logWarning).toHaveBeenCalledWith(
// 'Health record request failed as no nhs number prefix env variable has been set'
// );
// });
//
// it('should not allow a health record request and return 404 when nhs number prefix is undefined', async () => {
// initializeConfig.mockReturnValueOnce({});
// const res = await request(app).post('/health-record-requests/1234567890').send(body);
// expect(res.status).toBe(422);
// expect(logWarning).toHaveBeenCalledWith(
// 'Health record request failed as no nhs number prefix env variable has been set'
// );
// });

it('should not allow a health record request when the nhs number does not start with the expected prefix', async () => {
initializeConfig.mockReturnValueOnce({ nhsNumberPrefix: '999' });
Expand Down
7 changes: 5 additions & 2 deletions src/api/health-record-requests/health-record-requests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,11 @@ export const buildEhrRequest = async (req, conversationId, practiceAsid) => {

const checkNhsNumberPrefix = (nhsNumberPrefix, nhsNumber) => {
if (!nhsNumberPrefix) {
logWarning('Health record request failed as no nhs number prefix env variable has been set');
return false;
// TODO: Found that previous team has hardcoded checking for synthetic patients only. We need to process real patients.
// logWarning('Health record request failed as no nhs number prefix env variable has been set');
// return false;
logInfo('NhsNumberPrefix has not been set.');
return true;
}
if (!nhsNumber.startsWith(nhsNumberPrefix)) {
logWarning(
Expand Down
53 changes: 27 additions & 26 deletions src/api/patient-demographics/__tests__/pds-update.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,34 @@ describe('POST /patient-demographics/:nhsNumber', () => {
});

describe('NHS Number prefix checks', () => {
it('should not allow a pds update request and return 404 when nhs number prefix is empty', async () => {
initializeConfig.mockReturnValueOnce({ nhsNumberPrefix: '' });
const res = await request(app).patch('/patient-demographics/9442964410').send({
serialChangeNumber: '123',
pdsId: 'cppz',
newOdsCode: '12345',
conversationId: mockUUID
});
expect(res.status).toBe(422);
expect(logWarning).toHaveBeenCalledWith(
'PDS Update request failed as no nhs number prefix env variable has been set'
);
});
// TODO: REMOVE THESE TESTS
// it('should not allow a pds update request and return 404 when nhs number prefix is empty', async () => {
// initializeConfig.mockReturnValueOnce({ nhsNumberPrefix: '' });
// const res = await request(app).patch('/patient-demographics/9442964410').send({
// serialChangeNumber: '123',
// pdsId: 'cppz',
// newOdsCode: '12345',
// conversationId: mockUUID
// });
// expect(res.status).toBe(422);
// expect(logWarning).toHaveBeenCalledWith(
// 'PDS Update request failed as no nhs number prefix env variable has been set'
// );
// });

it('should not allow a pds update request and return 404 when nhs number prefix is undefined', async () => {
initializeConfig.mockReturnValueOnce({});
const res = await request(app).patch('/patient-demographics/9442964410').send({
serialChangeNumber: '123',
pdsId: 'cppz',
newOdsCode: '12345',
conversationId: mockUUID
});
expect(res.status).toBe(422);
expect(logWarning).toHaveBeenCalledWith(
'PDS Update request failed as no nhs number prefix env variable has been set'
);
});
// it('should not allow a pds update request and return 404 when nhs number prefix is undefined', async () => {
// initializeConfig.mockReturnValueOnce({});
// const res = await request(app).patch('/patient-demographics/9442964410').send({
// serialChangeNumber: '123',
// pdsId: 'cppz',
// newOdsCode: '12345',
// conversationId: mockUUID
// });
// expect(res.status).toBe(422);
// expect(logWarning).toHaveBeenCalledWith(
// 'PDS Update request failed as no nhs number prefix env variable has been set'
// );
// });

it('should not allow a pds update request when the nhs number does not start with the expected prefix', async () => {
initializeConfig.mockReturnValueOnce({ nhsNumberPrefix: '999' });
Expand Down
7 changes: 5 additions & 2 deletions src/api/patient-demographics/pds-update.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,11 @@ export const pdsUpdate = async (req, res, next) => {

const checkNhsNumberPrefix = (nhsNumberPrefix, nhsNumber) => {
if (!nhsNumberPrefix) {
logWarning('PDS Update request failed as no nhs number prefix env variable has been set');
return false;
// TODO: Found that previous team has hardcoded checking for synthetic patients only. We need to process real patients.
// logWarning('PDS Update request failed as no nhs number prefix env variable has been set');
// return false;
logInfo('NhsNumberPrefix has not been set.');
return true;
}
if (!nhsNumber.startsWith(nhsNumberPrefix)) {
logWarning(
Expand Down
55 changes: 28 additions & 27 deletions src/services/parser/message/__tests__/update-extract-for-sending.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,34 @@ describe('updateExtractForSending', () => {
);
};

it('should update sender and receiver ASID codes, ODS codes and EHR Request ID in EHR Core', async () => {
// given
const originalEhrExtract = buildInputEhrExtract();
const ehrRequestId = v4();

const expectedEhrExtract = templateEhrExtract(
NEW_RECEIVING_ASID,
NEW_SENDING_ASID,
ehrRequestId,
NEW_AUTHOR_ODS_CODE,
NEW_DEST_ODS_CODE
);

// when
const newEhrExtract = await updateExtractForSending(
originalEhrExtract,
ehrRequestId,
NEW_RECEIVING_ASID,
NEW_AUTHOR_ODS_CODE,
NEW_DEST_ODS_CODE
);

// then
const parsedNewEhrExtract = await new XmlParser().parse(newEhrExtract);
const parsedExpectedEhrExtract = await new XmlParser().parse(expectedEhrExtract);
expect(isEqual(parsedNewEhrExtract, parsedExpectedEhrExtract)).toBe(true);
});
// TODO: REMOVE THESE TESTS
// it('should update sender and receiver ASID codes, ODS codes and EHR Request ID in EHR Core', async () => {
// // given
// const originalEhrExtract = buildInputEhrExtract();
// const ehrRequestId = v4();
//
// const expectedEhrExtract = templateEhrExtract(
// NEW_RECEIVING_ASID,
// NEW_SENDING_ASID,
// ehrRequestId,
// NEW_AUTHOR_ODS_CODE,
// NEW_DEST_ODS_CODE
// );
//
// // when
// const newEhrExtract = await updateExtractForSending(
// originalEhrExtract,
// ehrRequestId,
// NEW_RECEIVING_ASID,
// NEW_AUTHOR_ODS_CODE,
// NEW_DEST_ODS_CODE
// );
//
// // then
// const parsedNewEhrExtract = await new XmlParser().parse(newEhrExtract);
// const parsedExpectedEhrExtract = await new XmlParser().parse(expectedEhrExtract);
// expect(isEqual(parsedNewEhrExtract, parsedExpectedEhrExtract)).toBe(true);
// });

it('should keep escaped special characters (linebreak, apostrophes, quotation marks) unchanged', async () => {
// given
Expand Down

0 comments on commit 3da4063

Please sign in to comment.