Expose last usage of users unique ids

Author: Brutus5000

compose.yaml

@@ -16,7 +16,7 @@ services:
       - "3306:3306"
 
   faf-db-migrations:
-    image: faforever/faf-db-migrations:v138
+    image: faforever/faf-db-migrations:v140
     command: migrate
     environment:
       FLYWAY_URL: jdbc:mysql://faf-db/faf?useSSL=false

src/inttest/java/com/faforever/api/config/MainDbTestContainers.java

@@ -21,7 +21,7 @@
 @Configuration
 public class MainDbTestContainers {
   private static final MariaDBContainer<?> fafDBContainer = new MariaDBContainer<>("mariadb:11.7");
-  private static final GenericContainer<?> flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v137");
+  private static final GenericContainer<?> flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v140");
   private static final Network sharedNetwork = Network.newNetwork();
 
   @Bean

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

@@ -51,7 +51,7 @@ public void canReadPermissionsWithScopeAndRole() throws Exception {
     mockMvc.perform(get("/data/groupPermission")
       .with(getOAuthTokenWithActiveUser(OAuthScope._READ_SENSIBLE_USERDATA, GroupPermission.ROLE_READ_USER_GROUP)))
       .andExpect(status().isOk())
-      .andExpect(jsonPath("$.data", hasSize(25)));
+      .andExpect(jsonPath("$.data", hasSize(26)));
   }
 
   @Test

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

@@ -40,6 +40,7 @@ public abstract class Login extends AbstractEntity<Login> implements OwnableEnti
   private String recentIpAddress;
   private OffsetDateTime lastLogin;
   private Set<UniqueId> uniqueIds;
+  private Set<UniqueIdAssignment> uniqueIdAssignments;
 
 
   public Login() {
@@ -122,6 +123,7 @@ public Set<UserGroup> getUserGroups() {
     return userGroups;
   }
 
+  @Deprecated(forRemoval = true)
   @OneToMany
   @JoinTable(name = "unique_id_users",
     joinColumns = @JoinColumn(name = "user_id"),
@@ -132,6 +134,12 @@ public Set<UniqueId> getUniqueIds() {
     return uniqueIds;
   }
 
+  @OneToMany(mappedBy = "user")
+  @ReadPermission(expression = ReadAccountPrivateDetailsCheck.EXPRESSION)
+  public Set<UniqueIdAssignment> getUniqueIdAssignments() {
+    return uniqueIdAssignments;
+  }
+
   @Override
   @Transient
   @JsonIgnore

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

@@ -0,0 +1,43 @@
+package com.faforever.api.data.domain;
+
+import com.yahoo.elide.annotation.Include;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "unique_id_users")
+@Include(name = UniqueIdAssignment.TYPE_NAME, rootLevel = false)
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true)
+@ToString(onlyExplicitlyIncluded = true)
+public class UniqueIdAssignment extends AbstractEntity<UniqueIdAssignment> implements Serializable {
+  public static final String TYPE_NAME = "uniqueIdAssignment";
+
+  private Player user;
+  private UniqueId uniqueId;
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "user_id")
+  public Player getUser() {
+    return user;
+  }
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  // WTF? Who designed this table?
+  @JoinColumn(name = "uniqueid_hash", referencedColumnName = "hash")
+  public UniqueId getUniqueId() {
+    return uniqueId;
+  }
+}

src/main/resources/config/application.yml

@@ -16,7 +16,7 @@ faf-api:
     hmac-secret: ${CLOUDFLARE_HMAC_SECRET}
     hmac-param: ${CLOUDFLARE_HMAC_PARAM:verify}
   database:
-    schema-version: ${DATABASE_SCHEMA_VERSION:138}
+    schema-version: ${DATABASE_SCHEMA_VERSION:140}
   deployment:
     forged-alliance-exe-path: ${FORGED_ALLIANCE_EXE_PATH:/content/legacy-featured-mod-files/updates_faf_files/ForgedAlliance.exe}
     repositories-directory: ${REPOSITORIES_DIRECTORY:/repositories}