From da10cb6ffe8941803fdf043970b6297bcccbe670 Mon Sep 17 00:00:00 2001
From: birkon <birkon@stud.ntnu.no>
Date: Tue, 25 Apr 2023 15:12:33 +0200
Subject: [PATCH] fixed usercontroller test

---
 .../v233/SmartMat/controller/user/UserController.java          | 3 +++
 .../java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
index e3099ab2..c28866ba 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
@@ -11,6 +11,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+
 
 /**
  * The user controller is responsible for handling requests related to users.
@@ -69,6 +71,7 @@ public class UserController {
                 .lastName(user.lastName())
                 .dateOfBirth(user.birthDate())
                 .enabled(true)
+                .authorities(new ArrayList<>())
                 .build();
         userService.saveUser(newUser);
         userService.addAuthorityToUser(newUser.getUsername(), Authority.USER);
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
index 751ff593..71588350 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
@@ -87,7 +87,7 @@ public class User implements UserDetails {
             joinColumns = @JoinColumn(name = "username"),
             inverseJoinColumns = @JoinColumn(name = "authority"))
     @JsonIgnoreProperties({"users"})
-    private List<AuthorityTable> authorities;
+    private List<AuthorityTable> authorities = new ArrayList<>();
 
 
     /**
-- 
GitLab