Peer-at-Code/peer-at-code-backend
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix groups

Browse source
This commit is contained in:
jeffcheasey88 2023-04-10 17:00:57 +02:00
parent 5609822241
commit 14e37b9e38
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
View file

@ -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;

3
src/be/jeffcheasey88/peeratcode/routes/groups/GroupJoin.java
View file

@ -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 {

2
src/be/jeffcheasey88/peeratcode/routes/groups/GroupQuit.java
View file

@ -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: *");

17
test/be/jeffcheasey88/peeratcode/routes/TmpRoutesTests.java
View file

@ -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);
}