From 7b6457b2865fb6f3930589ffa02a9e971f6cea7d Mon Sep 17 00:00:00 2001
From: Merel Steenbergen <m.a.steenbergen@student.tudelft.nl>
Date: Wed, 3 Apr 2019 14:19:30 +0200
Subject: [PATCH] ADD::RemoveFriend method and test in server.userController

---
 ...ft.pdf => 20190401_draft_final_report.pdf} | Bin
 .../greenify/server/rest/UserController.java  |  16 ++++++++--
 .../server/rest/UserControllerTest.java       |  28 ++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 rename doc/reports/final-report/{Final report - draft.pdf => 20190401_draft_final_report.pdf} (100%)

diff --git a/doc/reports/final-report/Final report - draft.pdf b/doc/reports/final-report/20190401_draft_final_report.pdf
similarity index 100%
rename from doc/reports/final-report/Final report - draft.pdf
rename to doc/reports/final-report/20190401_draft_final_report.pdf
diff --git a/src/Server/src/main/java/greenify/server/rest/UserController.java b/src/Server/src/main/java/greenify/server/rest/UserController.java
index e0e28e8..6d282e9 100644
--- a/src/Server/src/main/java/greenify/server/rest/UserController.java
+++ b/src/Server/src/main/java/greenify/server/rest/UserController.java
@@ -155,13 +155,25 @@ public class UserController {
     }
 
     /**
-     * This method adds friend for a user.
+     * This method adds a friend to a user.
      * @param name name of the user
-     *
+     * @param friend the name of the user you want to add as a friend.
      */
     @RequestMapping("/addFriend")
     public void addFriend(@RequestParam(value = "name") String name,
                               @RequestParam(value = "friend") String friend) {
         userService.addFriend(name, friend);
     }
+
+    /**
+     * This method removes a friend from a user.
+     * @param name name of the user
+     * @param friend name of the friend you want to remove
+     */
+    @RequestMapping("/removeFriend")
+    public void removeFriend(@RequestParam(value = "name") String name,
+                          @RequestParam(value = "friend") String friend) {
+        userService.removeFriend(name, friend);
+    }
 }
+
diff --git a/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java b/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java
index 1866605..4d5d459 100644
--- a/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java
+++ b/src/Server/src/test/java/greenify/server/rest/UserControllerTest.java
@@ -113,6 +113,34 @@ public class UserControllerTest {
         assertEquals("merel", arg2Captor.getValue());
     }
 
+    @Test
+    public void removeFriendTest() throws Exception {
+        ArgumentCaptor<String> arg1Captor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<String> arg2Captor = ArgumentCaptor.forClass(String.class);
+        mvc.perform(get("/addFriend")
+                .param("name", "ceren")
+                .param("friend", "merel")
+                .accept(MediaType.APPLICATION_JSON))
+                .andDo(print())
+                .andExpect(status().isOk());
+        verify(userService, times(1))
+                .addFriend(arg1Captor.capture(), arg2Captor.capture());
+        assertEquals("ceren", arg1Captor.getValue());
+        assertEquals("merel", arg2Captor.getValue());
+
+        mvc.perform(get("/removeFriend")
+                .param("name", "ceren")
+                .param("friend", "merel")
+                .accept(MediaType.APPLICATION_JSON))
+                .andDo(print())
+                .andExpect(status().isOk());
+        verify(userService, times(1)).
+        removeFriend(arg1Captor.capture(), arg2Captor.capture());
+        assertEquals("ceren", arg1Captor.getValue());
+        assertEquals("merel", arg2Captor.getValue());
+
+    }
+
     @Test
     public void getInputMapTest() throws Exception {
         ArgumentCaptor<String> arg1Captor = ArgumentCaptor.forClass(String.class);