From 0b41684e57c79374aee3a564307cd4fdef603e7c Mon Sep 17 00:00:00 2001 From: Akash Keshav <112591754+domesticchores@users.noreply.github.com> Date: Tue, 18 Mar 2025 11:41:04 -0400 Subject: THE UPDATE USER WORKS! -ak --- .../api/ufundapi/persistence/UserFileDAO.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java') diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java index f809aac..f8357e4 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java @@ -2,6 +2,7 @@ package com.ufund.api.ufundapi.persistence; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -9,7 +10,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; +import com.ufund.api.ufundapi.model.Need; import com.ufund.api.ufundapi.model.User; +import com.ufund.api.ufundapi.model.User.UserType; @Component public class UserFileDAO implements UserDAO { @@ -81,9 +84,24 @@ public class UserFileDAO implements UserDAO { public User updateUser(User user) throws IOException { synchronized (users) { if (users.containsKey(user.getUsername())) { - var old = users.put(user.getUsername(), user); - user.copyPassword(old); + System.out.println("in the dao " + user); + // var old = users.put(user.getUsername(), user); + // user.copyPassword(old); + System.out.println("basket needs: " + user.getBasketNeeds() + "type :" + user.getType()); + if (user.getBasketNeeds() == null || user.getType() == null) { + System.out.println("USING CRUTCH"); + User oldData = users.get(user.getUsername()); + User crutch = new User(oldData.getUsername(), 0, new ArrayList(), oldData.getType()); + crutch.copyPassword(oldData); + users.put(user.getUsername(), crutch); + } else { + System.out.println("GOOD DATA"); + var old = users.put(user.getUsername(), user); + user.copyPassword(old); + } save(); + System.out.println("end of dao " + user); + System.out.println("updated user with: " + users.get(user.getUsername())); return user; } else { return null; -- cgit v1.2.3 From ac33cc6884c0d3b3e112e6dde6154aa123016d93 Mon Sep 17 00:00:00 2001 From: Gunther6070 Date: Tue, 18 Mar 2025 13:37:55 -0400 Subject: Removed debugging comments --- .../main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java') diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java index f8357e4..def21c6 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java @@ -10,9 +10,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ufund.api.ufundapi.model.Need; import com.ufund.api.ufundapi.model.User; -import com.ufund.api.ufundapi.model.User.UserType; @Component public class UserFileDAO implements UserDAO { @@ -84,24 +82,18 @@ public class UserFileDAO implements UserDAO { public User updateUser(User user) throws IOException { synchronized (users) { if (users.containsKey(user.getUsername())) { - System.out.println("in the dao " + user); // var old = users.put(user.getUsername(), user); // user.copyPassword(old); - System.out.println("basket needs: " + user.getBasketNeeds() + "type :" + user.getType()); if (user.getBasketNeeds() == null || user.getType() == null) { - System.out.println("USING CRUTCH"); User oldData = users.get(user.getUsername()); User crutch = new User(oldData.getUsername(), 0, new ArrayList(), oldData.getType()); crutch.copyPassword(oldData); users.put(user.getUsername(), crutch); } else { - System.out.println("GOOD DATA"); var old = users.put(user.getUsername(), user); user.copyPassword(old); } save(); - System.out.println("end of dao " + user); - System.out.println("updated user with: " + users.get(user.getUsername())); return user; } else { return null; -- cgit v1.2.3 From 81b93fc671ba35d67c414937e18b686fd6d5f861 Mon Sep 17 00:00:00 2001 From: Akash Keshav <112591754+domesticchores@users.noreply.github.com> Date: Tue, 18 Mar 2025 16:53:39 -0400 Subject: idk but it works. funding basket worsk. -ak --- .../main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java') diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java index def21c6..ee7dbcf 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java @@ -80,16 +80,19 @@ public class UserFileDAO implements UserDAO { @Override public User updateUser(User user) throws IOException { + System.out.println("HOW TO FORK AND KILL CHILD " + user); synchronized (users) { if (users.containsKey(user.getUsername())) { // var old = users.put(user.getUsername(), user); // user.copyPassword(old); - if (user.getBasketNeeds() == null || user.getType() == null) { + if (user.getNeeds() == null || user.getType() == null) { + System.out.println("CRUTCH DATA"); User oldData = users.get(user.getUsername()); User crutch = new User(oldData.getUsername(), 0, new ArrayList(), oldData.getType()); crutch.copyPassword(oldData); users.put(user.getUsername(), crutch); } else { + System.out.println("GOOD DATA"); var old = users.put(user.getUsername(), user); user.copyPassword(old); } -- cgit v1.2.3 From 0268894e5b80c908d2c3eb5c2228ee22fde52904 Mon Sep 17 00:00:00 2001 From: Akash Keshav <112591754+domesticchores@users.noreply.github.com> Date: Tue, 18 Mar 2025 17:10:10 -0400 Subject: cleaned up outputs. -ak --- .../src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java') diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java index ee7dbcf..6e900aa 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java @@ -80,19 +80,16 @@ public class UserFileDAO implements UserDAO { @Override public User updateUser(User user) throws IOException { - System.out.println("HOW TO FORK AND KILL CHILD " + user); synchronized (users) { if (users.containsKey(user.getUsername())) { // var old = users.put(user.getUsername(), user); // user.copyPassword(old); if (user.getNeeds() == null || user.getType() == null) { - System.out.println("CRUTCH DATA"); User oldData = users.get(user.getUsername()); User crutch = new User(oldData.getUsername(), 0, new ArrayList(), oldData.getType()); crutch.copyPassword(oldData); users.put(user.getUsername(), crutch); } else { - System.out.println("GOOD DATA"); var old = users.put(user.getUsername(), user); user.copyPassword(old); } -- cgit v1.2.3