From 7aca4b0e8cc4e47d3d9670ecbd7a11e0d7cc9e14 Mon Sep 17 00:00:00 2001 From: larsbeck Date: Tue, 17 Nov 2026 14:52:10 +0100 Subject: [PATCH 1/2] fix: give a from-patch dataset the name and the tags of config.run from-patch took the name of the new dataset only from the name query parameter, and ignored config.run.name and config.run.tags. So the dataset got a generated name and no tags, but its configuration had the run of the request. Read them as from-input does: the name query parameter wins over config.run.name. SolverWorkerFacade.patchDataset and patchAndSolveDataset get the tags, as createDataset does. Fixes #2835 Claude-Session: https://claude.ai/code/session_01UUczJWM11RcvAp1qAfp4p4 --- .../impl/solver/SolverWorkerFacade.java | 6 ++- .../rest/impl/AbstractModelAPIResource.java | 35 ++++++++++++------ .../EmployeeScheduleResourceTest.java | 37 +++++++++++++++++++ .../impl/DefaultSolverWorkerFacade.java | 11 +++--- .../impl/DefaultSolverWorkerFacadeTest.java | 14 +++++-- 5 files changed, 82 insertions(+), 21 deletions(-) diff --git a/service/definition/src/main/java/ai/timefold/solver/service/definition/impl/solver/SolverWorkerFacade.java b/service/definition/src/main/java/ai/timefold/solver/service/definition/impl/solver/SolverWorkerFacade.java index 9821bba816..7586311b95 100644 --- a/service/definition/src/main/java/ai/timefold/solver/service/definition/impl/solver/SolverWorkerFacade.java +++ b/service/definition/src/main/java/ai/timefold/solver/service/definition/impl/solver/SolverWorkerFacade.java @@ -96,6 +96,7 @@ Metadata Metadata Metadata patchDataset(String id, - DatasetSelector select, String runName, + DatasetSelector select, String runName, Set tags, ModelInputPatchRequest modelInputPatchRequest); /** @@ -113,6 +114,7 @@ Metadata Metadata Metadata patchAndSolveDataset(String id, - DatasetSelector select, String runName, + DatasetSelector select, String runName, Set tags, ModelInputPatchRequest modelInputPatchRequest); /** diff --git a/service/rest/src/main/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResource.java b/service/rest/src/main/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResource.java index de15220ad7..036b424829 100644 --- a/service/rest/src/main/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResource.java +++ b/service/rest/src/main/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResource.java @@ -232,15 +232,8 @@ public Metadata fromInput( @Validated(nullable = true, operationId = OperationId.FROM_INPUT) Configuration configuration) { - Set tags = null; - String runName = null; - - if (configuration != null && configuration.run() != null) { - RunConfiguration runConfiguration = configuration.run(); - runName = runConfiguration.name(); - tags = runConfiguration.tags(); - } - runName = name == null ? runName : name; + String runName = runName(name, configuration); + Set tags = runTags(configuration); return switch (operation) { case OperationOnPost.NONE -> solverWorkerFacade.createDataset(id, select, runName, tags, configuration); @@ -279,10 +272,15 @@ public Metadata fromPatch( description = "Operation to execute on the POST request.") @DefaultValue(OperationOnPost.DEFAULT_OPERATION) @QueryParam("operation") OperationOnPost operation, @Validated(nullable = true, operationId = OperationId.FROM_PATCH) ModelInputPatchRequest patchRequest) { + Configuration configuration = patchRequest == null ? null : patchRequest.config(); + String runName = runName(name, configuration); + Set tags = runTags(configuration); + try { return switch (operation) { - case OperationOnPost.NONE -> solverWorkerFacade.patchDataset(id, select, name, patchRequest); - case OperationOnPost.SOLVE -> solverWorkerFacade.patchAndSolveDataset(id, select, name, patchRequest); + case OperationOnPost.NONE -> solverWorkerFacade.patchDataset(id, select, runName, tags, patchRequest); + case OperationOnPost.SOLVE -> + solverWorkerFacade.patchAndSolveDataset(id, select, runName, tags, patchRequest); }; } catch (IllegalArgumentException e) { throw new BadRequestException(Response.status(Response.Status.BAD_REQUEST) @@ -582,4 +580,19 @@ public Response getValidationIssueTypeByCode( } return Response.status(Response.Status.NOT_FOUND).build(); } + + /** + * Returns the name of a dataset that is created from another dataset: the name query parameter wins over the name + * of the run configuration. + */ + private static String runName(String name, Configuration configuration) { + if (name != null || configuration == null || configuration.run() == null) { + return name; + } + return configuration.run().name(); + } + + private static Set runTags(Configuration configuration) { + return configuration == null || configuration.run() == null ? null : configuration.run().tags(); + } } diff --git a/service/test-model/src/test/java/ai/timefold/solver/service/testmodel/EmployeeScheduleResourceTest.java b/service/test-model/src/test/java/ai/timefold/solver/service/testmodel/EmployeeScheduleResourceTest.java index 1a929767f6..64323ed04f 100644 --- a/service/test-model/src/test/java/ai/timefold/solver/service/testmodel/EmployeeScheduleResourceTest.java +++ b/service/test-model/src/test/java/ai/timefold/solver/service/testmodel/EmployeeScheduleResourceTest.java @@ -226,6 +226,43 @@ void uploadOnlySchedule() { assertThat(response.outputMetrics().assignedShifts()).isZero(); } + static Stream fromPatchNameScenarios() { + return Stream.of( + Arguments.of(null, "from-patch-config-name"), + Arguments.of("from-patch-query-name", "from-patch-query-name")); + } + + @ParameterizedTest + @MethodSource("fromPatchNameScenarios") + void fromPatchTakesTheNameAndTagsOfTheRunConfiguration(String queryName, String expectedName) { + Metadata metadata = post(createInputEmployeeSchedule(), OperationOnPost.NONE); + + // The name query parameter wins over config.run.name, as in from-input. + Metadata patchedMetadata = given() + .contentType(ContentType.JSON) + .accept(ContentType.JSON) + .body(""" + {"config": {"run": {"name": "from-patch-config-name", "tags": ["from-patch-tag"]}}, "patch": []}""") + .when() + .post("/schedules/" + metadata.getId() + "/from-patch?select=UNSOLVED&operation=" + + OperationOnPost.NONE.name() + (queryName == null ? "" : "&name=" + queryName)) + .then() + .log().ifError() + .statusCode(202) + .extract() + .as(new TypeRef<>() { + }); + + assertThat(patchedMetadata.getName()).isEqualTo(expectedName); + assertThat(patchedMetadata.getTags()).containsExactly("from-patch-tag"); + + // Await both datasets so the asynchronous computation cannot leak into the next test. + await() + .atMost(TEST_AWAIT_TIMEOUT_DURATION) + .pollInterval(TEST_POLL_INTERVAL_MILLIS) + .until(() -> datasetComputedSink.received().size() >= 2); + } + @Test @Disabled("Flaky test") void solveEmployeeScheduleWithWatching() throws InterruptedException { diff --git a/service/worker/src/main/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacade.java b/service/worker/src/main/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacade.java index f1f1b196a3..cbc65383b6 100644 --- a/service/worker/src/main/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacade.java +++ b/service/worker/src/main/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacade.java @@ -137,18 +137,18 @@ public Metad @Override public Metadata patchDataset(String id, - DatasetSelector select, String runName, + DatasetSelector select, String runName, Set tags, ModelInputPatchRequest modelInputPatchRequest) { - var metadata = createPatchedDataset(id, select, runName, modelInputPatchRequest); + var metadata = createPatchedDataset(id, select, runName, tags, modelInputPatchRequest); datasetValidateComputeCommandEmitter.send(new DatasetValidateComputeCommand(metadata.getId(), false)); return metadata; } @Override public Metadata patchAndSolveDataset(String id, - DatasetSelector select, String runName, + DatasetSelector select, String runName, Set tags, ModelInputPatchRequest modelInputPatchRequest) { - var metadata = createPatchedDataset(id, select, runName, modelInputPatchRequest); + var metadata = createPatchedDataset(id, select, runName, tags, modelInputPatchRequest); datasetValidateComputeCommandEmitter.send(new DatasetValidateComputeCommand(metadata.getId(), true)); return metadata; } @@ -272,7 +272,7 @@ private Metadata createDatasetInternal(String id, DatasetSelector select, String return metadata; } - private Metadata createPatchedDataset(String id, DatasetSelector select, String runName, + private Metadata createPatchedDataset(String id, DatasetSelector select, String runName, Set tags, ModelInputPatchRequest patchRequest) { var input = select == DatasetSelector.UNSOLVED ? getModelInput(id) : getSolvedModelInput(id); @@ -295,6 +295,7 @@ private Metadata createPatchedDataset(String id, DatasetSelector select, String ModelInput patchedModelInput = mapper.treeToValue(patchedInput, input.getClass()); Metadata metadata = new Metadata<>(runName); + metadata.setTags(tags); // set parent id to the id this data set is created from metadata.setParentId(id); // set origin id based on the origin id of the parent data set diff --git a/service/worker/src/test/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacadeTest.java b/service/worker/src/test/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacadeTest.java index e59111b774..01da70a4cc 100644 --- a/service/worker/src/test/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacadeTest.java +++ b/service/worker/src/test/java/ai/timefold/solver/service/worker/impl/DefaultSolverWorkerFacadeTest.java @@ -192,7 +192,7 @@ void createAndSolveDataset_fromExistingDataset_emitsValidateComputeWithSolveTrue void patchDataset_missingParent_throwsItemNotFound() { ModelInputPatchRequest patch = new ModelInputPatchRequest<>(null, List.of()); - assertThatThrownBy(() -> facade.patchDataset("missing", DatasetSelector.UNSOLVED, uniqueRunName(), patch)) + assertThatThrownBy(() -> facade.patchDataset("missing", DatasetSelector.UNSOLVED, uniqueRunName(), Set.of(), patch)) .isInstanceOf(ItemNotFoundException.class); assertThat(validateComputeEmitter.size()).isEqualTo(0); } @@ -205,12 +205,17 @@ void patchDataset_emitsValidateComputeWithoutSolve() { var childRunName = uniqueRunName(); ModelInputPatchRequest patch = new ModelInputPatchRequest<>(null, List.of()); - Metadata child = facade.patchDataset(parent.getId(), DatasetSelector.UNSOLVED, childRunName, patch); + Metadata child = facade.patchDataset(parent.getId(), DatasetSelector.UNSOLVED, childRunName, Set.of("patch-tag"), + patch); // emitter assertions assertThat(validateComputeEmitter.size()).isEqualTo(1); assertThat(validateComputeEmitter.getLastMessage().solve()).isFalse(); + // metadata assertions + assertThat(child.getName()).isEqualTo(childRunName); + assertThat(child.getTags()).containsExactly("patch-tag"); + // storage assertions — child dataset is stored independently with parent linkage assertThat(child.getParentId()).isEqualTo(parent.getId()); assertThat(child.getOriginId()).isEqualTo(parent.getOriginId()); @@ -233,12 +238,15 @@ void patchAndSolveDataset_emitsValidateComputeWithSolveTrue() { ModelInputPatchRequest patch = new ModelInputPatchRequest<>(null, List.of()); Metadata child = facade.patchAndSolveDataset( - parent.getId(), DatasetSelector.UNSOLVED, uniqueRunName(), patch); + parent.getId(), DatasetSelector.UNSOLVED, uniqueRunName(), Set.of("patch-tag"), patch); // emitter assertions assertThat(validateComputeEmitter.size()).isEqualTo(1); assertThat(validateComputeEmitter.getLastMessage().solve()).isTrue(); + // metadata assertions + assertThat(child.getTags()).containsExactly("patch-tag"); + // storage assertions assertThat(child.getParentId()).isEqualTo(parent.getId()); assertThat(child.getOriginId()).isEqualTo(parent.getOriginId()); From b11d1c7878ee8e4d6c7d50f721e65787806a9a7d Mon Sep 17 00:00:00 2001 From: larsbeck Date: Tue, 17 Nov 2026 14:54:51 +0100 Subject: [PATCH 2/2] test: cover the run name and the tags of from-patch in the rest module The test model tests from-patch over REST, but CI builds it outside the main build, so its coverage does not count. AbstractModelAPIResourceTest calls fromPatch and fromInput with a recording SolverWorkerFacade. Claude-Session: https://claude.ai/code/session_01UUczJWM11RcvAp1qAfp4p4 --- .../impl/AbstractModelAPIResourceTest.java | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 service/rest/src/test/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResourceTest.java diff --git a/service/rest/src/test/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResourceTest.java b/service/rest/src/test/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResourceTest.java new file mode 100644 index 0000000000..d17b92cb4c --- /dev/null +++ b/service/rest/src/test/java/ai/timefold/solver/service/rest/impl/AbstractModelAPIResourceTest.java @@ -0,0 +1,85 @@ +package ai.timefold.solver.service.rest.impl; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.lang.reflect.Proxy; +import java.util.List; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; + +import ai.timefold.solver.service.definition.api.dto.dataset.Configuration; +import ai.timefold.solver.service.definition.api.dto.dataset.ModelConfigOverrides; +import ai.timefold.solver.service.definition.api.dto.dataset.ModelInput; +import ai.timefold.solver.service.definition.api.dto.dataset.ModelOutput; +import ai.timefold.solver.service.definition.api.dto.dataset.RunConfiguration; +import ai.timefold.solver.service.definition.api.dto.patch.ModelInputPatchRequest; +import ai.timefold.solver.service.definition.api.dto.scoreanalysis.ModelConstraintJustification; +import ai.timefold.solver.service.definition.api.dto.validation.issue.Issue; +import ai.timefold.solver.service.definition.api.metrics.ModelInputMetrics; +import ai.timefold.solver.service.definition.api.metrics.ModelOutputMetrics; +import ai.timefold.solver.service.definition.api.rest.DatasetSelector; +import ai.timefold.solver.service.definition.api.rest.OperationOnPost; +import ai.timefold.solver.service.definition.impl.solver.SolverWorkerFacade; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +class AbstractModelAPIResourceTest { + + private static final Configuration CONFIGURATION = Configuration. empty() + .withRun(new RunConfiguration("config-name", null, null, Set.of("config-tag"))); + + private final AtomicReference lastFacadeCall = new AtomicReference<>(); + private final AbstractModelAPIResource resource = + new AbstractModelAPIResource<>(null, recordingFacade(), null) { + }; + + @ParameterizedTest + @CsvSource(nullValues = "null", value = { + "null, NONE, patchDataset, config-name", + "query-name, NONE, patchDataset, query-name", + "null, SOLVE, patchAndSolveDataset, config-name" }) + void fromPatchTakesTheNameAndTheTagsOfTheRunConfiguration(String name, OperationOnPost operation, String expectedMethod, + String expectedRunName) { + var patchRequest = new ModelInputPatchRequest<>(CONFIGURATION, List.of()); + + resource.fromPatch("parent-id", name, DatasetSelector.UNSOLVED, operation, patchRequest); + + assertThat(lastFacadeCall.get().method()).isEqualTo(expectedMethod); + assertThat(lastFacadeCall.get().arguments()) + .containsExactly("parent-id", DatasetSelector.UNSOLVED, expectedRunName, Set.of("config-tag"), patchRequest); + } + + @Test + void fromPatchWithoutConfigurationTakesTheNameQueryParameterOnly() { + var patchRequest = new ModelInputPatchRequest(null, List.of()); + + resource.fromPatch("parent-id", "query-name", DatasetSelector.UNSOLVED, OperationOnPost.NONE, patchRequest); + + assertThat(lastFacadeCall.get().arguments()) + .containsExactly("parent-id", DatasetSelector.UNSOLVED, "query-name", null, patchRequest); + } + + @ParameterizedTest + @CsvSource(nullValues = "null", value = { "null, config-name", "query-name, query-name" }) + void fromInputTakesTheNameAndTheTagsOfTheRunConfiguration(String name, String expectedRunName) { + resource.fromInput("parent-id", name, DatasetSelector.UNSOLVED, OperationOnPost.NONE, CONFIGURATION); + + assertThat(lastFacadeCall.get().method()).isEqualTo("createDataset"); + assertThat(lastFacadeCall.get().arguments()) + .containsExactly("parent-id", DatasetSelector.UNSOLVED, expectedRunName, Set.of("config-tag"), CONFIGURATION); + } + + private SolverWorkerFacade recordingFacade() { + return (SolverWorkerFacade) Proxy.newProxyInstance(SolverWorkerFacade.class.getClassLoader(), + new Class[] { SolverWorkerFacade.class }, + (proxy, method, arguments) -> { + lastFacadeCall.set(new FacadeCall(method.getName(), arguments)); + return null; + }); + } + + private record FacadeCall(String method, Object[] arguments) { + } +}