Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new clan db structure from https://github.com/FAForever/db/pull/56 #2

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/main/java/com/faforever/api/data/domain/Clan.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class Clan {
private Player clanLeader;
private String clanDesc;
private String clanTagColor;
private List<ClanMembership> memberships;
private List<Player> members;

@Id
@Column(name = "clan_id")
Expand Down Expand Up @@ -121,13 +121,9 @@ public void setClanTagColor(String clanTagColor) {
}

@OneToMany(mappedBy = "clan")
public List<ClanMembership> getMemberships() {
return memberships;
}
public List<Player> getMembers() { return members; }

public void setMemberships(List<ClanMembership> memberships) {
this.memberships = memberships;
}
public void setMembers(List<Player> newMembers) { this.members = newMembers; }

@Override
public int hashCode() {
Expand Down
102 changes: 0 additions & 102 deletions src/main/java/com/faforever/api/data/domain/ClanMembership.java

This file was deleted.

50 changes: 0 additions & 50 deletions src/main/java/com/faforever/api/data/domain/ClanMembershipPK.java

This file was deleted.

27 changes: 24 additions & 3 deletions src/main/java/com/faforever/api/data/domain/Player.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import com.yahoo.elide.annotation.Include;

import javax.persistence.Entity;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.*;
import java.sql.Timestamp;

@Entity
@Table(name = "login")
Expand All @@ -14,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;
Expand All @@ -28,6 +39,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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't commit your local settings

name: faf_lobby
username: ${DATABASE_USERNAME:root}
password: ${DATABASE_PASSWORD:banana}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spring:
active: ${API_PROFILE:dev}

server:
port: 8080
port: 5000
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't commit your local settings


security:
enable-csrf: true
Expand Down