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

Respond empty json even if no one in leaderboard

Browse source
This commit is contained in:
jeffcheasey88 2023-02-25 22:36:50 +01:00
parent b5db4328f2
commit 792005e84d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
View file

@ -27,8 +27,8 @@ public class Leaderboard implements Response {
public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception { public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *"); HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
SortedSet<Player> allPlayers = databaseRepo.getAllPlayerForLeaderboard(); SortedSet<Player> allPlayers = databaseRepo.getAllPlayerForLeaderboard();
JSONArray playersJSON = new JSONArray();
if (allPlayers != null) { if (allPlayers != null) {
JSONArray playersJSON = new JSONArray();
for (Player player : allPlayers) { for (Player player : allPlayers) {
JSONObject playerJSON = new JSONObject(); JSONObject playerJSON = new JSONObject();
playerJSON.put("pseudo", player.getPseudo()); playerJSON.put("pseudo", player.getPseudo());
@ -39,8 +39,8 @@ public class Leaderboard implements Response {
playerJSON.put("tries", player.getTotalTries()); playerJSON.put("tries", player.getTotalTries());
playersJSON.add(playerJSON); playersJSON.add(playerJSON);
} }
writer.write(playersJSON.toJSONString());
} }
writer.write(playersJSON.toJSONString());
writer.flush(); writer.flush();
writer.close(); writer.close();
} }

6
src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java
View file

@ -58,9 +58,11 @@ public class HttpUtil {
String line; String line;
String key = null; String key = null;
while(((line = reader.readLine()) != null) && (line.length() > 0)){ while(((line = reader.readLine()) != null) && (line.length() > 0)){
if(key != null) continue;
Matcher matcher = AUTORIZATION.matcher(line); Matcher matcher = AUTORIZATION.matcher(line);
if(matcher.matches()) key = matcher.group(1); if(matcher.matches()){
key = matcher.group(1);
break;
}
} }
return key; return key;
} }