2 files changed, 14 insertions, 14 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 dfcb8a3..7773028 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
@@ -1,6 +1,7 @@
 package com.ufund.api.ufundapi.controller;
 
 import java.io.IOException;
+import java.security.InvalidParameterException;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -20,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ufund.api.ufundapi.model.Need;
 import com.ufund.api.ufundapi.model.Need.GoalType;
 import com.ufund.api.ufundapi.service.CupboardService;
-import com.ufund.api.ufundapi.service.CupboardService.DuplicateKeyException;
+import com.ufund.api.ufundapi.DuplicateKeyException;
 
 @RestController
 @RequestMapping("cupboard")
@@ -50,7 +51,7 @@ public class CupboardController {
     public ResponseEntity<Need> createNeed(@RequestBody Map<String, String> params) {
         String name = params.get("name");
         int maxGoal = Integer.parseInt(params.get("maxGoal"));
-        Need.GoalType goalType = GoalType.valueOf(params.get("maxGoal"));
+        Need.GoalType goalType = GoalType.valueOf(params.get("goalType"));
 
         try {
             Need need = cupboardService.createNeed(name, maxGoal, goalType);
@@ -141,15 +142,17 @@ public class CupboardController {
      * @param need The need to update
      * @return OK response and the need if it was successful, or INTERNAL_SERVER_ERROR if there was an issue
      */
-    @PutMapping("")
-    public ResponseEntity<Need> updateNeed(@RequestBody Need need) {
+    @PutMapping("/{id}")
+    public ResponseEntity<Need> updateNeed(@RequestBody Need need, @PathVariable int id) {
         try {
-            Need updatedNeed = cupboardService.updateNeed(need);
+            Need updatedNeed = cupboardService.updateNeed(need, id);
             if (updatedNeed != null) {
                 return new ResponseEntity<>(need, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.NOT_FOUND);
             }
+        } catch (InvalidParameterException ex) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         } catch (IOException e) {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
index 02526af..0bb3fcf 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
@@ -1,10 +1,12 @@
 package com.ufund.api.ufundapi.controller;
 
 import java.io.IOException;
+import java.security.InvalidParameterException;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.ufund.api.ufundapi.DuplicateKeyException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -20,12 +22,6 @@ public class UserController {
     private final UserService userService;
     private final AuthService authService;    
 
-    /**
-     * Creates a UserController
-     * 
-     * @param userService
-     * @param authService
-     */
     public UserController(UserService userService, AuthService authService) {
         this.userService = userService;
         this.authService = authService;
@@ -49,7 +45,8 @@ public class UserController {
             } else {
                 return new ResponseEntity<>(HttpStatus.CONFLICT);
             }
-
+        } catch (DuplicateKeyException ex) {
+            return new ResponseEntity<>(HttpStatus.CONFLICT);
         } catch (IOException ex) {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
@@ -93,7 +90,6 @@ public class UserController {
      */
     @PutMapping("/{username}")
     public ResponseEntity<User> updateUser(@RequestBody User user, @PathVariable String username, @RequestHeader("jelly-api-key") String key) {
-
         try {
             authService.authenticate(username, key);
             user = userService.updateUser(user, username);
@@ -102,7 +98,8 @@ public class UserController {
             } else {
                 return new ResponseEntity<>(HttpStatus.NOT_FOUND);
             }
-
+        } catch (InvalidParameterException ex) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         } catch (IOException e) {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         } catch (IllegalAccessException e) {