Merge branch 'refs/heads/main' into development

qbicsoftware · Jul 16, 2024 · 37860d4 · 37860d4
2 parents cb57787 + 25819b6
commit 37860d4
Show file tree

Hide file tree

Showing 24 changed files with 119 additions and 57 deletions.
diff --git a/application-commons/pom.xml b/application-commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>application-commons</artifactId>

diff --git a/broadcasting/pom.xml b/broadcasting/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>broadcasting</artifactId>

diff --git a/domain-concept/pom.xml b/domain-concept/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
 
   <artifactId>domain-concept</artifactId>

diff --git a/email-service-provider/pom.xml b/email-service-provider/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
 
   <groupId>life.qbic.infrastructure</groupId>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances-api/pom.xml b/finances-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
 
   <groupId>life.qbic.finances</groupId>

diff --git a/finances-infrastructure/pom.xml b/finances-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
 
   <artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>finances</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances/pom.xml b/finances/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>finances</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-api/pom.xml b/identity-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
 
   <groupId>life.qbic.datamanager</groupId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-infrastructure/pom.xml b/identity-infrastructure/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <artifactId>identity-infrastructure</artifactId>
   <dependencies>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/identity/pom.xml b/identity/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -45,25 +45,25 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>broadcasting</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>logging</artifactId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>life.qbic</groupId>
   <artifactId>datamanager</artifactId>
   <name>Data Manager</name>
-  <version>1.1.3</version>
+  <version>1.1.5</version>
   <modules>
     <module>user-interface</module>
     <module>identity</module>

diff --git a/project-management-infrastructure/pom.xml b/project-management-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
 
   <groupId>life.qbic.identity</groupId>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/project-management/pom.xml b/project-management/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>project-management</artifactId>
@@ -37,13 +37,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -77,13 +77,13 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/...fe/qbic/projectmanagement/application/measurement/validation/MeasurementNGSValidator.java b/...fe/qbic/projectmanagement/application/measurement/validation/MeasurementNGSValidator.java
@@ -12,6 +12,7 @@
 import life.qbic.projectmanagement.application.ProjectInformationService;
 import life.qbic.projectmanagement.application.measurement.MeasurementService;
 import life.qbic.projectmanagement.application.measurement.NGSMeasurementMetadata;
+import life.qbic.projectmanagement.application.measurement.validation.MeasurementProteomicsValidator.PROTEOMICS_PROPERTY;
 import life.qbic.projectmanagement.application.ontology.OntologyLookupService;
 import life.qbic.projectmanagement.application.sample.SampleInformationService;
 import life.qbic.projectmanagement.domain.model.project.ProjectId;
@@ -63,6 +64,9 @@ public static boolean isNGS(Collection<String> properties) {
       return false;
     }
     if (properties.size() < NGS_PROPERTY.values().length) {
+      log.debug("Wrong length of property header: "+properties().size());
+      log.debug("Expected: "+ NGS_PROPERTY.values().length);
+      log.debug("Provided: "+ String.join(" - ", properties));
       return false;
     }
     var providedNGSProperties = properties.stream().map(String::toLowerCase).toList();

diff --git a/.../projectmanagement/application/measurement/validation/MeasurementProteomicsValidator.java b/.../projectmanagement/application/measurement/validation/MeasurementProteomicsValidator.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import life.qbic.logging.api.Logger;
 import life.qbic.projectmanagement.application.ProjectInformationService;
 import life.qbic.projectmanagement.application.measurement.MeasurementService;
@@ -62,12 +63,13 @@ public MeasurementProteomicsValidator(SampleInformationService sampleInformation
    */
   public static boolean isProteomics(Collection<String> properties) {
     if (properties.isEmpty()) {
-      log.debug("no properties found");
+      log.debug("No properties found");
       return false;
     }
     if (properties.size() < PROTEOMICS_PROPERTY.values().length) {
-      log.debug("wrong length of property header: "+properties().size());
-      log.debug("expected: "+PROTEOMICS_PROPERTY.values().length);
+      log.debug("Wrong length of property header: "+properties().size());
+      log.debug("Expected: "+PROTEOMICS_PROPERTY.values().length);
+      log.debug("Provided: "+ String.join(" - ", properties));
       return false;
     }
     for (PROTEOMICS_PROPERTY pxpProperty : PROTEOMICS_PROPERTY.values()) {

diff --git a/subscription-api/pom.xml b/subscription-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>life.qbic.logging</groupId>

diff --git a/subscription-provider/pom.xml b/subscription-provider/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.1.3</version>
+    <version>1.1.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>life.qbic.logging</groupId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>