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

saving udates, not missing much i guess

Browse Source
This commit is contained in:
jenzur
2019-07-14 02:28:16 +02:00
parent 9232830451
commit 3730230925
14 changed files with 537 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RaceTimer/racetimer_endpoints/src/main/java/DTO/BadgesDTO.java
+38
View File
@@ -0,0 +1,38 @@
/*
* 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 entity.Player;
import entity.UrlBanners;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author install1
*/
public class BadgesDTO {
private List<String> badgesUrls = new ArrayList();
public BadgesDTO(Player player) {
List<UrlBanners> urlBanners = player.getUrlBanners();
for (UrlBanners urlbanner : urlBanners) {
badgesUrls.add(urlbanner.getBadgeUrl());
}
}
public List<String> getBadgesUrls() {
return badgesUrls;
}
public void setBadgesUrls(List<String> badgesUrls) {
this.badgesUrls = badgesUrls;
}
public BadgesDTO() {
}
}
RaceTimer/racetimer_endpoints/src/main/java/DTO/MapBoardDTO.java
+13
View File
@@ -6,6 +6,10 @@
package DTO;
import entity.MapValues;
import entity.Player;
import entity.UrlBanners;
import java.util.ArrayList;
import java.util.List;
/**
*
@@ -20,6 +24,7 @@ public class MapBoardDTO {
private int mapTimeMinutes;
private float mapTimeSeconds;
private int position;
private List<String> badgesUrls = new ArrayList();
public MapBoardDTO() {
}
@@ -32,6 +37,14 @@ public class MapBoardDTO {
this.mapTimeMinutes = (int) Math.floor(mapvalue.getTime());
this.mapTimeSeconds = (float) (mapvalue.getTime() - Math.floor(mapvalue.getTime())) * 100;
this.position = mapvalue.getPosition();
}
public void setBadgesUrls(Player player) {
List<UrlBanners> urlBanners = player.getUrlBanners();
for (UrlBanners urlbanner : urlBanners) {
badgesUrls.add(urlbanner.getBadgeUrl());
}
}
public String getSteamID() {
RaceTimer/racetimer_endpoints/src/main/java/facade/Facade.java
+117 -73
View File
@@ -1,5 +1,6 @@
package facade;
import DTO.BadgesDTO;
import DTO.MapBoardDTO;
import DTO.MapBoardDTO2;
import DTO.PlayerMapBoardDTO;
@@ -52,6 +53,52 @@ public class Facade {
initSetup = 1;
}
private boolean getMap(String map, String Identifier) {
boolean identified = Pattern.compile(Pattern.quote(Identifier), Pattern.CASE_INSENSITIVE).matcher(map).find();
return identified;
}
private boolean getPlayer(Player player, String Identifier) {
boolean identified = Pattern.compile(Pattern.quote(Identifier), Pattern.CASE_INSENSITIVE).matcher(player.getName()).find();
if (!identified) {
identified = Pattern.compile(Pattern.quote(Identifier), Pattern.CASE_INSENSITIVE).matcher(player.getSteamID()).find();
}
return identified;
}
public List<MapBoardDTO2> getSearchMapsResults(String identifier) {
List<String> arrnames = new ArrayList(mapBoardCache.keySet());
Collections.sort(arrnames, String.CASE_INSENSITIVE_ORDER);
List<MapBoardDTO2> arrMaps = new ArrayList();
for (String str : arrnames) {
if (getMap(str, identifier)) {
Map.Entry<String, Integer> getMapnameAndStage = GetMapnameAndStage(str);
String mapName = getMapnameAndStage.getKey();
arrMaps.add(new MapBoardDTO2(mapName, getMapnameAndStage.getValue()));
}
}
return arrMaps;
}
public List<PlayerDTO> getSearchPlayerResults(String Identifier) {
List<Player> players = new ArrayList(playerCache.values());
List<PlayerDTO> playersDTO = new ArrayList();
Collection<Player> playerAvatarsCaching = new ArrayList();
for (Player player : players) {
if (getPlayer(player, Identifier)) {
playerAvatarsCaching.add(player);
}
}
updateAvatarsToCache(playerAvatarsCaching);
players = new ArrayList(playerCache.values());
for (Player player : players) {
if (getPlayer(player, Identifier)) {
playersDTO.add(new PlayerDTO(player));
}
}
return playersDTO;
}
public int getSpecificFetchMap(String mapname, int stage) {
MapBoard specificMapBoardCache = mapBoardCache.getOrDefault(mapname + "S" + stage, null);
if (specificMapBoardCache == null) {
@@ -62,11 +109,11 @@ public class Facade {
public List<MapBoardDTO2> getAllMaps() {
List<String> arrnames = new ArrayList(mapBoardCache.keySet());
Collections.sort(arrnames);
Collections.sort(arrnames, String.CASE_INSENSITIVE_ORDER);
List<MapBoardDTO2> arrMaps = new ArrayList();
System.out.println("arrnames size: " + arrnames.size() + "\n");
// System.out.println("arrnames size: " + arrnames.size() + "\n");
for (String str : arrnames) {
System.out.println("getAllMaps str: " + str + "\n");
//System.out.println("getAllMaps str: " + str + "\n");
Map.Entry<String, Integer> getMapnameAndStage = GetMapnameAndStage(str);
String mapName = getMapnameAndStage.getKey();
arrMaps.add(new MapBoardDTO2(mapName, getMapnameAndStage.getValue()));
@@ -102,17 +149,26 @@ public class Facade {
int counter = 0;
Collection<Player> playerAvatarsCaching = new ArrayList();
for (MapValues mapvalue : mapvalues) {
Player getPlayer = playerCache.get(mapvalue.getPlayerSteamID());
String avatar = getPlayer.getAvatar();
if (avatar == null) {
playerAvatarsCaching.add(getPlayer);
if (counter >= iterator && counter <= iterator + mapPlayerAddiditionCap) {
Player getPlayer = playerCache.get(mapvalue.getPlayerSteamID());
String avatar = getPlayer.getAvatar();
if (avatar == null) {
playerAvatarsCaching.add(getPlayer);
}
}
if (counter > iterator + mapPlayerAddiditionCap) {
break;
}
counter++;
}
counter = 0;
updateAvatarsToCache(playerAvatarsCaching);
for (MapValues mapvalue : mapvalues) {
if (counter >= iterator && counter <= iterator + mapPlayerAddiditionCap) {
String avatar = playerCache.get(mapvalue.getPlayerSteamID()).getAvatar();
returnlist.add(new MapBoardDTO(mapvalue, playerCache.get(mapvalue.getPlayerSteamID()).getName(), avatar));
MapBoardDTO mapBoardDTO = new MapBoardDTO(mapvalue, playerCache.get(mapvalue.getPlayerSteamID()).getName(), avatar);
mapBoardDTO.setBadgesUrls(playerCache.get(mapvalue.getPlayerSteamID()));
returnlist.add(mapBoardDTO);
}
if (counter > iterator + mapPlayerAddiditionCap) {
break;
@@ -128,14 +184,16 @@ public class Facade {
ConcurrentMap<String, MapValues> playerMaps = playerRelatedMapValuesCache.get(steamid);
List<PlayerMapBoardDTO> playerMapBoardDtos = new ArrayList();
int counter = 0;
for (Entry<String, MapValues> entries : playerMaps.entrySet()) {
List<String> arrnames = new ArrayList(playerMaps.keySet());
Collections.sort(arrnames, String.CASE_INSENSITIVE_ORDER);
for (String mapnames : arrnames) {
if (counter >= iterator && counter <= iterator + playerMapsCapAddition) {
PlayerMapBoardDTO mapBoardDto = new PlayerMapBoardDTO(steamid);
Map.Entry<String, Integer> getMapnameAndStage = GetMapnameAndStage(entries.getKey());
Map.Entry<String, Integer> getMapnameAndStage = GetMapnameAndStage(mapnames);
String mapName = getMapnameAndStage.getKey();
int stage = (getMapnameAndStage.getValue());
//System.out.println("getPlayerMaps: " + mapName + " stage: " + stage + "\n");
mapBoardDto.addMapValues(entries.getValue(), mapName, stage);
MapValues mapvalues = playerMaps.get(mapnames);
mapBoardDto.addMapValues(mapvalues, mapName, stage);
playerMapBoardDtos.add(mapBoardDto);
}
if (counter > iterator + playerMapsCapAddition) {
@@ -145,10 +203,15 @@ public class Facade {
}
return playerMapBoardDtos;
} catch (Exception ex) {
System.out.println("ex: " + ex);
return null;
}
}
public BadgesDTO getPlayerBadges(String steamID) {
return new BadgesDTO(playerCache.get(steamID));
}
public PlayerDTO getPlayer(String steamid) {
if (playerCache.get(steamid).getAvatar() == null) {
Collection<Player> playerAvatarsCaching = new ArrayList();
@@ -197,62 +260,46 @@ public class Facade {
Collection<Integer> banners = playerUrlBanners.getOrDefault(player.getSteamID(), null);
if (banners != null) {
List<UrlBanners> urlBanners = new ArrayList();
for (Integer bannerID : banners) {
//switch statement did not want to respond
for (int bannerID : banners) {
String bannerName = "";
String bannerURL = "";
switch (bannerID) {
case 2: {
bannerName = "User";
bannerURL = "https://unloze.com/images/badges/User.png";
}
case 6: {
bannerName = "Mapper";
bannerURL = "https://unloze.com/images/badges/Mapper.png";
}
case 7: {
bannerName = "Admin";
bannerURL = "https://unloze.com/images/badges/Admin.png";
}
case 8: {
bannerName = "Technical Staff";
bannerURL = "https://unloze.com/images/badges/Tech-Staff.png";
}
case 10: {
bannerName = "Leader";
bannerURL = "https://unloze.com/images/badges/Leader.png";
}
case 11: {
bannerName = "Global Admin";
bannerURL = "https://unloze.com/images/badges/Global-Admin.png";
}
case 12: {
bannerName = "VIP";
bannerURL = "https://unloze.com/images/badges/VIP.png";
}
case 13: {
bannerName = "Trial Admin";
bannerURL = "https://unloze.com/images/badges/Trial_Admin.png";
}
case 15: {
bannerName = "Event Winner";
bannerURL = "https://unloze.com/images/badges/Event-Winner.png";
}
case 19: {
bannerName = "Discord Manager";
bannerURL = "https://unloze.com/images/badges/Discord-Manager.png";
}
case 21: {
bannerName = "Retired Admin";
bannerURL = "https://unloze.com/images/badges/Retired-Admin.png";
}
case 25: {
bannerName = "Event Manager";
bannerURL = "https://unloze.com/images/badges/Event-Manager.png";
}
default: {
bannerName = "";
bannerURL = "";
}
if (bannerID == 2) {
bannerName = "User";
bannerURL = "https://unloze.com/images/badges/User.png";
} else if (bannerID == 6) {
bannerName = "Mapper";
bannerURL = "https://unloze.com/images/badges/Mapper.png";
} else if (bannerID == 7) {
bannerName = "Admin";
bannerURL = "https://unloze.com/images/badges/Admin.png";
} else if (bannerID == 8) {
bannerName = "Technical Staff";
bannerURL = "https://unloze.com/images/badges/Tech-Staff.png";
} else if (bannerID == 10) {
bannerName = "Leader";
bannerURL = "https://unloze.com/images/badges/Leader.png";
} else if (bannerID == 11) {
bannerName = "Global Admin";
bannerURL = "https://unloze.com/images/badges/Global-Admin.png";
} else if (bannerID == 12) {
bannerName = "VIP";
bannerURL = "https://unloze.com/images/badges/VIP.png";
} else if (bannerID == 13) {
bannerName = "Trial Admin";
bannerURL = "https://unloze.com/images/badges/Trial_Admin.png";
} else if (bannerID == 15) {
bannerName = "Event Winner";
bannerURL = "https://unloze.com/images/badges/Event-Winner.png";
} else if (bannerID == 19) {
bannerName = "Discord Manager";
bannerURL = "https://unloze.com/images/badges/Discord-Manager.png";
} else if (bannerID == 21) {
bannerName = "Retired Admin";
bannerURL = "https://unloze.com/images/badges/Retired-Admin.png";
} else if (bannerID == 25) {
bannerName = "Event Manager";
bannerURL = "https://unloze.com/images/badges/Event-Manager.png";
}
if (!bannerName.isEmpty() && !bannerURL.isEmpty()) {
urlBanners.add(new UrlBanners(bannerName, bannerURL));
@@ -260,7 +307,6 @@ public class Facade {
}
player.setUrlBanners(urlBanners);
}
//System.out.println("playername: " + player.getName() + "\n");
playerCache.put(player.getSteamID(), player);
}
}
@@ -285,7 +331,7 @@ public class Facade {
String avatar = jsonArray.getJSONObject(incrementer).getString("avatarfull");
String steamID = convertCommunityIdToSteamId(Long.valueOf(steamID64));
playerCache.get(steamID).setAvatar(avatar);
System.out.println("avatar: " + avatar + "\nname: " + playerCache.get(steamID).getName() + "\n");
//System.out.println("avatar: " + avatar + "\nname: " + playerCache.get(steamID).getName() + "\n");
} catch (NumberFormatException | JSONException ex) {
System.out.println("ex: " + ex.getLocalizedMessage() + "\n Nosteamer");
}
@@ -351,6 +397,7 @@ public class Facade {
private void orderingMapBoardValuesByTime() {
Collection<MapBoard> mapboards = mapBoardCache.values();
for (MapBoard mapboard : mapboards) {
//System.out.println("mapName: " + mapboard.getMapName());
List<MapValues> mapvalues = new ArrayList(mapboard.getMapvalues());
mapvalues.sort(Comparator.comparing(MapValues::getTime));
mapBoardCache.get(mapboard.getMapName()).setMapvalues(mapvalues);
@@ -364,9 +411,8 @@ public class Facade {
int position = 1;
for (MapValues mapvalue : mapvalues) {
mapvalue.setPosition(position);
float percentageSpreader = 0;
percentageSpreader = playerCount - position;
mapvalue.setMapPoints((int) Math.floor((percentageSpreader / playerCount) * 100));
float percentageSpreader = playerCount - position;
mapvalue.setMapPoints((int) Math.floor((percentageSpreader / playerCount) * playerCount /* 100 */));
position++;
}
}
@@ -446,7 +492,6 @@ public class Facade {
Collection<Player> players = playerCache.values();
Collection<MapBoard> mapBoards = mapBoardCache.values();
for (Player player : players) {
System.out.println("player: " + player.getName());
em.persist(player);
List<UrlBanners> urlBanners = player.getUrlBanners();
for (UrlBanners urlB : urlBanners) {
@@ -454,7 +499,6 @@ public class Facade {
}
}
for (MapBoard mapboard : mapBoards) {
System.out.println("mapboard: " + mapboard.getMapName());
em.persist(mapboard);
}
em.getTransaction().commit();
RaceTimer/racetimer_endpoints/src/main/java/rest/TimerResource.java
+27 -5
View File
@@ -31,7 +31,7 @@ public class TimerResource {
facade.checkTimeElapse();
return gson.toJson(facade.getleaderBoard(iterator));
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("allmaps")
@@ -39,8 +39,8 @@ public class TimerResource {
facade.checkTimeElapse();
return gson.toJson(facade.getAllMaps());
}
@GET
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("mapsizecache/{mapname}/{stage}")
public String getSpecifcMapSize(@PathParam("mapname") String mapname, @PathParam("stage") int stage) {
@@ -56,6 +56,14 @@ public class TimerResource {
return gson.toJson(facade.getPlayer(steamid));
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("player/badges/{steamid}")
public String retrievePlayerBadges(@PathParam("steamid") String steamid) {
facade.checkTimeElapse();
return gson.toJson(facade.getPlayerBadges(steamid));
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("player/maps/{steamid}/{iterator}")
@@ -67,11 +75,25 @@ public class TimerResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("map/{mapname}/{number}/{iterator}")
public String retrieveSpecificMapStages(@PathParam("mapname") String mapname, @PathParam("number") int stage,
public String retrieveSpecificMapStages(@PathParam("mapname") String mapname, @PathParam("number") int stage,
@PathParam("iterator") int iterator) {
facade.checkTimeElapse();
return gson.toJson(facade.getSpecificMap(mapname, stage, iterator));
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("searchplayers/{identifier}")
public String searchPlayers(@PathParam("identifier") String identifier){
facade.checkTimeElapse();
return gson.toJson(facade.getSearchPlayerResults(identifier));
}
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("searchmaps/{identifier}")
public String searchMaps(@PathParam("identifier") String identifier){
facade.checkTimeElapse();
return gson.toJson(facade.getSearchMapsResults(identifier));
}
}
RaceTimer/racetimer_endpoints/src/main/java/utils/Initialization.java
+6 -3
View File
@@ -26,11 +26,14 @@ public class Initialization {
private static void setupDBTablesWithPresentValues() {
Facade facade = new Facade();
facade.checkTimeElapse();
List<Player> getAllPlayers = facade.getAllPlayersFromCache();
facade.getleaderBoard(0);
Collection<MapBoard> getAllMapBoards = facade.getAllMapBoardsFromCache();
//facade.getPlayerMaps("STEAM_0:0:191740833", 0);
// facade.getPlayerMaps("STEAM_0:0:191740833", 25);
facade.getAllMaps();
//facade.getPlayerMaps("STEAM_0:0:33155716", 0);
AdminEditor admin = new AdminEditor("jenz", "1234");
EntityManager em = PuSelector.getEntityManagerFactory("pu").createEntityManager();
//simply cant persist collections/list