Merge pull request #142 from qbicsoftware/release/0.9.0

Release/0.9.0

Author: Steffengreiner

mariadb-connector/src/main/java/life/qbic/finance/persistence/SimpleOfferSearchService.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 import java.util.Optional;
-import life.qbic.OffsetBasedRequest;
+import life.qbic.persistence.OffsetBasedRequest;
 import life.qbic.projectmanagement.application.finances.offer.OfferSearchService;
 import life.qbic.projectmanagement.domain.finances.offer.Offer;
 import life.qbic.projectmanagement.domain.finances.offer.OfferId;

mariadb-connector/src/main/java/life/qbic/OffsetBasedRequest.java mariadb-connector/src/main/java/life/qbic/persistence/OffsetBasedRequest.java

@@ -1,7 +1,9 @@
-package life.qbic;
+package life.qbic.persistence;
 
+import java.util.Objects;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.lang.NonNull;
 
 /**
  * Simple implementation of a {@link Pageable} interface that provides offset and limit based
@@ -36,6 +38,18 @@ public OffsetBasedRequest(int offset, int limit) {
     sort = Sort.by(Sort.Direction.DESC, "id");
   }
 
+  public OffsetBasedRequest(int offset, int limit, Sort sort) {
+    if (limit < 1) {
+      throw new IllegalArgumentException("Limit must not be less than one!");
+    }
+    if (offset < 0) {
+      throw new IllegalArgumentException("Offset index must not be less than zero!");
+    }
+    this.offset = offset;
+    this.limit = limit;
+    this.sort = sort;
+  }
+
   @Override
   public int getPageNumber() {
     return offset / limit;
@@ -52,11 +66,14 @@ public long getOffset() {
   }
 
   @Override
+  @NonNull
   public Sort getSort() {
+    Objects.requireNonNull(sort);
     return sort;
   }
 
   @Override
+  @NonNull
   public Pageable next() {
     return new OffsetBasedRequest((int) (getOffset() + getPageSize()), getPageSize());
   }
@@ -67,16 +84,19 @@ public Pageable previous() {
   }
 
   @Override
+  @NonNull
   public Pageable previousOrFirst() {
     return hasPrevious() ? previous() : first();
   }
 
   @Override
+  @NonNull
   public Pageable first() {
     return new OffsetBasedRequest(0, getPageSize());
   }
 
   @Override
+  @NonNull
   public Pageable withPage(int pageNumber) {
     return new OffsetBasedRequest(offset * pageNumber, getPageSize());
   }

mariadb-connector/src/main/java/life/qbic/projectmanagement/persistence/ProjectPreviewJpaRepository.java

@@ -2,11 +2,14 @@
 
 import java.util.List;
 import java.util.Objects;
-import life.qbic.OffsetBasedRequest;
+import life.qbic.persistence.OffsetBasedRequest;
 import life.qbic.projectmanagement.application.ProjectPreview;
+import life.qbic.projectmanagement.application.SortOrder;
 import life.qbic.projectmanagement.application.api.ProjectPreviewLookup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Order;
 import org.springframework.stereotype.Component;
 
 /**
@@ -31,9 +34,19 @@ public List<ProjectPreview> query(int offset, int limit) {
   }
 
   @Override
-  public List<ProjectPreview> query(String filter, int offset, int limit) {
+  public List<ProjectPreview> query(String filter, int offset, int limit,
+      List<SortOrder> sortOrders) {
+    List<Order> orders = sortOrders.stream().map(it -> {
+      Order order;
+      if (it.isDescending()) {
+        order = Order.desc(it.propertyName());
+      } else {
+        order = Order.asc(it.propertyName());
+      }
+      return order;
+    }).toList();
     return projectPreviewRepository.findByProjectTitleContainingIgnoreCaseOrProjectCodeContainingIgnoreCase(
-        filter, filter, new OffsetBasedRequest(offset, limit)).getContent();
+        filter, filter, new OffsetBasedRequest(offset, limit, Sort.by(orders))).getContent();
   }
 
 }

mariadb-connector/src/main/java/life/qbic/projectmanagement/persistence/person/Person.java

@@ -0,0 +1,84 @@
+package life.qbic.projectmanagement.persistence.person;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * JPA query object for person information.
+ *
+ * @since 1.0.0
+ */
+@Entity
+@Table(name = "person_datamanager")
+public class Person {
+
+  @Column(name = "firstName")
+  private String firstName;
+
+  @Column(name = "lastName")
+  private String lastName;
+
+  @Id
+  private Long id;
+
+  @Column(name = "email")
+  private String email;
+
+  @Column(name = "referenceId")
+  private String referenceId;
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  @Id
+  public Long getId() {
+    return id;
+  }
+
+  public String fullName() {
+    return this.firstName + " " + this.lastName;
+  }
+
+  public String referenceId() {
+    return this.referenceId;
+  }
+
+  public String emailAddress() {
+    return this.email;
+  }
+
+  private String getFirstName() {
+    return firstName;
+  }
+
+  private void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  private String getLastName() {
+    return lastName;
+  }
+
+  private void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  private String getEmail() {
+    return email;
+  }
+
+  private void setEmail(String email) {
+    this.email = email;
+  }
+
+  private String getReferenceId() {
+    return referenceId;
+  }
+
+  private void setReferenceId(String referenceId) {
+    this.referenceId = referenceId;
+  }
+}

mariadb-connector/src/main/java/life/qbic/projectmanagement/persistence/person/PersonReferenceJpaRepository.java

