save nickname

Author: MalteSchwitters

backend/src/main/java/org/eventplanner/users/UserUseCase.java

@@ -112,6 +112,7 @@ public UserDetails updateUser(@NonNull SignedInUser signedInUser, @NonNull UserK
         applyNullable(spec.gender(), user::setGender);
         applyNullable(spec.title(), user::setTitle);
         applyNullable(spec.firstName(), user::setFirstName);
+        applyNullable(spec.nickName(), user::setNickName);
         applyNullable(spec.secondName(), user::setSecondName);
         applyNullable(spec.lastName(), user::setLastName);
         applyNullable(spec.dateOfBirth(), user::setDateOfBirth);

backend/src/main/java/org/eventplanner/users/entities/EncryptedUserDetails.java

@@ -21,6 +21,7 @@ public class EncryptedUserDetails implements Serializable {
     private @Nullable EncryptedString gender;
     private @Nullable EncryptedString title;
     private @NonNull EncryptedString firstName;
+    private @Nullable EncryptedString nickName;
     private @Nullable EncryptedString secondName;
     private @NonNull EncryptedString lastName;
     private @NonNull List<EncryptedString> positions;

backend/src/main/java/org/eventplanner/users/entities/User.java

@@ -7,6 +7,7 @@
 import org.eventplanner.positions.values.PositionKey;
 import org.eventplanner.users.values.UserKey;
 import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 import java.util.List;
 
@@ -18,5 +19,6 @@ public class User {
     private @NonNull UserKey key;
     private @NonNull String firstName;
     private @NonNull String lastName;
+    private @Nullable String nickName;
     private @NonNull List<PositionKey> positions;
 }

backend/src/main/java/org/eventplanner/users/entities/UserDetails.java

@@ -25,6 +25,7 @@ public class UserDetails {
     private @Nullable String gender;
     private @Nullable String title;
     private @NonNull String firstName;
+    private @Nullable String nickName;
     private @Nullable String secondName;
     private @NonNull String lastName;
     private @NonNull List<PositionKey> positions = new LinkedList<>();

backend/src/main/java/org/eventplanner/users/rest/dto/CreateUserRequest.java

@@ -10,6 +10,7 @@
 public record CreateUserRequest(
     @Nullable String title,
     @NonNull String firstName,
+    @Nullable String nickName,
     @Nullable String secondName,
     @NonNull String lastName,
     @NonNull AddressRepresentation address,
@@ -26,6 +27,7 @@ public record CreateUserRequest(
         return new CreateUserSpec(
             title,
             firstName,
+            nickName,
             secondName,
             lastName,
             address.toDomain(),

backend/src/main/java/org/eventplanner/users/rest/dto/UpdateUserRequest.java

@@ -16,6 +16,7 @@ public record UpdateUserRequest(
     @Nullable String gender,
     @Nullable String title,
     @Nullable String firstName,
+    @Nullable String nickName,
     @Nullable String secondName,
     @Nullable String lastName,
     @Nullable List<String> positions,
@@ -37,6 +38,7 @@ public record UpdateUserRequest(
             gender,
             title,
             firstName,
+            nickName,
             secondName,
             lastName,
             mapNullable(positions, PositionKey::new),

backend/src/main/java/org/eventplanner/users/rest/dto/UserDetailsRepresentation.java

@@ -14,6 +14,7 @@ public record UserDetailsRepresentation(
     @NonNull String key,
     @Nullable String gender,
     @NonNull String firstName,
+    @Nullable String nickName,
     @Nullable String secondName,
     @NonNull String lastName,
     @NonNull List<String> positions,
@@ -33,6 +34,7 @@ public static UserDetailsRepresentation fromDomain(@NonNull UserDetails user) {
             user.getKey().value(),
             user.getGender(),
             user.getFirstName(),
+            user.getNickName(),
             user.getSecondName(),
             user.getLastName(),
             user.getPositions().stream().map(PositionKey::value).toList(),

backend/src/main/java/org/eventplanner/users/rest/dto/UserRepresentation.java

@@ -3,20 +3,23 @@
 import org.eventplanner.positions.values.PositionKey;
 import org.eventplanner.users.entities.User;
 import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 import java.io.Serializable;
 import java.util.List;
 
 public record UserRepresentation(
     @NonNull String key,
     @NonNull String firstName,
+    @Nullable String nickName,
     @NonNull String lastName,
     @NonNull List<String> positions
 ) implements Serializable {
     public static UserRepresentation fromDomain(@NonNull User user) {
         return new UserRepresentation(
             user.getKey().value(),
             user.getFirstName(),
+            user.getNickName(),
             user.getLastName(),
             user.getPositions().stream().map(PositionKey::value).toList()
         );

backend/src/main/java/org/eventplanner/users/rest/dto/UserSelfRepresentation.java

@@ -13,6 +13,7 @@ public record UserSelfRepresentation(
     @NonNull String key,
     @Nullable String gender,
     @NonNull String firstName,
+    @Nullable String nickName,
     @Nullable String secondName,
     @NonNull String lastName,
     @NonNull List<String> positions,
@@ -30,6 +31,7 @@ public static UserSelfRepresentation fromDomain(@NonNull UserDetails user) {
             user.getKey().value(),
             user.getGender(),
             user.getFirstName(),
+            user.getNickName(),
             user.getSecondName(),
             user.getLastName(),
             user.getPositions().stream().map(PositionKey::value).toList(),

backend/src/main/java/org/eventplanner/users/service/UserEncryptionService.java

@@ -66,6 +66,7 @@ public UserEncryptionService(
             encryptNullable(user.getGender()),
             encryptNullable(user.getTitle()),
             encrypt(user.getFirstName()),
+            encryptNullable(user.getNickName()),
             encryptNullable(user.getSecondName()),
             encrypt(user.getLastName()),
             streamNullable(user.getPositions(), Stream.empty())
@@ -102,6 +103,7 @@ public UserEncryptionService(
             decryptNullable(user.getGender()),
             decryptNullable(user.getTitle()),
             decrypt(user.getFirstName()),
+            decryptNullable(user.getNickName()),
             decryptNullable(user.getSecondName()),
             decrypt(user.getLastName()),
             streamNullable(user.getPositions(), Stream.empty())

backend/src/main/java/org/eventplanner/users/service/UserService.java

@@ -94,6 +94,10 @@ public Optional<UserDetails> getUserByKey(@NonNull UserKey key) {
             if (userFirstName.equalsIgnoreCase(firstName)) {
                 return Optional.of(userEncryptionService.decrypt(user));
             }
+            var userNickName = userEncryptionService.decrypt(user.getNickName());
+            if (userNickName.equalsIgnoreCase(firstName)) {
+                return Optional.of(userEncryptionService.decrypt(user));
+            }
             var userSecondName = userEncryptionService.decryptNullable(user.getSecondName());
             if (userSecondName != null && (userFirstName + " " + userSecondName).equalsIgnoreCase(firstName)) {
                 return Optional.of(userEncryptionService.decrypt(user));

backend/src/main/java/org/eventplanner/users/spec/CreateUserSpec.java

@@ -9,6 +9,7 @@
 public record CreateUserSpec(
     @Nullable String title,
     @NonNull String firstName,
+    @Nullable String nickName,
     @Nullable String secondName,
     @NonNull String lastName,
     @NonNull Address address,

backend/src/main/java/org/eventplanner/users/spec/UpdateUserSpec.java

@@ -13,6 +13,7 @@ public record UpdateUserSpec(
     @Nullable String gender,
     @Nullable String title,
     @Nullable String firstName,
+    @Nullable String nickName,
     @Nullable String secondName,
     @Nullable String lastName,
     @Nullable List<PositionKey> positions,

frontend/src/adapter/rest/UserRestRepository.ts

@@ -234,6 +234,7 @@ export class UserRestRepository implements UserRepository {
         const requestBody: SignedInUserUpdateRequest = {
             gender: user.gender,
             title: user.title,
+            nickName: user.nickName,
             email: user.email,
             phone: user.phone,
             mobile: user.mobile,

frontend/src/application/usecases/UsersUseCase.ts

@@ -61,6 +61,7 @@ export class UsersUseCase {
             const savedUser = await this.userRepository.updateSignedInUser({
                 gender: details.gender,
                 title: details.title,
+                nickName: details.nickName,
                 phone: details.phone,
                 mobile: details.mobile,
                 address: details.address,