Feat/도메인 jpa 분리

scripts/backfill-public-id.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PROFILES="${SPRING_PROFILES_ACTIVE:-backfill-public-id}"
+
+./gradlew bootRun --args="--spring.profiles.active=${PROFILES} --spring.main.web-application-type=none"

src/main/java/me/pinitnotification/application/notification/ScheduleNotificationService.java

@@ -7,6 +7,7 @@
 import me.pinitnotification.application.notification.query.ScheduleQueryPort;
 import me.pinitnotification.domain.notification.UpcomingScheduleNotification;
 import me.pinitnotification.domain.notification.UpcomingScheduleNotificationRepository;
+import me.pinitnotification.domain.shared.IdGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -18,10 +19,14 @@ public class ScheduleNotificationService {
 
     private final UpcomingScheduleNotificationRepository notificationRepository;
     private final ScheduleQueryPort scheduleQueryPort;
+    private final IdGenerator idGenerator;
 
-    public ScheduleNotificationService(UpcomingScheduleNotificationRepository notificationRepository, ScheduleQueryPort scheduleQueryPort) {
+    public ScheduleNotificationService(UpcomingScheduleNotificationRepository notificationRepository,
+                                       ScheduleQueryPort scheduleQueryPort,
+                                       IdGenerator idGenerator) {
         this.notificationRepository = notificationRepository;
         this.scheduleQueryPort = scheduleQueryPort;
+        this.idGenerator = idGenerator;
     }
 
     @Transactional
@@ -74,6 +79,7 @@ private UpcomingScheduleNotification buildNotification(Long ownerId, Long schedu
         String scheduleStartTime = scheduleStartTimeOverride != null ? scheduleStartTimeOverride : basics.designatedStartTime();
 
         return new UpcomingScheduleNotification(
+                idGenerator.generate(),
                 basics.ownerId(),
                 basics.scheduleId(),
                 basics.scheduleTitle(),

src/main/java/me/pinitnotification/domain/notification/UpcomingScheduleNotification.java

@@ -1,39 +1,43 @@
 package me.pinitnotification.domain.notification;
 
-
-import jakarta.persistence.*;
 import lombok.Getter;
 
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeParseException;
 import java.util.Map;
+import java.util.UUID;
 
 @Getter
-@Entity
-@Table(
-        name = "upcoming_schedule_notification",
-        uniqueConstraints = {
-                @UniqueConstraint(name = "uk_schedule_owner", columnNames = {"schedule_id", "owner_id"}),
-                @UniqueConstraint(name = "uk_idempotent_key", columnNames = {"idempotent_key"})
-        }
-)
 public class UpcomingScheduleNotification implements Notification {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    @Column(name = "owner_id", nullable = false)
+    private Long legacyId;
+    private UUID id;
     private Long ownerId;
-    @Column(name = "schedule_id", nullable = false)
     private Long scheduleId;
-    @Column(name = "schedule_title", nullable = false)
     private String scheduleTitle;
-    @Column(name = "schedule_start_time", nullable = false)
     private String scheduleStartTime;
-    @Column(name = "idempotent_key", nullable = false)
     private String idempotentKey;
 
     protected UpcomingScheduleNotification() {}
 
+    public UpcomingScheduleNotification(Long legacyId, UUID id, Long ownerId, Long scheduleId, String scheduleTitle, String scheduleStartTime, String idempotentKey) {
+        this.legacyId = legacyId;
+        this.id = id;
+        this.ownerId = ownerId;
+        this.scheduleId = scheduleId;
+        this.scheduleTitle = scheduleTitle;
+        this.scheduleStartTime = scheduleStartTime;
+        this.idempotentKey = idempotentKey;
+    }
+
+    public UpcomingScheduleNotification(UUID id, Long ownerId, Long scheduleId, String scheduleTitle, String scheduleStartTime, String idempotentKey) {
+        this.id = id;
+        this.ownerId = ownerId;
+        this.scheduleId = scheduleId;
+        this.scheduleTitle = scheduleTitle;
+        this.scheduleStartTime = scheduleStartTime;
+        this.idempotentKey = idempotentKey;
+    }
+
     public UpcomingScheduleNotification(Long ownerId, Long scheduleId, String scheduleTitle, String scheduleStartTime, String idempotentKey) {
         this.ownerId = ownerId;
         this.scheduleId = scheduleId;

src/main/java/me/pinitnotification/domain/notification/UpcomingScheduleNotificationRepository.java

@@ -1,11 +1,13 @@
 package me.pinitnotification.domain.notification;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-
+import java.util.List;
 import java.util.Optional;
 
-public interface UpcomingScheduleNotificationRepository extends JpaRepository<UpcomingScheduleNotification, Long> {
+public interface UpcomingScheduleNotificationRepository {
+    List<UpcomingScheduleNotification> findAll();
     Optional<UpcomingScheduleNotification> findByScheduleIdAndOwnerId(Long scheduleId, Long ownerId);
     boolean existsByScheduleIdAndOwnerId(Long scheduleId, Long ownerId);
+    UpcomingScheduleNotification save(UpcomingScheduleNotification notification);
     void deleteByScheduleIdAndOwnerId(Long scheduleId, Long ownerId);
+    void deleteAllInBatch(List<UpcomingScheduleNotification> notifications);
 }

src/main/java/me/pinitnotification/domain/push/PushSubscription.java

@@ -1,47 +1,44 @@
 package me.pinitnotification.domain.push;
 
-import jakarta.persistence.*;
 import lombok.Getter;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.time.Instant;
+import java.util.UUID;
 
-@Entity
-@Table(
-    uniqueConstraints = {
-        @UniqueConstraint(
-                name = "uk_deviceId_memberId",
-                columnNames = {"member_id", "device_id"}
-        )
-    }
-)
-@EntityListeners(AuditingEntityListener.class)
 @Getter
 public class PushSubscription {
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    @Column(name = "member_id", nullable = false)
+    private Long legacyId;
+    private UUID id;
     private Long memberId;
-    @Column(name = "device_id", nullable = false)
     private String deviceId;
-    @Column(name = "token", nullable = false)
     private String token;
-    @LastModifiedDate
-    @Column(name = "modified_at", nullable = false)
     private Instant modifiedAt;
     protected PushSubscription() {}
 
+    public PushSubscription(Long legacyId, UUID id, Long memberId, String deviceId, String token, Instant modifiedAt) {
+        this.legacyId = legacyId;
+        this.id = id;
+        this.memberId = memberId;
+        this.deviceId = deviceId;
+        this.token = token;
+        this.modifiedAt = modifiedAt;
+    }
+
+    public PushSubscription(UUID id, Long memberId, String deviceId, String token) {
+        this.id = id;
+        this.memberId = memberId;
+        this.deviceId = deviceId;
+        this.token = token;
+    }
+
     public PushSubscription(Long memberId, String deviceId, String token) {
         this.memberId = memberId;
         this.deviceId = deviceId;
         this.token = token;
     }
 
     public void updateToken(String token) {
-        if (this.modifiedAt.isAfter(Instant.now())) {
+        if (this.modifiedAt != null && this.modifiedAt.isAfter(Instant.now())) {
             return;
         }
         this.token = token;

src/main/java/me/pinitnotification/domain/push/PushSubscriptionRepository.java

@@ -1,15 +1,15 @@
 package me.pinitnotification.domain.push;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-
 import java.util.List;
 import java.util.Optional;
 
-public interface PushSubscriptionRepository extends JpaRepository<PushSubscription, Long> {
+public interface PushSubscriptionRepository {
     Optional<PushSubscription> findByMemberIdAndDeviceId(Long memberId, String deviceId);
 
     List<PushSubscription> findAllByMemberId(Long memberId);
 
+    PushSubscription save(PushSubscription subscription);
+
     void deleteByToken(String token);
 
     void deleteByMemberIdAndDeviceId(Long memberId, String deviceId);

src/main/java/me/pinitnotification/domain/shared/IdGenerator.java

@@ -0,0 +1,7 @@
+package me.pinitnotification.domain.shared;
+
+import java.util.UUID;
+
+public interface IdGenerator {
+    UUID generate();
+}

src/main/java/me/pinitnotification/infrastructure/batch/PublicIdBackfillRunner.java

@@ -0,0 +1,62 @@
+package me.pinitnotification.infrastructure.batch;
+
+import me.pinitnotification.domain.shared.IdGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Profile;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Profile("backfill-public-id")
+@Component
+public class PublicIdBackfillRunner implements CommandLineRunner {
+    private static final Logger log = LoggerFactory.getLogger(PublicIdBackfillRunner.class);
+
+    private final JdbcTemplate jdbcTemplate;
+    private final IdGenerator idGenerator;
+    private final int batchSize;
+
+    public PublicIdBackfillRunner(JdbcTemplate jdbcTemplate,
+                                  IdGenerator idGenerator,
+                                  @Value("${backfill.public-id.batch-size:500}") int batchSize) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.idGenerator = idGenerator;
+        this.batchSize = batchSize;
+    }
+
+    @Override
+    public void run(String... args) {
+        backfillTable("upcoming_schedule_notification");
+        backfillTable("push_subscription");
+    }
+
+    private void backfillTable(String table) {
+        int total = 0;
+        while (true) {
+            List<Long> ids = jdbcTemplate.query(
+                    "select id from " + table + " where public_id is null limit ?",
+                    ps -> ps.setInt(1, batchSize),
+                    (rs, rowNum) -> rs.getLong(1)
+            );
+
+            if (ids.isEmpty()) {
+                break;
+            }
+
+            for (Long id : ids) {
+                int updated = jdbcTemplate.update(
+                        "update " + table + " set public_id = ? where id = ? and public_id is null",
+                        idGenerator.generate().toString(),
+                        id
+                );
+                total += updated;
+            }
+        }
+
+        log.info("Backfill completed for table={}, updatedRows={}", table, total);
+    }
+}

src/main/java/me/pinitnotification/infrastructure/fcm/FcmService.java

@@ -9,6 +9,7 @@
 import me.pinitnotification.domain.notification.Notification;
 import me.pinitnotification.domain.push.PushSubscription;
 import me.pinitnotification.domain.push.PushSubscriptionRepository;
+import me.pinitnotification.domain.shared.IdGenerator;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,10 +23,14 @@ public class FcmService implements PushService {
     private String vapidPublicKey;
     private final FirebaseMessaging firebaseMessaging;
     private final PushSubscriptionRepository pushSubscriptionRepository;
+    private final IdGenerator idGenerator;
 
-    public FcmService(FirebaseMessaging firebaseMessaging, PushSubscriptionRepository pushSubscriptionRepository) {
+    public FcmService(FirebaseMessaging firebaseMessaging,
+                      PushSubscriptionRepository pushSubscriptionRepository,
+                      IdGenerator idGenerator) {
         this.firebaseMessaging = firebaseMessaging;
         this.pushSubscriptionRepository = pushSubscriptionRepository;
+        this.idGenerator = idGenerator;
     }
 
     @Override
@@ -64,7 +69,7 @@ public void subscribe(Long memberId, String deviceId, String token) {
             PushSubscription existingSubscription = byMemberIdAndDeviceId.get();
             existingSubscription.updateToken(token);
         } else {
-            pushSubscriptionRepository.save(new PushSubscription(memberId, deviceId, token));
+            pushSubscriptionRepository.save(new PushSubscription(idGenerator.generate(), memberId, deviceId, token));
         }
     }
 

src/main/java/me/pinitnotification/infrastructure/persistence/IdV7GeneratorAdapter.java

@@ -0,0 +1,14 @@
+package me.pinitnotification.infrastructure.persistence;
+
+import me.pinitnotification.domain.shared.IdGenerator;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+public class IdV7GeneratorAdapter implements IdGenerator {
+    @Override
+    public UUID generate() {
+        return UuidV7Generator.generate();
+    }
+}

src/main/java/me/pinitnotification/infrastructure/persistence/UuidV7Generator.java

@@ -0,0 +1,47 @@
+package me.pinitnotification.infrastructure.persistence;
+
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+
+public final class UuidV7Generator {
+    private UuidV7Generator() {
+    }
+
+    public static UUID generate() {
+        byte[] bytes = new byte[16];
+        long millis = System.currentTimeMillis();
+
+        bytes[0] = (byte) (millis >>> 40);
+        bytes[1] = (byte) (millis >>> 32);
+        bytes[2] = (byte) (millis >>> 24);
+        bytes[3] = (byte) (millis >>> 16);
+        bytes[4] = (byte) (millis >>> 8);
+        bytes[5] = (byte) millis;
+
+        int randA = ThreadLocalRandom.current().nextInt(1 << 12);
+        bytes[6] = (byte) (0x70 | ((randA >>> 8) & 0x0F));
+        bytes[7] = (byte) randA;
+
+        long randB = ThreadLocalRandom.current().nextLong();
+        bytes[8] = (byte) (randB >>> 56);
+        bytes[9] = (byte) (randB >>> 48);
+        bytes[10] = (byte) (randB >>> 40);
+        bytes[11] = (byte) (randB >>> 32);
+        bytes[12] = (byte) (randB >>> 24);
+        bytes[13] = (byte) (randB >>> 16);
+        bytes[14] = (byte) (randB >>> 8);
+        bytes[15] = (byte) randB;
+
+        bytes[8] = (byte) ((bytes[8] & 0x3F) | 0x80);
+
+        long msb = 0;
+        long lsb = 0;
+        for (int i = 0; i < 8; i++) {
+            msb = (msb << 8) | (bytes[i] & 0xFF);
+        }
+        for (int i = 8; i < 16; i++) {
+            lsb = (lsb << 8) | (bytes[i] & 0xFF);
+        }
+        return new UUID(msb, lsb);
+    }
+}