RELEASE 1.2.0V

.github/workflows/cd.yml

@@ -72,7 +72,9 @@ jobs:
           envs: >-
             DB_PASSWORD,GCS_BUCKET,GCS_BACKUP_BUCKET,
             KAKAO_CLIENT_ID,KAKAO_CLIENT_SECRET,KAKAO_REDIRECT_URI_PROD,KAKAO_REDIRECT_URI_STAGING,KAKAO_ADMIN_KEY,
-            JWT_SECRET_KEY,FIREBASE_SERVICE_ACCOUNT_KEY
+            JWT_SECRET_KEY,FIREBASE_SERVICE_ACCOUNT_KEY,FCM_FAKE_LATENCY_MS,
+            OTLP_METRICS_ENABLED,OTEL_URL,OTEL_AUTH,OTLP_STEP,
+            CORS_ALLOWED_ORIGINS_PROD,CORS_ALLOWED_ORIGINS_STAGING,COOKIE_DOMAIN,NGINX_PROD_SERVER_NAME,NGINX_STAGING_SERVER_NAME
           script: |
             chmod +x /home/ubuntu/cockple/scripts/deploy.sh
             bash /home/ubuntu/cockple/scripts/deploy.sh \
@@ -89,3 +91,15 @@ jobs:
           KAKAO_ADMIN_KEY: ${{ secrets.KAKAO_ADMIN_KEY }}
           JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }}
           FIREBASE_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_KEY }}
+          FCM_FAKE_LATENCY_MS: ${{ vars.FCM_FAKE_LATENCY_MS }}
+          # 관측성(OTLP) — URL/토글/step은 Variable, 인증 토큰은 Secret
+          OTLP_METRICS_ENABLED: ${{ vars.OTLP_METRICS_ENABLED }}
+          OTEL_URL: ${{ vars.OTEL_URL }}
+          OTEL_AUTH: ${{ secrets.OTEL_AUTH }}
+          OTLP_STEP: ${{ vars.OTLP_STEP }}
+          # 도메인(SSOT) — 비밀 아님 → Variables. 미설정 시 빈 값 → docker-compose 기본값(현재 도메인) 사용(no-op).
+          CORS_ALLOWED_ORIGINS_PROD: ${{ vars.CORS_ALLOWED_ORIGINS_PROD }}
+          CORS_ALLOWED_ORIGINS_STAGING: ${{ vars.CORS_ALLOWED_ORIGINS_STAGING }}
+          COOKIE_DOMAIN: ${{ vars.COOKIE_DOMAIN }}
+          NGINX_PROD_SERVER_NAME: ${{ vars.NGINX_PROD_SERVER_NAME }}
+          NGINX_STAGING_SERVER_NAME: ${{ vars.NGINX_STAGING_SERVER_NAME }}

.gitignore

