From 29140af4ac52306de07d3e102acf8974d7b2acc4 Mon Sep 17 00:00:00 2001 From: jonathangoulding Date: Mon, 24 Jun 2024 15:41:46 +0100 Subject: [PATCH] Fix default licence view createdBy https://eaflood.atlassian.net/jira/software/c/projects/WATER/boards/96?selectedIssue=WATER-4422 When a return version does not have a user linked to the record the default string should be "Migrated from NALD". The assumption is a user can not create a return unless they are logged in. When the return is saved the user will be captured and stored in the createBty column. Therefore, if the created by field is null then it is safe to assume the data has been migrated from NALD. --- app/presenters/return-requirements/view.presenter.js | 2 +- test/presenters/return-requirements/view.presenter.test.js | 6 +++--- test/services/return-requirements/view.service.test.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/presenters/return-requirements/view.presenter.js b/app/presenters/return-requirements/view.presenter.js index 83479b9829..4aaf92de1e 100644 --- a/app/presenters/return-requirements/view.presenter.js +++ b/app/presenters/return-requirements/view.presenter.js @@ -36,7 +36,7 @@ function go (requirementsForReturns) { startDate: formatLongDate(startDate), status: _status(status), createdDate: formatLongDate(createdAt), - createdBy: user ? user.username : '' + createdBy: user ? user.username : 'Migrated from NALD' } } diff --git a/test/presenters/return-requirements/view.presenter.test.js b/test/presenters/return-requirements/view.presenter.test.js index 568022f063..7a9d8f9569 100644 --- a/test/presenters/return-requirements/view.presenter.test.js +++ b/test/presenters/return-requirements/view.presenter.test.js @@ -84,7 +84,7 @@ describe('Return Requirements - View presenter', () => { additionalSubmissionOptions: { multipleUpload: 'No' }, - createdBy: '', + createdBy: 'Migrated from NALD', createdDate: '1 December 2020', licenceId: 'c32ab7c6-e342-47b2-9c2e-d178ca89c5e5', licenceRef: '02/01', @@ -116,10 +116,10 @@ describe('Return Requirements - View presenter', () => { describe('the "createdBy" property', () => { describe('and there is no user linked to the return', () => { - it('returns an empty string', () => { + it('returns "Migrated from NALD" ', () => { const result = ViewPresenter.go(requirementsForReturns) - expect(result.createdBy).to.equal('') + expect(result.createdBy).to.equal('Migrated from NALD') }) }) describe('and there is a user linked to the return', () => { diff --git a/test/services/return-requirements/view.service.test.js b/test/services/return-requirements/view.service.test.js index 941bf3214b..3557ccdee0 100644 --- a/test/services/return-requirements/view.service.test.js +++ b/test/services/return-requirements/view.service.test.js @@ -41,7 +41,7 @@ describe('Return Requirements - View service', () => { additionalSubmissionOptions: { multipleUpload: 'No' }, - createdBy: '', + createdBy: 'Migrated from NALD', createdDate: returnVersion.createdAt.toLocaleDateString('en-GB', { year: 'numeric', month: 'long', day: 'numeric' }), licenceId: licence.id, licenceRef: result.licenceRef,