Load Cached Organisation Repo as Bean

Author: sven1103

Diff for: project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/CachedOrganisationRepository.java

@@ -20,6 +20,7 @@
 import life.qbic.logging.api.Logger;
 import life.qbic.projectmanagement.application.OrganisationRepository;
 import life.qbic.projectmanagement.domain.Organisation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -35,7 +36,6 @@
  *
  * @since 1.0.0s
  */
-@Component
 public class CachedOrganisationRepository implements OrganisationRepository {
 
   private static final Logger log = logger(CachedOrganisationRepository.class);
@@ -53,7 +53,6 @@ public CachedOrganisationRepository(int cacheSize) {
     this.configuredCacheSize = cacheSize;
   }
 
-
   public CachedOrganisationRepository() {
     this.configuredCacheSize = DEFAULT_CACHE_SIZE;
   }

Diff for: user-interface/src/main/java/life/qbic/datamanager/AppConfig.java

@@ -26,6 +26,7 @@
 import life.qbic.infrastructure.email.identity.IdentityEmailServiceProvider;
 import life.qbic.infrastructure.email.project.ProjectManagementEmailServiceProvider;
 import life.qbic.projectmanagement.application.AppContextProvider;
+import life.qbic.projectmanagement.application.OrganisationRepository;
 import life.qbic.projectmanagement.application.ProjectInformationService;
 import life.qbic.projectmanagement.application.api.SampleCodeService;
 import life.qbic.projectmanagement.application.authorization.acl.ProjectAccessService;
@@ -67,6 +68,7 @@
 import life.qbic.projectmanagement.application.sample.SampleInformationService;
 import life.qbic.projectmanagement.application.sample.qualitycontrol.QualityControlService;
 import life.qbic.projectmanagement.domain.repository.ProjectRepository;
+import life.qbic.projectmanagement.infrastructure.CachedOrganisationRepository;
 import org.jobrunr.scheduling.JobScheduler;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -97,6 +99,11 @@ public IdentityService userRegistrationService(
     return new IdentityService(userRepository);
   }
 
+  @Bean
+  public OrganisationRepository organisationRepository() {
+    return new CachedOrganisationRepository();
+  }
+
 
   @Bean
   public NewPasswordInput newPasswordInput(IdentityService identityService) {

Diff for: user-interface/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExperimentDetailsComponent.java

@@ -100,7 +100,7 @@ public class ExperimentDetailsComponent extends PageArea {
   private final Disclaimer noExperimentalVariablesDefined;
   private final Disclaimer noExperimentalGroupsDefined;
   private final Disclaimer addExperimentalVariablesNote;
-  private final DeletionService deletionService;
+  private final transient DeletionService deletionService;
   private final transient TerminologyService terminologyService;
   private final transient MessageSourceNotificationFactory messageSourceNotificationFactory;
   private final transient CancelConfirmationDialogFactory cancelConfirmationDialogFactory;
@@ -211,7 +211,8 @@ private void onEditButtonClicked() {
           "Experiment information could not be retrieved from service");
     }
 
-    Map<SampleOriginType, Set<OntologyTerm>> usedTerms = getOntologyTermsUsedInSamples(experimentId);
+    Map<SampleOriginType, Set<OntologyTerm>> usedTerms = getOntologyTermsUsedInSamples(
+        experimentId);
 
     optionalExperiment.ifPresent(experiment -> {
       EditExperimentDialog editExperimentDialog = new EditExperimentDialog(
@@ -246,7 +247,8 @@ private void showCancelConfirmationDialog(EditExperimentDialog editExperimentDia
         .open();
   }
 
-  private Map<SampleOriginType, Set<OntologyTerm>> getOntologyTermsUsedInSamples(ExperimentId experimentId) {
+  private Map<SampleOriginType, Set<OntologyTerm>> getOntologyTermsUsedInSamples(
+      ExperimentId experimentId) {
     Map<SampleOriginType, Set<OntologyTerm>> result = new EnumMap<>(SampleOriginType.class);
     Collection<Sample> samples = sampleInformationService.retrieveSamplesForExperiment(experimentId)
         .valueOrElse(new ArrayList<>());
@@ -725,6 +727,11 @@ public static BioIcon getDefaultBioIcon(SampleSourceType sampleSourceType) {
       };
     }
 
+    public static List<BioIcon> getOptionsForType(SampleSourceType type) {
+      return Arrays.stream(BioIcon.values()).filter(o ->
+          o.getType().equals(type)).toList();
+    }
+
     public String getLabel() {
       return label;
     }
@@ -737,17 +744,19 @@ public IconResource getIconResource() {
       return iconResource;
     }
 
-    public static List<BioIcon> getOptionsForType(SampleSourceType type) {
-      return Arrays.stream(BioIcon.values()).filter(o ->
-          o.getType().equals(type)).toList();
-    }
-
     private static class Constants {
 
       public static final String DEFAULT_LABEL = "default";
     }
   }
 
+  /**
+   * Describes the source level of a sample: species, specimen or analyte
+   */
+  public enum SampleSourceType {
+    SPECIES, SPECIMEN, ANALYTE
+  }
+
   /**
    * Wrapper class for different icon resources, e.g. VaadinIcons or custom SVGs. Provides a method
    * to create the respective Icon component.
@@ -773,11 +782,4 @@ public AbstractIcon createIcon() {
       }
     }
   }
-
-  /**
-   * Describes the source level of a sample: species, specimen or analyte
-   */
-  public enum SampleSourceType {
-    SPECIES, SPECIMEN, ANALYTE
-  }
 }