From 8a5f74d67551ac295c37be2ef8dd41b780a73b16 Mon Sep 17 00:00:00 2001 From: Gunther6070 Date: Mon, 17 Mar 2025 18:08:13 -0400 Subject: Refactored user to instead hold a list of ID's instead of needs --- .../src/main/java/com/ufund/api/ufundapi/model/User.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ufund-api/src') diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java index 61293b9..f08f9f0 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java @@ -14,7 +14,7 @@ public class User { @JsonProperty("username") private final String username; @JsonProperty("passwordHash") private int passwordHash; - @JsonProperty("basket") private final List basket; + @JsonProperty("basket") private final List basket; @JsonProperty("type") private final UserType type; /** @@ -23,7 +23,7 @@ public class User { * @param username The name of the user * @param basket A basket to copy from */ - public User(@JsonProperty("username") String username, @JsonProperty("passwordHash") int passwordHash, @JsonProperty("basket") List basket, @JsonProperty("type") UserType userType) { + public User(@JsonProperty("username") String username, @JsonProperty("passwordHash") int passwordHash, @JsonProperty("basket") List basket, @JsonProperty("type") UserType userType) { this.username = username; this.basket = basket; this.passwordHash = passwordHash; @@ -48,15 +48,15 @@ public class User { } public void addToBasket(Need need) { - basket.add(need); + basket.add(need.getId()); } - public Need[] getBasketNeeds() { - return basket.toArray(Need[]::new); + public Integer[] getBasketNeeds() { + return basket.toArray(Integer[]::new); } public void removeBasketNeed(Need need) { - basket.remove(need); + basket.remove(need.getId()); } public User withoutPasswordHash() { -- cgit v1.2.3