Greatly improve logging and other backend clean up

2 files changed, 6 insertions, 16 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/CupboardFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/CupboardFileDAO.java
index 4d11554..3115204 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/CupboardFileDAO.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/CupboardFileDAO.java
@@ -53,22 +53,13 @@ public class CupboardFileDAO implements CupboardDAO {
     }
 
     /**
-     * Return an array of the needs
-     *
-     * @return An array of all the needs
-     */
-    private Need[] getNeedsArray() {
-        return needs.values().toArray(Need[]::new);
-    }
-
-    /**
      * 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 {
-        Need[] needArray = getNeedsArray();
+        Need[] needArray = needs.values().toArray(Need[]::new);
 
         objectMapper.writeValue(new File(filename), needArray);
         return true;
@@ -77,7 +68,7 @@ public class CupboardFileDAO implements CupboardDAO {
     @Override
     public Need[] getNeeds() {
         synchronized (needs) {
-            return getNeedsArray();
+            return needs.values().toArray(Need[]::new);
         }
     }
 
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..1b888cd 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
@@ -5,6 +5,7 @@ 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;
@@ -82,16 +83,14 @@ 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) {
+                if (user.getNeeds() == null || user.getType() == null) { // TODO clean this up -tyler
                     User oldData = users.get(user.getUsername());
-                    User crutch = new User(oldData.getUsername(), 0, new ArrayList<Integer>(), oldData.getType());
+                    User crutch = new User(oldData.getUsername(), 0, new ArrayList<>(), oldData.getType());
                     crutch.copyPassword(oldData);
                     users.put(user.getUsername(), crutch);
                 } else {
                     var old = users.put(user.getUsername(), user);
-                    user.copyPassword(old);
+                    user.copyPassword(Objects.requireNonNull(old));
                 }
                 save();
                 return user;