Provide projectId for security context

Author: sven1103

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

@@ -101,54 +101,60 @@ Mono<ProjectCreationResponse> create(ProjectCreationRequest request)
   /**
    * Requests {@link SamplePreview} for a given experiment.
    *
+   * @param projectId    the project ID for the project to get the samples for
    * @param experimentId the experiment ID for which the sample preview shall be retrieved
    * @return a reactive stream of {@link SamplePreview} objects of the experiment
    * @throws RequestFailedException if the request could not be executed
    * @since 1.10.0
    */
-  Flux<SamplePreview> getSamplePreviews(String experimentId) throws RequestFailedException;
+  Flux<SamplePreview> getSamplePreviews(String projectId, String experimentId) throws RequestFailedException;
 
   /**
    * Requests {@link SamplePreview} for a given experiment with pagination support.
    *
+   * @param projectId    the project ID for the project to get the samples for
    * @param experimentId the experiment ID for which the sample preview shall be retrieved
    * @param offset       the offset from 0 of all available previews the returned previews should
    *                     start
    * @param limit        the maximum number of previews that should be returned
    * @return a reactive stream of {@link SamplePreview} objects in the experiment
    * @since 1.10.0
    */
-  Flux<SamplePreview> getSamplePreviews(String experimentId, int offset, int limit);
+  Flux<SamplePreview> getSamplePreviews(String projectId, String experimentId, int offset, int limit);
 
   /**
    * Requests all {@link Sample} for a given experiment.
    *
+   * @param projectId    the project ID for the project to get the samples for
    * @param experimentId the experiment ID for which the samples shall be retrieved
    * @return a reactive stream of {@link Sample} objects
    * @throws RequestFailedException in case the request cannot be executed
    * @since 1.10.0
    */
-  Flux<Sample> getSamples(String experimentId) throws RequestFailedException;
+  Flux<Sample> getSamples(String projectId, String experimentId) throws RequestFailedException;
 
   /**
    * Requests all {@link Sample} for a given batch
    *
-   * @param batchId the batch ID the samples shall be retrieved for
+   * @param projectId the project ID for the project to get the samples for
+   * @param batchId   the batch ID the samples shall be retrieved for
    * @return a reactive stream of {@link Sample} objects for the given batch
    * @throws RequestFailedException in case the request cannot be executed
    * @since 1.10.0
    */
-  Flux<Sample> getSamplesForBatch(String batchId) throws RequestFailedException;
+  Flux<Sample> getSamplesForBatch(String projectId, String batchId) throws RequestFailedException;
 
   /**
    * Find the sample ID for a given sample code
    *
+   * @param projectId  the project ID for the project to get the samples for
    * @param sampleCode the sample code (e.g. Q2TEST001AE) for the project
    * @return a reactive container of {@link SampleIdCodeEntry} for the sample code
    * @throws RequestFailedException in case the request cannot be executed
    * @since 1.10.0
    */
