Merge branch 'main' into css

1 files changed, 6 insertions, 16 deletions

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 6e900aa..ec94da8 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,9 +2,9 @@ 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;
+import java.util.Objects;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -44,12 +44,10 @@ public class UserFileDAO implements UserDAO {
     /**
      * Saves the needs to json
      *
-     * @return True if the save was successful, false otherwise
      * @throws IOException If there was an IO issue saving the file
      */
-    private boolean save() throws IOException {
+    private void save() throws IOException {
         objectMapper.writeValue(new File(filename), users.values());
-        return true;
     }
 
     @Override
@@ -82,17 +80,8 @@ 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);
-                if (user.getNeeds() == null || user.getType() == null) {
-                    User oldData = users.get(user.getUsername());
-                    User crutch = new User(oldData.getUsername(), 0, new ArrayList<Integer>(), oldData.getType());
-                    crutch.copyPassword(oldData);
-                    users.put(user.getUsername(), crutch);
-                } else {
-                    var old = users.put(user.getUsername(), user);
-                    user.copyPassword(old);
-                }
+                var old = users.put(user.getUsername(), user);
+                user.copyPassword(Objects.requireNonNull(old));
                 save();
                 return user;
             } else {
@@ -106,7 +95,8 @@ public class UserFileDAO implements UserDAO {
         synchronized (users) {
             if (users.containsKey(username)) {
                 users.remove(username);
-                return save();
+                save();
+                return true;
             } else {
                 return false;
             }