@@ -60,3 +60,7 @@ src/main/resources/firebase/*.json
 cockple_dump.sql
 
 k6
+
+### logs ###
+logs/
+/result-bulkhead-*.json

AGENTS.md

@@ -28,7 +28,8 @@ Nearest `AGENTS.md` wins. Read this file first, then the closest child file for
 |------|----------|-------|
 | App bootstrap | `src/main/java/umc/cockple/demo/Application.java` | Enables JPA auditing and caching |
 | Runtime config | `src/main/resources/application*.yml` | `local` is default; `staging` and `prod` override DB/Redis |
-| Security/websocket ingress | `src/main/java/umc/cockple/demo/global/config/` | JWT, CORS, WebSocket handler registration |
+| Security ingress | `src/main/java/umc/cockple/demo/global/config/` | HTTP security, JWT filters, CORS, shared runtime config |
+| Chat WebSocket ingress | `src/main/java/umc/cockple/demo/domain/chat/presentation/websocket/` | `/ws/chats` handler, auth interceptor, endpoint config |
 | Business APIs | `src/main/java/umc/cockple/demo/domain/` | Vertical slices by feature |
 | Exercise hotspot | `src/main/java/umc/cockple/demo/domain/exercise/` | Largest converter/query/test surface |
 | Chat hotspot | `src/main/java/umc/cockple/demo/domain/chat/` | REST + WebSocket + cache/event flow |
@@ -48,13 +49,13 @@ Nearest `AGENTS.md` wins. Read this file first, then the closest child file for
 
 ## ANTI-PATTERNS (THIS PROJECT)
 - Do not edit generated QueryDSL Q-types.
-- Do not widen security whitelist or CORS origins casually; both are explicit in `SecurityConfig` and `WebSocketConfig`.
+- Do not widen security whitelist or CORS origins casually; HTTP origins are explicit in `SecurityConfig` and chat WebSocket origins are explicit in `ChatWebSocketConfig`.
 - Do not rely on JPA auto-DDL for schema work; startup uses validation only.
 - Do not scatter test fixtures inside feature test packages; shared fixtures already live under `src/test/java/umc/cockple/demo/support/fixture/`.
 - Do not assume everything under `global/` is generic; JWT/OAuth code is coupled to member/auth flows.
 
 ## UNIQUE STYLES
-- `domain/chat` has extra realtime sublayers: `handler/`, `interceptor/`, `events/`, `service/websocket/`.
+- `domain/chat` has extra realtime sublayers: `presentation/websocket/`, `events/`, `service/websocket/`.
 - `domain/exercise` is the densest slice: large converter, query service, command internals, and the biggest integration tests.
 - `domain/party` and `domain/notification` use events/notification wiring more than simpler slices like `bookmark` or `terms`.
 

build.gradle

@@ -102,6 +102,10 @@ dependencies {
     // flyway
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'
+
+    // observability (Actuator + OTLP 메트릭 export)
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'io.micrometer:micrometer-registry-otlp'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -56,6 +56,9 @@ services:
     environment:
       JAVA_TOOL_OPTIONS: "-Xms768m -Xmx768m"
       SPRING_PROFILES_ACTIVE: prod
+      LOG_PATH: /logs
+      CORS_ALLOWED_ORIGINS: ${CORS_ALLOWED_ORIGINS_PROD:-http://localhost:5173,https://cockple.store,https://www.cockple.store,https://staging.cockple.store,https://cockple-fe.vercel.app,https://cockple-fe.vercel.app/}
+      COOKIE_DOMAIN: ${COOKIE_DOMAIN:-.cockple.store}
       DB_PASSWORD: ${DB_PASSWORD}
       GCS_BUCKET: ${GCS_BUCKET}
       KAKAO_CLIENT_ID: ${KAKAO_CLIENT_ID}
@@ -64,6 +67,8 @@ services:
       KAKAO_ADMIN_KEY: ${KAKAO_ADMIN_KEY}
       JWT_SECRET_KEY: ${JWT_SECRET_KEY}
       FIREBASE_SERVICE_ACCOUNT_KEY: ${FIREBASE_SERVICE_ACCOUNT_KEY}
+    volumes:
+      - ./logs/prod:/logs
     depends_on:
       mysql:
         condition: service_healthy
@@ -79,6 +84,15 @@ services:
     environment:
       JAVA_TOOL_OPTIONS: "-Xms128m -Xmx512m"
       SPRING_PROFILES_ACTIVE: staging
+      LOG_PATH: /logs
+      CORS_ALLOWED_ORIGINS: ${CORS_ALLOWED_ORIGINS_STAGING:-http://localhost:5173,https://cockple.store,https://www.cockple.store,https://staging.cockple.store,https://cockple-fe.vercel.app,https://cockple-fe.vercel.app/}
+      COOKIE_DOMAIN: ${COOKIE_DOMAIN:-.cockple.store}
+      FCM_FAKE_LATENCY_MS: ${FCM_FAKE_LATENCY_MS:-0}
+      # 관측성(Observability) — OTLP 메트릭 push (staging 전용). 미설정 시 off.
+      OTLP_METRICS_ENABLED: ${OTLP_METRICS_ENABLED:-false}
+      OTEL_URL: ${OTEL_URL:-}
+      OTEL_AUTH: ${OTEL_AUTH:-}
+      OTLP_STEP: ${OTLP_STEP:-1m}
       DB_PASSWORD: ${DB_PASSWORD}
       GCS_BUCKET: ${GCS_BUCKET}
       KAKAO_CLIENT_ID: ${KAKAO_CLIENT_ID}
@@ -87,6 +101,8 @@ services:
       KAKAO_ADMIN_KEY: ${KAKAO_ADMIN_KEY}
       JWT_SECRET_KEY: ${JWT_SECRET_KEY}
       FIREBASE_SERVICE_ACCOUNT_KEY: ${FIREBASE_SERVICE_ACCOUNT_KEY}
+    volumes:
+      - ./logs/staging:/logs
     depends_on:
       mysql:
         condition: service_healthy
@@ -101,9 +117,13 @@ services:
     restart: always
     ports:
       - "80:80"
+    environment:
+      PROD_SERVER_NAME: ${NGINX_PROD_SERVER_NAME:-api.cockple.store}
+      STAGING_SERVER_NAME: ${NGINX_STAGING_SERVER_NAME:-staging.cockple.store}
+      NGINX_ENVSUBST_FILTER: SERVER_NAME
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./nginx/conf.d:/etc/nginx/conf.d:ro
+      - ./nginx/templates:/etc/nginx/templates:ro
     mem_limit: 64m
     memswap_limit: 128m
 

nginx/conf.d/prod.conf → nginx/templates/prod.conf.template

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name api.cockple.store;
+    server_name ${PROD_SERVER_NAME};
 
     location /ws/ {
         proxy_pass http://cockple-app:8080;

nginx/conf.d/staging.conf → nginx/templates/staging.conf.template

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name staging.cockple.store;
+    server_name ${STAGING_SERVER_NAME};
 
     location /ws/ {
         proxy_pass http://cockple-app-staging:8080;

scripts/deploy.sh

@@ -26,10 +26,22 @@ KAKAO_REDIRECT_URI_STAGING=${KAKAO_REDIRECT_URI_STAGING}
 KAKAO_ADMIN_KEY=${KAKAO_ADMIN_KEY}
 JWT_SECRET_KEY=${JWT_SECRET_KEY}
 FIREBASE_SERVICE_ACCOUNT_KEY=${FIREBASE_SERVICE_ACCOUNT_KEY}
+FCM_FAKE_LATENCY_MS=${FCM_FAKE_LATENCY_MS:-0}
+OTLP_METRICS_ENABLED=${OTLP_METRICS_ENABLED:-false}
+OTEL_URL=${OTEL_URL:-}
+OTEL_AUTH=${OTEL_AUTH:-}
+OTLP_STEP=${OTLP_STEP:-1m}
+CORS_ALLOWED_ORIGINS_PROD=${CORS_ALLOWED_ORIGINS_PROD:-}
+CORS_ALLOWED_ORIGINS_STAGING=${CORS_ALLOWED_ORIGINS_STAGING:-}
+COOKIE_DOMAIN=${COOKIE_DOMAIN:-}
+NGINX_PROD_SERVER_NAME=${NGINX_PROD_SERVER_NAME:-}
+NGINX_STAGING_SERVER_NAME=${NGINX_STAGING_SERVER_NAME:-}
 EOF
 
 echo "${FIREBASE_SERVICE_ACCOUNT_KEY}" > /home/ubuntu/cockple/firebase-service-account.json
 
+mkdir -p /home/ubuntu/cockple/logs/prod /home/ubuntu/cockple/logs/staging
+
 echo "=== 배포 전 상태 ==="
 sudo docker ps
 

src/main/java/umc/cockple/demo/domain/bookmark/converter/BookmarkConverter.java

@@ -20,7 +20,8 @@
 public class BookmarkConverter {
 
     public GetAllExerciseBookmarksResponseDTO exerciseBookmarkToDTO(ExerciseBookmark bookmark,
-                                                                           boolean includeParty, boolean includeExercise) {
+                                                                           boolean includeParty, boolean includeExercise,
+                                                                           int nowMemberCnt) {
         Exercise exercise = bookmark.getExercise();
 
         return GetAllExerciseBookmarksResponseDTO.builder()
@@ -34,7 +35,7 @@ public GetAllExerciseBookmarksResponseDTO exerciseBookmarkToDTO(ExerciseBookmark
                 .startExerciseTime(exercise.getStartTime())
                 .endExerciseTime(exercise.getEndTime())
                 .maxMemberCnt(exercise.getMaxCapacity())
-                .nowMemberCnt(exercise.getNowCapacity())
+                .nowMemberCnt(nowMemberCnt)
                 .includeParty(includeParty)
                 .includeExercise(includeExercise)
                 .build();

src/main/java/umc/cockple/demo/domain/bookmark/repository/ExerciseBookmarkRepository.java

@@ -18,6 +18,19 @@ public interface ExerciseBookmarkRepository extends JpaRepository<ExerciseBookma
 
     List<ExerciseBookmark> findAllByMember(Member member);
 
+    @Query("""
+            SELECT DISTINCT eb
+            FROM ExerciseBookmark eb
+            JOIN FETCH eb.exercise e
+            JOIN FETCH e.party p
+            LEFT JOIN FETCH e.exerciseAddr
+            LEFT JOIN FETCH p.partyImg
+            LEFT JOIN FETCH p.chatRoom
+            LEFT JOIN FETCH p.levels
+            WHERE eb.member = :member
+            """)
+    List<ExerciseBookmark> findAllByMemberWithDetails(@Param("member") Member member);
+
 
     @Query("""
             SELECT eb.exercise.id FROM ExerciseBookmark eb

src/main/java/umc/cockple/demo/domain/bookmark/repository/PartyBookmarkRepository.java

@@ -22,6 +22,9 @@ public interface PartyBookmarkRepository extends JpaRepository<PartyBookmark, Lo
         SELECT DISTINCT pb
         FROM PartyBookmark pb
         JOIN FETCH pb.party p
+        LEFT JOIN FETCH p.partyAddr
+        LEFT JOIN FETCH p.partyImg
+        LEFT JOIN FETCH p.chatRoom
         LEFT JOIN FETCH p.exercises
         WHERE pb.member = :member
         """)

src/main/java/umc/cockple/demo/domain/bookmark/service/BookmarkQueryService.java

@@ -12,6 +12,7 @@
 import umc.cockple.demo.domain.bookmark.repository.ExerciseBookmarkRepository;
 import umc.cockple.demo.domain.bookmark.repository.PartyBookmarkRepository;
 import umc.cockple.demo.domain.exercise.domain.Exercise;
+import umc.cockple.demo.domain.exercise.service.query.lookup.ExerciseParticipantCountLookupService;
 import umc.cockple.demo.domain.file.service.FileService;
 import umc.cockple.demo.domain.member.domain.Member;
 import umc.cockple.demo.domain.member.exception.MemberErrorCode;
@@ -28,8 +29,11 @@
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 @Service
 @Transactional(readOnly = true)
@@ -41,6 +45,7 @@ public class BookmarkQueryService {
     private final PartyBookmarkRepository partyBookmarkRepository;
     private final MemberPartyRepository memberPartyRepository;
     private final MemberExerciseRepository memberExerciseRepository;
+    private final ExerciseParticipantCountLookupService exerciseParticipantCountLookupService;
     private final MemberRepository memberRepository;
     private final BookmarkConverter bookmarkConverter;
     private final FileService fileService;
@@ -50,7 +55,7 @@ public List<GetAllExerciseBookmarksResponseDTO> getAllExerciseBookmarks(Long mem
         Member member = findByMemberId(memberId);
 
         // 찜한 운동 가져오기
-        List<ExerciseBookmark> bookmarks = exerciseBookmarkRepository.findAllByMember(member);
+        List<ExerciseBookmark> bookmarks = exerciseBookmarkRepository.findAllByMemberWithDetails(member);
 
         // orderType에 따른 정렬
         Comparator<ExerciseBookmark> comparator = Comparator.comparing(ExerciseBookmark::getCreatedAt);
@@ -61,20 +66,25 @@ public List<GetAllExerciseBookmarksResponseDTO> getAllExerciseBookmarks(Long mem
         List<Long> partyIds = bookmarks.stream().map(b -> b.getExercise().getParty().getId()).toList();
         List<Long> exerciseIds = bookmarks.stream().map(b -> b.getExercise().getId()).toList();
 
-        List<Long> myParties = memberPartyRepository.findAllPartyIdsByMemberAndPartyIds(memberId, partyIds);
-        List<Long> myExercises = memberExerciseRepository.findAllExerciseIdsByMemberAndExerciseIds(memberId, exerciseIds);
+        Set<Long> myParties = new HashSet<>(memberPartyRepository.findAllPartyIdsByMemberAndPartyIds(memberId, partyIds));
+        Set<Long> myExercises = new HashSet<>(memberExerciseRepository.findAllExerciseIdsByMemberAndExerciseIds(memberId, exerciseIds));
+
+        // exercise 도메인의 공통 참여 인원수 조회 로직 사용 (N+1 제거)
+        Map<Long, Integer> nowCntByExerciseId = exerciseParticipantCountLookupService
+                .getParticipantCountsByExerciseIds(exerciseIds);
 
         // bookmark -> dto 변환
         return bookmarks.stream()
                 .map(bookmark -> {
+                    Long exerciseId = bookmark.getExercise().getId();
                     boolean includeParty = myParties.contains(bookmark.getExercise().getParty().getId());
-                    boolean includeExercise = myExercises.contains(bookmark.getExercise().getId());
-                    return bookmarkConverter.exerciseBookmarkToDTO(bookmark, includeParty, includeExercise);
+                    boolean includeExercise = myExercises.contains(exerciseId);
+                    int nowMemberCnt = nowCntByExerciseId.getOrDefault(exerciseId, 0);
+                    return bookmarkConverter.exerciseBookmarkToDTO(bookmark, includeParty, includeExercise, nowMemberCnt);
                 })
                 .toList();
     }
 
-
     public List<GetAllPartyBookmarkResponseDTO> getAllPartyBookmarks(Long memberId, PartyOrderType orderType) {
         // 회원 조회하기
         Member member = findByMemberId(memberId);

src/main/java/umc/cockple/demo/domain/bookmark/service/query/lookup/ExerciseBookmarkLookupService.java

@@ -0,0 +1,37 @@
+package umc.cockple.demo.domain.bookmark.service.query.lookup;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import umc.cockple.demo.domain.bookmark.repository.ExerciseBookmarkRepository;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class ExerciseBookmarkLookupService {
+
+    private final ExerciseBookmarkRepository exerciseBookmarkRepository;
+
+    public Map<Long, Boolean> getBookmarkStatus(Long memberId, List<Long> exerciseIds) {
+        if (exerciseIds.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        List<Long> bookmarkedExerciseIds = exerciseBookmarkRepository
+                .findAllExerciseIdsByMemberIdAndExerciseIds(memberId, exerciseIds);
+        Set<Long> bookmarkedExerciseIdSet = new HashSet<>(bookmarkedExerciseIds);
+
+        return exerciseIds.stream()
+                .collect(Collectors.toMap(
+                        exerciseId -> exerciseId,
+                        bookmarkedExerciseIdSet::contains
+                ));
+    }
+}

src/main/java/umc/cockple/demo/domain/chat/AGENTS.md

@@ -8,15 +8,19 @@ Chat mixes REST queries with WebSocket transport, Redis-backed subscription/cach
 ## WHERE TO LOOK
 | Task | Location | Notes |
 |------|----------|-------|
-| WebSocket ingress | `handler/ChatWebSocketHandler.java` | handles connect/message/close/error |
-| Auth for sockets | `interceptor/` | JWT auth is enforced before handler logic |
+| WebSocket ingress | `presentation/websocket/ChatWebSocketHandler.java` | handles connect/message/close/error |
+| Auth for sockets | `presentation/websocket/` | JWT auth is enforced before handler logic |
+| WebSocket dispatch | `presentation/websocket/ChatWebSocketRequestDispatcher.java` | parses socket payloads and delegates authenticated requests |
+| WebSocket commands | `presentation/websocket/ChatWebSocketCommandHandler.java` | handles socket request types and publishes command events |
+| WebSocket responses | `presentation/websocket/WebSocketResponseSender.java` | serializes and sends socket responses |
+| WebSocket response assembly | `converter/ChatWebSocketResponseAssembler.java` | shapes socket response payloads |
 | Realtime services | `service/websocket/` | subscription, room list cache, message fanout |
 | Read/query flows | `service/ChatQueryServiceImpl.java` | room lists, unread counts, history |
 | Events | `events/` | send/subscription events bridge transport and async handlers |
-| DTO conversion | `converter/ChatConverter.java` | shapes REST/socket payloads |
+| DTO conversion | `converter/ChatConverter.java` | shapes REST/API and common message payloads |
 
 ## CONVENTIONS
-- `WebSocketConfig` registers `/ws/chats` and wires the JWT interceptor.
+- `presentation/websocket/ChatWebSocketConfig` registers `/ws/chats` and wires the JWT interceptor.
 - Request `type()` drives socket branching: send, subscribe, unsubscribe, and chat-list variants.
 - Party chat and direct chat share the slice but differ in display-name/image/read-status logic.
 - Room list freshness depends on `service/websocket/ChatRoomListCacheService`.