Skip to content

feat: admin can update LTFT WTE and Start Date #784

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

Merged
Judge40 merged 5 commits into from
Jan 26, 2026
Merged

feat: admin can update LTFT WTE and Start Date #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a74e531
feat: admin can update LTFT WTE and Start Date
Judge40 Jan 22, 2026
81bb0f2
feat: validate patched LTFT content
Judge40 Jan 23, 2026
1424551
fix: revision increment after LTFT patch
Judge40 Jan 23, 2026
aa49317
fix: skip modify LTFT if patched content unchanged
Judge40 Jan 23, 2026
6f2b393
docs: add missing javadoc
Judge40 Jan 23, 2026
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
3 changes: 2 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

group = "uk.nhs.hee.tis.trainee"
version = "0.59.3"
version = "0.60.0"

configurations {
compileOnly {
Expand Down Expand Up @@ -57,6 +57,7 @@ dependencies {
implementation(libs.bundles.aws.xray)

implementation("commons-beanutils:commons-beanutils:1.11.0")
implementation("com.github.java-json-tools:json-patch:1.13")

// PDF
implementation(libs.bundles.pdf.publishing)
Expand Down
251 changes: 235 additions & 16 deletions ...tegrationTest/java/uk/nhs/hee/tis/trainee/forms/api/AdminLtftResourceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE;
import static org.junit.jupiter.params.provider.EnumSource.Mode.INCLUDE;
import static org.springframework.http.HttpMethod.PATCH;
import static org.springframework.http.MediaType.APPLICATION_JSON;
import static org.springframework.http.MediaType.APPLICATION_PDF;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.jwt;
Expand Down Expand Up @@ -153,14 +154,23 @@ void shouldReturnForbiddenWhenNoToken(HttpMethod method, URI uri) throws Excepti
.andExpect(jsonPath("$").doesNotExist());
}

@Test
void shouldReturnForbiddenPatchingWhenNoToken() throws Exception {
mockMvc.perform(request(PATCH, "/api/admin/ltft/123")
.contentType(APPLICATION_JSON))
.andExpect(status().isForbidden())
.andExpect(jsonPath("$").doesNotExist());
}

@ParameterizedTest
@CsvSource(delimiter = '|', textBlock = """
GET | /api/admin/ltft
GET | /api/admin/ltft/123
PUT | /api/admin/ltft/123/approve
PUT | /api/admin/ltft/123/reject
PUT | /api/admin/ltft/123/unsubmit
GET | /api/admin/ltft/count
GET | /api/admin/ltft
GET | /api/admin/ltft/123
PATCH | /api/admin/ltft/123
PUT | /api/admin/ltft/123/approve
PUT | /api/admin/ltft/123/reject
PUT | /api/admin/ltft/123/unsubmit
GET | /api/admin/ltft/count
""")
void shouldReturnForbiddenWhenEmptyToken(HttpMethod method, URI uri) throws Exception {
Jwt token = TestJwtUtil.createToken("{}");
Expand All @@ -172,12 +182,13 @@ void shouldReturnForbiddenWhenEmptyToken(HttpMethod method, URI uri) throws Exce

@ParameterizedTest
@CsvSource(delimiter = '|', textBlock = """
GET | /api/admin/ltft
GET | /api/admin/ltft/123
PUT | /api/admin/ltft/123/approve
PUT | /api/admin/ltft/123/reject
PUT | /api/admin/ltft/123/unsubmit
GET | /api/admin/ltft/count
GET | /api/admin/ltft
GET | /api/admin/ltft/123
PATCH | /api/admin/ltft/123
PUT | /api/admin/ltft/123/approve
PUT | /api/admin/ltft/123/reject
PUT | /api/admin/ltft/123/unsubmit
GET | /api/admin/ltft/count
""")
void shouldReturnForbiddenWhenNoGroupsInToken(HttpMethod method, URI uri) throws Exception {
mockMvc.perform(request(method, uri)
Expand All @@ -188,10 +199,11 @@ void shouldReturnForbiddenWhenNoGroupsInToken(HttpMethod method, URI uri) throws

@ParameterizedTest
@CsvSource(delimiter = '|', textBlock = """
GET | /api/admin/ltft/123
PUT | /api/admin/ltft/123/approve
PUT | /api/admin/ltft/123/reject
PUT | /api/admin/ltft/123/unsubmit
GET | /api/admin/ltft/123
PATCH | /api/admin/ltft/123
PUT | /api/admin/ltft/123/approve
PUT | /api/admin/ltft/123/reject
PUT | /api/admin/ltft/123/unsubmit
""")
void shouldReturnBadRequestWhenInvalidFormId(HttpMethod method, URI uri) throws Exception {
mockMvc.perform(request(method, uri)
Expand All @@ -211,6 +223,101 @@ void shouldReturnBadRequestWhenRequiredReasonMissing(HttpMethod method, String u
.andExpect(status().isBadRequest());
}

@Test
void shouldReturnBadRequestPatchingWhenPatchDtoNullValues() throws Exception {
UUID formId = UUID.randomUUID();

mockMvc.perform(request(PATCH, "/api/admin/ltft/{id}", formId)
.with(TestJwtUtil.createAdminToken(List.of(DBC_1), REQUIRED_ROLES))
.contentType(APPLICATION_JSON)
.content("{}"))
.andExpect(status().isBadRequest())
.andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
.andExpect(jsonPath("$.type", is("about:blank")))
.andExpect(jsonPath("$.title", is("Validation failure")))
.andExpect(jsonPath("$.status", is(HttpStatus.BAD_REQUEST.value())))
.andExpect(jsonPath("$.instance", is("/api/admin/ltft/%s".formatted(formId))))
.andExpect(jsonPath("$.properties.errors").isArray())
.andExpect(jsonPath("$.properties.errors", hasSize(3)))
.andExpect(jsonPath("$.properties.errors[0].pointer", is("#/message")))
.andExpect(jsonPath("$.properties.errors[0].detail", is("must not be null")))
.andExpect(jsonPath("$.properties.errors[1].pointer", is("#/patch")))
.andExpect(jsonPath("$.properties.errors[1].detail", is("must not be null")))
.andExpect(jsonPath("$.properties.errors[2].pointer", is("#/reason")))
.andExpect(jsonPath("$.properties.errors[2].detail", is("must not be null")));
}

@Test
void shouldReturnBadRequestPatchingWhenPatchEmpty() throws Exception {
UUID formId = UUID.randomUUID();
String formPatch = """
{
"patch": [],
"reason": "reason1",
"message": "message1"
}
""";

mockMvc.perform(request(PATCH, "/api/admin/ltft/{id}", formId)
.with(TestJwtUtil.createAdminToken(List.of(DBC_1), REQUIRED_ROLES))
.contentType(APPLICATION_JSON)
.content(formPatch))
.andExpect(status().isBadRequest())
.andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
.andExpect(jsonPath("$.type", is("about:blank")))
.andExpect(jsonPath("$.title", is("Validation failure")))
.andExpect(jsonPath("$.status", is(HttpStatus.BAD_REQUEST.value())))
.andExpect(jsonPath("$.instance", is("/api/admin/ltft/%s".formatted(formId))))
.andExpect(jsonPath("$.properties.errors").isArray())
.andExpect(jsonPath("$.properties.errors", hasSize(1)))
.andExpect(jsonPath("$.properties.errors[0].pointer", is("#/patch")))
.andExpect(jsonPath("$.properties.errors[0].detail", is("must not be empty")));
}

@Test
void shouldReturnBadRequestPatchingWhenPatchOpsNotAllowed() throws Exception {
UUID formId = UUID.randomUUID();
String formPatch = """
{
"patch": [
{
"op": "replace", "path": "/formRef", "value": "newref_12345_001"
},
{
"op": "add", "path": "/change/wte", "value": 0.5
},
{
"op": "add", "path": "/change/endDate", "value": "1970-01-01"
}
],
"reason": "reason1",
"message": "message1"
}
""";
mockMvc.perform(request(PATCH, "/api/admin/ltft/{id}", formId)
.with(TestJwtUtil.createAdminToken(List.of(DBC_1), REQUIRED_ROLES))
.contentType(APPLICATION_JSON)
.content(formPatch))
.andExpect(status().isBadRequest())
.andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
.andExpect(jsonPath("$.type", is("about:blank")))
.andExpect(jsonPath("$.title", is("Validation failure")))
.andExpect(jsonPath("$.status", is(HttpStatus.BAD_REQUEST.value())))
.andExpect(jsonPath("$.instance", is("/api/admin/ltft/%s".formatted(formId))))
.andExpect(jsonPath("$.properties.errors").isArray())
.andExpect(jsonPath("$.properties.errors", hasSize(4)))
.andExpect(jsonPath("$.properties.errors[0].pointer", is("#/patch/0/path")))
.andExpect(jsonPath("$.properties.errors[0].detail",
is("user not authorized to update '/formRef'")))
.andExpect(jsonPath("$.properties.errors[1].pointer", is("#/patch/1/op")))
.andExpect(jsonPath("$.properties.errors[1].detail", is("only 'replace' supported")))
.andExpect(jsonPath("$.properties.errors[2].pointer", is("#/patch/2/op")))
.andExpect(jsonPath("$.properties.errors[2].detail", is("only 'replace' supported")))
.andExpect(jsonPath("$.properties.errors[3].pointer", is("#/patch/2/path")))
.andExpect(jsonPath("$.properties.errors[3].detail",
is("user not authorized to update '/change/endDate'")));
}

@ParameterizedTest
@CsvSource(delimiter = '|', textBlock = """
GET | /api/admin/ltft/{id}
Expand All @@ -227,6 +334,26 @@ void shouldReturnNotFoundWhenFormIdNotFound(HttpMethod method, String uriTemplat
.andExpect(status().isNotFound());
}

@Test
void shouldReturnNotFoundPatchingWhenFormIdNotFound() throws Exception {
String formPatch = """
{
"patch": [
{
"op": "replace", "path": "/change/wte", "value": 0.5
}
],
"reason": "reason1",
"message": "message1"
}
""";
mockMvc.perform(request(PATCH, "/api/admin/ltft/{id}", UUID.randomUUID())
.with(TestJwtUtil.createAdminToken(List.of(DBC_1), REQUIRED_ROLES))
.contentType(APPLICATION_JSON)
.content(formPatch))
.andExpect(status().isNotFound());
}

@ParameterizedTest
@CsvSource(delimiter = '|', textBlock = """
GET | /api/admin/ltft/{id}
Expand All @@ -246,6 +373,97 @@ void shouldReturnNotFoundWhenLtftDoesNotMatchDbc(HttpMethod method, String uriTe
.andExpect(status().isNotFound());
}

@Test
void shouldReturnNotFoundPatchingWhenLtftDoesNotMatchDbc() throws Exception {
LtftForm form = createLtftForm(SUBMITTED, DBC_2, null);
form = template.save(form);

String formPatch = """
{
"patch": [
{
"op": "replace", "path": "/change/wte", "value": 0.5
}
],
"reason": "reason1",
"message": "message1"
}
""";
mockMvc.perform(request(PATCH, "/api/admin/ltft/{id}", form.getId())
.with(TestJwtUtil.createAdminToken(List.of(DBC_1), REQUIRED_ROLES))
.contentType(APPLICATION_JSON)
.content(formPatch))
.andExpect(status().isNotFound());
}

@Test
void shouldReturnBadRequestPatchingWhenPatchedFormFailsValidation() throws Exception {
LtftForm form = createLtftForm(SUBMITTED, DBC_1, null);
form = template.save(form);

String formPatch = """
{
"patch": [
{
"op": "replace", "path": "/change/wte", "value": 1.1
}
],
"reason": "reason1",
"message": "message1"
}
""";
mockMvc.perform(request(PATCH, "/api/admin/ltft/{id}", form.getId())
.with(TestJwtUtil.createAdminToken(List.of(DBC_1), REQUIRED_ROLES))
.contentType(APPLICATION_JSON)
.content(formPatch))
.andExpect(status().isBadRequest())
.andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
.andExpect(jsonPath("$.type", is("about:blank")))
.andExpect(jsonPath("$.title", is("Validation failure")))
.andExpect(jsonPath("$.status", is(HttpStatus.BAD_REQUEST.value())))
.andExpect(jsonPath("$.instance", is("/api/admin/ltft/%s".formatted(form.getId()))))
.andExpect(jsonPath("$.properties.errors").isArray())
.andExpect(jsonPath("$.properties.errors", hasSize(1)))
// The pointer is not correct to spec, as the validation error comes from the patched form.
.andExpect(jsonPath("$.properties.errors[0].pointer", is("#/change/wte")))
.andExpect(
jsonPath("$.properties.errors[0].detail", is("must be less than or equal to 1.0")));
}

@Test
void shouldReturnPatchedFormWhenLtftDoesMatchDbc() throws Exception {
LtftForm form = createLtftForm(SUBMITTED, DBC_1, null);
form = template.save(form);

String formPatch = """
{
"patch": [
{
"op": "replace", "path": "/change/startDate", "value": "1970-01-01"
},
{
"op": "replace", "path": "/change/wte", "value": 0.5
}
],
"reason": "reason1",
"message": "message1"
}
""";
mockMvc.perform(request(PATCH, "/api/admin/ltft/{id}", form.getId())
.with(TestJwtUtil.createAdminToken(List.of(DBC_1), REQUIRED_ROLES))
.contentType(APPLICATION_JSON)
.content(formPatch))
.andExpect(status().isOk())
.andExpect(jsonPath("$.id", is(form.getId().toString())))
.andExpect(jsonPath("$.formRef", is(form.getFormRef())))
.andExpect(jsonPath("$.revision", is(1)))
.andExpect(jsonPath("$.change.startDate", is("1970-01-01")))
.andExpect(jsonPath("$.change.wte", is(0.5)))
.andExpect(jsonPath("$.status.current.state", is(SUBMITTED.toString())))
.andExpect(jsonPath("$.status.current.detail.reason", is("reason1")))
.andExpect(jsonPath("$.status.current.detail.message", is("message1")));
}

@ParameterizedTest
@NullAndEmptySource
void shouldCountZeroWhenNoLtfts(String statusFilter) throws Exception {
Expand Down Expand Up @@ -1581,6 +1799,7 @@ private LtftForm createLtftForm(LifecycleState state, String dbc, LocalDate chan
LtftContent content = LtftContent.builder()
.change(CctChange.builder()
.startDate(changeStartDate)
.wte(0.8)
.build())
.programmeMembership(ProgrammeMembership.builder()
.designatedBodyCode(dbc)
Expand Down
Loading
Loading