Skip to content

Commit 610145a

Browse files
authored
Fixes sample registration and update issues (#1190)
* Provide way to assign request ids for validation requests * Fix equality comparison Fixes the equality comparison. Previously threw NoSuchElementException as two Long type objects were compared. --------- Co-authored-by: KochTobi <[email protected]>
1 parent 54c39f1 commit 610145a

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/SampleUpdateFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9+
import java.util.Objects;
910
import java.util.Optional;
1011
import java.util.function.BinaryOperator;
1112
import life.qbic.application.commons.ApplicationException;
@@ -65,7 +66,7 @@ public void enterValuesAsRows(Sheet sheet, CellStyles cellStyles) {
6566
for (Sample sample : samples) {
6667
Row row = getOrCreateRow(sheet, rowIndex);
6768
var experimentalGroup = experimentalGroups.stream()
68-
.filter(group -> group.id() == sample.experimentalGroupId())
69+
.filter(group -> Objects.equals(group.id(), sample.experimentalGroupId()))
6970
.findFirst().orElseThrow();
7071
fillRowWithSampleMetadata(row, sample, experimentalGroup.condition(),
7172
cellStyles.defaultCellStyle(),

project-management/src/main/java/life/qbic/projectmanagement/application/api/AsyncProjectService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,6 +1878,10 @@ record ValidationRequest(String projectId, ValidationRequestBody requestBody,
18781878
requireNonNull(projectId);
18791879
requireNonNull(requestId);
18801880
}
1881+
1882+
public ValidationRequest(String projectId, SampleRegistrationInformation registration) {
1883+
this(projectId, registration, UUID.randomUUID().toString());
1884+
}
18811885
}
18821886

18831887
/**

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/samples/registration/batch/RegisterSampleBatchDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private static InvalidUploadDisplay invalidDisplay(
155155

156156
private static ValidationRequest convertToRequest(SampleRegistrationInformation registration,
157157
String projectId) {
158-
return new ValidationRequest(projectId, registration, null);
158+
return new ValidationRequest(projectId, registration);
159159
}
160160

161161
private void setValidatedSampleMetadata(List<SampleRegistrationInformation> registrations) {

0 commit comments

Comments
 (0)