diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SampleRegistrationServiceV2.java b/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SampleRegistrationServiceV2.java index 5c964f4013..32c95c0bae 100644 --- a/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SampleRegistrationServiceV2.java +++ b/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SampleRegistrationServiceV2.java @@ -12,7 +12,6 @@ import life.qbic.projectmanagement.domain.model.project.ProjectId; import life.qbic.projectmanagement.domain.model.sample.Sample; import life.qbic.projectmanagement.domain.model.sample.SampleId; -import life.qbic.projectmanagement.domain.model.sample.SampleRegistrationRequest; import life.qbic.projectmanagement.domain.repository.SampleRepository; import org.springframework.security.access.prepost.PreAuthorize; @@ -40,7 +39,7 @@ public SampleRegistrationServiceV2(BatchRegistrationService batchRegistrationSer } @PreAuthorize("hasPermission(#projectId, 'life.qbic.projectmanagement.domain.model.project.Project', 'WRITE')") - public CompletableFuture registerNewSamples(Collection sampleRegistrationRequests, + public CompletableFuture registerNewSamples(Collection sampleRegistrationRequests, ProjectId projectId, String batchLabel, boolean batchIsPilot) throws RegistrationException { var result = batchRegistrationService.registerBatch(batchLabel, batchIsPilot, projectId); @@ -53,12 +52,12 @@ public CompletableFuture registerNewSamples(Collection updateSamples(Collection sampleRegistrationRequests, + public CompletableFuture updateSamples(Collection sampleRegistrationRequests, ExperimentId experimentId, ProjectId projectId) throws RegistrationException { throw new UnsupportedOperationException("Not implemented yet"); } - private void registerSamples(Collection sampleRegistrationRequests, BatchId batchId, ExperimentId experimentId, ProjectId projectId) + private void registerSamples(Collection sampleMetadata, BatchId batchId, ExperimentId experimentId, ProjectId projectId) throws RegistrationException { var experimentQuery = experimentInformationService.find(projectId.value(), experimentId); if (experimentQuery.isEmpty()) { @@ -76,17 +75,9 @@ private void rollbackSampleRegistration(Collection registeredSamples) } - private Sample buildSample(SampleRegistrationRequest sampleRegistrationRequest, ProjectId projectId) { - var result = sampleCodeService.generateFor(projectId); - if (result.isError()) { - throw new RegistrationException("Sample code generation failed"); - } - return Sample.create(result.getValue(), sampleRegistrationRequest); - } - public static class RegistrationException extends RuntimeException { - public RegistrationException(String message) { + super(message); } } diff --git a/user-interface/src/main/bundles/dev.bundle b/user-interface/src/main/bundles/dev.bundle index 4b05b1de6e..becff4f9c1 100644 Binary files a/user-interface/src/main/bundles/dev.bundle and b/user-interface/src/main/bundles/dev.bundle differ