From 14e37b9e387205aace7a1999637aef9efc8d7692 Mon Sep 17 00:00:00 2001
From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com>
Date: Mon, 10 Apr 2023 17:00:57 +0200
Subject: [PATCH] Fix groups

---
 .../repository/DatabaseRepository.java          |  4 ++--
 .../peeratcode/routes/groups/GroupJoin.java     |  3 +--
 .../peeratcode/routes/groups/GroupQuit.java     |  2 +-
 .../peeratcode/routes/TmpRoutesTests.java       | 17 +++++++++++++----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java b/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
index fc88541..a4a6c79 100644
--- a/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
+++ b/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
@@ -493,8 +493,8 @@ public class DatabaseRepository {
 			ensureConnection();
 			PreparedStatement statement = DatabaseQuery.INSERT_GROUP.prepare(this.con);
 			statement.setString(1, group.getName());
-			statement.setInt(2, group.getLinkToChapter());
-			statement.setInt(3, group.getLinkToPuzzle());
+			statement.setObject(2, group.getLinkToChapter());
+			statement.setObject(3, group.getLinkToPuzzle());
 			if(statement.executeUpdate() >= 0) return insertUserInGroup(group, creator);
 		} catch (Exception e){}
 		return false;
diff --git a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupJoin.java b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupJoin.java
index 0cbb670..4a1382b 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupJoin.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupJoin.java
@@ -25,8 +25,7 @@ public class GroupJoin implements Response{
 
 	@Route(path = "^\\/groupJoin$", type = POST, needLogin = true)
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
-		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
-		
+		HttpUtil.skipHeaders(reader);
 		if (this.repo.insertUserInGroup(new Group((JSONObject) HttpUtil.readJson(reader)), user)) {
 			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 		} else {
diff --git a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupQuit.java b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupQuit.java
index 5dd7fcf..8f579ac 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupQuit.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupQuit.java
@@ -25,7 +25,7 @@ public class GroupQuit implements Response{
 
 	@Route(path = "^\\/groupQuit$", type = POST, needLogin = true)
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
-		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
+		HttpUtil.skipHeaders(reader);
 		
 		if (this.repo.leaveGroup(new Group((JSONObject) HttpUtil.readJson(reader)), user)) {
 			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
diff --git a/test/be/jeffcheasey88/peeratcode/routes/TmpRoutesTests.java b/test/be/jeffcheasey88/peeratcode/routes/TmpRoutesTests.java
index 2b5bad9..97beaa4 100644
--- a/test/be/jeffcheasey88/peeratcode/routes/TmpRoutesTests.java
+++ b/test/be/jeffcheasey88/peeratcode/routes/TmpRoutesTests.java
@@ -2,6 +2,7 @@ package be.jeffcheasey88.peeratcode.routes;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
+import org.json.simple.JSONObject;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -41,12 +42,20 @@ public class TmpRoutesTests {
 	@Test
 	void testOnDeployed(){
 		try {
-			WebClient deploy = new WebClient("api.peerat.dev", 80);
+			JSONObject content = new JSONObject();
+			content.put("name", "testTeam1");
+			content.put("chapter", 2);
 			
-			deploy.auth("JeffCheasey88", "TheoPueDesPieds");
-			deploy.route("/player/","GET");
+			client.auth("JeffCheasey88", "TheoPueDesPieds");
 			
-			deploy.assertResponseCode(200);
+			client.route("/groupCreate", "POST", content.toJSONString());
+			client.assertResponseCode(200);
+			
+			client.route("/groupJoin","POST",content.toJSONString());
+			client.assertResponseCode(200);
+			
+			client.route("/groupQuit", "POST", content.toJSONString());
+			client.assertResponseCode(200);
 		}catch(Exception e){
 			fail(e);
 		}