Merge remote-tracking branch 'origin/api-cleanup' into api-cleanup

4 files changed, 24 insertions, 17 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java
index 2871916..d04d8b7 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java
@@ -12,18 +12,23 @@ public class User {
         MANAGER
     }
 
-    @JsonProperty("username") private final String username;
-    @JsonProperty("passwordHash") private int passwordHash;
-    @JsonProperty("basket") private final List<Integer> basket;
-    @JsonProperty("type") private final UserType type;
+    @JsonProperty("username")
+    private final String username;
+    @JsonProperty("passwordHash")
+    private int passwordHash;
+    @JsonProperty("basket")
+    private final List<Integer> basket;
+    @JsonProperty("type")
+    private final UserType type;
 
     /**
      * Create a new user
      * 
-     * @param username   The name of the user
-     * @param basket A basket to copy from
+     * @param username The name of the user
+     * @param basket   A basket to copy from
      */
-    public User(@JsonProperty("username") String username, @JsonProperty("passwordHash") int passwordHash, @JsonProperty("basket") List<Integer> basket, @JsonProperty("type") UserType userType) {
+    public User(@JsonProperty("username") String username, @JsonProperty("passwordHash") int passwordHash,
+            @JsonProperty("basket") List<Integer> basket, @JsonProperty("type") UserType userType) {
         this.username = username;
         this.basket = basket;
         this.passwordHash = passwordHash;
@@ -35,8 +40,7 @@ public class User {
                 username,
                 password.hashCode(),
                 new ArrayList<>(),
-                UserType.HELPER
-        );
+                UserType.HELPER);
     }
 
     public String getUsername() {
@@ -44,7 +48,8 @@ public class User {
     }
 
     /**
-     * Verifies if the provided password's hash is the same as the user's actual hash
+     * Verifies if the provided password's hash is the same as the user's actual
+     * hash
      * 
      * @param password The password to check if valid
      * @return True or false depending on if it's equal
@@ -62,7 +67,7 @@ public class User {
         basket.add(need.getId());
     }
 
-    public Integer[] getNeeds() {
+    public Integer[] getBasket() {
         return basket.toArray(Integer[]::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 1b888cd..63d864a 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
@@ -83,7 +83,9 @@ public class UserFileDAO implements UserDAO {
     public User updateUser(User user) throws IOException {
         synchronized (users) {
             if (users.containsKey(user.getUsername())) {
-                if (user.getNeeds() == null || user.getType() == null) { // TODO clean this up -tyler
+                // var old = users.put(user.getUsername(), user);
+                // user.copyPassword(old);
+                if (user.getBasket() == null || user.getType() == null) {
                     User oldData = users.get(user.getUsername());
                     User crutch = new User(oldData.getUsername(), 0, new ArrayList<>(), oldData.getType());
                     crutch.copyPassword(oldData);
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java
index aaa2f06..51283fc 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/UserService.java
@@ -48,7 +48,7 @@ public class UserService {
         if (user == null) {
             return null;
         }
-        for (int needId : user.getNeeds()) {
+        for (int needId : user.getBasket()) {
             if (cupboardService.getNeed(needId) == null) {
                 user.removeBasketNeed(needId);
             }
@@ -59,7 +59,7 @@ public class UserService {
     /**
      * Updates a user
      *
-     * @param user The ID of the user to update
+     * @param user     The ID of the user to update
      * @param username The user object to set (note: the ID is ignored)
      * @return The updated user object
      * @throws IOException Thrown if there was any issue saving the data
@@ -81,5 +81,5 @@ public class UserService {
     public boolean deleteUser(String username) throws IOException {
         return userDAO.deleteUser(username);
     }
-    
+
 }
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
index 55b7f07..517a7e2 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
@@ -59,7 +59,7 @@ public class UserTest {
 
         user.addToBasket(need);
 
-        Need getNeed = cupboardService.getNeed(user.getNeeds()[0]);
+        Need getNeed = cupboardService.getNeed(user.getBasket()[0]);
 
         assertEquals(needs[0], getNeed);
 
@@ -80,7 +80,7 @@ public class UserTest {
         user.removeBasketNeed(need.getId());
         user.addToBasket(need2);
 
-        Need getNeed = cupboardService.getNeed(user.getNeeds()[0]);
+        Need getNeed = cupboardService.getNeed(user.getBasket()[0]);
 
         assertEquals(need2, getNeed);