Persist and retrieve rtn-req set up session values #814

Demwunz · 2024-03-13T10:07:32Z

https://eaflood.atlassian.net/browse/WATER-4384

This PR will allow the application to persist data through the 'return-requirements' journey.

The data will persist in the session until it is cleared by another part of the application.

The data will be used to populate controls and fields so that the user can edit or review, and also for UI updates.

https://eaflood.atlassian.net/browse/WATER-4384 This PR will allow the application to persist data through the 'return-requirements' journey. The data will persist in the session until it is cleared by another part of the application. The data will be used to populate controls and fields so that the user can edit or review, and also for UI updates.

…up-session-values

Demwunz · 2024-03-26T17:26:18Z

This PR also includes minor amends to pages that were worked on in this PR, namely changing UI control names from snake_case to kebab-case.

Also where appropriate, the tests are also split into the respective journeys, either 'no-returns-required' or 'returns-required'. This is because the same view/presenter/service is used, but the output is different when presented on the "Check your Answers" page or the next page in the respective journey.

…up-session-values

Cruikshanks

Cleary, I've just got a head full of NITs!

Awesome work. Ping me if any issues or when updated and I'll jump straight back on and ✅ !

app/presenters/return-requirements/check-your-answers.presenter.js

Cruikshanks · 2024-03-27T11:25:52Z

app/presenters/return-requirements/start-date.presenter.js

