Merge branch 'development' into fix/sample-origin-database-mapping

Author: KochTobi

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

@@ -11,10 +11,9 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Objects;
 import life.qbic.projectmanagement.domain.model.project.Project;
 import life.qbic.projectmanagement.domain.model.project.ProjectId;
-import org.springframework.data.annotation.Immutable;
+import org.hibernate.annotations.Immutable;
 
 /**
  * A limited view of the more complex {@link Project}.
@@ -23,6 +22,7 @@
  */
 //Views are aggregates which cannot be changed
 @Immutable
+@org.springframework.data.annotation.Immutable
 @Entity
 @Table(name = "project_overview")
 public class ProjectOverview {
@@ -54,7 +54,6 @@ public class ProjectOverview {
   @Column(name = "amountPxpMeasurements")
   private String pxpMeasurementCount;
 
-  @Column(name = "userName")
   @ElementCollection(targetClass = String.class, fetch = FetchType.EAGER)
   @CollectionTable(name = "project_usernames", joinColumns = @JoinColumn(name = "projectId"))
   private Collection<String> collaboratorUserNames = new ArrayList<>();
@@ -63,26 +62,6 @@ protected ProjectOverview() {
 
   }
 
-  public ProjectOverview(ProjectId id, String projectTitle, String projectCode,
-      Instant lastModified, String principalInvestigatorName, String projectManagerName,
-      String projectResponsibleName,
-      String ngsMeasurementCount, String pxpMeasurementCount,
-      Collection<String> usernames) {
-    this.id = Objects.requireNonNull(id, "project Id cannot be null");
-    this.projectTitle = Objects.requireNonNull(projectTitle, "projectTitle cannot be null");
-    this.projectCode = Objects.requireNonNull(projectCode, "project code cannot be null");
-    this.lastModified = Objects.requireNonNull(lastModified, "lastModified date cannot be null");
-    this.principalInvestigatorName = Objects.requireNonNull(principalInvestigatorName,
-        "principal investigator name cannot be null");
-    this.projectManagerName = Objects.requireNonNull(projectManagerName,
-        "project manager name cannot be null");
-    this.projectResponsibleName = projectResponsibleName;
-    this.ngsMeasurementCount = ngsMeasurementCount;
-    this.pxpMeasurementCount = pxpMeasurementCount;
-    this.collaboratorUserNames = Objects.requireNonNull(usernames,
-        "The collaborator user names cannot be null");
-  }
-
   public ProjectId projectId() {
     return id;
   }

project-management/src/main/java/life/qbic/projectmanagement/domain/model/project/purchase/Offer.java

@@ -31,7 +31,7 @@ public class Offer {
   private String fileName;
 
   @Lob
-  @Column(name = "file_content", columnDefinition="BLOB")
+  @Column(name = "file_content", columnDefinition = "LONGBLOB")
   @Basic(fetch=LAZY)
   private byte[] fileContent;
 

project-management/src/main/java/life/qbic/projectmanagement/domain/model/sample/qualitycontrol/QualityControlUpload.java

@@ -35,7 +35,7 @@ public class QualityControlUpload {
   private ExperimentId experimentId;
   private String fileName;
   @Lob
-  @Column(name = "file_content", columnDefinition = "BLOB")
+  @Column(name = "file_content", columnDefinition = "LONGBLOB")
   @Basic(fetch = LAZY)
   private byte[] fileContent;
 

sql/modify-ontology-table-engine.sql

@@ -0,0 +1,7 @@
+ALTER TABLE ontology_classes
+    ENGINE = MyISAM;
+ALTER TABLE ontology_classes CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+ALTER TABLE ontology_classes
+    ADD FULLTEXT `idx_fulltext_name` (name);
+ALTER TABLE ontology_classes
+    ADD FULLTEXT `idx_fulltext_label` (label);