Merge pull request #2528 from govuk-one-login/PYIC-6736-Strategic-app…

…-journey-map Pyic 6736 strategic app journey map
govuk-one-login · Oct 8, 2024 · f356928 · f356928
2 parents b8e5556 + 529b204
commit f356928
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 9 deletions.
diff --git a/api-tests/features/p2-strategic-app.feature b/api-tests/features/p2-strategic-app.feature
@@ -1,33 +1,61 @@
 @Build
 Feature: M2B Strategic App Journeys
 
-  Scenario: MAM journey iphone
+  Scenario: MAM journey declared iphone
     Given I activate the 'strategicApp' feature set
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriage' event
     Then I get a 'pyi-triage-select-device' page response
     When I submit a 'smartphone' event
     Then I get a 'pyi-triage-select-smartphone' page response
     When I submit an 'iphone' event
     Then I get a 'pyi-triage-mobile-download-app' page response with context 'iphone'
 
-  Scenario: MAM journey android
+  Scenario: MAM journey detected iphone
     Given I activate the 'strategicApp' feature set
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriageIphone' event
+    Then I get a 'pyi-triage-mobile-confirm' page response
+    When I submit an 'next' event
+    Then I get a 'pyi-triage-mobile-download-app' page response with context 'iphone'
+
+  Scenario: MAM journey declared android
+    Given I activate the 'strategicApp' feature set
+    When I start a new 'medium-confidence' journey
+    Then I get a 'page-ipv-identity-document-start' page response
+    When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriage' event
     Then I get a 'pyi-triage-select-device' page response
     When I submit a 'smartphone' event
     Then I get a 'pyi-triage-select-smartphone' page response
     When I submit an 'android' event
     Then I get a 'pyi-triage-mobile-download-app' page response with context 'android'
 
+  Scenario: MAM journey detected android
+    Given I activate the 'strategicApp' feature set
+    When I start a new 'medium-confidence' journey
+    Then I get a 'page-ipv-identity-document-start' page response
+    When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriageAndroid' event
+    Then I get a 'pyi-triage-mobile-confirm' page response
+    When I submit an 'next' event
+    Then I get a 'pyi-triage-mobile-download-app' page response with context 'android'
+
   Scenario: MAM journey no compatible smartphone
     Given I activate the 'strategicApp' feature set
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriage' event
     Then I get a 'pyi-triage-select-device' page response
     When I submit a 'smartphone' event
     Then I get a 'pyi-triage-select-smartphone' page response
@@ -39,6 +67,8 @@ Feature: M2B Strategic App Journeys
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriage' event
     Then I get a 'pyi-triage-select-device' page response
     When I submit a 'computer-or-tablet' event
     Then I get a 'pyi-triage-select-smartphone' page response
@@ -50,6 +80,8 @@ Feature: M2B Strategic App Journeys
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriage' event
     Then I get a 'pyi-triage-select-device' page response
     When I submit a 'computer-or-tablet' event
     Then I get a 'pyi-triage-select-smartphone' page response
@@ -61,6 +93,8 @@ Feature: M2B Strategic App Journeys
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'appTriage' event
+    Then I get a 'identify-device' page response
+    When I submit an 'appTriage' event
     Then I get a 'pyi-triage-select-device' page response
     When I submit a 'computer-or-tablet' event
     Then I get a 'pyi-triage-select-smartphone' page response

diff --git a/api-tests/src/steps/ipv-steps.ts b/api-tests/src/steps/ipv-steps.ts
@@ -225,6 +225,7 @@ Then(
     assert.equal(
       this.lastJourneyEngineResponse.context,
       expectedContext === "null" ? null : expectedContext,
+      `Expected context ${expectedContext} but got ${this.lastJourneyEngineResponse.context}`,
     );
 
     if (clientOAuthSessionIdExists) {

diff --git a/...nt/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml b/...nt/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml
@@ -4,15 +4,21 @@ description: >-
   and handover to the appropriate journey type.
 entryEvents:
   appTriage:
-    targetState: SELECT_DEVICE_PAGE
-  appTriageSmartphone:
-    targetState: MAM_SELECT_SMARTPHONE
-  appTriageSmartphoneIphone:
-    targetState: MOBILE_IPHONE_CONFIRM_PAGE
-  appTriageSmartphoneAndroid:
-    targetState: MOBILE_ANDROID_CONFIRM_PAGE
+    targetState: IDENTIFY_DEVICE
 
 nestedJourneyStates:
+  IDENTIFY_DEVICE:
+    response:
+      type: page
+      pageId: identify-device
+    events:
+      appTriage:
+        targetState: SELECT_DEVICE_PAGE
+      appTriageIphone:
+        targetState: MOBILE_IPHONE_CONFIRM_PAGE
+      appTriageAndroid:
+        targetState: MOBILE_ANDROID_CONFIRM_PAGE
+
   SELECT_DEVICE_PAGE:
     response:
       type: page

diff --git a/...s/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml b/...s/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml
@@ -481,6 +481,7 @@ states:
         checkFeatureFlag:
           strategicAppEnabled:
             targetState: STRATEGIC_APP_TRIAGE
+            targetEntryEvent: appTriage
         checkIfDisabled:
           dcmaw:
             targetJourney: TECHNICAL_ERROR

diff --git a/...s/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml b/...s/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml
@@ -524,6 +524,7 @@ states:
         checkFeatureFlag:
           strategicAppEnabled:
             targetState: STRATEGIC_APP_TRIAGE
+            targetEntryEvent: appTriage
         checkIfDisabled:
           dcmaw:
             targetJourney: TECHNICAL_ERROR

diff --git a/...as/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml b/...as/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml
@@ -82,9 +82,29 @@ states:
     events:
       appTriage:
         targetState: CRI_DCMAW
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      end:
+        targetJourney: INELIGIBLE
+        targetState: INELIGIBLE
+
+  STRATEGIC_APP_TRIAGE:
+    nestedJourney: STRATEGIC_APP_TRIAGE
+    exitEvents:
+      next:
+        targetJourney: TECHNICAL_ERROR
+        targetState: ERROR
       end:
         targetJourney: INELIGIBLE
         targetState: INELIGIBLE
+      multipleDocCheckPage:
+        targetJourney: INELIGIBLE
+        targetState: INELIGIBLE
 
   CRI_DCMAW:
     response:

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
@@ -175,6 +175,10 @@ states:
     events:
       next:
         targetState: DCMAW_GIVEN_ONLY
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE
+            targetEntryEvent: appTriage
 
   RESET_IDENTITY_FAMILY_ONLY:
     response:
@@ -185,6 +189,10 @@ states:
     events:
       next:
         targetState: DCMAW_FAMILY_ONLY
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE
+            targetEntryEvent: appTriage
 
   DCMAW_GIVEN_ONLY:
     response:
@@ -341,6 +349,10 @@ states:
     events:
       next:
         targetState: DCMAW_GIVEN_WITH_ADDRESS
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE
+            targetEntryEvent: appTriage
 
   RESET_IDENTITY_FAMILY_WITH_ADDRESS:
     response:
@@ -351,6 +363,10 @@ states:
     events:
       next:
         targetState: DCMAW_FAMILY_WITH_ADDRESS
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE
+            targetEntryEvent: appTriage
 
   DCMAW_GIVEN_WITH_ADDRESS:
     response:
@@ -430,6 +446,21 @@ states:
         targetJourney: FAILED
         targetState: FAILED_CONFIRM_DETAILS
 
+  # Once the `next` event here is developed it's likely that we'll need to split this into four separate sub-journey
+  # instantiations.
+  STRATEGIC_APP_TRIAGE:
+    nestedJourney: STRATEGIC_APP_TRIAGE
+    exitEvents:
+      next:
+        targetJourney: TECHNICAL_ERROR
+        targetState: ERROR
+      end:
+        targetJourney: FAILED
+        targetState: FAILED_UPDATE_DETAILS
+      multipleDocCheckPage:
+        targetJourney: TECHNICAL_ERROR
+        targetState: ERROR
+
   # SHARED STATES
 
   CHECK_COI_GIVEN: