feat/117 :: Release 릴리즈 서비스 구현

services/auth/Dockerfile

@@ -1,6 +1,9 @@
 FROM mcr.microsoft.com/openjdk/jdk:21-ubuntu
 ARG JAR_FILE=build/libs/*.jar
+RUN groupadd -r appuser && useradd -r -g appuser appuser
 WORKDIR /app
 COPY ${JAR_FILE} app.jar
+RUN chown -R appuser:appuser /app
+USER appuser
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/UserEventKafkaListener.java

@@ -3,20 +3,25 @@
 import kr.magicbox.auth.adapter.in.kafka.annotation.Idempotent;
 import kr.magicbox.auth.adapter.in.kafka.event.UserBannedEvent;
 import kr.magicbox.auth.adapter.in.kafka.event.UserWithdrawnEvent;
+import kr.magicbox.auth.adapter.out.persistence.repository.AuthInboxRepository;
 import kr.magicbox.auth.application.port.in.HandleUserBannedUseCase;
 import kr.magicbox.auth.application.port.in.HandleUserWithdrawnUseCase;
 import kr.magicbox.auth.domain.vo.UserId;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.springframework.kafka.annotation.DltHandler;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class UserEventKafkaListener {
 
     private final HandleUserWithdrawnUseCase handleUserWithdrawnUseCase;
     private final HandleUserBannedUseCase handleUserBannedUseCase;
+    private final AuthInboxRepository authInboxRepository;
 
     @Idempotent
     @KafkaListener(topics = "outbox.event.user-withdrawn", groupId = "auth-service")
@@ -31,4 +36,11 @@ public void handleUserBannedEvent(ConsumerRecord<String, UserBannedEvent> consum
         UserBannedEvent event = consumerRecord.value();
         handleUserBannedUseCase.handleUserBanned(UserId.of(event.userId()));
     }
+
+    @DltHandler
+    public void handleDlt(ConsumerRecord<String, ?> consumerRecord) {
+        log.error("[Inbox] DLT 전환. topic={}, partition={}, offset={}", consumerRecord.topic(), consumerRecord.partition(), consumerRecord.offset());
+        authInboxRepository.findByTopicAndPartitionAndOffset(consumerRecord.topic(), consumerRecord.partition(), consumerRecord.offset())
+                .ifPresent(inbox -> inbox.markDeadLettered());
+    }
 }

services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/aop/IdempotentAspect.java

@@ -1,5 +1,7 @@
 package kr.magicbox.auth.adapter.in.kafka.aop;
 
+import kr.magicbox.auth.adapter.in.kafka.event.InboxEvent;
+import kr.magicbox.auth.adapter.in.kafka.properties.InboxProperties;
 import kr.magicbox.auth.adapter.out.persistence.entity.AuthInboxEntity;
 import kr.magicbox.auth.adapter.out.persistence.entity.AuthInboxStatus;
 import kr.magicbox.auth.adapter.out.persistence.repository.AuthInboxRepository;
@@ -12,6 +14,8 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.support.TransactionTemplate;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 
 @Slf4j
@@ -22,11 +26,29 @@ public class IdempotentAspect {
 
     private final AuthInboxRepository authInboxRepository;
     private final TransactionTemplate transactionTemplate;
+    private final InboxProperties inboxProperties;
 
     @Around("@annotation(kr.magicbox.auth.adapter.in.kafka.annotation.Idempotent)")
     public Object around(ProceedingJoinPoint pjp) {
         ConsumerRecord<String, ?> consumerRecord = extractRecord(pjp);
-        Long eventId = Long.parseLong(consumerRecord.key());
+        InboxEvent event = (InboxEvent) consumerRecord.value();
+        Long eventId = event.eventId();
+        Instant occurredAt = event.occurredAt();
+
+        if (isTooOld(occurredAt)) {
+            log.warn("[Inbox] 만료된 메시지 DEAD_LETTERED 처리. eventId={}, occurredAt={}", eventId, occurredAt);
+            transactionTemplate.executeWithoutResult(status ->
+                authInboxRepository.save(AuthInboxEntity.builder()
+                        .eventId(eventId)
+                        .topic(consumerRecord.topic())
+                        .partition(consumerRecord.partition())
+                        .offset(consumerRecord.offset())
+                        .status(AuthInboxStatus.DEAD_LETTERED)
+                        .occurredAt(occurredAt)
+                        .build())
+            );
+            return null;
+        }
 
         return transactionTemplate.execute(status -> {
             if (authInboxRepository.existsByEventId(eventId)) {
@@ -39,6 +61,7 @@ public Object around(ProceedingJoinPoint pjp) {
                     .partition(consumerRecord.partition())
                     .offset(consumerRecord.offset())
                     .status(AuthInboxStatus.PENDING)
+                    .occurredAt(occurredAt)
                     .build());
             try {
                 pjp.proceed();
@@ -51,6 +74,10 @@ public Object around(ProceedingJoinPoint pjp) {
         });
     }
 
+    private boolean isTooOld(Instant occurredAt) {
+        return occurredAt.isBefore(Instant.now().minus(inboxProperties.getMaxEventAgeMinutes(), ChronoUnit.MINUTES));
+    }
+
     @SuppressWarnings("unchecked")
     private ConsumerRecord<String, ?> extractRecord(ProceedingJoinPoint pjp) {
         return Arrays.stream(pjp.getArgs())

services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/event/InboxEvent.java

@@ -1,5 +1,8 @@
 package kr.magicbox.auth.adapter.in.kafka.event;
 
+import java.time.Instant;
+
 public interface InboxEvent {
     Long eventId();
+    Instant occurredAt();
 }

services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/event/UserBannedEvent.java

@@ -1,5 +1,6 @@
 package kr.magicbox.auth.adapter.in.kafka.event;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 
@@ -9,5 +10,5 @@
 public record UserBannedEvent(
         @JsonProperty("event_id") Long eventId,
         @JsonProperty("user_id") Long userId,
-        @JsonProperty("banned_at") Instant bannedAt
-) implements InboxEvent {}
+        @JsonProperty("occurred_at") @JsonAlias("banned_at") Instant occurredAt
+) implements InboxEvent {}

services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/event/UserWithdrawnEvent.java

@@ -1,5 +1,6 @@
 package kr.magicbox.auth.adapter.in.kafka.event;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 
@@ -9,5 +10,5 @@
 public record UserWithdrawnEvent(
         @JsonProperty("event_id") Long eventId,
         @JsonProperty("user_id") Long userId,
-        @JsonProperty("withdrawn_at") Instant withdrawnAt
-) implements InboxEvent {}
+        @JsonProperty("occurred_at") @JsonAlias("withdrawn_at") Instant occurredAt
+) implements InboxEvent {}

services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/properties/InboxProperties.java

@@ -0,0 +1,12 @@
+package kr.magicbox.auth.adapter.in.kafka.properties;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@RequiredArgsConstructor
+@ConfigurationProperties(prefix = "inbox")
+public class InboxProperties {
+    private final long maxEventAgeMinutes;
+}

services/auth/src/main/java/kr/magicbox/auth/adapter/out/communication/grpc/UserGrpcAdapter.java

@@ -16,6 +16,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.grpc.client.GrpcChannelFactory;
 import org.springframework.stereotype.Component;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Component

services/auth/src/main/java/kr/magicbox/auth/adapter/out/communication/grpc/UserStatusGrpcAdapter.java

@@ -10,6 +10,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.grpc.client.GrpcChannelFactory;
 import org.springframework.stereotype.Component;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Component

services/auth/src/main/java/kr/magicbox/auth/adapter/out/persistence/entity/AuthInboxEntity.java

@@ -6,6 +6,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.Instant;
+
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
@@ -28,13 +30,17 @@ public class AuthInboxEntity extends BaseEntity {
     @Column(nullable = false)
     private AuthInboxStatus status;
 
+    @Column(name = "occurred_at", nullable = false)
+    private Instant occurredAt;
+
     @Builder
-    public AuthInboxEntity(Long eventId, String topic, Integer partition, Long offset, AuthInboxStatus status) {
+    public AuthInboxEntity(Long eventId, String topic, Integer partition, Long offset, AuthInboxStatus status, Instant occurredAt) {
         this.eventId = eventId;
         this.topic = topic;
         this.partition = partition;
         this.offset = offset;
         this.status = status;
+        this.occurredAt = occurredAt;
     }
 
     public void markProcessed() {

services/auth/src/main/resources/application-dev.yml

@@ -107,4 +107,6 @@ security:
 logging:
   level:
     org.springframework.web: INFO
-    org.springframework.data.redis: INFO
+    org.springframework.data.redis: INFO
+inbox:
+  max-event-age-minutes: 5

services/auth/src/main/resources/application-prod.yml

@@ -97,13 +97,16 @@ code:
   ttl-seconds: ${OAUTH2_CODE_TTL_SECONDS}
 
 frontend:
-  uri: ${FRONTEND_URI}
+  uri: ${FRONTEND_URL}
 
 security:
   trusted:
     ips:
       - ${TRUSTED_IP_GATEWAY}
 
+inbox:
+  max-event-age-minutes: 5
+
 logging:
   level:
     org.springframework.web: WARN

services/creator/Dockerfile

@@ -1,6 +1,9 @@
 FROM mcr.microsoft.com/openjdk/jdk:21-ubuntu
 ARG JAR_FILE=build/libs/*.jar
+RUN groupadd -r appuser && useradd -r -g appuser appuser
 WORKDIR /app
 COPY ${JAR_FILE} app.jar
+RUN chown -R appuser:appuser /app
+USER appuser
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

services/creator/src/main/java/kr/magicbox/creator/adapter/in/grpc/CreatorGrpcService.java

@@ -1,11 +1,16 @@
 package kr.magicbox.creator.adapter.in.grpc;
 
+import io.grpc.Status;
 import io.grpc.stub.StreamObserver;
 import kr.magicbox.creator.application.dto.query.IsCreatorOwnedByUserQuery;
+import kr.magicbox.creator.application.port.in.GetCreatorIdByUserIdUseCase;
 import kr.magicbox.creator.application.port.in.IsCreatorOwnedByUserUseCase;
+import kr.magicbox.creator.domain.exception.CreatorNotFoundException;
 import kr.magicbox.creator.domain.vo.CreatorId;
 import kr.magicbox.creator.domain.vo.UserId;
 import kr.magicbox.creator.grpc.creator.CreatorServiceGrpc;
+import kr.magicbox.creator.grpc.creator.GetCreatorIdByUserIdRequest;
+import kr.magicbox.creator.grpc.creator.GetCreatorIdByUserIdResponse;
 import kr.magicbox.creator.grpc.creator.IsCreatorOwnedByUserRequest;
 import kr.magicbox.creator.grpc.creator.IsCreatorOwnedByUserResponse;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +20,7 @@
 @RequiredArgsConstructor
 public class CreatorGrpcService extends CreatorServiceGrpc.CreatorServiceImplBase {
     private final IsCreatorOwnedByUserUseCase isCreatorOwnedByUserUseCase;
+    private final GetCreatorIdByUserIdUseCase getCreatorIdByUserIdUseCase;
 
     @Override
     public void isCreatorOwnedByUser(IsCreatorOwnedByUserRequest request,
@@ -31,4 +37,22 @@ public void isCreatorOwnedByUser(IsCreatorOwnedByUserRequest request,
                 .build());
         responseObserver.onCompleted();
     }
+
+    @Override
+    public void getCreatorIdByUserId(GetCreatorIdByUserIdRequest request,
+                                     StreamObserver<GetCreatorIdByUserIdResponse> responseObserver) {
+        try {
+            CreatorId creatorId = getCreatorIdByUserIdUseCase.getCreatorIdByUserId(
+                    UserId.of(request.getUserId())
+            );
+            responseObserver.onNext(GetCreatorIdByUserIdResponse.newBuilder()
+                    .setCreatorId(creatorId.value())
+                    .build());
+            responseObserver.onCompleted();
+        } catch (CreatorNotFoundException e) {
+            responseObserver.onError(Status.NOT_FOUND
+                    .withDescription("Creator not found for userId: " + request.getUserId())
+                    .asRuntimeException());
+        }
+    }
 }

services/creator/src/main/java/kr/magicbox/creator/adapter/in/kafka/KafkaConfiguration.java

@@ -1,44 +1,22 @@
 package kr.magicbox.creator.adapter.in.kafka;
 
-import kr.magicbox.creator.adapter.in.kafka.properties.KafkaRetryProperties;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.TopicPartition;
+import kr.magicbox.creator.adapter.in.kafka.properties.InboxProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
-import org.springframework.kafka.core.ConsumerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.listener.CommonErrorHandler;
-import org.springframework.kafka.listener.DeadLetterPublishingRecoverer;
-import org.springframework.kafka.listener.DefaultErrorHandler;
-import org.springframework.util.backoff.FixedBackOff;
+import org.springframework.kafka.annotation.EnableKafkaRetryTopic;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
-@Slf4j
+@EnableKafkaRetryTopic
 @Configuration
-@RequiredArgsConstructor
+@EnableConfigurationProperties(InboxProperties.class)
 public class KafkaConfiguration {
-    private final KafkaRetryProperties kafkaRetryProperties;
 
     @Bean
-    public CommonErrorHandler errorHandler(KafkaTemplate<?, ?> kafkaTemplate) {
-        DeadLetterPublishingRecoverer recoverer = new DeadLetterPublishingRecoverer(kafkaTemplate,
-                (ConsumerRecord<?, ?> failedRecord, Exception ex) -> {
-                    String topic = failedRecord.topic() + "-dlt";
-                    log.error("[DLT] 메시지 처리 실패, DLT 전송합니다. topic={}, offset={}, exception={}", failedRecord.topic(), failedRecord.offset(), ex.getMessage());
-                    return new TopicPartition(topic, failedRecord.partition());
-                });
-        return new DefaultErrorHandler(recoverer, new FixedBackOff(kafkaRetryProperties.getIntervalMs(), kafkaRetryProperties.getMaxAttempts()));
-    }
-
-    @Bean
-    public ConcurrentKafkaListenerContainerFactory<?, ?> kafkaListenerContainerFactory(
-            ConsumerFactory<Object, Object> consumerFactory,
-            CommonErrorHandler errorHandler) {
-        ConcurrentKafkaListenerContainerFactory<Object, Object> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory);
-        factory.setCommonErrorHandler(errorHandler);
-        return factory;
+    public ThreadPoolTaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(1);
+        scheduler.setThreadNamePrefix("kafka-retry-");
+        return scheduler;
     }
 }