Skip to content

Commit 967ef23

Browse files
stevomcallisterstevomcallister
committed
updated to return actual results from PLP
1 parent 1363411 commit 967ef23

File tree

3 files changed

+19
-207
lines changed

3 files changed

+19
-207
lines changed

‎src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/PLPGateway.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class PLPGateway(
4848
val result =
4949
webClient.request<ReviewSchedules>(
5050
HttpMethod.GET,
51-
"/inductions/$prisonerNumber/review-schedule",
51+
"/action-plans/$prisonerNumber/reviews/review-schedules",
5252
authenticationHeader(),
5353
UpstreamApi.PLP,
5454
)

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/integration/person/PLPIntegrationTest.kt

-110
Original file line numberDiff line numberDiff line change
@@ -24,114 +24,4 @@ class PLPIntegrationTest : IntegrationTestBase() {
2424
),
2525
)
2626
}
27-
28-
@Test
29-
fun `returns a persons review schedule`() {
30-
callApi("$basePath/K5995YZ/plp-review-schedule")
31-
.andExpect(status().isOk)
32-
.andExpect(
33-
content().json(
34-
"""
35-
[
36-
{
37-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
38-
"reviewDateFrom": "2024-11-11",
39-
"reviewDateTo": "2025-01-11",
40-
"status": "COMPLETED",
41-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
42-
"createdBy": "auser_gen",
43-
"createdByDisplayName": "Albert User",
44-
"createdAt": "2024-12-11T18:40:39.268Z",
45-
"createdAtPrison": "BXI",
46-
"updatedBy": "auser_gen",
47-
"updatedByDisplayName": "Albert User",
48-
"updatedAt": "2024-12-11T18:40:38.268Z",
49-
"updatedAtPrison": "BXI",
50-
"version": 4
51-
},
52-
{
53-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
54-
"reviewDateFrom": "2024-11-11",
55-
"reviewDateTo": "2025-01-11",
56-
"status": "SCHEDULED",
57-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
58-
"createdBy": "auser_gen",
59-
"createdByDisplayName": "Albert User",
60-
"createdAt": "2024-12-11T18:40:39.256Z",
61-
"createdAtPrison": "BXI",
62-
"updatedBy": "auser_gen",
63-
"updatedByDisplayName": "Albert User",
64-
"updatedAt": "2024-12-11T18:40:36.256Z",
65-
"updatedAtPrison": "BXI",
66-
"version": 3
67-
},
68-
{
69-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
70-
"reviewDateFrom": "2024-11-11",
71-
"reviewDateTo": "2025-01-11",
72-
"status": "EXEMPT_PRISONER_DRUG_OR_ALCOHOL_DEPENDENCY",
73-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
74-
"createdBy": "auser_gen",
75-
"createdByDisplayName": "Albert User",
76-
"createdAt": "2024-12-11T18:40:39.244Z",
77-
"createdAtPrison": "BXI",
78-
"updatedBy": "auser_gen",
79-
"updatedByDisplayName": "Albert User",
80-
"updatedAt": "2024-12-11T18:40:36.244Z",
81-
"updatedAtPrison": "BXI",
82-
"version": 2
83-
},
84-
{
85-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
86-
"reviewDateFrom": "2024-11-11",
87-
"reviewDateTo": "2025-01-11",
88-
"status": "SCHEDULED",
89-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
90-
"createdBy": "auser_gen",
91-
"createdByDisplayName": "Albert User",
92-
"createdAt": "2024-12-11T18:40:39.229Z",
93-
"createdAtPrison": "BXI",
94-
"updatedBy": "auser_gen",
95-
"updatedByDisplayName": "Albert User",
96-
"updatedAt": "2024-12-11T18:40:35.229Z",
97-
"updatedAtPrison": "BXI",
98-
"version": 1
99-
},
100-
{
101-
"reference": "3eba9e8a-9144-408f-b4bf-2692aa4c2c97",
102-
"reviewDateFrom": "2024-11-11",
103-
"reviewDateTo": "2025-01-11",
104-
"status": "COMPLETED",
105-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
106-
"createdBy": "auser_gen",
107-
"createdByDisplayName": "Albert User",
108-
"createdAt": "2024-12-11T18:40:39.214Z",
109-
"createdAtPrison": "BXI",
110-
"updatedBy": "auser_gen",
111-
"updatedByDisplayName": "Albert User",
112-
"updatedAt": "2024-12-11T18:40:34.214Z",
113-
"updatedAtPrison": "BXI",
114-
"version": 2
115-
},
116-
{
117-
"reference": "3eba9e8a-9144-408f-b4bf-2692aa4c2c97",
118-
"reviewDateFrom": "2024-11-11",
119-
"reviewDateTo": "2025-01-11",
120-
"status": "SCHEDULED",
121-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
122-
"createdBy": "auser_gen",
123-
"createdByDisplayName": "Albert User",
124-
"createdAt": "2024-12-11T18:40:39.087Z",
125-
"createdAtPrison": "BXI",
126-
"updatedBy": "auser_gen",
127-
"updatedByDisplayName": "Albert User",
128-
"updatedAt": "2024-12-11T18:40:33.086Z",
129-
"updatedAtPrison": "BXI",
130-
"version": 1
131-
}
132-
]
133-
""",
134-
),
135-
)
136-
}
13727
}

