1 files changed, 67 insertions, 47 deletions
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java
index 839c518..94f93cb 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java
@@ -1,6 +1,8 @@
 package com.ufund.api.ufundapi.controller;
 
 import java.io.IOException;
+import java.util.Map;
+import static java.util.Map.entry;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,54 +13,74 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import org.springframework.http.HttpStatus;
 
+import com.ufund.api.ufundapi.DuplicateKeyException;
 import com.ufund.api.ufundapi.model.Need;
-import com.ufund.api.ufundapi.persistence.CupboardFileDao;
+import com.ufund.api.ufundapi.model.Need.GoalType;
+import com.ufund.api.ufundapi.service.CupboardService;
 
 public class CupboardControllerTest {
     private CupboardController cupboardController;
-    private CupboardFileDao mockCupboardDAO;
+    private CupboardService mockCupboardService;
 
     @BeforeEach
     public void setupCupboardDAO() {
-        mockCupboardDAO = mock(CupboardFileDao.class);
-        cupboardController = new CupboardController(mockCupboardDAO);
+        mockCupboardService = mock(CupboardService.class);
+        cupboardController = new CupboardController(mockCupboardService);
     }
 
     @Test
-    public void createNeed() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.createNeed(need)).thenReturn(need);
+    public void createNeed() throws IOException, DuplicateKeyException {
+        String name = "Test";
+        int maxGoal = 100;
+        GoalType type = Need.GoalType.MONETARY;
+        var need = new Need(name, type, maxGoal);
+        when(mockCupboardService.createNeed(name, maxGoal, type)).thenReturn(need);
+
 
-        var res = cupboardController.createNeed(need);
+        Map<String, Object> needMap = Map.ofEntries(
+                entry("name", "Test"),
+                entry("maxGoal", 100),
+                entry("type", "MONETARY")
+        );
+
+        var res = cupboardController.createNeed(needMap);
 
         assertEquals(HttpStatus.OK, res.getStatusCode());
         assertEquals(need, res.getBody());
     }
 
     @Test
-    public void createNeedBadMaxGoal() throws IOException {
-        var need = new Need("Name", 1, -100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.createNeed(need)).thenReturn(need);
+    public void createNeedBadMaxGoal() throws IOException, DuplicateKeyException {
+        when(mockCupboardService.createNeed("Name", -100, Need.GoalType.MONETARY)).thenThrow(new IllegalArgumentException());
+
+        Map<String, Object> needMap = Map.ofEntries(
+                entry("name", "Name"),
+                entry("maxGoal", -100),
+                entry("type", "MONETARY"));
 
-        var res = cupboardController.createNeed(need);
+        var res = cupboardController.createNeed(needMap);
 
-        assertEquals(HttpStatus.BAD_REQUEST, res.getStatusCode());
+        assertEquals(HttpStatus.UNPROCESSABLE_ENTITY, res.getStatusCode());
     }
 
     @Test
-    public void createNeedIOException() throws IOException {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.createNeed(need)).thenThrow(new IOException());
+    public void createNeedIOException() throws IOException, DuplicateKeyException {
+        when(mockCupboardService.createNeed("Name", 100, Need.GoalType.MONETARY)).thenThrow(new IOException());
+
+        Map<String, Object> needMap = Map.ofEntries(
+                entry("name", "Name"),
+                entry("maxGoal", 100),
+                entry("type", "MONETARY"));
 
-        var res = cupboardController.createNeed(need);
+        var res = cupboardController.createNeed(needMap);
 
         assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, res.getStatusCode());
     }
 
     @Test
-    public void getNeeds() {
+    public void getNeeds() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.getNeeds()).thenReturn(new Need[]{need});
+        when(mockCupboardService.getNeeds()).thenReturn(new Need[]{need});
 
         var res = cupboardController.getNeeds();
 
