From 97cbd320abe7c13cbfdc1c649be96f2a4e24200a Mon Sep 17 00:00:00 2001 From: Gunther6070 Date: Tue, 18 Mar 2025 15:33:09 -0400 Subject: Added check to getUser to remove deleted needs in basket --- .../java/com/ufund/api/ufundapi/service/UserService.java | 13 +++++++++++-- 1 file 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..3b59953 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.getBasketNeeds()) { + if (cupboardService.getNeed(needId) == null) { + user.removeBasketNeed(needId); + } + } return userDAO.getUser(username); } -- cgit v1.2.3