UNLOZE/projects-jenz
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

just making sure to have a backup online

Browse Source
This commit is contained in:
jenzur
2019-07-05 23:35:05 +02:00
parent a8e5349e31
commit f126440c11
17 changed files with 47854 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RaceTimer/racetimer_endpoints/src/main/java/DTO/MapBoardDTO.java
+3 -1
View File
@@ -15,6 +15,7 @@ public class MapBoardDTO {
private String steamID;
private String name;
private String avatar;
private int mapPoint;
private int mapTimeMinutes;
private float mapTimeSeconds;
@@ -23,9 +24,10 @@ public class MapBoardDTO {
public MapBoardDTO() {
}
public MapBoardDTO(MapValues mapvalue, String name) {
public MapBoardDTO(MapValues mapvalue, String name, String avatar) {
this.steamID = mapvalue.getPlayerSteamID();
this.name = name;
this.avatar = avatar;
this.mapPoint = mapvalue.getMapPoints();
this.mapTimeMinutes = (int) Math.floor(mapvalue.getTime());
this.mapTimeSeconds = (float) (mapvalue.getTime() - Math.floor(mapvalue.getTime())) * 100;
RaceTimer/racetimer_endpoints/src/main/java/DTO/MapBoardDTO2.java
+43
View File
@@ -0,0 +1,43 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package DTO;
import facade.Facade;
/**
*
* @author install1
*/
public class MapBoardDTO2 {
private String mapname;
private int mapstage;
public String getMapname() {
return mapname;
}
public void setMapname(String mapname) {
this.mapname = mapname;
}
public int getMapstage() {
return mapstage;
}
public void setMapstage(int mapstage) {
this.mapstage = mapstage;
}
public MapBoardDTO2() {
}
public MapBoardDTO2(String mapname, int mapstage) {
this.mapname = mapname;
this.mapstage = mapstage;
}
}
RaceTimer/racetimer_endpoints/src/main/java/DTO/PlayerMapBoardDTO.java
+4 -13
View File
@@ -7,8 +7,10 @@ package DTO;
import entity.MapBoard;
import entity.MapValues;
import facade.Facade;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -33,24 +35,13 @@ public class PlayerMapBoardDTO {
this.steamID = steamID;
}
public void addMapValues(MapValues mapvalue, String mapName) {
Pattern pattern = Pattern.compile("S(\\d+)");
Matcher matcher = pattern.matcher(mapName);
String map = "";
int stage = 1; //0
if (matcher.find()) {
String group = matcher.group();
map = mapName.substring(0, mapName.indexOf(group));
stage = Integer.valueOf(group.substring(1));
} else {
map = mapName;
}
public void addMapValues(MapValues mapvalue, String mapName, int stage) {
this.steamID = mapvalue.getPlayerSteamID();
this.mapPoint = mapvalue.getMapPoints();
this.mapTimeMinutes = (int) Math.floor(mapvalue.getTime());
this.mapTimeSeconds = (float) (mapvalue.getTime() - Math.floor(mapvalue.getTime())) * 100;
this.position = mapvalue.getPosition();
this.mapname = map;
this.mapname = mapName;
this.mapstage = stage;
}
RaceTimer/racetimer_endpoints/src/main/java/DataMapper/DataMapperCalls.java
+4 -3
View File
@@ -27,7 +27,8 @@ public class DataMapperCalls {
public static Map.Entry<Collection<Player>, Collection<MapBoard>> getAllValues() {
Collection<Player> allPlayers = new ArrayList();
//add mapvalues
//remove limitfetch eventually
ConcurrentMap<String, MapBoard> allMapBoards = new MapMaker().concurrencyLevel(4).makeMap();
String sqlQuery = "SELECT * FROM `zetimer_table`";
int limitfetch = 0;
@@ -35,7 +36,7 @@ public class DataMapperCalls {
try (PreparedStatement ps = con.prepareStatement(sqlQuery)) {
try (ResultSet result = ps.executeQuery()) {
int fetchSize = result.getMetaData().getColumnCount();
while (result.next() && limitfetch < 25) {
while (result.next() /*&& limitfetch < 25*/) {
int timesCounter = 0;
Player player = new Player(result.getString(1), result.getString(2));
int i = 3;
@@ -48,7 +49,7 @@ public class DataMapperCalls {
if (specificDouble > 0.000) {
timesCounter++;
MapValues mapValue = new MapValues();
mapValue.setPlayerSteamID(player);
mapValue.setPlayerSteamID(player.getSteamID());
mapValue.setTime((float) specificDouble);
allMapBoards.get(columnLabel).getMapvalues().add(mapValue);
}
RaceTimer/racetimer_endpoints/src/main/java/entity/MapValues.java
+2 -2
View File
@@ -71,8 +71,8 @@ public class MapValues implements Serializable {
return playerSteamID;
}
public void setPlayerSteamID(Player player) {
this.playerSteamID = player.getSteamID();
public void setPlayerSteamID(String steamID) {
this.playerSteamID = steamID;
}
public float getTime() {
RaceTimer/racetimer_endpoints/src/main/java/facade/Facade.java
+72 -22
View File
@@ -1,6 +1,7 @@
package facade;
import DTO.MapBoardDTO;
import DTO.MapBoardDTO2;
import DTO.PlayerMapBoardDTO;
import DTO.PlayerDTO;
import DataMapper.DataMapperCalls;
@@ -13,15 +14,20 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.time.Duration;
import java.time.Instant;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.json.JSONArray;
@@ -43,17 +49,44 @@ public class Facade {
initSetup = 1;
}
public List<MapBoardDTO2> getAllMaps() {
List<String> arrnames = new ArrayList(mapBoardCache.keySet());
Collections.sort(arrnames);
List<MapBoardDTO2> arrMaps = new ArrayList();
for (String str : arrnames) {
Map.Entry<String, Integer> getMapnameAndStage = GetMapnameAndStage(str);
arrMaps.add(new MapBoardDTO2(getMapnameAndStage.getKey(), getMapnameAndStage.getValue()));
}
return arrMaps;
}
public Entry<String, Integer> GetMapnameAndStage(String mapName) {
Pattern pattern = Pattern.compile("S(\\d+)");
Matcher matcher = pattern.matcher(mapName);
String map = "";
int stage = 1; //0
if (matcher.find()) {
String group = matcher.group();
map = mapName.substring(0, mapName.indexOf(group));
stage = Integer.valueOf(group.substring(1));
} else {
map = mapName;
}
return new AbstractMap.SimpleEntry(map, stage);
}
public List<MapBoardDTO> getSpecificMap(String mapname, int stage) {
List<MapBoardDTO> returnlist = new ArrayList();
String mapRetrieved = mapname + "S" + stage;
MapBoard mapBoard = mapBoardCache.getOrDefault(mapRetrieved, null);
if (mapBoard == null){
if (mapBoard == null) {
mapRetrieved = mapname;
mapBoard = mapBoardCache.get(mapRetrieved);
}
List<MapValues> mapvalues = mapBoard.getMapvalues();
for (MapValues mapvalue : mapvalues) {
returnlist.add(new MapBoardDTO(mapvalue, playerCache.get(mapvalue.getPlayerSteamID()).getName()));
String avatar = playerCache.get(mapvalue.getPlayerSteamID()).getAvatar();
returnlist.add(new MapBoardDTO(mapvalue, playerCache.get(mapvalue.getPlayerSteamID()).getName(), avatar));
}
return returnlist;
}
@@ -64,7 +97,8 @@ public class Facade {
List<PlayerMapBoardDTO> playerMapBoardDtos = new ArrayList();
for (Entry<String, MapValues> entries : playerMaps.entrySet()) {
PlayerMapBoardDTO mapBoardDto = new PlayerMapBoardDTO(steamid);
mapBoardDto.addMapValues(entries.getValue(), entries.getKey());
Map.Entry<String, Integer> getMapnameAndStage = GetMapnameAndStage(entries.getKey());
mapBoardDto.addMapValues(entries.getValue(), getMapnameAndStage.getKey(), getMapnameAndStage.getValue());
playerMapBoardDtos.add(mapBoardDto);
}
return playerMapBoardDtos;
@@ -74,30 +108,25 @@ public class Facade {
}
public PlayerDTO getPlayer(String steamid) {
EntityManager em = PuSelector.getEntityManagerFactory("pu").createEntityManager();
try {
Query query = em.createQuery("SELECT a FROM Player AS a WHERE a.steamID LIKE :steamID")
.setParameter("steamID", steamid);
Player player = (Player) query.getSingleResult();
return new PlayerDTO(player);
} finally {
em.close();
}
return new PlayerDTO(playerCache.get(steamid));
}
public Collection<PlayerDTO> getleaderBoard() {
EntityManager em = PuSelector.getEntityManagerFactory("pu").createEntityManager();
try {
Query query = em.createQuery("SELECT a FROM Player AS a ORDER BY A.rank ASC ");
List<Player> players = (List<Player>) query.getResultList();
Collection<PlayerDTO> playersDTO = new ArrayList();
for (Player player : players) {
public Collection<PlayerDTO> getleaderBoard(int iterator) {
int playerAddiditionCap = 150;
List<Player> players = new ArrayList(playerCache.values());
Collection<PlayerDTO> playersDTO = new ArrayList();
players.sort(Comparator.comparing(Player::getRank));
int counter = 0;
for (Player player : players) {
if (counter >= iterator && counter <= iterator + playerAddiditionCap) {
playersDTO.add(new PlayerDTO(player));
}
return playersDTO;
} finally {
em.close();
if (counter > iterator + playerAddiditionCap) {
break;
}
counter++;
}
return playersDTO;
}
private void addNewPlayerValuesToCache(Collection<Player> keyCollection) {
@@ -274,9 +303,30 @@ public class Facade {
setPlayerPoints();
updatePlayerRanks();
setTimesAsociatedToPeople();
updateEntitiesPersistence();
}
}
public void updateEntitiesPersistence() {
EntityManager em = PuSelector.getEntityManagerFactory("pu").createEntityManager();
em.getTransaction().begin();
em.createQuery("delete from MapBoard").executeUpdate();
em.createQuery("delete from MapValues").executeUpdate();
em.createQuery("delete from Player").executeUpdate();
em.createQuery("delete from UrlBanners").executeUpdate();
Collection<Player> players = playerCache.values();
Collection<MapBoard> mapBoards = mapBoardCache.values();
for (Player player : players) {
System.out.println("player: " + player.getName());
em.persist(player);
}
for (MapBoard mapboard : mapBoards) {
System.out.println("mapboard: " + mapboard.getMapName());
em.persist(mapboard);
}
em.getTransaction().commit();
}
public List<Player> getAllPlayersFromCache() {
checkTimeElapse();
return new ArrayList(playerCache.values());
RaceTimer/racetimer_endpoints/src/main/java/rest/TimerResource.java
+13 -3
View File
@@ -26,15 +26,17 @@ public class TimerResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("leaderboard")
public String retrieveLeaderBoard() {
return gson.toJson(facade.getleaderBoard());
@Path("leaderboard/{iterator}")
public String retrieveLeaderBoard(@PathParam("iterator") int iterator) {
facade.checkTimeElapse();
return gson.toJson(facade.getleaderBoard(iterator));
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("player/{steamid}")
public String retrievePlayer(@PathParam("steamid") String steamid) {
facade.checkTimeElapse();
return gson.toJson(facade.getPlayer(steamid));
}
@@ -53,4 +55,12 @@ public class TimerResource {
facade.checkTimeElapse();
return gson.toJson(facade.getSpecificMap(mapname, stage));
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("allmaps")
public String getAllMaps() {
facade.checkTimeElapse();
return gson.toJson(facade.getAllMaps());
}
}