Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hia 759 fix latest key dates and adjustments pnd queries #451

Merged
merged 4 commits into from
Jun 28, 2024
Merged

Hia 759 fix latest key dates and adjustments pnd queries #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8425e1
Update openApi spec
Jun 27, 2024
ee41fb8
Implement JsonInclude for SentencekeyDate
Jun 27, 2024
9248957
Update smoke test
Jun 27, 2024
630315f
Trigger Build
Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions openapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,21 +1659,21 @@ components:
dtoPostRecallRelease:
$ref: "#/components/schemas/SentenceKeyDate"
earlyTerm:
$ref: "#/components/schemas/SentenceKeyDate"
$ref: "#/components/schemas/SentenceKeyDateWithCalculatedDate"
homeDetentionCurfew:
$ref: "#/components/schemas/HomeDetentionCurfewDate"
lateTerm:
$ref: "#/components/schemas/SentenceKeyDate"
$ref: "#/components/schemas/SentenceKeyDateWithCalculatedDate"
licenceExpiry:
$ref: "#/components/schemas/SentenceKeyDate"
$ref: "#/components/schemas/SentenceKeyDateWithCalculatedDate"
midTerm:
$ref: "#/components/schemas/SentenceKeyDate"
$ref: "#/components/schemas/SentenceKeyDateWithCalculatedDate"
nonDto:
$ref: "#/components/schemas/NonDtoDate"
nonParole:
$ref: "#/components/schemas/SentenceKeyDate"
paroleEligibility:
$ref: "#/components/schemas/SentenceKeyDate"
$ref: "#/components/schemas/SentenceKeyDateWithCalculatedDate"
postRecallRelease:
$ref: "#/components/schemas/SentenceKeyDate"
release:
Expand Down Expand Up @@ -2256,7 +2256,7 @@ components:
type: integer
example: 13
description: Number of tagged bail days
SentenceKeyDate:
SentenceKeyDateWithCalculatedDate:
type: object
properties:
date:
Expand All @@ -2274,6 +2274,19 @@ components:
format: date
example: 2023-03-01
description: release calculated date for offender
SentenceKeyDate:
type: object
properties:
date:
type: string
format: date
example: 2023-03-01
description: release date for offender
overrideDate:
type: string
format: date
example: 2023-03-01
description: release override date for offender
HomeDetentionCurfewDate:
type: object
properties:
Expand Down
2 changes: 2 additions & 0 deletions ...n/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/hmpps/SentenceKeyDate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps

import com.fasterxml.jackson.annotation.JsonInclude
import java.time.LocalDate

