Added exeption handling in User

cathrkri · Mar 3, 2026 · 5ed46ad · 5ed46ad
1 parent ab2de3d
commit 5ed46ad
Showing 1 changed file with 32 additions and 4 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/User.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/User.java
@@ -4,7 +4,6 @@
 
 import java.util.UUID;
 
-// TODO: Unntakshåndtering mangler
 // TODO: Enhetstesting mangler
 
 /**
@@ -19,7 +18,7 @@ public class User {
   private String name;
   private String email;
   private String passwordHash;
-  private final String role;
+  private final Role role;
   private final Settings settings;
   private final Inbox inbox;
 
@@ -39,9 +38,32 @@ public User(UUID id,
               String name,
               String email,
               String password,
-              String role,
+              Role role,
               Settings settings,
               Inbox inbox) {
+    if (id == null) {
+      throw new IllegalArgumentException("ID cannot be null.");
+    }
+
+    if (name == null || name.isBlank()) {
+      throw new IllegalArgumentException("Name cannot be null or blank.");
+    }
+
+    if (email == null || email.isBlank() || !email.contains("@") || !email.contains(".")) {
+      throw new IllegalArgumentException("Email cannot be null or blank, and must contain '@' and '.'");
+    }
+
+    if (role == null) {
+      throw new IllegalArgumentException("Role cannot be null");
+    }
+
+    if (settings == null) {
+      throw new IllegalArgumentException("Settings cannot be null");
+    }
+
+    if (inbox == null) {
+      throw new IllegalArgumentException("Inbox cannot be null");
+    }
 
     this.id = id;
     this.name = name;
@@ -66,7 +88,7 @@ public String getEmail() {
     return email;
   }
 
-  public String getRole() {
+  public Role getRole() {
     return role;
   }
 
@@ -81,6 +103,9 @@ public Inbox getInbox() {
   // Add Setters
 
   public void setName(String name) {
+    if (name == null || name.isBlank()) {
+      throw new IllegalArgumentException("Name cannot be null or blank.");
+    }
     this.name = name;
   }
 
@@ -89,6 +114,9 @@ public void setPassword(String password) {
   }
 
   public void setEmail(String email) {
+    if (email == null || email.isBlank() || !email.contains("@") || !email.contains(".")) {
+      throw new IllegalArgumentException("Email cannot be null or blank, and must contains '@' and '.'");
+    }
     this.email = email;
   }