From 156004cab906d16afd1a6c48d8be3a4adbf60e97 Mon Sep 17 00:00:00 2001 From: larsbeck Date: Tue, 17 Nov 2026 14:47:57 +0100 Subject: [PATCH] fix: return the config of a from-patch request in its model-request createPatchedDataset stored the unprocessed configuration of the parent for the new dataset, also when the patch request had its own config. So model-request of the new dataset showed the config of the parent, but the solve used the config of the request. Store the config of the request as both, as from-input does. A patch request without a config still takes both from the parent. Fixes #2834 Claude-Session: https://claude.ai/code/session_01UUczJWM11RcvAp1qAfp4p4 --- .../impl/DefaultSolverWorkerFacade.java | 3 +- .../impl/DefaultSolverWorkerFacadeTest.java | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) 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..a9dde52524 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 @@ -282,7 +282,8 @@ private Metadata createPatchedDataset(String id, DatasetSelector select, String try { Configuration configuration = patchRequest.config() != null ? patchRequest.config() : getConfiguration(id); - Configuration initialConfiguration = getUnprocessedConfiguration(id); + Configuration initialConfiguration = + patchRequest.config() != null ? patchRequest.config() : getUnprocessedConfiguration(id); if (configuration == null) { configuration = Configuration.empty(); initialConfiguration = Configuration.empty(); 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..a977f0558e 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 @@ -9,6 +9,7 @@ import ai.timefold.solver.service.definition.api.dto.dataset.Configuration; import ai.timefold.solver.service.definition.api.dto.dataset.Metadata; +import ai.timefold.solver.service.definition.api.dto.dataset.RunConfiguration; import ai.timefold.solver.service.definition.api.dto.dataset.SolvingStatus; import ai.timefold.solver.service.definition.api.dto.patch.ModelInputPatchRequest; import ai.timefold.solver.service.definition.api.rest.DatasetSelector; @@ -18,6 +19,7 @@ import ai.timefold.solver.service.definition.internal.events.DatasetValidateComputeCommand; import ai.timefold.solver.service.definition.internal.events.SolveStartCommand; import ai.timefold.solver.service.definition.internal.events.SolveTerminateCommand; +import ai.timefold.solver.service.worker.impl.testdata.TestdataModelConfigOverrides; import ai.timefold.solver.service.worker.impl.testdata.TestdataModelInput; import ai.timefold.solver.service.worker.impl.testdata.TestdataStorage; import ai.timefold.solver.service.worker.impl.testdata.TestdataStorageService; @@ -225,6 +227,33 @@ void patchDataset_emitsValidateComputeWithoutSolve() { .isEqualTo(new TestdataModelInput("orig")); } + @Test + void patchDataset_withConfiguration_returnsItAsTheModelRequestConfiguration() { + var parentConfiguration = Configuration. empty().withRun(new RunConfiguration("parent")); + Metadata parent = facade.createDataset( + uniqueRunName(), Set.of(), new TestdataModelInput("orig"), parentConfiguration); + var patchConfiguration = Configuration. empty().withRun(new RunConfiguration("child")); + + Metadata child = facade.patchDataset(parent.getId(), DatasetSelector.UNSOLVED, uniqueRunName(), + new ModelInputPatchRequest<>(patchConfiguration, List.of())); + + assertThat(facade.getConfiguration(child.getId())).isEqualTo(patchConfiguration); + assertThat(facade.getModelRequest(child.getId()).configuration()).isEqualTo(patchConfiguration); + } + + @Test + void patchDataset_withoutConfiguration_keepsTheModelRequestConfigurationOfTheParent() { + var parentConfiguration = Configuration. empty().withRun(new RunConfiguration("parent")); + Metadata parent = facade.createDataset( + uniqueRunName(), Set.of(), new TestdataModelInput("orig"), parentConfiguration); + + Metadata child = facade.patchDataset(parent.getId(), DatasetSelector.UNSOLVED, uniqueRunName(), + new ModelInputPatchRequest<>(null, List.of())); + + assertThat(facade.getConfiguration(child.getId())).isEqualTo(parentConfiguration); + assertThat(facade.getModelRequest(child.getId()).configuration()).isEqualTo(parentConfiguration); + } + @Test void patchAndSolveDataset_emitsValidateComputeWithSolveTrue() { Metadata parent = facade.createDataset(