Skip to content

Commit 245b628

Browse files
AEPRAEPR
committed
PRSD-1546: Use explicit steps types in state
1 parent 856ac22 commit 245b628

File tree

2 files changed

+30
-31
lines changed

2 files changed

+30
-31
lines changed

‎src/main/kotlin/uk/gov/communities/prsdb/webapp/journeys/example/ExampleState.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
package uk.gov.communities.prsdb.webapp.journeys.example
22

33
import uk.gov.communities.prsdb.webapp.journeys.JourneyState
4-
import uk.gov.communities.prsdb.webapp.journeys.JourneyStep
4+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.CheckEpcStep
5+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcNotFoundStep
6+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcQuestionStep
7+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcSupersededStep
8+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.HouseholdStep
9+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.OccupiedStep
10+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.SearchEpcStep
11+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.TenantsStep
512
import uk.gov.communities.prsdb.webapp.models.dataModels.EpcDataModel
6-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.CheckMatchedEpcFormModel
7-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.EpcFormModel
8-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.EpcLookupFormModel
9-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.NoInputFormModel
10-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.NumberOfHouseholdsFormModel
11-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.NumberOfPeopleFormModel
12-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.OccupancyFormModel
1313

1414
interface OccupiedJourneyState : JourneyState {
15-
val occupied: JourneyStep<*, OccupancyFormModel, *>?
16-
val households: JourneyStep<*, NumberOfHouseholdsFormModel, *>?
17-
val tenants: JourneyStep<*, NumberOfPeopleFormModel, *>?
15+
val occupied: OccupiedStep
16+
val households: HouseholdStep
17+
val tenants: TenantsStep
1818
}
1919

2020
interface EpcJourneyState : JourneyState {
2121
var automatchedEpc: EpcDataModel?
2222
var searchedEpc: EpcDataModel?
2323
val propertyId: Long
2424

25-
val epcQuestion: JourneyStep<*, EpcFormModel, *>?
26-
val checkAutomatchedEpc: JourneyStep<*, CheckMatchedEpcFormModel, *>?
27-
val searchForEpc: JourneyStep<*, EpcLookupFormModel, *>?
28-
val epcNotFound: JourneyStep<*, NoInputFormModel, *>?
29-
val epcSuperseded: JourneyStep<*, NoInputFormModel, *>?
30-
val checkSearchedEpc: JourneyStep<*, CheckMatchedEpcFormModel, *>?
25+
val epcQuestion: EpcQuestionStep
26+
val checkAutomatchedEpc: CheckEpcStep
27+
val searchForEpc: SearchEpcStep
28+
val epcNotFound: EpcNotFoundStep
29+
val epcSuperseded: EpcSupersededStep
30+
val checkSearchedEpc: CheckEpcStep
3131
}

‎src/main/kotlin/uk/gov/communities/prsdb/webapp/journeys/example/FooExampleJourneyFactory.kt‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,28 @@ import uk.gov.communities.prsdb.webapp.annotations.webAnnotations.PrsdbWebServic
99
import uk.gov.communities.prsdb.webapp.journeys.AbstractJourneyState
1010
import uk.gov.communities.prsdb.webapp.journeys.AndParents
1111
import uk.gov.communities.prsdb.webapp.journeys.JourneyStateService
12-
import uk.gov.communities.prsdb.webapp.journeys.JourneyStep
1312
import uk.gov.communities.prsdb.webapp.journeys.NoSuchJourneyException
1413
import uk.gov.communities.prsdb.webapp.journeys.OrParents
1514
import uk.gov.communities.prsdb.webapp.journeys.StepLifecycleOrchestrator
1615
import uk.gov.communities.prsdb.webapp.journeys.always
1716
import uk.gov.communities.prsdb.webapp.journeys.builders.JourneyBuilder.Companion.journey
17+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.CheckEpcStep
1818
import uk.gov.communities.prsdb.webapp.journeys.example.steps.CheckEpcStepConfig
1919
import uk.gov.communities.prsdb.webapp.journeys.example.steps.Complete
2020
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcNotFoundStep
21+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcQuestionStep
2122
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcSearchResult
2223
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcStatus
2324
import uk.gov.communities.prsdb.webapp.journeys.example.steps.EpcSupersededStep
2425
import uk.gov.communities.prsdb.webapp.journeys.example.steps.FooCheckAnswersStep
2526
import uk.gov.communities.prsdb.webapp.journeys.example.steps.FooTaskListStep
27+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.HouseholdStep
28+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.OccupiedStep
29+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.SearchEpcStep
30+
import uk.gov.communities.prsdb.webapp.journeys.example.steps.TenantsStep
2631
import uk.gov.communities.prsdb.webapp.journeys.example.steps.YesOrNo
2732
import uk.gov.communities.prsdb.webapp.journeys.hasOutcome
2833
import uk.gov.communities.prsdb.webapp.models.dataModels.EpcDataModel
29-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.CheckMatchedEpcFormModel
30-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.EpcFormModel
31-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.EpcLookupFormModel
32-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.NumberOfHouseholdsFormModel
33-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.NumberOfPeopleFormModel
34-
import uk.gov.communities.prsdb.webapp.models.requestModels.formModels.OccupancyFormModel
3534

3635
@PrsdbWebService
3736
class FooExampleJourneyFactory(
@@ -152,15 +151,15 @@ class FooExampleJourneyFactory(
152151
@Scope("prototype")
153152
class FooJourneyState(
154153
val taskListStep: FooTaskListStep,
155-
override val occupied: JourneyStep<YesOrNo, OccupancyFormModel, FooJourneyState>,
156-
override val households: JourneyStep<Complete, NumberOfHouseholdsFormModel, FooJourneyState>,
157-
override val tenants: JourneyStep<Complete, NumberOfPeopleFormModel, FooJourneyState>,
158-
override val epcQuestion: JourneyStep<EpcStatus, EpcFormModel, FooJourneyState>,
159-
override val checkAutomatchedEpc: JourneyStep<YesOrNo, CheckMatchedEpcFormModel, FooJourneyState>,
160-
override val searchForEpc: JourneyStep<EpcSearchResult, EpcLookupFormModel, FooJourneyState>,
154+
override val occupied: OccupiedStep,
155+
override val households: HouseholdStep,
156+
override val tenants: TenantsStep,
157+
override val epcQuestion: EpcQuestionStep,
158+
override val checkAutomatchedEpc: CheckEpcStep,
159+
override val searchForEpc: SearchEpcStep,
161160
override val epcNotFound: EpcNotFoundStep,
162161
override val epcSuperseded: EpcSupersededStep,
163-
override val checkSearchedEpc: JourneyStep<YesOrNo, CheckMatchedEpcFormModel, FooJourneyState>,
162+
override val checkSearchedEpc: CheckEpcStep,
164163
val fooCheckYourAnswersStep: FooCheckAnswersStep,
165164
private val journeyStateService: JourneyStateService,
166165
) : AbstractJourneyState(journeyStateService),

0 commit comments

Comments
 (0)