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

Manage group as Object and no more String for leaderboard and playerDetails

Browse source
This commit is contained in:
Francois G 2023-03-20 15:16:11 +01:00
parent a4b4ef8beb
commit 6442ebdf19
3 changed files with 97 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/be/jeffcheasey88/peeratcode/model/Player.java
View file

@ -1,9 +1,11 @@
package be.jeffcheasey88.peeratcode.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
@ -21,7 +23,7 @@ public class Player implements Comparable<Player> {
private String firstname;
private String lastname;
private String description;
private LinkedHashSet<String> groups;
private Set<Group> groups;
private byte[] avatar;
private int rank;
@ -32,35 +34,15 @@ public class Player implements Comparable<Player> {
private Set<Badge> badges;
public Player(String pseudo, String email, String firstname, String lastname, String description) {
this(pseudo, email, firstname, lastname, description, null, null);
}
public Player(String pseudo, String email, String firstname, String lastname, String description, String groups) {
this(pseudo, email, firstname, lastname, description, groups, null);
}
public Player(String pseudo, String email, String firstname, String lastname, String description, String groups,
byte[] avatar) {
this(pseudo, email, firstname, lastname, description, groups, avatar, null);
}
public Player(String pseudo, String email, String firstname, String lastname, String description, String groups,
byte[] avatar, Set<Badge> badges) {
this.pseudo = pseudo;
this.email = email;
this.firstname = firstname;
this.lastname = lastname;
this.description = description;
setGroups(groups);
this.avatar = avatar;
totalScore = 0;
totalCompletion = 0;
totalTries = 0;
if (badges != null)
this.badges = new HashSet<Badge>(badges);
else
this.badges = new HashSet<Badge>();
}
public String getPseudo() {
@ -83,31 +65,32 @@ public class Player implements Comparable<Player> {
return this.description;
}
public Set<String> getGroups() {
public Set<Group> getGroups() {
return groups;
}
/**
* SEE SET_TAGS IN PUZZLE
*
* @return DEATH
*/
public JSONArray getJsonGroups() {
if (groups == null)
return null;
if (groups != null) {
JSONArray groupsJSON = new JSONArray();
for (String group: groups) {
JSONObject groupJSON = new JSONObject();
groupJSON.put("name", group);
groupsJSON.add(groupJSON);
for (Group group : groups) {
groupsJSON.add(group.getJson());
}
return groupsJSON;
}
return null;
}
public void setGroups(String groups) {
if (groups == null || groups.isEmpty())
this.groups = null;
else
this.groups = new LinkedHashSet<String>(Arrays.asList(groups.split(",")));
public void addGroup(Group newGroup) {
if (newGroup != null) {
if (this.groups == null)
this.groups = new HashSet<Group>();
this.groups.add(newGroup);
}
}
public byte[] getAvatar() {
@ -160,6 +143,7 @@ public class Player implements Comparable<Player> {
/**
* SEE SET_TAGS IN PUZZLE
*
* @return DEATH
*/
public JSONArray getJsonBadges() {
@ -178,6 +162,14 @@ public class Player implements Comparable<Player> {
return badgesJSON;
}
public void addBadge(Badge newBadge) {
if (newBadge != null) {
if (badges == null)
badges = new HashSet<Badge>();
badges.add(newBadge);
}
}
@Override
public int compareTo(Player other) {
if (this == other)
@ -189,14 +181,29 @@ public class Player implements Comparable<Player> {
compare = Integer.compare(other.getTotalCompletion(), totalCompletion);
if (compare == 0) {
compare = Integer.compare(totalTries, other.getTotalTries());
if(compare == 0) compare = other.getPseudo().compareTo(pseudo);
if (compare == 0)
compare = other.getPseudo().compareTo(pseudo);
}
}
return compare;
}
public void addBadge(Badge newBadge) {
badges.add(newBadge);
@Override
public int hashCode() {
return Objects.hash(email, pseudo);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Player other = (Player) obj;
return Objects.equals(email, other.email) && Objects.equals(pseudo, other.pseudo);
}
}

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

@ -19,6 +19,7 @@ import be.jeffcheasey88.peeratcode.Configuration;
import be.jeffcheasey88.peeratcode.model.Badge;
import be.jeffcheasey88.peeratcode.model.Chapter;
import be.jeffcheasey88.peeratcode.model.Completion;
import be.jeffcheasey88.peeratcode.model.Group;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.model.Puzzle;
@ -34,12 +35,12 @@ public class DatabaseRepository {
private static final String SCORE = "SELECT score FROM completions WHERE fk_player = ? AND fk_puzzle = ?";
private static final String GET_COMPLETION = "SELECT id_completion, tries, fileName, score FROM completions WHERE fk_puzzle = ? AND fk_player = ?";
private static final String GET_PLAYER_SIMPLE = "SELECT pseudo, email, firstname, lastname, description FROM players WHERE id_player = ?";
private static final String GET_PLAYER_DETAILS = "SELECT p.*, scores.score, scores.completions, scores.tries, scores.rank, GROUP_CONCAT(DISTINCT g.name ORDER BY g.fk_chapter, g.fk_puzzle) AS sgroup FROM players p, (SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player LEFT JOIN groups g ON cg.fk_group = g.id_group WHERE p.id_player = scores.fk_player AND ";
private static final String GET_PLAYER_DETAILS = "SELECT p.*, scores.score, scores.completions, scores.tries, scores.rank, g.* FROM players p, (SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player LEFT JOIN groups g ON cg.fk_group = g.id_group WHERE p.id_player = scores.fk_player AND ";
private static final String GET_PLAYER_DETAILS_BY_ID = GET_PLAYER_DETAILS
+ " p.id_player = ? GROUP BY p.id_player;";
+ " p.id_player = ? ORDER BY g.fk_chapter, g.fk_puzzle;";
private static final String GET_PLAYER_DETAILS_BY_PSEUDO = GET_PLAYER_DETAILS
+ "p.pseudo = ? GROUP BY p.pseudo;";
private static final String ALL_PLAYERS_FOR_LEADERBOARD = "select DISTINCT p.*, scores.* from players p ,(SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player WHERE p.id_player = scores.fk_player";
+ "p.pseudo = ? ORDER BY g.fk_chapter, g.fk_puzzle;";
private static final String ALL_PLAYERS_FOR_LEADERBOARD = "select p.*, scores.*, g.* from players p ,(SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player LEFT JOIN groups g ON cg.fk_group = g.id_group WHERE p.id_player = scores.fk_player ORDER BY g.fk_chapter, g.fk_puzzle";
private static final String GET_BADGE = "SELECT * FROM badges WHERE id_badge = ?";
private static final String GET_BADGES_OF_PLAYER = "SELECT * FROM badges b LEFT JOIN containsBadges cb ON cb.fk_badge = b.id_badge WHERE cb.fk_player = ?";
private static final String INSERT_COMPLETION = "INSERT INTO completions (fk_puzzle, fk_player, tries, code, fileName, score) values (?, ?, ?, ?, ?, ?)";
@ -67,7 +68,8 @@ public class DatabaseRepository {
}
private Chapter makeChapter(ResultSet chapterResult) throws SQLException {
return new Chapter(chapterResult.getInt("id_chapter"), chapterResult.getString("name"), chapterResult.getTimestamp("start_date"), chapterResult.getTimestamp("end_date"));
return new Chapter(chapterResult.getInt("id_chapter"), chapterResult.getString("name"),
chapterResult.getTimestamp("start_date"), chapterResult.getTimestamp("end_date"));
}
private Completion makeCompletion(int playerId, int puzzleId, ResultSet completionResult) throws SQLException {
@ -83,18 +85,27 @@ public class DatabaseRepository {
if (hasColumn(playerResult, "avatar")) {
p.setAvatar(playerResult.getBytes("avatar"));
}
if (hasColumn(playerResult, "sgroup")) {
p.setGroups(playerResult.getString("sgroup"));
}
if (hasColumn(playerResult, "score")) {
p.setRank(playerResult.getInt("rank"));
p.setTotalScore(playerResult.getInt("score"));
p.setTotalCompletion(playerResult.getInt("completions"));
p.setTotalTries(playerResult.getInt("tries"));
}
// Manage groups
String groupName = playerResult.getString("name");
if (groupName != null) {
p.addGroup(makeGroup(playerResult));
}
return p;
}
private Group makeGroup(ResultSet result) throws SQLException {
Group gr = new Group(result.getString("name"), result.getInt("fk_chapter"), result.getInt("fk_puzzle"));
return gr;
}
private Badge makeBadge(ResultSet rs) throws SQLException {
return new Badge(rs.getString("name"), rs.getBytes("logo"), rs.getInt("level"));
}
@ -209,16 +220,21 @@ public class DatabaseRepository {
completionsStmt.setInt(1, id);
}
ResultSet result = completionsStmt.executeQuery();
if (result.next()) {
Player player = makePlayer(result);
Player player = null;
while (result.next()) {
if (player == null) {
player = makePlayer(result);
completionsStmt = con.prepareStatement(GET_BADGES_OF_PLAYER);
completionsStmt.setInt(1, result.getInt("id_player"));
ResultSet resultBadges = completionsStmt.executeQuery();
while (resultBadges.next()) {
player.addBadge(makeBadge(resultBadges));
}
return player;
} else {
player.addGroup(makeGroup(result));
}
}
return player;
} catch (SQLException e) {
e.printStackTrace();
}
@ -230,13 +246,17 @@ public class DatabaseRepository {
ensureConnection();
PreparedStatement playersStmt = con.prepareStatement(ALL_PLAYERS_FOR_LEADERBOARD);
ResultSet result = playersStmt.executeQuery();
SortedSet<Player> players = new TreeSet<Player>();
ArrayList<Player> players = new ArrayList<Player>();
Player tmpPlayer;
while (result.next()) {
tmpPlayer = makePlayer(result);
if (!players.contains(tmpPlayer)) {
players.add(tmpPlayer);
} else {
players.get(players.indexOf(tmpPlayer)).addGroup(makeGroup(result));
}
return players;
}
return new TreeSet<Player>(players);
} catch (SQLException e) {
e.printStackTrace();
}

2
src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
View file

@ -44,7 +44,7 @@ public class PlayerDetails implements Response {
playerJSON.put("score", player.getTotalScore());
playerJSON.put("completions", player.getTotalCompletion());
playerJSON.put("tries", player.getTotalTries());
if (player.getBadges().size() > 0) playerJSON.put("badges", player.getJsonBadges());
if (player.getBadges() != null) playerJSON.put("badges", player.getJsonBadges());
if(player.getAvatar() != null) playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
writer.write(playerJSON.toJSONString().replace("\\", ""));
} else {