@@ -67,9 +89,8 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void getNeedsIOException() {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.getNeeds()).thenThrow(new IOException());
+    public void getNeedsIOException() throws IOException {
+        when(mockCupboardService.getNeeds()).thenThrow(new IOException());
 
         var res = cupboardController.getNeeds();
 
@@ -77,8 +98,8 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void getNeedsEmpty() {
-        when(mockCupboardDAO.getNeeds()).thenReturn(new Need[]{});
+    public void getNeedsEmpty() throws IOException {
+        when(mockCupboardService.getNeeds()).thenReturn(new Need[]{});
 
         var res = cupboardController.getNeeds();
 
@@ -87,9 +108,9 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void searchNeeds() {
+    public void searchNeeds() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.findNeeds("Na")).thenReturn(new Need[]{need});
+        when(mockCupboardService.searchNeeds("Na")).thenReturn(new Need[]{need});
 
         var res = cupboardController.searchNeeds("Na");
 
@@ -98,9 +119,8 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void searchNeedsIOException() {
-        var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.findNeeds("Na")).thenThrow(new IOException());
+    public void searchNeedsIOException() throws IOException {
+        when(mockCupboardService.searchNeeds("Na")).thenThrow(new IOException());
 
         var res = cupboardController.searchNeeds("Na");
 
@@ -108,8 +128,8 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void searchNeedsEmpty() {
-        when(mockCupboardDAO.findNeeds("Na")).thenReturn(new Need[]{});
+    public void searchNeedsEmpty() throws IOException {
+        when(mockCupboardService.searchNeeds("Na")).thenReturn(new Need[]{});
 
         var res = cupboardController.searchNeeds("Na");
 
@@ -118,9 +138,9 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void getNeed() {
+    public void getNeed() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.getNeed(need.getId())).thenReturn(need);
+        when(mockCupboardService.getNeed(need.getId())).thenReturn(need);
 
         var res = cupboardController.getNeed(need.getId());
 
@@ -129,9 +149,9 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void getNeedIOException() {
+    public void getNeedIOException() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.getNeed(need.getId())).thenThrow(new IOException());
+        when(mockCupboardService.getNeed(need.getId())).thenThrow(new IOException());
 
         var res = cupboardController.getNeed(need.getId());
 
@@ -139,9 +159,9 @@ public class CupboardControllerTest {
     }
 
     @Test
-    public void getNeedFail() {
+    public void getNeedFail() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.getNeed(need.getId())).thenReturn(null);
+        when(mockCupboardService.getNeed(need.getId())).thenReturn(null);
 
         var res = cupboardController.getNeed(need.getId());
 
@@ -152,9 +172,9 @@ public class CupboardControllerTest {
     @Test
     public void updateNeeds() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.updateNeed(need)).thenReturn(need);
+        when(mockCupboardService.updateNeed(need, 1)).thenReturn(need);
 
-        var res = cupboardController.updateNeed(need);
+        var res = cupboardController.updateNeed(need, 1);
 
         assertEquals(HttpStatus.OK, res.getStatusCode());
         assertEquals(need, res.getBody());
@@ -163,9 +183,9 @@ public class CupboardControllerTest {
     @Test
     public void updateNeedsIOException() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.updateNeed(need)).thenThrow(new IOException());
+        when(mockCupboardService.updateNeed(need, 1)).thenThrow(new IOException());
 
-        var res = cupboardController.updateNeed(need);
+        var res = cupboardController.updateNeed(need, 1);
 
         assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, res.getStatusCode());
     }
@@ -173,8 +193,8 @@ public class CupboardControllerTest {
     @Test
     public void deleteNeed() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.getNeed(1)).thenReturn(need);
-        when(mockCupboardDAO.deleteNeed(1)).thenReturn(true);
+        when(mockCupboardService.getNeed(1)).thenReturn(need);
+        when(mockCupboardService.deleteNeed(1)).thenReturn(true);
 
         var res = cupboardController.deleteNeed(1);
 
@@ -183,8 +203,8 @@ public class CupboardControllerTest {
 
     @Test
     public void deleteNeedFail() throws IOException {
-        when(mockCupboardDAO.getNeed(1)).thenReturn(null);
-        when(mockCupboardDAO.deleteNeed(1)).thenReturn(false);
+        when(mockCupboardService.getNeed(1)).thenReturn(null);
+        when(mockCupboardService.deleteNeed(1)).thenReturn(false);
 
         var res = cupboardController.deleteNeed(1);
 
@@ -194,8 +214,8 @@ public class CupboardControllerTest {
     @Test
     public void deleteNeedIOException() throws IOException {
         var need = new Need("Name", 1, 100, Need.GoalType.MONETARY);
-        when(mockCupboardDAO.getNeed(1)).thenReturn(need);
-        when(mockCupboardDAO.deleteNeed(1)).thenThrow(new IOException());
+        when(mockCupboardService.getNeed(1)).thenReturn(need);
+        when(mockCupboardService.deleteNeed(1)).thenThrow(new IOException());
 
         var res = cupboardController.deleteNeed(1);