Skip to content

Commit

Permalink
Merge pull request #2340 from ministryofjustice/feature/aps-1345-tidy…
Browse files Browse the repository at this point in the history 
…-up-cas1-app-submission-tests

APS-1345 Improve CAS1 App Submission Assessment Auto Allocation Tests
  • Loading branch information
@davidatkinsuk
davidatkinsuk authored Sep 30, 2024
2 parents 6b09d26 + e45b4ce commit 1f42ebd
Show file tree
Hide file tree
Showing 10 changed files with 493 additions and 251 deletions.
2 changes: 1 addition & 1 deletion helm_deploy/values-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ generic-service:
URL-TEMPLATES_API_CAS3_BOOKING-CANCELLED-UPDATED-EVENT-DETAIL: https://approved-premises-api-test.hmpps.service.justice.gov.uk/events/cas3/booking-cancelled-updated/#eventId

USER-ALLOCATIONS_RULES_ESAP-ASSESSMENTS_ENABLED: false
USER-ALLOCATIONS_RULES_ESAP-ASSESSMENTS_PRIORITY: 0
USER-ALLOCATIONS_RULES_ESAP-ASSESSMENTS_PRIORITY: 3
USER-ALLOCATIONS_RULES_ESAP-ASSESSMENTS_ALLOCATE-TO-USER: # TODO: Determine appropriate user
USER-ALLOCATIONS_RULES_EMERGENCY-AND-SHORT-NOTICE-ASSESSMENTS_ENABLED: false
USER-ALLOCATIONS_RULES_EMERGENCY-AND-SHORT-NOTICE-ASSESSMENTS_PRIORITY: 0
Expand Down
1 change: 1 addition & 0 deletions ...ain/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/service/ApplicationService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ class ApplicationService(
val isWomensApplication: Boolean?,
@Deprecated("use apType")
val isPipeApplication: Boolean?,
@Deprecated("use noticeType")
val isEmergencyApplication: Boolean?,
@Deprecated("use apType")
val isEsapApplication: Boolean?,
Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/static/_shared.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1659,10 +1659,14 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -2240,10 +2244,16 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -2284,12 +2294,18 @@ components:
- type: object
properties:
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isWomensApplication:
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if this an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/static/codegen/built-api-spec.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6137,10 +6137,14 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -6718,10 +6722,16 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -6762,12 +6772,18 @@ components:
- type: object
properties:
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isWomensApplication:
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if this an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/static/codegen/built-cas1-api-spec.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2798,10 +2798,14 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -3379,10 +3383,16 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -3423,12 +3433,18 @@ components:
- type: object
properties:
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isWomensApplication:
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if this an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/static/codegen/built-cas2-api-spec.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2250,10 +2250,14 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -2831,10 +2835,16 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -2875,12 +2885,18 @@ components:
- type: object
properties:
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isWomensApplication:
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if this an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/static/codegen/built-cas3-api-spec.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1750,10 +1750,14 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -2331,10 +2335,16 @@ components:
isWomensApplication:
type: boolean
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down Expand Up @@ -2375,12 +2385,18 @@ components:
- type: object
properties:
isPipeApplication:
deprecated: true
description: Use apType
type: boolean
isWomensApplication:
type: boolean
isEmergencyApplication:
deprecated: true
description: noticeType should be used to indicate if this an emergency application
type: boolean
isEsapApplication:
deprecated: true
description: Use apType
type: boolean
apType:
$ref: '#/components/schemas/ApType'
Expand Down
Loading

0 comments on commit 1f42ebd

Please sign in to comment.