Add leaderboardId field to Achievement table (with backfill)

db/migration/V0077__Add_leaderboard_id_field_to_Achievement_table.SQL

@@ -0,0 +1,23 @@
+ALTER TABLE "Achievement"
+ADD COLUMN "leaderboardId" UUID,
+ADD CONSTRAINT "fk_leaderboard" FOREIGN KEY ("leaderboardId") REFERENCES "Leaderboard"(id);
+
+-- backfill
+-- all current `Achievement.name` is either
+--   "<leaderboard name> - <school> - <Nth> Place"  (tag leaderboards)
+--   "<leaderboard name> - <Nth> Place"             (global leaderboard)
+DO $$
+BEGIN
+    CASE current_database()
+        WHEN 'codebloom-prod' THEN
+            UPDATE "Achievement" a
+            SET "leaderboardId" = l.id
+            FROM "Leaderboard" l
+            WHERE l.name = split_part(a.title, ' - ', 1);
+        ELSE
+            RAISE NOTICE 'Skipping prod only backfill: Current database is %', current_database();
+    END CASE;
+END $$;
+
+ALTER TABLE "Achievement"
+ALTER COLUMN "leaderboardId" SET NOT NULL;

db/repeated/R__Mock_V0023_Insert_mock_achievements_for_achievement_table.SQL

@@ -1,31 +1,33 @@
 DO $$
 BEGIN
-    INSERT INTO "Achievement" 
-        (id, "userId", title, description, "isActive", place, leaderboard, "createdAt")
+    INSERT INTO "Achievement"
+        (id, "userId", title, description, "isActive", place, leaderboard, "leaderboardId", "createdAt")
     VALUES
         (
             '265dd000-c310-11f0-8d3a-461b1b1abee9',
             '1717a2dc-ce77-4853-a620-82177799ad26',
-            'October Overflow',
+            'Not expired leaderboard',
             'Achieved first place on the Patina Network leaderboard',
             true,
             'ONE',
             'Patina',
+            '39bc2def-669f-4383-8ea3-7202efd613f2',
             '2025-11-11 00:00:00+00'
         );
 
-    INSERT INTO "Achievement" 
-        (id, "userId", title, description, "isActive", place, leaderboard, "createdAt")
+    INSERT INTO "Achievement"
+        (id, "userId", title, description, "isActive", place, leaderboard, "leaderboardId", "createdAt")
     VALUES
         (
             '365dd000-c310-11f0-8d3a-461b1b1abeea',
             '1717a2dc-ce77-4853-a620-82177799ad26',
-            'auto november = nullptr;',
+            'Expired leaderboard',
             'Secured first place on the global leaderboard',
             true,
             'ONE',
             NULL,
+            '8fc363b2-b5be-4f1a-9e0e-ea4844fc919c',
             '2025-12-06 00:00:00+00'
         );
 
-END $$;
+END $$;

src/main/java/org/patinanetwork/codebloom/common/db/models/achievements/Achievement.java

