Merge pull request #22 from RIT-SWEN-261-02/css

Merge css into main

1 files changed, 34 insertions, 32 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 bbfd3f6..12fb0a9 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
@@ -5,7 +5,6 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.ufund.api.ufundapi.service.AuthService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -22,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ufund.api.ufundapi.DuplicateKeyException;
 import com.ufund.api.ufundapi.model.Need;
 import com.ufund.api.ufundapi.model.Need.GoalType;
+import com.ufund.api.ufundapi.service.AuthService;
 import com.ufund.api.ufundapi.service.CupboardService;
 
 @RestController
@@ -51,29 +51,33 @@ public class CupboardController {
      *         INTERNAL_SERVER_ERROR otherwise
      */
     @PostMapping("")
-    public ResponseEntity<Need> createNeed(@RequestBody Map<String, Object> params, @RequestHeader("jelly-api-key") String key) {
+    public ResponseEntity<Object> createNeed(@RequestBody Map<String, Object> params, @RequestHeader("jelly-api-key") String key) {
         LOG.log(Level.INFO, "POST /cupboard body={0}", params);
 
         String name = (String) params.get("name");
+        String image = (String) params.get("image");
+        String location = (String) params.get("location");
         double maxGoal = ((Number) params.get("maxGoal")).doubleValue();
+        boolean urgent = (Boolean) params.get("urgent");
+        String description = (String) params.get("description");
         Need.GoalType goalType = GoalType.valueOf((String) params.get("type"));
 
         try {
             authService.keyHasAccessToCupboard(key);
-            Need need = cupboardService.createNeed(name, maxGoal, goalType);
+            Need need = cupboardService.createNeed(name, image, location, maxGoal, goalType, urgent, description);
             return new ResponseEntity<>(need, HttpStatus.OK);
         } catch (DuplicateKeyException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.CONFLICT);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.CONFLICT);
         } catch (IllegalArgumentException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
         } catch (IllegalAccessException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.UNAUTHORIZED);
         } catch (IOException ex) {
             LOG.log(Level.SEVERE, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -86,15 +90,15 @@ public class CupboardController {
      *         ResponseEntity with HTTP status of INTERNAL_SERVER_ERROR otherwise
      */
     @GetMapping("")
-    public ResponseEntity<Need[]> getNeeds() {
+    public ResponseEntity<Object> getNeeds() {
         LOG.info("GET /cupboard");
 
         try {
             Need[] needs = cupboardService.getNeeds();
             return new ResponseEntity<>(needs, HttpStatus.OK);
-        } catch (IOException e) {
-            LOG.log(Level.SEVERE, e.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        } catch (IOException ex) {
+            LOG.log(Level.SEVERE, ex.getLocalizedMessage());
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -104,23 +108,21 @@ 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
       * <p>
       */
     @GetMapping("/")
-    public ResponseEntity<Need[]> searchNeeds(@RequestParam String name) {
+    public ResponseEntity<Object> searchNeeds(@RequestParam String name) {
         LOG.info("GET /cupboard/?name="+name);
 
         try {
             Need[] needs = cupboardService.searchNeeds(name);
             return new ResponseEntity<>(needs, HttpStatus.OK);
-        } catch (IOException e) {
-            LOG.log(Level.SEVERE,e.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        } catch (IOException ex) {
+            LOG.log(Level.SEVERE,ex.getLocalizedMessage());
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -133,7 +135,7 @@ public class CupboardController {
      *         ResponseEntity with HTTP status of NOT_FOUND if not found<br>
      */
     @GetMapping("/{id}")
-    public ResponseEntity<Need> getNeed(@PathVariable int id) {
+    public ResponseEntity<Object> getNeed(@PathVariable int id) {
         LOG.log(Level.INFO, "GET /cupboard/{0}", id);
 
         try {
@@ -143,9 +145,9 @@ public class CupboardController {
             } else {
                 return new ResponseEntity<>(HttpStatus.NOT_FOUND);
             }
-        } catch (IOException e) {
-            LOG.log(Level.SEVERE, e.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        } catch (IOException ex) {
+            LOG.log(Level.SEVERE, ex.getLocalizedMessage());
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
 
     }
@@ -157,7 +159,7 @@ public class CupboardController {
      * @return OK response and the need if it was successful, or INTERNAL_SERVER_ERROR if there was an issue
      */
     @PutMapping("/{id}")
-    public ResponseEntity<Need> updateNeed(@RequestBody Need need, @PathVariable int id, @RequestHeader("jelly-api-key") String key) {
+    public ResponseEntity<Object> updateNeed(@RequestBody Need need, @PathVariable int id, @RequestHeader("jelly-api-key") String key) {
         LOG.log(Level.INFO, "PUT /cupboard/{0} body={1}", of(id, need));
         try {
             authService.keyHasAccessToCupboard(key);
@@ -169,19 +171,19 @@ public class CupboardController {
             }
         } catch (IllegalArgumentException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
         } catch (IllegalAccessException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.UNAUTHORIZED);
         } catch (IOException ex) {
             LOG.log(Level.SEVERE, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
     /**
      * Checks out a need by checkoutAmount
-     * 
+     *
      * @param data JSON object with parameters needID and amount
      * @param key  Key used to authenticate user
      * @return OK if successful, other statuses if failure
@@ -196,13 +198,13 @@ public class CupboardController {
             return new ResponseEntity<>(HttpStatus.OK);
         } catch (IllegalArgumentException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
         } catch (IllegalAccessException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.UNAUTHORIZED);
         } catch (IOException ex) {
             LOG.log(Level.SEVERE, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -213,7 +215,7 @@ public class CupboardController {
      * @return OK if the need was deleted, NOT_FOUND if the need was not found, or INTERNAL_SERVER_ERROR if an error occurred
     */
     @DeleteMapping("/{id}")
-    public ResponseEntity<Need> deleteNeed(@PathVariable int id, @RequestHeader("jelly-api-key") String key) {
+    public ResponseEntity<Object> deleteNeed(@PathVariable int id, @RequestHeader("jelly-api-key") String key) {
         LOG.log(Level.INFO, "DELETE /cupboard/{0}", id);
         try {
             authService.keyHasAccessToCupboard(key);
@@ -225,10 +227,10 @@ public class CupboardController {
             }
         } catch (IllegalAccessException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.UNAUTHORIZED);
         } catch (IOException ex) {
             LOG.log(Level.SEVERE, ex.getLocalizedMessage());
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }