From f863add034fc9593fade8c32244a0960b965e532 Mon Sep 17 00:00:00 2001 From: Dan Corder Date: Tue, 1 Oct 2024 15:25:07 +0100 Subject: [PATCH 1/6] PYIC-6736: Re-instate app triage steps --- .../nested-journeys/strategic-app-triage.yaml | 6 +- .../journey-maps/new-p1-identity.yaml | 170 ++++++++++++++++++ .../journey-maps/new-p2-identity.yaml | 170 ++++++++++++++++++ .../journey-maps/reverification.yaml | 38 ++++ .../journey-maps/update-name.yaml | 145 +++++++++++++++ 5 files changed, 525 insertions(+), 4 deletions(-) diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml index 62ed26fba0..8258504b2c 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml @@ -5,11 +5,9 @@ description: >- entryEvents: appTriage: targetState: SELECT_DEVICE_PAGE - appTriageSmartphone: - targetState: MAM_SELECT_SMARTPHONE - appTriageSmartphoneIphone: + appTriageIphone: targetState: MOBILE_IPHONE_CONFIRM_PAGE - appTriageSmartphoneAndroid: + appTriageAndroid: targetState: MOBILE_ANDROID_CONFIRM_PAGE nestedJourneyStates: diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml index fe2972a699..6d6160b637 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml @@ -130,6 +130,22 @@ states: checkIfDisabled: dcmaw: targetState: NINO_START_PAGE + appTriageAndroid: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetState: NINO_START_PAGE + appTriageIphone: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetState: NINO_START_PAGE end: targetState: NINO_START_PAGE @@ -281,6 +297,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR f2f: targetJourney: F2F_HAND_OFF targetState: START @@ -299,6 +333,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE_SKIP_MESSAGE @@ -467,6 +519,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -476,6 +546,7 @@ states: type: page pageId: no-photo-id-abandon-find-another-way events: +# PYIC-6736 Delete once core front is updated to use appTriage mobileApp: targetState: CRI_DCMAW checkFeatureFlag: @@ -485,6 +556,33 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriage: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR passport: targetState: WEB_DL_OR_PASSPORT targetEntryEvent: ukPassport @@ -514,6 +612,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -533,6 +649,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: MITIGATION_01_CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: MITIGATION_01_CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetState: MITIGATION_01_F2F_START_PAGE checkIfDisabled: @@ -628,6 +762,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -704,6 +856,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR PYI_POST_OFFICE: response: diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml index 5a72d7969c..adb820ae70 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml @@ -130,6 +130,22 @@ states: checkIfDisabled: dcmaw: targetState: MULTIPLE_DOC_CHECK_PAGE + appTriageAndroid: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetState: MULTIPLE_DOC_CHECK_PAGE + appTriageIphone: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetState: MULTIPLE_DOC_CHECK_PAGE end: targetState: F2F_START_PAGE checkIfDisabled: @@ -297,6 +313,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR f2f: targetJourney: F2F_HAND_OFF targetState: START @@ -315,6 +349,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE_SKIP_MESSAGE @@ -497,6 +549,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -519,6 +589,7 @@ states: type: page pageId: no-photo-id-abandon-find-another-way events: +# PYIC-6736 Delete once core front is updated to use appTriage mobileApp: targetState: CRI_DCMAW checkFeatureFlag: @@ -528,6 +599,33 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriage: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR passport: targetState: WEB_DL_OR_PASSPORT targetEntryEvent: ukPassport @@ -557,6 +655,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -576,6 +692,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: MITIGATION_01_CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: MITIGATION_01_CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetState: MITIGATION_01_F2F_START_PAGE checkIfDisabled: @@ -671,6 +805,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -747,6 +899,24 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: CRI_DCMAW_PYI_ESCAPE + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR PYI_POST_OFFICE: response: diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml index 5a4942f76e..f1fed50111 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml @@ -82,9 +82,47 @@ states: events: appTriage: targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageAndroid: + targetState: CRI_DCMAW + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmawIphone: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + 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 index 5e3c10845f..7423981147 100644 --- 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 @@ -174,7 +174,40 @@ states: resetType: NAME_ONLY_CHANGE events: next: + targetState: STRATEGIC_APP_DETECT_GIVEN_ONLY + + STRATEGIC_APP_DETECT_GIVEN_ONLY: + response: + type: page + pageId: identify-device + events: + appTriage: + targetState: DCMAW_GIVEN_ONLY + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageAndroid: targetState: DCMAW_GIVEN_ONLY + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: DCMAW_GIVEN_ONLY + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR RESET_IDENTITY_FAMILY_ONLY: response: @@ -184,7 +217,40 @@ states: resetType: NAME_ONLY_CHANGE events: next: + targetState: STRATEGIC_APP_DETECT_FAMILY_ONLY + + STRATEGIC_APP_DETECT_FAMILY_ONLY: + response: + type: page + pageId: identify-device + events: + appTriage: + targetState: DCMAW_FAMILY_ONLY + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageAndroid: targetState: DCMAW_FAMILY_ONLY + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: + targetState: DCMAW_FAMILY_ONLY + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR DCMAW_GIVEN_ONLY: response: @@ -340,7 +406,40 @@ states: resetType: ALL events: next: + targetState: STRATEGIC_APP_DETECT_GIVEN_WITH_ADDRESS + + STRATEGIC_APP_DETECT_GIVEN_WITH_ADDRESS: + response: + type: page + pageId: identify-device + events: + appTriage: + targetState: DCMAW_GIVEN_WITH_ADDRESS + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageAndroid: + targetState: DCMAW_GIVEN_WITH_ADDRESS + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: targetState: DCMAW_GIVEN_WITH_ADDRESS + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR RESET_IDENTITY_FAMILY_WITH_ADDRESS: response: @@ -350,7 +449,40 @@ states: resetType: ALL events: next: + targetState: STRATEGIC_APP_DETECT_FAMILY_WITH_ADDRESS + + STRATEGIC_APP_DETECT_FAMILY_WITH_ADDRESS: + response: + type: page + pageId: identify-device + events: + appTriage: + targetState: DCMAW_FAMILY_WITH_ADDRESS + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageAndroid: + targetState: DCMAW_FAMILY_WITH_ADDRESS + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR + appTriageIphone: targetState: DCMAW_FAMILY_WITH_ADDRESS + checkFeatureFlag: + strategicAppEnabled: + targetState: STRATEGIC_APP_TRIAGE + checkIfDisabled: + dcmaw: + targetJourney: TECHNICAL_ERROR + targetState: ERROR DCMAW_GIVEN_WITH_ADDRESS: response: @@ -430,6 +562,19 @@ states: targetJourney: FAILED targetState: FAILED_CONFIRM_DETAILS + 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: From fceb5e3e6f92a99e22f8ea8c18b479848a83216a Mon Sep 17 00:00:00 2001 From: Dan Corder Date: Tue, 1 Oct 2024 15:25:51 +0100 Subject: [PATCH 2/6] PYIC-6736: Update API tests --- api-tests/features/p2-strategic-app.feature | 20 +++++++++++++++++-- .../p2-repeat-fraud-check-failure.feature | 2 ++ .../p2-repeat-fraud-check.feature | 8 ++++++++ .../p2-reuse-update-details-failure.feature | 2 ++ .../p2-reuse-update-details.feature | 10 ++++++++++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/api-tests/features/p2-strategic-app.feature b/api-tests/features/p2-strategic-app.feature index 00948a554a..f22938492c 100644 --- a/api-tests/features/p2-strategic-app.feature +++ b/api-tests/features/p2-strategic-app.feature @@ -1,7 +1,7 @@ @Build Feature: M2B Strategic App Journeys - Scenario: MAM journey iphone + Scenario: MAM journey declared iphone Given I start a new 'medium-confidence' journey with feature set 'strategicApp' Then I get a 'page-ipv-identity-document-start' page response When I submit an 'appTriage' event @@ -11,7 +11,15 @@ Feature: M2B Strategic App Journeys 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 start a new 'medium-confidence' journey with feature set 'strategicApp' + Then I get a 'page-ipv-identity-document-start' 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 + + Scenario: MAM journey declared android Given I start a new 'medium-confidence' journey with feature set 'strategicApp' Then I get a 'page-ipv-identity-document-start' page response When I submit an 'appTriage' event @@ -21,6 +29,14 @@ Feature: M2B Strategic App Journeys 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 start a new 'medium-confidence' journey with feature set 'strategicApp' + Then I get a 'page-ipv-identity-document-start' 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 + Scenario: MAM journey no compatible smartphone Given I start a new 'medium-confidence' journey with feature set 'strategicApp' Then I get a 'page-ipv-identity-document-start' page response diff --git a/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature index 5f455a99e9..776e335ec4 100644 --- a/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature +++ b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature @@ -16,6 +16,8 @@ Feature: Repeat fraud check failures When I submit a 'given-names-only' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit an 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response @FastFollow diff --git a/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature index 521db8f0f5..6908e92fcf 100644 --- a/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature +++ b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature @@ -28,6 +28,8 @@ Feature: Repeat fraud check journeys When I submit a 'given-names-only' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-passport-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -47,6 +49,8 @@ Feature: Repeat fraud check journeys When I submit a 'family-name-only' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -81,6 +85,8 @@ Feature: Repeat fraud check journeys When I submit a 'family-name-and-address' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' @@ -102,6 +108,8 @@ Feature: Repeat fraud check journeys When I submit a 'given-names-and-address' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' diff --git a/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature b/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature index 598ba2b6c8..f14223ae19 100644 --- a/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature +++ b/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature @@ -16,6 +16,8 @@ Feature: Identity reuse update details failures When I submit a 'given-names-only' event Then I get a 'page-update-name' page response When I submit an 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response @FastFollow diff --git a/api-tests/features/reuse-update-details/p2-reuse-update-details.feature b/api-tests/features/reuse-update-details/p2-reuse-update-details.feature index 4d08c1e5b2..c6d420236f 100644 --- a/api-tests/features/reuse-update-details/p2-reuse-update-details.feature +++ b/api-tests/features/reuse-update-details/p2-reuse-update-details.feature @@ -16,6 +16,8 @@ Feature: Identity reuse update details When I submit a 'given-names-only' event Then I get a 'page-update-name' page response When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -29,6 +31,8 @@ Feature: Identity reuse update details When I submit a 'given-names-only' event Then I get a 'page-update-name' page response When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -46,6 +50,8 @@ Feature: Identity reuse update details When I submit a 'family-name-only' event Then I get a 'page-update-name' page response When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -76,6 +82,8 @@ Feature: Identity reuse update details When I submit a 'family-name-and-address' event Then I get a 'page-update-name' page response When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' @@ -96,6 +104,8 @@ Feature: Identity reuse update details When I submit a 'given-names-and-address' event Then I get a 'page-update-name' page response When I submit a 'update-name' event + Then I get a 'identify-device' page response + When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' From fca1383b266c75ceac64594939dadb4cc29d6927 Mon Sep 17 00:00:00 2001 From: Dan Corder Date: Wed, 2 Oct 2024 15:41:52 +0100 Subject: [PATCH 3/6] PYIC-6736: Fix tests --- api-tests/features/p2-strategic-app.feature | 4 ++-- api-tests/src/steps/ipv-steps.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api-tests/features/p2-strategic-app.feature b/api-tests/features/p2-strategic-app.feature index f22938492c..7d6ecd7a4b 100644 --- a/api-tests/features/p2-strategic-app.feature +++ b/api-tests/features/p2-strategic-app.feature @@ -17,7 +17,7 @@ Feature: M2B Strategic App Journeys 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 + Then I get a 'pyi-triage-mobile-download-app' page response with context 'iphone' Scenario: MAM journey declared android Given I start a new 'medium-confidence' journey with feature set 'strategicApp' @@ -35,7 +35,7 @@ Feature: M2B Strategic App Journeys 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 + Then I get a 'pyi-triage-mobile-download-app' page response with context 'android' Scenario: MAM journey no compatible smartphone Given I start a new 'medium-confidence' journey with feature set 'strategicApp' diff --git a/api-tests/src/steps/ipv-steps.ts b/api-tests/src/steps/ipv-steps.ts index 6de9ab3bec..d59b59c897 100644 --- a/api-tests/src/steps/ipv-steps.ts +++ b/api-tests/src/steps/ipv-steps.ts @@ -245,6 +245,7 @@ Then( assert.equal( this.lastJourneyEngineResponse.context, expectedContext === "null" ? null : expectedContext, + `Expected context ${expectedContext} but got ${this.lastJourneyEngineResponse.context}` ); if (clientOAuthSessionIdExists) { From c1c72fed64315ee116855a0d9c86ab75db4b5872 Mon Sep 17 00:00:00 2001 From: Dan Corder Date: Wed, 2 Oct 2024 15:46:01 +0100 Subject: [PATCH 4/6] PYIC-6736: Run prettier --- api-tests/src/steps/ipv-steps.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-tests/src/steps/ipv-steps.ts b/api-tests/src/steps/ipv-steps.ts index d59b59c897..d5a73192ac 100644 --- a/api-tests/src/steps/ipv-steps.ts +++ b/api-tests/src/steps/ipv-steps.ts @@ -245,7 +245,7 @@ Then( assert.equal( this.lastJourneyEngineResponse.context, expectedContext === "null" ? null : expectedContext, - `Expected context ${expectedContext} but got ${this.lastJourneyEngineResponse.context}` + `Expected context ${expectedContext} but got ${this.lastJourneyEngineResponse.context}`, ); if (clientOAuthSessionIdExists) { From dd630faa98c812af0fdfb8928e0462eb8b203557 Mon Sep 17 00:00:00 2001 From: Dan Corder Date: Fri, 4 Oct 2024 10:13:48 +0100 Subject: [PATCH 5/6] PYIC-6736: Send all strategic app routes through the identify-device page --- api-tests/features/p2-strategic-app.feature | 16 ++ .../p2-repeat-fraud-check-failure.feature | 2 - .../p2-repeat-fraud-check.feature | 8 - .../p2-reuse-update-details-failure.feature | 2 - .../p2-reuse-update-details.feature | 10 -- .../nested-journeys/strategic-app-triage.yaml | 18 +- .../journey-maps/new-p1-identity.yaml | 160 ------------------ .../journey-maps/new-p2-identity.yaml | 160 ------------------ .../journey-maps/reverification.yaml | 18 -- .../journey-maps/update-name.yaml | 126 +------------- 10 files changed, 35 insertions(+), 485 deletions(-) diff --git a/api-tests/features/p2-strategic-app.feature b/api-tests/features/p2-strategic-app.feature index ce019636aa..ba980d1987 100644 --- a/api-tests/features/p2-strategic-app.feature +++ b/api-tests/features/p2-strategic-app.feature @@ -6,6 +6,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 'smartphone' event Then I get a 'pyi-triage-select-smartphone' page response @@ -16,6 +18,8 @@ Feature: M2B Strategic App Journeys 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 @@ -26,6 +30,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 'smartphone' event Then I get a 'pyi-triage-select-smartphone' page response @@ -36,6 +42,8 @@ Feature: M2B Strategic App Journeys 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 @@ -46,6 +54,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 'smartphone' event Then I get a 'pyi-triage-select-smartphone' page response @@ -57,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 @@ -68,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 @@ -79,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/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature index 776e335ec4..5f455a99e9 100644 --- a/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature +++ b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check-failure.feature @@ -16,8 +16,6 @@ Feature: Repeat fraud check failures When I submit a 'given-names-only' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit an 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response @FastFollow diff --git a/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature index 6908e92fcf..521db8f0f5 100644 --- a/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature +++ b/api-tests/features/repeat-fraud-check/p2-repeat-fraud-check.feature @@ -28,8 +28,6 @@ Feature: Repeat fraud check journeys When I submit a 'given-names-only' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-passport-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -49,8 +47,6 @@ Feature: Repeat fraud check journeys When I submit a 'family-name-only' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -85,8 +81,6 @@ Feature: Repeat fraud check journeys When I submit a 'family-name-and-address' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' @@ -108,8 +102,6 @@ Feature: Repeat fraud check journeys When I submit a 'given-names-and-address' event Then I get a 'page-update-name' page response with context 'repeatFraudCheck' When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' diff --git a/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature b/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature index f14223ae19..598ba2b6c8 100644 --- a/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature +++ b/api-tests/features/reuse-update-details/p2-reuse-update-details-failure.feature @@ -16,8 +16,6 @@ Feature: Identity reuse update details failures When I submit a 'given-names-only' event Then I get a 'page-update-name' page response When I submit an 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response @FastFollow diff --git a/api-tests/features/reuse-update-details/p2-reuse-update-details.feature b/api-tests/features/reuse-update-details/p2-reuse-update-details.feature index c6d420236f..4d08c1e5b2 100644 --- a/api-tests/features/reuse-update-details/p2-reuse-update-details.feature +++ b/api-tests/features/reuse-update-details/p2-reuse-update-details.feature @@ -16,8 +16,6 @@ Feature: Identity reuse update details When I submit a 'given-names-only' event Then I get a 'page-update-name' page response When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -31,8 +29,6 @@ Feature: Identity reuse update details When I submit a 'given-names-only' event Then I get a 'page-update-name' page response When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -50,8 +46,6 @@ Feature: Identity reuse update details When I submit a 'family-name-only' event Then I get a 'page-update-name' page response When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiNoAddress' @@ -82,8 +76,6 @@ Feature: Identity reuse update details When I submit a 'family-name-and-address' event Then I get a 'page-update-name' page response When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-family-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' @@ -104,8 +96,6 @@ Feature: Identity reuse update details When I submit a 'given-names-and-address' event Then I get a 'page-update-name' page response When I submit a 'update-name' event - Then I get a 'identify-device' page response - When I submit an 'appTriage' event Then I get a 'dcmaw' CRI response When I submit 'kenneth-changed-given-name-driving-permit-valid' details to the CRI stub Then I get a 'page-dcmaw-success' page response with context 'coiAddress' diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml index 8258504b2c..a628a619c0 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/nested-journeys/strategic-app-triage.yaml @@ -4,13 +4,21 @@ description: >- and handover to the appropriate journey type. entryEvents: appTriage: - targetState: SELECT_DEVICE_PAGE - appTriageIphone: - targetState: MOBILE_IPHONE_CONFIRM_PAGE - appTriageAndroid: - 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/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml index 6d6160b637..504e6670e9 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml @@ -130,22 +130,6 @@ states: checkIfDisabled: dcmaw: targetState: NINO_START_PAGE - appTriageAndroid: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetState: NINO_START_PAGE - appTriageIphone: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetState: NINO_START_PAGE end: targetState: NINO_START_PAGE @@ -297,24 +281,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR f2f: targetJourney: F2F_HAND_OFF targetState: START @@ -333,24 +299,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE_SKIP_MESSAGE @@ -519,24 +467,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -565,24 +495,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR passport: targetState: WEB_DL_OR_PASSPORT targetEntryEvent: ukPassport @@ -612,24 +524,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -649,24 +543,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: MITIGATION_01_CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: MITIGATION_01_CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetState: MITIGATION_01_F2F_START_PAGE checkIfDisabled: @@ -762,24 +638,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -856,24 +714,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR PYI_POST_OFFICE: response: diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml index adb820ae70..c7af4642bc 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml @@ -130,22 +130,6 @@ states: checkIfDisabled: dcmaw: targetState: MULTIPLE_DOC_CHECK_PAGE - appTriageAndroid: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetState: MULTIPLE_DOC_CHECK_PAGE - appTriageIphone: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetState: MULTIPLE_DOC_CHECK_PAGE end: targetState: F2F_START_PAGE checkIfDisabled: @@ -313,24 +297,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR f2f: targetJourney: F2F_HAND_OFF targetState: START @@ -349,24 +315,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE_SKIP_MESSAGE @@ -549,24 +497,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -608,24 +538,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR passport: targetState: WEB_DL_OR_PASSPORT targetEntryEvent: ukPassport @@ -655,24 +567,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -692,24 +586,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: MITIGATION_01_CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: MITIGATION_01_CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: MITIGATION_01_STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetState: MITIGATION_01_F2F_START_PAGE checkIfDisabled: @@ -805,24 +681,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE @@ -899,24 +757,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW_PYI_ESCAPE - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR PYI_POST_OFFICE: response: diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml index f1fed50111..93e9386b8d 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml @@ -89,24 +89,6 @@ states: dcmaw: targetJourney: TECHNICAL_ERROR targetState: ERROR - appTriageAndroid: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmawIphone: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR end: targetJourney: INELIGIBLE targetState: INELIGIBLE 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 index 7423981147..bf6ab72138 100644 --- 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 @@ -174,40 +174,11 @@ states: resetType: NAME_ONLY_CHANGE events: next: - targetState: STRATEGIC_APP_DETECT_GIVEN_ONLY - - STRATEGIC_APP_DETECT_GIVEN_ONLY: - response: - type: page - pageId: identify-device - events: - appTriage: - targetState: DCMAW_GIVEN_ONLY - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageAndroid: - targetState: DCMAW_GIVEN_ONLY - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: targetState: DCMAW_GIVEN_ONLY checkFeatureFlag: strategicAppEnabled: targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR + targetEntryEvent: appTriage RESET_IDENTITY_FAMILY_ONLY: response: @@ -217,40 +188,11 @@ states: resetType: NAME_ONLY_CHANGE events: next: - targetState: STRATEGIC_APP_DETECT_FAMILY_ONLY - - STRATEGIC_APP_DETECT_FAMILY_ONLY: - response: - type: page - pageId: identify-device - events: - appTriage: - targetState: DCMAW_FAMILY_ONLY - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageAndroid: - targetState: DCMAW_FAMILY_ONLY - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: targetState: DCMAW_FAMILY_ONLY checkFeatureFlag: strategicAppEnabled: targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR + targetEntryEvent: appTriage DCMAW_GIVEN_ONLY: response: @@ -406,40 +348,11 @@ states: resetType: ALL events: next: - targetState: STRATEGIC_APP_DETECT_GIVEN_WITH_ADDRESS - - STRATEGIC_APP_DETECT_GIVEN_WITH_ADDRESS: - response: - type: page - pageId: identify-device - events: - appTriage: - targetState: DCMAW_GIVEN_WITH_ADDRESS - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageAndroid: - targetState: DCMAW_GIVEN_WITH_ADDRESS - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: targetState: DCMAW_GIVEN_WITH_ADDRESS checkFeatureFlag: strategicAppEnabled: targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR + targetEntryEvent: appTriage RESET_IDENTITY_FAMILY_WITH_ADDRESS: response: @@ -449,40 +362,11 @@ states: resetType: ALL events: next: - targetState: STRATEGIC_APP_DETECT_FAMILY_WITH_ADDRESS - - STRATEGIC_APP_DETECT_FAMILY_WITH_ADDRESS: - response: - type: page - pageId: identify-device - events: - appTriage: - targetState: DCMAW_FAMILY_WITH_ADDRESS - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageAndroid: - targetState: DCMAW_FAMILY_WITH_ADDRESS - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriageIphone: targetState: DCMAW_FAMILY_WITH_ADDRESS checkFeatureFlag: strategicAppEnabled: targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR + targetEntryEvent: appTriage DCMAW_GIVEN_WITH_ADDRESS: response: @@ -562,6 +446,8 @@ 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: From 529b2047cb6a39a6ec38ad60a6be3ed6337de06f Mon Sep 17 00:00:00 2001 From: Dan Corder Date: Fri, 4 Oct 2024 15:29:13 +0100 Subject: [PATCH 6/6] PYIC-6736: Use entry event mapping to avoid needing to change event name --- .../statemachine/journey-maps/new-p1-identity.yaml | 11 +---------- .../statemachine/journey-maps/new-p2-identity.yaml | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml index 504e6670e9..a2483664b1 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml @@ -476,21 +476,12 @@ states: type: page pageId: no-photo-id-abandon-find-another-way events: -# PYIC-6736 Delete once core front is updated to use appTriage mobileApp: targetState: CRI_DCMAW checkFeatureFlag: strategicAppEnabled: targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriage: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE + targetEntryEvent: appTriage checkIfDisabled: dcmaw: targetJourney: TECHNICAL_ERROR diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml index c7af4642bc..25b32a9d10 100644 --- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml +++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml @@ -519,21 +519,12 @@ states: type: page pageId: no-photo-id-abandon-find-another-way events: -# PYIC-6736 Delete once core front is updated to use appTriage mobileApp: targetState: CRI_DCMAW checkFeatureFlag: strategicAppEnabled: targetState: STRATEGIC_APP_TRIAGE - checkIfDisabled: - dcmaw: - targetJourney: TECHNICAL_ERROR - targetState: ERROR - appTriage: - targetState: CRI_DCMAW - checkFeatureFlag: - strategicAppEnabled: - targetState: STRATEGIC_APP_TRIAGE + targetEntryEvent: appTriage checkIfDisabled: dcmaw: targetJourney: TECHNICAL_ERROR