Merge pull request #14 from RIT-SWEN-261-02/funding_basketv2.1

funding-basket merge

1 files changed, 11 insertions, 2 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 935ee72..caf9f4c 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
@@ -2,18 +2,21 @@ package com.ufund.api.ufundapi.service;
 
 import java.io.IOException;
 
+import org.springframework.stereotype.Component;
+
 import com.ufund.api.ufundapi.DuplicateKeyException;
 import com.ufund.api.ufundapi.model.User;
 import com.ufund.api.ufundapi.persistence.UserDAO;
-import org.springframework.stereotype.Component;
 
 @Component
 public class UserService {
 
     private final UserDAO userDAO;
+    private final CupboardService cupboardService;
 
-    public UserService(UserDAO userDao) {
+    public UserService(UserDAO userDao, CupboardService cupboardService) {
         this.userDAO = userDao;
+        this.cupboardService = cupboardService;
     }
 
     /**
@@ -40,6 +43,12 @@ public class UserService {
      * @throws IOException If there was any problem saving the file
      */
     public User getUser(String username) throws IOException {
+        User user = userDAO.getUser(username);
+        for (int needId : user.getNeeds()) {
+            if (cupboardService.getNeed(needId) == null) {
+                user.removeBasketNeed(needId);
+            }
+        }
         return userDAO.getUser(username);
     }