Merge remote-tracking branch 'origin/main' into list-and-cupboard-component-refactor

# Conflicts:
#	ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
#	ufund-api/src/main/java/com/ufund/api/ufundapi/model/Need.java
#	ufund-ui/src/app/components/cupboard/cupboard.component.ts
#	ufund-ui/src/app/components/need-list/need-list.component.ts
#	ufund-ui/src/app/models/Need.ts

1 files changed, 7 insertions, 4 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java
index caf9f4c..6e27f50 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java
@@ -12,7 +12,7 @@ import com.ufund.api.ufundapi.persistence.UserDAO;
 public class UserService {
 
     private final UserDAO userDAO;
-    private final CupboardService cupboardService;
+    final CupboardService cupboardService;
 
     public UserService(UserDAO userDao, CupboardService cupboardService) {
         this.userDAO = userDao;
@@ -44,7 +44,10 @@ public class UserService {
      */
     public User getUser(String username) throws IOException {
         User user = userDAO.getUser(username);
-        for (int needId : user.getNeeds()) {
+        if (user == null) {
+            return null;
+        }
+        for (int needId : user.getBasket()) {
             if (cupboardService.getNeed(needId) == null) {
                 user.removeBasketNeed(needId);
             }
@@ -55,7 +58,7 @@ public class UserService {
     /**
      * Updates a user
      *
-     * @param user The ID of the user to update
+     * @param user     The ID of the user to update
      * @param username The user object to set (note: the ID is ignored)
      * @return The updated user object
      * @throws IOException Thrown if there was any issue saving the data
@@ -77,5 +80,5 @@ public class UserService {
     public boolean deleteUser(String username) throws IOException {
         return userDAO.deleteUser(username);
     }
-    
+
 }