Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -225,6 +227,33 @@ void patchDataset_emitsValidateComputeWithoutSolve() {
.isEqualTo(new TestdataModelInput("orig"));
}

@Test
void patchDataset_withConfiguration_returnsItAsTheModelRequestConfiguration() {
var parentConfiguration = Configuration.<TestdataModelConfigOverrides> empty().withRun(new RunConfiguration("parent"));
Metadata<?> parent = facade.createDataset(
uniqueRunName(), Set.of(), new TestdataModelInput("orig"), parentConfiguration);
var patchConfiguration = Configuration.<TestdataModelConfigOverrides> 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.<TestdataModelConfigOverrides> 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(
Expand Down
Loading