Greatly improve logging and other backend clean up

1 files changed, 4 insertions, 5 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..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;