From c15aa3daab0cf9a640945d4e634d1327fb55d2db Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Tue, 25 Mar 2025 00:03:45 -0400
Subject: Greatly improve logging and other backend clean up
---
.../java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 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 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;
--
cgit v1.2.3
From d31c1aec7f615646553a227c8e235d4ae2679c68 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Tue, 25 Mar 2025 08:20:31 -0400
Subject: Rename user getNeeds to getBasket
---
.../src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 2 +-
1 file changed, 1 insertion(+), 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 6e900aa..16560e7 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
@@ -84,7 +84,7 @@ public class UserFileDAO implements UserDAO {
if (users.containsKey(user.getUsername())) {
// var old = users.put(user.getUsername(), user);
// user.copyPassword(old);
- if (user.getNeeds() == null || user.getType() == null) {
+ if (user.getBasket() == 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);
--
cgit v1.2.3
From 5f03e80712f7a18370b5118fde5327bde1b6fbbf Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Tue, 25 Mar 2025 10:17:55 -0400
Subject: Fix tests and more cleanup
---
.../java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 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 63d864a..0d9b9e4 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
@@ -45,12 +45,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
@@ -83,9 +81,7 @@ 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.getBasket() == null || user.getType() == null) {
+ if (user.getBasket() == null || user.getType() == null) { // TODO clean this up
User oldData = users.get(user.getUsername());
User crutch = new User(oldData.getUsername(), 0, new ArrayList<>(), oldData.getType());
crutch.copyPassword(oldData);
@@ -107,7 +103,8 @@ public class UserFileDAO implements UserDAO {
synchronized (users) {
if (users.containsKey(username)) {
users.remove(username);
- return save();
+ save();
+ return true;
} else {
return false;
}
--
cgit v1.2.3
From 5dfb1327c4507ae1613debb5b485fd74edff33db Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Wed, 26 Mar 2025 19:00:04 -0400
Subject: fix expiration logic and cleanup
---
.../src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 3 ++-
1 file changed, 2 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 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);
--
cgit v1.2.3
From 4f5e9e9ecda282a98af5d70bd6cf0540973c7314 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Thu, 27 Mar 2025 18:47:27 -0400
Subject: Remove crutch
---
.../com/ufund/api/ufundapi/persistence/UserFileDAO.java | 13 ++-----------
1 file changed, 2 insertions(+), 11 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 4b09449..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,7 +2,6 @@ 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;
@@ -81,16 +80,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) {
- 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);
- users.put(user.getUsername(), crutch);
- } else {
- var old = users.put(user.getUsername(), user);
- user.copyPassword(Objects.requireNonNull(old));
- }
+ var old = users.put(user.getUsername(), user);
+ user.copyPassword(Objects.requireNonNull(old));
save();
return user;
} else {
--
cgit v1.2.3