Merge branch 'list-and-cupboard-component-refactor' of https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions into list-and-cupboard-component-refactor

3 files changed, 2 insertions, 20 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 c62bff3..d426aee 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
@@ -106,8 +106,6 @@ public class CupboardController {
       *
       * @param name The name parameter which contains the text used to find the {@link Need need}
       *
-      * @deprecated Searching should now be done client side in the future
-      *
       * @return ResponseEntity with array of {@link Need need} objects (may be empty) and
       * HTTP status of OK<br>
       * ResponseEntity with HTTP status of INTERNAL_SERVER_ERROR otherwise
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 00cd38f..55a9441 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
@@ -46,7 +46,7 @@ public class Need {
      * @param type    The type of need (monetary, physical)
      * @param urgent The urgency of the need
      */
-    public Need(String name, String location, GoalType type, double maxGoal, boolean urgent) {
+    public Need(String name, String location, double maxGoal, GoalType type, boolean urgent) {
         this.name = name;
         this.location = location;
         this.type = type;
@@ -74,10 +74,6 @@ public class Need {
         return name;
     }
 
-    public String getLocation() {
-        return location;
-    }
-
     public int getId() {
         return id;
     }
@@ -98,10 +94,6 @@ public class Need {
         return current;
     }
 
-    public boolean isUrgent() {
-        return urgent;
-    }
-
     public void setCurrent(double current) {
         this.current = current;
     }
@@ -122,15 +114,7 @@ public class Need {
         this.name = name;
     }
 
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
     public void setID(int id){
         this.id = id;
     }
-
-    public void setUrgent(boolean urgent) {
-        this.urgent = urgent;
-    }
 }
\ No newline at end of file
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java
index 15d1fad..4dcfcad 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java
@@ -43,7 +43,7 @@ public class CupboardService {
             }
         }
 
-        Need need = new Need(name, location, goalType, maxGoal, urgent);
+        Need need = new Need(name, location, maxGoal, goalType, urgent);
         return cupboardDAO.addNeed(need);
 
     }