Merge pull request #600 from qbicsoftware/development

Release PR

Author: wow-such-code

README.md

@@ -5,8 +5,6 @@
 Data Manager - A web-based multi-omics data management platform for the biomedical life sciences
 that enables FAIR-compliant data access.
 
-**Disclaimer**: _this project is still under heavy development and not yet officially released._
-
 [![Build Maven Package](https://github.com/qbicsoftware/data-manager-app/actions/workflows/build_package.yml/badge.svg)](https://github.com/qbicsoftware/data-manager-app/actions/workflows/build_package.yml)
 [![Run Maven Tests](https://github.com/qbicsoftware/data-manager-app/actions/workflows/run_tests.yml/badge.svg)](https://github.com/qbicsoftware/data-manager-app/actions/workflows/run_tests.yml)
 [![CodeQL](https://github.com/qbicsoftware/data-manager-app/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/qbicsoftware/data-manager-app/actions/workflows/codeql-analysis.yml)
@@ -334,3 +332,5 @@ This work is licensed under the [MIT license](https://mit-license.org/).
 
 This work uses the [Vaadin Framework](https://github.com/vaadin), which is licensed
 under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0).
+
+The University of Tübingen logo is a registered trademark and the copyright is owned by the [University of Tübingen](https://uni-tuebingen.de/).

application-commons/pom.xml

@@ -19,5 +19,10 @@
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons</artifactId>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-core -->
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+    </dependency>
   </dependencies>
 </project>

application-commons/src/main/java/life/qbic/application/commons/ApplicationException.java

@@ -104,6 +104,9 @@ public static ApplicationException wrapping(Throwable e) {
     if (e instanceof ApplicationException applicationException) {
       return new ApplicationException(e, applicationException.errorCode(),
           applicationException.errorParameters());
+    }
+    if (e instanceof org.springframework.security.access.AccessDeniedException) {
+      return new ApplicationException(e, ErrorCode.ACCESS_DENIED, ErrorParameters.empty());
     } else {
       return new ApplicationException(e.getMessage(), e);
     }
@@ -133,6 +136,7 @@ public String toString() {
    */
   public enum ErrorCode {
     GENERAL,
+    ACCESS_DENIED,
     INVALID_EXPERIMENTAL_DESIGN,
     INVALID_PROJECT_OBJECTIVE,
     INVALID_PROJECT_TITLE,

domain-concept/pom.xml

@@ -23,6 +23,12 @@
       <artifactId>spock-core</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.17.1</version>
+    </dependency>
   </dependencies>
 
 </project>

domain-concept/src/main/java/life/qbic/domain/concepts/DomainEvent.java

@@ -1,5 +1,6 @@
 package life.qbic.domain.concepts;
 
+import com.fasterxml.jackson.annotation.JsonGetter;
 import java.io.Serializable;
 import java.time.Instant;
 
@@ -13,10 +14,21 @@
  */
 public abstract class DomainEvent implements Serializable {
 
+  protected final Instant occurredOn;
+
+  protected DomainEvent() {
+    this.occurredOn = Instant.now();
+  }
+
   /**
    * The instant of event creation.
    *
    * @return the instant the of event creation.
    */
-  public abstract Instant occurredOn();
+
+  @JsonGetter("occurredOn")
+  public Instant occurredOn() {
+    return occurredOn;
+  }
+
 }

domain-concept/src/main/java/life/qbic/domain/concepts/DomainEventSubscriber.java

@@ -3,7 +3,7 @@
 /**
  * <b>Domain Event Subscriber</b>
  *
- * <p>Clients can implement this interface to subscribe to {@link DomainEventPublisher} and get
+ * <p>Clients can implement this interface to subscribe to {@link DomainEventDispatcher} and get
  * informed whenever a {@link DomainEvent} of the specified type <code>T</code> happens.
  *
  * @since 1.0.0

domain-concept/src/main/java/life/qbic/domain/concepts/LocalDomainEventDispatcher.java

@@ -0,0 +1,63 @@
+package life.qbic.domain.concepts;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <b>Local Domain Event Dispatcher</b>
+ * <p>
+ * Dispatches domain events to registered {@link DomainEventSubscriber}.
+ * <p>
+ * In contrast to the {@link DomainEventDispatcher} class, this class offers a
+ * {@link LocalDomainEventDispatcher#reset()} method to clear all potentially existing subscribes.
+ * This enables the domain event dispatcher to be used in an isolated local domain interaction
+ * scope, e.g. from within an application service, when you want to ensure a successful committed
+ * transaction first but still want to make use of broadcasting domain events within your domain.
+ * <p>
+ * <strong>Disclaimer</strong>
+ * <p>The implementation runs in the main application thread and is blocking. Depending on the
+ * number of registered subscriber and their implementation, expect the dispatching of events to
+ * block your main app.</p>
+ *
+ * @since 1.0.0
+ */
+public class LocalDomainEventDispatcher {
+
+  private static final ThreadLocal<List<DomainEventSubscriber<?>>> subscribers = ThreadLocal.withInitial(
+      ArrayList::new);
+  private static LocalDomainEventDispatcher INSTANCE;
+
+  private LocalDomainEventDispatcher() {
+    subscribers.set(new ArrayList<>());
+  }
+
+  public static LocalDomainEventDispatcher instance() {
+    if (INSTANCE == null) {
+      INSTANCE = new LocalDomainEventDispatcher();
+    }
+    return INSTANCE;
+  }
+
+  public <T extends DomainEvent> void subscribe(DomainEventSubscriber<T> subscriber) {
+    var currentSubscribers = subscribers.get();
+    currentSubscribers.add(subscriber);
+    subscribers.set(currentSubscribers);
+  }
+
+  public <T extends DomainEvent> void dispatch(T domainEvent) {
+    subscribers.get().stream()
+        .filter(subscriber -> subscriber.subscribedToEventType() == domainEvent.getClass())
+        .map(subscriber -> (DomainEventSubscriber<T>) subscriber)
+        .forEach(subscriber -> subscriber.handleEvent(domainEvent));
+  }
+
+  /**
+   * Removes all existing {@link DomainEventSubscriber}s of the dispatcher instance.
+   *
+   * @since 1.0.0
+   */
+  public void reset() {
+    subscribers.remove();
+  }
+
+}

domain-concept/src/test/groovy/life/qbic/domain/concepts/TestEvent.groovy

@@ -16,11 +16,6 @@ class TestEvent extends DomainEvent {
 
     private String test = "TEST"
 
-    @Override
-    Instant occurredOn() {
-        return Instant.now()
-    }
-
     boolean equals(o) {
         if (this.is(o)) return true
         if (o == null || getClass() != o.class) return false

identity-api/src/main/java/life/qbic/identity/api/UserInfo.java

@@ -7,7 +7,8 @@
  *
  * @since 1.0.0
  */
-public record UserInfo(String id, String fullName, String emailAddress, String userName, String encryptedPassword,
+public record UserInfo(String id, String fullName, String emailAddress, String platformUserName,
+                       String encryptedPassword,
                        boolean isActive) {
 
 }

identity/src/main/java/life/qbic/identity/application/user/IdentityService.java

@@ -150,6 +150,28 @@ public ApplicationResponse requestPasswordReset(String userEmailAddress) {
     return ApplicationResponse.successResponse();
   }
 
+  public ApplicationResponse requestUserNameChange(String userId, String userName) {
+    if (isNull(userName) || userName.isBlank()) {
+      return ApplicationResponse.failureResponse(new EmptyUserNameException());
+    }
+    UserId id = UserId.from(userId);
+    var optionalUser = userRepository.findById(id);
+    if (optionalUser.isEmpty()) {
+      return ApplicationResponse.failureResponse(new UserNotFoundException("User not found"));
+    }
+    // get user
+    var user = optionalUser.get();
+    if (user.userName().equals(userName)) {
+      return ApplicationResponse.successResponse();
+    }
+    if (userRepository.findByUserName(userName).isPresent()) {
+      return ApplicationResponse.failureResponse(new UserNameNotAvailableException());
+    }
+    user.setNewUserName(userName);
+    userRepository.updateUser(user);
+    return ApplicationResponse.successResponse();
+  }
+
   /**
    * Sets a new password for a given user.
    * <p>

identity/src/main/java/life/qbic/identity/domain/event/PasswordResetRequested.java

@@ -1,7 +1,6 @@
 package life.qbic.identity.domain.event;
 
 import java.io.Serial;
-import java.time.Instant;
 import life.qbic.domain.concepts.DomainEvent;
 import life.qbic.identity.domain.model.EmailAddress;
 import life.qbic.identity.domain.model.FullName;
@@ -21,8 +20,6 @@ public class PasswordResetRequested extends DomainEvent {
 
   private final UserId userId;
 
-  private final Instant occurredOn;
-
   private final FullName fullName;
 
   private final EmailAddress emailAddress;
@@ -38,23 +35,15 @@ public class PasswordResetRequested extends DomainEvent {
    */
   public static PasswordResetRequested create(UserId userId, FullName name,
       EmailAddress emailAddress) {
-    return new PasswordResetRequested(userId, Instant.now(), name, emailAddress);
+    return new PasswordResetRequested(userId, name, emailAddress);
   }
 
-  private PasswordResetRequested(UserId userId, Instant occurredOn, FullName name,
-      EmailAddress emailAddress) {
-    super();
+  private PasswordResetRequested(UserId userId, FullName name, EmailAddress emailAddress) {
     this.userId = userId;
-    this.occurredOn = occurredOn;
     this.fullName = name;
     this.emailAddress = emailAddress;
   }
 
-  @Override
-  public Instant occurredOn() {
-    return occurredOn;
-  }
-
   /**
    * Returns the user id of the user for whom the password needs to be reset
    *

identity/src/main/java/life/qbic/identity/domain/event/UserActivated.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import java.io.Serial;
-import java.time.Instant;
 import life.qbic.domain.concepts.DomainEvent;
 
 
@@ -25,17 +24,10 @@ private UserActivated() {
 
   private UserActivated(String userId) {
     this.userId = userId;
-    this.occurredOn = Instant.now();
   }
 
-  private Instant occurredOn;
   private String userId;
 
-  @Override
-  public Instant occurredOn() {
-    return occurredOn;
-  }
-
   @JsonGetter("userId")
   public String userId() {
     return userId;

identity/src/main/java/life/qbic/identity/domain/event/UserEmailConfirmed.java

@@ -1,7 +1,6 @@
 package life.qbic.identity.domain.event;
 
 import java.io.Serial;
-import java.time.Instant;
 import life.qbic.domain.concepts.DomainEvent;
 
 /**
@@ -16,27 +15,19 @@ public class UserEmailConfirmed extends DomainEvent {
 
   private final String userId;
   private final String email;
-  private final Instant occurredOn;
 
   public static UserEmailConfirmed create(String userId, String email) {
-    return new UserEmailConfirmed(userId, email, Instant.now());
+    return new UserEmailConfirmed(userId, email);
   }
 
   /**
    * @param userId     the id of the user for which the mail was confirmed
    * @param email      the confirmed email address
-   * @param occurredOn the timestamp this event happened
    * @since 1.0.0
    */
-  private UserEmailConfirmed(final String userId, final String email, Instant occurredOn) {
+  private UserEmailConfirmed(final String userId, final String email) {
     this.userId = userId;
     this.email = email;
-    this.occurredOn = occurredOn;
-  }
-
-  @Override
-  public Instant occurredOn() {
-    return occurredOn;
   }
 
   public String userId() {

identity/src/main/java/life/qbic/identity/domain/event/UserRegistered.java

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serial;
-import java.time.Instant;
 import life.qbic.domain.concepts.DomainEvent;
 
 /**
@@ -17,16 +16,14 @@ public class UserRegistered extends DomainEvent {
   @Serial
   private static final long serialVersionUID = 2581827831168895067L;
 
-  private Instant occurredOn;
-
   @JsonProperty("fullName")
   private String fullName;
   @JsonProperty("email")
   private String email;
 
   private String userId;
 
-  private UserRegistered() {
+  protected UserRegistered() {
 
   }
 
@@ -43,13 +40,6 @@ private UserRegistered(final String userId, final String fullName, final String
     this.userId = userId;
     this.fullName = fullName;
     this.email = email;
-    this.occurredOn = Instant.now();
-  }
-
-  @JsonGetter("occurredOn")
-  @Override
-  public Instant occurredOn() {
-    return occurredOn;
   }
 
   @JsonGetter("userId")

identity/src/main/java/life/qbic/identity/domain/model/PasswordPolicy.java

@@ -15,7 +15,7 @@
  */
 class PasswordPolicy {
 
-  private static final int MIN_LENGTH = 8;
+  private static final int MIN_LENGTH = 12;
 
   private static PasswordPolicy policy;
 

identity/src/main/java/life/qbic/identity/domain/model/User.java

@@ -171,6 +171,15 @@ public void setNewPassword(EncryptedPassword newPassword) {
     this.setEncryptedPassword(newPassword);
   }
 
+  /**
+   * Overrides the previous username and sets a new one
+   *
+   * @param userName the new username
+   */
+  public void setNewUserName(String userName) {
+    this.userName = userName;
+  }
+
   private void activate() {
     if (this.active) {
       return;

identity/src/test/groovy/life/qbic/identity/domain/user/EncryptedPasswordSpec.groovy

@@ -29,6 +29,6 @@ class EncryptedPasswordSpec extends Specification {
         encryptedPassword != null
 
         where:
-        rawPassword << ["test1234", "1234!#234", "megastrongpassword"]
+        rawPassword << ["test12340001", "1234!#2340001", "megastrongpassword0001"]
     }
 }