@@ -2,7 +2,7 @@

 /**
 * Formats data for the `/return-requirements/{sessionId}/start-date` page
- * @module StartDatedPresenter
+ * @module StartDatePresenter


app/services/return-requirements/check-your-answers.service.js

app/services/return-requirements/submit-no-returns-required.service.js

test/services/return-requirements/submit-purpose.service.test.js

test/services/return-requirements/submit-reason.service.test.js

Cruikshanks · 2024-03-27T11:53:15Z

test/services/return-requirements/submit-start-date.service.test.js

      }
    })
  })

  describe('when called', () => {
-    describe('with a valid payload', () => {
+    describe('with a valid payload for currentStartDate', () => {


Did we mean currentStartDate? Or should this be licenceStartDate?

nice catch, I changed the test but forgot to update that to licenceStartDate

Cruikshanks · 2024-03-27T11:53:45Z

test/services/return-requirements/submit-start-date.service.test.js

@@ -47,29 +69,21 @@ describe('Submit Start Date service', () => {
        }
      })

-      it('fetches the current setup session record', async () => {
-        const result = await SubmitStartDateService.go(session.id, payload)
+      it('saves the submitted value', async () => {


NIT

Suggested change

it('saves the submitted value', async () => {

it('saves the submitted values', async () => {

Cruikshanks · 2024-03-27T11:54:06Z

test/services/return-requirements/submit-start-date.service.test.js

+        }
+      })
+
+      it('saves the submitted value', async () => {


NIT

Suggested change

it('saves the submitted value', async () => {

it('saves the selected option', async () => {

…r.js Co-authored-by: Alan Cruikshanks <[email protected]>

Co-authored-by: Alan Cruikshanks <[email protected]>

…rvice.js Co-authored-by: Alan Cruikshanks <[email protected]>

Co-authored-by: Alan Cruikshanks <[email protected]>

…up-session-values

Cruikshanks

Having properly clocked the context where journey rather than view was being used ( 🤦 ) I think the only thing I have left is about splitting the check your answers tests at the top level; we can get the same result without splitting things at the very top level for the presenter.

test/services/return-requirements/submit-reason.service.test.js

test/services/return-requirements/submit-purpose.service.test.js

Cruikshanks · 2024-04-02T08:56:49Z

test/presenters/return-requirements/check-your-answers.presenter.test.js

I think this comment still applies here

I 💯 agree it's going to make things easier to manage if we test 'check your answers' separately depending on the journey. But I believe we can do this with the same tools and not break a convention. For example

describe('Check Your Answers presenter', () => { describe("when the 'no returns required' journey was selected", () => { // ... }) describe("when the 'returns required' journey was selected", () => { // ... }) })

Amended this

…up-session-values

Cruikshanks · 2024-04-03T19:48:16Z

test/presenters/return-requirements/check-your-answers.presenter.test.js

@@ -12,17 +12,17 @@ const CheckYourAnswersPresenter = require('../../../app/presenters/return-requir

 describe('Check Your Answers presenter - No Returns Required', () => {
  let session
-


This is whitespace we would normally leave in

restored the whitespace

Cruikshanks · 2024-04-03T19:48:52Z

app/services/return-requirements/submit-start-date.service.js

+    await _save(session, payload)
+    return {


This one still doesn't look to be resolved.

test/presenters/return-requirements/check-your-answers.presenter.test.js

Cruikshanks · 2024-04-03T19:50:57Z

Happy to ignore the SonarCloud duplication issue for now. Once we have the journeys complete we can take a more informed view as to what refactoring needs doing.

…er.test.js Co-authored-by: Alan Cruikshanks <[email protected]>

…up-session-values

Cruikshanks

Demwunz self-assigned this Mar 13, 2024

Demwunz added the enhancement New feature or request label Mar 13, 2024

Demwunz and others added 3 commits March 21, 2024 09:44

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

2f817db

…up-session-values

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

e44468c

…up-session-values

feat(app): added persistent data to session

ced8c2f

Demwunz force-pushed the WATER-4384-persist-and-retrieve-rtn-req-set-up-session-values branch from 2c8d44a to ced8c2f Compare March 22, 2024 16:51

feat(app): show date from session

2d238fc

Demwunz force-pushed the WATER-4384-persist-and-retrieve-rtn-req-set-up-session-values branch from 19f9014 to 2d238fc Compare March 22, 2024 17:10

Demwunz and others added 5 commits March 25, 2024 11:40

feat(app): make variable names consistent

2f09376

feat(app): update tests

92629b8

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

d7eb2d8

…up-session-values

feat(app): update check your answers test

72e39cf

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

9ee1e4c

…up-session-values

Demwunz marked this pull request as ready for review March 26, 2024 17:25

Demwunz requested review from Cruikshanks and robertparkinson March 26, 2024 17:28

Demwunz and others added 2 commits March 27, 2024 09:32

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

b000f38

…up-session-values

feat(app): removed unnecessary func

ea7aca2

Cruikshanks requested changes Mar 27, 2024

View reviewed changes

Demwunz and others added 9 commits March 27, 2024 13:38

Update app/presenters/return-requirements/check-your-answers.presente…

abecef4

…r.js Co-authored-by: Alan Cruikshanks <[email protected]>

Update app/presenters/return-requirements/check-your-answers.presente…

dab0558

…r.js Co-authored-by: Alan Cruikshanks <[email protected]>

Update app/services/return-requirements/check-your-answers.service.js

b9dd135

Co-authored-by: Alan Cruikshanks <[email protected]>

Update app/services/return-requirements/submit-no-returns-required.se…

8232caf

…rvice.js Co-authored-by: Alan Cruikshanks <[email protected]>

Update app/services/return-requirements/submit-purpose.service.js

f343dbf

Co-authored-by: Alan Cruikshanks <[email protected]>

Update app/services/return-requirements/submit-reason.service.js

3ee51a5

Co-authored-by: Alan Cruikshanks <[email protected]>

Update app/services/return-requirements/submit-setup.service.js

657a3b2

Co-authored-by: Alan Cruikshanks <[email protected]>

fix(app): simplify test

9a0f94f

fix(app): various test amends

9fe416a

Demwunz requested a review from Cruikshanks March 28, 2024 14:14

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

aa10a68

…up-session-values

Cruikshanks requested changes Apr 2, 2024

View reviewed changes

Demwunz and others added 2 commits April 3, 2024 10:04

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

c37836b

…up-session-values

fix(app): readjusted test for legibility

52d4c20

Demwunz force-pushed the WATER-4384-persist-and-retrieve-rtn-req-set-up-session-values branch from 6d5bdd5 to 52d4c20 Compare April 3, 2024 12:17

Demwunz requested a review from Cruikshanks April 3, 2024 13:27

Cruikshanks requested changes Apr 3, 2024

View reviewed changes

Demwunz and others added 4 commits April 3, 2024 23:51

Update test/presenters/return-requirements/check-your-answers.present…

360806d

…er.test.js Co-authored-by: Alan Cruikshanks <[email protected]>

fix(app): restore whitespace

4826f11

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

2062d14

…up-session-values

fix(app): restore whitespace

065a56f

Demwunz requested a review from Cruikshanks April 4, 2024 08:01

Merge branch 'main' into WATER-4384-persist-and-retrieve-rtn-req-set-…

6b0fd44

…up-session-values

Cruikshanks approved these changes Apr 4, 2024

View reviewed changes

Demwunz merged commit ab8b439 into main Apr 4, 2024
5 of 6 checks passed

Demwunz deleted the WATER-4384-persist-and-retrieve-rtn-req-set-up-session-values branch April 4, 2024 09:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Persist and retrieve rtn-req set up session values #814

Persist and retrieve rtn-req set up session values #814

Demwunz commented Mar 13, 2024

Demwunz commented Mar 26, 2024 •

edited

Loading

Cruikshanks left a comment

Cruikshanks Mar 27, 2024

Cruikshanks Mar 27, 2024

Demwunz Mar 28, 2024

Cruikshanks Mar 27, 2024

Demwunz Mar 28, 2024

Cruikshanks Mar 27, 2024

Demwunz Mar 28, 2024

Cruikshanks left a comment •

edited

Loading

Cruikshanks Apr 2, 2024

Demwunz Apr 4, 2024

Cruikshanks Apr 3, 2024

Demwunz Apr 4, 2024

Cruikshanks Apr 3, 2024

Cruikshanks commented Apr 3, 2024

Cruikshanks left a comment

	it('saves the submitted value', async () => {
	it('saves the submitted values', async () => {

	it('saves the submitted value', async () => {
	it('saves the selected option', async () => {

		@@ -12,17 +12,17 @@ const CheckYourAnswersPresenter = require('../../../app/presenters/return-requir

		describe('Check Your Answers presenter - No Returns Required', () => {
		let session

Persist and retrieve rtn-req set up session values #814

Persist and retrieve rtn-req set up session values #814

Conversation

Demwunz commented Mar 13, 2024

Demwunz commented Mar 26, 2024 • edited Loading

Cruikshanks left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Cruikshanks left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Cruikshanks commented Apr 3, 2024

Cruikshanks left a comment

Choose a reason for hiding this comment

Demwunz commented Mar 26, 2024 •

edited

Loading

Cruikshanks left a comment •

edited

Loading