Merge pull request #1939 from govuk-one-login/bau-fix-back-from-rfc

BAU: Fix back after repeat fraud check
govuk-one-login · May 22, 2024 · 6fe36f1 · 6fe36f1
2 parents 618797a + 0d20ec0
commit 6fe36f1
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/...rocess-journey-event/src/main/resources/statemachine/journey-maps/repeat-fraud-check.yaml b/...rocess-journey-event/src/main/resources/statemachine/journey-maps/repeat-fraud-check.yaml
@@ -60,16 +60,16 @@ states:
         targetState: UPDATE_NAME_DOB
       given-names-only:
         targetJourney: UPDATE_NAME
-        targetState: UPDATE_NAME_WITHOUT_ADDRESS_START
+        targetState: UPDATE_NAME_WITHOUT_ADDRESS_AFTER_RFC_START
       family-name-only:
         targetJourney: UPDATE_NAME
-        targetState: UPDATE_NAME_WITHOUT_ADDRESS_START
+        targetState: UPDATE_NAME_WITHOUT_ADDRESS_AFTER_RFC_START
       given-names-and-address:
         targetJourney: UPDATE_NAME
-        targetState: UPDATE_NAME_WITH_ADDRESS_START
+        targetState: UPDATE_NAME_WITH_ADDRESS_AFTER_RFC_START
       family-name-and-address:
         targetJourney: UPDATE_NAME
-        targetState: UPDATE_NAME_WITH_ADDRESS_START
+        targetState: UPDATE_NAME_WITH_ADDRESS_AFTER_RFC_START
       next:
         targetState: FRAUD_CHECK_RFC
 

diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/update-name.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/update-name.yaml
@@ -7,15 +7,25 @@ description: >-
 states:
 # Entry points
 
-  UPDATE_NAME_WITH_ADDRESS_START:
+  UPDATE_NAME_WITH_ADDRESS_AFTER_REUSE_START:
     events:
       next:
-        targetState: UPDATE_NAME_PAGE_WITH_ADDRESS
+        targetState: UPDATE_NAME_PAGE_WITH_ADDRESS_AFTER_REUSE
 
-  UPDATE_NAME_WITHOUT_ADDRESS_START:
+  UPDATE_NAME_WITH_ADDRESS_AFTER_RFC_START:
     events:
       next:
-        targetState: UPDATE_NAME_PAGE_WITHOUT_ADDRESS
+        targetState: UPDATE_NAME_PAGE_WITH_ADDRESS_AFTER_RFC
+
+  UPDATE_NAME_WITHOUT_ADDRESS_AFTER_REUSE_START:
+    events:
+      next:
+        targetState: UPDATE_NAME_PAGE_WITHOUT_ADDRESS_AFTER_REUSE
+
+  UPDATE_NAME_WITHOUT_ADDRESS_AFTER_RFC_START:
+    events:
+      next:
+        targetState: UPDATE_NAME_PAGE_WITHOUT_ADDRESS_AFTER_RFC
 
   # Parent States
 
@@ -53,7 +63,7 @@ states:
 
    # WITHOUT ADDRESS
 
-  UPDATE_NAME_PAGE_WITHOUT_ADDRESS:
+  UPDATE_NAME_PAGE_WITHOUT_ADDRESS_AFTER_REUSE:
     response:
       type: page
       pageId: page-update-name
@@ -66,6 +76,19 @@ states:
         targetJourney: REUSE_EXISTING_IDENTITY
         targetState: UPDATE_DETAILS_START
 
+  UPDATE_NAME_PAGE_WITHOUT_ADDRESS_AFTER_RFC:
+    response:
+      type: page
+      pageId: page-update-name
+    events:
+      update-name:
+        targetState: RESET_IDENTITY_WITHOUT_ADDRESS
+      end:
+        targetState: RETURN_TO_RP
+      back:
+        targetJourney: REPEAT_FRAUD_CHECK
+        targetState: START
+
   RESET_IDENTITY_WITHOUT_ADDRESS:
     response:
       type: process
@@ -118,7 +141,7 @@ states:
 
   # WITH ADDRESS
 
-  UPDATE_NAME_PAGE_WITH_ADDRESS:
+  UPDATE_NAME_PAGE_WITH_ADDRESS_AFTER_REUSE:
     response:
       type: page
       pageId: page-update-name
@@ -131,6 +154,19 @@ states:
         targetJourney: REUSE_EXISTING_IDENTITY
         targetState: UPDATE_DETAILS_START
 
+  UPDATE_NAME_PAGE_WITH_ADDRESS_AFTER_RFC:
+    response:
+      type: page
+      pageId: page-update-name
+    events:
+      update-name:
+        targetState: RESET_IDENTITY_WITH_ADDRESS
+      end:
+        targetState: RETURN_TO_RP
+      back:
+        targetJourney: REPEAT_FRAUD_CHECK
+        targetState: START
+
   RESET_IDENTITY_WITH_ADDRESS:
     response:
       type: process