@@ -0,0 +1,31 @@
+package life.qbic.projectmanagement.persistence.person;
+
+import java.util.List;
+import life.qbic.persistence.OffsetBasedRequest;
+import life.qbic.projectmanagement.application.api.PersonLookupService;
+import life.qbic.projectmanagement.domain.project.PersonReference;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Simple implementation of the {@link PersonLookupService} interface.
+ *
+ * @since 1.0.0
+ */
+@Component
+public class PersonReferenceJpaRepository implements PersonLookupService {
+
+  private final PersonRepo personRepo;
+
+  public PersonReferenceJpaRepository(@Autowired PersonRepo personRepo) {
+    this.personRepo = personRepo;
+  }
+
+  @Override
+  public List<PersonReference> find(String filter, int offset, int limit) {
+    var personsResult = personRepo.findPersonByFirstNameContainingIgnoreCaseOrLastNameContainingIgnoreCase(filter,
+        filter, new OffsetBasedRequest(offset, limit));
+    return personsResult.getContent().stream().map(person -> new PersonReference(
+        person.referenceId(), person.fullName(), person.emailAddress())).toList();
+  }
+}

mariadb-connector/src/main/java/life/qbic/projectmanagement/persistence/person/PersonRepo.java

@@ -0,0 +1,12 @@
+package life.qbic.projectmanagement.persistence.person;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface PersonRepo extends PagingAndSortingRepository<Person, Long> {
+
+  Page<Person> findPersonByFirstNameContainingIgnoreCaseOrLastNameContainingIgnoreCase(
+      String firstName, String lastName, Pageable pageable);
+
+}

projectmanagement/src/main/java/life/qbic/projectmanagement/application/PersonSearchService.java

@@ -0,0 +1,38 @@
+package life.qbic.projectmanagement.application;
+
+import java.util.List;
+import life.qbic.projectmanagement.application.api.PersonLookupService;
+import life.qbic.projectmanagement.domain.project.PersonReference;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Person Search Service
+ *
+ * @since 1.0.0
+ */
+@Component
+public class PersonSearchService {
+
+  private final PersonLookupService personLookupService;
+
+  public PersonSearchService(@Autowired PersonLookupService personLookupService) {
+    this.personLookupService = personLookupService;
+  }
+
+  /**
+   * Lists all findings for a person based on a provided filter expression.
+   * <p>
+   * Supports pagination by the parameters <code>offset</code> and
+   * <code>limit</code>.
+   *
+   * @param filter a character sequence to filter the person references output for
+   * @param offset a pagination offset
+   * @param limit  a pagination limit
+   * @return a list of {@link PersonReference} matching the search filter
+   * @since 1.0.0
+   */
+  public List<PersonReference> find(String filter, int offset, int limit) {
+    return personLookupService.find(filter, offset, limit);
+  }
+}

projectmanagement/src/main/java/life/qbic/projectmanagement/application/ProjectCreationService.java

@@ -11,6 +11,7 @@
 import life.qbic.logging.api.Logger;
 import life.qbic.projectmanagement.domain.project.ExperimentalDesignDescription;
 import life.qbic.projectmanagement.domain.project.OfferIdentifier;
+import life.qbic.projectmanagement.domain.project.PersonReference;
 import life.qbic.projectmanagement.domain.project.Project;
 import life.qbic.projectmanagement.domain.project.ProjectCode;
 import life.qbic.projectmanagement.domain.project.ProjectIntent;
@@ -41,13 +42,16 @@ public ProjectCreationService(ProjectRepository projectRepository) {
    * @return the created project
    */
   public Result<Project, ApplicationException> createProject(String title, String objective,
-      String experimentalDesign, String sourceOffer) {
+      String experimentalDesign, String sourceOffer, PersonReference projectManager,
+      PersonReference principalInvestigator) {
     try {
       Project project;
       if (Objects.isNull(experimentalDesign) || experimentalDesign.isEmpty()) {
-        project = createProjectWithoutExperimentalDesign(title, objective);
+        project = createProjectWithoutExperimentalDesign(title, objective, projectManager,
+            principalInvestigator);
       } else {
-        project = createProjectWithExperimentalDesign(title, objective, experimentalDesign);
+        project = createProjectWithExperimentalDesign(title, objective, experimentalDesign,
+            projectManager, principalInvestigator);
       }
       Optional.ofNullable(sourceOffer)
           .flatMap(it -> it.isBlank() ? Optional.empty() : Optional.of(it))
@@ -72,14 +76,17 @@ private ProjectCode createRandomCode() {
     return code;
   }
 
-  private Project createProjectWithoutExperimentalDesign(String title, String objective) {
+  private Project createProjectWithoutExperimentalDesign(String title, String objective,
+      PersonReference projectManager,
+      PersonReference principalInvestigator) {
     ProjectIntent intent = getProjectIntent(title, objective);
-    return Project.create(intent, createRandomCode());
+    return Project.create(intent, createRandomCode(), projectManager, principalInvestigator);
   }
 
   private Project createProjectWithExperimentalDesign(String title,
       String objective,
-      String experimentalDesign) {
+      String experimentalDesign, PersonReference projectManager,
+      PersonReference principalInvestigator) {
 
     ExperimentalDesignDescription experimentalDesignDescription;
     try {
@@ -91,13 +98,13 @@ private Project createProjectWithExperimentalDesign(String title,
     }
 
     ProjectIntent intent = getProjectIntent(title, objective).with(experimentalDesignDescription);
-    return Project.create(intent, createRandomCode());
+    return Project.create(intent, createRandomCode(), projectManager, principalInvestigator);
   }
 
   private static ProjectIntent getProjectIntent(String title, String objective) {
     ProjectTitle projectTitle;
     try {
-      projectTitle = ProjectTitle.create(title);
+      projectTitle = ProjectTitle.of(title);
     } catch (RuntimeException e) {
       log.error(e.getMessage(), e);
       throw new ProjectManagementException(ErrorCode.INVALID_PROJECT_TITLE,