@@ -23,6 +23,9 @@ public class Achievement {
     @NotNullColumn
     private String userId;
 
+    @NotNullColumn
+    private String leaderboardId;
+
     @NotNullColumn
     private AchievementPlaceEnum place;
 

src/main/java/org/patinanetwork/codebloom/common/db/repos/achievements/AchievementRepository.java

@@ -15,6 +15,7 @@ public interface AchievementRepository {
      *       <li>title
      *       <li>description
      *       <li>isActive
+     *       <li>leaderboardId
      *     </ul>
      */
     void createAchievement(Achievement achievement);
@@ -29,6 +30,7 @@ public interface AchievementRepository {
      *       <li>description
      *       <li>isActive
      *       <li>deletedAt
+     *       <li>leaderboardId
      *     </ul>
      *
      * @return updated achievement if successful

src/main/java/org/patinanetwork/codebloom/common/db/repos/achievements/AchievementSqlRepository.java

@@ -26,6 +26,7 @@
         var title = rs.getString("title");
         var description = rs.getString("description");
         var isActive = rs.getBoolean("isActive");
+        var leaderboardId = rs.getString("leaderboardId");
         var createdAt = StandardizedOffsetDateTime.normalize(rs.getObject("createdAt", OffsetDateTime.class));
         OffsetDateTime deletedAt =
                 StandardizedOffsetDateTime.normalize(rs.getObject("deletedAt", OffsetDateTime.class));
@@ -34,6 +35,7 @@
                 .userId(userId)
                 .place(place)
                 .leaderboard(leaderboard)
+                .leaderboardId(leaderboardId)
                 .title(title)
                 .description(description)
                 .isActive(isActive)
@@ -53,9 +55,9 @@
         achievement.setId(UUID.randomUUID().toString());
         String sql = """
             INSERT INTO "Achievement"
-                (id, "userId", place, leaderboard, title, description, "isActive", "deletedAt")
+                (id, "userId", place, leaderboard, title, description, "isActive", "deletedAt", "leaderboardId")
             VALUES
-                (:id, :userId, :place, :leaderboard, :title, :description, :isActive, :deletedAt)
+                (:id, :userId, :place, :leaderboard, :title, :description, :isActive, :deletedAt, :leaderboardId)
             RETURNING
                 "createdAt"
             """;
@@ -71,6 +73,7 @@
                                 .map(Enum::name)
                                 .orElse(null),
                         Types.OTHER)
+                .param("leaderboardId", UUID.fromString(achievement.getLeaderboardId()))
                 .param("title", achievement.getTitle())
                 .param("description", achievement.getDescription())
                 .param("isActive", achievement.isActive())
@@ -94,7 +97,8 @@
                 title = :title,
                 description = :description,
                 "isActive" = :isActive,
-                "deletedAt" = :deletedAt
+                "deletedAt" = :deletedAt,
+                "leaderboardId" = :leaderboardId
             WHERE
                 id = :id
             """;
@@ -108,10 +112,12 @@
                                 .map(Enum::name)
                                 .orElse(null),
                         Types.OTHER)
+                .param("leaderboardId", achievement.getLeaderboardId())
                 .param("title", achievement.getTitle())
                 .param("description", achievement.getDescription())
                 .param("isActive", achievement.isActive())
                 .param("deletedAt", achievement.getDeletedAt())
+                .param("leaderboardId", UUID.fromString(achievement.getLeaderboardId()))
                 .param("id", UUID.fromString(achievement.getId()))
                 .update();
 
@@ -150,7 +156,8 @@
                 description,
                 "isActive",
                 "createdAt",
-                "deletedAt"
+                "deletedAt",
+                "leaderboardId"
             FROM
                 "Achievement"
             WHERE
@@ -178,7 +185,8 @@
                 description,
                 "isActive",
                 "createdAt",
-                "deletedAt"
+                "deletedAt",
+                "leaderboardId"
             FROM
                 "Achievement"
             WHERE

src/main/java/org/patinanetwork/codebloom/common/dto/achievement/AchievementDto.java

@@ -30,6 +30,9 @@ public class AchievementDto {
     @Schema(requiredMode = Schema.RequiredMode.REQUIRED, nullable = true)
     private Tag leaderboard;
 
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
+    private String leaderboardId;
+
     @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     private String title;
 
@@ -52,6 +55,7 @@ public static AchievementDto fromAchievement(final Achievement achievement) {
                 .leaderboard(achievement.getLeaderboard())
                 .place(achievement.getPlace())
                 .title(achievement.getTitle())
+                .leaderboardId(achievement.getLeaderboardId())
                 .description(achievement.getDescription())
                 .isActive(achievement.isActive())
                 .createdAt(achievement.getCreatedAt())

src/test/java/org/patinanetwork/codebloom/common/db/repos/achievements/AchievementRepositoryTest.java

@@ -22,6 +22,8 @@ public class AchievementRepositoryTest extends BaseRepositoryTest {
     private Achievement testAchievement;
     private Achievement deletableAchievement;
     private String mockUserId = "ed3bfe18-e42a-467f-b4fa-07e8da4d2555";
+    // Not expired leaderboard
+    private String mockLeaderboardId = "39bc2def-669f-4383-8ea3-7202efd613f2";
 
     @Autowired
     public AchievementRepositoryTest(final AchievementRepository repo) {
@@ -34,6 +36,7 @@ void createAchievement() {
                 .userId(mockUserId)
                 .place(AchievementPlaceEnum.ONE)
                 .leaderboard(null)
+                .leaderboardId(mockLeaderboardId)
                 .title("Test Achievement")
                 .description("Integration test achievement")
                 .isActive(true)
@@ -78,6 +81,7 @@ void testUpdateAchievement() {
                 .userId(testAchievement.getUserId())
                 .place(AchievementPlaceEnum.THREE)
                 .leaderboard(Tag.Patina)
+                .leaderboardId(mockLeaderboardId)
                 .title("Updated Title")
                 .description("Updated Description")
                 .isActive(false)
@@ -101,6 +105,7 @@ void testDeleteAchievementById() {
                 .userId(mockUserId)
                 .place(AchievementPlaceEnum.ONE)
                 .leaderboard(null)
+                .leaderboardId(mockLeaderboardId)
                 .title("Deletable Achievement")
                 .description("Should be deleted")
                 .isActive(true)