Merge pull request 'Add SchematicNode.getElo' (#202) from SchemElo into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #202 Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Commit
acd9f2588c
@ -103,4 +103,5 @@ public interface Provider {
|
||||
void deleteSchematicNode(SchematicNode node);
|
||||
InputStream getSchematicData(SchematicNode node) throws IOException;
|
||||
void saveSchematicNode(SchematicNode node, InputStream blob, boolean newFormat);
|
||||
int getSchematicElo(SchematicNode node, int season);
|
||||
}
|
||||
|
@ -413,6 +413,7 @@ public class SQLProvider implements Provider {
|
||||
private static final Statement updateDatabase = new Statement("UPDATE SchematicNode SET NodeData = ?, NodeFormat = ? WHERE NodeId = ?");
|
||||
private static final Statement selSchemData = new Statement("SELECT NodeData FROM SchematicNode WHERE NodeId = ?");
|
||||
private static final Statement deleteNode = new Statement("DELETE FROM SchematicNode WHERE NodeId = ?");
|
||||
private static final Statement schemElo = new Statement("SELECT Elo FROM SchemElo WHERE SchemId = ? AND Season = ?");
|
||||
|
||||
private static final Statement.ResultSetUser<List<SchematicNode>> toSchematicList = rs -> {
|
||||
List<SchematicNode> nodes = new ArrayList<>();
|
||||
@ -627,4 +628,14 @@ public class SQLProvider implements Provider {
|
||||
public void saveSchematicNode(SchematicNode node, InputStream blob, boolean newFormat) {
|
||||
updateDatabase.update(blob, newFormat, node.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSchematicElo(SchematicNode node, int season) {
|
||||
return schemElo.select(rs -> {
|
||||
if(rs.next()) {
|
||||
return rs.getInt("Elo");
|
||||
}
|
||||
return 0;
|
||||
}, node.getId(), season);
|
||||
}
|
||||
}
|
||||
|
@ -521,4 +521,8 @@ public class SchematicNode {
|
||||
this.allowReplay = allowReplay;
|
||||
updateDB();
|
||||
}
|
||||
|
||||
public int getElo(int season) {
|
||||
return Provider.impl.getSchematicElo(this, season);
|
||||
}
|
||||
}
|
||||
|
54
SpigotCore_Main/src/de/steamwar/sql/Season.java
Normale Datei
54
SpigotCore_Main/src/de/steamwar/sql/Season.java
Normale Datei
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* This file is a part of the SteamWar software.
|
||||
*
|
||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.steamwar.sql;
|
||||
|
||||
import java.util.Calendar;
|
||||
|
||||
public class Season {
|
||||
private Season() {}
|
||||
|
||||
public static int getSeason() {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
int yearIndex = calendar.get(Calendar.MONTH) / 4;
|
||||
return (calendar.get(Calendar.YEAR) * 3 + yearIndex);
|
||||
}
|
||||
|
||||
public static String getSeasonStart() {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
return calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) / 4 * 3 + 1) + "-1";
|
||||
}
|
||||
|
||||
public static String convertSeasonToString(int season){
|
||||
if (season == -1) return "";
|
||||
int yearSeason = season % 3;
|
||||
int year = (season - yearSeason) / 3;
|
||||
return String.format("%d-%d", year, yearSeason);
|
||||
}
|
||||
|
||||
public static int convertSeasonToNumber(String season){
|
||||
if (season.isEmpty()) return -1;
|
||||
String[] split = season.split("-");
|
||||
try {
|
||||
return Integer.parseInt(split[0]) * 3 + Integer.parseInt(split[1]);
|
||||
} catch (NumberFormatException e) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
@ -406,4 +406,9 @@ public class StandaloneProvider implements Provider {
|
||||
throw new SecurityException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSchematicElo(SchematicNode node, int season) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren