Update registration service

qbicsoftware · Sep 24, 2024 · 828d45d · 828d45d
1 parent ae7c0bb
commit 828d45d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/...main/java/life/qbic/projectmanagement/application/sample/SampleRegistrationServiceV2.java b/...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<Void> registerNewSamples(Collection<SampleRegistrationRequest> sampleRegistrationRequests,
+  public CompletableFuture<Void> registerNewSamples(Collection<SampleMetadata> sampleRegistrationRequests,
       ProjectId projectId, String batchLabel, boolean batchIsPilot)
       throws RegistrationException {
     var result = batchRegistrationService.registerBatch(batchLabel, batchIsPilot, projectId);
@@ -53,12 +52,12 @@ public CompletableFuture<Void> registerNewSamples(Collection<SampleRegistrationR
   }
 
   @PreAuthorize("hasPermission(#projectId, 'life.qbic.projectmanagement.domain.model.project.Project', 'WRITE')")
-  public CompletableFuture<Void> updateSamples(Collection<SampleRegistrationRequest> sampleRegistrationRequests,
+  public CompletableFuture<Void> updateSamples(Collection<SampleMetadata> sampleRegistrationRequests,
       ExperimentId experimentId, ProjectId projectId) throws RegistrationException {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  private void registerSamples(Collection<SampleRegistrationRequest> sampleRegistrationRequests, BatchId batchId, ExperimentId experimentId, ProjectId projectId)
+  private void registerSamples(Collection<SampleMetadata> 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<SampleId> 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