-  Mono<SampleIdCodeEntry> findSampleId(String sampleCode) throws RequestFailedException;
+  Mono<SampleIdCodeEntry> findSampleId(String projectId, String sampleCode)
+      throws RequestFailedException;
 
   /**
    * Container of an update request for a service call and part of the
@@ -429,6 +435,7 @@ record ProjectCreationRequest(ProjectDesign design, ProjectContacts contacts,
    * @since 1.10.0
    */
   record SampleCreationRequest(String projectId, Collection<SampleRegistrationRequest> requests) {
+
     public SampleCreationRequest(String projectId, Collection<SampleRegistrationRequest> requests) {
       this.projectId = projectId;
       this.requests = List.copyOf(requests);
@@ -443,6 +450,7 @@ public SampleCreationRequest(String projectId, Collection<SampleRegistrationRequ
    * @since 1.10.0
    */
   record SampleUpdateRequest(String projectId, Collection<SampleUpdate> requests) {
+
     public SampleUpdateRequest(String projectId, Collection<SampleUpdate> requests) {
       this.projectId = projectId;
       this.requests = List.copyOf(requests);

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

@@ -1,13 +1,11 @@
 package life.qbic.projectmanagement.application.api;
 
-import static life.qbic.logging.service.LoggerFactory.logger;
-import static life.qbic.projectmanagement.application.authorization.ReactiveSecurityContextUtils.applySecurityContext;
-import static life.qbic.projectmanagement.application.authorization.ReactiveSecurityContextUtils.writeSecurityContext;
-
 import java.util.Objects;
 import life.qbic.logging.api.Logger;
 import life.qbic.logging.service.LoggerFactory;
 import life.qbic.projectmanagement.application.ProjectInformationService;
+import static life.qbic.projectmanagement.application.authorization.ReactiveSecurityContextUtils.applySecurityContext;
+import static life.qbic.projectmanagement.application.authorization.ReactiveSecurityContextUtils.writeSecurityContext;
 import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry;
 import life.qbic.projectmanagement.application.sample.SamplePreview;
 import life.qbic.projectmanagement.domain.model.project.ProjectId;
@@ -33,16 +31,21 @@
 @Service
 public class AsyncProjectServiceImpl implements AsyncProjectService {
 
+  private static final Logger log = LoggerFactory.logger(AsyncProjectServiceImpl.class);
   private final ProjectInformationService projectService;
   private final Scheduler scheduler;
-  private static final Logger log = LoggerFactory.logger(AsyncProjectServiceImpl.class);
 
   public AsyncProjectServiceImpl(@Autowired ProjectInformationService projectService,
       @Autowired Scheduler scheduler) {
     this.projectService = Objects.requireNonNull(projectService);
     this.scheduler = Objects.requireNonNull(scheduler);
   }
 
+  private static Retry defaultRetryStrategy() {
+    return Retry.maxInARow(5)
+        .doBeforeRetry(retrySignal -> log.warn("Operation failed (" + retrySignal + ")"));
+  }
+
   @Override
   public Mono<ProjectUpdateResponse> update(@NonNull ProjectUpdateRequest request)
       throws UnknownRequestException, RequestFailedException, AccessDeniedException {
@@ -67,31 +70,35 @@ public Mono<ProjectCreationResponse> create(ProjectCreationRequest request)
   }
 
   @Override
-  public Flux<SamplePreview> getSamplePreviews(String experimentId) throws RequestFailedException {
+  public Flux<SamplePreview> getSamplePreviews(String projectId, String experimentId)
+      throws RequestFailedException {
     throw new RuntimeException("not implemented");
   }
 
   @Override
-  public Flux<SamplePreview> getSamplePreviews(String experimentId, int offset, int limit) {
+  public Flux<SamplePreview> getSamplePreviews(String projectId, String experimentId, int offset,
+      int limit) {
     throw new RuntimeException("not implemented");
   }
 
   @Override
-  public Flux<Sample> getSamples(String experimentId) throws RequestFailedException {
+  public Flux<Sample> getSamples(String projectId, String experimentId)
+      throws RequestFailedException {
     throw new RuntimeException("not implemented");
   }
 
   @Override
-  public Flux<Sample> getSamplesForBatch(String batchId) throws RequestFailedException {
+  public Flux<Sample> getSamplesForBatch(String projectId, String batchId)
+      throws RequestFailedException {
     throw new RuntimeException("not implemented");
   }
 
   @Override
-  public Mono<SampleIdCodeEntry> findSampleId(String sampleCode) throws RequestFailedException {
+  public Mono<SampleIdCodeEntry> findSampleId(String projectId, String sampleCode)
+      throws RequestFailedException {
     throw new RuntimeException("not implemented");
   }
 
-
   @Override
   public Mono<ExperimentUpdateResponse> update(
       ExperimentUpdateRequest request) {
@@ -115,11 +122,6 @@ public Mono<ExperimentUpdateResponse> update(
         .retryWhen(defaultRetryStrategy());
   }
 
-  private static Retry defaultRetryStrategy() {
-    return Retry.maxInARow(5)
-        .doBeforeRetry(retrySignal -> log.warn("Operation failed (" + retrySignal + ")"));
-  }
-
   private <T> Mono<T> unknownRequest() {
     return Mono.error(() -> new UnknownRequestException("Invalid request body"));
   }
@@ -145,7 +147,8 @@ private Mono<ExperimentUpdateResponse> updateExperimentalVariables(String projec
   }
 
 
-  private Mono<ProjectUpdateResponse> updateProjectDesign(String projectId, ProjectDesign design, String requestId) {
+  private Mono<ProjectUpdateResponse> updateProjectDesign(String projectId, ProjectDesign design,
+      String requestId) {
     return applySecurityContext(
         Mono.<ProjectUpdateResponse>create(sink -> {
           try {