From 57312e2cbbadce588d9cafc82c361fdf1d407d52 Mon Sep 17 00:00:00 2001 From: Dragonfire Date: Sat, 7 Jan 2017 13:05:29 +0100 Subject: [PATCH 1/3] Use new clan db structure from https://github.com/FAForever/db/pull/56 --- .../java/com/faforever/api/data/domain/Clan.java | 10 +++------- .../java/com/faforever/api/data/domain/Player.java | 14 +++++++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/faforever/api/data/domain/Clan.java b/src/main/java/com/faforever/api/data/domain/Clan.java index db4fc62a4..ddb18ac02 100644 --- a/src/main/java/com/faforever/api/data/domain/Clan.java +++ b/src/main/java/com/faforever/api/data/domain/Clan.java @@ -28,7 +28,7 @@ public class Clan { private Player clanLeader; private String clanDesc; private String clanTagColor; - private List memberships; + private List members; @Id @Column(name = "clan_id") @@ -121,13 +121,9 @@ public void setClanTagColor(String clanTagColor) { } @OneToMany(mappedBy = "clan") - public List getMemberships() { - return memberships; - } + public List getMembers() { return members; } - public void setMemberships(List memberships) { - this.memberships = memberships; - } + public void setMembers(List newMembers) { this.members = newMembers; } @Override public int hashCode() { diff --git a/src/main/java/com/faforever/api/data/domain/Player.java b/src/main/java/com/faforever/api/data/domain/Player.java index bce259187..d56d53f57 100644 --- a/src/main/java/com/faforever/api/data/domain/Player.java +++ b/src/main/java/com/faforever/api/data/domain/Player.java @@ -2,9 +2,7 @@ import com.yahoo.elide.annotation.Include; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "login") @@ -28,6 +26,16 @@ public GlobalRating getGlobalRating() { return globalRating; } + private Clan clan; + + @ManyToOne + @JoinColumn(name = "clan_id") + public Clan getClan() { + return clan; + } + + public void setClan(Clan newClan) { this.clan = newClan; } + public void setGlobalRating(GlobalRating globalRating) { this.globalRating = globalRating; } From db3a5ae4bfd9cb5f15a85d798d31e06660e9cd39 Mon Sep 17 00:00:00 2001 From: Dragonfire Date: Sat, 7 Jan 2017 13:08:04 +0100 Subject: [PATCH 2/3] Remove unused classes --- .../api/data/domain/ClanMembership.java | 102 ------------------ .../api/data/domain/ClanMembershipPK.java | 50 --------- 2 files changed, 152 deletions(-) delete mode 100644 src/main/java/com/faforever/api/data/domain/ClanMembership.java delete mode 100644 src/main/java/com/faforever/api/data/domain/ClanMembershipPK.java diff --git a/src/main/java/com/faforever/api/data/domain/ClanMembership.java b/src/main/java/com/faforever/api/data/domain/ClanMembership.java deleted file mode 100644 index a2c7cc4db..000000000 --- a/src/main/java/com/faforever/api/data/domain/ClanMembership.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.faforever.api.data.domain; - -import com.yahoo.elide.annotation.ComputedRelationship; -import com.yahoo.elide.annotation.Exclude; -import com.yahoo.elide.annotation.Include; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import java.sql.Timestamp; -import java.util.Objects; - -@Entity -@Table(name = "clan_members") -@IdClass(ClanMembershipPK.class) -@Include(type = "clan_membership") -public class ClanMembership { - - private int clanId; - private int playerId; - private Timestamp joinClanDate; - private Clan clan; - private Player player; - - @Id - @Column(name = "clan_id", insertable = false, updatable = false) - @Exclude - public int getClanId() { - return clanId; - } - - public void setClanId(int clan) { - this.clanId = clan; - } - - @ManyToOne - @JoinColumn(name = "clan_id") - @ComputedRelationship - public Clan getClan() { - return clan; - } - - public void setClan(Clan clan) { - this.clan = clan; - } - - @ManyToOne - @JoinColumn(name = "player_id") - @ComputedRelationship - public Player getPlayer() { - return player; - } - - public void setPlayer(Player player) { - this.player = player; - } - - @Id - @Column(name = "player_id", insertable = false, updatable = false) - @Exclude - public int getPlayerId() { - return playerId; - } - - public void setPlayerId(int player) { - this.playerId = player; - } - - @Basic - @Column(name = "join_clan_date") - public Timestamp getJoinClanDate() { - return joinClanDate; - } - - public void setJoinClanDate(Timestamp joinClanDate) { - this.joinClanDate = joinClanDate; - } - - @Override - public int hashCode() { - return Objects.hash(clanId, playerId, joinClanDate); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ClanMembership that = (ClanMembership) o; - return clanId == that.clanId && - playerId == that.playerId && - Objects.equals(joinClanDate, that.joinClanDate); - } -} diff --git a/src/main/java/com/faforever/api/data/domain/ClanMembershipPK.java b/src/main/java/com/faforever/api/data/domain/ClanMembershipPK.java deleted file mode 100644 index cbe67bd0b..000000000 --- a/src/main/java/com/faforever/api/data/domain/ClanMembershipPK.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.faforever.api.data.domain; - -import javax.persistence.Column; -import javax.persistence.Id; -import java.io.Serializable; -import java.util.Objects; - -public class ClanMembershipPK implements Serializable { - - private int clanId; - private int playerId; - - @Column(name = "clan_id", insertable = false, updatable = false) - @Id - public int getClanId() { - return clanId; - } - - public void setClanId(int clanId) { - this.clanId = clanId; - } - - @Column(name = "player_id", insertable = false, updatable = false) - @Id - public int getPlayerId() { - return playerId; - } - - public void setPlayerId(int playerId) { - this.playerId = playerId; - } - - @Override - public int hashCode() { - return Objects.hash(clanId, playerId); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ClanMembershipPK that = (ClanMembershipPK) o; - return clanId == that.clanId && - playerId == that.playerId; - } -} From e6d48e2cc8302c29f3d337200299553eda801894 Mon Sep 17 00:00:00 2001 From: Dragonfire Date: Sat, 7 Jan 2017 13:11:29 +0100 Subject: [PATCH 3/3] Add clan join date --- .../java/com/faforever/api/data/domain/Player.java | 13 +++++++++++++ src/main/resources/config/application-dev.yml | 2 +- src/main/resources/config/application.yml | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/faforever/api/data/domain/Player.java b/src/main/java/com/faforever/api/data/domain/Player.java index d56d53f57..02212b7e3 100644 --- a/src/main/java/com/faforever/api/data/domain/Player.java +++ b/src/main/java/com/faforever/api/data/domain/Player.java @@ -3,6 +3,7 @@ import com.yahoo.elide.annotation.Include; import javax.persistence.*; +import java.sql.Timestamp; @Entity @Table(name = "login") @@ -12,6 +13,18 @@ public class Player extends Login { private Ladder1v1Rating ladder1v1Rating; private GlobalRating globalRating; + @Basic + @Column(name = "clan_join_date") + public Timestamp getClanJoinDate() { + return clanJoinDate; + } + + public void setClanJoinDate(Timestamp clanJoinDate) { + this.clanJoinDate = clanJoinDate; + } + + private Timestamp clanJoinDate; + @OneToOne(mappedBy = "player") public Ladder1v1Rating getLadder1v1Rating() { return ladder1v1Rating; diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 00fda02b8..bb03c5889 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ faf-api: spring: datasource: - url: jdbc:mysql://${DATABASE_ADDRESS:192.168.99.100}/${DATABASE_NAME:faf_lobby}?useSSL=false + url: jdbc:mysql://${DATABASE_ADDRESS:localhost}/${DATABASE_NAME:faf_test}?useSSL=false name: faf_lobby username: ${DATABASE_USERNAME:root} password: ${DATABASE_PASSWORD:banana} diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 7cee9deeb..9457f8dc7 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -25,7 +25,7 @@ spring: active: ${API_PROFILE:dev} server: - port: 8080 + port: 5000 security: enable-csrf: true