Merge remote-tracking branch 'refs/remotes/origin/main' into funding_basket

# Conflicts:
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.ts

3 files changed, 91 insertions, 33 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/Need.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/Need.java
index 2611357..c0e9214 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/Need.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/Need.java
@@ -14,7 +14,7 @@ public class Need {
     @JsonProperty("filterAttributes") private String[] filterAttributes;
     @JsonProperty("type") final private GoalType type;
     @JsonProperty("maxGoal") private double maxGoal;
-    @JsonProperty("Current") private double current;
+    @JsonProperty("current") private double current;
 
     /**
      * Create a new need
@@ -32,6 +32,19 @@ public class Need {
     }
 
     /**
+     * Create a new need
+     *
+     * @param name    The name of the need
+     * @param maxGoal The maximum goal for this need
+     * @param type    The type of need (monetary, physical)
+     */
+    public Need(String name, GoalType type, double maxGoal) {
+        this.name = name;
+        this.type = type;
+        this.maxGoal = maxGoal;
+    }
+
+    /**
      * Create a deep copy of another need
      *
      * @param other The need to copy from
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 59f4c46..f08f9f0 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
@@ -7,46 +7,40 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class User {
 
-    @JsonProperty("name")
-    private final String name;
-    @JsonProperty("passwordHash")
-    private int passwordHash;
-    @JsonProperty("basket")
-    private final List<Need> basket;
-
-    /**
-     * Create a new user
-     * 
-     * @param name The name of the user
-     */
-    public User(String name) {
-        this.name = name;
-        basket = new ArrayList<>();
+    public enum UserType {
+        HELPER,
+        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;
+
     /**
      * Create a new user
      * 
-     * @param name   The name of the user
+     * @param username   The name of the user
      * @param basket A basket to copy from
      */
-    public User(@JsonProperty("name") String name, @JsonProperty("basket") List<Need> basket) {
-        this.name = name;
+    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;
+        this.type = userType;
     }
 
-    /**
-     * Create a deep copy of another user
-     *
-     * @param other The user to copy from
-     */
-    public User(User other) {
-        this.name = other.name;
-        this.basket = other.basket;
+    public static User create(String username, String password) {
+        return new User(
+                username,
+                password.hashCode(),
+                new ArrayList<>(),
+                UserType.HELPER
+        );
     }
 
-    public String getName() {
-        return name;
+    public String getUsername() {
+        return username;
     }
 
     public boolean verifyPassword(String password) {
@@ -54,15 +48,23 @@ public class User {
     }
 
     public void addToBasket(Need need) {
-        basket.add(need);
+        basket.add(need.getId());
     }
 
-    public Need[] getBasketNeeds() {
-        return basket.toArray(Need[]::new);
+    public Integer[] getBasketNeeds() {
+        return basket.toArray(Integer[]::new);
     }
 
     public void removeBasketNeed(Need need) {
-        basket.remove(need);
+        basket.remove(need.getId());
+    }
+
+    public User withoutPasswordHash() {
+        return new User(this.username, 0, this.basket, this.type);
+    }
+
+    public UserType getType() {
+        return type;
     }
 
 }
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/UserAuth.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/UserAuth.java
new file mode 100644
index 0000000..1c11a28
--- /dev/null
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/UserAuth.java
@@ -0,0 +1,43 @@
+package com.ufund.api.ufundapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class UserAuth {
+    @JsonProperty("key") String key;
+    @JsonProperty("username") String username;
+    @JsonProperty("expiration") LocalDateTime expiration;
+
+    public UserAuth(@JsonProperty("key") String key, @JsonProperty("username") String username, @JsonProperty("expiration") LocalDateTime expiration) {
+        this.key = key;
+        this.expiration = expiration;
+        this.username = username;
+    }
+
+    /**
+     * Generate a new user authentication profile
+     * @param username the username the key will belong to
+     * @return The new user authentication profile
+     */
+    public static UserAuth generate(String username) {
+        return new UserAuth(
+                UUID.randomUUID().toString(),
+                username,
+                LocalDateTime.now().plusDays(30)
+        );
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public LocalDateTime getExpiration() {
+        return expiration;
+    }
+}