‎src/test/resources/expected-responses/plp-review-schedule

+18-96
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,20 @@
1-
[
21
{
3-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
4-
"reviewDateFrom": "2024-11-11",
5-
"reviewDateTo": "2025-01-11",
6-
"status": "COMPLETED",
7-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
8-
"createdBy": "auser_gen",
9-
"createdByDisplayName": "Albert User",
10-
"createdAt": "2024-12-11T18:40:39.268Z",
11-
"createdAtPrison": "BXI",
12-
"updatedBy": "auser_gen",
13-
"updatedByDisplayName": "Albert User",
14-
"updatedAt": "2024-12-11T18:40:38.268Z",
15-
"updatedAtPrison": "BXI",
16-
"version": 4
17-
},
18-
{
19-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
20-
"reviewDateFrom": "2024-11-11",
21-
"reviewDateTo": "2025-01-11",
22-
"status": "SCHEDULED",
23-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
24-
"createdBy": "auser_gen",
25-
"createdByDisplayName": "Albert User",
26-
"createdAt": "2024-12-11T18:40:39.256Z",
27-
"createdAtPrison": "BXI",
28-
"updatedBy": "auser_gen",
29-
"updatedByDisplayName": "Albert User",
30-
"updatedAt": "2024-12-11T18:40:36.256Z",
31-
"updatedAtPrison": "BXI",
32-
"version": 3
33-
},
34-
{
35-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
36-
"reviewDateFrom": "2024-11-11",
37-
"reviewDateTo": "2025-01-11",
38-
"status": "EXEMPT_PRISONER_DRUG_OR_ALCOHOL_DEPENDENCY",
39-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
40-
"createdBy": "auser_gen",
41-
"createdByDisplayName": "Albert User",
42-
"createdAt": "2024-12-11T18:40:39.244Z",
43-
"createdAtPrison": "BXI",
44-
"updatedBy": "auser_gen",
45-
"updatedByDisplayName": "Albert User",
46-
"updatedAt": "2024-12-11T18:40:36.244Z",
47-
"updatedAtPrison": "BXI",
48-
"version": 2
49-
},
50-
{
51-
"reference": "91130fff-d6ce-4ead-8461-1507140a2ae0",
52-
"reviewDateFrom": "2024-11-11",
53-
"reviewDateTo": "2025-01-11",
54-
"status": "SCHEDULED",
55-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
56-
"createdBy": "auser_gen",
57-
"createdByDisplayName": "Albert User",
58-
"createdAt": "2024-12-11T18:40:39.229Z",
59-
"createdAtPrison": "BXI",
60-
"updatedBy": "auser_gen",
61-
"updatedByDisplayName": "Albert User",
62-
"updatedAt": "2024-12-11T18:40:35.229Z",
63-
"updatedAtPrison": "BXI",
64-
"version": 1
65-
},
66-
{
67-
"reference": "3eba9e8a-9144-408f-b4bf-2692aa4c2c97",
68-
"reviewDateFrom": "2024-11-11",
69-
"reviewDateTo": "2025-01-11",
70-
"status": "COMPLETED",
71-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
72-
"createdBy": "auser_gen",
73-
"createdByDisplayName": "Albert User",
74-
"createdAt": "2024-12-11T18:40:39.214Z",
75-
"createdAtPrison": "BXI",
76-
"updatedBy": "auser_gen",
77-
"updatedByDisplayName": "Albert User",
78-
"updatedAt": "2024-12-11T18:40:34.214Z",
79-
"updatedAtPrison": "BXI",
80-
"version": 2
81-
},
82-
{
83-
"reference": "3eba9e8a-9144-408f-b4bf-2692aa4c2c97",
84-
"reviewDateFrom": "2024-11-11",
85-
"reviewDateTo": "2025-01-11",
86-
"status": "SCHEDULED",
87-
"calculationRule": "BETWEEN_12_AND_60_MONTHS_TO_SERVE",
88-
"createdBy": "auser_gen",
89-
"createdByDisplayName": "Albert User",
90-
"createdAt": "2024-12-11T18:40:39.087Z",
91-
"createdAtPrison": "BXI",
92-
"updatedBy": "auser_gen",
93-
"updatedByDisplayName": "Albert User",
94-
"updatedAt": "2024-12-11T18:40:33.086Z",
95-
"updatedAtPrison": "BXI",
96-
"version": 1
2+
"reviewSchedules": [
3+
{
4+
"createdBy": "asmith_gen",
5+
"createdByDisplayName": "Alex Smith",
6+
"createdAt": "2023-06-19T09:39:44Z",
7+
"createdAtPrison": "BXI",
8+
"updatedBy": "asmith_gen",
9+
"updatedByDisplayName": "Alex Smith",
10+
"updatedAt": "2023-06-19T09:39:44Z",
11+
"updatedAtPrison": "BXI",
12+
"reference": "c88a6c48-97e2-4c04-93b5-98619966447b",
13+
"reviewDateFrom": "2023-11-19",
14+
"reviewDateTo": "2023-12-19",
15+
"status": "SCHEDULED",
16+
"calculationRule": "PRISONER_READMISSION",
17+
"version": 0
18+
}
19+
]
9720
}
98-
]

0 commit comments

Comments
 (0)