Drop many-to-many uniqueIds

Author: Brutus5000

src/inttest/java/com/faforever/api/data/PlayerElideTest.java

@@ -48,10 +48,10 @@ public void restrictedResultWithoutScope() throws Exception {
       .andExpect(jsonPath("$.data[1].attributes", not(hasKey("lastLogin"))))
       .andExpect(jsonPath("$.data[2].attributes", not(hasKey("lastLogin"))))
       .andExpect(jsonPath("$.data[3].attributes", not(hasKey("lastLogin"))))
-      .andExpect(jsonPath("$.data[0].relationships", not(hasKey("uniqueIds"))))
-      .andExpect(jsonPath("$.data[1].relationships", not(hasKey("uniqueIds"))))
-      .andExpect(jsonPath("$.data[2].relationships", not(hasKey("uniqueIds"))))
-      .andExpect(jsonPath("$.data[3].relationships", not(hasKey("uniqueIds"))))
+      .andExpect(jsonPath("$.data[0].relationships", not(hasKey("uniqueIdAssignments"))))
+      .andExpect(jsonPath("$.data[1].relationships", not(hasKey("uniqueIdAssignments"))))
+      .andExpect(jsonPath("$.data[2].relationships", not(hasKey("uniqueIdAssignments"))))
+      .andExpect(jsonPath("$.data[3].relationships", not(hasKey("uniqueIdAssignments"))))
       .andExpect(jsonPath("$.data[0].relationships", not(hasKey("accountLinks"))))
       .andExpect(jsonPath("$.data[1].relationships", not(hasKey("accountLinks"))))
       .andExpect(jsonPath("$.data[2].relationships", not(hasKey("accountLinks"))))
@@ -64,7 +64,7 @@ public void restrictedResultWithoutScope() throws Exception {
       .andExpect(jsonPath("$.data[4].relationships", hasKey("userGroups")))
       .andExpect(jsonPath("$.data[4].relationships", hasKey("accountLinks")))
       // you cannot see your uuid
-      .andExpect(jsonPath("$.data[4].relationships", not(hasKey("uniqueIds"))))
+      .andExpect(jsonPath("$.data[4].relationships", not(hasKey("uniqueIdAssignments"))))
       // nobody can see passwords!
       .andExpect(jsonPath("$.data[0].attributes", not(hasKey("password"))))
       .andExpect(jsonPath("$.data[1].attributes", not(hasKey("password"))))
@@ -107,10 +107,10 @@ public void restrictedResultWithoutRole() throws Exception {
       .andExpect(jsonPath("$.data[1].attributes", not(hasKey("lastLogin"))))
       .andExpect(jsonPath("$.data[2].attributes", not(hasKey("lastLogin"))))
       .andExpect(jsonPath("$.data[3].attributes", not(hasKey("lastLogin"))))
-      .andExpect(jsonPath("$.data[0].relationships", not(hasKey("uniqueIds"))))
-      .andExpect(jsonPath("$.data[1].relationships", not(hasKey("uniqueIds"))))
-      .andExpect(jsonPath("$.data[2].relationships", not(hasKey("uniqueIds"))))
-      .andExpect(jsonPath("$.data[3].relationships", not(hasKey("uniqueIds"))))
+      .andExpect(jsonPath("$.data[0].relationships", not(hasKey("uniqueIdAssignments"))))
+      .andExpect(jsonPath("$.data[1].relationships", not(hasKey("uniqueIdAssignments"))))
+      .andExpect(jsonPath("$.data[2].relationships", not(hasKey("uniqueIdAssignments"))))
+      .andExpect(jsonPath("$.data[3].relationships", not(hasKey("uniqueIdAssignments"))))
       .andExpect(jsonPath("$.data[0].relationships", not(hasKey("accountLinks"))))
       .andExpect(jsonPath("$.data[1].relationships", not(hasKey("accountLinks"))))
       .andExpect(jsonPath("$.data[2].relationships", not(hasKey("accountLinks"))))
@@ -123,7 +123,7 @@ public void restrictedResultWithoutRole() throws Exception {
       .andExpect(jsonPath("$.data[4].relationships", hasKey("userGroups")))
       .andExpect(jsonPath("$.data[4].relationships", hasKey("accountLinks")))
       // you cannot see your uuid
-      .andExpect(jsonPath("$.data[4].relationships", not(hasKey("uniqueIds"))))
+      .andExpect(jsonPath("$.data[4].relationships", not(hasKey("uniqueIdAssignments"))))
       // nobody can see passwords!
       .andExpect(jsonPath("$.data[0].attributes", not(hasKey("password"))))
       .andExpect(jsonPath("$.data[1].attributes", not(hasKey("password"))))
@@ -169,11 +169,11 @@ public void canSeePrivateDetailsWithScopeAndRole() throws Exception {
       .andExpect(jsonPath("$.data[2].attributes", hasKey("lastLogin")))
       .andExpect(jsonPath("$.data[3].attributes", hasKey("lastLogin")))
       .andExpect(jsonPath("$.data[4].attributes", hasKey("lastLogin")))
-      .andExpect(jsonPath("$.data[0].relationships", hasKey("uniqueIds")))
-      .andExpect(jsonPath("$.data[1].relationships", hasKey("uniqueIds")))
-      .andExpect(jsonPath("$.data[2].relationships", hasKey("uniqueIds")))
-      .andExpect(jsonPath("$.data[3].relationships", hasKey("uniqueIds")))
-      .andExpect(jsonPath("$.data[4].relationships", hasKey("uniqueIds")))
+      .andExpect(jsonPath("$.data[0].relationships", hasKey("uniqueIdAssignments")))
+      .andExpect(jsonPath("$.data[1].relationships", hasKey("uniqueIdAssignments")))
+      .andExpect(jsonPath("$.data[2].relationships", hasKey("uniqueIdAssignments")))
+      .andExpect(jsonPath("$.data[3].relationships", hasKey("uniqueIdAssignments")))
+      .andExpect(jsonPath("$.data[4].relationships", hasKey("uniqueIdAssignments")))
       .andExpect(jsonPath("$.data[0].relationships", hasKey("accountLinks")))
       .andExpect(jsonPath("$.data[1].relationships", hasKey("accountLinks")))
       .andExpect(jsonPath("$.data[2].relationships", hasKey("accountLinks")))

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

@@ -14,8 +14,6 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.OneToMany;
@@ -39,7 +37,6 @@ public abstract class Login extends AbstractEntity<Login> implements OwnableEnti
   private Set<UserGroup> userGroups;
   private String recentIpAddress;
   private OffsetDateTime lastLogin;
-  private Set<UniqueId> uniqueIds;
   private Set<UniqueIdAssignment> uniqueIdAssignments;
 
 
@@ -123,17 +120,6 @@ public Set<UserGroup> getUserGroups() {
     return userGroups;
   }
 
-  @Deprecated(forRemoval = true)
-  @OneToMany
-  @JoinTable(name = "unique_id_users",
-    joinColumns = @JoinColumn(name = "user_id"),
-    inverseJoinColumns = @JoinColumn(name = "uniqueid_hash", referencedColumnName = "hash")
-  )
-  @ReadPermission(expression = ReadAccountPrivateDetailsCheck.EXPRESSION)
-  public Set<UniqueId> getUniqueIds() {
-    return uniqueIds;
-  }
-
   @OneToMany(mappedBy = "user")
   @ReadPermission(expression = ReadAccountPrivateDetailsCheck.EXPRESSION)
   public Set<UniqueIdAssignment> getUniqueIdAssignments() {