Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package com.kustacks.kuring.club.adapter.out.persistence;

import com.kustacks.kuring.club.application.port.out.ClubQueryPort;
import com.kustacks.kuring.club.application.port.out.ClubSubscriptionCommandPort;
import com.kustacks.kuring.club.application.port.out.ClubSubscriptionQueryPort;
import com.kustacks.kuring.club.domain.Club;
import com.kustacks.kuring.club.domain.ClubSubscribe;
import com.kustacks.kuring.common.annotation.PersistenceAdapter;
import com.kustacks.kuring.user.domain.RootUser;
import lombok.RequiredArgsConstructor;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;

@PersistenceAdapter
@RequiredArgsConstructor
public class ClubPersistenceAdapter implements ClubQueryPort, ClubSubscriptionCommandPort, ClubSubscriptionQueryPort {

private final ClubRepository clubRepository;
private final ClubSubscribeRepository clubSubscribeRepository;

@Override
public Optional<Club> findClubById(Long id) {
return clubRepository.findById(id);
}

@Override
public List<Club> findClubsBetweenDates(LocalDateTime start, LocalDateTime end) {
return clubRepository.findClubsBetweenDates(start, end);
}

@Override
public List<Club> findNextDayRecruitEndClubs(LocalDateTime now) {
LocalDate tomorrow = now.toLocalDate().plusDays(1);
LocalDateTime startInclusive = tomorrow.atStartOfDay();
LocalDateTime endExclusive = tomorrow.plusDays(1).atStartOfDay();
return findClubsBetweenDates(startInclusive, endExclusive);
}

@Override
public boolean existsSubscription(Long rootUserId, Long clubId) {
return clubSubscribeRepository.existsByRootUserIdAndClubId(rootUserId, clubId);
}

@Override
public void saveSubscription(RootUser rootUser, Club club) {
clubSubscribeRepository.save(new ClubSubscribe(rootUser, club));
}

@Override
public void deleteSubscription(RootUser rootUser, Club club) {
clubSubscribeRepository.deleteByRootUserAndClub(rootUser, club);
}

@Override
public long countSubscriptions(Long rootUserId) {
return clubSubscribeRepository.countByRootUserId(rootUserId);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.kustacks.kuring.club.adapter.out.persistence;

import com.kustacks.kuring.club.domain.Club;

import java.time.LocalDateTime;
import java.util.List;

public interface ClubQueryRepository {

List<Club> findClubsBetweenDates(LocalDateTime start, LocalDateTime end);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.kustacks.kuring.club.adapter.out.persistence;

import com.kustacks.kuring.club.domain.Club;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;

import java.time.LocalDateTime;
import java.util.List;

import static com.kustacks.kuring.club.domain.QClub.club;

@RequiredArgsConstructor
class ClubQueryRepositoryImpl implements ClubQueryRepository {

private final JPAQueryFactory queryFactory;

@Override
public List<Club> findClubsBetweenDates(LocalDateTime start, LocalDateTime end) {
return queryFactory.selectFrom(club)
.where(
club.isAlways.isFalse(),
recruitEndAtGoe(start),
recruitEndAtLt(end)
)
.fetch();
}

private BooleanExpression recruitEndAtGoe(LocalDateTime start) {
return start != null ? club.recruitEndAt.goe(start) : null;
}

private BooleanExpression recruitEndAtLt(LocalDateTime end) {
return end != null ? club.recruitEndAt.lt(end) : null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.kustacks.kuring.club.adapter.out.persistence;

import com.kustacks.kuring.club.domain.Club;
import org.springframework.data.jpa.repository.JpaRepository;

interface ClubRepository extends JpaRepository<Club, Long>, ClubQueryRepository {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.kustacks.kuring.club.adapter.out.persistence;

import com.kustacks.kuring.club.domain.Club;
import com.kustacks.kuring.club.domain.ClubSubscribe;
import com.kustacks.kuring.user.domain.RootUser;
import org.springframework.data.jpa.repository.JpaRepository;

interface ClubSubscribeRepository extends JpaRepository<ClubSubscribe, Long> {

boolean existsByRootUserIdAndClubId(Long rootUserId, Long clubId);

long countByRootUserId(Long rootUserId);

void deleteByRootUserAndClub(RootUser rootUser, Club club);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.kustacks.kuring.club.application.port.in;

public interface ClubNotificationUseCase {

void sendDeadlineNotifications();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.kustacks.kuring.club.application.port.in;

import com.kustacks.kuring.club.application.port.in.dto.ClubSubscriptionCommand;

public interface ClubSubscriptionUseCase {

long addSubscription(ClubSubscriptionCommand command);

long removeSubscription(ClubSubscriptionCommand command);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.kustacks.kuring.club.application.port.in.dto;

public record ClubSubscriptionCommand(
String email,
Long clubId
) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.kustacks.kuring.club.application.port.out;

import com.kustacks.kuring.club.domain.Club;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;

public interface ClubQueryPort {

Optional<Club> findClubById(Long id);

List<Club> findClubsBetweenDates(LocalDateTime start, LocalDateTime end);

List<Club> findNextDayRecruitEndClubs(LocalDateTime now);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.kustacks.kuring.club.application.port.out;

import com.kustacks.kuring.club.domain.Club;
import com.kustacks.kuring.user.domain.RootUser;

public interface ClubSubscriptionCommandPort {

void saveSubscription(RootUser rootUser, Club club);

void deleteSubscription(RootUser rootUser, Club club);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.kustacks.kuring.club.application.port.out;

public interface ClubSubscriptionQueryPort {

boolean existsSubscription(Long rootUserId, Long clubId);

long countSubscriptions(Long rootUserId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package com.kustacks.kuring.club.application.service;

import com.kustacks.kuring.club.application.port.in.ClubSubscriptionUseCase;
import com.kustacks.kuring.club.application.port.in.dto.ClubSubscriptionCommand;
import com.kustacks.kuring.club.application.port.out.ClubQueryPort;
import com.kustacks.kuring.club.application.port.out.ClubSubscriptionCommandPort;
import com.kustacks.kuring.club.application.port.out.ClubSubscriptionQueryPort;
import com.kustacks.kuring.club.domain.Club;
import com.kustacks.kuring.common.annotation.UseCase;
import com.kustacks.kuring.common.exception.InvalidStateException;
import com.kustacks.kuring.common.exception.code.ErrorCode;
import com.kustacks.kuring.common.properties.ServerProperties;
import com.kustacks.kuring.user.application.port.out.RootUserQueryPort;
import com.kustacks.kuring.user.application.port.out.UserEventPort;
import com.kustacks.kuring.user.application.port.out.UserQueryPort;
import com.kustacks.kuring.user.domain.RootUser;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@UseCase
@Transactional
@RequiredArgsConstructor
public class ClubCommandService implements ClubSubscriptionUseCase {

private static final String CLUB_TOPIC_PREFIX = "club.";

private final ServerProperties serverProperties;
private final ClubQueryPort clubQueryPort;
private final ClubSubscriptionCommandPort clubSubscriptionCommandPort;
private final ClubSubscriptionQueryPort countSubscriptionsQueryPort;
private final RootUserQueryPort rootUserQueryPort;
private final UserQueryPort userQueryPort;
private final UserEventPort userEventPort;

@Override
public long addSubscription(ClubSubscriptionCommand command) {
RootUser rootUser = findRootUserByEmail(command.email());
Club club = findClubById(command.clubId());

if (isAlreadySubscription(rootUser, club)) {
throw new InvalidStateException(ErrorCode.CLUB_ALREADY_SUBSCRIBED);
}

clubSubscriptionCommandPort.saveSubscription(rootUser, club);
subscribeAllLoggedInDevices(rootUser.getId(), makeTopic(club));
Comment on lines +42 to +47
Copy link

@coderabbitai coderabbitai bot Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

구독 상태 체크 후 저장/삭제하는 패턴이 동시성 경쟁 상태를 만듭니다.

existssave/delete가 원자적으로 보장되지 않아 동시 요청에서 중복 저장 또는 의도와 다른 성공/실패 결과가 발생할 수 있습니다. 저장/삭제는 DB 제약 기반으로 처리하고 충돌 예외를 도메인 예외로 매핑하는 방식이 필요합니다.

Also applies to: 57-61

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@src/main/java/com/kustacks/kuring/club/application/service/ClubCommandService.java`
around lines 42 - 47, The pre-check using isAlreadySubscription before calling
clubSubscriptionCommandPort.saveSubscription (and the similar delete flow)
causes race conditions; instead make save/delete operations rely on a DB
uniqueness/constraint and map database exceptions to domain errors: remove the
existence check in the subscribe path, call
clubSubscriptionCommandPort.saveSubscription(rootUser, club) inside a
transaction, catch the persistence exception (e.g.
DataIntegrityViolationException or the specific repository exception) and throw
InvalidStateException(ErrorCode.CLUB_ALREADY_SUBSCRIBED) on duplicate-key; for
unsubscribe, perform the delete via
clubSubscriptionCommandPort.deleteSubscription(...) and if the delete reports
zero rows affected throw InvalidStateException(ErrorCode.CLUB_NOT_SUBSCRIBED);
keep subscribeAllLoggedInDevices(rootUser.getId(), makeTopic(club)) only after a
confirmed successful save and ensure transactional boundaries around these
operations.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 부분은 낙관적으로 처리하는거에 대한 고민을 해봐야겠네
이 부분을 요약해서 이슈로 만들어줘

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧩 Analysis chain

@rlagkswn00, 동시성 이슈를 정리해서 GitHub 이슈로 생성하겠습니다.


🏁 Script executed:

#!/bin/bash

# Create GitHub issue for the concurrency race condition problem
gh issue create \
  --title "동아리 구독 기능의 동시성 경쟁 상태 개선" \
  --body "## 문제 설명

동아리 구독/구독 취소 기능에서 구독 상태를 확인한 후 저장/삭제하는 패턴이 동시성 경쟁 상태(race condition)를 발생시킬 수 있습니다.

## 발생 위치

- 파일: \`src/main/java/com/kustacks/kuring/club/application/service/ClubCommandService.java\`
- 메서드: \`addSubscription()\` 및 \`removeSubscription()\`
- 라인: 42-47, 57-61

## 현재 문제점

\`existsSubscription()\` 체크와 \`save()/delete()\` 작업이 원자적으로 보장되지 않아 다음과 같은 문제가 발생할 수 있습니다:

1. **구독 추가 시**: 동시에 여러 요청이 들어올 경우, 모두 존재하지 않는다고 판단하여 중복 저장이 시도될 수 있습니다.
2. **구독 취소 시**: 동시에 여러 삭제 요청이 들어올 경우, 모두 존재한다고 판단하여 의도와 다른 결과가 발생할 수 있습니다.

## 개선 방향 고려사항

낙관적 처리(optimistic) 방식을 포함한 다양한 동시성 제어 방안에 대한 검토가 필요합니다.

## 참고

- PR: https://github.com/ku-ring/ku-ring-backend-web/pull/349
- 코멘트: https://github.com/ku-ring/ku-ring-backend-web/pull/349#discussion_r2856267052
- 보고자: `@rlagkswn00`" \
  --assignee rlagkswn00

Length of output: 57


@rlagkswn00, 동시성 경쟁 상태 이슈를 생성했습니다!

이슈 #351: 동아리 구독 기능의 동시성 경쟁 상태 개선

낙관적 처리 방식을 포함한 다양한 동시성 제어 방안을 검토하실 때 참고하시면 됩니다.


return countSubscriptionsQueryPort.countSubscriptions(rootUser.getId());
Comment on lines +46 to +49
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

외부 토픽 구독/해제를 트랜잭션 내부에서 호출하면 데이터-외부상태 불일치가 발생할 수 있습니다.

DB 트랜잭션이 롤백되더라도 외부 구독 상태는 이미 변경될 수 있어 정합성이 깨질 수 있습니다. 외부 호출은 커밋 이후로 분리하는 게 안전합니다.

🔧 제안 수정안
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
@@
-        clubSubscriptionCommandPort.saveSubscription(rootUser, club);
-        subscribeAllLoggedInDevices(rootUser.getId(), makeTopic(club));
+        clubSubscriptionCommandPort.saveSubscription(rootUser, club);
+        runAfterCommit(() -> subscribeAllLoggedInDevices(rootUser.getId(), makeTopic(club)));
@@
-        clubSubscriptionCommandPort.deleteSubscription(rootUser, club);
-        unsubscribeAllLoggedInDevices(rootUser.getId(), makeTopic(club));
+        clubSubscriptionCommandPort.deleteSubscription(rootUser, club);
+        runAfterCommit(() -> unsubscribeAllLoggedInDevices(rootUser.getId(), makeTopic(club)));
@@
+    private void runAfterCommit(Runnable action) {
+        if (!TransactionSynchronizationManager.isActualTransactionActive()) {
+            action.run();
+            return;
+        }
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+            `@Override`
+            public void afterCommit() {
+                action.run();
+            }
+        });
+    }

Also applies to: 60-63, 80-92

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@src/main/java/com/kustacks/kuring/club/application/service/ClubCommandService.java`
around lines 46 - 49, The methods currently call external subscription
operations (subscribeAllLoggedInDevices / unsubscribeAllLoggedInDevices) inside
the DB transaction alongside clubSubscriptionCommandPort.saveSubscription /
deleteSubscription and countSubscriptionsQueryPort.countSubscriptions, which
risks data vs external-state inconsistency if the transaction rolls back; move
these external calls out of the transactional boundary by either publishing a
domain event or registering an after-commit callback (e.g.,
TransactionSynchronizationManager.registerSynchronization) from the
transactional methods (those invoking
clubSubscriptionCommandPort.saveSubscription and deleteSubscription and
countSubscriptionsQueryPort.countSubscriptions) and perform
subscribeAllLoggedInDevices/unsubscribeAllLoggedInDevices with makeTopic(...)
only in the after-commit handler so external subscriptions run only after
successful commit.

}

@Override
public long removeSubscription(ClubSubscriptionCommand command) {
RootUser rootUser = findRootUserByEmail(command.email());
Club club = findClubById(command.clubId());

if (!isAlreadySubscription(rootUser, club)) {
throw new InvalidStateException(ErrorCode.CLUB_NOT_SUBSCRIBED);
}
clubSubscriptionCommandPort.deleteSubscription(rootUser, club);
unsubscribeAllLoggedInDevices(rootUser.getId(), makeTopic(club));

return countSubscriptionsQueryPort.countSubscriptions(rootUser.getId());
}

private boolean isAlreadySubscription(RootUser rootUser, Club club) {
return countSubscriptionsQueryPort.existsSubscription(rootUser.getId(), club.getId());
}

private RootUser findRootUserByEmail(String email) {
return rootUserQueryPort.findRootUserByEmail(email)
.orElseThrow(() -> new InvalidStateException(ErrorCode.ROOT_USER_NOT_FOUND));
}

private Club findClubById(Long id) {
return clubQueryPort.findClubById(id)
.orElseThrow(() -> new InvalidStateException(ErrorCode.CLUB_NOT_FOUND));
}

private void subscribeAllLoggedInDevices(Long rootUserId, String topic) {
userQueryPort.findByLoggedInUserId(rootUserId)
.forEach(user -> userEventPort.subscribeEvent(user.getFcmToken(), topic));

log.info("동아리 토픽 구독 완료. rootUserId={}, topic={}", rootUserId, topic);
}

private void unsubscribeAllLoggedInDevices(Long rootUserId, String topic) {
userQueryPort.findByLoggedInUserId(rootUserId)
.forEach(user -> userEventPort.unsubscribeEvent(user.getFcmToken(), topic));

log.info("동아리 토픽 구독 해제 완료. rootUserId={}, topic={}", rootUserId, topic);
}

private String makeTopic(Club club) {
return serverProperties.ifDevThenAddSuffix(CLUB_TOPIC_PREFIX + club.getId());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package com.kustacks.kuring.club.application.service;

import com.google.firebase.messaging.Message;
import com.google.firebase.messaging.Notification;
import com.kustacks.kuring.club.application.port.in.ClubNotificationUseCase;
import com.kustacks.kuring.club.application.port.out.ClubQueryPort;
import com.kustacks.kuring.club.domain.Club;
import com.kustacks.kuring.common.annotation.UseCase;
import com.kustacks.kuring.common.properties.ServerProperties;
import com.kustacks.kuring.message.application.port.out.FirebaseMessagingPort;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

import static com.kustacks.kuring.message.domain.MessageType.CLUB;

@Slf4j
@UseCase
@RequiredArgsConstructor
public class ClubNotificationService implements ClubNotificationUseCase {

private static final String CLUB_TOPIC_PREFIX = "club.";
private static final String D_DAY_1_TITLE = "[D-1] %s 동아리 모집";
private static final String D_DAY_1_BODY = "내일 마감되기 전에 지원하세요!";

private final ClubQueryPort clubQueryPort;
private final FirebaseMessagingPort firebaseMessagingPort;
private final ServerProperties serverProperties;

@Override
public void sendDeadlineNotifications() {
List<Club> clubs = findDeadlineClubs();
clubs.forEach(this::sendDeadLineClubNotification);
}

private void sendDeadLineClubNotification(Club club) {
try {
Message message = buildMessage(club);
firebaseMessagingPort.send(message);
log.info("동아리 마감 알림 발송 완료. clubId={}", club.getId());
} catch (Exception e) {
log.error("동아리 마감 알림 발송 실패. clubId={}", club.getId(), e);
}
}

private List<Club> findDeadlineClubs() {
return clubQueryPort.findNextDayRecruitEndClubs(LocalDateTime.now());
}

private Message buildMessage(Club club) {
String messageTitle = String.format(D_DAY_1_TITLE, club.getName());

return Message.builder()
.setNotification(buildNotification(messageTitle, D_DAY_1_BODY))
.setTopic(buildTopic(club))
.putAllData(buildMessageData(messageTitle, D_DAY_1_BODY, club))
.build();
}

private Map<String, String> buildMessageData(String title, String body, Club club) {
return Map.of(
"clubId", String.valueOf(club.getId()),
"title", title,
"body", body,
"messageType", CLUB.getValue()
);
}

private String buildTopic(Club club) {
return serverProperties.ifDevThenAddSuffix(CLUB_TOPIC_PREFIX + club.getId());
}

private Notification buildNotification(String title, String body) {
return Notification.builder()
.setTitle(title)
.setBody(body)
.build();
}
}
Loading
Loading