This reverts commit 6d579b6981
.
Dieser Commit ist enthalten in:
Ursprung
6d579b6981
Commit
bf480f6e6f
@ -21,65 +21,46 @@ package de.steamwar.sql;
|
||||
|
||||
import de.steamwar.sql.internal.Field;
|
||||
import de.steamwar.sql.internal.SelectStatement;
|
||||
import de.steamwar.sql.internal.Statement;
|
||||
import de.steamwar.sql.internal.Table;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.List;
|
||||
|
||||
@AllArgsConstructor
|
||||
public class Event {
|
||||
|
||||
private static final Table<Event> table = new Table<>(Event.class);
|
||||
private static final SelectStatement<Event> byId = table.select(Table.PRIMARY);
|
||||
private static final SelectStatement<Event> allShort = new SelectStatement<>(table, "SELECT * FROM Event");
|
||||
private static final Statement create = table.insertFields(true, "eventName", "deadline", "start", "end", "maximumTeamMembers", "publicSchemsOnly", "spectateSystem");
|
||||
private static final Statement update = table.update(Table.PRIMARY, "eventName", "deadline", "start", "end", "schemType", "maximumTeamMembers", "publicSchemsOnly", "spectateSystem");
|
||||
private static final Statement delete = table.delete(Table.PRIMARY);
|
||||
|
||||
|
||||
public static Event get(int eventID){
|
||||
return byId.select(eventID);
|
||||
}
|
||||
|
||||
public static List<Event> getAllShort(){
|
||||
return allShort.listSelect();
|
||||
}
|
||||
|
||||
public static Event create(String eventName, Timestamp start, Timestamp end){
|
||||
return get(create.insertGetKey(eventName, start, start, end, 5, false, false));
|
||||
}
|
||||
|
||||
public static void delete(int eventID){
|
||||
delete.update(eventID);
|
||||
}
|
||||
|
||||
@Getter
|
||||
@Field(keys = {Table.PRIMARY}, autoincrement = true)
|
||||
private final int eventID;
|
||||
@Getter
|
||||
@Field(keys = {"eventName"})
|
||||
private String eventName;
|
||||
private final String eventName;
|
||||
@Getter
|
||||
@Field
|
||||
private Timestamp deadline;
|
||||
private final Timestamp deadline;
|
||||
@Getter
|
||||
@Field
|
||||
private Timestamp start;
|
||||
private final Timestamp start;
|
||||
@Getter
|
||||
@Field
|
||||
private Timestamp end;
|
||||
private final Timestamp end;
|
||||
@Getter
|
||||
@Field
|
||||
private int maximumTeamMembers;
|
||||
private final int maximumTeamMembers;
|
||||
@Field(nullable = true)
|
||||
private SchematicType schemType;
|
||||
private final SchematicType schemType;
|
||||
@Field
|
||||
private boolean publicSchemsOnly;
|
||||
private final boolean publicSchemsOnly;
|
||||
@Field
|
||||
private boolean spectateSystem;
|
||||
private final boolean spectateSystem;
|
||||
|
||||
public boolean publicSchemsOnly() {
|
||||
return publicSchemsOnly;
|
||||
@ -91,40 +72,4 @@ public class Event {
|
||||
public SchematicType getSchematicType() {
|
||||
return schemType;
|
||||
}
|
||||
|
||||
public void setEventName(String eventName) {
|
||||
this.eventName = eventName;
|
||||
}
|
||||
|
||||
public void setDeadline(Timestamp deadline) {
|
||||
this.deadline = deadline;
|
||||
}
|
||||
|
||||
public void setStart(Timestamp start) {
|
||||
this.start = start;
|
||||
}
|
||||
|
||||
public void setEnd(Timestamp end) {
|
||||
this.end = end;
|
||||
}
|
||||
|
||||
public void setMaximumTeamMembers(int maximumTeamMembers) {
|
||||
this.maximumTeamMembers = maximumTeamMembers;
|
||||
}
|
||||
|
||||
public void setPublicSchemsOnly(boolean publicSchemsOnly) {
|
||||
this.publicSchemsOnly = publicSchemsOnly;
|
||||
}
|
||||
|
||||
public void setSpectateSystem(boolean spectateSystem) {
|
||||
this.spectateSystem = spectateSystem;
|
||||
}
|
||||
|
||||
public void setSchemType(SchematicType schemType) {
|
||||
this.schemType = schemType;
|
||||
}
|
||||
|
||||
public void update(){
|
||||
update.update(eventName, deadline, start, end, schemType, maximumTeamMembers, publicSchemsOnly, spectateSystem, eventID);
|
||||
}
|
||||
}
|
||||
|
@ -25,10 +25,6 @@ import de.steamwar.sql.internal.Statement;
|
||||
import de.steamwar.sql.internal.Table;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.List;
|
||||
|
||||
@AllArgsConstructor
|
||||
public class EventFight {
|
||||
@ -37,52 +33,26 @@ public class EventFight {
|
||||
private static final SelectStatement<EventFight> byId = table.select(Table.PRIMARY);
|
||||
private static final Statement setResult = table.update(Table.PRIMARY, "Ergebnis");
|
||||
private static final Statement setFight = table.update(Table.PRIMARY, "Fight");
|
||||
private static final SelectStatement<EventFight> byEvent = table.selectFields("eventID");
|
||||
private static final Statement update = table.update(Table.PRIMARY, "startTime", "spielModus", "map", "teamBlue", "teamRed", "kampfleiter");
|
||||
private static final Statement create = table.insertFields(true, "eventID", "startTime", "spielModus", "map", "teamBlue", "teamRed", "kampfleiter");
|
||||
|
||||
public static EventFight get(int fightID) {
|
||||
return byId.select(fightID);
|
||||
}
|
||||
|
||||
public static EventFight create(int eventID, Timestamp startTime, String spielModus, String map, int teamBlue, int teamRed) {
|
||||
return EventFight.get(create.insertGetKey(eventID, startTime, spielModus, map, teamBlue, teamRed, 0));
|
||||
}
|
||||
|
||||
public static List<EventFight> getFromEvent(int eventID) {
|
||||
return byEvent.listSelect(eventID);
|
||||
}
|
||||
|
||||
@Getter
|
||||
@Field
|
||||
private int eventID;
|
||||
private final int eventID;
|
||||
@Getter
|
||||
@Field(keys = {Table.PRIMARY}, autoincrement = true)
|
||||
private int fightID;
|
||||
private final int fightID;
|
||||
@Getter
|
||||
@Setter
|
||||
@Field
|
||||
private Timestamp startTime;
|
||||
private final int teamBlue;
|
||||
@Getter
|
||||
@Setter
|
||||
@Field
|
||||
private String spielModus;
|
||||
private final int teamRed;
|
||||
@Getter
|
||||
@Setter
|
||||
@Field
|
||||
private String map;
|
||||
@Getter
|
||||
@Setter
|
||||
@Field
|
||||
private int teamBlue;
|
||||
@Getter
|
||||
@Setter
|
||||
@Field
|
||||
private int teamRed;
|
||||
@Getter
|
||||
@Setter
|
||||
@Field
|
||||
private int kampfleiter;
|
||||
private final int kampfleiter;
|
||||
@Getter
|
||||
@Field(def = "0")
|
||||
private int ergebnis;
|
||||
@ -99,8 +69,4 @@ public class EventFight {
|
||||
this.fight = fight;
|
||||
setFight.update(fight, fightID);
|
||||
}
|
||||
|
||||
public void update() {
|
||||
update.update(startTime, spielModus, map, teamBlue, teamRed, kampfleiter, fightID);
|
||||
}
|
||||
}
|
||||
|
@ -44,8 +44,6 @@ public class SteamwarUser {
|
||||
private static final SelectStatement<SteamwarUser> byDiscord = table.selectFields("DiscordId");
|
||||
private static final SelectStatement<SteamwarUser> byTeam = table.selectFields("Team");
|
||||
private static final SelectStatement<SteamwarUser> getServerTeam = new SelectStatement<>(table, "SELECT * FROM UserData WHERE UserGroup != 'Member' AND UserGroup != 'YouTuber'");
|
||||
|
||||
private static final SelectStatement<SteamwarUser> getAll = new SelectStatement<>(table, "SELECT * FROM UserData");
|
||||
private static final Statement updateName = table.update(Table.PRIMARY, "UserName");
|
||||
private static final Statement updateLocale = table.update(Table.PRIMARY, "Locale", "ManualLocale");
|
||||
private static final Statement updateTeam = table.update(Table.PRIMARY, "Team");
|
||||
@ -159,10 +157,6 @@ public class SteamwarUser {
|
||||
return byDiscord.select(discordId);
|
||||
}
|
||||
|
||||
public static List<SteamwarUser> getAll() {
|
||||
return getAll.listSelect();
|
||||
}
|
||||
|
||||
public static void createOrUpdateUsername(UUID uuid, String userName) {
|
||||
insert.update(uuid, userName);
|
||||
}
|
||||
|
@ -33,7 +33,6 @@ public class Team {
|
||||
|
||||
private static final Table<Team> table = new Table<>(Team.class);
|
||||
private static final SelectStatement<Team> select = table.select(Table.PRIMARY);
|
||||
private static final SelectStatement<Team> all = new SelectStatement(table, "SELECT * FROM Team");
|
||||
|
||||
@Field(keys = {Table.PRIMARY})
|
||||
@Getter
|
||||
@ -56,10 +55,6 @@ public class Team {
|
||||
return select.select(id);
|
||||
}
|
||||
|
||||
public static List<Team> getAll() {
|
||||
return all.listSelect();
|
||||
}
|
||||
|
||||
public List<Integer> getMembers(){
|
||||
return SteamwarUser.getTeam(teamId).stream().map(SteamwarUser::getId).collect(Collectors.toList());
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren