Skip to content

Commit f8337a6

Browse files
committed
Fix Login
1 parent cfae15f commit f8337a6

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

src/main/java/com/faforever/api/data/domain/Login.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
import javax.persistence.Column;
1616
import javax.persistence.FetchType;
17+
import javax.persistence.JoinColumn;
18+
import javax.persistence.JoinTable;
1719
import javax.persistence.ManyToMany;
1820
import javax.persistence.MappedSuperclass;
1921
import javax.persistence.OneToMany;
@@ -37,6 +39,8 @@ public abstract class Login extends AbstractEntity implements OwnableEntity {
3739
private Set<UserGroup> userGroups;
3840
private String recentIpAddress;
3941
private OffsetDateTime lastLogin;
42+
private Set<UniqueId> uniqueIds;
43+
4044

4145
public Login() {
4246
this.bans = new HashSet<>(0);
@@ -117,6 +121,16 @@ public Set<UserGroup> getUserGroups() {
117121
return userGroups;
118122
}
119123

124+
@OneToMany
125+
@JoinTable(name = "unique_id_users",
126+
joinColumns = @JoinColumn(name = "user_id"),
127+
inverseJoinColumns = @JoinColumn(name = "uniqueid_hash", referencedColumnName = "hash")
128+
)
129+
@ReadPermission(expression = ReadAccountPrivateDetailsCheck.EXPRESSION)
130+
public Set<UniqueId> getUniqueIds() {
131+
return uniqueIds;
132+
}
133+
120134
@Override
121135
@Transient
122136
@JsonIgnore

src/main/java/com/faforever/api/data/domain/UniqueId.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import javax.persistence.Column;
1111
import javax.persistence.Entity;
1212
import javax.persistence.Table;
13+
import java.io.Serializable;
1314

1415
@Entity
1516
@Table(name = "uniqueid")
@@ -19,7 +20,7 @@
1920
@NoArgsConstructor
2021
@EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
2122
@ToString(onlyExplicitlyIncluded = true)
22-
public class UniqueId extends AbstractEntity {
23+
public class UniqueId extends AbstractEntity implements Serializable {
2324

2425
public static final String TYPE_NAME = "uniqueId";
2526

0 commit comments

Comments
 (0)