Merge branch 'main' into need-image

# Conflicts:
#	ufund-ui/src/app/components/need-list/need-list.component.ts
#	ufund-ui/src/app/components/need-page/need-page.component.html

2 files changed, 19 insertions, 1 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
index 075878a..5452c81 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
@@ -198,7 +198,7 @@ public class CupboardController {
             for (Map<String, Integer> map : data) {
                 int needID = map.get("needID");
                 if (cupboardService.getNeed(needID) == null) {
-                    return new ResponseEntity<>("One or more need is invalid, please refresh.", HttpStatus.BAD_REQUEST);
+                    return new ResponseEntity<>("One or more needs are invalid, please refresh.", HttpStatus.BAD_REQUEST);
                 }
             }
             for (Map<String, Integer> map : data) {
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 9b6170b..d3b3065 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
@@ -2,6 +2,8 @@ package com.ufund.api.ufundapi.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.util.Arrays;
+
 public class Need {
 
     public enum GoalType {
@@ -129,4 +131,20 @@ public class Need {
     public void setID(int id){
         this.id = id;
     }
+
+    @Override
+    public String toString() {
+        return "Need{" +
+                "name='" + name + '\'' +
+                ", image='" + image + '\'' +
+                ", location='" + location + '\'' +
+                ", id=" + id +
+                ", filterAttributes=" + Arrays.toString(filterAttributes) +
+                ", type=" + type +
+                ", maxGoal=" + maxGoal +
+                ", urgent=" + urgent +
+                ", current=" + current +
+                ", description='" + description + '\'' +
+                '}';
+    }
 }
\ No newline at end of file