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

Hot Fix groups

Browse source
This commit is contained in:
jeffcheasey88 2024-04-16 14:48:43 +02:00
parent b223b6bad4
commit e78ef96cfd
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/dev/peerat/backend/repository/DatabaseQuery.java
View file

@ -51,11 +51,8 @@ public enum DatabaseQuery {
"SELECT * FROM completions WHERE fk_puzzle = ? AND fk_player = ?"), "SELECT * FROM completions WHERE fk_puzzle = ? AND fk_player = ?"),
GET_COMPLETION_GROUP("SELECT c.*\r\n" GET_COMPLETION_GROUP("SELECT c.*\r\n"
+ "FROM completions c\r\n" + "FROM completions c\r\n"
+ "JOIN containsGroups cG on c.fk_player = cG.fk_player\r\n" + "WHERE c.fk_puzzle = ? AND c.fk_player IN\r\n"
+ "JOIN groups g on cG.fk_group = g.id_group\r\n" + "(select f.fk_player FROM containsGroups cgs JOIN containsGroups f ON f.fk_group = cgs.fk_group JOIN groups g ON g.id_group = cgs.fk_group WHERE g.fk_chapter = 12 AND cgs.fk_player = ?)"),
+ "JOIN puzzles p on p.id_puzzle = c.fk_puzzle\r\n"
+ "JOIN chapters ch on ch.id_chapter = p.fk_chapter\r\n"
+ "WHERE (ch.id_chapter = 12) AND cG.fk_player = ? AND p.id_puzzle = ?"),
INSERT_COMPLETION( INSERT_COMPLETION(
"INSERT INTO completions (fk_puzzle, fk_player, tries, code, fileName, score) values (?, ?, ?, ?, ?, ?)"), "INSERT INTO completions (fk_puzzle, fk_player, tries, code, fileName, score) values (?, ?, ?, ?, ?, ?)"),
UPDATE_COMPLETION( UPDATE_COMPLETION(
@ -63,11 +60,8 @@ public enum DatabaseQuery {
SCORE("SELECT score FROM completions WHERE fk_player = ? AND fk_puzzle = ?"), SCORE("SELECT score FROM completions WHERE fk_player = ? AND fk_puzzle = ?"),
SCORE_GROUP("SELECT c.score\r\n" SCORE_GROUP("SELECT c.score\r\n"
+ "FROM completions c\r\n" + "FROM completions c\r\n"
+ "JOIN containsGroups cG on c.fk_player = cG.fk_player\r\n" + "WHERE c.fk_puzzle = ? AND c.fk_player IN\r\n"
+ "JOIN groups g on cG.fk_group = g.id_group\r\n" + "(select f.fk_player FROM containsGroups cgs JOIN containsGroups f ON f.fk_group = cgs.fk_group JOIN groups g ON g.id_group = cgs.fk_group WHERE g.fk_chapter = 12 AND cgs.fk_player = ?)"),
+ "JOIN puzzles p on p.id_puzzle = c.fk_puzzle\r\n"
+ "JOIN chapters ch on ch.id_chapter = p.fk_chapter\r\n"
+ "WHERE (ch.id_chapter = 12) AND cG.fk_player = ? AND p.id_puzzle = ?"),
// PLAYERS // PLAYERS
GET_PLAYER_SIMPLE("SELECT pseudo, email, firstname, lastname, description FROM players WHERE id_player = ?"), GET_PLAYER_SIMPLE("SELECT pseudo, email, firstname, lastname, description FROM players WHERE id_player = ?"),

8
src/dev/peerat/backend/repository/DatabaseRepository.java
View file

@ -157,8 +157,8 @@ public class DatabaseRepository {
try { try {
ensureConnection(); ensureConnection();
PreparedStatement stmt = DatabaseQuery.SCORE_GROUP.prepare(this.con); PreparedStatement stmt = DatabaseQuery.SCORE_GROUP.prepare(this.con);
stmt.setInt(1, user); stmt.setInt(1, puzzle);
stmt.setInt(2, puzzle); stmt.setInt(2, user);
ResultSet result = stmt.executeQuery(); ResultSet result = stmt.executeQuery();
if (result.next()) if (result.next())
return result.getInt("score"); return result.getInt("score");
@ -179,8 +179,8 @@ public class DatabaseRepository {
public Completion getCompletionGroup(int user, int puzzle) { public Completion getCompletionGroup(int user, int puzzle) {
try { try {
PreparedStatement stmt = DatabaseQuery.GET_COMPLETION_GROUP.prepare(this.con); PreparedStatement stmt = DatabaseQuery.GET_COMPLETION_GROUP.prepare(this.con);
stmt.setInt(1, user); stmt.setInt(1, puzzle);
stmt.setInt(2, puzzle); stmt.setInt(2, user);
ResultSet result = stmt.executeQuery(); ResultSet result = stmt.executeQuery();
if (result.next()) if (result.next())
return makeCompletion(result); return makeCompletion(result);