1 files changed, 33 insertions, 22 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 4b2a04d..6b0bb71 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.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -17,21 +18,23 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ufund.api.ufundapi.model.Need;
-import com.ufund.api.ufundapi.persistence.CupboardDAO;
+import com.ufund.api.ufundapi.model.Need.GoalType;
+import com.ufund.api.ufundapi.service.CupboardService;
+import com.ufund.api.ufundapi.service.CupboardService.DuplicateKeyException;
 
 @RestController
 @RequestMapping("cupboard")
 public class CupboardController {
     private static final Logger LOG = Logger.getLogger(CupboardController.class.getName());
-    private final CupboardDAO cupboardDAO;
+    private final CupboardService cupboardService;
 
     /**
      * Create a cupboard controller to receive REST signals
      *
-     * @param cupboardDAO The Data Access Object
+     * @param cupboardService The Data Access Object
      */
-    public CupboardController(CupboardDAO cupboardDAO) {
-        this.cupboardDAO = cupboardDAO;
+    public CupboardController(CupboardService cupboardService) {
+        this.cupboardService = cupboardService;
     }
 
     /**
@@ -41,16 +44,20 @@ public class CupboardController {
      * @return OK response and the need if it was successful, INTERNAL_SERVER_ERROR otherwise
      */
     @PostMapping("")
-    public ResponseEntity<Need> createNeed(@RequestBody Need need) {
+    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"));
+
         try {
-            if (need.getMaxGoal() <= 0) {
-                return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-            }
-            if (need.getMaxGoal() < need.getCurrent()) {
-                return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-            }
-            cupboardDAO.createNeed(need);
+            
+            Need need = cupboardService.createNeed(name, maxGoal, goalType);
             return new ResponseEntity<>(need, HttpStatus.OK);
+
+        } catch (DuplicateKeyException ex) {
+            return new ResponseEntity<>(HttpStatus.CONFLICT);
+        } catch (IllegalArgumentException ex) {
+            return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
         } catch (IOException ex) {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
@@ -69,7 +76,7 @@ public class CupboardController {
         LOG.info("GET /needs");
 
         try {
-            Need[] needs = cupboardDAO.getNeeds();
+            Need[] needs = cupboardService.getNeeds();
             return new ResponseEntity<>(needs, HttpStatus.OK);
         } catch (IOException e) {
             LOG.log(Level.SEVERE, e.getLocalizedMessage());
@@ -93,8 +100,8 @@ public class CupboardController {
         LOG.info("GET /need/?name="+name);
 
         try {
-            Need[] needArray = cupboardDAO.findNeeds(name);
-            return new ResponseEntity<>(needArray, HttpStatus.OK);
+            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);
@@ -116,7 +123,7 @@ public class CupboardController {
         LOG.log(Level.INFO, "GET /need/{0}", id);
 
         try {
-            Need need = cupboardDAO.getNeed(id);
+            Need need = cupboardService.getNeed(id);
             if (need != null) {
                 return new ResponseEntity<>(need, HttpStatus.OK);
             } else {
@@ -140,8 +147,12 @@ public class CupboardController {
     @PutMapping("")
     public ResponseEntity<Need> updateNeed(@RequestBody Need need) {
         try {
-            need = cupboardDAO.updateNeed(need);
-            return new ResponseEntity<>(need, HttpStatus.OK);
+            Need updatedNeed = cupboardService.updateNeed(need);
+            if (updatedNeed != null) {
+                return new ResponseEntity<>(need, HttpStatus.OK);
+            } else {
+                return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+            }
         } catch (IOException e) {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
@@ -156,9 +167,9 @@ public class CupboardController {
     @DeleteMapping("/{id}")
     public ResponseEntity<Need> deleteNeed(@PathVariable int id) {
         try {
-            if (cupboardDAO.getNeed(id) != null) {
-                cupboardDAO.deleteNeed(id);
-                return new ResponseEntity<>(HttpStatus.OK);
+            Need need = cupboardService.getNeed(id);
+            if (cupboardService.deleteNeed(id)) {
+                return new ResponseEntity<>(need, HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(HttpStatus.NOT_FOUND);
             }