From 3ecdcffbcdf6b8c2c000ad8fb8607147346569fd Mon Sep 17 00:00:00 2001
From: Denis Natusch <denis.natusch@mailbox.tu-dresden.de>
Date: Tue, 21 Nov 2023 14:51:47 +0100
Subject: [PATCH] Simplifiy user id

---
 src/main/java/catering/staff/Staff.java       |  2 -
 src/main/java/catering/users/User.java        | 64 ++-----------------
 .../java/catering/users/UserRepository.java   |  3 +-
 3 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/src/main/java/catering/staff/Staff.java b/src/main/java/catering/staff/Staff.java
index 0401627..b8a2638 100644
--- a/src/main/java/catering/staff/Staff.java
+++ b/src/main/java/catering/staff/Staff.java
@@ -4,8 +4,6 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import org.springframework.data.domain.AbstractAggregateRoot;
-
 @Entity
 public class Staff {
 
diff --git a/src/main/java/catering/users/User.java b/src/main/java/catering/users/User.java
index 674b429..3ca5caa 100644
--- a/src/main/java/catering/users/User.java
+++ b/src/main/java/catering/users/User.java
@@ -1,23 +1,18 @@
 package catering.users;
 
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import jakarta.persistence.OneToOne;
 
+import org.salespointframework.core.AbstractAggregateRoot;
 import org.salespointframework.useraccount.Role;
 import org.salespointframework.useraccount.UserAccount;
-import org.salespointframework.core.AbstractAggregateRoot;
-
-import catering.users.User.UserIdentifier;
-import java.io.Serializable;
-import java.util.UUID;
-import org.jmolecules.ddd.types.Identifier;
 
 @Entity
-public class User extends AbstractAggregateRoot<UserIdentifier> {
+public class User {
 
-	private @EmbeddedId UserIdentifier id = new UserIdentifier();
+	private @Id @GeneratedValue Long id;
 	private String address, fullName;
 
 	@OneToOne
@@ -65,8 +60,7 @@ public class User extends AbstractAggregateRoot<UserIdentifier> {
 		return this.userAccount;
 	}
 
-	@Override
-	public UserIdentifier getId() {
+	public Long getId() {
 		return id;
 	}
 
@@ -77,50 +71,4 @@ public class User extends AbstractAggregateRoot<UserIdentifier> {
 	public boolean hasRole(String role) {
 		return userAccount.getRoles().stream().toList().contains(Role.of(role));
 	}
-
-	@Embeddable
-	public static final class UserIdentifier implements Identifier, Serializable {
-
-		private static final long serialVersionUID = 7740660930809051850L;
-		private final UUID identifier;
-
-		UserIdentifier() {
-			this(UUID.randomUUID());
-		}
-
-		UserIdentifier(UUID identifier) {
-			this.identifier = identifier;
-		}
-
-		@Override
-		public int hashCode() {
-
-			final int prime = 31;
-			int result = 1;
-
-			result = prime * result + (identifier == null ? 0 : identifier.hashCode());
-
-			return result;
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-
-			if (obj == this) {
-				return true;
-			}
-
-			if (!(obj instanceof UserIdentifier that)) {
-				return false;
-			}
-
-			return this.identifier.equals(that.identifier);
-		}
-
-		@Override
-		public String toString(){
-			return identifier.toString();
-		}
-	}
-
 }
diff --git a/src/main/java/catering/users/UserRepository.java b/src/main/java/catering/users/UserRepository.java
index e4fcec4..1bc49e6 100644
--- a/src/main/java/catering/users/UserRepository.java
+++ b/src/main/java/catering/users/UserRepository.java
@@ -1,10 +1,9 @@
 package catering.users;
 
-import catering.users.User.UserIdentifier;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.util.Streamable;
 
-interface UserRepository extends CrudRepository<User, UserIdentifier> {
+interface UserRepository extends CrudRepository<User, Long> {
 
 	@Override
 	Streamable<User> findAll();