@JsonInclude(JsonInclude.Include.NON_NULL)
data class SentenceKeyDate(
val date: LocalDate? = null,
val overrideDate: LocalDate? = null,
Expand Down
193 changes: 94 additions & 99 deletions ...api/controllers/v1/person/sentences/LatestSentenceKeyDatesAndAdjustmentsControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,106 +157,101 @@ internal class LatestSentenceKeyDatesAndAdjustmentsControllerTest(

result.response.contentAsString.shouldContain(
"""
{
"data": {
"adjustments": {
"additionalDaysAwarded": 7,
"unlawfullyAtLarge": 10,
"lawfullyAtLarge": 2,
"restoredAdditionalDaysAwarded": 0,
"specialRemission": 11,
"recallSentenceRemand": 1,
"recallSentenceTaggedBail": 3,
"remand": 6,
"taggedBail": 3,
"unusedRemand": 6
},
"automaticRelease": {
"date": "2023-04-01",
"overrideDate": "2023-04-01",
"calculatedDate": null
},
"conditionalRelease": {
"date": "2023-05-01",
"overrideDate": "2023-05-01",
"calculatedDate": null
},
"dtoPostRecallRelease": {
"date": "2024-01-02",
"overrideDate": "2024-01-02",
"calculatedDate": null
},
"earlyTerm": {
"date": "2021-11-02",
"overrideDate": "2021-11-02",
"calculatedDate": "2021-11-02"
},
"homeDetentionCurfew": {
"actualDate": "2022-04-01",
"eligibilityCalculatedDate": "2022-04-01",
"eligibilityDate": "2022-04-01",
"eligibilityOverrideDate": "2022-04-01",
"endDate": "2022-04-01"
},
"lateTerm": {
"date": "2022-01-01",
"overrideDate": "2022-01-01",
"calculatedDate": "2022-01-01"
},
"licenceExpiry": {
"date": "2025-02-01",
"overrideDate": "2025-02-01",
"calculatedDate": "2025-02-01"
},
"midTerm": {
"date": "2024-02-01",
"overrideDate": "2024-02-01",
"calculatedDate": "2024-02-01"
},
"nonDto": {
"date": "2024-02-01",
"releaseDateType": "CRD"
},
"nonParole": {
"date": "2026-11-02",
"overrideDate": "2026-11-02",
"calculatedDate": null
},
"paroleEligibility": {
"date": "2027-02-01",
"overrideDate": "2027-02-01",
"calculatedDate": "2027-02-01"
},
"postRecallRelease": {
"date": "2028-02-01",
"overrideDate": "2028-02-01",
"calculatedDate": null
},
"release": {
"date": "2030-02-01",
"confirmedDate": "2030-02-01"
},
"sentence": {
"effectiveEndDate": "2025-02-01",
"expiryCalculatedDate": "2025-02-01",
"expiryDate": "2025-02-01",
"expiryOverrideDate": "2025-02-01",
"startDate": "2025-02-01"
},
"topupSupervision": {
"expiryCalculatedDate": "2022-04-01",
"expiryDate": "2022-04-01",
"expiryOverrideDate": "2022-04-01",
"startDate": "2022-04-01"
},
"actualParoleDate": "2031-02-01",
"earlyRemovalSchemeEligibilityDate": "2031-02-01",
"releaseOnTemporaryLicenceDate": "2031-02-01",
"tariffDate": "2031-02-01",
"tariffEarlyRemovalSchemeEligibilityDate": "2031-02-01"
{
"data": {
"adjustments": {
"additionalDaysAwarded": 7,
"unlawfullyAtLarge": 10,
"lawfullyAtLarge": 2,
"restoredAdditionalDaysAwarded": 0,
"specialRemission": 11,
"recallSentenceRemand": 1,
"recallSentenceTaggedBail": 3,
"remand": 6,
"taggedBail": 3,
"unusedRemand": 6
},
"automaticRelease": {
"date": "2023-04-01",
"overrideDate": "2023-04-01"
},
"conditionalRelease": {
"date": "2023-05-01",
"overrideDate": "2023-05-01"
},
"dtoPostRecallRelease": {
"date": "2024-01-02",
"overrideDate": "2024-01-02"
},
"earlyTerm": {
"date": "2021-11-02",
"overrideDate": "2021-11-02",
"calculatedDate": "2021-11-02"
},
"homeDetentionCurfew": {
"actualDate": "2022-04-01",
"eligibilityCalculatedDate": "2022-04-01",
"eligibilityDate": "2022-04-01",
"eligibilityOverrideDate": "2022-04-01",
"endDate": "2022-04-01"
},
"lateTerm": {
"date": "2022-01-01",
"overrideDate": "2022-01-01",
"calculatedDate": "2022-01-01"
},
"licenceExpiry": {
"date": "2025-02-01",
"overrideDate": "2025-02-01",
"calculatedDate": "2025-02-01"
},
"midTerm": {
"date": "2024-02-01",
"overrideDate": "2024-02-01",
"calculatedDate": "2024-02-01"
},
"nonDto": {
"date": "2024-02-01",
"releaseDateType": "CRD"
},
"nonParole": {
"date": "2026-11-02",
"overrideDate": "2026-11-02"
},
"paroleEligibility": {
"date": "2027-02-01",
"overrideDate": "2027-02-01",
"calculatedDate": "2027-02-01"
},
"postRecallRelease": {
"date": "2028-02-01",
"overrideDate": "2028-02-01"
},
"release": {
"date": "2030-02-01",
"confirmedDate": "2030-02-01"
},
"sentence": {
"effectiveEndDate": "2025-02-01",
"expiryCalculatedDate": "2025-02-01",
"expiryDate": "2025-02-01",
"expiryOverrideDate": "2025-02-01",
"startDate": "2025-02-01"
},
"topupSupervision": {
"expiryCalculatedDate": "2022-04-01",
"expiryDate": "2022-04-01",
"expiryOverrideDate": "2022-04-01",
"startDate": "2022-04-01"
},
"actualParoleDate": "2031-02-01",
"earlyRemovalSchemeEligibilityDate": "2031-02-01",
"releaseOnTemporaryLicenceDate": "2031-02-01",
"tariffDate": "2031-02-01",
"tariffEarlyRemovalSchemeEligibilityDate": "2031-02-01"
}
}
}
""".removeWhitespaceAndNewlines(),
""".removeWhitespaceAndNewlines(),
)
}

Expand Down
5 changes: 0 additions & 5 deletions ...igital/hmpps/hmppsintegrationapi/gateways/nomis/GetLatestSentenceKeyDatesForPersonTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,12 @@ class GetLatestSentenceKeyDatesForPersonTest(

response.data?.automaticRelease?.date.shouldBe(LocalDate.parse("2023-03-01"))
response.data?.automaticRelease?.overrideDate.shouldBe(LocalDate.parse("2023-03-01"))
response.data?.automaticRelease?.calculatedDate.shouldBe(null)

response.data?.conditionalRelease?.date.shouldBe(LocalDate.parse("2023-04-01"))
response.data?.conditionalRelease?.overrideDate.shouldBe(LocalDate.parse("2023-04-01"))
response.data?.conditionalRelease?.calculatedDate.shouldBe(null)

response.data?.dtoPostRecallRelease?.date.shouldBe(LocalDate.parse("2023-05-01"))
response.data?.dtoPostRecallRelease?.overrideDate.shouldBe(LocalDate.parse("2023-05-01"))
response.data?.dtoPostRecallRelease?.calculatedDate.shouldBe(null)

response.data?.earlyTerm?.date.shouldBe(LocalDate.parse("2021-04-01"))
response.data?.earlyTerm?.overrideDate.shouldBe(LocalDate.parse("2021-04-01"))
Expand Down Expand Up @@ -148,15 +145,13 @@ class GetLatestSentenceKeyDatesForPersonTest(

response.data?.nonParole?.date.shouldBe(LocalDate.parse("2026-02-01"))
response.data?.nonParole?.overrideDate.shouldBe(LocalDate.parse("2026-02-01"))
response.data?.nonParole?.calculatedDate.shouldBe(null)

response.data?.paroleEligibility?.date.shouldBe(LocalDate.parse("2027-02-01"))
response.data?.paroleEligibility?.overrideDate.shouldBe(LocalDate.parse("2027-02-01"))
response.data?.paroleEligibility?.calculatedDate.shouldBe(LocalDate.parse("2027-02-01"))

response.data?.postRecallRelease?.date.shouldBe(LocalDate.parse("2028-02-01"))
response.data?.postRecallRelease?.overrideDate.shouldBe(LocalDate.parse("2028-02-01"))
response.data?.postRecallRelease?.calculatedDate.shouldBe(null)

response.data?.release?.date.shouldBe(LocalDate.parse("2030-02-01"))
response.data?.release?.confirmedDate.shouldBe(LocalDate.parse("2030-02-01"))
Expand Down
5 changes: 0 additions & 5 deletions ...ppsintegrationapi/services/GetLatestSentenceKeyDatesAndAdjustmentsForPersonServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,12 @@ internal class GetLatestSentenceKeyDatesAndAdjustmentsForPersonServiceTest(

response.data?.automaticRelease?.date.shouldBe(LocalDate.parse("2023-11-02"))
response.data?.automaticRelease?.overrideDate.shouldBe(LocalDate.parse("2023-11-02"))
response.data?.automaticRelease?.calculatedDate.shouldBe(null)

response.data?.conditionalRelease?.date.shouldBe(LocalDate.parse("2023-12-02"))
response.data?.conditionalRelease?.overrideDate.shouldBe(LocalDate.parse("2023-12-02"))
response.data?.conditionalRelease?.calculatedDate.shouldBe(null)

response.data?.dtoPostRecallRelease?.date.shouldBe(LocalDate.parse("2024-01-02"))
response.data?.dtoPostRecallRelease?.overrideDate.shouldBe(LocalDate.parse("2024-01-02"))
response.data?.dtoPostRecallRelease?.calculatedDate.shouldBe(null)

response.data?.earlyTerm?.date.shouldBe(LocalDate.parse("2021-11-02"))
response.data?.earlyTerm?.overrideDate.shouldBe(LocalDate.parse("2021-11-02"))
Expand Down Expand Up @@ -216,15 +213,13 @@ internal class GetLatestSentenceKeyDatesAndAdjustmentsForPersonServiceTest(

response.data?.nonParole?.date.shouldBe(LocalDate.parse("2026-11-02"))
response.data?.nonParole?.overrideDate.shouldBe(LocalDate.parse("2026-11-02"))
response.data?.nonParole?.calculatedDate.shouldBe(null)

response.data?.paroleEligibility?.date.shouldBe(LocalDate.parse("2027-02-01"))
response.data?.paroleEligibility?.overrideDate.shouldBe(LocalDate.parse("2027-02-01"))
response.data?.paroleEligibility?.calculatedDate.shouldBe(LocalDate.parse("2027-02-01"))

response.data?.postRecallRelease?.date.shouldBe(LocalDate.parse("2028-02-01"))
response.data?.postRecallRelease?.overrideDate.shouldBe(LocalDate.parse("2028-02-01"))
response.data?.postRecallRelease?.calculatedDate.shouldBe(null)

response.data?.release?.date.shouldBe(LocalDate.parse("2030-02-01"))
response.data?.release?.confirmedDate.shouldBe(LocalDate.parse("2030-02-01"))
Expand Down
15 changes: 5 additions & 10 deletions ...otlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/smoke/person/SentencesSmokeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,15 @@ class SentencesSmokeTest : DescribeSpec(
},
"automaticRelease": {
"date": "2020-02-03",
"overrideDate": "2020-02-03",
"calculatedDate": null
"overrideDate": "2020-02-03"
},
"conditionalRelease": {
"date": "2020-02-03",
"overrideDate": "2020-02-03",
"calculatedDate": null
"overrideDate": "2020-02-03"
},
"dtoPostRecallRelease": {
"date": "2020-02-03",
"overrideDate": "2020-04-01",
"calculatedDate": null
"overrideDate": "2020-04-01"
},
"earlyTerm": {
"date": "2020-02-03",
Expand Down Expand Up @@ -143,8 +140,7 @@ class SentencesSmokeTest : DescribeSpec(
},
"nonParole": {
"date": "2020-02-03",
"overrideDate": "2020-02-03",
"calculatedDate": null
"overrideDate": "2020-02-03"
},
"paroleEligibility": {
"date": "2020-02-03",
Expand All @@ -153,8 +149,7 @@ class SentencesSmokeTest : DescribeSpec(
},
"postRecallRelease": {
"date": "2020-02-03",
"overrideDate": "2020-04-01",
"calculatedDate": null
"overrideDate": "2020-04-01"
},
"release": {
"date": "2020-04-01",
Expand Down
Loading