From 2bdffe6ab4962d660a6302e114b2028f8f439aef Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Fri, 29 Mar 2024 14:30:46 +0100
Subject: [PATCH] remove member of a discussion

---
 .../Clyde/EndPoints/Msg/MessagesController.java | 16 +++++++++++++++-
 .../herisson/Clyde/Tables/Msg/Discussion.java   |  4 ++++
 frontend/src/Apps/Msg.vue                       | 17 +++++++++++++++--
 frontend/src/rest/msg.js                        |  4 ++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Msg/MessagesController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Msg/MessagesController.java
index 8cee27c..591e172 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Msg/MessagesController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Msg/MessagesController.java
@@ -65,7 +65,7 @@ public class MessagesController {
 	}
 
 	@PatchMapping("/discussion/{id}/add")
-	public ResponseEntity<Discussion> AlterDiscussion(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody User data){
+	public ResponseEntity<Discussion> invite(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody User data){
 		User user = authServ.getUserFromToken(token);
 		if(user == null){
 			return new UnauthorizedResponse<>(null);
@@ -78,6 +78,20 @@ public class MessagesController {
 		return new ResponseEntity<>(disc, HttpStatus.OK);
 	}
 
+	@PatchMapping("/discussion/{id}/remove")
+	public ResponseEntity<Discussion> removeMember(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody User data){
+		User user = authServ.getUserFromToken(token);
+		if(user == null){
+			return new UnauthorizedResponse<>(null);
+		}
+
+		Discussion disc = discRepo.findById(id).orElse(null);
+		User member = userServ.getUserById(data.getRegNo());
+		disc.delMember(member);
+		discRepo.save(disc);
+		return new ResponseEntity<>(disc, HttpStatus.OK);
+	}
+
 	@PostMapping("/discussion/{id}")
 	public ResponseEntity<Discussion> sendMessage(@RequestHeader("Authorization") String token, @PathVariable long id, @RequestBody Message msg){
 		User user = authServ.getUserFromToken(token);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Discussion.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Discussion.java
index e98bd1e..ee0912e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Discussion.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Discussion.java
@@ -55,4 +55,8 @@ public class Discussion{
     public void addMember(User user) {
 		members.add(user);
     }
+
+    public void delMember(User user) {
+		members.remove(user);
+    }
 }
diff --git a/frontend/src/Apps/Msg.vue b/frontend/src/Apps/Msg.vue
index b74f980..a5aa1f4 100644
--- a/frontend/src/Apps/Msg.vue
+++ b/frontend/src/Apps/Msg.vue
@@ -7,7 +7,7 @@
 
 <script setup>
 	import { ref, reactive } from 'vue'
-	import { discussionsList, currentDiscussion, fetchDiscussion, createDiscussion, sendMessage, updateDiscussionName, invite} from '@/rest/msg.js'
+	import { discussionsList, currentDiscussion, fetchDiscussion, createDiscussion, sendMessage, updateDiscussionName, invite, removeMember} from '@/rest/msg.js'
 
 	const msgContent = ref("");
 	const addMember = ref(false);
@@ -33,7 +33,7 @@
 			</div>
 		</div>
 		<div id="members" v-if="currentDiscussion.length != 0">
-			<div class="memberItem" v-for="member in currentDiscussion.members" :key="member.id">{{ member.firstName }} {{ member.lastName.toUpperCase() }}</div>
+			<div class="memberItem" v-for="member in currentDiscussion.members" @click="removeMember(currentDiscussion.id, member.regNo)" :key="member.id"><span>{{ member.firstName }} {{ member.lastName.toUpperCase() }}</span></div>
 			<input type=text id="addMembers" @focus="addMember = true" @blur="addMember = false;$event.target.value = ''" @change="invite(currentDiscussion.id, $event.target.value)" :placeholder="addMember ? 'Regno' : '+'"/>
 		</div>
 	</div>
@@ -102,6 +102,19 @@ div#members{
 	border: 1px solid darkorange;
 }
 
+.memberItem:hover span{
+	display: none;
+}
+
+.memberItem:hover{
+	background-color: red;
+}
+
+.memberItem:hover:before{
+	color: white;
+	content: "X"
+}
+
 #createDiscussion{
 	height: 4vh;
 	margin: 5px;
diff --git a/frontend/src/rest/msg.js b/frontend/src/rest/msg.js
index a27161b..4b17d43 100644
--- a/frontend/src/rest/msg.js
+++ b/frontend/src/rest/msg.js
@@ -27,6 +27,10 @@ export async function invite(id, regNo){
 	restPatch("/discussion/"+ id+ "/add", {regNo: parseInt(regNo)}).then(() => fetchDiscussion(id))
 }
 
+export async function removeMember(id, regNo){
+	restPatch("/discussion/"+ id+ "/remove", {regNo: parseInt(regNo)}).then(() => fetchDiscussion(id))
+}
+
 export async function sendMessage(id, content, responseId){
 	let data = {
 		content: content,