fix expiration logic and cleanup

2 files changed, 3 insertions, 2 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserAuthFIleDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserAuthFIleDAO.java
index 9023b42..7bda3f9 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserAuthFIleDAO.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserAuthFIleDAO.java
@@ -37,7 +37,7 @@ public class UserAuthFIleDAO implements UserAuthDAO {
         UserAuth[] userAuthKeysArray = objectMapper.readValue(new File(filename), UserAuth[].class);
 
         for (UserAuth userAuth : userAuthKeysArray) {
-            if (userAuth.getExpiration().compareTo(LocalDateTime.now()) > -1) { // Someone else double check the logic is correct. Checks if auth is valid and adds if so
+            if (userAuth.getExpiration().isBefore(LocalDateTime.now())) {
                 userAuthMap.put(userAuth.getKey(), userAuth);
             }
         }
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 0d9b9e4..4b09449 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
@@ -81,7 +81,8 @@ public class UserFileDAO implements UserDAO {
     public User updateUser(User user) throws IOException {
         synchronized (users) {
             if (users.containsKey(user.getUsername())) {
-                if (user.getBasket() == null || user.getType() == null) { // TODO clean this up
+                if (user.getBasket() == null || user.getType() == null) {
+                    System.err.println("CRUTCH HAPPENED");
                     User oldData = users.get(user.getUsername());
                     User crutch = new User(oldData.getUsername(), 0, new ArrayList<>(), oldData.getType());
                     crutch.copyPassword(oldData);