From 945a0fa75e9bdf46aaa21ff87576388a20a4014a Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sun, 8 Mar 2026 23:54:45 +0900 Subject: [PATCH 01/94] =?UTF-8?q?#1=20[Docs]=20=ED=99=88/=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20API=20=EB=AA=85=EC=84=B8?= =?UTF-8?q?=20=EB=B0=8F=20ERD=20=EB=AC=B8=EC=84=9C=20=EC=A0=95=EB=A6=AC=20?= =?UTF-8?q?(#2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - user, notice-notification ERD 문서 분리 - home, mypage, user API 명세 문서 추가 및 정리 --- docs/api-specs/home-api.md | 128 +++++++++++++++++++++ docs/api-specs/mypage-api.md | 85 ++++++++++++++ docs/api-specs/user-api.md | 183 ++++++++++++++++++++++++++++++ docs/erd/notice-notification.puml | 41 +++++++ docs/erd/user.puml | 81 +++++++++++++ 5 files changed, 518 insertions(+) create mode 100644 docs/api-specs/home-api.md create mode 100644 docs/api-specs/mypage-api.md create mode 100644 docs/api-specs/user-api.md create mode 100644 docs/erd/notice-notification.puml create mode 100644 docs/erd/user.puml diff --git a/docs/api-specs/home-api.md b/docs/api-specs/home-api.md new file mode 100644 index 00000000..3b83e2ce --- /dev/null +++ b/docs/api-specs/home-api.md @@ -0,0 +1,128 @@ +# 홈 API 명세서 + +## 1. 설계 메모 + +- `Home`은 원천 도메인이 아니라 여러 도메인을 조합하는 집계 API입니다. +- 메인 화면에서 바로 응답하는 즉답형 기능은 `quiz` 도메인으로 분리합니다. +- 홈 화면은 아래 데이터를 한 번에 조합해서 반환합니다. + - HOT 배틀 + - PICK 배틀 + - 퀴즈 + - 최신 배틀 +- 공지는 홈 상단 노출 대상만 조회합니다. + +--- + +## 2. 홈 API + +### 2.1 `GET /api/v1/home` + +홈 화면 집계 조회 API. + +반환 항목: + +- HOT 배틀 +- PICK 배틀 +- 퀴즈 2지선다 +- 퀴즈 4지선다 +- 최신 배틀 목록 + +```json +{ + "hot_battle": { + "battle_id": "battle_001", + "title": "안락사 도입, 찬성 vs 반대", + "summary": "인간에게 품위 있는 죽음을 허용해야 할까?", + "thumbnail_url": "https://cdn.example.com/battle/hot-001.png" + }, + "pick_battle": { + "battle_id": "battle_002", + "title": "공리주의 vs 의무론", + "summary": "도덕 판단의 기준은 결과일까 원칙일까?", + "thumbnail_url": "https://cdn.example.com/battle/pick-002.png" + }, + "quizzes": [ + { + "quiz_id": "quiz_001", + "type": "BINARY", + "title": "AI가 만든 그림도 예술일까?", + "options": [ + { "code": "A", "label": "그렇다" }, + { "code": "B", "label": "아니다" } + ] + }, + { + "quiz_id": "quiz_002", + "type": "MULTIPLE_CHOICE", + "title": "도덕 판단의 기준은?", + "options": [ + { "code": "A", "label": "결과" }, + { "code": "B", "label": "의도" }, + { "code": "C", "label": "규칙" }, + { "code": "D", "label": "상황" } + ] + } + ], + "latest_battles": [ + { + "battle_id": "battle_101", + "title": "정의란 무엇인가", + "summary": "정의의 기준은 모두에게 같아야 할까?", + "thumbnail_url": "https://cdn.example.com/battle/latest-101.png" + } + ] +} +``` + +### 2.2 `POST /api/v1/quiz/{quizId}/responses` + +홈 화면에서 퀴즈 응답 저장. + +요청: + +```json +{ + "selected_option_code": "A" +} +``` + +응답: + +```json +{ + "quiz_id": "quiz_001", + "selected_option_code": "A", + "submitted_at": "2026-03-08T12:00:00Z" +} +``` + +--- + +## 3. 공지 API + +### 3.1 `GET /api/v1/notices` + +현재 노출 가능한 전체 공지 목록 조회. + +쿼리 파라미터: + +- `placement`: 선택, 예시 `HOME_TOP` +- `limit`: 선택 + +응답: + +```json +{ + "items": [ + { + "notice_id": "notice_001", + "title": "3월 신규 딜레마 업데이트", + "body": "매일 새로운 딜레마가 추가돼요.", + "notice_type": "ANNOUNCEMENT", + "is_pinned": true, + "starts_at": "2026-03-01T00:00:00Z", + "ends_at": "2026-03-31T23:59:59Z" + } + ] +} +``` diff --git a/docs/api-specs/mypage-api.md b/docs/api-specs/mypage-api.md new file mode 100644 index 00000000..e4945605 --- /dev/null +++ b/docs/api-specs/mypage-api.md @@ -0,0 +1,85 @@ +# 마이페이지 API 명세서 + +## 1. 설계 메모 + +- 마이페이지는 원천 도메인이 아니라 사용자, 리캡, 활동 이력을 묶는 조회 API 성격이 강합니다. +- 상단 요약과 상세 목록은 분리해서 조회합니다. + +--- + +## 2. 마이페이지 API + +### 2.1 `GET /api/v1/me/mypage` + +마이페이지 상단에 필요한 집계 데이터 조회. + +응답: + +```json +{ + "profile": { + "user_id": "user_001", + "nickname": "생각하는올빼미", + "avatar_emoji": "🦉", + "manner_temperature": 36.5 + }, + "recap_summary": { + "personality_title": "원칙 중심형", + "summary": "감정보다 이성과 규칙을 더 중시하는 편이에요." + }, + "activity_counts": { + "comments": 12, + "posts": 3, + "liked_contents": 8, + "changed_mind_contents": 2 + } +} +``` + +### 2.2 `GET /api/v1/me/recap` + +상세 리캡 정보 조회. + +응답: + +```json +{ + "personality_title": "원칙 중심형", + "summary": "감정보다 이성과 규칙을 더 중시하는 편이에요.", + "scores": { + "score_1": 88, + "score_2": 74, + "score_3": 62, + "score_4": 45, + "score_5": 30, + "score_6": 15 + } +} +``` + +### 2.3 `GET /api/v1/me/activities` + +사용자 행동 이력 조회. + +쿼리 파라미터: + +- `type`: `COMMENT | POST | LIKED_CONTENT | CHANGED_MIND` +- `cursor`: 선택 +- `size`: 선택 + +응답: + +```json +{ + "items": [ + { + "activity_id": "act_001", + "type": "COMMENT", + "title": "안락사 도입, 찬성 vs 반대", + "description": "자기결정권은 가장 기본적인 인권이라고 생각해요.", + "created_at": "2026-03-08T12:00:00Z" + } + ], + "next_cursor": "cursor_002" +} +``` diff --git a/docs/api-specs/user-api.md b/docs/api-specs/user-api.md new file mode 100644 index 00000000..b22e74d5 --- /dev/null +++ b/docs/api-specs/user-api.md @@ -0,0 +1,183 @@ +# 사용자 API 명세서 + +## 1. 설계 메모 + +- 첫 로그인 시 닉네임 랜덤 생성과 이모지 선택이 필요합니다. +- 프로필, 설정, 성향 점수는 모두 사용자 도메인 책임입니다. +- 성향 점수는 현재값을 갱신하면서 이력도 함께 적재합니다. + +--- + +## 2. 첫 로그인 API + +### 2.1 `GET /api/v1/onboarding/bootstrap` + +첫 로그인 화면 진입 시 필요한 초기 데이터 조회. + +응답: + +```json +{ + "random_nickname": "생각하는올빼미", + "emoji_options": ["🦊", "🦉", "🐱", "🐻", "🐰", "🦁", "🐸", "🐧"] +} +``` + +### 2.2 `POST /api/v1/onboarding/profile` + +첫 로그인 시 프로필 생성. + +요청: + +```json +{ + "nickname": "생각하는올빼미", + "avatar_emoji": "🦉" +} +``` + +응답: + +```json +{ + "user_id": "user_001", + "nickname": "생각하는올빼미", + "avatar_emoji": "🦉", + "manner_temperature": 36.5, + "onboarding_completed": true +} +``` + +--- + +## 3. 프로필 API + +### 3.1 `PATCH /api/v1/me/profile` + +닉네임 및 아바타 수정. + +요청: + +```json +{ + "nickname": "생각하는펭귄", + "avatar_emoji": "🐧" +} +``` + +응답: + +```json +{ + "user_id": "user_001", + "nickname": "생각하는펭귄", + "avatar_emoji": "🐧", + "updated_at": "2026-03-08T12:00:00Z" +} +``` + +--- + +## 4. 설정 API + +### 4.1 `GET /api/v1/me/settings` + +현재 사용자 설정 조회. + +응답: + +```json +{ + "push_enabled": true, + "email_enabled": false, + "debate_request_enabled": true, + "profile_public": true +} +``` + +### 4.2 `PATCH /api/v1/me/settings` + +사용자 설정 수정. + +요청: + +```json +{ + "push_enabled": false, + "debate_request_enabled": false +} +``` + +응답: + +```json +{ + "updated": true +} +``` + +--- + +## 5. 성향 점수 API + +### 5.1 `PUT /api/v1/me/tendency-scores` + +최신 성향 점수 수정 및 이력 저장. + +요청: + +```json +{ + "score_1": 30, + "score_2": -20, + "score_3": 55, + "score_4": 10, + "score_5": -75, + "score_6": 42 +} +``` + +응답: + +```json +{ + "user_id": "user_001", + "score_1": 30, + "score_2": -20, + "score_3": 55, + "score_4": 10, + "score_5": -75, + "score_6": 42, + "updated_at": "2026-03-08T12:00:00Z", + "history_saved": true +} +``` + +### 5.2 `GET /api/v1/me/tendency-scores/history` + +성향 점수 변경 이력 조회. + +쿼리 파라미터: + +- `cursor`: 선택 +- `size`: 선택 + +응답: + +```json +{ + "items": [ + { + "history_id": "ths_001", + "score_1": 30, + "score_2": -20, + "score_3": 55, + "score_4": 10, + "score_5": -75, + "score_6": 42, + "created_at": "2026-03-08T12:00:00Z" + } + ], + "next_cursor": null +} +``` diff --git a/docs/erd/notice-notification.puml b/docs/erd/notice-notification.puml new file mode 100644 index 00000000..4c33ce53 --- /dev/null +++ b/docs/erd/notice-notification.puml @@ -0,0 +1,41 @@ +@startuml +hide circle +hide methods +skinparam linetype ortho + +entity "USERS\n사용자" as users { + * id : uuid <> +} + +entity "NOTICES\n전체 공지" as notices { + * id : uuid <> + -- + title : string + body : text + notice_type : string + is_pinned : boolean + starts_at : datetime + ends_at : datetime + created_at : datetime +} + +entity "NOTIFICATIONS\n알림 발송 이력" as notifications { + * id : uuid <> + -- + user_id : uuid <> + notification_type : string + title : string + body : text + payload_json : text + status : string + scheduled_at : datetime + sent_at : datetime + failed_at : datetime + provider_message_id : string + failure_reason : string + created_at : datetime +} + +users ||--o{ notifications + +@enduml diff --git a/docs/erd/user.puml b/docs/erd/user.puml new file mode 100644 index 00000000..5007a966 --- /dev/null +++ b/docs/erd/user.puml @@ -0,0 +1,81 @@ +@startuml +hide circle +hide methods +skinparam linetype ortho + +entity "USERS\n사용자" as users { + * id : uuid <> + -- + provider : string + provider_user_id : string + status : string + created_at : datetime +} + +entity "USER_PROFILES\n사용자 프로필" as user_profiles { + * user_id : uuid <> + -- + nickname : string + avatar_type : string + avatar_url : string + manner_temperature : float + updated_at : datetime +} + +entity "USER_SETTINGS\n사용자 설정" as user_settings { + * user_id : uuid <> + -- + push_enabled : boolean + email_enabled : boolean + debate_request_enabled : boolean + profile_public : boolean + updated_at : datetime +} + +entity "USER_AGREEMENTS\n사용자 동의 이력" as user_agreements { + * id : uuid <> + -- + user_id : uuid <> + agreement_type : string + version : string + agreed_at : datetime +} + +entity "USER_DEVICES\n사용자 디바이스" as user_devices { + * id : uuid <> + -- + user_id : uuid <> + device_token : string + platform : string + last_seen_at : datetime +} + +entity "USER_BLOCKS\n사용자 차단" as user_blocks { + * id : uuid <> + -- + blocker_user_id : uuid <> + blocked_user_id : uuid <> + created_at : datetime +} + +entity "USER_TENDENCY_SCORES\n사용자 성향 점수 (-100~100) \n(필드는 추후 수정)" as user_tendency_scores { + * user_id : uuid <> + -- + score_1 : int + score_2 : int + score_3 : int + score_4 : int + score_5 : int + score_6 : int + updated_at : datetime +} + +users ||--|| user_profiles +users ||--|| user_settings +users ||--o{ user_agreements +users ||--o{ user_devices +users ||--o{ user_blocks : blocker +users ||--o{ user_blocks : blocked +users ||--|| user_tendency_scores + +@enduml From 95f60dc2b8536002e9e54d79fb2b057e6b0581d1 Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Tue, 10 Mar 2026 14:08:05 +0900 Subject: [PATCH 02/94] =?UTF-8?q?#3=20[Docs]=20Oauth2=20ERD=20=EB=B0=8F=20?= =?UTF-8?q?API=20=EC=A0=95=EC=9D=98=20(#4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Oauth2 ERD 및 API 정의 --- docs/api-specs/oauth-api.md | 214 ++++++++++++++++++++++++++++++++++++ docs/erd/oauth2.puml | 78 +++++++++++++ 2 files changed, 292 insertions(+) create mode 100644 docs/api-specs/oauth-api.md create mode 100644 docs/erd/oauth2.puml diff --git a/docs/api-specs/oauth-api.md b/docs/api-specs/oauth-api.md new file mode 100644 index 00000000..61178893 --- /dev/null +++ b/docs/api-specs/oauth-api.md @@ -0,0 +1,214 @@ +# 🔐 PIQUE 사용자 인증 및 온보딩 API 통합 명세서 + +## 1. 설계 메모 +* **인증 방식**: OAuth 2.0 인가 코드 방식을 사용하며, 서비스 자체 JWT(Access/Refresh)를 발급합니다. +* **온보딩 흐름**: 로그인 응답의 `isNewUser`가 `true`일 경우, `bootstrap` 데이터를 조회한 뒤 `profile` 생성 API를 호출합니다. +* **상태 전환**: 프로필 생성이 완료되면 유저 상태(`status`)는 `PENDING`에서 `ACTIVE`로 변경됩니다. +* **재화 관리**: 유저 지갑(`userWallet`)은 별도 테이블로 관리하며 프로필 설정 완료 시 함께 조회됩니다. +* **응답 규격**: 모든 응답은 `statusCode`, `data`, `error` 필드를 포함하는 공통 포맷을 준수합니다. + +--- + +## 2. API 상세 내역 + +### 2.1 소셜 로그인 및 회원가입 +* **Endpoint**: `POST /api/v1/auth/login/{provider}` +* **설명**: 소셜 인가 코드를 이용해 로그인 및 계정을 생성합니다. 상태가 `BANNED`인 유저는 403을 반환합니다. +* **요청 바디**: +```json +{ + "authorizationCode": "string", + "redirectUri": "string" +} +``` +* **성공 응답**: +```json +{ + "statusCode": 200, + "data": { + "accessToken": "eyJhbGciOiJIUzI...", + "refreshToken": "def456-ghi789...", + "userId": 105, + "isNewUser": true, + "status": "PENDING" + }, + "error": null +} +``` + +### 2.2 온보딩 초기 데이터 조회 +* **Endpoint**: `GET /api/v1/onboarding/bootstrap` +* **설명**: 첫 로그인 화면 진입 시 필요한 랜덤 닉네임과 캐릭터 옵션을 조회합니다. +* **성공 응답**: +```json +{ + "statusCode": 200, + "data": { + "randomNickname": "생각하는올빼미", + "characterOptions": [ + { "id": 1, "name": "올빼미", "imageUrl": "https://..." }, + { "id": 2, "name": "여우", "imageUrl": "https://..." } + ] + }, + "error": null +} +``` + +### 2.3 초기 프로필 설정 (가입 완료) +* **Endpoint**: `POST /api/v1/onboarding/profile` +* **설명**: 신규 유저의 닉네임과 캐릭터를 설정하여 정식 회원으로 전환합니다. +* **요청 바디**: +```json +{ + "nickname": "생각하는올빼미", + "characterId": 1 +} +``` +* **성공 응답**: +```json +{ + "statusCode": 200, + "data": { + "userId": 105, + "nickname": "생각하는올빼미", + "characterId": 1, + "userWallet": { + "credit": 500, + "updatedAt": "2026-03-08T12:00:00Z" + }, + "status": "ACTIVE", + "onboardingCompleted": true + }, + "error": null +} +``` + +### 2.4 토큰 재발급 +* **Endpoint**: `POST /api/v1/auth/refresh` +* **설명**: 만료된 Access Token을 Refresh Token을 사용하여 재발급합니다. +* **요청 헤더**: `X-Refresh-Token: {refreshToken}` +* **성공 응답**: +```json +{ + "statusCode": 200, + "data": { + "accessToken": "new_eyJhbGciOiJIUzI...", + "refreshToken": "new_def456-ghi789..." + }, + "error": null +} +``` + +### 2.5 로그아웃 +* **Endpoint**: `POST /api/v1/auth/logout` +* **설명**: 현재 로그인된 사용자의 Refresh Token을 삭제하여 로그아웃 처리합니다. +* **요청 헤더**: `Authorization: Bearer {accessToken}` +* **성공 응답**: +```json +{ + "statusCode": 200, + "data": { + "loggedOut": true + }, + "error": null +} +``` + +### 2.6 회원 탈퇴 +* **Endpoint**: `DELETE /api/v1/me` +* **설명**: 현재 로그인된 사용자의 계정을 삭제합니다. `users`, `user_socials`, `refresh_tokens`, `user_wallets`, `credit_histories` 연관 데이터를 함께 처리합니다. +* **요청 헤더**: `Authorization: Bearer {accessToken}` +* **성공 응답**: +```json +{ + "statusCode": 200, + "data": { + "withdrawn": true + }, + "error": null +} +``` + +--- + +## 3. 예외 응답 (공통) + +### 3.1 요청 파라미터 오류 (400) +```json +{ + "statusCode": 400, + "data": null, + "error": { + "code": "COMMON_INVALID_PARAMETER", + "message": "요청 파라미터가 잘못되었습니다.", + "errors": [ + { + "field": "nickname", + "value": "홍길동!", + "reason": "특수문자는 포함할 수 없습니다." + } + ] + } +} +``` + +### 3.2 인증 오류 (401) +```json +{ + "statusCode": 401, + "data": null, + "error": { + "code": "AUTH_INVALID_CODE", + "message": "유효하지 않은 소셜 인가 코드입니다.", + "errors": [] + } +} +``` +```json +{ + "statusCode": 401, + "data": null, + "error": { + "code": "AUTH_TOKEN_EXPIRED", + "message": "만료되었거나 유효하지 않은 Refresh Token입니다.", + "errors": [] + } +} +``` + +### 3.3 중복 오류 (409) +```json +{ + "statusCode": 409, + "data": null, + "error": { + "code": "USER_NICKNAME_DUPLICATE", + "message": "이미 사용 중인 닉네임입니다.", + "errors": [] + } +} +``` +```json +{ + "statusCode": 409, + "data": null, + "error": { + "code": "ONBOARDING_ALREADY_COMPLETED", + "message": "이미 온보딩이 완료된 사용자입니다.", + "errors": [] + } +} +``` + +### 3.4 접근 거부 오류 (403) +```json +{ + "statusCode": 403, + "data": null, + "error": { + "code": "USER_BANNED", + "message": "제재된 사용자입니다.", + "errors": [] + } +} +``` \ No newline at end of file diff --git a/docs/erd/oauth2.puml b/docs/erd/oauth2.puml new file mode 100644 index 00000000..bd04b802 --- /dev/null +++ b/docs/erd/oauth2.puml @@ -0,0 +1,78 @@ +@startuml +!theme plain +skinparam Linetype ortho + +' 1. 사용자 기본 테이블 +entity "users" { + * id : BIGINT <> + -- + email : VARCHAR(255) <> + nickname : VARCHAR(50) <> + character_id : INT <> + role : ENUM('USER', 'ADMIN') + status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +' 2. OAuth 연동 정보 테이블 +' [논의 필요] access_token, refresh_token 암호화 저장 여부 검토 필요 +entity "user_socials" { + * id : BIGINT <> + -- + user_id : BIGINT <> + provider : ENUM('KAKAO', 'GOOGLE', 'APPLE') + provider_user_id : VARCHAR(255) + access_token : TEXT + refresh_token : TEXT +} + +' 3. 선택 가능한 캐릭터 정보 테이블 +entity "characters" { + * id : INT <> + -- + name : VARCHAR(50) + image_url : VARCHAR(255) + description : VARCHAR(255) +} + +' 4. 서비스 자체 인증 토큰 관리 +' [논의 필요] 현재는 재발급 시 기존 토큰 삭제 방식 사용 +' 토큰 탈취 감지가 필요하다면 is_revoked : BOOLEAN DEFAULT false 추가 검토 +entity "refresh_tokens" { + * id : BIGINT <> + -- + user_id : BIGINT <> + token_value : TEXT + expired_at : TIMESTAMP + ' is_revoked : BOOLEAN DEFAULT false +} + +' 5. 지갑 테이블 +entity "user_wallets" { + * id : BIGINT <> + -- + user_id : BIGINT <> + credit : INT DEFAULT 0 + updated_at : TIMESTAMP +} + +' 6. 크레딧 변동 이력 테이블 +entity "credit_histories" { + * id : BIGINT <> + -- + user_id : BIGINT <> + amount : INT -- 변동된 크레딧 양 + type : ENUM('CHARGE', 'USE', 'EVENT', 'REFUND') + description : VARCHAR(255) + created_at : TIMESTAMP +} + +' 관계 설정 +users }|--|| characters : "선택한 캐릭터" +users ||--o{ user_socials : "소셜 연동" +users ||--o{ refresh_tokens : "인증 관리" +users ||--|| user_wallets : "보유 크레딧" +users ||--o{ credit_histories : "이력 기록" + +@enduml \ No newline at end of file From 062f9fc251a0b7ca1ff6aa720319a6861386178c Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Wed, 11 Mar 2026 13:50:34 +0900 Subject: [PATCH 03/94] =?UTF-8?q?[Docs]=20=EB=B0=B0=ED=8B=80,=20=EC=8B=9C?= =?UTF-8?q?=EB=82=98=EB=A6=AC=EC=98=A4,=20=ED=88=AC=ED=91=9C,=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20ERD=20=EB=B0=8F=20API=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api-specs/battle-api.md | 494 ++++++++++++++++++++++++++++ docs/api-specs/scenario-api.md | 569 +++++++++++++++++++++++++++++++++ docs/api-specs/tag-api.md | 188 +++++++++++ docs/api-specs/vote-api.md | 153 +++++++++ docs/erd/battle.puml | 89 ++++++ docs/erd/scenario.puml | 127 ++++++++ docs/erd/tag.puml | 61 ++++ docs/erd/vote.puml | 101 ++++++ 8 files changed, 1782 insertions(+) create mode 100644 docs/api-specs/battle-api.md create mode 100644 docs/api-specs/scenario-api.md create mode 100644 docs/api-specs/tag-api.md create mode 100644 docs/api-specs/vote-api.md create mode 100644 docs/erd/battle.puml create mode 100644 docs/erd/scenario.puml create mode 100644 docs/erd/tag.puml create mode 100644 docs/erd/vote.puml diff --git a/docs/api-specs/battle-api.md b/docs/api-specs/battle-api.md new file mode 100644 index 00000000..4fd9277a --- /dev/null +++ b/docs/api-specs/battle-api.md @@ -0,0 +1,494 @@ +# 배틀 API 명세서 + +--- + +## 설계 메모 + +- **오늘의 배틀 :** + - 스와이프 UI를 위해 약 5개의 배틀 리스트를 반환합니다. '오늘의 배틀(검정 창)'과 '일반 배틀 카드(하얀 창)'의 진입점(API)을 분리하여 각기 필요한 데이터를 제공합니다. +- **태그 :** + - 배틀 응답의 `tags` 필드는 `{ tag_id, name }` 객체 배열로 반환됩니다. 태그 전체 목록 조회 및 태그 기반 배틀 필터링은 Tag API를 참조하세요. +- **도메인 분리 :** + - 사용자 서비스 API와 관리자(Admin) 전용 API 도메인을 분리했습니다. 기본 콘텐츠 발행은 관리자 도메인에서 이루어집니다. +- **AI 자동 생성 :** + - 스케줄러가 매일 자동으로 트렌딩 이슈를 검색·수집하여 AI API를 호출하고 배틀 초안을 `PENDING` 상태로 저장합니다. 관리자는 `/api/v1/admin/ai/battles`를 통해 검수·승인·반려합니다. +- **배틀 `status` 흐름 :** + + | status | 적용 대상 | 설명 | + |--------|--------------|------| + | `DRAFT` | 관리자 | 관리자가 작성 중인 초안 | + | `PENDING` | AI, 유저 [후순위] | 검수 대기 중 | + | `PUBLISHED` | 전체 | 검수 완료, 실제 노출 | + | `REJECTED` | AI, 유저 [후순위] | 검수 반려 | + | `ARCHIVED` | 전체 | 배틀 종료 후 이력 보존 | + +- **[후순위] 크리에이터 정책 :** + - 매너 온도 45도 이상의 사용자가 직접 배틀을 제안하는 기능은 런칭 스펙에서 제외됩니다. + +--- + +## 사용자 API + +### `GET /api/v1/battles/today` + +- 스와이프 UI용으로 오늘 진행 중인 배틀 목록을 반환합니다. +- 피그마 디자인 상 5개로 임의 판단 -> 추후 수정 가능 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "battle_id": "battle_001", + "title": "드라마 <레이디 두아>, 원가 18만원 명품은 사기인가?", + "summary": "18만 원짜리 가방을 1억에 판 주인공, 사기꾼일까 예술가일까?", + "thumbnail_url": "https://cdn.pique.app/battle/hot-001.png", + "tags": [ + { "tag_id": "tag_001", "name": "사회" }, + { "tag_id": "tag_002", "name": "철학" }, + { "tag_id": "tag_003", "name": "롤스" }, + { "tag_id": "tag_004", "name": "니체" } + ], + "participants_count": 2148, + "audio_duration": 420, + "share_url": "https://pique.app/battles/battle_001", + "options": [ + { "option_id": "option_A", "label": "A", "title": "사기다 (롤스)" }, + { "option_id": "option_B", "label": "B", "title": "사기가 아니다 (니체)" } + ], + "user_vote_status": "NONE" + } + ], + "total_count": 5 + }, + "error": null +} +``` + +--- + +### `GET /api/v1/battles/{battle_id}` + +- 배틀 카드(하얀 창) 선택 시 노출되는 상세 정보(철학자, 성향, 인용구 등)를 조회합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "battle_id": "battle_001", + "title": "드라마 <레이디 두아>, 원가 18만원 명품은 사기인가?", + "tags": [ + { "tag_id": "tag_001", "name": "사회" }, + { "tag_id": "tag_002", "name": "철학" } + ], + "options": [ + { + "option_id": "option_A", + "label": "A", + "stance": "정보의 대칭 (공정성)", + "representative": "존 롤스", + "title": "사기다", + "quote": "베일 뒤에서 누구나 동의할 수 있는 공정한 규칙이 깨진 것입니다.", + "keywords": ["합리적", "원칙주의", "절대적"], + "image_url": "https://cdn.pique.app/images/rawls.png" + }, + { + "option_id": "option_B", + "label": "B", + "stance": "가치 창조 (욕망의 질서)", + "representative": "프리드리히 니체", + "title": "사기가 아니다", + "quote": "주인공은 가려운 욕망을 정확히 읽어내고, 새로운 가치를 창조해낸 예술가입니다.", + "keywords": ["본능적", "실용주의", "주관적"], + "image_url": "https://cdn.pique.app/images/nietzsche.png" + } + ] + }, + "error": null +} +``` + +--- + +## 관리자 API + +### `POST /api/v1/admin/battles` + +- 공식 배틀을 직접 생성합니다. + +#### Request Body + +```json +{ + "title": "드라마 <레이디 두아>, 원가 18만원 명품은 사기인가?", + "summary": "18만 원짜리 가방을 1억에 판 주인공, 사기꾼일까 예술가일까?", + "description": "예술과 사기의 경계에 대한 철학적 딜레마", + "thumbnail_url": "https://cdn.pique.app/battle/hot-001.png", + "target_date": "2026-03-10", + "tag_ids": ["tag_001", "tag_002", "tag_003", "tag_004"], + "options": [ + { + "label": "A", + "title": "사기다", + "stance": "정보의 대칭 (공정성)", + "representative": "존 롤스", + "quote": "베일 뒤에서 누구나 동의할 수 있는 공정한 규칙이 깨진 것입니다.", + "keywords": ["합리적", "원칙주의", "절대적"], + "image_url": "https://cdn.pique.app/images/rawls.png" + }, + { + "label": "B", + "title": "사기가 아니다", + "stance": "가치 창조 (욕망의 질서)", + "representative": "프리드리히 니체", + "quote": "주인공은 가려운 욕망을 정확히 읽어내고, 새로운 가치를 창조해낸 예술가입니다.", + "keywords": ["본능적", "실용주의", "주관적"], + "image_url": "https://cdn.pique.app/images/nietzsche.png" + } + ] +} +``` + +#### 성공 응답 `201 Created` + +```json +{ + "statusCode": 201, + "data": { + "battle_id": "battle_001", + "title": "드라마 <레이디 두아>, 원가 18만원 명품은 사기인가?", + "summary": "18만 원짜리 가방을 1억에 판 주인공, 사기꾼일까 예술가일까?", + "description": "예술과 사기의 경계에 대한 철학적 딜레마", + "thumbnail_url": "https://cdn.pique.app/battle/hot-001.png", + "target_date": "2026-03-10", + "status": "DRAFT", + "creator_type": "ADMIN", + "tags": [ + { "tag_id": "tag_001", "name": "사회" }, + { "tag_id": "tag_002", "name": "철학" }, + { "tag_id": "tag_003", "name": "롤스" }, + { "tag_id": "tag_004", "name": "니체" } + ], + "options": [ + { + "option_id": "option_A", + "label": "A", + "title": "사기다", + "stance": "정보의 대칭 (공정성)", + "representative": "존 롤스", + "quote": "베일 뒤에서 누구나 동의할 수 있는 공정한 규칙이 깨진 것입니다.", + "keywords": ["합리적", "원칙주의", "절대적"], + "image_url": "https://cdn.pique.app/images/rawls.png" + }, + { + "option_id": "option_B", + "label": "B", + "title": "사기가 아니다", + "stance": "가치 창조 (욕망의 질서)", + "representative": "프리드리히 니체", + "quote": "주인공은 가려운 욕망을 정확히 읽어내고, 새로운 가치를 창조해낸 예술가입니다.", + "keywords": ["본능적", "실용주의", "주관적"], + "image_url": "https://cdn.pique.app/images/nietzsche.png" + } + ], + "created_at": "2026-03-10T09:00:00Z" + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/admin/battles/{battle_id}` + +- 배틀 정보를 수정합니다. 변경할 필드만 포함합니다. + +#### Request Body + +```json +{ + "title": "드라마 <레이디 두아>, 원가 18만원 명품은 사기인가? (수정)", + "status": "PUBLISHED", + "tag_ids": ["tag_001", "tag_002"] +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "battle_id": "battle_001", + "title": "드라마 <레이디 두아>, 원가 18만원 명품은 사기인가? (수정)", + "summary": "18만 원짜리 가방을 1억에 판 주인공, 사기꾼일까 예술가일까?", + "description": "예술과 사기의 경계에 대한 철학적 딜레마", + "thumbnail_url": "https://cdn.pique.app/battle/hot-001.png", + "target_date": "2026-03-10", + "status": "PUBLISHED", + "creator_type": "ADMIN", + "tags": [ + { "tag_id": "tag_001", "name": "사회" }, + { "tag_id": "tag_002", "name": "철학" } + ], + "updated_at": "2026-03-10T10:00:00Z" + }, + "error": null +} +``` + +--- + +### `DELETE /api/v1/admin/battles/{battle_id}` + +- 배틀을 삭제합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true, + "deleted_at": "2026-03-10T11:00:00Z" + }, + "error": null +} +``` + +--- + +## `[후순위]` 관리자 AI 검수 API + +- 스케줄러가 자동 생성한 AI 배틀 초안(`PENDING`)을 관리자가 검수 · 승인 · 반려합니다. + +### `GET /api/v1/admin/ai/battles` + +- AI가 생성한 `PENDING` 상태의 배틀 목록을 조회합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "battle_id": "battle_ai_001", + "title": "AI가 제안한 배틀 제목", + "summary": "AI가 생성한 요약", + "thumbnail_url": "https://cdn.pique.app/battle/ai-001.png", + "target_date": "2026-03-11", + "status": "PENDING", + "creator_type": "AI", + "tags": [ + { "tag_id": "tag_001", "name": "사회" } + ], + "options": [ + { "option_id": "option_A", "label": "A", "title": "찬성", "keywords": ["합리적", "효율중심", "미래지향"] }, + { "option_id": "option_B", "label": "B", "title": "반대", "keywords": ["인본주의", "도덕중심", "전통적"] } + ], + "created_at": "2026-03-11T06:00:00Z" + } + ], + "total_count": 3 + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/admin/ai/battles/{battle_id}` + +- AI가 생성한 배틀을 승인하거나 반려합니다. 승인 시 내용을 수정한 뒤 승인할 수 있습니다. + +#### Request Body — 승인 + +```json +{ + "action": "APPROVE", + "title": "AI 초안 제목 (수정 가능)", + "summary": "AI 초안 요약 (수정 가능)", + "tag_ids": ["tag_001", "tag_002"] +} +``` + +#### Request Body — 반려 + +```json +{ + "action": "REJECT", + "reject_reason": "주제가 서비스 방향과 맞지 않음" +} +``` + +#### 성공 응답 `200 OK` — 승인 + +```json +{ + "statusCode": 200, + "data": { + "battle_id": "battle_ai_001", + "status": "PUBLISHED", + "creator_type": "AI", + "updated_at": "2026-03-11T09:00:00Z" + }, + "error": null +} +``` + +#### 성공 응답 `200 OK` — 반려 + +```json +{ + "statusCode": 200, + "data": { + "battle_id": "battle_ai_001", + "status": "REJECTED", + "reject_reason": "주제가 서비스 방향과 맞지 않음", + "updated_at": "2026-03-11T09:00:00Z" + }, + "error": null +} +``` + +--- + +## `[후순위]` 크리에이터 API + +### `POST /api/v1/battles` + +- 배틀을 제안합니다. (매너 온도 45도 이상 유저) + +#### Request Body + +```json +{ + "title": "AI가 만든 예술 작품, 저작권은 누구에게?", + "summary": "AI 창작물의 저작권 귀속 주체에 대한 철학적 딜레마", + "description": "창작의 주체성과 소유권에 대한 철학적 논쟁", + "thumbnail_url": "https://cdn.pique.app/battle/ai-art.png", + "target_date": "2026-03-15", + "tag_ids": ["tag_002", "tag_005"], + "options": [ + { + "label": "A", + "title": "AI 개발사에게 귀속된다", + "stance": "도구 이론", + "representative": "존 로크", + "quote": "노동을 투입한 자에게 소유권이 있다.", + "keywords": ["합리적", "효율중심", "미래지향"], + "image_url": "https://cdn.pique.app/images/locke.png" + }, + { + "label": "B", + "title": "퍼블릭 도메인이어야 한다", + "stance": "공유재 이론", + "representative": "장 자크 루소", + "quote": "창작물은 사회의 산물이므로 모두의 것이다.", + "keywords": ["합리적", "효율중심", "미래지향"], + "image_url": "https://cdn.pique.app/images/rousseau.png" + } + ] +} +``` + +#### 성공 응답 `201 Created` + +```json +{ + "statusCode": 201, + "data": { + "battle_id": "battle_002", + "title": "AI가 만든 예술 작품, 저작권은 누구에게?", + "status": "PENDING", + "creator_type": "USER", + "created_at": "2026-03-10T12:00:00Z" + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/battles/{battle_id}` + +- 제안한 배틀 정보를 수정합니다. 변경할 필드만 포함합니다. + +#### Request Body + +```json +{ + "title": "AI가 만든 예술 작품, 저작권은 누구에게? (수정)", + "summary": "AI 창작물의 저작권 귀속 주체에 대한 철학적 딜레마" +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "battle_id": "battle_002", + "title": "AI가 만든 예술 작품, 저작권은 누구에게? (수정)", + "summary": "AI 창작물의 저작권 귀속 주체에 대한 철학적 딜레마", + "status": "PENDING", + "creator_type": "USER", + "updated_at": "2026-03-10T13:00:00Z" + }, + "error": null +} +``` + +--- + +### `DELETE /api/v1/battles/{battle_id}` + +- 제안한 배틀을 삭제합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true, + "deleted_at": "2026-03-10T14:00:00Z" + }, + "error": null +} +``` + +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- + +## 배틀 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `BATTLE_NOT_FOUND` | `404` | 존재하지 않는 배틀 | +| `BATTLE_CLOSED` | `409` | 종료된 배틀 | +| `BATTLE_ALREADY_PUBLISHED` | `409` | 이미 발행된 배틀 | +| `BATTLE_OPTION_NOT_FOUND` | `404` | 존재하지 않는 선택지 | + +--- \ No newline at end of file diff --git a/docs/api-specs/scenario-api.md b/docs/api-specs/scenario-api.md new file mode 100644 index 00000000..575c7427 --- /dev/null +++ b/docs/api-specs/scenario-api.md @@ -0,0 +1,569 @@ +# 시나리오 API 명세서 + +--- + +## 설계 메모 + +- **시나리오 구조 (인터랙티브 O/X 모두 지원) :** + - 배틀의 성격에 따라 인터랙티브(분기 선택)가 없는 '단일 오디오 재생'과 인터랙티브가 있는 '트리형 오디오 재생'을 모두 지원합니다. `is_interactive` 상태값으로 구분하여 클라이언트가 적절한 UI를 렌더링합니다. +- **트리(Node) 구조 :** + - 시나리오(오디오/대본)는 오프닝/1라운드 → 유저 선택 분기(2라운드) → 최종 결론(3라운드/클로징)으로 이어지는 트리(Node) 구조를 가집니다. +- **TTS 사전 생성 :** + - 관리자가 시나리오를 발행할 때 단 1번만 TTS API를 호출하여 `.mp3` 파일과 타임스탬프(`start_time`)를 생성하고 CDN에 저장합니다. 유저 플레이 시에는 실시간 호출 없이 저장된 파일을 스트리밍합니다. +- **AI 자동 생성 :** + - 스케줄러가 매일 자동으로 트렌딩 이슈를 검색·수집하여 AI API를 호출하고 시나리오 초안을 `PENDING` 상태로 저장합니다. 관리자는 `/api/v1/admin/ai/scenarios`를 통해 검수·승인·반려합니다. +- **프론트엔드 자체 처리 :** + - 글씨 크기(A-/A+) 및 오디오 플레이어 컨트롤(15초 전/후, 배속, 스와이프)은 프론트엔드에서 네이티브/UI 상태로 처리합니다. +- **시나리오 `status` 흐름 :** + + | status | 적용 대상 | 설명 | + |--------|--------------|------| + | `DRAFT` | 관리자 | 관리자가 작성 중인 초안. TTS 미생성 상태 | + | `PENDING` | AI, 유저 [후순위] | 관리자 검수 대기 중 | + | `PUBLISHED` | 전체 | TTS 생성 완료, CDN 업로드 완료, 실제 노출 | + | `REJECTED` | AI, 유저 [후순위] | 검수 반려 | + | `ARCHIVED` | 전체 | 배틀 종료 후 이력 보존, 더 이상 노출 안 함 | + +- **[후순위] 크리에이터 정책 :** + - 매너 온도 45도 이상의 사용자가 직접 시나리오를 제안하는 기능은 런칭 스펙에서 제외됩니다. + +--- + +## 사용자 API + +### `GET /api/v1/battles/{battle_id}/scenario` + +- 사전 투표 완료 후 시나리오 창 진입 시 호출합니다. +- `is_interactive` 값에 따라 클라이언트 렌더링 방식이 분기됩니다. + +--- + +#### CASE 1 - 단일 재생 (`is_interactive: false`) + +- 전체 시나리오가 1개의 노드에 담기며, `interactive_options`는 빈 배열로 반환됩니다. + +```json +{ + "statusCode": 200, + "data": { + "battle_id": "battle_001", + "is_interactive": false, + "my_pre_vote": { + "option_id": "option_A", + "label": "A", + "title": "사기다" + }, + "start_node_id": "node_001_full", + "nodes": [ + { + "node_id": "node_001_full", + "audio_url": "https://cdn.pique.app/audio/battle_001_full.mp3", + "audio_duration": 420, + "scripts": [ + { "start_time": 0, "speaker_name": "나레이션", "speaker_side": "NONE", "message": "여기 한 여자가 있습니다. 동대문에서 18만 원에 떼온 가방을 1억 원에 팔았습니다..." }, + { "start_time": 60000, "speaker_name": "존 롤스", "speaker_side": "A", "message": "재판장님, 시장 경제의 핵심은 '정보의 대칭'입니다. 판매자가 원가를 은폐한 것은 기만입니다." }, + { "start_time": 90000, "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "명품을 사는 사람이 원가를 몰라서 삽니까? 그들은 남들보다 우월해지기 위해 기꺼이 1억을 지불한 겁니다." }, + { "start_time": 150000, "speaker_name": "존 롤스", "speaker_side": "A", "message": "현명하십니다. 상품의 가치가 전적으로 기만에 의해 결정된다면 사회적 계약의 약탈입니다." }, + { "start_time": 210000, "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "역시 가치를 아시는군요! 거래는 예술입니다. 주인공은 가방에 독점적 서사를 입혔고 구매자는 만족했습니다." }, + { "start_time": 300000, "speaker_name": "존 롤스", "speaker_side": "A", "message": "한 가지 묻겠습니다. 당신이 만약 그 가방의 구매자였다면, 원가를 알고도 웃으며 1억을 내놓겠습니까?" }, + { "start_time": 330000, "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "질문이 틀렸소. 명품을 사는 자들은 이미 그 게임의 규칙을 압니다. 불쾌함이 곧 사기는 아닙니다." }, + { "start_time": 390000, "speaker_name": "나레이션", "speaker_side": "NONE", "message": "거래는 끝났고, 가방은 누군가의 손에 들려 있습니다. 이제 당신의 최종 선택을 들려주세요." } + ], + "interactive_options": [] + } + ] + }, + "error": null +} +``` + +--- + +#### CASE 2 - 분기형 인터랙티브 재생 (`is_interactive: true`) + +- `interactive_options` 배열의 `next_node_id`를 따라 노드를 순회합니다. + +```json +{ + "statusCode": 200, + "data": { + "battle_id": "battle_001", + "is_interactive": true, + "my_pre_vote": { + "option_id": "option_A", + "label": "A", + "title": "사기다" + }, + "start_node_id": "node_001_opening", + "nodes": [ + { + "node_id": "node_001_opening", + "audio_url": "https://cdn.pique.app/audio/battle_001_round1.mp3", + "audio_duration": 150, + "scripts": [ + { "start_time": 0, "speaker_name": "나레이션", "speaker_side": "NONE", "message": "여기 한 여자가 있습니다. 동대문에서 18만 원에 떼온 가방을 1억 원에 팔았습니다..." }, + { "start_time": 60000, "speaker_name": "존 롤스", "speaker_side": "A", "message": "재판장님, 시장 경제의 핵심은 '정보의 대칭'입니다..." }, + { "start_time": 90000, "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "명품을 사는 사람이 원가를 몰라서 삽니까? 그들은 차별화를 위해..." } + ], + "interactive_options": [ + { "label": "사회적 신뢰를 위해 정보의 투명성이 우선이다.", "next_node_id": "node_002_branch_a" }, + { "label": "시장은 개인의 욕망이 만나는 곳이다.", "next_node_id": "node_002_branch_b" } + ] + }, + { + "node_id": "node_002_branch_a", + "audio_url": "https://cdn.pique.app/audio/battle_001_round2_a.mp3", + "audio_duration": 110, + "scripts": [ + { "start_time": 0, "speaker_name": "유저", "speaker_side": "A", "message": "사회의 기본 신뢰를 위해 투명한 정보 공개가 우선되어야 합니다." }, + { "start_time": 10000, "speaker_name": "존 롤스", "speaker_side": "A", "message": "현명하십니다. 상품의 가치가 전적으로 기만에 의해 결정된다면..." } + ], + "interactive_options": [ + { "label": "최종 충돌 및 정리 듣기", "next_node_id": "node_003_closing" } + ] + }, + { + "node_id": "node_002_branch_b", + "audio_url": "https://cdn.pique.app/audio/battle_001_round2_b.mp3", + "audio_duration": 120, + "scripts": [ + { "start_time": 0, "speaker_name": "유저", "speaker_side": "B", "message": "강요 없는 자발적 거래라면, 욕망에 따른 가격 결정은 시장의 자유입니다." }, + { "start_time": 10000, "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "역시 가치를 아시는군요! 거래는 예술입니다..." } + ], + "interactive_options": [ + { "label": "최종 충돌 및 정리 듣기", "next_node_id": "node_003_closing" } + ] + }, + { + "node_id": "node_003_closing", + "audio_url": "https://cdn.pique.app/audio/battle_001_round3_closing.mp3", + "audio_duration": 90, + "scripts": [ + { "start_time": 0, "speaker_name": "존 롤스", "speaker_side": "A", "message": "한 가지 묻겠습니다. 당신이 만약 그 가방의 구매자였다면..." }, + { "start_time": 30000, "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "질문이 틀렸소. 명품을 사는 자들은 이미 그 게임의 규칙을 압니다..." }, + { "start_time": 60000, "speaker_name": "나레이션", "speaker_side": "NONE", "message": "이제 당신의 최종 선택을 들려주세요." } + ], + "interactive_options": [] + } + ] + }, + "error": null +} +``` + +--- + +## 관리자 API + +### `POST /api/v1/admin/scenarios` + +- 공식 시나리오를 직접 생성합니다. 생성 시 TTS API가 자동 호출되어 `.mp3` 파일이 CDN에 업로드됩니다. + +#### Request Body + +```json +{ + "battle_id": "battle_001", + "is_interactive": true, + "nodes": [ + { + "node_name": "node_001_opening", + "is_start_node": true, + "scripts": [ + { "speaker_name": "나레이션", "speaker_side": "NONE", "message": "여기 한 여자가 있습니다. 동대문에서 18만 원에 떼온 가방을 1억 원에 팔았습니다..." }, + { "speaker_name": "존 롤스", "speaker_side": "A", "message": "재판장님, 시장 경제의 핵심은 '정보의 대칭'입니다..." }, + { "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "명품을 사는 사람이 원가를 몰라서 삽니까?..." } + ], + "interactive_options": [ + { "label": "사회적 신뢰를 위해 정보의 투명성이 우선이다.", "next_node_name": "node_002_branch_a" }, + { "label": "시장은 개인의 욕망이 만나는 곳이다.", "next_node_name": "node_002_branch_b" } + ] + }, + { + "node_name": "node_002_branch_a", + "is_start_node": false, + "scripts": [ + { "speaker_name": "유저", "speaker_side": "A", "message": "사회의 기본 신뢰를 위해 투명한 정보 공개가 우선되어야 합니다." }, + { "speaker_name": "존 롤스", "speaker_side": "A", "message": "현명하십니다. 상품의 가치가 전적으로 기만에 의해 결정된다면..." } + ], + "interactive_options": [ + { "label": "최종 충돌 및 정리 듣기", "next_node_name": "node_003_closing" } + ] + }, + { + "node_name": "node_002_branch_b", + "is_start_node": false, + "scripts": [ + { "speaker_name": "유저", "speaker_side": "B", "message": "강요 없는 자발적 거래라면, 욕망에 따른 가격 결정은 시장의 자유입니다." }, + { "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "역시 가치를 아시는군요! 거래는 예술입니다..." } + ], + "interactive_options": [ + { "label": "최종 충돌 및 정리 듣기", "next_node_name": "node_003_closing" } + ] + }, + { + "node_name": "node_003_closing", + "is_start_node": false, + "scripts": [ + { "speaker_name": "존 롤스", "speaker_side": "A", "message": "한 가지 묻겠습니다. 당신이 만약 그 가방의 구매자였다면..." }, + { "speaker_name": "프리드리히 니체", "speaker_side": "B", "message": "질문이 틀렸소. 명품을 사는 자들은 이미 그 게임의 규칙을 압니다..." }, + { "speaker_name": "나레이션", "speaker_side": "NONE", "message": "이제 당신의 최종 선택을 들려주세요." } + ], + "interactive_options": [] + } + ] +} +``` + +#### 성공 응답 `201 Created` + +```json +{ + "statusCode": 201, + "data": { + "scenario_id": "scenario_001", + "battle_id": "battle_001", + "is_interactive": true, + "status": "DRAFT", + "creator_type": "ADMIN", + "nodes": [ + { + "node_id": "node_001_opening", + "node_name": "node_001_opening", + "is_start_node": true, + "audio_url": "https://cdn.pique.app/audio/battle_001_round1.mp3", + "audio_duration": 150, + "interactive_options": [ + { "label": "사회적 신뢰를 위해 정보의 투명성이 우선이다.", "next_node_id": "node_002_branch_a" }, + { "label": "시장은 개인의 욕망이 만나는 곳이다.", "next_node_id": "node_002_branch_b" } + ] + }, + { + "node_id": "node_002_branch_a", + "node_name": "node_002_branch_a", + "is_start_node": false, + "audio_url": "https://cdn.pique.app/audio/battle_001_round2_a.mp3", + "audio_duration": 110, + "interactive_options": [ + { "label": "최종 충돌 및 정리 듣기", "next_node_id": "node_003_closing" } + ] + }, + { + "node_id": "node_002_branch_b", + "node_name": "node_002_branch_b", + "is_start_node": false, + "audio_url": "https://cdn.pique.app/audio/battle_001_round2_b.mp3", + "audio_duration": 120, + "interactive_options": [ + { "label": "최종 충돌 및 정리 듣기", "next_node_id": "node_003_closing" } + ] + }, + { + "node_id": "node_003_closing", + "node_name": "node_003_closing", + "is_start_node": false, + "audio_url": "https://cdn.pique.app/audio/battle_001_round3_closing.mp3", + "audio_duration": 90, + "interactive_options": [] + } + ], + "created_at": "2026-03-10T09:00:00Z" + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/admin/scenarios/{scenario_id}` + +- 시나리오 정보를 수정합니다. 변경할 필드만 포함합니다. + +#### Request Body + +```json +{ + "status": "PUBLISHED" +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "scenario_id": "scenario_001", + "battle_id": "battle_001", + "is_interactive": true, + "status": "PUBLISHED", + "creator_type": "ADMIN", + "updated_at": "2026-03-10T10:00:00Z" + }, + "error": null +} +``` + +--- + +### `DELETE /api/v1/admin/scenarios/{scenario_id}` + +- 시나리오를 삭제합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true, + "deleted_at": "2026-03-10T11:00:00Z" + }, + "error": null +} +``` + +--- + +## `[후순위]` 관리자 AI 검수 API + +- 스케줄러가 자동 생성한 AI 시나리오 초안(`PENDING`)을 관리자가 검수 · 승인 · 반려합니다. + +### `GET /api/v1/admin/ai/scenarios` + +- AI가 생성한 `PENDING` 상태의 시나리오 목록을 조회합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "scenario_id": "scenario_ai_001", + "battle_id": "battle_ai_001", + "is_interactive": true, + "status": "PENDING", + "creator_type": "AI", + "nodes": [ + { + "node_id": "node_ai_001_opening", + "node_name": "node_ai_001_opening", + "is_start_node": true, + "audio_url": "https://cdn.pique.app/audio/battle_ai_001_round1.mp3", + "audio_duration": 140, + "interactive_options": [ + { "label": "AI 생성 선택지 A", "next_node_id": "node_ai_002_branch_a" }, + { "label": "AI 생성 선택지 B", "next_node_id": "node_ai_002_branch_b" } + ] + } + ], + "created_at": "2026-03-11T06:00:00Z" + } + ], + "total_count": 2 + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/admin/ai/scenarios/{scenario_id}` + +- AI가 생성한 시나리오를 승인하거나 반려합니다. 승인 시 내용을 수정한 뒤 승인할 수 있습니다. + +#### Request Body — 승인 + +```json +{ + "action": "APPROVE", + "nodes": [ + { + "node_id": "node_ai_001_opening", + "scripts": [ + { "speaker_name": "나레이션", "speaker_side": "NONE", "message": "수정된 나레이션 내용..." } + ], + "interactive_options": [ + { "label": "수정된 선택지 A", "next_node_id": "node_ai_002_branch_a" }, + { "label": "수정된 선택지 B", "next_node_id": "node_ai_002_branch_b" } + ] + } + ] +} +``` + +#### Request Body — 반려 + +```json +{ + "action": "REJECT", + "reject_reason": "시나리오 흐름이 부자연스러움" +} +``` + +#### 성공 응답 `200 OK` — 승인 + +```json +{ + "statusCode": 200, + "data": { + "scenario_id": "scenario_ai_001", + "battle_id": "battle_ai_001", + "status": "PUBLISHED", + "creator_type": "AI", + "updated_at": "2026-03-11T09:00:00Z" + }, + "error": null +} +``` + +#### 성공 응답 `200 OK` — 반려 + +```json +{ + "statusCode": 200, + "data": { + "scenario_id": "scenario_ai_001", + "status": "REJECTED", + "reject_reason": "시나리오 흐름이 부자연스러움", + "updated_at": "2026-03-11T09:00:00Z" + }, + "error": null +} +``` + +--- + +## `[후순위]` 크리에이터 API + +### `POST /api/v1/scenarios` + +- 시나리오를 제안합니다. (매너 온도 45도 이상 유저) + +#### Request Body + +```json +{ + "battle_id": "battle_002", + "is_interactive": false, + "nodes": [ + { + "node_name": "node_001_full", + "is_start_node": true, + "scripts": [ + { "speaker_name": "나레이션", "speaker_side": "NONE", "message": "AI가 그린 그림 한 장이 경매에서 1억 원에 낙찰됐습니다..." }, + { "speaker_name": "존 로크", "speaker_side": "A", "message": "노동을 투입한 자에게 소유권이 있습니다. AI 개발사가 권리를 가져야 합니다." }, + { "speaker_name": "루소", "speaker_side": "B", "message": "AI는 인류의 지식을 학습했습니다. 그 결과물은 모두의 것이어야 합니다." } + ], + "interactive_options": [] + } + ] +} +``` + +#### 성공 응답 `201 Created` + +```json +{ + "statusCode": 201, + "data": { + "scenario_id": "scenario_002", + "battle_id": "battle_002", + "is_interactive": false, + "status": "PENDING", + "creator_type": "USER", + "created_at": "2026-03-10T12:00:00Z" + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/scenarios/{scenario_id}` + +제안한 시나리오를 수정합니다. 변경할 필드만 포함합니다. + +#### Request Body + +```json +{ + "nodes": [ + { + "node_name": "node_001_full", + "is_start_node": true, + "scripts": [ + { "speaker_name": "나레이션", "speaker_side": "NONE", "message": "AI가 그린 그림 한 장이 경매에서 1억 원에 낙찰됐습니다. (수정)" }, + { "speaker_name": "존 로크", "speaker_side": "A", "message": "노동을 투입한 자에게 소유권이 있습니다." }, + { "speaker_name": "루소", "speaker_side": "B", "message": "AI는 인류의 지식을 학습했습니다." } + ], + "interactive_options": [] + } + ] +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "scenario_id": "scenario_002", + "battle_id": "battle_002", + "is_interactive": false, + "status": "PENDING", + "creator_type": "USER", + "updated_at": "2026-03-10T13:00:00Z" + }, + "error": null +} +``` + +--- + +### `DELETE /api/v1/scenarios/{scenario_id}` + +- 제안한 시나리오를 삭제합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true, + "deleted_at": "2026-03-10T14:00:00Z" + }, + "error": null +} +``` + +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- + +## 시나리오 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `SCENARIO_NOT_FOUND` | `404` | 존재하지 않는 시나리오 | +| `SCENARIO_NODE_NOT_FOUND` | `404` | 존재하지 않는 노드 | +| `SCENARIO_ALREADY_PUBLISHED` | `409` | 이미 발행된 시나리오 | +| `SCENARIO_TTS_FAILED` | `500` | TTS 생성 실패 | + +--- \ No newline at end of file diff --git a/docs/api-specs/tag-api.md b/docs/api-specs/tag-api.md new file mode 100644 index 00000000..e852f17b --- /dev/null +++ b/docs/api-specs/tag-api.md @@ -0,0 +1,188 @@ +# 태그 API 명세서 + +--- + +## 설계 메모 + +- **태그 구조 :** + - 태그는 별도 `TAGS` 테이블로 관리하며, `BATTLE_TAGS` 중간 테이블을 통해 배틀과 N:M 관계를 가집니다. +- **태그 목록 조회 :** + - 관리자가 배틀에 태그를 붙일 때 선택 목록 제공 및 클라이언트 필터 UI 구성에 활용됩니다. +- **태그 기반 배틀 필터링 :** + - `tag_id` 쿼리 파라미터로 특정 태그가 붙은 배틀 목록을 조회합니다. + +--- + +## 사용자 API + +### `GET /api/v1/tags` + +- 전체 태그 목록을 조회합니다. 클라이언트 필터 UI 구성 및 관리자 태그 선택에 활용됩니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { "tag_id": "tag_001", "name": "사회" }, + { "tag_id": "tag_002", "name": "철학" }, + { "tag_id": "tag_003", "name": "롤스" }, + { "tag_id": "tag_004", "name": "니체" }, + { "tag_id": "tag_005", "name": "경제" }, + { "tag_id": "tag_006", "name": "윤리" } + ], + "total_count": 6 + }, + "error": null +} +``` + +--- + +### `GET /api/v1/battles?tag_id={tag_id}` + +- 특정 태그가 붙은 배틀 목록을 조회합니다. + +#### Query Parameters + +| 파라미터 | 타입 | 필수 | 설명 | +|----------|------|:----:|------| +| `tag_id` | string | ✅ | 필터링할 태그 ID | + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "tag": { "tag_id": "tag_002", "name": "철학" }, + "items": [ + { + "battle_id": "battle_001", + "title": "드라마 <레이디 두아>, 원가 18만원 명품은 사기인가?", + "summary": "18만 원짜리 가방을 1억에 판 주인공, 사기꾼일까 예술가일까?", + "thumbnail_url": "https://cdn.pique.app/battle/hot-001.png", + "tags": [ + { "tag_id": "tag_001", "name": "사회" }, + { "tag_id": "tag_002", "name": "철학" } + ], + "participants_count": 2148, + "audio_duration": 420, + "options": [ + { "option_id": "option_A", "label": "A", "title": "사기다 (롤스)" }, + { "option_id": "option_B", "label": "B", "title": "사기가 아니다 (니체)" } + ], + "user_vote_status": "NONE" + } + ], + "total_count": 1 + }, + "error": null +} +``` + +--- + +## 관리자 API + +### `POST /api/v1/admin/tags` + +- 새 태그를 생성합니다. + +#### Request Body + +```json +{ + "name": "정치" +} +``` + +#### 성공 응답 `201 Created` + +```json +{ + "statusCode": 201, + "data": { + "tag_id": "tag_007", + "name": "정치", + "created_at": "2026-03-10T09:00:00Z" + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/admin/tags/{tag_id}` + +- 태그명을 수정합니다. + +#### Request Body + +```json +{ + "name": "사회" +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "tag_id": "tag_007", + "name": "사회", + "updated_at": "2026-03-10T10:00:00Z" + }, + "error": null +} +``` + +--- + +### `DELETE /api/v1/admin/tags/{tag_id}` + +- 태그를 삭제합니다. 연결된 `BATTLE_TAGS` 레코드도 함께 삭제됩니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true, + "deleted_at": "2026-03-10T11:00:00Z" + }, + "error": null +} +``` + +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- + +## 태그 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `TAG_NOT_FOUND` | `404` | 존재하지 않는 태그 | +| `TAG_ALREADY_EXISTS` | `409` | 이미 존재하는 태그명 | +| `TAG_IN_USE` | `409` | 배틀에 사용 중인 태그 (삭제 불가) | +| `TAG_LIMIT_EXCEEDED` | `400` | 배틀당 태그 최대 개수 초과 | + +--- \ No newline at end of file diff --git a/docs/api-specs/vote-api.md b/docs/api-specs/vote-api.md new file mode 100644 index 00000000..cef1e198 --- /dev/null +++ b/docs/api-specs/vote-api.md @@ -0,0 +1,153 @@ +# 투표 API 명세서 + +--- + +## 설계 메모 + +- **사전/사후 투표 단일 레코드 :** + - 사전 투표와 사후 투표는 `VOTES` 테이블의 단일 레코드로 관리됩니다. `status` 필드(`NONE` → `PRE_VOTED` → `POST_VOTED`)로 진행 단계를 추적합니다. +- **투표 수정 :** + - 투표 입장 변경은 `PATCH` 메서드를 사용합니다. `vote_type` 필드로 사전/사후 구분합니다. +- **사후 투표 응답 :** + - 사후 투표 완료 시 `mind_changed` 여부와 전체 통계, 리워드 정보를 함께 반환합니다. + +--- + +## 사용자 API + +### `POST /api/v1/battles/{battle_id}/votes/pre` + +- 시나리오 청취 전 사전 투표를 진행합니다. + +#### Request Body + +```json +{ + "option_id": "option_A" +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "vote_id": "vote_001", + "status": "PRE_VOTED", + "next_step_url": "/battles/battle_001/scenario" + }, + "error": null +} +``` + +--- + +### `POST /api/v1/battles/{battle_id}/votes/post` + +- 시나리오 청취 후 최종 사후 투표를 진행합니다. 완료 시 결과 통계와 리워드를 함께 반환합니다. + +#### Request Body + +```json +{ + "option_id": "option_A" +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "vote_id": "vote_001", + "mind_changed": false, + "status": "POST_VOTED", + "statistics": { + "option_A_ratio": 65, + "option_B_ratio": 35 + }, + "reward": { + "is_majority": true, + "credits_earned": 10 + }, + "updated_at": "2026-03-10T16:35:00Z" + }, + "error": null +} +``` + +--- + +### `PATCH /api/v1/battles/{battle_id}/votes` + +- 기존 투표 입장을 변경합니다. `vote_type`으로 사전/사후 투표를 구분합니다. + +#### Request Body + +```json +{ + "vote_type": "PRE", + "option_id": "option_B" +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "vote_id": "vote_001", + "updated_at": "2026-03-10T16:40:00Z" + }, + "error": null +} +``` + +--- + +### `DELETE /api/v1/battles/{battle_id}/votes` + +- 투표 이력을 취소 및 삭제합니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true, + "deleted_at": "2026-03-10T16:45:00Z" + }, + "error": null +} +``` + +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- + +## 투표 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `VOTE_NOT_FOUND` | `404` | 존재하지 않는 투표 | +| `VOTE_ALREADY_SUBMITTED` | `409` | 이미 투표 완료 | +| `PRE_VOTE_REQUIRED` | `409` | 사전 투표 필요 | +| `POST_VOTE_REQUIRED` | `409` | 사후 투표 필요 | + +--- \ No newline at end of file diff --git a/docs/erd/battle.puml b/docs/erd/battle.puml new file mode 100644 index 00000000..1da3dc37 --- /dev/null +++ b/docs/erd/battle.puml @@ -0,0 +1,89 @@ +@startuml battle +hide circle +hide methods +skinparam linetype ortho + +' ─────────────────────────────── +' 테이블 정의 +' ─────────────────────────────── + +entity "users\n사용자" as users { + * id : BIGINT <> + -- + email : VARCHAR(255) <> + nickname : VARCHAR(50) <> + character_id : INT <> + role : ENUM('USER', 'ADMIN') + status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "BATTLES\n배틀(주제)" as battles { + * id : UUID <> + -- + title : VARCHAR(255) + summary : VARCHAR(500) + description : TEXT + thumbnail_url : VARCHAR(500) + target_date : DATE + status : ENUM('DRAFT', 'PENDING', 'PUBLISHED', 'REJECTED', 'ARCHIVED') + creator_type : ENUM('ADMIN', 'USER', 'AI') + creator_id : BIGINT <> (nullable) + reject_reason : VARCHAR(500) (nullable) + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "BATTLE_OPTIONS\n선택지" as battle_options { + * id : UUID <> + -- + battle_id : UUID <> + label : ENUM('A', 'B') + title : VARCHAR(100) + stance : VARCHAR(255) + representative : VARCHAR(100) + quote : TEXT + keywords : JSONB + image_url : VARCHAR(500) +} + +' ─────────────────────────────── +' 배치 가이드 (위→아래) +' ─────────────────────────────── + +users -[hidden]down- battles +battles -[hidden]down- battle_options + +' ─────────────────────────────── +' 관계 +' ─────────────────────────────── + +users ||--o{ battles : "creates" +battles ||--o{ battle_options : "has" + +' ─────────────────────────────── +' 노트 +' ─────────────────────────────── + +note right of battles + status 흐름: + + [관리자 직접 발행] + DRAFT → PUBLISHED → ARCHIVED + + [AI 자동 생성 · 스케줄러 - 후순위] + PENDING → PUBLISHED → ARCHIVED + → REJECTED + + [유저 크리에이터 - 후순위] + PENDING → PUBLISHED → ARCHIVED + → REJECTED + + creator_type + ADMIN : 관리자 직접 발행 → creator_id = null + AI : [후순위] 스케줄러 자동 생성 → creator_id = null + USER : [후순위] 유저 제안 → creator_id = users.id +end note + +@enduml diff --git a/docs/erd/scenario.puml b/docs/erd/scenario.puml new file mode 100644 index 00000000..be674e64 --- /dev/null +++ b/docs/erd/scenario.puml @@ -0,0 +1,127 @@ +@startuml scenario +hide circle +hide methods +skinparam linetype ortho + +' ─────────────────────────────── +' 테이블 정의 +' ─────────────────────────────── + +entity "users\n사용자" as users { + * id : BIGINT <> + -- + email : VARCHAR(255) <> + nickname : VARCHAR(50) <> + character_id : INT <> + role : ENUM('USER', 'ADMIN') + status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "BATTLES\n배틀(주제)" as battles { + * id : UUID <> + -- + title : VARCHAR(255) + summary : VARCHAR(500) + description : TEXT + thumbnail_url : VARCHAR(500) + target_date : DATE + status : ENUM('DRAFT', 'PENDING', 'PUBLISHED', 'REJECTED', 'ARCHIVED') + creator_type : ENUM('ADMIN', 'USER', 'AI') + creator_id : BIGINT <> (nullable) + reject_reason : TEXT (nullable) + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + + +entity "SCENARIOS\n시나리오 마스터" as scenarios { + * id : UUID <> + -- + battle_id : UUID <> + creator_type : ENUM('ADMIN', 'USER', 'AI') + creator_id : BIGINT <> (nullable) + is_interactive : BOOLEAN + status : ENUM('DRAFT', 'PENDING', 'PUBLISHED', 'REJECTED', 'ARCHIVED') + reject_reason : VARCHAR(500) (nullable) + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "SCENARIO_NODES\n시나리오 노드 (오디오/분기 통합)" as scenario_nodes { + * id : UUID <> + -- + scenario_id : UUID <> + node_name : VARCHAR(100) + audio_url : VARCHAR(500) + audio_duration : INT + is_start_node : BOOLEAN + interactive_options : JSONB +} + +entity "SCENARIO_SCRIPTS\n대본(말풍선)" as scenario_scripts { + * id : UUID <> + -- + node_id : UUID <> + start_time : INT + speaker_name : VARCHAR(100) + speaker_side : ENUM('A', 'B', 'NONE') + message : TEXT +} + +' ─────────────────────────────── +' 배치 가이드 (위→아래) +' ─────────────────────────────── + +users -[hidden]down- battles +battles -[hidden]down- scenarios +scenarios -[hidden]down- scenario_nodes +scenario_nodes -[hidden]down- scenario_scripts + +' ─────────────────────────────── +' 관계 +' ─────────────────────────────── + +users ||--o{ scenarios : "creates" +battles ||--|| scenarios : "has" +scenarios ||--o{ scenario_nodes : "contains" +scenario_nodes ||--o{ scenario_scripts : "contains" + +' ─────────────────────────────── +' 노트 +' ─────────────────────────────── + +note right of scenarios + status 흐름: + + [관리자 직접 발행] + DRAFT → PUBLISHED → ARCHIVED + + [AI 자동 생성 · 스케줄러 - 후순위] + PENDING → PUBLISHED → ARCHIVED + → REJECTED + + [유저 크리에이터 - 후순위] + PENDING → PUBLISHED → ARCHIVED + → REJECTED + + is_interactive = false : + 노드 1개, interactive_options = [] + + is_interactive = true : + 오프닝 → 분기(A/B) → 클로징 + interactive_options = [ + { label, next_node_id } + ] + + PUBLISHED 전환 시 + TTS 생성 + CDN 업로드 자동 연동 + + creator_type + ADMIN : 관리자 직접 발행 → creator_id = null + AI : [후순위] 스케줄러 자동 생성 → creator_id = null + USER : [후순위] 유저 제안 → creator_id = users.id +end note + +@enduml diff --git a/docs/erd/tag.puml b/docs/erd/tag.puml new file mode 100644 index 00000000..bc57d86e --- /dev/null +++ b/docs/erd/tag.puml @@ -0,0 +1,61 @@ +@startuml tag +hide circle +hide methods +skinparam linetype ortho + +' ─────────────────────────────── +' 테이블 정의 +' ─────────────────────────────── + +entity "BATTLES\n배틀(주제)" as battles { + * id : UUID <> + -- + title : VARCHAR(255) + summary : VARCHAR(500) + description : TEXT + thumbnail_url : VARCHAR(500) + target_date : DATE + status : ENUM('DRAFT', 'PENDING', 'PUBLISHED', 'REJECTED', 'ARCHIVED') + creator_type : ENUM('ADMIN', 'USER', 'AI') + creator_id : BIGINT <> (nullable) + reject_reason : VARCHAR(500) (nullable) + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "TAGS\n태그" as tags { + * id : UUID <> + -- + name : VARCHAR(50) <> + created_at : TIMESTAMP +} + +entity "BATTLE_TAGS\n배틀-태그 매핑" as battle_tags { + * battle_id : UUID <> + * tag_id : UUID <> +} + +' ─────────────────────────────── +' 배치 가이드 (좌→우→아래) +' ─────────────────────────────── + +battles -[hidden]right- tags +tags -[hidden]down- battle_tags + +' ─────────────────────────────── +' 관계 +' ─────────────────────────────── + +battles ||--o{ battle_tags : "tagged with" +tags ||--o{ battle_tags : "used in" + +' ─────────────────────────────── +' 노트 +' ─────────────────────────────── + +note bottom of battle_tags + 복합 PK: (battle_id, tag_id) + 배틀과 태그의 N:M 관계를 처리하는 중간 테이블 +end note + +@enduml diff --git a/docs/erd/vote.puml b/docs/erd/vote.puml new file mode 100644 index 00000000..44defaab --- /dev/null +++ b/docs/erd/vote.puml @@ -0,0 +1,101 @@ +@startuml vote +hide circle +hide methods +skinparam linetype ortho + +' ─────────────────────────────── +' 테이블 정의 +' ─────────────────────────────── + +entity "users\n사용자" as users { + * id : BIGINT <> + -- + email : VARCHAR(255) <> + nickname : VARCHAR(50) <> + character_id : INT <> + role : ENUM('USER', 'ADMIN') + status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "BATTLES\n배틀(주제)" as battles { + * id : UUID <> + -- + title : VARCHAR(255) + summary : VARCHAR(500) + description : TEXT + thumbnail_url : VARCHAR(500) + target_date : DATE + status : ENUM('DRAFT', 'PENDING', 'PUBLISHED', 'REJECTED', 'ARCHIVED') + creator_type : ENUM('ADMIN', 'USER', 'AI') + creator_id : BIGINT <> (nullable) + reject_reason : VARCHAR(500) (nullable) + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "BATTLE_OPTIONS\n선택지" as battle_options { + * id : UUID <> + -- + battle_id : UUID <> + label : ENUM('A', 'B') + title : VARCHAR(100) + stance : VARCHAR(255) + representative : VARCHAR(100) + quote : TEXT + image_url : VARCHAR(500) +} + +entity "VOTES\n투표 이력" as votes { + * id : UUID <> + -- + user_id : BIGINT <> + battle_id : UUID <> + pre_vote_option_id : UUID <> (nullable) + post_vote_option_id : UUID <> (nullable) + mind_changed : BOOLEAN + reward_credits : INT + status : ENUM('NONE', 'PRE_VOTED', 'POST_VOTED') + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +' ─────────────────────────────── +' 배치 가이드 +' users battles +' \ | +' votes battle_options +' ─────────────────────────────── + +users -[hidden]right- battles +battles -[hidden]down- battle_options +users -[hidden]down- votes +votes -[hidden]right- battle_options + +' ─────────────────────────────── +' 관계 +' ─────────────────────────────── + +users ||--o{ votes : "votes" +battles ||--o{ battle_options : "has" +battles ||--o{ votes : "receives" +votes }o--|| battle_options : "pre_vote" +votes }o--|| battle_options : "post_vote" + +' ─────────────────────────────── +' 노트 +' ─────────────────────────────── + +note right of votes + status 흐름: + NONE → PRE_VOTED → POST_VOTED + + pre_vote_option_id : 사전 투표 선택지 (nullable) + post_vote_option_id : 사후 투표 선택지 (nullable) + + mind_changed: + pre_vote_option_id ≠ post_vote_option_id 이면 true +end note + +@enduml From 6e83da85b795f5552ec4e5a97a9ec0cc577f4520 Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Thu, 12 Mar 2026 01:53:09 +0900 Subject: [PATCH 04/94] =?UTF-8?q?#8=20[Docs]=20user/oauth=20ERD=20?= =?UTF-8?q?=EB=B0=8F=20API=20=EB=AA=85=EC=84=B8=20=EC=A0=95=EB=A6=AC=20(#9?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - user / oauth2 ERD 경계 및 필드 구조 재정리 - user 운영성 상세 ERD 분리 - user API 명세를 기준으로 oauth API 명세 통일 - 공개 식별자 `user_tag`, 프로필 필드, 토큰 사용 흐름 반영 - 문서 간 상충되던 user / oauth 명세 정합성 수정 --- docs/api-specs/oauth-api.md | 302 +++++++++++++++++------------------- docs/api-specs/user-api.md | 66 ++++++-- docs/erd/oauth2.puml | 77 ++++----- docs/erd/user-ops.puml | 63 ++++++++ docs/erd/user.puml | 92 +++++------ 5 files changed, 328 insertions(+), 272 deletions(-) create mode 100644 docs/erd/user-ops.puml diff --git a/docs/api-specs/oauth-api.md b/docs/api-specs/oauth-api.md index 61178893..d9472261 100644 --- a/docs/api-specs/oauth-api.md +++ b/docs/api-specs/oauth-api.md @@ -1,214 +1,202 @@ -# 🔐 PIQUE 사용자 인증 및 온보딩 API 통합 명세서 +# OAuth API 명세서 ## 1. 설계 메모 -* **인증 방식**: OAuth 2.0 인가 코드 방식을 사용하며, 서비스 자체 JWT(Access/Refresh)를 발급합니다. -* **온보딩 흐름**: 로그인 응답의 `isNewUser`가 `true`일 경우, `bootstrap` 데이터를 조회한 뒤 `profile` 생성 API를 호출합니다. -* **상태 전환**: 프로필 생성이 완료되면 유저 상태(`status`)는 `PENDING`에서 `ACTIVE`로 변경됩니다. -* **재화 관리**: 유저 지갑(`userWallet`)은 별도 테이블로 관리하며 프로필 설정 완료 시 함께 조회됩니다. -* **응답 규격**: 모든 응답은 `statusCode`, `data`, `error` 필드를 포함하는 공통 포맷을 준수합니다. + +- OAuth API는 `snake_case` 필드명을 기준으로 합니다. +- 소셜 로그인은 OAuth 2.0 인가 코드 방식을 사용합니다. +- 로그인 성공 시 서비스 자체 `access_token`, `refresh_token`을 발급합니다. +- 사용자 프로필 생성 및 온보딩 상세 명세는 `user-api.md`를 기준으로 합니다. +- 외부 응답에서는 내부 PK인 `user_id`를 노출하지 않고 `user_tag`를 사용합니다. + +### 1.1 공통 요청 헤더 + +- `Content-Type: application/json` + - JSON 요청 바디가 있는 API에 사용합니다. +- `Authorization: Bearer {access_token}` + - 로그인 이후 인증이 필요한 API에 사용합니다. +- `X-Refresh-Token: {refresh_token}` + - Access Token 재발급 API에 사용합니다. + +### 1.2 토큰 사용 방식 + +로그인 성공 후 클라이언트는 `access_token`, `refresh_token`을 발급받습니다. + +- `access_token` + - 이후 인증이 필요한 API 호출 시 `Authorization: Bearer {access_token}` 헤더로 전달합니다. + - 예: `GET /api/v1/me/profile`, `PATCH /api/v1/me/settings`, `DELETE /api/v1/me` +- `refresh_token` + - API가 `401`과 `auth_access_token_expired`를 반환했을 때 `POST /api/v1/auth/refresh` 에서 사용합니다. + - `X-Refresh-Token: {refresh_token}` 헤더로 전달합니다. +- Access Token 만료 안내 + - 인증이 필요한 API는 Access Token이 만료되면 `401 Unauthorized`를 반환합니다. + - 에러 코드가 `auth_access_token_expired` 이면 클라이언트는 Refresh API를 호출해야 합니다. + - Refresh 성공 후 실패했던 요청을 새 `access_token`으로 1회 재시도합니다. +- Refresh Token 만료 안내 + - Refresh API가 `401`과 `auth_refresh_token_expired`를 반환하면 재로그인이 필요합니다. +- 재발급 성공 시 + - 새 `access_token`, 새 `refresh_token`으로 교체합니다. + - 이후 요청에는 기존 토큰 대신 새 토큰을 사용합니다. +- 로그아웃 시 + - `POST /api/v1/auth/logout` 호출 후 클라이언트에 저장된 토큰을 삭제합니다. +- 회원 탈퇴 시 + - `DELETE /api/v1/me` 호출 후 클라이언트에 저장된 토큰을 삭제합니다. + +신규 사용자 흐름: + +1. `POST /api/v1/auth/login/{provider}` 호출 +2. 응답에서 `is_new_user = true` 확인 +3. 발급받은 `access_token`으로 온보딩 API 호출 +4. `POST /api/v1/onboarding/profile` 완료 후 일반 사용자 API 사용 + +기존 사용자 흐름: + +1. `POST /api/v1/auth/login/{provider}` 호출 +2. 응답에서 `is_new_user = false` 확인 +3. 발급받은 `access_token`으로 바로 사용자 API 호출 --- -## 2. API 상세 내역 +## 2. 인증 API -### 2.1 소셜 로그인 및 회원가입 -* **Endpoint**: `POST /api/v1/auth/login/{provider}` -* **설명**: 소셜 인가 코드를 이용해 로그인 및 계정을 생성합니다. 상태가 `BANNED`인 유저는 403을 반환합니다. -* **요청 바디**: -```json -{ - "authorizationCode": "string", - "redirectUri": "string" -} -``` -* **성공 응답**: -```json -{ - "statusCode": 200, - "data": { - "accessToken": "eyJhbGciOiJIUzI...", - "refreshToken": "def456-ghi789...", - "userId": 105, - "isNewUser": true, - "status": "PENDING" - }, - "error": null -} -``` +### 2.1 `POST /api/v1/auth/login/{provider}` -### 2.2 온보딩 초기 데이터 조회 -* **Endpoint**: `GET /api/v1/onboarding/bootstrap` -* **설명**: 첫 로그인 화면 진입 시 필요한 랜덤 닉네임과 캐릭터 옵션을 조회합니다. -* **성공 응답**: -```json -{ - "statusCode": 200, - "data": { - "randomNickname": "생각하는올빼미", - "characterOptions": [ - { "id": 1, "name": "올빼미", "imageUrl": "https://..." }, - { "id": 2, "name": "여우", "imageUrl": "https://..." } - ] - }, - "error": null -} -``` +소셜 인가 코드를 이용해 로그인 및 계정을 생성합니다. + +- `{provider}`: `kakao`, `google` +- 상태가 `BANNED`인 사용자는 `403`을 반환합니다. +- 신규 사용자는 `status = PENDING`, `is_new_user = true` 상태로 응답합니다. + +요청: -### 2.3 초기 프로필 설정 (가입 완료) -* **Endpoint**: `POST /api/v1/onboarding/profile` -* **설명**: 신규 유저의 닉네임과 캐릭터를 설정하여 정식 회원으로 전환합니다. -* **요청 바디**: ```json { - "nickname": "생각하는올빼미", - "characterId": 1 + "authorization_code": "string", + "redirect_uri": "string" } ``` -* **성공 응답**: + +요청 헤더: + +- `Content-Type: application/json` + +응답: + ```json { - "statusCode": 200, - "data": { - "userId": 105, - "nickname": "생각하는올빼미", - "characterId": 1, - "userWallet": { - "credit": 500, - "updatedAt": "2026-03-08T12:00:00Z" - }, - "status": "ACTIVE", - "onboardingCompleted": true - }, - "error": null + "access_token": "eyJhbGciOiJIUzI...", + "refresh_token": "def456-ghi789...", + "user_tag": "sfit4-2", + "is_new_user": true, + "status": "PENDING" } ``` -### 2.4 토큰 재발급 -* **Endpoint**: `POST /api/v1/auth/refresh` -* **설명**: 만료된 Access Token을 Refresh Token을 사용하여 재발급합니다. -* **요청 헤더**: `X-Refresh-Token: {refreshToken}` -* **성공 응답**: +### 2.2 `POST /api/v1/auth/refresh` + +만료된 Access Token을 Refresh Token으로 재발급합니다. + +요청 헤더: + +- `Content-Type: application/json` +- `X-Refresh-Token: {refresh_token}` + +응답: + ```json { - "statusCode": 200, - "data": { - "accessToken": "new_eyJhbGciOiJIUzI...", - "refreshToken": "new_def456-ghi789..." - }, - "error": null + "access_token": "new_eyJhbGciOiJIUzI...", + "refresh_token": "new_def456-ghi789..." } ``` -### 2.5 로그아웃 -* **Endpoint**: `POST /api/v1/auth/logout` -* **설명**: 현재 로그인된 사용자의 Refresh Token을 삭제하여 로그아웃 처리합니다. -* **요청 헤더**: `Authorization: Bearer {accessToken}` -* **성공 응답**: +### 2.3 `POST /api/v1/auth/logout` + +현재 로그인된 사용자의 Refresh Token을 삭제하여 로그아웃 처리합니다. + +요청 헤더: + +- `Content-Type: application/json` +- `Authorization: Bearer {access_token}` + +응답: + ```json { - "statusCode": 200, - "data": { - "loggedOut": true - }, - "error": null + "logged_out": true } ``` -### 2.6 회원 탈퇴 -* **Endpoint**: `DELETE /api/v1/me` -* **설명**: 현재 로그인된 사용자의 계정을 삭제합니다. `users`, `user_socials`, `refresh_tokens`, `user_wallets`, `credit_histories` 연관 데이터를 함께 처리합니다. -* **요청 헤더**: `Authorization: Bearer {accessToken}` -* **성공 응답**: +### 2.4 `DELETE /api/v1/me` + +현재 로그인된 사용자의 계정을 탈퇴 처리합니다. + +- `users`, `user_social_accounts`, `auth_refresh_tokens` 연관 데이터를 함께 처리합니다. +- 사용자 도메인 상세 정리는 `user` 정책에 따라 함께 처리합니다. + +요청 헤더: + +- `Authorization: Bearer {access_token}` + +응답: + ```json { - "statusCode": 200, - "data": { - "withdrawn": true - }, - "error": null + "withdrawn": true } ``` --- -## 3. 예외 응답 (공통) +## 3. 인증 예외 응답 -### 3.1 요청 파라미터 오류 (400) -```json -{ - "statusCode": 400, - "data": null, - "error": { - "code": "COMMON_INVALID_PARAMETER", - "message": "요청 파라미터가 잘못되었습니다.", - "errors": [ - { - "field": "nickname", - "value": "홍길동!", - "reason": "특수문자는 포함할 수 없습니다." - } - ] - } -} -``` +### 3.1 잘못된 요청 (400) -### 3.2 인증 오류 (401) ```json { - "statusCode": 401, - "data": null, - "error": { - "code": "AUTH_INVALID_CODE", - "message": "유효하지 않은 소셜 인가 코드입니다.", - "errors": [] - } + "code": "common_invalid_parameter", + "message": "요청 파라미터가 잘못되었습니다.", + "errors": [ + { + "field": "redirect_uri", + "value": "", + "reason": "redirect_uri 는 필수입니다." + } + ] } ``` + +### 3.2 인증 실패 (401) + ```json { - "statusCode": 401, - "data": null, - "error": { - "code": "AUTH_TOKEN_EXPIRED", - "message": "만료되었거나 유효하지 않은 Refresh Token입니다.", - "errors": [] - } + "code": "auth_invalid_code", + "message": "유효하지 않은 소셜 인가 코드입니다.", + "errors": [] } ``` -### 3.3 중복 오류 (409) ```json { - "statusCode": 409, - "data": null, - "error": { - "code": "USER_NICKNAME_DUPLICATE", - "message": "이미 사용 중인 닉네임입니다.", - "errors": [] - } + "code": "auth_access_token_expired", + "message": "Access Token이 만료되었습니다. Refresh Token으로 재발급이 필요합니다.", + "errors": [] } ``` + ```json { - "statusCode": 409, - "data": null, - "error": { - "code": "ONBOARDING_ALREADY_COMPLETED", - "message": "이미 온보딩이 완료된 사용자입니다.", - "errors": [] - } + "code": "auth_refresh_token_expired", + "message": "Refresh Token이 만료되었거나 유효하지 않습니다. 다시 로그인이 필요합니다.", + "errors": [] } ``` -### 3.4 접근 거부 오류 (403) +### 3.3 접근 거부 (403) + ```json { - "statusCode": 403, - "data": null, - "error": { - "code": "USER_BANNED", - "message": "제재된 사용자입니다.", - "errors": [] - } + "code": "user_banned", + "message": "제재된 사용자입니다.", + "errors": [] } -``` \ No newline at end of file +``` diff --git a/docs/api-specs/user-api.md b/docs/api-specs/user-api.md index b22e74d5..be8d36f0 100644 --- a/docs/api-specs/user-api.md +++ b/docs/api-specs/user-api.md @@ -2,37 +2,42 @@ ## 1. 설계 메모 -- 첫 로그인 시 닉네임 랜덤 생성과 이모지 선택이 필요합니다. +- 사용자 API는 `snake_case` 필드명을 기준으로 합니다. +- 외부 응답에서는 내부 PK인 `user_id`를 노출하지 않고 `user_tag`를 사용합니다. +- `nickname`은 중복 허용 프로필명입니다. +- `user_tag`는 고유한 공개 식별자이며 저장 시 `@` 없이 관리합니다. +- 프로필 아바타는 자유 입력 이모지가 아니라 `character_type` 선택 방식으로 관리합니다. +- `character_type`은 소문자 `snake_case` 문자열 값으로 관리합니다. - 프로필, 설정, 성향 점수는 모두 사용자 도메인 책임입니다. - 성향 점수는 현재값을 갱신하면서 이력도 함께 적재합니다. --- -## 2. 첫 로그인 API +## 2. 첫 로그인 / 온보딩 API ### 2.1 `GET /api/v1/onboarding/bootstrap` 첫 로그인 화면 진입 시 필요한 초기 데이터 조회. +이모지는 8개 뿐이라 앱에서 관리하는 버전입니다. 응답: ```json { - "random_nickname": "생각하는올빼미", - "emoji_options": ["🦊", "🦉", "🐱", "🐻", "🐰", "🦁", "🐸", "🐧"] + "random_nickname": "생각하는올빼미" } ``` ### 2.2 `POST /api/v1/onboarding/profile` 첫 로그인 시 프로필 생성. - +owl, wolf, lion 등은 추후 디자인에 따라 정의 요청: ```json { "nickname": "생각하는올빼미", - "avatar_emoji": "🦉" + "character_type": "owl" } ``` @@ -40,10 +45,11 @@ ```json { - "user_id": "user_001", + "user_tag": "sfit4-2", "nickname": "생각하는올빼미", - "avatar_emoji": "🦉", + "character_type": "owl", "manner_temperature": 36.5, + "status": "ACTIVE", "onboarding_completed": true } ``` @@ -52,16 +58,47 @@ ## 3. 프로필 API -### 3.1 `PATCH /api/v1/me/profile` +### 3.1 `GET /api/v1/users/{user_tag}` + +공개 사용자 프로필 조회. + +응답: + +```json +{ + "user_tag": "sfit4-2", + "nickname": "생각하는올빼미", + "character_type": "owl", + "manner_temperature": 36.5 +} +``` + +### 3.2 `GET /api/v1/me/profile` + +내 프로필 조회. + +응답: + +```json +{ + "user_tag": "sfit4-2", + "nickname": "생각하는올빼미", + "character_type": "owl", + "manner_temperature": 36.5, + "updated_at": "2026-03-08T12:00:00Z" +} +``` + +### 3.3 `PATCH /api/v1/me/profile` -닉네임 및 아바타 수정. +닉네임 및 캐릭터 수정. 요청: ```json { "nickname": "생각하는펭귄", - "avatar_emoji": "🐧" + "character_type": "penguin" } ``` @@ -69,9 +106,9 @@ ```json { - "user_id": "user_001", + "user_tag": "sfit4-2", "nickname": "생각하는펭귄", - "avatar_emoji": "🐧", + "character_type": "penguin", "updated_at": "2026-03-08T12:00:00Z" } ``` @@ -123,6 +160,7 @@ ### 5.1 `PUT /api/v1/me/tendency-scores` 최신 성향 점수 수정 및 이력 저장. +!!! 기획 확정에 따라 필드명 및 규칙 변경될 예정 요청: @@ -141,7 +179,7 @@ ```json { - "user_id": "user_001", + "user_tag": "sfit4-2", "score_1": 30, "score_2": -20, "score_3": 55, diff --git a/docs/erd/oauth2.puml b/docs/erd/oauth2.puml index bd04b802..1213f848 100644 --- a/docs/erd/oauth2.puml +++ b/docs/erd/oauth2.puml @@ -2,77 +2,54 @@ !theme plain skinparam Linetype ortho -' 1. 사용자 기본 테이블 +' 1. 서비스 사용자 참조 entity "users" { * id : BIGINT <> -- - email : VARCHAR(255) <> - nickname : VARCHAR(50) <> - character_id : INT <> - role : ENUM('USER', 'ADMIN') + user_tag : VARCHAR(30) <> status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') created_at : TIMESTAMP updated_at : TIMESTAMP } ' 2. OAuth 연동 정보 테이블 -' [논의 필요] access_token, refresh_token 암호화 저장 여부 검토 필요 -entity "user_socials" { +' 소셜 공급자 식별자는 users 와 분리한다. +entity "user_social_accounts" { * id : BIGINT <> -- user_id : BIGINT <> provider : ENUM('KAKAO', 'GOOGLE', 'APPLE') provider_user_id : VARCHAR(255) - access_token : TEXT - refresh_token : TEXT + provider_email : VARCHAR(255) (nullable) + linked_at : TIMESTAMP + last_login_at : TIMESTAMP } -' 3. 선택 가능한 캐릭터 정보 테이블 -entity "characters" { - * id : INT <> - -- - name : VARCHAR(50) - image_url : VARCHAR(255) - description : VARCHAR(255) -} - -' 4. 서비스 자체 인증 토큰 관리 -' [논의 필요] 현재는 재발급 시 기존 토큰 삭제 방식 사용 -' 토큰 탈취 감지가 필요하다면 is_revoked : BOOLEAN DEFAULT false 추가 검토 -entity "refresh_tokens" { +' 3. 서비스 자체 세션(Refresh Token) 관리 +' raw token 대신 token_hash 저장을 기본 전제로 둔다. +entity "auth_refresh_tokens" { * id : BIGINT <> -- user_id : BIGINT <> - token_value : TEXT - expired_at : TIMESTAMP - ' is_revoked : BOOLEAN DEFAULT false -} - -' 5. 지갑 테이블 -entity "user_wallets" { - * id : BIGINT <> - -- - user_id : BIGINT <> - credit : INT DEFAULT 0 - updated_at : TIMESTAMP -} - -' 6. 크레딧 변동 이력 테이블 -entity "credit_histories" { - * id : BIGINT <> - -- - user_id : BIGINT <> - amount : INT -- 변동된 크레딧 양 - type : ENUM('CHARGE', 'USE', 'EVENT', 'REFUND') - description : VARCHAR(255) + token_hash : VARCHAR(255) + expires_at : TIMESTAMP + revoked_at : TIMESTAMP (nullable) + last_used_at : TIMESTAMP created_at : TIMESTAMP } ' 관계 설정 -users }|--|| characters : "선택한 캐릭터" -users ||--o{ user_socials : "소셜 연동" -users ||--o{ refresh_tokens : "인증 관리" -users ||--|| user_wallets : "보유 크레딧" -users ||--o{ credit_histories : "이력 기록" +users ||--o{ user_social_accounts : "소셜 연동" +users ||--o{ auth_refresh_tokens : "서비스 세션" + +note right of user_social_accounts + UNIQUE(provider, provider_user_id) + 한 유저는 여러 소셜 계정을 연결할 수 있다. +end note + +note right of auth_refresh_tokens + 로그아웃, 재발급, 다중 디바이스 세션 관리를 위해 + 서비스 refresh token 을 별도 테이블에서 관리한다. +end note -@enduml \ No newline at end of file +@enduml diff --git a/docs/erd/user-ops.puml b/docs/erd/user-ops.puml new file mode 100644 index 00000000..dcfc4054 --- /dev/null +++ b/docs/erd/user-ops.puml @@ -0,0 +1,63 @@ +@startuml +hide circle +hide methods +skinparam linetype ortho + +entity "USERS\n서비스 사용자" as users { + * id : BIGINT <> + -- + user_tag : VARCHAR(30) <> + status : ENUM('PENDING', 'ACTIVE', 'DELETED') + created_at : timestamp + updated_at : timestamp +} + +entity "USER_SETTINGS\n사용자 설정" as user_settings { + * user_id : BIGINT <> + -- + push_enabled : boolean + email_enabled : boolean + debate_request_enabled : boolean + profile_public : boolean + updated_at : timestamp +} + +entity "USER_AGREEMENTS\n사용자 동의 이력" as user_agreements { + * id : BIGINT <> + -- + user_id : BIGINT <> + agreement_type : string + version : string + agreed_at : timestamp +} + +entity "USER_DEVICES\n사용자 디바이스" as user_devices { + * id : BIGINT <> + -- + user_id : BIGINT <> + device_token : string + platform : string + last_seen_at : timestamp + created_at : timestamp +} + +entity "USER_BLOCKS\n사용자 차단" as user_blocks { + * id : BIGINT <> + -- + blocker_user_id : BIGINT <> + blocked_user_id : BIGINT <> + created_at : timestamp +} + +users -[hidden]down- user_settings +user_settings -[hidden]down- user_agreements +user_agreements -[hidden]down- user_devices +user_devices -[hidden]down- user_blocks + +users ||--|| user_settings +users ||--o{ user_agreements +users ||--o{ user_devices +users ||--o{ user_blocks : blocker +users ||--o{ user_blocks : blocked + +@enduml diff --git a/docs/erd/user.puml b/docs/erd/user.puml index 5007a966..e34d53a5 100644 --- a/docs/erd/user.puml +++ b/docs/erd/user.puml @@ -3,79 +3,69 @@ hide circle hide methods skinparam linetype ortho -entity "USERS\n사용자" as users { - * id : uuid <> +entity "USERS\n서비스 사용자" as users { + * id : BIGINT <> -- - provider : string - provider_user_id : string - status : string - created_at : datetime + user_tag : VARCHAR(30) <> + role : ENUM('USER', 'ADMIN') + status : ENUM('PENDING', 'ACTIVE', 'DELETED') + onboarding_completed : boolean + created_at : timestamp + updated_at : timestamp + deleted_at : timestamp (nullable) } entity "USER_PROFILES\n사용자 프로필" as user_profiles { - * user_id : uuid <> + * user_id : BIGINT <> -- nickname : string - avatar_type : string - avatar_url : string + character_type : ENUM('owl', 'fox', '...') manner_temperature : float - updated_at : datetime + updated_at : timestamp } -entity "USER_SETTINGS\n사용자 설정" as user_settings { - * user_id : uuid <> +entity "USER_TENDENCY_SCORES\n사용자 성향 점수 현재값" as user_tendency_scores { + * user_id : BIGINT <> -- - push_enabled : boolean - email_enabled : boolean - debate_request_enabled : boolean - profile_public : boolean - updated_at : datetime -} - -entity "USER_AGREEMENTS\n사용자 동의 이력" as user_agreements { - * id : uuid <> - -- - user_id : uuid <> - agreement_type : string - version : string - agreed_at : datetime -} - -entity "USER_DEVICES\n사용자 디바이스" as user_devices { - * id : uuid <> - -- - user_id : uuid <> - device_token : string - platform : string - last_seen_at : datetime -} - -entity "USER_BLOCKS\n사용자 차단" as user_blocks { - * id : uuid <> - -- - blocker_user_id : uuid <> - blocked_user_id : uuid <> - created_at : datetime + score_1 : int + score_2 : int + score_3 : int + score_4 : int + score_5 : int + score_6 : int + updated_at : timestamp } -entity "USER_TENDENCY_SCORES\n사용자 성향 점수 (-100~100) \n(필드는 추후 수정)" as user_tendency_scores { - * user_id : uuid <> +entity "USER_TENDENCY_SCORE_HISTORIES\n사용자 성향 점수 변경 이력" as user_tendency_score_histories { + * id : BIGINT <> -- + user_id : BIGINT <> score_1 : int score_2 : int score_3 : int score_4 : int score_5 : int score_6 : int - updated_at : datetime + created_at : timestamp } +users -[hidden]down- user_profiles +user_profiles -[hidden]down- user_tendency_scores +user_tendency_scores -[hidden]down- user_tendency_score_histories + users ||--|| user_profiles -users ||--|| user_settings -users ||--o{ user_agreements -users ||--o{ user_devices -users ||--o{ user_blocks : blocker -users ||--o{ user_blocks : blocked users ||--|| user_tendency_scores +users ||--o{ user_tendency_score_histories + +note right of users + users 는 서비스 내부 사용자 식별자와 상태만 관리한다. + provider, provider_user_id 같은 OAuth 식별자는 이 테이블에 두지 않는다. + user_tag 는 공개 식별자이며 저장 시 @ 없이 보관한다. +end note + +note right of user_profiles + nickname은 중복 허용 + user_tag를 대외 식별자로 활용 +end note @enduml From deb598fa3e19d06ec46d9c41f2bc1b1189b8b247 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Thu, 12 Mar 2026 23:05:20 +0900 Subject: [PATCH 05/94] =?UTF-8?q?#7=20[Chore]=20API=20=EA=B3=B5=ED=86=B5?= =?UTF-8?q?=20=EC=9D=91=EB=8B=B5=20=EA=B5=AC=EC=A1=B0=20=EB=B0=8F=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20Config=20=EC=84=B8=ED=8C=85=20(#11)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- docker-compose.yml | 17 +++++++ .../java/com/swyp/app/AppApplication.java | 12 +++-- .../test/controller/TestController.java | 19 ++++++++ .../swyp/app/global/common/BaseEntity.java | 24 ++++++++++ .../common/exception/CustomException.java | 10 +++++ .../global/common/exception/ErrorCode.java | 21 +++++++++ .../exception/GlobalExceptionHandler.java | 29 ++++++++++++ .../global/common/response/ApiResponse.java | 44 +++++++++++++++++++ .../app/global/config/SecurityConfig.java | 24 ++++++++++ .../swyp/app/global/config/SwaggerConfig.java | 19 ++++++++ src/main/resources/application.yml | 19 +++++++- 12 files changed, 231 insertions(+), 10 deletions(-) create mode 100644 docker-compose.yml create mode 100644 src/main/java/com/swyp/app/domain/test/controller/TestController.java create mode 100644 src/main/java/com/swyp/app/global/common/BaseEntity.java create mode 100644 src/main/java/com/swyp/app/global/common/exception/CustomException.java create mode 100644 src/main/java/com/swyp/app/global/common/exception/ErrorCode.java create mode 100644 src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/swyp/app/global/common/response/ApiResponse.java create mode 100644 src/main/java/com/swyp/app/global/config/SecurityConfig.java create mode 100644 src/main/java/com/swyp/app/global/config/SwaggerConfig.java diff --git a/.gitignore b/.gitignore index 42445464..edc1c6eb 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,5 @@ out/ .vscode/ ### Setting ### -.env \ No newline at end of file +.env +postgres_data/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..0cfd9264 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +services: + db: + image: postgres:15 + container_name: pique-postgres-db + restart: always + environment: + POSTGRES_DB: ${DB_NAME} + POSTGRES_USER: ${DB_USER} + POSTGRES_PASSWORD: ${DB_PASSWORD} + ports: + - "127.0.0.1:${DB_PORT:-5433}:5432" + volumes: + - ./postgres_data:/var/lib/postgresql/data + +networks: + default: + name: pique-network \ No newline at end of file diff --git a/src/main/java/com/swyp/app/AppApplication.java b/src/main/java/com/swyp/app/AppApplication.java index 11ec00cf..01062c0f 100644 --- a/src/main/java/com/swyp/app/AppApplication.java +++ b/src/main/java/com/swyp/app/AppApplication.java @@ -4,12 +4,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -@SpringBootApplication @EnableJpaAuditing +@SpringBootApplication public class AppApplication { - - public static void main(String[] args) { - SpringApplication.run(AppApplication.class, args); - } - -} + public static void main(String[] args) { + SpringApplication.run(AppApplication.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/test/controller/TestController.java b/src/main/java/com/swyp/app/domain/test/controller/TestController.java new file mode 100644 index 00000000..f8ea09f0 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/test/controller/TestController.java @@ -0,0 +1,19 @@ +package com.swyp.app.domain.test.controller; + +import com.swyp.app.global.common.response.ApiResponse; // 패키지 경로 확인! +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/test") +public class TestController { + + @GetMapping("/response") + public ApiResponse> testResponse() { + List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); + return ApiResponse.onSuccess("API 공통 응답 테스트 성공!", teamMembers); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/BaseEntity.java b/src/main/java/com/swyp/app/global/common/BaseEntity.java new file mode 100644 index 00000000..8da69f05 --- /dev/null +++ b/src/main/java/com/swyp/app/global/common/BaseEntity.java @@ -0,0 +1,24 @@ +package com.swyp.app.global.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseEntity { + + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/exception/CustomException.java b/src/main/java/com/swyp/app/global/common/exception/CustomException.java new file mode 100644 index 00000000..5c834728 --- /dev/null +++ b/src/main/java/com/swyp/app/global/common/exception/CustomException.java @@ -0,0 +1,10 @@ +package com.swyp.app.global.common.exception; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public class CustomException extends RuntimeException { + private final ErrorCode errorCode; +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java new file mode 100644 index 00000000..122fcaa6 --- /dev/null +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -0,0 +1,21 @@ +package com.swyp.app.global.common.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ErrorCode { + // Common + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_500", "서버 에러, 관리자에게 문의하세요."), + BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON_400", "잘못된 요청입니다."), + + // Battle & Tag + BATTLE_NOT_FOUND(HttpStatus.NOT_FOUND, "BATTLE_404", "존재하지 않는 배틀입니다."), + TAG_NOT_FOUND(HttpStatus.NOT_FOUND, "TAG_404", "존재하지 않는 태그입니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..1d1336c7 --- /dev/null +++ b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java @@ -0,0 +1,29 @@ +package com.swyp.app.global.common.exception; + +import com.swyp.app.global.common.response.ApiResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(CustomException.class) + public ResponseEntity> handleCustomException(CustomException e) { + ErrorCode code = e.getErrorCode(); + return ResponseEntity + .status(code.getHttpStatus()) + .body(ApiResponse.onFailure(code.getHttpStatus().value(), code.getCode(), code.getMessage())); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity> handleAllException(Exception e) { + log.error("Internal Server Error: ", e); + ErrorCode code = ErrorCode.INTERNAL_SERVER_ERROR; + return ResponseEntity + .status(code.getHttpStatus()) + .body(ApiResponse.onFailure(500, code.getCode(), e.getMessage())); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/response/ApiResponse.java b/src/main/java/com/swyp/app/global/common/response/ApiResponse.java new file mode 100644 index 00000000..904d76db --- /dev/null +++ b/src/main/java/com/swyp/app/global/common/response/ApiResponse.java @@ -0,0 +1,44 @@ +package com.swyp.app.global.common.response; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@JsonPropertyOrder({"statusCode", "message", "data", "error"}) +public class ApiResponse { + + private final int statusCode; + private final String message; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private final T data; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private final ErrorResponse error; + + // 성공 응답 (기본) + public static ApiResponse onSuccess(T data) { + return new ApiResponse<>(200, "요청에 성공하였습니다.", data, null); + } + + // 성공 응답 (메시지 커스텀) + public static ApiResponse onSuccess(String message, T data) { + return new ApiResponse<>(200, message, data, null); + } + + // 에러 응답 + public static ApiResponse onFailure(int statusCode, String errorCode, String message) { + return new ApiResponse<>(statusCode, message, null, new ErrorResponse(errorCode, message)); + } + + @Getter + @AllArgsConstructor + public static class ErrorResponse { + private final String code; + private final String message; + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/config/SecurityConfig.java b/src/main/java/com/swyp/app/global/config/SecurityConfig.java new file mode 100644 index 00000000..11163d26 --- /dev/null +++ b/src/main/java/com/swyp/app/global/config/SecurityConfig.java @@ -0,0 +1,24 @@ +package com.swyp.app.global.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +public class SecurityConfig { + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth + .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() + .anyRequest().permitAll() // 개발 초기 전체 허용 + ); + return http.build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/config/SwaggerConfig.java b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java new file mode 100644 index 00000000..7b63e1ad --- /dev/null +++ b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java @@ -0,0 +1,19 @@ +package com.swyp.app.global.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .info(new Info() + .title("PIQUE API 명세서") + .description("PIQUE 서비스 API 명세서입니다.") + .version("v1.0.0")); + } +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 71885b87..1607f899 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: datasource: url: ${DB_URL} username: ${DB_USER} - password: ${DB_PW} + password: ${DB_PASSWORD} driver-class-name: org.postgresql.Driver jpa: @@ -11,4 +11,19 @@ spring: show-sql: true properties: hibernate: - format_sql: true \ No newline at end of file + format_sql: true + dialect: org.hibernate.dialect.PostgreSQLDialect + + jackson: + property-naming-strategy: SNAKE_CASE + +springdoc: + default-consumes-media-type: application/json + default-produces-media-type: application/json + swagger-ui: + path: /swagger-ui.html + tags-sorter: alpha + operations-sorter: alpha + display-request-duration: true + api-docs: + path: /v3/api-docs \ No newline at end of file From 301f313a156a4bacf30ab07c5f0f049a7ec527ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A4=80=ED=98=81?= <127603139+HYH0804@users.noreply.github.com> Date: Thu, 12 Mar 2026 23:38:04 +0900 Subject: [PATCH 06/94] =?UTF-8?q?#10=20[Docs]=20Perspective=20,=20Like=20,?= =?UTF-8?q?=20Comment=20ERD=20=EB=B0=8F=20API=20=EC=A0=95=EC=9D=98=20(#12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - #10 ## 📝 작업 내용 ### 📚 Docs | 내용 | 파일 | |------|------| | 좋아요 도메인 API 명세서 신규 작성 | `likes-api.md` | | 댓글 도메인 API 명세서 신규 작성 | `comments-api.md` | | 관점 도메인 ERD 다이어그램 추가 | `perspectives.puml` | | 관점 도메인 API 명세서 신규 작성 | `perspectives-api.md` | | 추천 도메인 API 명세서 신규 작성 | `recommendations-api.md` | | 투표 도메인 API 명세서 수정 | `vote-api.md` | | 댓글 도메인 ERD 다이어그램 추가 | `comment.puml` | ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [x] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 PERSPECTIVES (관점) + COMMENTS (댓글) + LIKES (좋아요) image COMMENTS (댓글) image ## 💬 리뷰 요구사항 > 1. 천수님 테이블 구조 위에다가 제가 필요한 테이블들 끼운거라 큰 문제는 없어보입니다. --- docs/api-specs/comments-api.md | 265 ++++++++++++++++++++++++++ docs/api-specs/likes-api.md | 175 +++++++++++++++++ docs/api-specs/perspectives-api.md | 258 +++++++++++++++++++++++++ docs/api-specs/recommendations-api.md | 163 ++++++++++++++++ docs/api-specs/vote-api.md | 103 ++++++++++ docs/erd/comment.puml | 36 ++++ docs/erd/perspectives.puml | 84 ++++++++ 7 files changed, 1084 insertions(+) create mode 100644 docs/api-specs/comments-api.md create mode 100644 docs/api-specs/likes-api.md create mode 100644 docs/api-specs/perspectives-api.md create mode 100644 docs/api-specs/recommendations-api.md create mode 100644 docs/erd/comment.puml create mode 100644 docs/erd/perspectives.puml diff --git a/docs/api-specs/comments-api.md b/docs/api-specs/comments-api.md new file mode 100644 index 00000000..0980f5f5 --- /dev/null +++ b/docs/api-specs/comments-api.md @@ -0,0 +1,265 @@ +# 댓글 API 명세서 + +--- + +## 설계 메모 + +- 관점에서의 댓글 관련한 API 입니다. +- 대댓글은 존재하지 않고 같은 최상위 뎁스의 댓글만 존재합니다. + +--- + +## 댓글 목록 조회 API + +### `GET /api/v1/perspectives/{perspective_id}/comments` + +- 댓글 목록 조회 (UI 상에서 아직 없어 임의로 기입함) + +#### 쿼리 파라미터 + +- 파라미터 | 타입 | 필수 | 설명 +- cursor | string | X | 커서 페이지네이션 +- size | number | X | 기본값 20 (임의 설정했음) + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "comment_id": "comment_001", + "user": { + "user_tag": "user@12312asb", + "nickname": "철학하는고양이", + "character_url": "https://cdn.pique.app/characters/cat.png" + }, + "content": "저도 같은 생각이에요.", + "is_mine": true, + "created_at": "2026-03-11T12:00:00Z" + } + ], + "next_cursor": "cursor_002", + "has_next": true + }, + "error": null +} +``` + +#### 예외 응답 `404 - 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +--- +## 특정 댓글 삭제 API +### `DELETE /api/v1/perspectives/{perspective_id}/comments/{comment_id}` + +- 특정 댓글을 삭제 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true + }, + "error": null +} +``` + +#### 예외 응답 `404 - 댓글 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "COMMENT_NOT_FOUND", + "message": "존재하지 않는 댓글입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `403 - 본인 댓글 아님` + +```json +{ + "statusCode": 403, + "data": null, + "error": { + "code": "FORBIDDEN_ACCESS", + "message": "본인 댓글만 삭제할 수 있습니다.", + "errors": [] + } +} +``` + +--- + +## 특정 댓글 수정 API +### `PATCH /api/v1/perspectives/{perspective_id}/comments/{comment_id}` + +- 특정 댓글을 삭제 + +#### Request Body + +```json +{ + "content": "수정된 댓글 내용이에요." +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "comment_id": "comment_001", + "content": "수정된 댓글 내용이에요.", + "updated_at": "2026-03-11T13:00:00Z" + }, + "error": null +} +``` + +#### 예외 응답 `404 - 댓글 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "COMMENT_NOT_FOUND", + "message": "존재하지 않는 댓글입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `403 - 본인 댓글 아님` + +```json +{ + "statusCode": 403, + "data": null, + "error": { + "code": "COMMENT_FORBIDDEN", + "message": "본인 댓글만 삭제할 수 있습니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `400 - 내용 없음` + +```json +{ + "statusCode": 400, + "data": null, + "error": { + "code": "COMMON_INVALID_PARAMETER", + "message": "댓글 내용을 입력해주세요.", + "errors": [] + } +} +``` + +--- + + +## 특정 댓글 생성 API +### `DELETE /api/v1/perspectives/{perspective_id}/comments` + +- 특정 댓글을 삭제 + +#### Request Body + +```json +{ + "content": "저도 같은 생각이에요." +} +``` + +#### 성공 응답 `201 Created` + +```json +{ + "statusCode": 201, + "data": { + "comment_id": "comment_001", + "user": { + "user_tag": "user@12312asb", + "nickname": "철학하는고양이", + "character_url": "https://cdn.pique.app/characters/cat.png" + }, + "content": "저도 같은 생각이에요.", + "created_at": "2026-03-11T12:00:00Z" + }, + "error": null +} +``` + +#### 예외 응답 `404 - 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `400 - 내용 없음` + +```json +{ + "statusCode": 400, + "data": null, + "error": { + "code": "COMMON_INVALID_PARAMETER", + "message": "댓글 내용을 입력해주세요.", + "errors": [] + } +} +``` + + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- + +## 댓글 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|-----------| +| `COMMENT_NOT_FOUND` | `404` | 존재하지 않는 댓글 | +| `COMMENT_FORBIDDEN` | `403` | 본인 댓글 아님 | +--- \ No newline at end of file diff --git a/docs/api-specs/likes-api.md b/docs/api-specs/likes-api.md new file mode 100644 index 00000000..601ca306 --- /dev/null +++ b/docs/api-specs/likes-api.md @@ -0,0 +1,175 @@ +# 좋아요 API 명세서 + +--- + +## 설계 메모 + +- 관점에 들어갈 좋아요 API 입니다. + +--- + +## 관점 좋아요 조회 API + +### `GET /api/v1/perspectives/{perspective_id}/likes` + +- 관점 좋아요 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "perspective_id": "perspective_001", + "like_count": 13 + }, + "error": null +} +``` + +#### 예외 응답 `404 - 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +```json +{ + "statusCode": 409, + "data": null, + "error": { + "code": "LIKE_ALREADY_EXISTS", + "message": "이미 좋아요를 누른 관점입니다.", + "errors": [] + } +} +``` + +--- +## 관점 좋아요 등록 API +### `POST /api/v1/perspectives/{perspective_id}/likes` + +- 좋아요 등록 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "perspective_id": "perspective_001", + "like_count": 13, + "is_liked": true + }, + "error": null +} +``` + +#### 실패 응답 `404 - 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +#### 실패 응답 `409 - 이미 좋아요 누름` + +```json +{ + "statusCode": 409, + "data": null, + "error": { + "code": "LIKE_ALREADY_EXISTS", + "message": "이미 좋아요를 누른 관점입니다.", + "errors": [] + } +} +``` + + +--- +## 관점에 등록됐던 좋아요 삭제 API +### `DELETE /api/v1/perspectives/{perspective_id}/likes` + +- 관점에 등록됐던 좋아요 취소 API + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "perspective_id": "perspective_001", + "like_count": 12, + "is_liked": false + }, + "error": null +} +``` + +#### 실패 응답 `404 - 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +#### 실패 응답 `409 - 좋아요 누른 적 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "LIKE_NOT_FOUND", + "message": "좋아요를 누른 적 없는 관점입니다.", + "errors": [] + } +} +``` +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- + +## 좋아요 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `LIKE_ALREADY_EXISTS` | `409` | 이미 좋아요 누른 관점 | +| `LIKE_NOT_FOUND` | `404` | 좋아요 누른 적 없는 관점 | + +--- \ No newline at end of file diff --git a/docs/api-specs/perspectives-api.md b/docs/api-specs/perspectives-api.md new file mode 100644 index 00000000..365aa730 --- /dev/null +++ b/docs/api-specs/perspectives-api.md @@ -0,0 +1,258 @@ +# 관점 API 명세서 + +--- + +## 설계 메모 + +- 관점 API 입니다. +- 현재 Creator 뱃지 부분이 ERD 상에선 보이지 않는데 확인 필요 +--- + +## 관점 생성 API + +### `POST /api/v1/battles/{battle_id}/perspectives` + +- 특정 배틀에 대한 관점 생성 (비동기) + +#### Request Body + +```json +{ + "content": "자기결정권은 가장 기본적인 인권이라고 생각해요." +} +``` + +#### 성공 응답 `201 Created` + +```json +{ + "statusCode": 201, + "data": { + "perspective_id": "perspective_001", + "status": "PENDING", + "created_at": "2026-03-11T12:00:00Z" + }, + "error": null +} +``` + +#### 예외 응답 `404 - 존재하지 않는 배틀` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "BATTLE_NOT_FOUND", + "message": "존재하지 않는 배틀입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `409 - 이미 관점 작성함` + +```json +{ + "statusCode": 409, + "data": null, + "error": { + "code": "PERSPECTIVE_ALREADY_EXISTS", + "message": "이미 관점을 작성한 배틀입니다.", + "errors": [] + } +} +``` + + + +--- +## 관점 리스트 조회 API +### `GET /api/v1/battles/{battle_id}/perspectives` + +- 특정 배틀에 대한 관점 리스트 조회 + +#### 쿼리 파라미터 + +- 파라미터 | 타입 | 필수 | 설명 +- cursor | string | X | 커서 페이지네이션 +- size | number | X | 기본값 20 (임의 설정했음) +- option_label | string | X | A or B 투표 옵션 필터 + + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "perspective_id": "perspective_001", + "user": { + "user_tag": "user@12312asb", + "nickname": "철학하는고양이", + "character_url": "https://cdn.pique.app/characters/cat.png" + }, + "option": { + "option_id": "option_A", + "label": "A", + "title": "찬성" + }, + "content": "자기결정권은 가장 기본적인 인권이라고 생각해요.", + "like_count": 12, + "comment_count": 3, + "is_liked": false, + "created_at": "2026-03-11T12:00:00Z" + } + ], + "next_cursor": "cursor_002", + "has_next": true + }, + "error": null +} +``` + +#### 예외 응답 `404 - 존재하지 않는 배틀` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "BATTLE_NOT_FOUND", + "message": "존재하지 않는 배틀입니다.", + "errors": [] + } +} +``` + +--- +## 관점 삭제 API +### `DELETE /api/v1/perspectives/{perspective_id}` + +- 특정 배틀에 대한 내가 쓴 관점 삭제 + + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "success": true + }, + "error": null +} +``` + +#### 예외 응답 `404 - 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `403 - 본인 관점 아님` + +```json +{ + "statusCode": 403, + "data": null, + "error": { + "code": "FORBIDDEN_ACCESS", + "message": "본인 관점만 삭제할 수 있습니다.", + "errors": [] + } +} +``` + + +--- +## 관점 수정 API +### `PATCH /api/v1/perspectives/{perspective_id}` + +- 특정 배틀에 대한 내가 쓴 관점 수정 + +#### Request Body + +```json +{ + "content": "수정된 관점 내용입니다." +} +``` + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "perspective_id": "perspective_001", + "content": "수정된 관점 내용입니다.", + "updated_at": "2026-03-11T13:00:00Z" + }, + "error": null +} +``` + +#### 예외 응답 `404 - 존재하지 않는 관점` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `403 - 본인 관점 아님` +```json +{ + "statusCode": 403, + "data": null, + "error": { + "code": "FORBIDDEN_ACCESS", + "message": "본인 관점만 수정할 수 있습니다.", + "errors": [] + } +} +``` + +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- + +## 관점 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|-------------| +| `PERSPECTIVE_NOT_FOUND` | `404` | 존재하지 않는 관점 | +| `PERSPECTIVE_ALREADY_EXISTS` | `409` | 해당 배틀에 이미 관점 작성함 | +| `PERSPECTIVE_FORBIDDEN` | `403` | 본인 관점 아님 | +| `PERSPECTIVE_POST_VOTE_REQUIRED` | `409` | 사후 투표 미완료 | + +--- \ No newline at end of file diff --git a/docs/api-specs/recommendations-api.md b/docs/api-specs/recommendations-api.md new file mode 100644 index 00000000..7d444aae --- /dev/null +++ b/docs/api-specs/recommendations-api.md @@ -0,0 +1,163 @@ +# 성향기반 배틀 추천 API 명세서 + +--- + +## 설계 메모 + +- 연관 , 비슷한 , 반대 성향에 대한 추천 / 내부 정책 로직 API 입니다. + +--- + +## 성향 기반 연관 배틀 조회 API + +### `GET /api/v1/battles/{battle_id}/related` + +- 연관 배틀 조회 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "battle_id": "battle_002", + "title": "유전자 편집 아기, 허용해야 할까?", + "tags": [ + { "tag_id": "tag_001", "name": "과학" }, + { "tag_id": "tag_002", "name": "윤리" } + ], + "options": [ + { "option_id": "option_A", "label": "A", "title": "허용" }, + { "option_id": "option_B", "label": "B", "title": "금지" } + ], + "participants_count": 890 + } + ] + }, + "error": null +} +``` + +#### 예외 응답 `404 - 배틀 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "BATTLE_NOT_FOUND", + "message": "존재하지 않는 배틀입니다.", + "errors": [] + } +} +``` + +--- +## 성향 기반 비슷한 유저가 들은 배틀 조회 API +### `GET /api/v1/battles/{battle_id}/recommendations/similar` + +- 비슷한 유저가 들은 배틀 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "battle_id": "battle_002", + "title": "사형제도, 유지 vs 폐지", + "thumbnail_url": "https://cdn.pique.app/battle/002.png", + "tags": [ + { "tag_id": "tag_001", "name": "사회" } + ], + "participants_count": 1500, + "options": [ + { "option_id": "option_A", "label": "A", "title": "유지" }, + { "option_id": "option_B", "label": "B", "title": "폐지" } + ], + "match_ratio": 87 + } + ] + }, + "error": null +} +``` + +### 예외 응답 `404 - 배틀 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "BATTLE_NOT_FOUND", + "message": "존재하지 않는 배틀입니다.", + "errors": [] + } +} +``` + +--- +## 성향 기반 반대 성향 유저에게 인기 배틀 조회 API +### `GET /api/v1/battles/{battle_id}/recommendations/opposite` + +- 반대 성향 유저에게 인기 중인 배틀 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "items": [ + { + "battle_id": "battle_003", + "title": "AI 판사, 도입해야 할까?", + "thumbnail_url": "https://cdn.pique.app/battle/003.png", + "tags": [ + { "tag_id": "tag_002", "name": "기술" } + ], + "participants_count": 780, + "options": [ + { "option_id": "option_A", "label": "A", "title": "도입" }, + { "option_id": "option_B", "label": "B", "title": "반대" } + ] + } + ] + }, + "error": null +} +``` + +#### 예외 응답 `404 - 배틀 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "BATTLE_NOT_FOUND", + "message": "존재하지 않는 배틀입니다.", + "errors": [] + } +} +``` +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `COMMON_BAD_REQUEST` | `400` | 잘못된 요청 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_TOKEN_EXPIRED` | `401` | 토큰 만료 | +| `FORBIDDEN_ACCESS` | `403` | 접근 권한 없음 | +| `USER_BANNED` | `403` | 제재된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +--- \ No newline at end of file diff --git a/docs/api-specs/vote-api.md b/docs/api-specs/vote-api.md index cef1e198..0ebae6d4 100644 --- a/docs/api-specs/vote-api.md +++ b/docs/api-specs/vote-api.md @@ -127,6 +127,109 @@ --- +### `GET /api/v1/battles/{battle_id}/vote-stats` + +- 투표 %를 조회 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "options": [ + { + "option_id": "option_A", + "label": "A", + "title": "찬성", + "vote_count": 1259, + "ratio": 59.5 + }, + { + "option_id": "option_B", + "label": "B", + "title": "반대", + "vote_count": 856, + "ratio": 40.5 + } + ], + "total_count": 2115, + "updated_at": "2026-03-11T12:00:00Z" + }, + "error": null +} +``` + +#### 예외 응답 `404 - 배틀없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "BATTLE_NOT_FOUND", + "message": "존재하지 않는 배틀입니다.", + "errors": [] + } +} +``` +--- +### `GET /api/v1/battles/{battle_id}/votes/me` + +- 투표 %를 조회 + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "pre_vote": { + "option_id": "option_A", + "label": "A", + "title": "찬성" + }, + "post_vote": { + "option_id": "option_A", + "label": "A", + "title": "찬성" + }, + "mind_changed": false, + "status": "POST_VOTED" + }, + "error": null +} +``` + +#### 예외 응답 `404 - 배틀없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "BATTLE_NOT_FOUND", + "message": "존재하지 않는 배틀입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `404 - 투표 내역 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "VOTE_NOT_FOUND", + "message": "투표 내역이 없습니다.", + "errors": [] + } +} +``` + +--- ## 공통 에러 코드 | Error Code | HTTP Status | 설명 | diff --git a/docs/erd/comment.puml b/docs/erd/comment.puml new file mode 100644 index 00000000..258ca3fd --- /dev/null +++ b/docs/erd/comment.puml @@ -0,0 +1,36 @@ +@startuml perspective_comments +hide circle +hide methods +skinparam linetype ortho + +entity "users\n사용자" as users { + * id : BIGINT <> +} + +entity "PERSPECTIVES\n관점" as perspectives { + * id : UUID <> +} + +entity "PERSPECTIVE_COMMENTS\n관점 댓글" as perspective_comments { + * id : UUID <> + -- + perspective_id : UUID <> + user_id : BIGINT <> + content : TEXT + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +perspectives -[hidden]down- perspective_comments +users -[hidden]right- perspective_comments + +perspectives ||--o{ perspective_comments : "has" +users ||--o{ perspective_comments : "writes" + +note right of perspective_comments + 삭제: 본인만 가능 + 수정: 본인만 가능 + 대댓글 없음 (1단 구조) +end note + +@enduml \ No newline at end of file diff --git a/docs/erd/perspectives.puml b/docs/erd/perspectives.puml new file mode 100644 index 00000000..960f0a7c --- /dev/null +++ b/docs/erd/perspectives.puml @@ -0,0 +1,84 @@ +@startuml perspective +hide circle +hide methods +skinparam linetype ortho + +entity "users\n사용자" as users { + * id : BIGINT <> +} + +entity "BATTLES\n배틀(주제)" as battles { + * id : UUID <> +} + +entity "BATTLE_OPTIONS\n선택지" as battle_options { + * id : UUID <> +} + +entity "PERSPECTIVES\n관점" as perspectives { + * id : UUID <> + -- + battle_id : UUID <> + user_id : BIGINT <> + option_id : UUID <> + content : TEXT + like_count : INT default 0 + comment_count : INT default 0 + status : ENUM('PENDING', 'PUBLISHED', 'REJECTED') + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "COMMENTS\n관점 댓글" as perspective_comments { + * id : UUID <> + -- + perspective_id : UUID <> + user_id : BIGINT <> + content : TEXT + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +entity "LIKES\n관점 좋아요" as perspective_likes { + * perspective_id : UUID <> + * user_id : BIGINT <> + -- + created_at : TIMESTAMP +} + +users -[hidden]down- perspectives +battles -[hidden]down- perspectives +perspectives -[hidden]down- perspective_comments +perspective_likes -[hidden]right- perspective_comments + +battles ||--o{ perspectives : "has" +users ||--o{ perspectives : "writes" +battle_options ||--o{ perspectives : "belongs to" +perspectives ||--o{ perspective_comments : "has" +users ||--o{ perspective_comments : "writes" +perspectives ||--o{ perspective_likes : "has" +users ||--o{ perspective_likes : "likes" + +note right of perspectives + status 흐름: + PENDING → PUBLISHED → REJECTED + + option_id: 서버가 votes 테이블에서 + pre_vote_option_id를 읽어서 저장 + + like_count, comment_count: + 캐싱용 카운터 (정합성은 배치로 보정) + + UNIQUE (battle_id, user_id): + 1인 1관점 제약 +end note + +note bottom of perspective_likes + 복합 PK: (perspective_id, user_id) + 동일 유저 중복 좋아요 방지 +end note + +@enduml +``` + +--- \ No newline at end of file From b5efc6e0a4261bfde6913bf7d4584e50a9ca97d5 Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Fri, 13 Mar 2026 15:22:40 +0900 Subject: [PATCH 07/94] =?UTF-8?q?#13=20[Docs]=20user/oauth=20API=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api-specs/oauth-api.md | 148 +++++++++++++++----------------- docs/api-specs/user-api.md | 162 +++++++++++++++++++++++++----------- 2 files changed, 181 insertions(+), 129 deletions(-) diff --git a/docs/api-specs/oauth-api.md b/docs/api-specs/oauth-api.md index d9472261..4f31b61b 100644 --- a/docs/api-specs/oauth-api.md +++ b/docs/api-specs/oauth-api.md @@ -11,44 +11,46 @@ ### 1.1 공통 요청 헤더 - `Content-Type: application/json` - - JSON 요청 바디가 있는 API에 사용합니다. + - JSON 요청 바디가 있는 API에 사용합니다. - `Authorization: Bearer {access_token}` - - 로그인 이후 인증이 필요한 API에 사용합니다. + - 로그인 이후 인증이 필요한 API에 사용합니다. - `X-Refresh-Token: {refresh_token}` - - Access Token 재발급 API에 사용합니다. + - Access Token 재발급 API에 사용합니다. ### 1.2 토큰 사용 방식 로그인 성공 후 클라이언트는 `access_token`, `refresh_token`을 발급받습니다. - `access_token` - - 이후 인증이 필요한 API 호출 시 `Authorization: Bearer {access_token}` 헤더로 전달합니다. - - 예: `GET /api/v1/me/profile`, `PATCH /api/v1/me/settings`, `DELETE /api/v1/me` + - 이후 인증이 필요한 API 호출 시 `Authorization: Bearer {access_token}` 헤더로 전달합니다. + - 예: `GET /api/v1/me/profile`, `PATCH /api/v1/me/settings`, `DELETE /api/v1/me` - `refresh_token` - - API가 `401`과 `auth_access_token_expired`를 반환했을 때 `POST /api/v1/auth/refresh` 에서 사용합니다. - - `X-Refresh-Token: {refresh_token}` 헤더로 전달합니다. + - API가 `401`과 `AUTH_ACCESS_TOKEN_EXPIRED`를 반환했을 때 `POST /api/v1/auth/refresh` 에서 사용합니다. + - `X-Refresh-Token: {refresh_token}` 헤더로 전달합니다. - Access Token 만료 안내 - - 인증이 필요한 API는 Access Token이 만료되면 `401 Unauthorized`를 반환합니다. - - 에러 코드가 `auth_access_token_expired` 이면 클라이언트는 Refresh API를 호출해야 합니다. - - Refresh 성공 후 실패했던 요청을 새 `access_token`으로 1회 재시도합니다. + - 인증이 필요한 API는 Access Token이 만료되면 `401 Unauthorized`를 반환합니다. + - 에러 코드가 `AUTH_ACCESS_TOKEN_EXPIRED` 이면 클라이언트는 Refresh API를 호출해야 합니다. + - Refresh 성공 후 실패했던 요청을 새 `access_token`으로 1회 재시도합니다. - Refresh Token 만료 안내 - - Refresh API가 `401`과 `auth_refresh_token_expired`를 반환하면 재로그인이 필요합니다. + - Refresh API가 `401`과 `AUTH_REFRESH_TOKEN_EXPIRED`를 반환하면 재로그인이 필요합니다. - 재발급 성공 시 - - 새 `access_token`, 새 `refresh_token`으로 교체합니다. - - 이후 요청에는 기존 토큰 대신 새 토큰을 사용합니다. + - 새 `access_token`, 새 `refresh_token`으로 교체합니다. + - 이후 요청에는 기존 토큰 대신 새 토큰을 사용합니다. - 로그아웃 시 - - `POST /api/v1/auth/logout` 호출 후 클라이언트에 저장된 토큰을 삭제합니다. + - `POST /api/v1/auth/logout` 호출 후 클라이언트에 저장된 토큰을 삭제합니다. - 회원 탈퇴 시 - - `DELETE /api/v1/me` 호출 후 클라이언트에 저장된 토큰을 삭제합니다. + - `DELETE /api/v1/me` 호출 후 클라이언트에 저장된 토큰을 삭제합니다. -신규 사용자 흐름: +### 1.3 로그인 흐름 + +**신규 사용자** 1. `POST /api/v1/auth/login/{provider}` 호출 2. 응답에서 `is_new_user = true` 확인 3. 발급받은 `access_token`으로 온보딩 API 호출 4. `POST /api/v1/onboarding/profile` 완료 후 일반 사용자 API 사용 -기존 사용자 흐름: +**기존 사용자** 1. `POST /api/v1/auth/login/{provider}` 호출 2. 응답에서 `is_new_user = false` 확인 @@ -63,9 +65,13 @@ 소셜 인가 코드를 이용해 로그인 및 계정을 생성합니다. - `{provider}`: `kakao`, `google` -- 상태가 `BANNED`인 사용자는 `403`을 반환합니다. +- 상태가 `BANNED` 또는 `SUSPENDED`인 사용자는 `403`을 반환합니다. - 신규 사용자는 `status = PENDING`, `is_new_user = true` 상태로 응답합니다. +요청 헤더: + +- `Content-Type: application/json` + 요청: ```json @@ -75,22 +81,24 @@ } ``` -요청 헤더: - -- `Content-Type: application/json` - 응답: ```json { - "access_token": "eyJhbGciOiJIUzI...", - "refresh_token": "def456-ghi789...", - "user_tag": "sfit4-2", - "is_new_user": true, - "status": "PENDING" + "statusCode": 200, + "data": { + "access_token": "eyJhbGciOiJIUzI...", + "refresh_token": "def456-ghi789...", + "user_tag": "sfit4-2", + "is_new_user": true, + "status": "PENDING" + }, + "error": null } ``` +--- + ### 2.2 `POST /api/v1/auth/refresh` 만료된 Access Token을 Refresh Token으로 재발급합니다. @@ -104,11 +112,17 @@ ```json { - "access_token": "new_eyJhbGciOiJIUzI...", - "refresh_token": "new_def456-ghi789..." + "statusCode": 200, + "data": { + "access_token": "new_eyJhbGciOiJIUzI...", + "refresh_token": "new_def456-ghi789..." + }, + "error": null } ``` +--- + ### 2.3 `POST /api/v1/auth/logout` 현재 로그인된 사용자의 Refresh Token을 삭제하여 로그아웃 처리합니다. @@ -122,10 +136,16 @@ ```json { - "logged_out": true + "statusCode": 200, + "data": { + "logged_out": true + }, + "error": null } ``` +--- + ### 2.4 `DELETE /api/v1/me` 현재 로그인된 사용자의 계정을 탈퇴 처리합니다. @@ -141,62 +161,26 @@ ```json { - "withdrawn": true + "statusCode": 200, + "data": { + "withdrawn": true + }, + "error": null } ``` --- -## 3. 인증 예외 응답 - -### 3.1 잘못된 요청 (400) - -```json -{ - "code": "common_invalid_parameter", - "message": "요청 파라미터가 잘못되었습니다.", - "errors": [ - { - "field": "redirect_uri", - "value": "", - "reason": "redirect_uri 는 필수입니다." - } - ] -} -``` +## 3. 에러 코드 -### 3.2 인증 실패 (401) +### 3.1 공통 에러 코드 -```json -{ - "code": "auth_invalid_code", - "message": "유효하지 않은 소셜 인가 코드입니다.", - "errors": [] -} -``` - -```json -{ - "code": "auth_access_token_expired", - "message": "Access Token이 만료되었습니다. Refresh Token으로 재발급이 필요합니다.", - "errors": [] -} -``` - -```json -{ - "code": "auth_refresh_token_expired", - "message": "Refresh Token이 만료되었거나 유효하지 않습니다. 다시 로그인이 필요합니다.", - "errors": [] -} -``` - -### 3.3 접근 거부 (403) - -```json -{ - "code": "user_banned", - "message": "제재된 사용자입니다.", - "errors": [] -} -``` +| HTTP | 에러 코드 | 설명 | +|------|-----------|------| +| `400` | `COMMON_INVALID_PARAMETER` | 요청 파라미터가 잘못되었습니다. | +| `401` | `AUTH_INVALID_CODE` | 유효하지 않은 소셜 인가 코드 | +| `401` | `AUTH_ACCESS_TOKEN_EXPIRED` | Access Token 만료 — Refresh 필요 | +| `401` | `AUTH_REFRESH_TOKEN_EXPIRED` | Refresh Token 만료 — 재로그인 필요 | +| `403` | `USER_BANNED` | 영구 제재된 사용자 | +| `403` | `USER_SUSPENDED` | 일정 기간 이용 정지된 사용자 | +| `500` | `INTERNAL_SERVER_ERROR` | 서버 오류 | \ No newline at end of file diff --git a/docs/api-specs/user-api.md b/docs/api-specs/user-api.md index be8d36f0..65c92145 100644 --- a/docs/api-specs/user-api.md +++ b/docs/api-specs/user-api.md @@ -24,7 +24,11 @@ ```json { - "random_nickname": "생각하는올빼미" + "statusCode": 200, + "data": { + "random_nickname": "생각하는올빼미" + }, + "error": null } ``` @@ -32,6 +36,7 @@ 첫 로그인 시 프로필 생성. owl, wolf, lion 등은 추후 디자인에 따라 정의 + 요청: ```json @@ -45,12 +50,16 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "user_tag": "sfit4-2", - "nickname": "생각하는올빼미", - "character_type": "owl", - "manner_temperature": 36.5, - "status": "ACTIVE", - "onboarding_completed": true + "statusCode": 200, + "data": { + "user_tag": "sfit4-2", + "nickname": "생각하는올빼미", + "character_type": "owl", + "manner_temperature": 36.5, + "status": "ACTIVE", + "onboarding_completed": true + }, + "error": null } ``` @@ -66,13 +75,19 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "user_tag": "sfit4-2", - "nickname": "생각하는올빼미", - "character_type": "owl", - "manner_temperature": 36.5 + "statusCode": 200, + "data": { + "user_tag": "sfit4-2", + "nickname": "생각하는올빼미", + "character_type": "owl", + "manner_temperature": 36.5 + }, + "error": null } ``` +--- + ### 3.2 `GET /api/v1/me/profile` 내 프로필 조회. @@ -81,14 +96,20 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "user_tag": "sfit4-2", - "nickname": "생각하는올빼미", - "character_type": "owl", - "manner_temperature": 36.5, - "updated_at": "2026-03-08T12:00:00Z" + "statusCode": 200, + "data": { + "user_tag": "sfit4-2", + "nickname": "생각하는올빼미", + "character_type": "owl", + "manner_temperature": 36.5, + "updated_at": "2026-03-08T12:00:00Z" + }, + "error": null } ``` +--- + ### 3.3 `PATCH /api/v1/me/profile` 닉네임 및 캐릭터 수정. @@ -106,10 +127,14 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "user_tag": "sfit4-2", - "nickname": "생각하는펭귄", - "character_type": "penguin", - "updated_at": "2026-03-08T12:00:00Z" + "statusCode": 200, + "data": { + "user_tag": "sfit4-2", + "nickname": "생각하는펭귄", + "character_type": "penguin", + "updated_at": "2026-03-08T12:00:00Z" + }, + "error": null } ``` @@ -125,13 +150,19 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "push_enabled": true, - "email_enabled": false, - "debate_request_enabled": true, - "profile_public": true + "statusCode": 200, + "data": { + "push_enabled": true, + "email_enabled": false, + "debate_request_enabled": true, + "profile_public": true + }, + "error": null } ``` +--- + ### 4.2 `PATCH /api/v1/me/settings` 사용자 설정 수정. @@ -149,7 +180,11 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "updated": true + "statusCode": 200, + "data": { + "updated": true + }, + "error": null } ``` @@ -179,18 +214,24 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "user_tag": "sfit4-2", - "score_1": 30, - "score_2": -20, - "score_3": 55, - "score_4": 10, - "score_5": -75, - "score_6": 42, - "updated_at": "2026-03-08T12:00:00Z", - "history_saved": true + "statusCode": 200, + "data": { + "user_tag": "sfit4-2", + "score_1": 30, + "score_2": -20, + "score_3": 55, + "score_4": 10, + "score_5": -75, + "score_6": 42, + "updated_at": "2026-03-08T12:00:00Z", + "history_saved": true + }, + "error": null } ``` +--- + ### 5.2 `GET /api/v1/me/tendency-scores/history` 성향 점수 변경 이력 조회. @@ -204,18 +245,45 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 ```json { - "items": [ - { - "history_id": "ths_001", - "score_1": 30, - "score_2": -20, - "score_3": 55, - "score_4": 10, - "score_5": -75, - "score_6": 42, - "created_at": "2026-03-08T12:00:00Z" - } - ], - "next_cursor": null + "statusCode": 200, + "data": { + "items": [ + { + "history_id": "ths_001", + "score_1": 30, + "score_2": -20, + "score_3": 55, + "score_4": 10, + "score_5": -75, + "score_6": 42, + "created_at": "2026-03-08T12:00:00Z" + } + ], + "next_cursor": null + }, + "error": null } ``` + +--- + +## 6. 에러 코드 + +### 6.1 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | +| `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | +| `AUTH_ACCESS_TOKEN_EXPIRED` | `401` | Access Token 만료 | +| `AUTH_REFRESH_TOKEN_EXPIRED` | `401` | Refresh Token 만료 — 재로그인 필요 | +| `USER_BANNED` | `403` | 영구 제재된 사용자 | +| `USER_SUSPENDED` | `403` | 일정 기간 이용 정지된 사용자 | +| `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | + +### 6.2 사용자 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|------| +| `USER_NOT_FOUND` | `404` | 존재하지 않는 사용자 | +| `ONBOARDING_ALREADY_COMPLETED` | `409` | 이미 온보딩이 완료된 사용자 | \ No newline at end of file From ff0cdb7f85b7f931b3960a70edaa4460e795bcce Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Fri, 13 Mar 2026 15:34:24 +0900 Subject: [PATCH 08/94] =?UTF-8?q?#19=20[Fix]=20=EA=B3=B5=ED=86=B5=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/domain/test/controller/TestController.java | 2 +- .../common/exception/GlobalExceptionHandler.java | 2 +- .../app/global/common/response/ApiResponse.java | 14 ++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/swyp/app/domain/test/controller/TestController.java b/src/main/java/com/swyp/app/domain/test/controller/TestController.java index f8ea09f0..40a9d9c6 100644 --- a/src/main/java/com/swyp/app/domain/test/controller/TestController.java +++ b/src/main/java/com/swyp/app/domain/test/controller/TestController.java @@ -14,6 +14,6 @@ public class TestController { @GetMapping("/response") public ApiResponse> testResponse() { List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); - return ApiResponse.onSuccess("API 공통 응답 테스트 성공!", teamMembers); + return ApiResponse.onSuccess(teamMembers); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java index 1d1336c7..aade7409 100644 --- a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java @@ -24,6 +24,6 @@ public ResponseEntity> handleAllException(Exception e) { ErrorCode code = ErrorCode.INTERNAL_SERVER_ERROR; return ResponseEntity .status(code.getHttpStatus()) - .body(ApiResponse.onFailure(500, code.getCode(), e.getMessage())); + .body(ApiResponse.onFailure(500, code.getCode(), code.getMessage())); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/response/ApiResponse.java b/src/main/java/com/swyp/app/global/common/response/ApiResponse.java index 904d76db..b3b4e50d 100644 --- a/src/main/java/com/swyp/app/global/common/response/ApiResponse.java +++ b/src/main/java/com/swyp/app/global/common/response/ApiResponse.java @@ -8,11 +8,10 @@ @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) -@JsonPropertyOrder({"statusCode", "message", "data", "error"}) +@JsonPropertyOrder({"statusCode", "data", "error"}) public class ApiResponse { private final int statusCode; - private final String message; @JsonInclude(JsonInclude.Include.NON_NULL) private final T data; @@ -20,19 +19,14 @@ public class ApiResponse { @JsonInclude(JsonInclude.Include.NON_NULL) private final ErrorResponse error; - // 성공 응답 (기본) + // 성공 응답 public static ApiResponse onSuccess(T data) { - return new ApiResponse<>(200, "요청에 성공하였습니다.", data, null); - } - - // 성공 응답 (메시지 커스텀) - public static ApiResponse onSuccess(String message, T data) { - return new ApiResponse<>(200, message, data, null); + return new ApiResponse<>(200, data, null); } // 에러 응답 public static ApiResponse onFailure(int statusCode, String errorCode, String message) { - return new ApiResponse<>(statusCode, message, null, new ErrorResponse(errorCode, message)); + return new ApiResponse<>(statusCode, null, new ErrorResponse(errorCode, message)); } @Getter From f4da17948a3b02ec3beeac4ab335d245e831c326 Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sat, 14 Mar 2026 22:55:18 +0900 Subject: [PATCH 09/94] =?UTF-8?q?#21=20[Feat]=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=B0=8F=20API=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20(#24)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - #21 ## 📝 작업 내용 ### ✨ Feat | 내용 | 파일 | |------|------| | 사용자 도메인 엔티티 및 리포지토리 구현 | `src/main/java/com/swyp/app/domain/user/entity/*`, `src/main/java/com/swyp/app/domain/user/repository/*` | | 온보딩/프로필/설정/성향 점수 API 구현 | `src/main/java/com/swyp/app/domain/user/controller/UserController.java`, `src/main/java/com/swyp/app/domain/user/service/UserService.java` | | 필수 약관 동의 이력 저장 로직 추가 | `src/main/java/com/swyp/app/domain/user/entity/UserAgreement.java`, `src/main/java/com/swyp/app/domain/user/service/UserService.java` | | request validation 및 입력 예외 처리 보강 | `src/main/java/com/swyp/app/domain/user/dto/request/*`, `src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java` | ### ♻️ Refactor | 내용 | 파일 | |------|------| | `/me` 계열 호출을 auth 전 임시 현재 사용자 방식으로 단순화 | `src/main/java/com/swyp/app/domain/user/controller/UserController.java`, `src/main/java/com/swyp/app/domain/user/service/UserService.java` | | 프로필 PATCH를 부분 수정 방식으로 보강 | `src/main/java/com/swyp/app/domain/user/entity/UserProfile.java`, `src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserProfileRequest.java` | ### 🐛 Fix | 내용 | 파일 | |------|------| | 온보딩 재호출 시 중복 완료 방지 로직 추가 | `src/main/java/com/swyp/app/domain/user/service/UserService.java` | | 설정 기본값 및 응답 예시 정합성 수정 | `src/main/java/com/swyp/app/domain/user/service/UserService.java`, `docs/api-specs/user-api.md` | ## 📌 공유 사항 > 1. auth 미구현 상태라 `/me` 계열은 현재 가장 최근 사용자를 임시 current user로 간주합니다. OAuth 연동 시 교체 예정입니다. > 2. `user_tag`는 prefix 없는 8자리 랜덤 문자열로 생성되도록 변경했습니다. ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [x] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 - 없음 (서버/API 구현) ## 💬 리뷰 요구사항 - 없음 --- build.gradle | 2 + docs/api-specs/oauth-api.md | 4 +- docs/api-specs/user-api.md | 22 +- docs/erd/user-ops.puml | 10 +- docs/erd/user.puml | 10 +- .../user/controller/UserController.java | 91 ++++++ .../CreateOnboardingProfileRequest.java | 15 + .../request/UpdateTendencyScoreRequest.java | 20 ++ .../dto/request/UpdateUserProfileRequest.java | 21 ++ .../request/UpdateUserSettingsRequest.java | 18 ++ .../user/dto/response/BootstrapResponse.java | 6 + .../user/dto/response/MyProfileResponse.java | 15 + .../response/OnboardingProfileResponse.java | 16 + .../TendencyScoreHistoryItemResponse.java | 15 + .../TendencyScoreHistoryResponse.java | 9 + .../dto/response/TendencyScoreResponse.java | 16 + .../dto/response/UpdateResultResponse.java | 6 + .../dto/response/UserProfileResponse.java | 13 + .../dto/response/UserSettingsResponse.java | 9 + .../app/domain/user/entity/AgreementType.java | 6 + .../app/domain/user/entity/CharacterType.java | 36 +++ .../user/entity/CharacterTypeConverter.java | 18 ++ .../com/swyp/app/domain/user/entity/User.java | 58 ++++ .../app/domain/user/entity/UserAgreement.java | 53 +++ .../app/domain/user/entity/UserProfile.java | 54 ++++ .../swyp/app/domain/user/entity/UserRole.java | 6 + .../app/domain/user/entity/UserSettings.java | 61 ++++ .../app/domain/user/entity/UserStatus.java | 8 + .../domain/user/entity/UserTendencyScore.java | 56 ++++ .../user/entity/UserTendencyScoreHistory.java | 48 +++ .../repository/UserAgreementRepository.java | 7 + .../repository/UserProfileRepository.java | 7 + .../user/repository/UserRepository.java | 12 + .../repository/UserSettingsRepository.java | 7 + .../UserTendencyScoreHistoryRepository.java | 13 + .../UserTendencyScoreRepository.java | 7 + .../app/domain/user/service/UserService.java | 304 ++++++++++++++++++ .../global/common/exception/ErrorCode.java | 9 +- .../exception/GlobalExceptionHandler.java | 21 +- src/test/resources/application.yml | 13 + 40 files changed, 1103 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/user/controller/UserController.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserProfileRequest.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/AgreementType.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/CharacterType.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/User.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/UserAgreement.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/UserProfile.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/UserRole.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/UserSettings.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/UserStatus.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java create mode 100644 src/main/java/com/swyp/app/domain/user/repository/UserAgreementRepository.java create mode 100644 src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java create mode 100644 src/main/java/com/swyp/app/domain/user/repository/UserRepository.java create mode 100644 src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java create mode 100644 src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreHistoryRepository.java create mode 100644 src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java create mode 100644 src/main/java/com/swyp/app/domain/user/service/UserService.java create mode 100644 src/test/resources/application.yml diff --git a/build.gradle b/build.gradle index 7343ef12..582eb26a 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,7 @@ repositories { dependencies { // Web implementation 'org.springframework.boot:spring-boot-starter-webmvc' + implementation 'org.springframework.boot:spring-boot-starter-validation' // JPA implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // Security @@ -41,6 +42,7 @@ dependencies { // PostgreSQL runtimeOnly 'org.postgresql:postgresql' // Test + testRuntimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test' testImplementation 'org.springframework.boot:spring-boot-starter-security-test' testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test' diff --git a/docs/api-specs/oauth-api.md b/docs/api-specs/oauth-api.md index 4f31b61b..7a7db7f1 100644 --- a/docs/api-specs/oauth-api.md +++ b/docs/api-specs/oauth-api.md @@ -89,7 +89,7 @@ "data": { "access_token": "eyJhbGciOiJIUzI...", "refresh_token": "def456-ghi789...", - "user_tag": "sfit4-2", + "user_tag": "a7k2m9q1", "is_new_user": true, "status": "PENDING" }, @@ -183,4 +183,4 @@ | `401` | `AUTH_REFRESH_TOKEN_EXPIRED` | Refresh Token 만료 — 재로그인 필요 | | `403` | `USER_BANNED` | 영구 제재된 사용자 | | `403` | `USER_SUSPENDED` | 일정 기간 이용 정지된 사용자 | -| `500` | `INTERNAL_SERVER_ERROR` | 서버 오류 | \ No newline at end of file +| `500` | `INTERNAL_SERVER_ERROR` | 서버 오류 | diff --git a/docs/api-specs/user-api.md b/docs/api-specs/user-api.md index 65c92145..ee5898df 100644 --- a/docs/api-specs/user-api.md +++ b/docs/api-specs/user-api.md @@ -6,9 +6,11 @@ - 외부 응답에서는 내부 PK인 `user_id`를 노출하지 않고 `user_tag`를 사용합니다. - `nickname`은 중복 허용 프로필명입니다. - `user_tag`는 고유한 공개 식별자이며 저장 시 `@` 없이 관리합니다. +- `user_tag`는 prefix 없이 생성되는 8자리 이하의 랜덤 문자열입니다. - 프로필 아바타는 자유 입력 이모지가 아니라 `character_type` 선택 방식으로 관리합니다. - `character_type`은 소문자 `snake_case` 문자열 값으로 관리합니다. - 프로필, 설정, 성향 점수는 모두 사용자 도메인 책임입니다. +- 온보딩 완료 시 필수 약관 동의 이력은 서버에서 함께 저장합니다. - 성향 점수는 현재값을 갱신하면서 이력도 함께 적재합니다. --- @@ -52,7 +54,7 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "sfit4-2", + "user_tag": "a7k2m9q1", "nickname": "생각하는올빼미", "character_type": "owl", "manner_temperature": 36.5, @@ -77,7 +79,7 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "sfit4-2", + "user_tag": "a7k2m9q1", "nickname": "생각하는올빼미", "character_type": "owl", "manner_temperature": 36.5 @@ -98,7 +100,7 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "sfit4-2", + "user_tag": "a7k2m9q1", "nickname": "생각하는올빼미", "character_type": "owl", "manner_temperature": 36.5, @@ -129,7 +131,7 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "sfit4-2", + "user_tag": "a7k2m9q1", "nickname": "생각하는펭귄", "character_type": "penguin", "updated_at": "2026-03-08T12:00:00Z" @@ -152,10 +154,10 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "push_enabled": true, + "push_enabled": false, "email_enabled": false, - "debate_request_enabled": true, - "profile_public": true + "debate_request_enabled": false, + "profile_public": false }, "error": null } @@ -216,7 +218,7 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "sfit4-2", + "user_tag": "a7k2m9q1", "score_1": 30, "score_2": -20, "score_3": 55, @@ -249,7 +251,7 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 "data": { "items": [ { - "history_id": "ths_001", + "history_id": 1, "score_1": 30, "score_2": -20, "score_3": 55, @@ -286,4 +288,4 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 | Error Code | HTTP Status | 설명 | |------------|:-----------:|------| | `USER_NOT_FOUND` | `404` | 존재하지 않는 사용자 | -| `ONBOARDING_ALREADY_COMPLETED` | `409` | 이미 온보딩이 완료된 사용자 | \ No newline at end of file +| `ONBOARDING_ALREADY_COMPLETED` | `409` | 이미 온보딩이 완료된 사용자 | diff --git a/docs/erd/user-ops.puml b/docs/erd/user-ops.puml index dcfc4054..8cf8d1f3 100644 --- a/docs/erd/user-ops.puml +++ b/docs/erd/user-ops.puml @@ -7,7 +7,7 @@ entity "USERS\n서비스 사용자" as users { * id : BIGINT <> -- user_tag : VARCHAR(30) <> - status : ENUM('PENDING', 'ACTIVE', 'DELETED') + status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') created_at : timestamp updated_at : timestamp } @@ -26,7 +26,7 @@ entity "USER_AGREEMENTS\n사용자 동의 이력" as user_agreements { * id : BIGINT <> -- user_id : BIGINT <> - agreement_type : string + agreement_type : ENUM('TERMS_OF_SERVICE', 'PRIVACY_POLICY') version : string agreed_at : timestamp } @@ -60,4 +60,10 @@ users ||--o{ user_devices users ||--o{ user_blocks : blocker users ||--o{ user_blocks : blocked +note bottom of user_blocks + 공통 컬럼 정책 + - BaseEntity: created_at, updated_at + - agreed_at, last_seen_at 은 도메인별 개별 컬럼 +end note + @enduml diff --git a/docs/erd/user.puml b/docs/erd/user.puml index e34d53a5..c0572811 100644 --- a/docs/erd/user.puml +++ b/docs/erd/user.puml @@ -8,7 +8,7 @@ entity "USERS\n서비스 사용자" as users { -- user_tag : VARCHAR(30) <> role : ENUM('USER', 'ADMIN') - status : ENUM('PENDING', 'ACTIVE', 'DELETED') + status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') onboarding_completed : boolean created_at : timestamp updated_at : timestamp @@ -19,7 +19,7 @@ entity "USER_PROFILES\n사용자 프로필" as user_profiles { * user_id : BIGINT <> -- nickname : string - character_type : ENUM('owl', 'fox', '...') + character_type : ENUM('owl', 'fox', 'wolf', 'lion', 'penguin', 'bear', 'rabbit', 'cat') manner_temperature : float updated_at : timestamp } @@ -68,4 +68,10 @@ note right of user_profiles user_tag를 대외 식별자로 활용 end note +note bottom of user_tendency_score_histories + 공통 컬럼 정책 + - BaseEntity: created_at, updated_at + - deleted_at 은 users 에만 개별 보유 +end note + @enduml diff --git a/src/main/java/com/swyp/app/domain/user/controller/UserController.java b/src/main/java/com/swyp/app/domain/user/controller/UserController.java new file mode 100644 index 00000000..15c1e4ee --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/controller/UserController.java @@ -0,0 +1,91 @@ +package com.swyp.app.domain.user.controller; + +import com.swyp.app.domain.user.dto.request.CreateOnboardingProfileRequest; +import com.swyp.app.domain.user.dto.request.UpdateTendencyScoreRequest; +import com.swyp.app.domain.user.dto.request.UpdateUserProfileRequest; +import com.swyp.app.domain.user.dto.request.UpdateUserSettingsRequest; +import com.swyp.app.domain.user.dto.response.BootstrapResponse; +import com.swyp.app.domain.user.dto.response.MyProfileResponse; +import com.swyp.app.domain.user.dto.response.OnboardingProfileResponse; +import com.swyp.app.domain.user.dto.response.TendencyScoreHistoryResponse; +import com.swyp.app.domain.user.dto.response.TendencyScoreResponse; +import com.swyp.app.domain.user.dto.response.UpdateResultResponse; +import com.swyp.app.domain.user.dto.response.UserProfileResponse; +import com.swyp.app.domain.user.dto.response.UserSettingsResponse; +import com.swyp.app.domain.user.service.UserService; +import com.swyp.app.global.common.response.ApiResponse; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1") +public class UserController { + + private final UserService userService; + + @GetMapping("/onboarding/bootstrap") + public ApiResponse getBootstrap() { + return ApiResponse.onSuccess(userService.getBootstrap()); + } + + @PostMapping("/onboarding/profile") + public ApiResponse createOnboardingProfile( + @Valid @RequestBody CreateOnboardingProfileRequest request + ) { + return ApiResponse.onSuccess(userService.createOnboardingProfile(request)); + } + + @GetMapping("/users/{userTag}") + public ApiResponse getUserProfile(@PathVariable String userTag) { + return ApiResponse.onSuccess(userService.getUserProfile(userTag)); + } + + @GetMapping("/me/profile") + public ApiResponse getMyProfile() { + return ApiResponse.onSuccess(userService.getMyProfile()); + } + + @PatchMapping("/me/profile") + public ApiResponse updateMyProfile( + @Valid @RequestBody UpdateUserProfileRequest request + ) { + return ApiResponse.onSuccess(userService.updateMyProfile(request)); + } + + @GetMapping("/me/settings") + public ApiResponse getMySettings() { + return ApiResponse.onSuccess(userService.getMySettings()); + } + + @PatchMapping("/me/settings") + public ApiResponse updateMySettings( + @Valid @RequestBody UpdateUserSettingsRequest request + ) { + return ApiResponse.onSuccess(userService.updateMySettings(request)); + } + + @PutMapping("/me/tendency-scores") + public ApiResponse updateMyTendencyScores( + @Valid @RequestBody UpdateTendencyScoreRequest request + ) { + return ApiResponse.onSuccess(userService.updateMyTendencyScores(request)); + } + + @GetMapping("/me/tendency-scores/history") + public ApiResponse getMyTendencyScoreHistory( + @RequestParam(required = false) Long cursor, + @RequestParam(required = false) Integer size + ) { + return ApiResponse.onSuccess(userService.getMyTendencyScoreHistory(cursor, size)); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java new file mode 100644 index 00000000..f00047d7 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.user.dto.request; + +import com.swyp.app.domain.user.entity.CharacterType; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record CreateOnboardingProfileRequest( + @NotBlank + @Size(min = 2, max = 20) + String nickname, + @NotNull + CharacterType characterType +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java new file mode 100644 index 00000000..2cde0bc2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java @@ -0,0 +1,20 @@ +package com.swyp.app.domain.user.dto.request; + +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; + +public record UpdateTendencyScoreRequest( + @Min(-100) @Max(100) + int score1, + @Min(-100) @Max(100) + int score2, + @Min(-100) @Max(100) + int score3, + @Min(-100) @Max(100) + int score4, + @Min(-100) @Max(100) + int score5, + @Min(-100) @Max(100) + int score6 +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserProfileRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserProfileRequest.java new file mode 100644 index 00000000..d287da78 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserProfileRequest.java @@ -0,0 +1,21 @@ +package com.swyp.app.domain.user.dto.request; + +import com.swyp.app.domain.user.entity.CharacterType; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Size; + +public record UpdateUserProfileRequest( + @Size(min = 2, max = 20) + String nickname, + CharacterType characterType +) { + @AssertTrue(message = "적어도 하나 이상의 프로필 값이 필요합니다.") + public boolean hasAnyFieldToUpdate() { + return nickname != null || characterType != null; + } + + @AssertTrue(message = "nickname은 공백만 입력할 수 없습니다.") + public boolean hasValidNickname() { + return nickname == null || !nickname.isBlank(); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java new file mode 100644 index 00000000..a0a067b7 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.user.dto.request; + +import jakarta.validation.constraints.AssertTrue; + +public record UpdateUserSettingsRequest( + Boolean pushEnabled, + Boolean emailEnabled, + Boolean debateRequestEnabled, + Boolean profilePublic +) { + @AssertTrue(message = "적어도 하나 이상의 설정값이 필요합니다.") + public boolean hasAnySettingToUpdate() { + return pushEnabled != null + || emailEnabled != null + || debateRequestEnabled != null + || profilePublic != null; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java new file mode 100644 index 00000000..60cfd4aa --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.user.dto.response; + +public record BootstrapResponse( + String randomNickname +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java new file mode 100644 index 00000000..1f7a3578 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.user.entity.CharacterType; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +public record MyProfileResponse( + String userTag, + String nickname, + CharacterType characterType, + BigDecimal mannerTemperature, + LocalDateTime updatedAt +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java new file mode 100644 index 00000000..6c67ab4a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java @@ -0,0 +1,16 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.user.entity.CharacterType; +import com.swyp.app.domain.user.entity.UserStatus; + +import java.math.BigDecimal; + +public record OnboardingProfileResponse( + String userTag, + String nickname, + CharacterType characterType, + BigDecimal mannerTemperature, + UserStatus status, + boolean onboardingCompleted +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java new file mode 100644 index 00000000..96aa08e5 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.user.dto.response; + +import java.time.LocalDateTime; + +public record TendencyScoreHistoryItemResponse( + Long historyId, + int score1, + int score2, + int score3, + int score4, + int score5, + int score6, + LocalDateTime createdAt +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java new file mode 100644 index 00000000..d125ef12 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java @@ -0,0 +1,9 @@ +package com.swyp.app.domain.user.dto.response; + +import java.util.List; + +public record TendencyScoreHistoryResponse( + List items, + Long nextCursor +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java new file mode 100644 index 00000000..14b697b8 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java @@ -0,0 +1,16 @@ +package com.swyp.app.domain.user.dto.response; + +import java.time.LocalDateTime; + +public record TendencyScoreResponse( + String userTag, + int score1, + int score2, + int score3, + int score4, + int score5, + int score6, + LocalDateTime updatedAt, + boolean historySaved +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java new file mode 100644 index 00000000..c5ee9cb9 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.user.dto.response; + +public record UpdateResultResponse( + boolean updated +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java new file mode 100644 index 00000000..f1bdce73 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.user.entity.CharacterType; + +import java.math.BigDecimal; + +public record UserProfileResponse( + String userTag, + String nickname, + CharacterType characterType, + BigDecimal mannerTemperature +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java new file mode 100644 index 00000000..a1c8965b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java @@ -0,0 +1,9 @@ +package com.swyp.app.domain.user.dto.response; + +public record UserSettingsResponse( + boolean pushEnabled, + boolean emailEnabled, + boolean debateRequestEnabled, + boolean profilePublic +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/AgreementType.java b/src/main/java/com/swyp/app/domain/user/entity/AgreementType.java new file mode 100644 index 00000000..18be442a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/AgreementType.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.user.entity; + +public enum AgreementType { + TERMS_OF_SERVICE, + PRIVACY_POLICY +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/CharacterType.java b/src/main/java/com/swyp/app/domain/user/entity/CharacterType.java new file mode 100644 index 00000000..e26e5b6d --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/CharacterType.java @@ -0,0 +1,36 @@ +package com.swyp.app.domain.user.entity; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +import java.util.Arrays; + +public enum CharacterType { + OWL("owl"), + FOX("fox"), + WOLF("wolf"), + LION("lion"), + PENGUIN("penguin"), + BEAR("bear"), + RABBIT("rabbit"), + CAT("cat"); + + private final String value; + + CharacterType(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @JsonCreator + public static CharacterType from(String value) { + return Arrays.stream(values()) + .filter(type -> type.value.equalsIgnoreCase(value)) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("Unknown character type: " + value)); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java b/src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java new file mode 100644 index 00000000..287a5209 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.user.entity; + +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; + +@Converter(autoApply = true) +public class CharacterTypeConverter implements AttributeConverter { + + @Override + public String convertToDatabaseColumn(CharacterType attribute) { + return attribute == null ? null : attribute.getValue(); + } + + @Override + public CharacterType convertToEntityAttribute(String dbData) { + return dbData == null ? null : CharacterType.from(dbData); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/User.java b/src/main/java/com/swyp/app/domain/user/entity/User.java new file mode 100644 index 00000000..fcaaf6f3 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/User.java @@ -0,0 +1,58 @@ +package com.swyp.app.domain.user.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Getter +@Entity +@Table(name = "users") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class User extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "user_tag", nullable = false, unique = true, length = 30) + private String userTag; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private UserRole role; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private UserStatus status; + + @Column(name = "onboarding_completed", nullable = false) + private boolean onboardingCompleted; + + @Column(name = "deleted_at") + private LocalDateTime deletedAt; + + @Builder + private User(String userTag, UserRole role, UserStatus status, boolean onboardingCompleted) { + this.userTag = userTag; + this.role = role; + this.status = status; + this.onboardingCompleted = onboardingCompleted; + } + + public void completeOnboarding() { + this.status = UserStatus.ACTIVE; + this.onboardingCompleted = true; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserAgreement.java b/src/main/java/com/swyp/app/domain/user/entity/UserAgreement.java new file mode 100644 index 00000000..c719acce --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/UserAgreement.java @@ -0,0 +1,53 @@ +package com.swyp.app.domain.user.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Getter +@Entity +@Table(name = "user_agreements") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class UserAgreement extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @Enumerated(EnumType.STRING) + @Column(name = "agreement_type", nullable = false, length = 50) + private AgreementType agreementType; + + @Column(nullable = false, length = 20) + private String version; + + @Column(name = "agreed_at", nullable = false) + private LocalDateTime agreedAt; + + @Builder + private UserAgreement(User user, AgreementType agreementType, String version, LocalDateTime agreedAt) { + this.user = user; + this.agreementType = agreementType; + this.version = version; + this.agreedAt = agreedAt; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserProfile.java b/src/main/java/com/swyp/app/domain/user/entity/UserProfile.java new file mode 100644 index 00000000..51a7e836 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/UserProfile.java @@ -0,0 +1,54 @@ +package com.swyp.app.domain.user.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Getter +@Entity +@Table(name = "user_profiles") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class UserProfile extends BaseEntity { + + @Id + private Long userId; + + @MapsId + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + private String nickname; + + private CharacterType characterType; + + private BigDecimal mannerTemperature; + + @Builder + private UserProfile(User user, String nickname, CharacterType characterType, BigDecimal mannerTemperature) { + this.user = user; + this.nickname = nickname; + this.characterType = characterType; + this.mannerTemperature = mannerTemperature; + } + + public void update(String nickname, CharacterType characterType) { + if (nickname != null && !nickname.isBlank()) { + this.nickname = nickname; + } + if (characterType != null) { + this.characterType = characterType; + } + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserRole.java b/src/main/java/com/swyp/app/domain/user/entity/UserRole.java new file mode 100644 index 00000000..60fe0419 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/UserRole.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.user.entity; + +public enum UserRole { + USER, + ADMIN +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserSettings.java b/src/main/java/com/swyp/app/domain/user/entity/UserSettings.java new file mode 100644 index 00000000..e1415936 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/UserSettings.java @@ -0,0 +1,61 @@ +package com.swyp.app.domain.user.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "user_settings") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class UserSettings extends BaseEntity { + + @Id + private Long userId; + + @MapsId + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + private boolean pushEnabled; + + private boolean emailEnabled; + + private boolean debateRequestEnabled; + + private boolean profilePublic; + + @Builder + private UserSettings(User user, boolean pushEnabled, boolean emailEnabled, boolean debateRequestEnabled, boolean profilePublic) { + this.user = user; + this.pushEnabled = pushEnabled; + this.emailEnabled = emailEnabled; + this.debateRequestEnabled = debateRequestEnabled; + this.profilePublic = profilePublic; + } + + public void update(Boolean pushEnabled, Boolean emailEnabled, Boolean debateRequestEnabled, Boolean profilePublic) { + if (pushEnabled != null) { + this.pushEnabled = pushEnabled; + } + if (emailEnabled != null) { + this.emailEnabled = emailEnabled; + } + if (debateRequestEnabled != null) { + this.debateRequestEnabled = debateRequestEnabled; + } + if (profilePublic != null) { + this.profilePublic = profilePublic; + } + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserStatus.java b/src/main/java/com/swyp/app/domain/user/entity/UserStatus.java new file mode 100644 index 00000000..8b6aa8d6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/UserStatus.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.user.entity; + +public enum UserStatus { + PENDING, + ACTIVE, + DELETED, + BANNED +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java new file mode 100644 index 00000000..093e11e7 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java @@ -0,0 +1,56 @@ +package com.swyp.app.domain.user.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "user_tendency_scores") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class UserTendencyScore extends BaseEntity { + + @Id + private Long userId; + + @MapsId + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + private int score1; + private int score2; + private int score3; + private int score4; + private int score5; + private int score6; + + @Builder + private UserTendencyScore(User user, int score1, int score2, int score3, int score4, int score5, int score6) { + this.user = user; + this.score1 = score1; + this.score2 = score2; + this.score3 = score3; + this.score4 = score4; + this.score5 = score5; + this.score6 = score6; + } + + public void update(int score1, int score2, int score3, int score4, int score5, int score6) { + this.score1 = score1; + this.score2 = score2; + this.score3 = score3; + this.score4 = score4; + this.score5 = score5; + this.score6 = score6; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java new file mode 100644 index 00000000..9cbf6de2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java @@ -0,0 +1,48 @@ +package com.swyp.app.domain.user.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "user_tendency_score_histories") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class UserTendencyScoreHistory extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + private int score1; + private int score2; + private int score3; + private int score4; + private int score5; + private int score6; + + @Builder + private UserTendencyScoreHistory(User user, int score1, int score2, int score3, int score4, int score5, int score6) { + this.user = user; + this.score1 = score1; + this.score2 = score2; + this.score3 = score3; + this.score4 = score4; + this.score5 = score5; + this.score6 = score6; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserAgreementRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserAgreementRepository.java new file mode 100644 index 00000000..a5da4266 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/repository/UserAgreementRepository.java @@ -0,0 +1,7 @@ +package com.swyp.app.domain.user.repository; + +import com.swyp.app.domain.user.entity.UserAgreement; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserAgreementRepository extends JpaRepository { +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java new file mode 100644 index 00000000..510ef9b1 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java @@ -0,0 +1,7 @@ +package com.swyp.app.domain.user.repository; + +import com.swyp.app.domain.user.entity.UserProfile; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserProfileRepository extends JpaRepository { +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java new file mode 100644 index 00000000..7691467c --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java @@ -0,0 +1,12 @@ +package com.swyp.app.domain.user.repository; + +import com.swyp.app.domain.user.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface UserRepository extends JpaRepository { + Optional findByUserTag(String userTag); + Optional findTopByOrderByIdDesc(); + boolean existsByUserTag(String userTag); +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java new file mode 100644 index 00000000..6559e6fe --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java @@ -0,0 +1,7 @@ +package com.swyp.app.domain.user.repository; + +import com.swyp.app.domain.user.entity.UserSettings; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserSettingsRepository extends JpaRepository { +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreHistoryRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreHistoryRepository.java new file mode 100644 index 00000000..e7c4d451 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreHistoryRepository.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.user.repository; + +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserTendencyScoreHistory; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface UserTendencyScoreHistoryRepository extends JpaRepository { + List findByUserOrderByIdDesc(User user, Pageable pageable); + List findByUserAndIdLessThanOrderByIdDesc(User user, Long id, Pageable pageable); +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java new file mode 100644 index 00000000..db4324d6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java @@ -0,0 +1,7 @@ +package com.swyp.app.domain.user.repository; + +import com.swyp.app.domain.user.entity.UserTendencyScore; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserTendencyScoreRepository extends JpaRepository { +} diff --git a/src/main/java/com/swyp/app/domain/user/service/UserService.java b/src/main/java/com/swyp/app/domain/user/service/UserService.java new file mode 100644 index 00000000..6332c48e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/service/UserService.java @@ -0,0 +1,304 @@ +package com.swyp.app.domain.user.service; + +import com.swyp.app.domain.user.dto.request.CreateOnboardingProfileRequest; +import com.swyp.app.domain.user.dto.request.UpdateTendencyScoreRequest; +import com.swyp.app.domain.user.dto.request.UpdateUserProfileRequest; +import com.swyp.app.domain.user.dto.request.UpdateUserSettingsRequest; +import com.swyp.app.domain.user.dto.response.BootstrapResponse; +import com.swyp.app.domain.user.dto.response.MyProfileResponse; +import com.swyp.app.domain.user.dto.response.OnboardingProfileResponse; +import com.swyp.app.domain.user.dto.response.TendencyScoreHistoryItemResponse; +import com.swyp.app.domain.user.dto.response.TendencyScoreHistoryResponse; +import com.swyp.app.domain.user.dto.response.TendencyScoreResponse; +import com.swyp.app.domain.user.dto.response.UpdateResultResponse; +import com.swyp.app.domain.user.dto.response.UserProfileResponse; +import com.swyp.app.domain.user.dto.response.UserSettingsResponse; +import com.swyp.app.domain.user.entity.AgreementType; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserAgreement; +import com.swyp.app.domain.user.entity.UserProfile; +import com.swyp.app.domain.user.entity.UserRole; +import com.swyp.app.domain.user.entity.UserSettings; +import com.swyp.app.domain.user.entity.UserStatus; +import com.swyp.app.domain.user.entity.UserTendencyScore; +import com.swyp.app.domain.user.entity.UserTendencyScoreHistory; +import com.swyp.app.domain.user.repository.UserProfileRepository; +import com.swyp.app.domain.user.repository.UserAgreementRepository; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.domain.user.repository.UserSettingsRepository; +import com.swyp.app.domain.user.repository.UserTendencyScoreHistoryRepository; +import com.swyp.app.domain.user.repository.UserTendencyScoreRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; +import java.util.concurrent.ThreadLocalRandom; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class UserService { + + private static final String[] PREFIXES = {"생각하는", "집중하는", "차분한", "기민한", "용감한", "명확한"}; + private static final String[] SUFFIXES = {"올빼미", "여우", "늑대", "사자", "펭귄", "토끼", "고양이", "곰"}; + private static final BigDecimal DEFAULT_MANNER_TEMPERATURE = BigDecimal.valueOf(36.5); + private static final int DEFAULT_HISTORY_SIZE = 20; + private static final String DEFAULT_AGREEMENT_VERSION = "1.0"; + private static final String USER_TAG_CHARACTERS = "abcdefghijklmnopqrstuvwxyz0123456789"; + private static final int USER_TAG_LENGTH = 8; + + private final UserRepository userRepository; + private final UserAgreementRepository userAgreementRepository; + private final UserProfileRepository userProfileRepository; + private final UserSettingsRepository userSettingsRepository; + private final UserTendencyScoreRepository userTendencyScoreRepository; + private final UserTendencyScoreHistoryRepository userTendencyScoreHistoryRepository; + + public BootstrapResponse getBootstrap() { + return new BootstrapResponse(generateRandomNickname()); + } + + @Transactional + public OnboardingProfileResponse createOnboardingProfile(CreateOnboardingProfileRequest request) { + User user = userRepository.findTopByOrderByIdDesc() + .orElseGet(this::createPendingUser); + + if (user.isOnboardingCompleted()) { + throw new CustomException(ErrorCode.ONBOARDING_ALREADY_COMPLETED); + } + + UserProfile profile = UserProfile.builder() + .user(user) + .nickname(request.nickname()) + .characterType(request.characterType()) + .mannerTemperature(DEFAULT_MANNER_TEMPERATURE) + .build(); + + UserSettings settings = UserSettings.builder() + .user(user) + .pushEnabled(false) + .emailEnabled(false) + .debateRequestEnabled(false) + .profilePublic(false) + .build(); + + UserTendencyScore tendencyScore = UserTendencyScore.builder() + .user(user) + .score1(0) + .score2(0) + .score3(0) + .score4(0) + .score5(0) + .score6(0) + .build(); + + userProfileRepository.save(profile); + userSettingsRepository.save(settings); + userTendencyScoreRepository.save(tendencyScore); + saveRequiredAgreements(user); + + user.completeOnboarding(); + + return new OnboardingProfileResponse( + user.getUserTag(), + profile.getNickname(), + profile.getCharacterType(), + profile.getMannerTemperature(), + user.getStatus(), + user.isOnboardingCompleted() + ); + } + + public UserProfileResponse getUserProfile(String userTag) { + User user = findUserByTag(userTag); + UserProfile profile = findUserProfile(user.getId()); + return new UserProfileResponse(user.getUserTag(), profile.getNickname(), profile.getCharacterType(), profile.getMannerTemperature()); + } + + public MyProfileResponse getMyProfile() { + User user = findCurrentUser(); + UserProfile profile = findUserProfile(user.getId()); + return new MyProfileResponse( + user.getUserTag(), + profile.getNickname(), + profile.getCharacterType(), + profile.getMannerTemperature(), + profile.getUpdatedAt() + ); + } + + @Transactional + public MyProfileResponse updateMyProfile(UpdateUserProfileRequest request) { + User user = findCurrentUser(); + UserProfile profile = findUserProfile(user.getId()); + profile.update(request.nickname(), request.characterType()); + return new MyProfileResponse( + user.getUserTag(), + profile.getNickname(), + profile.getCharacterType(), + profile.getMannerTemperature(), + profile.getUpdatedAt() + ); + } + + public UserSettingsResponse getMySettings() { + UserSettings settings = findUserSettings(findCurrentUser().getId()); + return new UserSettingsResponse( + settings.isPushEnabled(), + settings.isEmailEnabled(), + settings.isDebateRequestEnabled(), + settings.isProfilePublic() + ); + } + + @Transactional + public UpdateResultResponse updateMySettings(UpdateUserSettingsRequest request) { + UserSettings settings = findUserSettings(findCurrentUser().getId()); + settings.update( + request.pushEnabled(), + request.emailEnabled(), + request.debateRequestEnabled(), + request.profilePublic() + ); + return new UpdateResultResponse(true); + } + + @Transactional + public TendencyScoreResponse updateMyTendencyScores(UpdateTendencyScoreRequest request) { + User user = findCurrentUser(); + UserTendencyScore score = findUserTendencyScore(user.getId()); + score.update( + request.score1(), + request.score2(), + request.score3(), + request.score4(), + request.score5(), + request.score6() + ); + + userTendencyScoreHistoryRepository.save(UserTendencyScoreHistory.builder() + .user(user) + .score1(request.score1()) + .score2(request.score2()) + .score3(request.score3()) + .score4(request.score4()) + .score5(request.score5()) + .score6(request.score6()) + .build()); + + return new TendencyScoreResponse( + user.getUserTag(), + score.getScore1(), + score.getScore2(), + score.getScore3(), + score.getScore4(), + score.getScore5(), + score.getScore6(), + score.getUpdatedAt(), + true + ); + } + + public TendencyScoreHistoryResponse getMyTendencyScoreHistory(Long cursor, Integer size) { + User user = findCurrentUser(); + int pageSize = size == null || size <= 0 ? DEFAULT_HISTORY_SIZE : size; + PageRequest pageable = PageRequest.of(0, pageSize); + + List histories = cursor == null + ? userTendencyScoreHistoryRepository.findByUserOrderByIdDesc(user, pageable) + : userTendencyScoreHistoryRepository.findByUserAndIdLessThanOrderByIdDesc(user, cursor, pageable); + + List items = histories.stream() + .map(history -> new TendencyScoreHistoryItemResponse( + history.getId(), + history.getScore1(), + history.getScore2(), + history.getScore3(), + history.getScore4(), + history.getScore5(), + history.getScore6(), + history.getCreatedAt() + )) + .toList(); + + Long nextCursor = histories.size() == pageSize ? histories.get(histories.size() - 1).getId() : null; + return new TendencyScoreHistoryResponse(items, nextCursor); + } + + private User findUserByTag(String userTag) { + return userRepository.findByUserTag(userTag) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + } + + private User findCurrentUser() { + return userRepository.findTopByOrderByIdDesc() + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + } + + private User createPendingUser() { + User user = User.builder() + .userTag(generateUserTag()) + .role(UserRole.USER) + .status(UserStatus.PENDING) + .onboardingCompleted(false) + .build(); + return userRepository.save(user); + } + + private void saveRequiredAgreements(User user) { + LocalDateTime agreedAt = LocalDateTime.now(); + userAgreementRepository.saveAll(List.of( + UserAgreement.builder() + .user(user) + .agreementType(AgreementType.TERMS_OF_SERVICE) + .version(DEFAULT_AGREEMENT_VERSION) + .agreedAt(agreedAt) + .build(), + UserAgreement.builder() + .user(user) + .agreementType(AgreementType.PRIVACY_POLICY) + .version(DEFAULT_AGREEMENT_VERSION) + .agreedAt(agreedAt) + .build() + )); + } + + private UserProfile findUserProfile(Long userId) { + return userProfileRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + } + + private UserSettings findUserSettings(Long userId) { + return userSettingsRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + } + + private UserTendencyScore findUserTendencyScore(Long userId) { + return userTendencyScoreRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + } + + private String generateRandomNickname() { + return PREFIXES[ThreadLocalRandom.current().nextInt(PREFIXES.length)] + + SUFFIXES[ThreadLocalRandom.current().nextInt(SUFFIXES.length)]; + } + + private String generateUserTag() { + String candidate; + do { + StringBuilder builder = new StringBuilder(USER_TAG_LENGTH); + for (int i = 0; i < USER_TAG_LENGTH; i++) { + int index = ThreadLocalRandom.current().nextInt(USER_TAG_CHARACTERS.length()); + builder.append(USER_TAG_CHARACTERS.charAt(index)); + } + candidate = builder.toString(); + } while (userRepository.existsByUserTag(candidate)); + return candidate; + } +} diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 122fcaa6..5cef13a5 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -10,12 +10,17 @@ public enum ErrorCode { // Common INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_500", "서버 에러, 관리자에게 문의하세요."), BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON_400", "잘못된 요청입니다."), + AUTH_UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "AUTH_401", "인증 정보가 필요합니다."), // Battle & Tag BATTLE_NOT_FOUND(HttpStatus.NOT_FOUND, "BATTLE_404", "존재하지 않는 배틀입니다."), - TAG_NOT_FOUND(HttpStatus.NOT_FOUND, "TAG_404", "존재하지 않는 태그입니다."); + TAG_NOT_FOUND(HttpStatus.NOT_FOUND, "TAG_404", "존재하지 않는 태그입니다."), + + // User + USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 사용자입니다."), + ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "USER_409", "이미 온보딩이 완료된 사용자입니다."); private final HttpStatus httpStatus; private final String code; private final String message; -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java index aade7409..135cae06 100644 --- a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java @@ -1,10 +1,14 @@ package com.swyp.app.global.common.exception; import com.swyp.app.global.common.response.ApiResponse; +import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; @Slf4j @RestControllerAdvice @@ -18,6 +22,21 @@ public ResponseEntity> handleCustomException(CustomException e .body(ApiResponse.onFailure(code.getHttpStatus().value(), code.getCode(), code.getMessage())); } + @ExceptionHandler({ + HttpMessageNotReadableException.class, + MethodArgumentTypeMismatchException.class, + MethodArgumentNotValidException.class, + ConstraintViolationException.class, + IllegalArgumentException.class + }) + public ResponseEntity> handleBadRequest(Exception e) { + log.warn("Bad Request: {}", e.getMessage()); + ErrorCode code = ErrorCode.BAD_REQUEST; + return ResponseEntity + .status(code.getHttpStatus()) + .body(ApiResponse.onFailure(code.getHttpStatus().value(), code.getCode(), code.getMessage())); + } + @ExceptionHandler(Exception.class) public ResponseEntity> handleAllException(Exception e) { log.error("Internal Server Error: ", e); @@ -26,4 +45,4 @@ public ResponseEntity> handleAllException(Exception e) { .status(code.getHttpStatus()) .body(ApiResponse.onFailure(500, code.getCode(), code.getMessage())); } -} \ No newline at end of file +} diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml new file mode 100644 index 00000000..3262fa00 --- /dev/null +++ b/src/test/resources/application.yml @@ -0,0 +1,13 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb;MODE=PostgreSQL;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE + driver-class-name: org.h2.Driver + username: sa + password: + + jpa: + hibernate: + ddl-auto: create-drop + properties: + hibernate: + dialect: org.hibernate.dialect.H2Dialect From 8d57f66787673a4c578d1fb734b4733f3f591dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A4=80=ED=98=81?= <127603139+HYH0804@users.noreply.github.com> Date: Sun, 15 Mar 2026 16:05:16 +0900 Subject: [PATCH 10/94] =?UTF-8?q?#17=20[Feat]=20Perspective=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EB=B0=9C=20?= =?UTF-8?q?(#26)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - #17 ## 📝 작업 내용 ### ✨ Feat | 내용 | 파일 | |------|------| | Perspective 엔티티 및 상태(PerspectiveStatus) 구현 | `Perspective.java`, `PerspectiveStatus.java` | | PerspectiveComment 엔티티 구현 | `PerspectiveComment.java` | | PerspectiveLike 엔티티 구현 (UUID PK + UniqueConstraint) | `PerspectiveLike.java` | | 관점 생성 / 조회 / 수정 / 삭제 API 구현 | `PerspectiveController.java`, `PerspectiveService.java` | | 내 PENDING 관점 조회 API 구현 | `PerspectiveController.java`, `PerspectiveService.java` | | 관점 댓글 생성 / 조회 / 수정 / 삭제 API 구현 | `PerspectiveCommentController.java`, `PerspectiveCommentService.java` | | 관점 좋아요 조회 / 등록 / 취소 API 구현 | `PerspectiveLikeController.java`, `PerspectiveLikeService.java` | | 흥미 기반 배틀 추천 조회 API 구현 (커서 페이지네이션, 정책 미확정) | `RecommendationController.java`, `RecommendationService.java` | | 투표 통계 조회 / 내 투표 내역 조회 API 구현 | `VoteController.java`, `VoteServiceImpl.java` | | 타 도메인 의존 서비스 인터페이스 + 구현체 구현 (Battle, Vote, User, Tag) | `BattleServiceImpl.java`,`UserQueryServiceImpl.java`, `TagServiceImpl.java` | | User 엔티티 및 Repository 구현 | `User.java`, `UserRepository.java` | | 에러코드 추가 (Perspective / Comment / Like / Vote / User) | `ErrorCode.java` | | 로컬 개발환경 DB 설정 (application-local.yml, .gitignore 추가) | `application-local.yml`, `.gitignore` | | perspectives-api.md 명세 업데이트 (내 PENDING 관점 조회 추가) | `perspectives-api.md` | ### ♻️ Refactor | 내용 | 파일 | |------|------| | 관점 목록 조회 시 PUBLISHED 상태만 반환하도록 수정 | `PerspectiveRepository.java`, `PerspectiveService.java` | | 좋아요 수 조회를 캐시 카운터 대신 실제 DB count로 변경 | `PerspectiveLikeService.java`, `PerspectiveLikeRepository.java` | | 추천 응답에 커서 페이지네이션(nextCursor, hasNext) 추가 | `RecommendationListResponse.java` | ### 🐛 Fix | 내용 | 파일 | |------|------| | 본인 관점에 좋아요 방지 로직 추가 | `PerspectiveLikeService.java` | ## 📌 공유 사항 > 1. Security 미적용으로 인해 userId가 각 Controller에 `1L`로 하드코딩되어 있습니다. Security 적용 후 `@AuthenticationPrincipal`로 교체 필요합니다. > 2. Battle / Vote / User / Tag 서비스는 각 도메인 병합 전 임시 구현으로, 추후 해당 도메인 담당자와 로직 통합이 필요합니다. > 3. 흥미 기반 배틀 추천 정책이 미확정 상태로, 현재는 빈 리스트를 반환합니다. ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [x] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 Perspective 도메인 관련 스웨거 명세입니다. image ## 💬 리뷰 요구사항 > 1. 타 도메인(Battle, User, Vote, Tag) 서비스 구현체를 임시로 포함했습니다. 리뷰하실때 엔티티랑 도메인 ServiceImpl 만 확인해주시면 Merge Confilict는 제가 해결해서 Merge 시켜놓겠습니다. --- .gitignore | 3 +- build.gradle | 2 + docs/api-specs/perspectives-api.md | 36 +++++ docs/api-specs/recommendations-api.md | 120 +++----------- .../swyp/app/domain/battle/entity/Battle.java | 74 +++++++++ .../battle/entity/BattleCreatorType.java | 5 + .../domain/battle/entity/BattleOption.java | 69 +++++++++ .../battle/entity/BattleOptionLabel.java | 5 + .../domain/battle/entity/BattleStatus.java | 5 + .../app/domain/battle/entity/BattleTag.java | 46 ++++++ .../repository/BattleOptionRepository.java | 17 ++ .../battle/repository/BattleRepository.java | 9 ++ .../repository/BattleTagRepository.java | 13 ++ .../domain/battle/service/BattleService.java | 16 ++ .../battle/service/BattleServiceImpl.java | 40 +++++ .../PerspectiveCommentController.java | 80 ++++++++++ .../controller/PerspectiveController.java | 87 +++++++++++ .../controller/PerspectiveLikeController.java | 48 ++++++ .../dto/request/CreateCommentRequest.java | 8 + .../dto/request/CreatePerspectiveRequest.java | 8 + .../dto/request/UpdateCommentRequest.java | 8 + .../dto/request/UpdatePerspectiveRequest.java | 8 + .../dto/response/CommentListResponse.java | 21 +++ .../dto/response/CreateCommentResponse.java | 13 ++ .../response/CreatePerspectiveResponse.java | 12 ++ .../dto/response/LikeCountResponse.java | 5 + .../dto/response/LikeResponse.java | 5 + .../dto/response/MyPerspectiveResponse.java | 13 ++ .../dto/response/PerspectiveListResponse.java | 34 ++++ .../dto/response/UpdateCommentResponse.java | 10 ++ .../response/UpdatePerspectiveResponse.java | 10 ++ .../perspective/entity/Perspective.java | 96 ++++++++++++ .../entity/PerspectiveComment.java | 51 ++++++ .../perspective/entity/PerspectiveLike.java | 47 ++++++ .../perspective/entity/PerspectiveStatus.java | 5 + .../PerspectiveCommentRepository.java | 17 ++ .../repository/PerspectiveLikeRepository.java | 17 ++ .../repository/PerspectiveRepository.java | 26 ++++ .../service/PerspectiveCommentService.java | 123 +++++++++++++++ .../service/PerspectiveLikeService.java | 69 +++++++++ .../service/PerspectiveService.java | 146 ++++++++++++++++++ .../controller/RecommendationController.java | 33 ++++ .../response/RecommendationListResponse.java | 25 +++ .../service/RecommendationService.java | 28 ++++ .../com/swyp/app/domain/tag/entity/Tag.java | 34 ++++ .../domain/tag/repository/TagRepository.java | 9 ++ .../app/domain/tag/service/TagService.java | 11 ++ .../domain/tag/service/TagServiceImpl.java | 27 ++++ .../user/repository/UserRepository.java | 1 + .../domain/user/service/UserQueryService.java | 8 + .../user/service/UserQueryServiceImpl.java | 22 +++ .../vote/controller/VoteController.java | 38 +++++ .../vote/dto/response/MyVoteResponse.java | 14 ++ .../vote/dto/response/VoteStatsResponse.java | 19 +++ .../com/swyp/app/domain/vote/entity/Vote.java | 71 +++++++++ .../app/domain/vote/entity/VoteStatus.java | 5 + .../vote/repository/VoteRepository.java | 20 +++ .../app/domain/vote/service/VoteService.java | 15 ++ .../domain/vote/service/VoteServiceImpl.java | 81 ++++++++++ .../global/common/exception/ErrorCode.java | 20 +++ 60 files changed, 1806 insertions(+), 102 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/battle/entity/Battle.java create mode 100644 src/main/java/com/swyp/app/domain/battle/entity/BattleCreatorType.java create mode 100644 src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java create mode 100644 src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java create mode 100644 src/main/java/com/swyp/app/domain/battle/entity/BattleStatus.java create mode 100644 src/main/java/com/swyp/app/domain/battle/entity/BattleTag.java create mode 100644 src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java create mode 100644 src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java create mode 100644 src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java create mode 100644 src/main/java/com/swyp/app/domain/battle/service/BattleService.java create mode 100644 src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/request/CreateCommentRequest.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/request/UpdateCommentRequest.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/CreatePerspectiveResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/LikeCountResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/LikeResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/UpdateCommentResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/UpdatePerspectiveResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java create mode 100644 src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java create mode 100644 src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java create mode 100644 src/main/java/com/swyp/app/domain/tag/entity/Tag.java create mode 100644 src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java create mode 100644 src/main/java/com/swyp/app/domain/tag/service/TagService.java create mode 100644 src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java create mode 100644 src/main/java/com/swyp/app/domain/user/service/UserQueryService.java create mode 100644 src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java create mode 100644 src/main/java/com/swyp/app/domain/vote/controller/VoteController.java create mode 100644 src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java create mode 100644 src/main/java/com/swyp/app/domain/vote/dto/response/VoteStatsResponse.java create mode 100644 src/main/java/com/swyp/app/domain/vote/entity/Vote.java create mode 100644 src/main/java/com/swyp/app/domain/vote/entity/VoteStatus.java create mode 100644 src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java create mode 100644 src/main/java/com/swyp/app/domain/vote/service/VoteService.java create mode 100644 src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java diff --git a/.gitignore b/.gitignore index edc1c6eb..2020e070 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ out/ ### Setting ### .env -postgres_data/ \ No newline at end of file +postgres_data/ +src/main/resources/application-local.yml \ No newline at end of file diff --git a/build.gradle b/build.gradle index 582eb26a..4856d4f2 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,8 @@ dependencies { developmentOnly 'org.springframework.boot:spring-boot-devtools' // PostgreSQL runtimeOnly 'org.postgresql:postgresql' + // H2 (local 프로필용) + runtimeOnly 'com.h2database:h2' // Test testRuntimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test' diff --git a/docs/api-specs/perspectives-api.md b/docs/api-specs/perspectives-api.md index 365aa730..dd60b8f9 100644 --- a/docs/api-specs/perspectives-api.md +++ b/docs/api-specs/perspectives-api.md @@ -127,6 +127,42 @@ } ``` +--- +## 내 PENDING 관점 조회 API +### `GET /api/v1/battles/{battle_id}/perspectives/me/pending` + +- 특정 배틀에서 내가 작성한 관점이 PENDING 상태인 경우 반환합니다. +- UI 상단에 검수 대기 중인 내 관점을 표시하기 위한 API입니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": { + "perspective_id": "perspective_001", + "content": "자기결정권은 가장 기본적인 인권이라고 생각해요.", + "status": "PENDING", + "created_at": "2026-03-11T12:00:00Z" + }, + "error": null +} +``` + +#### 예외 응답 `404 - PENDING 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + --- ## 관점 삭제 API ### `DELETE /api/v1/perspectives/{perspective_id}` diff --git a/docs/api-specs/recommendations-api.md b/docs/api-specs/recommendations-api.md index 7d444aae..1974890c 100644 --- a/docs/api-specs/recommendations-api.md +++ b/docs/api-specs/recommendations-api.md @@ -8,57 +8,10 @@ --- -## 성향 기반 연관 배틀 조회 API - -### `GET /api/v1/battles/{battle_id}/related` - -- 연관 배틀 조회 - -#### 성공 응답 `200 OK` - -```json -{ - "statusCode": 200, - "data": { - "items": [ - { - "battle_id": "battle_002", - "title": "유전자 편집 아기, 허용해야 할까?", - "tags": [ - { "tag_id": "tag_001", "name": "과학" }, - { "tag_id": "tag_002", "name": "윤리" } - ], - "options": [ - { "option_id": "option_A", "label": "A", "title": "허용" }, - { "option_id": "option_B", "label": "B", "title": "금지" } - ], - "participants_count": 890 - } - ] - }, - "error": null -} -``` - -#### 예외 응답 `404 - 배틀 없음` - -```json -{ - "statusCode": 404, - "data": null, - "error": { - "code": "BATTLE_NOT_FOUND", - "message": "존재하지 않는 배틀입니다.", - "errors": [] - } -} -``` - ---- ## 성향 기반 비슷한 유저가 들은 배틀 조회 API ### `GET /api/v1/battles/{battle_id}/recommendations/similar` -- 비슷한 유저가 들은 배틀 +- 비슷한 유저가 들은 배틀 , PM의 전략 미확정 (26.03.15) #### 성공 응답 `200 OK` @@ -69,17 +22,27 @@ "items": [ { "battle_id": "battle_002", - "title": "사형제도, 유지 vs 폐지", - "thumbnail_url": "https://cdn.pique.app/battle/002.png", + "title": "사후세계는 존재하는가, 인간이 만든 위안인가?", "tags": [ - { "tag_id": "tag_001", "name": "사회" } + { "tag_id": "tag_001", "name": "철학" } ], - "participants_count": 1500, + "participants_count": 1340, "options": [ - { "option_id": "option_A", "label": "A", "title": "유지" }, - { "option_id": "option_B", "label": "B", "title": "폐지" } - ], - "match_ratio": 87 + { + "option_id": "option_A", + "label": "A", + "title": "존재한다", + "representative": "플라톤", + "image_url": "https://cdn.pique.app/characters/platon.png" + }, + { + "option_id": "option_B", + "label": "B", + "title": "인간이 만든 위안이다", + "representative": "에피쿠로스", + "image_url": "https://cdn.pique.app/characters/epicurus.png" + } + ] } ] }, @@ -101,51 +64,6 @@ } ``` ---- -## 성향 기반 반대 성향 유저에게 인기 배틀 조회 API -### `GET /api/v1/battles/{battle_id}/recommendations/opposite` - -- 반대 성향 유저에게 인기 중인 배틀 - -#### 성공 응답 `200 OK` - -```json -{ - "statusCode": 200, - "data": { - "items": [ - { - "battle_id": "battle_003", - "title": "AI 판사, 도입해야 할까?", - "thumbnail_url": "https://cdn.pique.app/battle/003.png", - "tags": [ - { "tag_id": "tag_002", "name": "기술" } - ], - "participants_count": 780, - "options": [ - { "option_id": "option_A", "label": "A", "title": "도입" }, - { "option_id": "option_B", "label": "B", "title": "반대" } - ] - } - ] - }, - "error": null -} -``` - -#### 예외 응답 `404 - 배틀 없음` - -```json -{ - "statusCode": 404, - "data": null, - "error": { - "code": "BATTLE_NOT_FOUND", - "message": "존재하지 않는 배틀입니다.", - "errors": [] - } -} -``` --- ## 공통 에러 코드 diff --git a/src/main/java/com/swyp/app/domain/battle/entity/Battle.java b/src/main/java/com/swyp/app/domain/battle/entity/Battle.java new file mode 100644 index 00000000..2b79cc67 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/entity/Battle.java @@ -0,0 +1,74 @@ +package com.swyp.app.domain.battle.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.UUID; + +@Getter +@Entity +@Table(name = "battles") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Battle extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, length = 255) + private String title; + + @Column(length = 500) + private String summary; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(name = "thumbnail_url", length = 500) + private String thumbnailUrl; + + @Column(name = "target_date") + private LocalDate targetDate; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private BattleStatus status; + + @Enumerated(EnumType.STRING) + @Column(name = "creator_type", nullable = false, length = 10) + private BattleCreatorType creatorType; + + // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "creator_id") 로 교체 + @Column(name = "creator_id") + private Long creatorId; + + @Column(name = "reject_reason", length = 500) + private String rejectReason; + + @Builder + private Battle(String title, String summary, String description, String thumbnailUrl, + LocalDate targetDate, BattleStatus status, BattleCreatorType creatorType, + Long creatorId, String rejectReason) { + this.title = title; + this.summary = summary; + this.description = description; + this.thumbnailUrl = thumbnailUrl; + this.targetDate = targetDate; + this.status = status; + this.creatorType = creatorType; + this.creatorId = creatorId; + this.rejectReason = rejectReason; + } +} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleCreatorType.java b/src/main/java/com/swyp/app/domain/battle/entity/BattleCreatorType.java new file mode 100644 index 00000000..6367ac57 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/entity/BattleCreatorType.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.battle.entity; + +public enum BattleCreatorType { + ADMIN, USER, AI +} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java b/src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java new file mode 100644 index 00000000..54683de8 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java @@ -0,0 +1,69 @@ +package com.swyp.app.domain.battle.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Getter +@Entity +@Table(name = "battle_options") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class BattleOption { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "battle_id", nullable = false) + private Battle battle; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 5) + private BattleOptionLabel label; + + @Column(nullable = false, length = 100) + private String title; + + @Column(length = 255) + private String stance; + + @Column(length = 100) + private String representative; + + @Column(columnDefinition = "TEXT") + private String quote; + + @Column(columnDefinition = "jsonb") + private String keywords; + + @Column(name = "image_url", length = 500) + private String imageUrl; + + @Builder + private BattleOption(Battle battle, BattleOptionLabel label, String title, String stance, + String representative, String quote, String keywords, String imageUrl) { + this.battle = battle; + this.label = label; + this.title = title; + this.stance = stance; + this.representative = representative; + this.quote = quote; + this.keywords = keywords; + this.imageUrl = imageUrl; + } +} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java b/src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java new file mode 100644 index 00000000..7cc47848 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.battle.entity; + +public enum BattleOptionLabel { + A, B +} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleStatus.java b/src/main/java/com/swyp/app/domain/battle/entity/BattleStatus.java new file mode 100644 index 00000000..5c7cf55b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/entity/BattleStatus.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.battle.entity; + +public enum BattleStatus { + DRAFT, PENDING, PUBLISHED, REJECTED, ARCHIVED +} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleTag.java b/src/main/java/com/swyp/app/domain/battle/entity/BattleTag.java new file mode 100644 index 00000000..50ca4239 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/entity/BattleTag.java @@ -0,0 +1,46 @@ +package com.swyp.app.domain.battle.entity; + +import com.swyp.app.domain.tag.entity.Tag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Getter +@Entity +@Table( + name = "battle_tags", + uniqueConstraints = @UniqueConstraint(columnNames = {"battle_id", "tag_id"}) +) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class BattleTag { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "battle_id", nullable = false) + private Battle battle; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "tag_id", nullable = false) + private Tag tag; + + @Builder + private BattleTag(Battle battle, Tag tag) { + this.battle = battle; + this.tag = tag; + } +} diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java new file mode 100644 index 00000000..6ecea267 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java @@ -0,0 +1,17 @@ +package com.swyp.app.domain.battle.repository; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.entity.BattleOptionLabel; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface BattleOptionRepository extends JpaRepository { + + List findByBattle(Battle battle); + + Optional findByBattleAndLabel(Battle battle, BattleOptionLabel label); +} diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java new file mode 100644 index 00000000..b09b20e6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java @@ -0,0 +1,9 @@ +package com.swyp.app.domain.battle.repository; + +import com.swyp.app.domain.battle.entity.Battle; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface BattleRepository extends JpaRepository { +} diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java new file mode 100644 index 00000000..ea686e3e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.battle.repository; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleTag; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.UUID; + +public interface BattleTagRepository extends JpaRepository { + + List findByBattle(Battle battle); +} diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleService.java b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java new file mode 100644 index 00000000..762c514a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java @@ -0,0 +1,16 @@ +package com.swyp.app.domain.battle.service; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.entity.BattleOptionLabel; + +import java.util.UUID; + +public interface BattleService { + + Battle findById(UUID battleId); + + BattleOption findOptionById(UUID optionId); + + BattleOption findOptionByBattleIdAndLabel(UUID battleId, BattleOptionLabel label); +} diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java new file mode 100644 index 00000000..c23d9c6c --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java @@ -0,0 +1,40 @@ +package com.swyp.app.domain.battle.service; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.entity.BattleOptionLabel; +import com.swyp.app.domain.battle.repository.BattleOptionRepository; +import com.swyp.app.domain.battle.repository.BattleRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class BattleServiceImpl implements BattleService { + + private final BattleRepository battleRepository; + private final BattleOptionRepository battleOptionRepository; + + @Override + public Battle findById(UUID battleId) { + return battleRepository.findById(battleId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + } + + @Override + public BattleOption findOptionById(UUID optionId) { + return battleOptionRepository.findById(optionId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + } + + @Override + public BattleOption findOptionByBattleIdAndLabel(UUID battleId, BattleOptionLabel label) { + Battle battle = findById(battleId); + return battleOptionRepository.findByBattleAndLabel(battle, label) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java new file mode 100644 index 00000000..83cfcf90 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java @@ -0,0 +1,80 @@ +package com.swyp.app.domain.perspective.controller; + +import com.swyp.app.domain.perspective.dto.request.CreateCommentRequest; +import com.swyp.app.domain.perspective.dto.request.UpdateCommentRequest; +import com.swyp.app.domain.perspective.dto.response.CommentListResponse; +import com.swyp.app.domain.perspective.dto.response.CreateCommentResponse; +import com.swyp.app.domain.perspective.dto.response.UpdateCommentResponse; +import com.swyp.app.domain.perspective.service.PerspectiveCommentService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.UUID; + +@Tag(name = "관점 댓글 (Comment)", description = "관점 댓글 생성, 조회, 수정, 삭제 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class PerspectiveCommentController { + + private final PerspectiveCommentService commentService; + + @Operation(summary = "댓글 생성", description = "특정 관점에 댓글을 작성합니다.") + @PostMapping("/perspectives/{perspectiveId}/comments") + public ApiResponse createComment( + @PathVariable UUID perspectiveId, + @RequestBody @Valid CreateCommentRequest request + ) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(commentService.createComment(perspectiveId, userId, request)); + } + + @Operation(summary = "댓글 목록 조회", description = "특정 관점의 댓글 목록을 커서 기반 페이지네이션으로 조회합니다.") + @GetMapping("/perspectives/{perspectiveId}/comments") + public ApiResponse getComments( + @PathVariable UUID perspectiveId, + @RequestParam(required = false) String cursor, + @RequestParam(required = false) Integer size + ) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(commentService.getComments(perspectiveId, userId, cursor, size)); + } + + @Operation(summary = "댓글 삭제", description = "본인이 작성한 댓글을 삭제합니다.") + @DeleteMapping("/perspectives/{perspectiveId}/comments/{commentId}") + public ApiResponse deleteComment( + @PathVariable UUID perspectiveId, + @PathVariable UUID commentId + ) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + commentService.deleteComment(perspectiveId, commentId, userId); + return ApiResponse.onSuccess(null); + } + + @Operation(summary = "댓글 수정", description = "본인이 작성한 댓글의 내용을 수정합니다.") + @PatchMapping("/perspectives/{perspectiveId}/comments/{commentId}") + public ApiResponse updateComment( + @PathVariable UUID perspectiveId, + @PathVariable UUID commentId, + @RequestBody @Valid UpdateCommentRequest request + ) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(commentService.updateComment(perspectiveId, commentId, userId, request)); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java new file mode 100644 index 00000000..e0b98bd2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java @@ -0,0 +1,87 @@ +package com.swyp.app.domain.perspective.controller; + +import com.swyp.app.domain.perspective.dto.request.CreatePerspectiveRequest; +import com.swyp.app.domain.perspective.dto.request.UpdatePerspectiveRequest; +import com.swyp.app.domain.perspective.dto.response.CreatePerspectiveResponse; +import com.swyp.app.domain.perspective.dto.response.MyPerspectiveResponse; +import com.swyp.app.domain.perspective.dto.response.PerspectiveListResponse; +import com.swyp.app.domain.perspective.dto.response.UpdatePerspectiveResponse; +import com.swyp.app.domain.perspective.service.PerspectiveService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.UUID; + +@Tag(name = "관점 (Perspective)", description = "관점 생성, 조회, 수정, 삭제 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class PerspectiveController { + + private final PerspectiveService perspectiveService; + + // TODO: Prevote 의 여부를 Vote 도메인 개발 이후 교체 + @Operation(summary = "관점 생성", description = "특정 배틀에 대한 관점을 생성합니다. 사전 투표가 완료된 경우에만 가능합니다.") + @PostMapping("/battles/{battleId}/perspectives") + public ApiResponse createPerspective( + @PathVariable UUID battleId, + @RequestBody @Valid CreatePerspectiveRequest request + ) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(perspectiveService.createPerspective(battleId, userId, request)); + } + + @Operation(summary = "관점 리스트 조회", description = "특정 배틀의 관점 목록을 커서 기반 페이지네이션으로 조회합니다. optionLabel(A/B)로 필터링 가능합니다.") + @GetMapping("/battles/{battleId}/perspectives") + public ApiResponse getPerspectives( + @PathVariable UUID battleId, + @RequestParam(required = false) String cursor, + @RequestParam(required = false) Integer size, + @RequestParam(required = false) String optionLabel + ) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(perspectiveService.getPerspectives(battleId, userId, cursor, size, optionLabel)); + } + + @Operation(summary = "내 PENDING 관점 조회", description = "특정 배틀에서 내가 작성한 관점이 PENDING 상태인 경우 반환합니다. PENDING 관점이 없으면 404를 반환합니다.") + @GetMapping("/battles/{battleId}/perspectives/me/pending") + public ApiResponse getMyPendingPerspective(@PathVariable UUID battleId) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(perspectiveService.getMyPendingPerspective(battleId, userId)); + } + + @Operation(summary = "관점 삭제", description = "본인이 작성한 관점을 삭제합니다.") + @DeleteMapping("/perspectives/{perspectiveId}") + public ApiResponse deletePerspective(@PathVariable UUID perspectiveId) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + perspectiveService.deletePerspective(perspectiveId, userId); + return ApiResponse.onSuccess(null); + } + + @Operation(summary = "관점 수정", description = "본인이 작성한 관점의 내용을 수정합니다.") + @PatchMapping("/perspectives/{perspectiveId}") + public ApiResponse updatePerspective( + @PathVariable UUID perspectiveId, + @RequestBody @Valid UpdatePerspectiveRequest request + ) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(perspectiveService.updatePerspective(perspectiveId, userId, request)); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java new file mode 100644 index 00000000..9ce7e232 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java @@ -0,0 +1,48 @@ +package com.swyp.app.domain.perspective.controller; + +import com.swyp.app.domain.perspective.dto.response.LikeCountResponse; +import com.swyp.app.domain.perspective.dto.response.LikeResponse; +import com.swyp.app.domain.perspective.service.PerspectiveLikeService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.UUID; + +@Tag(name = "관점 좋아요 (Like)", description = "관점 좋아요 조회, 등록, 취소 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class PerspectiveLikeController { + + private final PerspectiveLikeService likeService; + + @Operation(summary = "좋아요 수 조회", description = "특정 관점의 좋아요 수를 조회합니다.") + @GetMapping("/perspectives/{perspectiveId}/likes") + public ApiResponse getLikeCount(@PathVariable UUID perspectiveId) { + return ApiResponse.onSuccess(likeService.getLikeCount(perspectiveId)); + } + + @Operation(summary = "좋아요 등록", description = "특정 관점에 좋아요를 등록합니다.") + @PostMapping("/perspectives/{perspectiveId}/likes") + public ApiResponse addLike(@PathVariable UUID perspectiveId) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(likeService.addLike(perspectiveId, userId)); + } + + @Operation(summary = "좋아요 취소", description = "특정 관점에 등록한 좋아요를 취소합니다.") + @DeleteMapping("/perspectives/{perspectiveId}/likes") + public ApiResponse removeLike(@PathVariable UUID perspectiveId) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(likeService.removeLike(perspectiveId, userId)); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/request/CreateCommentRequest.java b/src/main/java/com/swyp/app/domain/perspective/dto/request/CreateCommentRequest.java new file mode 100644 index 00000000..9715a684 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/request/CreateCommentRequest.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.perspective.dto.request; + +import jakarta.validation.constraints.NotBlank; + +public record CreateCommentRequest( + @NotBlank + String content +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java b/src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java new file mode 100644 index 00000000..04994b34 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.perspective.dto.request; + +import jakarta.validation.constraints.NotBlank; + +public record CreatePerspectiveRequest( + @NotBlank + String content +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdateCommentRequest.java b/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdateCommentRequest.java new file mode 100644 index 00000000..fd767a4a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdateCommentRequest.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.perspective.dto.request; + +import jakarta.validation.constraints.NotBlank; + +public record UpdateCommentRequest( + @NotBlank + String content +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java b/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java new file mode 100644 index 00000000..0cc75f38 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.perspective.dto.request; + +import jakarta.validation.constraints.NotBlank; + +public record UpdatePerspectiveRequest( + @NotBlank + String content +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java new file mode 100644 index 00000000..fb7e85b2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java @@ -0,0 +1,21 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +public record CommentListResponse( + List items, + String nextCursor, + boolean hasNext +) { + public record Item( + UUID commentId, + UserSummary user, + String content, + boolean isMine, + LocalDateTime createdAt + ) {} + + public record UserSummary(String userTag, String nickname, String characterUrl) {} +} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java new file mode 100644 index 00000000..3709f6b9 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.time.LocalDateTime; +import java.util.UUID; + +public record CreateCommentResponse( + UUID commentId, + UserSummary user, + String content, + LocalDateTime createdAt +) { + public record UserSummary(String userTag, String nickname, String characterUrl) {} +} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/CreatePerspectiveResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreatePerspectiveResponse.java new file mode 100644 index 00000000..7de585bc --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreatePerspectiveResponse.java @@ -0,0 +1,12 @@ +package com.swyp.app.domain.perspective.dto.response; + +import com.swyp.app.domain.perspective.entity.PerspectiveStatus; + +import java.time.LocalDateTime; +import java.util.UUID; + +public record CreatePerspectiveResponse( + UUID perspectiveId, + PerspectiveStatus status, + LocalDateTime createdAt +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/LikeCountResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/LikeCountResponse.java new file mode 100644 index 00000000..b0446a9c --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/LikeCountResponse.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.util.UUID; + +public record LikeCountResponse(UUID perspectiveId, long likeCount) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/LikeResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/LikeResponse.java new file mode 100644 index 00000000..5f0a077e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/LikeResponse.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.util.UUID; + +public record LikeResponse(UUID perspectiveId, int likeCount, boolean isLiked) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java new file mode 100644 index 00000000..c59fe493 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.perspective.dto.response; + +import com.swyp.app.domain.perspective.entity.PerspectiveStatus; + +import java.time.LocalDateTime; +import java.util.UUID; + +public record MyPerspectiveResponse( + UUID perspectiveId, + String content, + PerspectiveStatus status, + LocalDateTime createdAt +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java new file mode 100644 index 00000000..a5e535ad --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java @@ -0,0 +1,34 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +public record PerspectiveListResponse( + List items, + String nextCursor, + boolean hasNext +) { + public record Item( + UUID perspectiveId, + UserSummary user, + OptionSummary option, + String content, + int likeCount, + int commentCount, + boolean isLiked, + LocalDateTime createdAt + ) {} + + public record UserSummary( + String userTag, + String nickname, + String characterUrl + ) {} + + public record OptionSummary( + UUID optionId, + String label, + String title + ) {} +} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/UpdateCommentResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/UpdateCommentResponse.java new file mode 100644 index 00000000..302a5898 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/UpdateCommentResponse.java @@ -0,0 +1,10 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.time.LocalDateTime; +import java.util.UUID; + +public record UpdateCommentResponse( + UUID commentId, + String content, + LocalDateTime updatedAt +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/UpdatePerspectiveResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/UpdatePerspectiveResponse.java new file mode 100644 index 00000000..b6e9959a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/UpdatePerspectiveResponse.java @@ -0,0 +1,10 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.time.LocalDateTime; +import java.util.UUID; + +public record UpdatePerspectiveResponse( + UUID perspectiveId, + String content, + LocalDateTime updatedAt +) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java new file mode 100644 index 00000000..b9cee98a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java @@ -0,0 +1,96 @@ +package com.swyp.app.domain.perspective.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Getter +@Entity +@Table( + name = "perspectives", + uniqueConstraints = @UniqueConstraint(columnNames = {"battle_id", "user_id"}) +) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Perspective extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + // TODO: Battle 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "battle_id") 로 교체 + @Column(name = "battle_id", nullable = false) + private UUID battleId; + + // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 + @Column(name = "user_id", nullable = false) + private Long userId; + + // TODO: BattleOption 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "option_id") 로 교체 + @Column(name = "option_id", nullable = false) + private UUID optionId; + + @Column(nullable = false, columnDefinition = "TEXT") + private String content; + + @Column(name = "like_count", nullable = false) + private int likeCount = 0; + + @Column(name = "comment_count", nullable = false) + private int commentCount = 0; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private PerspectiveStatus status; + + @Builder + private Perspective(UUID battleId, Long userId, UUID optionId, String content) { + this.battleId = battleId; + this.userId = userId; + this.optionId = optionId; + this.content = content; + this.likeCount = 0; + this.commentCount = 0; + this.status = PerspectiveStatus.PENDING; + } + + public void updateContent(String content) { + this.content = content; + } + + public void publish() { + this.status = PerspectiveStatus.PUBLISHED; + } + + public void reject() { + this.status = PerspectiveStatus.REJECTED; + } + + public void incrementLikeCount() { + this.likeCount++; + } + + public void decrementLikeCount() { + if (this.likeCount > 0) this.likeCount--; + } + + public void incrementCommentCount() { + this.commentCount++; + } + + public void decrementCommentCount() { + if (this.commentCount > 0) this.commentCount--; + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java new file mode 100644 index 00000000..1e5cee2a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java @@ -0,0 +1,51 @@ +package com.swyp.app.domain.perspective.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Getter +@Entity +@Table(name = "perspective_comments") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PerspectiveComment extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "perspective_id", nullable = false) + private Perspective perspective; + + // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 + @Column(name = "user_id", nullable = false) + private Long userId; + + @Column(nullable = false, columnDefinition = "TEXT") + private String content; + + @Builder + private PerspectiveComment(Perspective perspective, Long userId, String content) { + this.perspective = perspective; + this.userId = userId; + this.content = content; + } + + public void updateContent(String content) { + this.content = content; + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java new file mode 100644 index 00000000..8286834e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java @@ -0,0 +1,47 @@ +package com.swyp.app.domain.perspective.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Getter +@Entity +@Table( + name = "perspective_likes", + uniqueConstraints = @UniqueConstraint(columnNames = {"perspective_id", "user_id"}) +) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PerspectiveLike extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "perspective_id", nullable = false) + private Perspective perspective; + + // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 + @Column(name = "user_id", nullable = false) + private Long userId; + + @Builder + private PerspectiveLike(Perspective perspective, Long userId) { + this.perspective = perspective; + this.userId = userId; + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java new file mode 100644 index 00000000..21f7ae53 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.perspective.entity; + +public enum PerspectiveStatus { + PENDING, PUBLISHED, REJECTED +} diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java new file mode 100644 index 00000000..1b02326a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java @@ -0,0 +1,17 @@ +package com.swyp.app.domain.perspective.repository; + +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +public interface PerspectiveCommentRepository extends JpaRepository { + + List findByPerspectiveOrderByCreatedAtDesc(Perspective perspective, Pageable pageable); + + List findByPerspectiveAndCreatedAtBeforeOrderByCreatedAtDesc(Perspective perspective, LocalDateTime cursor, Pageable pageable); +} diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java new file mode 100644 index 00000000..dff34fe1 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java @@ -0,0 +1,17 @@ +package com.swyp.app.domain.perspective.repository; + +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveLike; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +import java.util.UUID; + +public interface PerspectiveLikeRepository extends JpaRepository { + + boolean existsByPerspectiveAndUserId(Perspective perspective, Long userId); + + Optional findByPerspectiveAndUserId(Perspective perspective, Long userId); + + long countByPerspective(Perspective perspective); +} diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java new file mode 100644 index 00000000..fde10af8 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java @@ -0,0 +1,26 @@ +package com.swyp.app.domain.perspective.repository; + +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveStatus; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface PerspectiveRepository extends JpaRepository { + + boolean existsByBattleIdAndUserId(UUID battleId, Long userId); + + Optional findByBattleIdAndUserId(UUID battleId, Long userId); + + List findByBattleIdAndStatusOrderByCreatedAtDesc(UUID battleId, PerspectiveStatus status, Pageable pageable); + + List findByBattleIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(UUID battleId, PerspectiveStatus status, LocalDateTime cursor, Pageable pageable); + + List findByBattleIdAndOptionIdAndStatusOrderByCreatedAtDesc(UUID battleId, UUID optionId, PerspectiveStatus status, Pageable pageable); + + List findByBattleIdAndOptionIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(UUID battleId, UUID optionId, PerspectiveStatus status, LocalDateTime cursor, Pageable pageable); +} diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java new file mode 100644 index 00000000..aafddd34 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java @@ -0,0 +1,123 @@ +package com.swyp.app.domain.perspective.service; + +import com.swyp.app.domain.perspective.dto.request.CreateCommentRequest; +import com.swyp.app.domain.perspective.dto.request.UpdateCommentRequest; +import com.swyp.app.domain.perspective.dto.response.CommentListResponse; +import com.swyp.app.domain.perspective.dto.response.CreateCommentResponse; +import com.swyp.app.domain.perspective.dto.response.UpdateCommentResponse; +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import com.swyp.app.domain.perspective.repository.PerspectiveCommentRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveRepository; +import com.swyp.app.domain.user.service.UserQueryService; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PerspectiveCommentService { + + private static final int DEFAULT_PAGE_SIZE = 20; + + private final PerspectiveRepository perspectiveRepository; + private final PerspectiveCommentRepository commentRepository; + private final UserQueryService userQueryService; + + @Transactional + public CreateCommentResponse createComment(UUID perspectiveId, Long userId, CreateCommentRequest request) { + Perspective perspective = findPerspectiveById(perspectiveId); + + PerspectiveComment comment = PerspectiveComment.builder() + .perspective(perspective) + .userId(userId) + .content(request.content()) + .build(); + + commentRepository.save(comment); + perspective.incrementCommentCount(); + + UserQueryService.UserSummary user = userQueryService.findSummaryById(userId); + return new CreateCommentResponse( + comment.getId(), + new CreateCommentResponse.UserSummary(user.userTag(), user.nickname(), user.characterUrl()), + comment.getContent(), + comment.getCreatedAt() + ); + } + + public CommentListResponse getComments(UUID perspectiveId, Long userId, String cursor, Integer size) { + Perspective perspective = findPerspectiveById(perspectiveId); + + int pageSize = (size == null || size <= 0) ? DEFAULT_PAGE_SIZE : size; + PageRequest pageable = PageRequest.of(0, pageSize); + + List comments = cursor == null + ? commentRepository.findByPerspectiveOrderByCreatedAtDesc(perspective, pageable) + : commentRepository.findByPerspectiveAndCreatedAtBeforeOrderByCreatedAtDesc( + perspective, LocalDateTime.parse(cursor), pageable); + + List items = comments.stream() + .map(c -> { + UserQueryService.UserSummary user = userQueryService.findSummaryById(c.getUserId()); + return new CommentListResponse.Item( + c.getId(), + new CommentListResponse.UserSummary(user.userTag(), user.nickname(), user.characterUrl()), + c.getContent(), + c.getUserId().equals(userId), + c.getCreatedAt() + ); + }) + .toList(); + + String nextCursor = comments.size() == pageSize + ? comments.get(comments.size() - 1).getCreatedAt().toString() + : null; + + return new CommentListResponse(items, nextCursor, nextCursor != null); + } + + @Transactional + public void deleteComment(UUID perspectiveId, UUID commentId, Long userId) { + Perspective perspective = findPerspectiveById(perspectiveId); + PerspectiveComment comment = findCommentById(commentId); + validateOwnership(comment, userId); + + commentRepository.delete(comment); + perspective.decrementCommentCount(); + } + + @Transactional + public UpdateCommentResponse updateComment(UUID perspectiveId, UUID commentId, Long userId, UpdateCommentRequest request) { + findPerspectiveById(perspectiveId); + PerspectiveComment comment = findCommentById(commentId); + validateOwnership(comment, userId); + + comment.updateContent(request.content()); + return new UpdateCommentResponse(comment.getId(), comment.getContent(), comment.getUpdatedAt()); + } + + private Perspective findPerspectiveById(UUID perspectiveId) { + return perspectiveRepository.findById(perspectiveId) + .orElseThrow(() -> new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND)); + } + + private PerspectiveComment findCommentById(UUID commentId) { + return commentRepository.findById(commentId) + .orElseThrow(() -> new CustomException(ErrorCode.COMMENT_NOT_FOUND)); + } + + private void validateOwnership(PerspectiveComment comment, Long userId) { + if (!comment.getUserId().equals(userId)) { + throw new CustomException(ErrorCode.COMMENT_FORBIDDEN); + } + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java new file mode 100644 index 00000000..7d419e44 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java @@ -0,0 +1,69 @@ +package com.swyp.app.domain.perspective.service; + +import com.swyp.app.domain.perspective.dto.response.LikeCountResponse; +import com.swyp.app.domain.perspective.dto.response.LikeResponse; +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveLike; +import com.swyp.app.domain.perspective.repository.PerspectiveLikeRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.UUID; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PerspectiveLikeService { + + private final PerspectiveRepository perspectiveRepository; + private final PerspectiveLikeRepository likeRepository; + + public LikeCountResponse getLikeCount(UUID perspectiveId) { + Perspective perspective = findPerspectiveById(perspectiveId); + long likeCount = likeRepository.countByPerspective(perspective); + return new LikeCountResponse(perspective.getId(), likeCount); + } + + @Transactional + public LikeResponse addLike(UUID perspectiveId, Long userId) { + Perspective perspective = findPerspectiveById(perspectiveId); + + if (perspective.getUserId().equals(userId)) { + throw new CustomException(ErrorCode.LIKE_SELF_FORBIDDEN); + } + + if (likeRepository.existsByPerspectiveAndUserId(perspective, userId)) { + throw new CustomException(ErrorCode.LIKE_ALREADY_EXISTS); + } + + likeRepository.save(PerspectiveLike.builder() + .perspective(perspective) + .userId(userId) + .build()); + perspective.incrementLikeCount(); + + return new LikeResponse(perspective.getId(), perspective.getLikeCount(), true); + } + + @Transactional + public LikeResponse removeLike(UUID perspectiveId, Long userId) { + Perspective perspective = findPerspectiveById(perspectiveId); + + PerspectiveLike like = likeRepository.findByPerspectiveAndUserId(perspective, userId) + .orElseThrow(() -> new CustomException(ErrorCode.LIKE_NOT_FOUND)); + + likeRepository.delete(like); + perspective.decrementLikeCount(); + + return new LikeResponse(perspective.getId(), perspective.getLikeCount(), false); + } + + private Perspective findPerspectiveById(UUID perspectiveId) { + return perspectiveRepository.findById(perspectiveId) + .orElseThrow(() -> new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND)); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java new file mode 100644 index 00000000..85bca44b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java @@ -0,0 +1,146 @@ +package com.swyp.app.domain.perspective.service; + +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.entity.BattleOptionLabel; +import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.domain.perspective.entity.PerspectiveStatus; +import com.swyp.app.domain.perspective.dto.request.CreatePerspectiveRequest; +import com.swyp.app.domain.perspective.dto.request.UpdatePerspectiveRequest; +import com.swyp.app.domain.perspective.dto.response.CreatePerspectiveResponse; +import com.swyp.app.domain.perspective.dto.response.MyPerspectiveResponse; +import com.swyp.app.domain.perspective.dto.response.PerspectiveListResponse; +import com.swyp.app.domain.perspective.dto.response.UpdatePerspectiveResponse; +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.repository.PerspectiveLikeRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveRepository; +import com.swyp.app.domain.user.service.UserQueryService; +import com.swyp.app.domain.vote.service.VoteService; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PerspectiveService { + + private static final int DEFAULT_PAGE_SIZE = 20; + + private final PerspectiveRepository perspectiveRepository; + private final PerspectiveLikeRepository perspectiveLikeRepository; + private final BattleService battleService; + private final VoteService voteService; + private final UserQueryService userQueryService; + + @Transactional + public CreatePerspectiveResponse createPerspective(UUID battleId, Long userId, CreatePerspectiveRequest request) { + battleService.findById(battleId); + + if (perspectiveRepository.existsByBattleIdAndUserId(battleId, userId)) { + throw new CustomException(ErrorCode.PERSPECTIVE_ALREADY_EXISTS); + } + + UUID optionId = voteService.findPreVoteOptionId(battleId, userId); + + Perspective perspective = Perspective.builder() + .battleId(battleId) + .userId(userId) + .optionId(optionId) + .content(request.content()) + .build(); + + Perspective saved = perspectiveRepository.save(perspective); + return new CreatePerspectiveResponse(saved.getId(), saved.getStatus(), saved.getCreatedAt()); + } + + public PerspectiveListResponse getPerspectives(UUID battleId, Long userId, String cursor, Integer size, String optionLabel) { + battleService.findById(battleId); + + int pageSize = (size == null || size <= 0) ? DEFAULT_PAGE_SIZE : size; + PageRequest pageable = PageRequest.of(0, pageSize); + + List perspectives; + + if (optionLabel != null) { + BattleOptionLabel label = BattleOptionLabel.valueOf(optionLabel.toUpperCase()); + BattleOption option = battleService.findOptionByBattleIdAndLabel(battleId, label); + perspectives = cursor == null + ? perspectiveRepository.findByBattleIdAndOptionIdAndStatusOrderByCreatedAtDesc(battleId, option.getId(), PerspectiveStatus.PUBLISHED, pageable) + : perspectiveRepository.findByBattleIdAndOptionIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(battleId, option.getId(), PerspectiveStatus.PUBLISHED, LocalDateTime.parse(cursor), pageable); + } else { + perspectives = cursor == null + ? perspectiveRepository.findByBattleIdAndStatusOrderByCreatedAtDesc(battleId, PerspectiveStatus.PUBLISHED, pageable) + : perspectiveRepository.findByBattleIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(battleId, PerspectiveStatus.PUBLISHED, LocalDateTime.parse(cursor), pageable); + } + + List items = perspectives.stream() + .map(p -> { + UserQueryService.UserSummary user = userQueryService.findSummaryById(p.getUserId()); + BattleOption option = battleService.findOptionById(p.getOptionId()); + boolean isLiked = perspectiveLikeRepository.existsByPerspectiveAndUserId(p, userId); + return new PerspectiveListResponse.Item( + p.getId(), + new PerspectiveListResponse.UserSummary(user.userTag(), user.nickname(), user.characterUrl()), + new PerspectiveListResponse.OptionSummary(option.getId(), option.getLabel().name(), option.getTitle()), + p.getContent(), + p.getLikeCount(), + p.getCommentCount(), + isLiked, + p.getCreatedAt() + ); + }) + .toList(); + + String nextCursor = perspectives.size() == pageSize + ? perspectives.get(perspectives.size() - 1).getCreatedAt().toString() + : null; + + return new PerspectiveListResponse(items, nextCursor, nextCursor != null); + } + + @Transactional + public void deletePerspective(UUID perspectiveId, Long userId) { + Perspective perspective = findPerspectiveById(perspectiveId); + validateOwnership(perspective, userId); + perspectiveRepository.delete(perspective); + } + + @Transactional + public UpdatePerspectiveResponse updatePerspective(UUID perspectiveId, Long userId, UpdatePerspectiveRequest request) { + Perspective perspective = findPerspectiveById(perspectiveId); + validateOwnership(perspective, userId); + perspective.updateContent(request.content()); + return new UpdatePerspectiveResponse(perspective.getId(), perspective.getContent(), perspective.getUpdatedAt()); + } + + public MyPerspectiveResponse getMyPendingPerspective(UUID battleId, Long userId) { + battleService.findById(battleId); + Perspective perspective = perspectiveRepository.findByBattleIdAndUserId(battleId, userId) + .filter(p -> p.getStatus() == PerspectiveStatus.PENDING) + .orElseThrow(() -> new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND)); + return new MyPerspectiveResponse( + perspective.getId(), + perspective.getContent(), + perspective.getStatus(), + perspective.getCreatedAt() + ); + } + + private Perspective findPerspectiveById(UUID perspectiveId) { + return perspectiveRepository.findById(perspectiveId) + .orElseThrow(() -> new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND)); + } + + private void validateOwnership(Perspective perspective, Long userId) { + if (!perspective.getUserId().equals(userId)) { + throw new CustomException(ErrorCode.PERSPECTIVE_FORBIDDEN); + } + } +} diff --git a/src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java b/src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java new file mode 100644 index 00000000..37b3a267 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java @@ -0,0 +1,33 @@ +package com.swyp.app.domain.recommendation.controller; + +import com.swyp.app.domain.recommendation.dto.response.RecommendationListResponse; +import com.swyp.app.domain.recommendation.service.RecommendationService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.UUID; + +@Tag(name = "추천 (Recommendation)", description = "배틀 추천 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class RecommendationController { + + private final RecommendationService recommendationService; + + @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀 기반으로 흥미로운 배틀 목록을 추천합니다. (추천 정책 미확정)") + @GetMapping("/battles/{battleId}/recommendations/interesting") + public ApiResponse getInterestingBattles( + @PathVariable UUID battleId, + @RequestParam(required = false) String cursor, + @RequestParam(required = false) Integer size) { + return ApiResponse.onSuccess(recommendationService.getInterestingBattles(battleId, cursor, size)); + } +} diff --git a/src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java b/src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java new file mode 100644 index 00000000..2aeae675 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java @@ -0,0 +1,25 @@ +package com.swyp.app.domain.recommendation.dto.response; + +import java.util.List; +import java.util.UUID; + +public record RecommendationListResponse(List items, String nextCursor, boolean hasNext) { + + public record Item( + UUID battleId, + String title, + List tags, + int participantsCount, + List options + ) {} + + public record TagSummary(UUID tagId, String name) {} + + public record OptionSummary( + UUID optionId, + String label, + String title, + String representative, + String imageUrl + ) {} +} diff --git a/src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java b/src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java new file mode 100644 index 00000000..bcec8f05 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java @@ -0,0 +1,28 @@ +package com.swyp.app.domain.recommendation.service; + +import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.domain.recommendation.dto.response.RecommendationListResponse; +import com.swyp.app.domain.tag.service.TagService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class RecommendationService { + + private final BattleService battleService; + private final TagService tagService; + + public RecommendationListResponse getInterestingBattles(UUID battleId, String cursor, Integer size) { + battleService.findById(battleId); + + // TODO: 흥미 기반 배틀 추천 정책 미확정 (추후 구현) + + return new RecommendationListResponse(List.of(), null, false); + } +} diff --git a/src/main/java/com/swyp/app/domain/tag/entity/Tag.java b/src/main/java/com/swyp/app/domain/tag/entity/Tag.java new file mode 100644 index 00000000..b4ed1273 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/entity/Tag.java @@ -0,0 +1,34 @@ +package com.swyp.app.domain.tag.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Getter +@Entity +@Table(name = "tags") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Tag extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, unique = true, length = 50) + private String name; + + @Builder + private Tag(String name) { + this.name = name; + } +} diff --git a/src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java b/src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java new file mode 100644 index 00000000..4abc69c4 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java @@ -0,0 +1,9 @@ +package com.swyp.app.domain.tag.repository; + +import com.swyp.app.domain.tag.entity.Tag; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface TagRepository extends JpaRepository { +} diff --git a/src/main/java/com/swyp/app/domain/tag/service/TagService.java b/src/main/java/com/swyp/app/domain/tag/service/TagService.java new file mode 100644 index 00000000..7be5db83 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/service/TagService.java @@ -0,0 +1,11 @@ +package com.swyp.app.domain.tag.service; + +import com.swyp.app.domain.tag.entity.Tag; + +import java.util.List; +import java.util.UUID; + +public interface TagService { + + List findByBattleId(UUID battleId); +} diff --git a/src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java b/src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java new file mode 100644 index 00000000..60fd2594 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java @@ -0,0 +1,27 @@ +package com.swyp.app.domain.tag.service; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.repository.BattleTagRepository; +import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.domain.tag.entity.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class TagServiceImpl implements TagService { + + private final BattleService battleService; + private final BattleTagRepository battleTagRepository; + + @Override + public List findByBattleId(UUID battleId) { + Battle battle = battleService.findById(battleId); + return battleTagRepository.findByBattle(battle).stream() + .map(bt -> bt.getTag()) + .toList(); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java index 7691467c..3e430c85 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java @@ -3,6 +3,7 @@ import com.swyp.app.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; +public interface UserRepository extends JpaRepository { import java.util.Optional; public interface UserRepository extends JpaRepository { diff --git a/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java b/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java new file mode 100644 index 00000000..7cfa195f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.user.service; + +public interface UserQueryService { + + UserSummary findSummaryById(Long userId); + + record UserSummary(String userTag, String nickname, String characterUrl) {} +} diff --git a/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java b/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java new file mode 100644 index 00000000..cf2aefe7 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java @@ -0,0 +1,22 @@ +package com.swyp.app.domain.user.service; + +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UserQueryServiceImpl implements UserQueryService { + + private final UserRepository userRepository; + + @Override + public UserSummary findSummaryById(Long userId) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + return new UserSummary(user.getUserTag(), user.getNickname(), user.getCharacterUrl()); + } +} diff --git a/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java b/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java new file mode 100644 index 00000000..3575186d --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java @@ -0,0 +1,38 @@ +package com.swyp.app.domain.vote.controller; + +import com.swyp.app.domain.vote.dto.response.MyVoteResponse; +import com.swyp.app.domain.vote.dto.response.VoteStatsResponse; +import com.swyp.app.domain.vote.service.VoteService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.UUID; + +@Tag(name = "투표 (Vote)", description = "투표 통계 및 내 투표 내역 조회 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class VoteController { + + private final VoteService voteService; + + @Operation(summary = "투표 통계 조회", description = "특정 배틀의 옵션별 투표 수와 비율을 조회합니다.") + @GetMapping("/battles/{battleId}/vote-stats") + public ApiResponse getVoteStats(@PathVariable UUID battleId) { + return ApiResponse.onSuccess(voteService.getVoteStats(battleId)); + } + + @Operation(summary = "내 투표 내역 조회", description = "특정 배틀에 대한 내 사전/사후 투표 내역과 생각 변화 여부를 조회합니다.") + @GetMapping("/battles/{battleId}/votes/me") + public ApiResponse getMyVote(@PathVariable UUID battleId) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(voteService.getMyVote(battleId, userId)); + } +} diff --git a/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java b/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java new file mode 100644 index 00000000..4a99b1d3 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java @@ -0,0 +1,14 @@ +package com.swyp.app.domain.vote.dto.response; + +import com.swyp.app.domain.vote.entity.VoteStatus; + +import java.util.UUID; + +public record MyVoteResponse( + OptionInfo preVote, + OptionInfo postVote, + boolean mindChanged, + VoteStatus status +) { + public record OptionInfo(UUID optionId, String label, String title) {} +} diff --git a/src/main/java/com/swyp/app/domain/vote/dto/response/VoteStatsResponse.java b/src/main/java/com/swyp/app/domain/vote/dto/response/VoteStatsResponse.java new file mode 100644 index 00000000..6a7122eb --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/dto/response/VoteStatsResponse.java @@ -0,0 +1,19 @@ +package com.swyp.app.domain.vote.dto.response; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +public record VoteStatsResponse( + List options, + long totalCount, + LocalDateTime updatedAt +) { + public record OptionStat( + UUID optionId, + String label, + String title, + long voteCount, + double ratio + ) {} +} diff --git a/src/main/java/com/swyp/app/domain/vote/entity/Vote.java b/src/main/java/com/swyp/app/domain/vote/entity/Vote.java new file mode 100644 index 00000000..2851acb5 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/entity/Vote.java @@ -0,0 +1,71 @@ +package com.swyp.app.domain.vote.entity; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Getter +@Entity +@Table(name = "votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Vote extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 + @Column(name = "user_id", nullable = false) + private Long userId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "battle_id", nullable = false) + private Battle battle; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "pre_vote_option_id") + private BattleOption preVoteOption; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "post_vote_option_id") + private BattleOption postVoteOption; + + @Column(name = "mind_changed", nullable = false) + private boolean mindChanged; + + @Column(name = "reward_credits", nullable = false) + private int rewardCredits; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private VoteStatus status; + + @Builder + private Vote(Long userId, Battle battle, BattleOption preVoteOption, + BattleOption postVoteOption, boolean mindChanged, int rewardCredits, VoteStatus status) { + this.userId = userId; + this.battle = battle; + this.preVoteOption = preVoteOption; + this.postVoteOption = postVoteOption; + this.mindChanged = mindChanged; + this.rewardCredits = rewardCredits; + this.status = status; + } +} diff --git a/src/main/java/com/swyp/app/domain/vote/entity/VoteStatus.java b/src/main/java/com/swyp/app/domain/vote/entity/VoteStatus.java new file mode 100644 index 00000000..478c63db --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/entity/VoteStatus.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.vote.entity; + +public enum VoteStatus { + NONE, PRE_VOTED, POST_VOTED +} diff --git a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java new file mode 100644 index 00000000..9410f060 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java @@ -0,0 +1,20 @@ +package com.swyp.app.domain.vote.repository; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.vote.entity.Vote; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +import java.util.UUID; + +public interface VoteRepository extends JpaRepository { + + Optional findByBattleAndUserId(Battle battle, Long userId); + + long countByBattle(Battle battle); + + long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); + + Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); +} diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteService.java b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java new file mode 100644 index 00000000..0c8b8d1b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.vote.service; + +import com.swyp.app.domain.vote.dto.response.MyVoteResponse; +import com.swyp.app.domain.vote.dto.response.VoteStatsResponse; + +import java.util.UUID; + +public interface VoteService { + + UUID findPreVoteOptionId(UUID battleId, Long userId); + + VoteStatsResponse getVoteStats(UUID battleId); + + MyVoteResponse getMyVote(UUID battleId, Long userId); +} diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java new file mode 100644 index 00000000..8e7bb9fd --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java @@ -0,0 +1,81 @@ +package com.swyp.app.domain.vote.service; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.repository.BattleOptionRepository; +import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.domain.vote.dto.response.MyVoteResponse; +import com.swyp.app.domain.vote.dto.response.VoteStatsResponse; +import com.swyp.app.domain.vote.entity.Vote; +import com.swyp.app.domain.vote.repository.VoteRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class VoteServiceImpl implements VoteService { + + private final VoteRepository voteRepository; + private final BattleService battleService; + private final BattleOptionRepository battleOptionRepository; + + @Override + public UUID findPreVoteOptionId(UUID battleId, Long userId) { + Battle battle = battleService.findById(battleId); + Vote vote = voteRepository.findByBattleAndUserId(battle, userId) + .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + if (vote.getPreVoteOption() == null) { + throw new CustomException(ErrorCode.PERSPECTIVE_POST_VOTE_REQUIRED); + } + return vote.getPreVoteOption().getId(); + } + + @Override + public VoteStatsResponse getVoteStats(UUID battleId) { + Battle battle = battleService.findById(battleId); + List options = battleOptionRepository.findByBattle(battle); + long totalCount = voteRepository.countByBattle(battle); + + List stats = options.stream() + .map(option -> { + long count = voteRepository.countByBattleAndPreVoteOption(battle, option); + double ratio = totalCount > 0 + ? Math.round((double) count / totalCount * 1000.0) / 10.0 + : 0.0; + return new VoteStatsResponse.OptionStat( + option.getId(), option.getLabel().name(), option.getTitle(), count, ratio); + }) + .toList(); + + LocalDateTime updatedAt = voteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) + .map(Vote::getUpdatedAt) + .orElse(null); + + return new VoteStatsResponse(stats, totalCount, updatedAt); + } + + @Override + public MyVoteResponse getMyVote(UUID battleId, Long userId) { + Battle battle = battleService.findById(battleId); + Vote vote = voteRepository.findByBattleAndUserId(battle, userId) + .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + + MyVoteResponse.OptionInfo preVote = toOptionInfo(vote.getPreVoteOption()); + MyVoteResponse.OptionInfo postVote = toOptionInfo(vote.getPostVoteOption()); + + return new MyVoteResponse(preVote, postVote, vote.isMindChanged(), vote.getStatus()); + } + + private MyVoteResponse.OptionInfo toOptionInfo(BattleOption option) { + if (option == null) return null; + return new MyVoteResponse.OptionInfo(option.getId(), option.getLabel().name(), option.getTitle()); + } +} diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 5cef13a5..313c074f 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -12,10 +12,30 @@ public enum ErrorCode { BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON_400", "잘못된 요청입니다."), AUTH_UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "AUTH_401", "인증 정보가 필요합니다."), + // User + USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 유저입니다."), + // Battle & Tag BATTLE_NOT_FOUND(HttpStatus.NOT_FOUND, "BATTLE_404", "존재하지 않는 배틀입니다."), TAG_NOT_FOUND(HttpStatus.NOT_FOUND, "TAG_404", "존재하지 않는 태그입니다."), + // Perspective + PERSPECTIVE_NOT_FOUND(HttpStatus.NOT_FOUND, "PERSPECTIVE_404", "존재하지 않는 관점입니다."), + PERSPECTIVE_ALREADY_EXISTS(HttpStatus.CONFLICT, "PERSPECTIVE_409", "이미 관점을 작성한 배틀입니다."), + PERSPECTIVE_FORBIDDEN(HttpStatus.FORBIDDEN, "PERSPECTIVE_403", "본인 관점만 수정/삭제할 수 있습니다."), + PERSPECTIVE_POST_VOTE_REQUIRED(HttpStatus.CONFLICT, "PERSPECTIVE_VOTE_409", "사후 투표가 완료되지 않았습니다."), + + // Comment + COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_404", "존재하지 않는 댓글입니다."), + COMMENT_FORBIDDEN(HttpStatus.FORBIDDEN, "COMMENT_403", "본인 댓글만 수정/삭제할 수 있습니다."), + + // Like + LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "LIKE_409", "이미 좋아요를 누른 관점입니다."), + LIKE_NOT_FOUND(HttpStatus.NOT_FOUND, "LIKE_404", "좋아요를 누른 적 없는 관점입니다."), + LIKE_SELF_FORBIDDEN(HttpStatus.FORBIDDEN, "LIKE_403", "본인 관점에는 좋아요를 누를 수 없습니다."), + + // Vote + VOTE_NOT_FOUND(HttpStatus.NOT_FOUND, "VOTE_404", "투표 내역이 없습니다."); // User USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 사용자입니다."), ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "USER_409", "이미 온보딩이 완료된 사용자입니다."); From e212667bf2d5111d3cae3d0821f986a192bf4f23 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:39:06 +0900 Subject: [PATCH 11/94] =?UTF-8?q?#15=20[Feat]=20=EB=B0=B0=ED=8B=80,=20?= =?UTF-8?q?=ED=83=9C=EA=B7=B8,=20=ED=88=AC=ED=91=9C=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EB=B0=9C=20(#28)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminBattleController.java | 55 +++++ .../battle/controller/BattleController.java | 35 +++ .../battle/converter/BattleConverter.java | 119 ++++++++++ .../dto/request/AdminBattleCreateRequest.java | 19 ++ .../dto/request/AdminBattleOptionRequest.java | 17 ++ .../dto/request/AdminBattleUpdateRequest.java | 18 ++ .../response/AdminBattleDeleteResponse.java | 13 ++ .../response/AdminBattleDetailResponse.java | 32 +++ .../dto/response/BattleOptionResponse.java | 15 ++ .../dto/response/BattleSummaryResponse.java | 24 ++ .../dto/response/BattleTagResponse.java | 15 ++ .../response/BattleUserDetailResponse.java | 18 ++ .../dto/response/BattleVoteResponse.java | 16 ++ .../dto/response/OptionStatResponse.java | 18 ++ .../dto/response/TodayBattleListResponse.java | 13 ++ .../dto/response/TodayBattleResponse.java | 23 ++ .../dto/response/TodayOptionResponse.java | 19 ++ .../swyp/app/domain/battle/entity/Battle.java | 91 ++++++-- .../domain/battle/entity/BattleOption.java | 32 ++- .../battle/entity/BattleOptionLabel.java | 5 - .../{entity => enums}/BattleCreatorType.java | 2 +- .../battle/enums/BattleOptionLabel.java | 5 + .../{entity => enums}/BattleStatus.java | 2 +- .../app/domain/battle/enums/BattleType.java | 5 + .../repository/BattleOptionRepository.java | 4 +- .../battle/repository/BattleRepository.java | 46 +++- .../repository/BattleTagRepository.java | 6 +- .../domain/battle/service/BattleService.java | 54 ++++- .../battle/service/BattleServiceImpl.java | 212 +++++++++++++++++- .../service/PerspectiveService.java | 2 +- .../domain/tag/controller/TagController.java | 64 ++++++ .../domain/tag/converter/TagConverter.java | 35 +++ .../domain/tag/dto/request/TagRequest.java | 13 ++ .../tag/dto/response/TagDeleteResponse.java | 8 + .../tag/dto/response/TagListResponse.java | 8 + .../domain/tag/dto/response/TagResponse.java | 13 ++ .../com/swyp/app/domain/tag/entity/Tag.java | 39 +++- .../swyp/app/domain/tag/enums/TagType.java | 10 + .../domain/tag/repository/TagRepository.java | 8 +- .../app/domain/tag/service/TagService.java | 13 +- .../domain/tag/service/TagServiceImpl.java | 74 +++++- .../com/swyp/app/domain/user/entity/User.java | 12 +- .../user/repository/UserRepository.java | 1 - .../vote/controller/VoteController.java | 33 ++- .../domain/vote/converter/VoteConverter.java | 38 ++++ .../domain/vote/dto/request/VoteRequest.java | 7 + .../vote/dto/response/MyVoteResponse.java | 3 +- .../vote/dto/response/VoteResultResponse.java | 9 + .../com/swyp/app/domain/vote/entity/Vote.java | 29 ++- .../vote/{entity => enums}/VoteStatus.java | 2 +- .../vote/repository/VoteRepository.java | 2 +- .../app/domain/vote/service/VoteService.java | 8 +- .../domain/vote/service/VoteServiceImpl.java | 52 ++++- .../swyp/app/global/common/BaseEntity.java | 3 +- .../global/common/exception/ErrorCode.java | 50 +++-- src/main/resources/application.yml | 3 - 56 files changed, 1337 insertions(+), 135 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java create mode 100644 src/main/java/com/swyp/app/domain/battle/controller/BattleController.java create mode 100644 src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleOptionRequest.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleUpdateRequest.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDeleteResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/BattleOptionResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/BattleSummaryResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/BattleTagResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/BattleVoteResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/OptionStatResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleResponse.java create mode 100644 src/main/java/com/swyp/app/domain/battle/dto/response/TodayOptionResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java rename src/main/java/com/swyp/app/domain/battle/{entity => enums}/BattleCreatorType.java (56%) create mode 100644 src/main/java/com/swyp/app/domain/battle/enums/BattleOptionLabel.java rename src/main/java/com/swyp/app/domain/battle/{entity => enums}/BattleStatus.java (65%) create mode 100644 src/main/java/com/swyp/app/domain/battle/enums/BattleType.java create mode 100644 src/main/java/com/swyp/app/domain/tag/controller/TagController.java create mode 100644 src/main/java/com/swyp/app/domain/tag/converter/TagConverter.java create mode 100644 src/main/java/com/swyp/app/domain/tag/dto/request/TagRequest.java create mode 100644 src/main/java/com/swyp/app/domain/tag/dto/response/TagDeleteResponse.java create mode 100644 src/main/java/com/swyp/app/domain/tag/dto/response/TagListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/tag/dto/response/TagResponse.java create mode 100644 src/main/java/com/swyp/app/domain/tag/enums/TagType.java create mode 100644 src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java create mode 100644 src/main/java/com/swyp/app/domain/vote/dto/request/VoteRequest.java create mode 100644 src/main/java/com/swyp/app/domain/vote/dto/response/VoteResultResponse.java rename src/main/java/com/swyp/app/domain/vote/{entity => enums}/VoteStatus.java (59%) diff --git a/src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java new file mode 100644 index 00000000..0c50ee68 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java @@ -0,0 +1,55 @@ +package com.swyp.app.domain.battle.controller; + +import com.swyp.app.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.app.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.app.domain.battle.dto.response.AdminBattleDeleteResponse; +import com.swyp.app.domain.battle.dto.response.AdminBattleDetailResponse; +import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@Tag(name = "배틀 API (관리자)", description = "배틀 생성/수정/삭제 (관리자 전용)") +@RestController +@RequestMapping("/api/v1/admin/battles") +@RequiredArgsConstructor +public class AdminBattleController { + + private final BattleService battleService; + + @Operation(summary = "배틀 생성") + @PostMapping + public ApiResponse createBattle( + @RequestBody @Valid AdminBattleCreateRequest request, + @AuthenticationPrincipal Long adminUserId + ) { + // TODO: 로그인 기능 구현 후 @AuthenticationPrincipal adminUserId로 변경 예정 + // 현재 인증 정보가 없어 null이 들어오므로 테스트용 가짜 ID(1L)를 사용함 + Long testAdminId = (adminUserId != null) ? adminUserId : 1L; + + return ApiResponse.onSuccess(battleService.createBattle(request, testAdminId)); + } + + @Operation(summary = "배틀 수정 (변경 필드만 포함)") + @PatchMapping("/{battleId}") + public ApiResponse updateBattle( + @PathVariable UUID battleId, + @RequestBody @Valid AdminBattleUpdateRequest request + ) { + return ApiResponse.onSuccess(battleService.updateBattle(battleId, request)); + } + + @Operation(summary = "배틀 삭제") + @DeleteMapping("/{battleId}") + public ApiResponse deleteBattle( + @PathVariable UUID battleId + ) { + return ApiResponse.onSuccess(battleService.deleteBattle(battleId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/controller/BattleController.java b/src/main/java/com/swyp/app/domain/battle/controller/BattleController.java new file mode 100644 index 00000000..fc3b5c7d --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/controller/BattleController.java @@ -0,0 +1,35 @@ +package com.swyp.app.domain.battle.controller; + +import com.swyp.app.domain.battle.dto.response.BattleUserDetailResponse; +import com.swyp.app.domain.battle.dto.response.TodayBattleListResponse; +import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@Tag(name = "배틀 API (사용자)", description = "배틀 조회") +@RestController +@RequestMapping("/api/v1/battles") +@RequiredArgsConstructor +public class BattleController { + + private final BattleService battleService; + + @Operation(summary = "오늘의 배틀 목록 조회 (스와이프 UI용, 최대 5개)") + @GetMapping("/today") + public ApiResponse getTodayBattles() { + return ApiResponse.onSuccess(battleService.getTodayBattles()); + } + + @Operation(summary = "배틀 상세 조회") + @GetMapping("/{battleId}") + public ApiResponse getBattleDetail( + @PathVariable UUID battleId + ) { + return ApiResponse.onSuccess(battleService.getBattleDetail(battleId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java new file mode 100644 index 00000000..a8262d82 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java @@ -0,0 +1,119 @@ +package com.swyp.app.domain.battle.converter; + +import com.swyp.app.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.app.domain.battle.dto.response.*; +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.enums.BattleCreatorType; +import com.swyp.app.domain.battle.enums.BattleStatus; +import com.swyp.app.domain.tag.entity.Tag; +import com.swyp.app.domain.tag.enums.TagType; +import com.swyp.app.domain.user.entity.User; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class BattleConverter { + + private static final String BASE_SHARE_URL = "https://pique.app/battles/"; + + // 1. 배틀 엔티티 변환 (Admin 생성용) + public static Battle toEntity(AdminBattleCreateRequest request, User admin) { + return Battle.builder() + .title(request.title()) + .summary(request.summary()) + .description(request.description()) + .thumbnailUrl(request.thumbnailUrl()) + .type(request.type()) + .targetDate(request.targetDate()) + .status(BattleStatus.DRAFT) + .creatorType(BattleCreatorType.ADMIN) + .creator(admin) + .build(); + } + + // 2. 오늘의 배틀 변환 + public static TodayBattleResponse toTodayResponse(Battle b, List tags, List opts) { + return new TodayBattleResponse( + b.getId(), + b.getTitle(), + b.getSummary(), + b.getThumbnailUrl(), + b.getType(), + b.getAudioDuration() == null ? 0 : b.getAudioDuration(), + BASE_SHARE_URL + b.getId(), + toTagResponses(tags, null), + opts.stream().map(o -> new TodayOptionResponse( + o.getId(), o.getLabel(), o.getTitle(), o.getRepresentative(), o.getStance(), o.getImageUrl() + )).toList() + ); + } + + // 관리자용 상세 정보 변환 + public static AdminBattleDetailResponse toAdminDetailResponse(Battle b, List tags, List opts) { + return new AdminBattleDetailResponse( + b.getId(), + b.getTitle(), + b.getSummary(), + b.getDescription(), + b.getThumbnailUrl(), + b.getType(), + b.getTargetDate(), + b.getStatus(), + b.getCreatorType(), + toTagResponses(tags, null), + toOptionResponses(opts), + b.getCreatedAt(), + b.getUpdatedAt() + ); + } + + // 3. 유저용 배틀 상세 변환 (사전/사후 투표) + public static BattleUserDetailResponse toUserDetailResponse(Battle b, List tags, List opts, Long partCount, String voteStatus) { + + BattleSummaryResponse summary = new BattleSummaryResponse( + b.getId(), + b.getTitle(), + b.getSummary(), + b.getThumbnailUrl(), + b.getType(), + b.getViewCount() == null ? 0 : b.getViewCount(), + partCount == null ? 0L : partCount, + b.getAudioDuration() == null ? 0 : b.getAudioDuration(), + toTagResponses(tags, null), + toOptionResponses(opts) + ); + + return new BattleUserDetailResponse( + summary, + b.getDescription(), + BASE_SHARE_URL + b.getId(), + voteStatus, + toTagResponses(tags, TagType.CATEGORY), + toTagResponses(tags, TagType.PHILOSOPHER), + toTagResponses(tags, TagType.VALUE) + ); + } + + // 옵션 변환 (A, B, C, D 모두 대응) + private static List toOptionResponses(List options) { + return options.stream() + .map(o -> new BattleOptionResponse( + o.getId(), + o.getLabel(), + o.getTitle(), + o.getRepresentative(), + o.getImageUrl(), + o.getStance(), + o.getQuote() + )).toList(); + } + + private static List toTagResponses(List tags, TagType targetType) { + return tags.stream() + .filter(t -> targetType == null || t.getType() == targetType) + .map(t -> new BattleTagResponse(t.getId(), t.getName(), t.getType())) + .toList(); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java new file mode 100644 index 00000000..10f13ffb --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java @@ -0,0 +1,19 @@ +package com.swyp.app.domain.battle.dto.request; + +import com.swyp.app.domain.battle.enums.BattleType; + +import java.time.LocalDate; +import java.util.List; +import java.util.UUID; + +public record AdminBattleCreateRequest( + String title, + String summary, + String description, + String thumbnailUrl, + BattleType type, + UUID categoryId, + LocalDate targetDate, + List tagIds, + List options +) {} diff --git a/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleOptionRequest.java b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleOptionRequest.java new file mode 100644 index 00000000..51eaa91a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleOptionRequest.java @@ -0,0 +1,17 @@ +package com.swyp.app.domain.battle.dto.request; + +import com.swyp.app.domain.battle.enums.BattleOptionLabel; + +import java.util.List; +import java.util.UUID; + +public record AdminBattleOptionRequest( + BattleOptionLabel label, + String title, + String stance, + String representative, + String quote, + String imageUrl, + List philosopherTagIds, + List valueTagIds +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleUpdateRequest.java b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleUpdateRequest.java new file mode 100644 index 00000000..c972dc00 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleUpdateRequest.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.battle.dto.request; + +import com.swyp.app.domain.battle.enums.BattleStatus; + +import java.time.LocalDate; +import java.util.List; +import java.util.UUID; + +public record AdminBattleUpdateRequest( + String title, + String summary, + String description, + String thumbnailUrl, + LocalDate targetDate, + Integer audioDuration, + BattleStatus status, + List tagIds +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDeleteResponse.java new file mode 100644 index 00000000..4aa786dc --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDeleteResponse.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.battle.dto.response; + +import java.time.LocalDateTime; + +/** + * 관리자 - 배틀 삭제 응답 + * 역할: 배틀이 성공적으로 소프트 딜리트 되었는지 확인하고 삭제 시점을 반환합니다. + */ + +public record AdminBattleDeleteResponse( + Boolean success, // 삭제 성공 여부 + LocalDateTime deletedAt // 삭제 처리된 일시 (Soft Delete) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java new file mode 100644 index 00000000..28766df1 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java @@ -0,0 +1,32 @@ +package com.swyp.app.domain.battle.dto.response; + +import com.swyp.app.domain.battle.enums.BattleCreatorType; +import com.swyp.app.domain.battle.enums.BattleStatus; +import com.swyp.app.domain.battle.enums.BattleType; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import java.util.UUID; + +/** + * 관리자 - 배틀 상세 상세 조회 응답 + * 역할: 관리자가 배틀의 모든 설정 값(상태, 생성자 타입, 수정일 등)을 확인하고 수정할 때 사용합니다. + */ + +public record AdminBattleDetailResponse( + UUID battleId, // 배틀 고유 ID + String title, // 배틀 제목 + String summary, // 배틀 요약 문구 + String description, // 배틀 상세 설명 + String thumbnailUrl, // 상단 배경 이미지 URL + BattleType type, // 배틀 타입 (BATTLE, QUIZ, VOTE) + LocalDate targetDate, // 게시 예정일 (홈 화면 노출 날짜) + BattleStatus status, // 배틀 상태 (DRAFT, PUBLISHED, ARCHIVED 등) + BattleCreatorType creatorType, // 생성 주체 (ADMIN, USER) + List tags, // 연결된 모든 태그 리스트 + List options, // 대결 선택지 상세 정보 리스트 + LocalDateTime createdAt, // 데이터 생성 일시 + LocalDateTime updatedAt // 데이터 최종 수정 일시 +) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/BattleOptionResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleOptionResponse.java new file mode 100644 index 00000000..0dfb1cab --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleOptionResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.battle.dto.response; + +import com.swyp.app.domain.battle.enums.BattleOptionLabel; + +import java.util.UUID; + +public record BattleOptionResponse( + UUID optionId, + BattleOptionLabel label, + String title, + String stance, + String representative, + String quote, + String imageUrl +) {} diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/BattleSummaryResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleSummaryResponse.java new file mode 100644 index 00000000..a093fc90 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleSummaryResponse.java @@ -0,0 +1,24 @@ +package com.swyp.app.domain.battle.dto.response; + +import com.swyp.app.domain.battle.enums.BattleType; + +import java.util.List; +import java.util.UUID; + +/** + * 유저 - 배틀 요약 정보 응답 + * 역할: 홈 화면의 각 섹션 카드나 리스트에서 '미리보기' 형태로 보여줄 데이터입니다. + */ + +public record BattleSummaryResponse( + UUID battleId, // 배틀 고유 ID + String title, // 배틀 제목 + String summary, // 배틀 요약 (누군가는 이것을...) + String thumbnailUrl, // 카드 배경 이미지 URL + BattleType type, // 배틀 타입 태그 (#BATTLE, #VOTE 등) + Integer viewCount, // 조회수 + Long participantsCount, // 누적 참여자 수 + Integer audioDuration, // 오디오 소요 시간 + List tags, // 카테고리/인물 태그 리스트 + List options // 선택지 요약 (A vs B) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/BattleTagResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleTagResponse.java new file mode 100644 index 00000000..358dffc5 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleTagResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.battle.dto.response; +import com.swyp.app.domain.tag.enums.TagType; + +import java.util.UUID; + +/** + * 유저 - 배틀 태그 응답 + * 역할: 화면 곳곳에 쓰이는 #예술 #철학 등의 태그 정보를 담습니다. + */ + +public record BattleTagResponse( + UUID tagId, // 태그 고유 ID + String name, // 태그 명칭 + TagType type // 태그 카테고리 (CATEGORY, PHILOSOPHER, VALUE) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java new file mode 100644 index 00000000..d7ea2a21 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.battle.dto.response; + +import java.util.List; + +/** + * 유저 - 배틀 상세 페이지 응답 (시안 4, 5번) + * 역할: 배틀 클릭 시 진입하는 상세 화면의 모든 정보를 담습니다. 투표 여부에 따라 UI가 변합니다. + */ + +public record BattleUserDetailResponse( + BattleSummaryResponse battleInfo, // 기본적인 배틀 정보 (요약 DTO 재사용) + String description, // 상세 본문 설명 + String shareUrl, // 공유하기 버튼용 링크 + String userVoteStatus, // 현재 유저의 투표 상태 (NONE, A, B...) + List categoryTags, // UI 상단용 카테고리 태그만 분리 + List philosopherTags, // UI 하단용 철학자 태그만 분리 + List valueTags // 성향 분석용 가치관 태그만 분리 +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/BattleVoteResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleVoteResponse.java new file mode 100644 index 00000000..fecc9891 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleVoteResponse.java @@ -0,0 +1,16 @@ +package com.swyp.app.domain.battle.dto.response; + +import java.util.List; +import java.util.UUID; + +/** + * 유저 - 투표 결과 전체 응답 + * 역할: 투표 완료 후 실시간으로 변한 전체 참여자 수와 옵션별 비율을 반환합니다. + */ + +public record BattleVoteResponse( + UUID battleId, // 투표한 배틀 ID + UUID selectedOptionId, // 유저가 방금 선택한 옵션 ID + Long totalParticipants, // 실시간 전체 참여자 수 + List results // 옵션별 득표 현황 리스트 +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/OptionStatResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/OptionStatResponse.java new file mode 100644 index 00000000..00579f72 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/OptionStatResponse.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.battle.dto.response; + +import com.swyp.app.domain.battle.enums.BattleOptionLabel; + +import java.util.UUID; + +/** + * 유저 - 옵션별 실시간 통계 + * 역할: 각 선택지별로 몇 명이 선택했는지, 퍼센트(%)는 얼마인지 담습니다. + */ + +public record OptionStatResponse( + UUID optionId, // 옵션 고유 ID + BattleOptionLabel label,// 라벨 (A, B) + String title, // 옵션 명칭 + Long voteCount, // 해당 옵션의 득표 수 + Double ratio // 해당 옵션의 득표 비율 (0~100.0) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleListResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleListResponse.java new file mode 100644 index 00000000..0e7f72af --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleListResponse.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.battle.dto.response; + +import java.util.List; + +/** + * 유저 - 오늘의 배틀 목록 응답 + * 역할: 오늘의 배틀 섹션에 노출될 배틀들과 총 개수를 감싸는 리스트형 DTO입니다. + */ + +public record TodayBattleListResponse( + List items, // 오늘의 배틀 리스트 + Integer totalCount // 목록 총 개수 +) {} diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleResponse.java new file mode 100644 index 00000000..35d88178 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/TodayBattleResponse.java @@ -0,0 +1,23 @@ +package com.swyp.app.domain.battle.dto.response; + +import com.swyp.app.domain.battle.enums.BattleType; + +import java.util.List; +import java.util.UUID; + +/** + * 유저 - 오늘의 배틀 상세 응답 (시안 6번) + * 역할: 어두운 배경의 풀스크린 UI에 필요한 배경 이미지, 시간, 공유 주소 등을 담습니다. + */ + +public record TodayBattleResponse( + UUID battleId, // 배틀 고유 ID + String title, // 배틀 제목 + String summary, // 중간 요약 문구 + String thumbnailUrl, // 풀스크린 배경 이미지 URL + BattleType type, // 타입 태그 + Integer audioDuration, // 소요 시간 (분:초 변환용 데이터) + String shareUrl, // 공유하기 링크 + List tags, // 상단 태그 리스트 + List options // 중앙 세로형 대결 카드 데이터 +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/TodayOptionResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/TodayOptionResponse.java new file mode 100644 index 00000000..d34af13a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/TodayOptionResponse.java @@ -0,0 +1,19 @@ +package com.swyp.app.domain.battle.dto.response; + +import com.swyp.app.domain.battle.enums.BattleOptionLabel; + +import java.util.UUID; + +/** + * 유저 - 오늘의 배틀 전용 옵션 응답 + * 역할: 오늘의 배틀 시안의 세로형 카드에 들어가는 인물, 입장, 아바타 정보를 담습니다. + */ + +public record TodayOptionResponse( + UUID optionId, // 옵션 ID + BattleOptionLabel label,// 라벨 (A, B) + String title, // 제목 (예: 찬성한다) + String representative, // 인물 (예: 피터 싱어) + String stance, // 한 줄 입장 (예: 고통을 끝낼 권리는..) + String imageUrl // 아바타 이미지 URL +) {} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/Battle.java b/src/main/java/com/swyp/app/domain/battle/entity/Battle.java index 2b79cc67..a1758805 100644 --- a/src/main/java/com/swyp/app/domain/battle/entity/Battle.java +++ b/src/main/java/com/swyp/app/domain/battle/entity/Battle.java @@ -1,20 +1,18 @@ package com.swyp.app.domain.battle.entity; +import com.swyp.app.domain.battle.enums.BattleCreatorType; +import com.swyp.app.domain.battle.enums.BattleStatus; +import com.swyp.app.domain.battle.enums.BattleType; +import com.swyp.app.domain.user.entity.User; import com.swyp.app.global.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.UUID; @Getter @@ -27,10 +25,9 @@ public class Battle extends BaseEntity { @GeneratedValue(strategy = GenerationType.UUID) private UUID id; - @Column(nullable = false, length = 255) + @Column(nullable = false) private String title; - @Column(length = 500) private String summary; @Column(columnDefinition = "TEXT") @@ -39,9 +36,22 @@ public class Battle extends BaseEntity { @Column(name = "thumbnail_url", length = 500) private String thumbnailUrl; + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private BattleType type; + + @Column(name = "view_count") + private Integer viewCount = 0; + + @Column(name = "total_participants") + private Long totalParticipantsCount = 0L; + @Column(name = "target_date") private LocalDate targetDate; + @Column(name = "audio_duration") + private Integer audioDuration; + @Enumerated(EnumType.STRING) @Column(nullable = false, length = 20) private BattleStatus status; @@ -50,25 +60,64 @@ public class Battle extends BaseEntity { @Column(name = "creator_type", nullable = false, length = 10) private BattleCreatorType creatorType; - // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "creator_id") 로 교체 - @Column(name = "creator_id") - private Long creatorId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "creator_id") + private User creator; + + // 홈 화면 5단 기획을 위한 필드들 + + @Column(name = "is_editor_pick") + private Boolean isEditorPick = false; // 기본값 false + + @Column(name = "comment_count") + private Long commentCount = 0L; // 베스트 배틀 정렬용 기본값 0 - @Column(name = "reject_reason", length = 500) - private String rejectReason; + @Column(name = "deleted_at") + private LocalDateTime deletedAt; @Builder - private Battle(String title, String summary, String description, String thumbnailUrl, - LocalDate targetDate, BattleStatus status, BattleCreatorType creatorType, - Long creatorId, String rejectReason) { + public Battle(String title, String summary, String description, String thumbnailUrl, + BattleType type, LocalDate targetDate, Integer audioDuration, + BattleStatus status, BattleCreatorType creatorType, User creator) { this.title = title; this.summary = summary; this.description = description; this.thumbnailUrl = thumbnailUrl; + this.type = type; this.targetDate = targetDate; + this.audioDuration = audioDuration; this.status = status; this.creatorType = creatorType; - this.creatorId = creatorId; - this.rejectReason = rejectReason; + this.creator = creator; + this.viewCount = 0; + this.totalParticipantsCount = 0L; + this.isEditorPick = false; + this.commentCount = 0L; + this.deletedAt = null; + } + + public void update(String title, String summary, String description, + String thumbnailUrl, LocalDate targetDate, + Integer audioDuration, BattleStatus status) { + if (title != null) this.title = title; + if (summary != null) this.summary = summary; + if (description != null) this.description = description; + if (thumbnailUrl != null) this.thumbnailUrl = thumbnailUrl; + if (targetDate != null) this.targetDate = targetDate; + if (audioDuration != null) this.audioDuration = audioDuration; + if (status != null) this.status = status; + } + + public void delete() { + this.status = BattleStatus.ARCHIVED; + this.deletedAt = LocalDateTime.now(); + } + + public void increaseViewCount() { + this.viewCount = (this.viewCount == null ? 0 : this.viewCount) + 1; + } + + public void addParticipant() { + this.totalParticipantsCount = (this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount) + 1; } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java b/src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java index 54683de8..42d8f0f0 100644 --- a/src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java +++ b/src/main/java/com/swyp/app/domain/battle/entity/BattleOption.java @@ -1,21 +1,13 @@ package com.swyp.app.domain.battle.entity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import java.util.List; import java.util.UUID; @Getter @@ -33,7 +25,7 @@ public class BattleOption { private Battle battle; @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 5) + @Column(nullable = false, length = 10) private BattleOptionLabel label; @Column(nullable = false, length = 100) @@ -48,22 +40,26 @@ public class BattleOption { @Column(columnDefinition = "TEXT") private String quote; - @Column(columnDefinition = "jsonb") - private String keywords; + @Column(name = "vote_count") + private Long voteCount = 0L; @Column(name = "image_url", length = 500) private String imageUrl; @Builder - private BattleOption(Battle battle, BattleOptionLabel label, String title, String stance, - String representative, String quote, String keywords, String imageUrl) { + public BattleOption(Battle battle, BattleOptionLabel label, String title, String stance, + String representative, String quote, List keywords, String imageUrl) { this.battle = battle; this.label = label; this.title = title; this.stance = stance; this.representative = representative; this.quote = quote; - this.keywords = keywords; this.imageUrl = imageUrl; + this.voteCount = 0L; } -} + + public void increaseVoteCount() { + this.voteCount = (this.voteCount == null ? 0L : this.voteCount) + 1; + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java b/src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java deleted file mode 100644 index 7cc47848..00000000 --- a/src/main/java/com/swyp/app/domain/battle/entity/BattleOptionLabel.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.swyp.app.domain.battle.entity; - -public enum BattleOptionLabel { - A, B -} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleCreatorType.java b/src/main/java/com/swyp/app/domain/battle/enums/BattleCreatorType.java similarity index 56% rename from src/main/java/com/swyp/app/domain/battle/entity/BattleCreatorType.java rename to src/main/java/com/swyp/app/domain/battle/enums/BattleCreatorType.java index 6367ac57..0ec4f25b 100644 --- a/src/main/java/com/swyp/app/domain/battle/entity/BattleCreatorType.java +++ b/src/main/java/com/swyp/app/domain/battle/enums/BattleCreatorType.java @@ -1,4 +1,4 @@ -package com.swyp.app.domain.battle.entity; +package com.swyp.app.domain.battle.enums; public enum BattleCreatorType { ADMIN, USER, AI diff --git a/src/main/java/com/swyp/app/domain/battle/enums/BattleOptionLabel.java b/src/main/java/com/swyp/app/domain/battle/enums/BattleOptionLabel.java new file mode 100644 index 00000000..e395fb11 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/enums/BattleOptionLabel.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.battle.enums; + +public enum BattleOptionLabel { + A, B, C, D +} diff --git a/src/main/java/com/swyp/app/domain/battle/entity/BattleStatus.java b/src/main/java/com/swyp/app/domain/battle/enums/BattleStatus.java similarity index 65% rename from src/main/java/com/swyp/app/domain/battle/entity/BattleStatus.java rename to src/main/java/com/swyp/app/domain/battle/enums/BattleStatus.java index 5c7cf55b..c395e5fa 100644 --- a/src/main/java/com/swyp/app/domain/battle/entity/BattleStatus.java +++ b/src/main/java/com/swyp/app/domain/battle/enums/BattleStatus.java @@ -1,4 +1,4 @@ -package com.swyp.app.domain.battle.entity; +package com.swyp.app.domain.battle.enums; public enum BattleStatus { DRAFT, PENDING, PUBLISHED, REJECTED, ARCHIVED diff --git a/src/main/java/com/swyp/app/domain/battle/enums/BattleType.java b/src/main/java/com/swyp/app/domain/battle/enums/BattleType.java new file mode 100644 index 00000000..0f8b71e6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/enums/BattleType.java @@ -0,0 +1,5 @@ +package com.swyp.app.domain.battle.enums; + +public enum BattleType { + BATTLE, QUIZ, VOTE +} diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java index 6ecea267..d00339f1 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java @@ -2,7 +2,7 @@ import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleOption; -import com.swyp.app.domain.battle.entity.BattleOptionLabel; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; @@ -12,6 +12,6 @@ public interface BattleOptionRepository extends JpaRepository { List findByBattle(Battle battle); - Optional findByBattleAndLabel(Battle battle, BattleOptionLabel label); + } diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java index b09b20e6..4e9c28a2 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java @@ -1,9 +1,53 @@ package com.swyp.app.domain.battle.repository; import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.enums.BattleStatus; +import com.swyp.app.domain.battle.enums.BattleType; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; import java.util.UUID; public interface BattleRepository extends JpaRepository { -} + + // 1. EDITOR PICK + @Query("SELECT battle FROM Battle battle " + + "WHERE battle.isEditorPick = true AND battle.status = :status " + + "AND battle.deletedAt IS NULL " + + "ORDER BY battle.createdAt DESC") + List findEditorPicks(@Param("status") BattleStatus status, Pageable pageable); + + // 2. 지금 뜨는 배틀 + @Query("SELECT battle FROM Battle battle JOIN Vote vote ON vote.battle = battle " + + "WHERE vote.createdAt >= :yesterday AND battle.status = 'PUBLISHED' " + + "AND battle.deletedAt IS NULL " + + "GROUP BY battle ORDER BY COUNT(vote) DESC") + List findTrendingBattles(@Param("yesterday") LocalDateTime yesterday, Pageable pageable); + + // 3. Best 배틀 + @Query("SELECT battle FROM Battle battle " + + "WHERE battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + + "ORDER BY (battle.totalParticipantsCount + (battle.commentCount * 5)) DESC") + List findBestBattles(Pageable pageable); + + // 4. 오늘의 Pické (단일 타입) + @Query("SELECT battle FROM Battle battle " + + "WHERE battle.type = :type AND battle.targetDate = :today " + + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL") + List findTodayPicks(@Param("type") BattleType type, @Param("today") LocalDate today); + + // 5. 새로운 배틀 + @Query("SELECT battle FROM Battle battle " + + "WHERE battle.id NOT IN :excludeIds AND battle.status = 'PUBLISHED' " + + "AND battle.deletedAt IS NULL " + + "ORDER BY battle.createdAt DESC") + List findNewBattlesExcluding(@Param("excludeIds") List excludeIds, Pageable pageable); + + // 기본 조회용 + List findByTargetDateAndStatusAndDeletedAtIsNull(LocalDate date, BattleStatus status); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java index ea686e3e..38a5c8a7 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java @@ -2,12 +2,14 @@ import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleTag; +import com.swyp.app.domain.tag.entity.Tag; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; import java.util.UUID; public interface BattleTagRepository extends JpaRepository { - List findByBattle(Battle battle); -} + void deleteByBattle(Battle battle); + boolean existsByTag(Tag tag); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleService.java b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java index 762c514a..fe6fc122 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleService.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java @@ -1,16 +1,62 @@ package com.swyp.app.domain.battle.service; +import com.swyp.app.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.app.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.app.domain.battle.dto.response.*; import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleOption; -import com.swyp.app.domain.battle.entity.BattleOptionLabel; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; +import com.swyp.app.domain.battle.enums.BattleType; +import java.util.List; import java.util.UUID; public interface BattleService { + // === [내부 공통/조회 메서드] === Battle findById(UUID battleId); - BattleOption findOptionById(UUID optionId); - BattleOption findOptionByBattleIdAndLabel(UUID battleId, BattleOptionLabel label); -} + + + // === [사용자용 - 홈 화면 5단 로직 지원 API] === + + // 1. 에디터 픽 조회 (isEditorPick = true) + List getEditorPicks(); + + // 2. 지금 뜨는 배틀 조회 (최근 24시간 투표 급증순) + List getTrendingBattles(); + + // 3. Best 배틀 조회 (누적 지표 랭킹) + List getBestBattles(); + + // 4. 오늘의 Pické 조회 (단일 타입 매칭) + List getTodayPicks(BattleType type); + + // 5. 새로운 배틀 조회 (중복 제외 리스트) + List getNewBattles(List excludeIds); + + + // === [사용자용 - 기본 API] === + + // 오늘의 배틀 (기존 로직 유지용) + TodayBattleListResponse getTodayBattles(); + + // 배틀 상세 정보 + BattleUserDetailResponse getBattleDetail(UUID battleId); + + // 투표 실행 및 실시간 통계 결과 반환 + BattleVoteResponse vote(UUID battleId, UUID optionId); + + + // === [관리자용 API] === + + // 배틀 생성 + AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, Long adminUserId); + + // 배틀 수정 + AdminBattleDetailResponse updateBattle(UUID battleId, AdminBattleUpdateRequest request); + + // 배틀 삭제 (DB에서 지우지 않고 소프트 딜리트/상태변경을 수행합니다) + AdminBattleDeleteResponse deleteBattle(UUID battleId); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java index c23d9c6c..03da9eaa 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java @@ -1,40 +1,238 @@ package com.swyp.app.domain.battle.service; +import com.swyp.app.domain.battle.converter.BattleConverter; +import com.swyp.app.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.app.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.app.domain.battle.dto.response.*; import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleOption; -import com.swyp.app.domain.battle.entity.BattleOptionLabel; +import com.swyp.app.domain.battle.entity.BattleTag; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; +import com.swyp.app.domain.battle.enums.BattleStatus; +import com.swyp.app.domain.battle.enums.BattleType; import com.swyp.app.domain.battle.repository.BattleOptionRepository; import com.swyp.app.domain.battle.repository.BattleRepository; +import com.swyp.app.domain.battle.repository.BattleTagRepository; +import com.swyp.app.domain.tag.entity.Tag; +import com.swyp.app.domain.tag.repository.TagRepository; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.domain.vote.repository.VoteRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; @Service @RequiredArgsConstructor +@Transactional(readOnly = true) public class BattleServiceImpl implements BattleService { private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; + private final BattleTagRepository battleTagRepository; + private final TagRepository tagRepository; + private final UserRepository userRepository; + private final VoteRepository voteRepository; @Override public Battle findById(UUID battleId) { - return battleRepository.findById(battleId) + Battle battle = battleRepository.findById(battleId) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + + if (battle.getDeletedAt() != null) { + throw new CustomException(ErrorCode.BATTLE_NOT_FOUND); + } + return battle; + } + + // [사용자용 - 홈 화면 5단 로직] + + @Override + public List getEditorPicks() { + List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, PageRequest.of(0, 10)); + return convertToTodayResponses(battles); + } + + @Override + public List getTrendingBattles() { + LocalDateTime yesterday = LocalDateTime.now().minusDays(1); + List battles = battleRepository.findTrendingBattles(yesterday, PageRequest.of(0, 5)); + return convertToTodayResponses(battles); + } + + @Override + public List getBestBattles() { + List battles = battleRepository.findBestBattles(PageRequest.of(0, 5)); + return convertToTodayResponses(battles); + } + + @Override + public List getTodayPicks(BattleType type) { + List battles = battleRepository.findTodayPicks(type, LocalDate.now()); + return convertToTodayResponses(battles); + } + + @Override + public List getNewBattles(List excludeIds) { + List finalExcludeIds = (excludeIds == null || excludeIds.isEmpty()) + ? List.of(UUID.randomUUID()) : excludeIds; + List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, PageRequest.of(0, 10)); + return convertToTodayResponses(battles); + } + + // [사용자용 - 기본 API] + + @Override + public TodayBattleListResponse getTodayBattles() { + List battles = battleRepository.findByTargetDateAndStatusAndDeletedAtIsNull( + LocalDate.now(), BattleStatus.PUBLISHED); + List items = convertToTodayResponses(battles); + return new TodayBattleListResponse(items, items.size()); + } + + @Override + public BattleUserDetailResponse getBattleDetail(UUID battleId) { + Battle battle = findById(battleId); + battle.increaseViewCount(); + + List allTags = getTagsByBattle(battle); + List options = battleOptionRepository.findByBattle(battle); + + // 임시 유저 1L의 투표 상태 확인 (추후 수정 필요) + String voteStatus = voteRepository.findByBattleAndUserId(battle, 1L) + .map(v -> v.getPostVoteOption().getLabel().name()) + .orElse("NONE"); + + return BattleConverter.toUserDetailResponse(battle, allTags, options, battle.getTotalParticipantsCount(), voteStatus); + } + + @Override + @Transactional + public BattleVoteResponse vote(UUID battleId, UUID optionId) { + Battle battle = findById(battleId); + BattleOption option = battleOptionRepository.findById(optionId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); + + battle.addParticipant(); + option.increaseVoteCount(); + + List results = battleOptionRepository.findByBattle(battle).stream().map(opt -> { + Long v = opt.getVoteCount() == null ? 0L : opt.getVoteCount(); + Long t = battle.getTotalParticipantsCount() == null ? 0L : battle.getTotalParticipantsCount(); + Double r = (t == 0L) ? 0.0 : Math.round((double) v / t * 1000) / 10.0; + return new OptionStatResponse(opt.getId(), opt.getLabel(), opt.getTitle(), v, r); + }).toList(); + + return new BattleVoteResponse(battle.getId(), option.getId(), battle.getTotalParticipantsCount(), results); + } + + // [관리자용 API] + + @Override + @Transactional + public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, Long adminUserId) { + // 1. 유저 확인 + User admin = userRepository.findById(adminUserId == null ? 1L : adminUserId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + // 2. 선택지 개수 검증 (VOTE는 4개, QUIZ, BATTLE은 2개) + int requiredOptionCount = (request.type() == BattleType.VOTE) ? 4 : 2; + if (request.options().size() != requiredOptionCount) { + throw new CustomException(ErrorCode.BATTLE_INVALID_OPTION_COUNT); + } + + // 3. 배틀 저장 + Battle battle = battleRepository.save(BattleConverter.toEntity(request, admin)); + + // 4. 태그 저장 + if (request.tagIds() != null) { + saveBattleTags(battle, request.tagIds()); + } + + // 5. 옵션 저장 + List savedOptions = new ArrayList<>(); + for (var optReq : request.options()) { + BattleOption option = battleOptionRepository.save(BattleOption.builder() + .battle(battle) + .label(optReq.label()) + .title(optReq.title()) + .stance(optReq.stance()) + .representative(optReq.representative()) + .quote(optReq.quote()) + .imageUrl(optReq.imageUrl()) + .build()); + savedOptions.add(option); + } + + // 6. 관리자용 상세 응답 반환 + return BattleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), savedOptions); + } + + @Override + @Transactional + public AdminBattleDetailResponse updateBattle(UUID battleId, AdminBattleUpdateRequest request) { + Battle battle = findById(battleId); + battle.update(request.title(), request.summary(), request.description(), + request.thumbnailUrl(), request.targetDate(), request.audioDuration(), request.status()); + + if (request.tagIds() != null) { + battleTagRepository.deleteByBattle(battle); + saveBattleTags(battle, request.tagIds()); + } + + return BattleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), battleOptionRepository.findByBattle(battle)); + } + + @Override + @Transactional + public AdminBattleDeleteResponse deleteBattle(UUID battleId) { + Battle battle = findById(battleId); + battle.delete(); + return new AdminBattleDeleteResponse(true, LocalDateTime.now()); + } + + // [공통 헬퍼 메서드] + + private List convertToTodayResponses(List battles) { + return battles.stream().map(battle -> { + List tags = getTagsByBattle(battle); + List options = battleOptionRepository.findByBattle(battle); + return BattleConverter.toTodayResponse(battle, tags, options); + }).toList(); + } + + private List getTagsByBattle(Battle b) { + return battleTagRepository.findByBattle(b).stream() + .map(BattleTag::getTag) + .filter(t -> t.getDeletedAt() == null) + .toList(); + } + + private void saveBattleTags(Battle b, List ids) { + tagRepository.findAllById(ids).stream() + .filter(t -> t.getDeletedAt() == null) + .forEach(t -> battleTagRepository.save(BattleTag.builder().battle(b).tag(t).build())); } @Override public BattleOption findOptionById(UUID optionId) { return battleOptionRepository.findById(optionId) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); } @Override public BattleOption findOptionByBattleIdAndLabel(UUID battleId, BattleOptionLabel label) { - Battle battle = findById(battleId); - return battleOptionRepository.findByBattleAndLabel(battle, label) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + Battle b = findById(battleId); + return battleOptionRepository.findByBattleAndLabel(b, label) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java index 85bca44b..867bd2e6 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java @@ -1,7 +1,7 @@ package com.swyp.app.domain.perspective.service; import com.swyp.app.domain.battle.entity.BattleOption; -import com.swyp.app.domain.battle.entity.BattleOptionLabel; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; import com.swyp.app.domain.battle.service.BattleService; import com.swyp.app.domain.perspective.entity.PerspectiveStatus; import com.swyp.app.domain.perspective.dto.request.CreatePerspectiveRequest; diff --git a/src/main/java/com/swyp/app/domain/tag/controller/TagController.java b/src/main/java/com/swyp/app/domain/tag/controller/TagController.java new file mode 100644 index 00000000..96f30f15 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/controller/TagController.java @@ -0,0 +1,64 @@ +package com.swyp.app.domain.tag.controller; + +import com.swyp.app.domain.tag.dto.request.TagRequest; +import com.swyp.app.domain.tag.dto.response.*; +import com.swyp.app.domain.tag.enums.TagType; +import com.swyp.app.domain.tag.service.TagService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@Tag(name = "태그 (Tag)", description = "태그 조회 및 관리 API") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1") +public class TagController { + + private final TagService tagService; + + @Operation(summary = "태그 목록 조회", description = "전체 태그 목록을 조회합니다. 특정 타입(type)을 지정하여 필터링할 수 있습니다.") + @GetMapping("/tags") + public ApiResponse getTags( + @Parameter(description = "필터링할 태그 타입 (예: BATTLE 등)", required = false) + @RequestParam(name = "type", required = false) TagType type) { + + TagListResponse response = tagService.getTags(type); + return ApiResponse.onSuccess(response); + } + + @Operation(summary = "태그 생성 (관리자)", description = "관리자가 새로운 태그를 생성합니다.") + @PostMapping("/admin/tags") + public ApiResponse createTag( + @Valid @RequestBody TagRequest request) { + + TagResponse response = tagService.createTag(request); + return ApiResponse.onSuccess(response); + } + + @Operation(summary = "태그 수정 (관리자)", description = "관리자가 기존 태그의 이름이나 정보를 수정합니다.") + @PatchMapping("/admin/tags/{tag_id}") + public ApiResponse updateTag( + @Parameter(description = "수정할 태그의 UUID", example = "123e4567-e89b-12d3-a456-426614174000") + @PathVariable("tag_id") UUID tagId, + @Valid @RequestBody TagRequest request) { + + TagResponse response = tagService.updateTag(tagId, request); + return ApiResponse.onSuccess(response); + } + + @Operation(summary = "태그 삭제 (관리자)", description = "관리자가 특정 태그를 삭제합니다. 단, 배틀에 사용 중인 태그는 삭제할 수 없습니다.") + @DeleteMapping("/admin/tags/{tag_id}") + public ApiResponse deleteTag( + @Parameter(description = "삭제할 태그의 UUID", example = "123e4567-e89b-12d3-a456-426614174000") + @PathVariable("tag_id") UUID tagId) { + + TagDeleteResponse response = tagService.deleteTag(tagId); + return ApiResponse.onSuccess(response); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/converter/TagConverter.java b/src/main/java/com/swyp/app/domain/tag/converter/TagConverter.java new file mode 100644 index 00000000..d92fee8a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/converter/TagConverter.java @@ -0,0 +1,35 @@ +package com.swyp.app.domain.tag.converter; + +import com.swyp.app.domain.tag.dto.request.TagRequest; +import com.swyp.app.domain.tag.dto.response.*; +import com.swyp.app.domain.tag.entity.Tag; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.util.List; + +@Component +public class TagConverter { + + public static Tag toEntity(TagRequest request) { + return Tag.builder() + .name(request.name()) + .type(request.type()) + .build(); + } + + public static TagResponse toDetailResponse(Tag tag) { + return new TagResponse(tag.getId(), tag.getName(), tag.getType(), tag.getCreatedAt(), tag.getUpdatedAt()); + } + + public static TagListResponse toListResponse(List tags) { + List items = tags.stream() + .map(TagConverter::toDetailResponse) + .toList(); + return new TagListResponse(items, items.size()); + } + + public static TagDeleteResponse toDeleteResponse() { + return new TagDeleteResponse(true, LocalDateTime.now()); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/dto/request/TagRequest.java b/src/main/java/com/swyp/app/domain/tag/dto/request/TagRequest.java new file mode 100644 index 00000000..3b124a52 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/dto/request/TagRequest.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.tag.dto.request; + +import com.swyp.app.domain.tag.enums.TagType; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record TagRequest( + @NotBlank(message = "태그 이름을 입력해주세요.") + String name, + + @NotNull(message = "태그 타입을 선택해주세요.") + TagType type +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/dto/response/TagDeleteResponse.java b/src/main/java/com/swyp/app/domain/tag/dto/response/TagDeleteResponse.java new file mode 100644 index 00000000..0df7b20e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/dto/response/TagDeleteResponse.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.tag.dto.response; + +import java.time.LocalDateTime; + +public record TagDeleteResponse( + boolean success, + LocalDateTime deletedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/dto/response/TagListResponse.java b/src/main/java/com/swyp/app/domain/tag/dto/response/TagListResponse.java new file mode 100644 index 00000000..8bd726d0 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/dto/response/TagListResponse.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.tag.dto.response; + +import java.util.List; + +public record TagListResponse( + List items, + int totalCount +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/dto/response/TagResponse.java b/src/main/java/com/swyp/app/domain/tag/dto/response/TagResponse.java new file mode 100644 index 00000000..27be10a9 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/dto/response/TagResponse.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.tag.dto.response; + +import com.swyp.app.domain.tag.enums.TagType; +import java.time.LocalDateTime; +import java.util.UUID; + +public record TagResponse( + UUID tagId, + String name, + TagType type, + LocalDateTime createdAt, + LocalDateTime updatedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/entity/Tag.java b/src/main/java/com/swyp/app/domain/tag/entity/Tag.java index b4ed1273..0df5f86c 100644 --- a/src/main/java/com/swyp/app/domain/tag/entity/Tag.java +++ b/src/main/java/com/swyp/app/domain/tag/entity/Tag.java @@ -1,17 +1,14 @@ package com.swyp.app.domain.tag.entity; +import com.swyp.app.domain.tag.enums.TagType; import com.swyp.app.global.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import java.time.LocalDateTime; import java.util.UUID; @Getter @@ -22,13 +19,37 @@ public class Tag extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.UUID) + @Column(name = "tag_id", updatable = false, nullable = false) private UUID id; - @Column(nullable = false, unique = true, length = 50) + @Column(nullable = false, length = 50) private String name; + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private TagType type; + + @Column(name = "deleted_at") + private LocalDateTime deletedAt; + @Builder - private Tag(String name) { + public Tag(String name, TagType type) { this.name = name; + this.type = type; + this.deletedAt = null; + } + + public void updateTag(String name, TagType type) { + if (name != null && !name.isBlank()) { + this.name = name; + } + if (type != null) { + this.type = type; + } + } + + // 소프트 삭제 메서드 + public void delete() { + this.deletedAt = LocalDateTime.now(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/enums/TagType.java b/src/main/java/com/swyp/app/domain/tag/enums/TagType.java new file mode 100644 index 00000000..3b7de82b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/tag/enums/TagType.java @@ -0,0 +1,10 @@ +package com.swyp.app.domain.tag.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum TagType { + PHILOSOPHER, CATEGORY, VALUE +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java b/src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java index 4abc69c4..d72e1283 100644 --- a/src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java +++ b/src/main/java/com/swyp/app/domain/tag/repository/TagRepository.java @@ -1,9 +1,15 @@ package com.swyp.app.domain.tag.repository; import com.swyp.app.domain.tag.entity.Tag; +import com.swyp.app.domain.tag.enums.TagType; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.UUID; public interface TagRepository extends JpaRepository { -} + + List findAllByType(TagType type); + + Boolean existsByNameAndType(String name, TagType type); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/service/TagService.java b/src/main/java/com/swyp/app/domain/tag/service/TagService.java index 7be5db83..17d1acc0 100644 --- a/src/main/java/com/swyp/app/domain/tag/service/TagService.java +++ b/src/main/java/com/swyp/app/domain/tag/service/TagService.java @@ -1,11 +1,20 @@ package com.swyp.app.domain.tag.service; +import com.swyp.app.domain.tag.dto.request.TagRequest; +import com.swyp.app.domain.tag.dto.response.TagDeleteResponse; +import com.swyp.app.domain.tag.dto.response.TagListResponse; +import com.swyp.app.domain.tag.dto.response.TagResponse; import com.swyp.app.domain.tag.entity.Tag; +import com.swyp.app.domain.tag.enums.TagType; import java.util.List; import java.util.UUID; public interface TagService { - List findByBattleId(UUID battleId); -} + + TagListResponse getTags(TagType type); + TagResponse createTag(TagRequest request); + TagResponse updateTag(UUID tagId, TagRequest request); + TagDeleteResponse deleteTag(UUID tagId); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java b/src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java index 60fd2594..16f88172 100644 --- a/src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/tag/service/TagServiceImpl.java @@ -1,27 +1,93 @@ package com.swyp.app.domain.tag.service; import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.repository.BattleRepository; import com.swyp.app.domain.battle.repository.BattleTagRepository; -import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.domain.tag.converter.TagConverter; +import com.swyp.app.domain.tag.dto.request.TagRequest; +import com.swyp.app.domain.tag.dto.response.*; import com.swyp.app.domain.tag.entity.Tag; +import com.swyp.app.domain.tag.enums.TagType; +import com.swyp.app.domain.tag.repository.TagRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.UUID; @Service @RequiredArgsConstructor +@Transactional(readOnly = true) public class TagServiceImpl implements TagService { - private final BattleService battleService; + private final TagRepository tagRepository; private final BattleTagRepository battleTagRepository; + private final BattleRepository battleRepository; @Override public List findByBattleId(UUID battleId) { - Battle battle = battleService.findById(battleId); + Battle battle = battleRepository.findById(battleId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + return battleTagRepository.findByBattle(battle).stream() .map(bt -> bt.getTag()) .toList(); } -} + + @Override + public TagListResponse getTags(TagType type) { + List tags = (type != null) ? tagRepository.findAllByType(type) : tagRepository.findAll(); + return TagConverter.toListResponse(tags); + } + + @Override + @Transactional + public TagResponse createTag(TagRequest request) { + validateDuplicateTag(request.name(), request.type()); + + Tag newTag = TagConverter.toEntity(request); + Tag savedTag = tagRepository.save(newTag); + + return TagConverter.toDetailResponse(savedTag); + } + + @Override + @Transactional + public TagResponse updateTag(UUID tagId, TagRequest request) { + Tag tag = findTagById(tagId); + + if (!tag.getName().equals(request.name()) || tag.getType() != request.type()) { + validateDuplicateTag(request.name(), request.type()); + } + + tag.updateTag(request.name(), request.type()); + return TagConverter.toDetailResponse(tag); + } + + @Override + @Transactional + public TagDeleteResponse deleteTag(UUID tagId) { + Tag tag = findTagById(tagId); + + if (battleTagRepository.existsByTag(tag)) { + throw new CustomException(ErrorCode.TAG_IN_USE); + } + + tag.delete(); + return TagConverter.toDeleteResponse(); + } + + private Tag findTagById(UUID tagId) { + return tagRepository.findById(tagId) + .orElseThrow(() -> new CustomException(ErrorCode.TAG_NOT_FOUND)); + } + + private void validateDuplicateTag(String name, TagType type) { + if (tagRepository.existsByNameAndType(name, type)) { + throw new CustomException(ErrorCode.TAG_DUPLICATED); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/user/entity/User.java b/src/main/java/com/swyp/app/domain/user/entity/User.java index fcaaf6f3..37c7ee84 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/User.java +++ b/src/main/java/com/swyp/app/domain/user/entity/User.java @@ -29,6 +29,12 @@ public class User extends BaseEntity { @Column(name = "user_tag", nullable = false, unique = true, length = 30) private String userTag; + @Column(length = 50) + private String nickname; + + @Column(name = "character_url", columnDefinition = "TEXT") + private String characterUrl; + @Enumerated(EnumType.STRING) @Column(nullable = false, length = 20) private UserRole role; @@ -44,8 +50,10 @@ public class User extends BaseEntity { private LocalDateTime deletedAt; @Builder - private User(String userTag, UserRole role, UserStatus status, boolean onboardingCompleted) { + private User(String userTag, String nickname, String characterUrl, UserRole role, UserStatus status, boolean onboardingCompleted) { this.userTag = userTag; + this.nickname = nickname; + this.characterUrl = characterUrl; this.role = role; this.status = status; this.onboardingCompleted = onboardingCompleted; @@ -55,4 +63,4 @@ public void completeOnboarding() { this.status = UserStatus.ACTIVE; this.onboardingCompleted = true; } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java index 3e430c85..7691467c 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java @@ -3,7 +3,6 @@ import com.swyp.app.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; -public interface UserRepository extends JpaRepository { import java.util.Optional; public interface UserRepository extends JpaRepository { diff --git a/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java b/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java index 3575186d..8c96f9b8 100644 --- a/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java +++ b/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java @@ -1,20 +1,19 @@ package com.swyp.app.domain.vote.controller; +import com.swyp.app.domain.vote.dto.request.VoteRequest; import com.swyp.app.domain.vote.dto.response.MyVoteResponse; +import com.swyp.app.domain.vote.dto.response.VoteResultResponse; import com.swyp.app.domain.vote.dto.response.VoteStatsResponse; import com.swyp.app.domain.vote.service.VoteService; import com.swyp.app.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.UUID; -@Tag(name = "투표 (Vote)", description = "투표 통계 및 내 투표 내역 조회 API") +@Tag(name = "투표 (Vote)", description = "사전/사후 투표 실행 및 통계, 내 투표 내역 조회 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -22,17 +21,37 @@ public class VoteController { private final VoteService voteService; + @Operation(summary = "사전 투표 실행", description = "배틀 진입 시 첫 투표(사전 투표)를 진행합니다.") + @PostMapping("/battles/{battleId}/votes/pre") + public ApiResponse preVote( + @PathVariable UUID battleId, + @RequestBody VoteRequest request) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(voteService.preVote(battleId, userId, request)); + } + + @Operation(summary = "사후 투표 실행", description = "콘텐츠 소비 후 최종 투표(사후 투표)를 진행합니다.") + @PostMapping("/battles/{battleId}/votes/post") + public ApiResponse postVote( + @PathVariable UUID battleId, + @RequestBody VoteRequest request) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + return ApiResponse.onSuccess(voteService.postVote(battleId, userId, request)); + } + @Operation(summary = "투표 통계 조회", description = "특정 배틀의 옵션별 투표 수와 비율을 조회합니다.") @GetMapping("/battles/{battleId}/vote-stats") public ApiResponse getVoteStats(@PathVariable UUID battleId) { return ApiResponse.onSuccess(voteService.getVoteStats(battleId)); } - @Operation(summary = "내 투표 내역 조회", description = "특정 배틀에 대한 내 사전/사후 투표 내역과 생각 변화 여부를 조회합니다.") + @Operation(summary = "내 투표 내역 조회", description = "특정 배틀에 대한 내 사전/사후 투표 내역과 현재 상태를 조회합니다.") @GetMapping("/battles/{battleId}/votes/me") public ApiResponse getMyVote(@PathVariable UUID battleId) { // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 Long userId = 1L; return ApiResponse.onSuccess(voteService.getMyVote(battleId, userId)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java b/src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java new file mode 100644 index 00000000..13322446 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java @@ -0,0 +1,38 @@ +package com.swyp.app.domain.vote.converter; + +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.vote.dto.response.MyVoteResponse; +import com.swyp.app.domain.vote.dto.response.VoteResultResponse; +import com.swyp.app.domain.vote.dto.response.VoteStatsResponse; +import com.swyp.app.domain.vote.entity.Vote; + +import java.time.LocalDateTime; +import java.util.List; + +public class VoteConverter { + + // 투표 실행 결과 변환 + public static VoteResultResponse toVoteResultResponse(Vote vote) { + return new VoteResultResponse(vote.getId(), vote.getStatus()); + } + + // 내 투표 내역 변환 + public static MyVoteResponse toMyVoteResponse(Vote vote) { + return new MyVoteResponse( + toOptionInfo(vote.getPreVoteOption()), + toOptionInfo(vote.getPostVoteOption()), + vote.getStatus() + ); + } + + // 투표 통계 변환 + public static VoteStatsResponse toVoteStatsResponse(List stats, long totalCount, LocalDateTime updatedAt) { + return new VoteStatsResponse(stats, totalCount, updatedAt); + } + + // 옵션 정보를 응답용으로 변환 (null 안전 처리) + private static MyVoteResponse.OptionInfo toOptionInfo(BattleOption option) { + if (option == null) return null; + return new MyVoteResponse.OptionInfo(option.getId(), option.getLabel().name(), option.getTitle()); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/vote/dto/request/VoteRequest.java b/src/main/java/com/swyp/app/domain/vote/dto/request/VoteRequest.java new file mode 100644 index 00000000..194ccbf8 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/dto/request/VoteRequest.java @@ -0,0 +1,7 @@ +package com.swyp.app.domain.vote.dto.request; + +import java.util.UUID; + +public record VoteRequest( + UUID optionId +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java b/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java index 4a99b1d3..354ecb4a 100644 --- a/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java +++ b/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java @@ -1,13 +1,12 @@ package com.swyp.app.domain.vote.dto.response; -import com.swyp.app.domain.vote.entity.VoteStatus; +import com.swyp.app.domain.vote.enums.VoteStatus; import java.util.UUID; public record MyVoteResponse( OptionInfo preVote, OptionInfo postVote, - boolean mindChanged, VoteStatus status ) { public record OptionInfo(UUID optionId, String label, String title) {} diff --git a/src/main/java/com/swyp/app/domain/vote/dto/response/VoteResultResponse.java b/src/main/java/com/swyp/app/domain/vote/dto/response/VoteResultResponse.java new file mode 100644 index 00000000..6ffa2a00 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/dto/response/VoteResultResponse.java @@ -0,0 +1,9 @@ +package com.swyp.app.domain.vote.dto.response; + +import com.swyp.app.domain.vote.enums.VoteStatus; +import java.util.UUID; + +public record VoteResultResponse( + UUID voteId, + VoteStatus status +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/vote/entity/Vote.java b/src/main/java/com/swyp/app/domain/vote/entity/Vote.java index 2851acb5..33a92f1e 100644 --- a/src/main/java/com/swyp/app/domain/vote/entity/Vote.java +++ b/src/main/java/com/swyp/app/domain/vote/entity/Vote.java @@ -2,6 +2,7 @@ import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.vote.enums.VoteStatus; import com.swyp.app.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -47,25 +48,33 @@ public class Vote extends BaseEntity { @JoinColumn(name = "post_vote_option_id") private BattleOption postVoteOption; - @Column(name = "mind_changed", nullable = false) - private boolean mindChanged; - - @Column(name = "reward_credits", nullable = false) - private int rewardCredits; - @Enumerated(EnumType.STRING) @Column(nullable = false, length = 20) private VoteStatus status; @Builder private Vote(Long userId, Battle battle, BattleOption preVoteOption, - BattleOption postVoteOption, boolean mindChanged, int rewardCredits, VoteStatus status) { + BattleOption postVoteOption, VoteStatus status) { this.userId = userId; this.battle = battle; this.preVoteOption = preVoteOption; this.postVoteOption = postVoteOption; - this.mindChanged = mindChanged; - this.rewardCredits = rewardCredits; this.status = status; } -} + + // 사전 투표 생성 팩토리 메서드 + public static Vote createPreVote(Long userId, Battle battle, BattleOption option) { + return Vote.builder() + .userId(userId) + .battle(battle) + .preVoteOption(option) + .status(VoteStatus.PRE_VOTED) + .build(); + } + + // 사후 투표 실행 상태 변경 메서드 + public void doPostVote(BattleOption postOption) { + this.postVoteOption = postOption; + this.status = VoteStatus.POST_VOTED; + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/vote/entity/VoteStatus.java b/src/main/java/com/swyp/app/domain/vote/enums/VoteStatus.java similarity index 59% rename from src/main/java/com/swyp/app/domain/vote/entity/VoteStatus.java rename to src/main/java/com/swyp/app/domain/vote/enums/VoteStatus.java index 478c63db..166ce81a 100644 --- a/src/main/java/com/swyp/app/domain/vote/entity/VoteStatus.java +++ b/src/main/java/com/swyp/app/domain/vote/enums/VoteStatus.java @@ -1,4 +1,4 @@ -package com.swyp.app.domain.vote.entity; +package com.swyp.app.domain.vote.enums; public enum VoteStatus { NONE, PRE_VOTED, POST_VOTED diff --git a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java index 9410f060..ca13e2cc 100644 --- a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java +++ b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java @@ -17,4 +17,4 @@ public interface VoteRepository extends JpaRepository { long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteService.java b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java index 0c8b8d1b..6efc522d 100644 --- a/src/main/java/com/swyp/app/domain/vote/service/VoteService.java +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java @@ -1,6 +1,8 @@ package com.swyp.app.domain.vote.service; +import com.swyp.app.domain.vote.dto.request.VoteRequest; import com.swyp.app.domain.vote.dto.response.MyVoteResponse; +import com.swyp.app.domain.vote.dto.response.VoteResultResponse; import com.swyp.app.domain.vote.dto.response.VoteStatsResponse; import java.util.UUID; @@ -12,4 +14,8 @@ public interface VoteService { VoteStatsResponse getVoteStats(UUID battleId); MyVoteResponse getMyVote(UUID battleId, Long userId); -} + + VoteResultResponse preVote(UUID battleId, Long userId, VoteRequest request); + + VoteResultResponse postVote(UUID battleId, Long userId, VoteRequest request); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java index 8e7bb9fd..1df48b1f 100644 --- a/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java @@ -4,9 +4,13 @@ import com.swyp.app.domain.battle.entity.BattleOption; import com.swyp.app.domain.battle.repository.BattleOptionRepository; import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.domain.vote.converter.VoteConverter; +import com.swyp.app.domain.vote.dto.request.VoteRequest; import com.swyp.app.domain.vote.dto.response.MyVoteResponse; +import com.swyp.app.domain.vote.dto.response.VoteResultResponse; import com.swyp.app.domain.vote.dto.response.VoteStatsResponse; import com.swyp.app.domain.vote.entity.Vote; +import com.swyp.app.domain.vote.enums.VoteStatus; import com.swyp.app.domain.vote.repository.VoteRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; @@ -33,7 +37,7 @@ public UUID findPreVoteOptionId(UUID battleId, Long userId) { Vote vote = voteRepository.findByBattleAndUserId(battle, userId) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); if (vote.getPreVoteOption() == null) { - throw new CustomException(ErrorCode.PERSPECTIVE_POST_VOTE_REQUIRED); + throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); } return vote.getPreVoteOption().getId(); } @@ -59,7 +63,7 @@ public VoteStatsResponse getVoteStats(UUID battleId) { .map(Vote::getUpdatedAt) .orElse(null); - return new VoteStatsResponse(stats, totalCount, updatedAt); + return VoteConverter.toVoteStatsResponse(stats, totalCount, updatedAt); } @Override @@ -68,14 +72,44 @@ public MyVoteResponse getMyVote(UUID battleId, Long userId) { Vote vote = voteRepository.findByBattleAndUserId(battle, userId) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - MyVoteResponse.OptionInfo preVote = toOptionInfo(vote.getPreVoteOption()); - MyVoteResponse.OptionInfo postVote = toOptionInfo(vote.getPostVoteOption()); + return VoteConverter.toMyVoteResponse(vote); + } + + @Override + @Transactional + public VoteResultResponse preVote(UUID battleId, Long userId, VoteRequest request) { + Battle battle = battleService.findById(battleId); + BattleOption option = battleOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - return new MyVoteResponse(preVote, postVote, vote.isMindChanged(), vote.getStatus()); + // 이미 투표 내역이 존재하는지 검증 + if (voteRepository.findByBattleAndUserId(battle, userId).isPresent()) { + throw new CustomException(ErrorCode.VOTE_ALREADY_SUBMITTED); + } + + Vote vote = Vote.createPreVote(userId, battle, option); + voteRepository.save(vote); + + return VoteConverter.toVoteResultResponse(vote); } - private MyVoteResponse.OptionInfo toOptionInfo(BattleOption option) { - if (option == null) return null; - return new MyVoteResponse.OptionInfo(option.getId(), option.getLabel().name(), option.getTitle()); + @Override + @Transactional + public VoteResultResponse postVote(UUID battleId, Long userId, VoteRequest request) { + Battle battle = battleService.findById(battleId); + BattleOption option = battleOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); + + Vote vote = voteRepository.findByBattleAndUserId(battle, userId) + .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + + // 사전 투표 상태일 때만 사후 투표 가능 + if (vote.getStatus() != VoteStatus.PRE_VOTED) { + throw new CustomException(ErrorCode.INVALID_VOTE_STATUS); + } + + vote.doPostVote(option); + + return VoteConverter.toVoteResultResponse(vote); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/BaseEntity.java b/src/main/java/com/swyp/app/global/common/BaseEntity.java index 8da69f05..ccf7f328 100644 --- a/src/main/java/com/swyp/app/global/common/BaseEntity.java +++ b/src/main/java/com/swyp/app/global/common/BaseEntity.java @@ -16,9 +16,10 @@ public abstract class BaseEntity { @CreatedDate - @Column(updatable = false) + @Column(name = "created_at", updatable = false) private LocalDateTime createdAt; @LastModifiedDate + @Column(name = "updated_at") private LocalDateTime updatedAt; } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 313c074f..95e2aeac 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -7,40 +7,54 @@ @Getter @AllArgsConstructor public enum ErrorCode { + // Common INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_500", "서버 에러, 관리자에게 문의하세요."), - BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON_400", "잘못된 요청입니다."), - AUTH_UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "AUTH_401", "인증 정보가 필요합니다."), + BAD_REQUEST (HttpStatus.BAD_REQUEST, "COMMON_400", "잘못된 요청입니다."), + AUTH_UNAUTHORIZED (HttpStatus.UNAUTHORIZED, "AUTH_401", "인증 정보가 필요합니다."), // User - USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 유저입니다."), - - // Battle & Tag - BATTLE_NOT_FOUND(HttpStatus.NOT_FOUND, "BATTLE_404", "존재하지 않는 배틀입니다."), - TAG_NOT_FOUND(HttpStatus.NOT_FOUND, "TAG_404", "존재하지 않는 태그입니다."), + USER_NOT_FOUND (HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 사용자입니다."), + ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "USER_409", "이미 온보딩이 완료된 사용자입니다."), + + // Battle + BATTLE_NOT_FOUND (HttpStatus.NOT_FOUND, "BATTLE_404", "존재하지 않는 배틀입니다."), + BATTLE_CLOSED (HttpStatus.CONFLICT, "BATTLE_409_CLS", "종료된 배틀입니다."), + BATTLE_ALREADY_PUBLISHED(HttpStatus.CONFLICT, "BATTLE_409_PUB", "이미 발행된 배틀입니다."), + BATTLE_OPTION_NOT_FOUND (HttpStatus.NOT_FOUND, "BATTLE_OPT_404", "존재하지 않는 선택지입니다."), + BATTLE_INVALID_OPTION_COUNT(HttpStatus.BAD_REQUEST, "BATTLE_400_OPT", "배틀 타입에 맞지 않는 선택지 개수입니다."), + + // Tag + TAG_NOT_FOUND (HttpStatus.NOT_FOUND, "TAG_404", "존재하지 않는 태그입니다."), + TAG_DUPLICATED (HttpStatus.CONFLICT, "TAG_409_DUP", "이미 존재하는 태그명입니다."), + TAG_IN_USE (HttpStatus.CONFLICT, "TAG_409_USE", "배틀에 사용 중인 태그라 삭제할 수 없습니다."), + TAG_INVALID_ID (HttpStatus.BAD_REQUEST, "TAG_400_ID", "잘못된 태그 ID 형식입니다."), + TAG_INVALID_TYPE (HttpStatus.BAD_REQUEST, "TAG_400_TYPE", "알 수 없는 태그 타입입니다."), + TAG_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, "TAG_400_LIMIT", "배틀당 태그 최대 개수를 초과했습니다."), // Perspective - PERSPECTIVE_NOT_FOUND(HttpStatus.NOT_FOUND, "PERSPECTIVE_404", "존재하지 않는 관점입니다."), - PERSPECTIVE_ALREADY_EXISTS(HttpStatus.CONFLICT, "PERSPECTIVE_409", "이미 관점을 작성한 배틀입니다."), - PERSPECTIVE_FORBIDDEN(HttpStatus.FORBIDDEN, "PERSPECTIVE_403", "본인 관점만 수정/삭제할 수 있습니다."), - PERSPECTIVE_POST_VOTE_REQUIRED(HttpStatus.CONFLICT, "PERSPECTIVE_VOTE_409", "사후 투표가 완료되지 않았습니다."), + PERSPECTIVE_NOT_FOUND (HttpStatus.NOT_FOUND, "PERSPECTIVE_404", "존재하지 않는 관점입니다."), + PERSPECTIVE_ALREADY_EXISTS (HttpStatus.CONFLICT, "PERSPECTIVE_409", "이미 관점을 작성한 배틀입니다."), + PERSPECTIVE_FORBIDDEN (HttpStatus.FORBIDDEN, "PERSPECTIVE_403", "본인 관점만 수정/삭제할 수 있습니다."), + PERSPECTIVE_POST_VOTE_REQUIRED(HttpStatus.CONFLICT, "PERSPECTIVE_VOTE_409", "사후 투표가 완료되지 않았습니다."), // Comment COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_404", "존재하지 않는 댓글입니다."), COMMENT_FORBIDDEN(HttpStatus.FORBIDDEN, "COMMENT_403", "본인 댓글만 수정/삭제할 수 있습니다."), // Like - LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "LIKE_409", "이미 좋아요를 누른 관점입니다."), - LIKE_NOT_FOUND(HttpStatus.NOT_FOUND, "LIKE_404", "좋아요를 누른 적 없는 관점입니다."), + LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "LIKE_409", "이미 좋아요를 누른 관점입니다."), + LIKE_NOT_FOUND (HttpStatus.NOT_FOUND, "LIKE_404", "좋아요를 누른 적 없는 관점입니다."), LIKE_SELF_FORBIDDEN(HttpStatus.FORBIDDEN, "LIKE_403", "본인 관점에는 좋아요를 누를 수 없습니다."), // Vote - VOTE_NOT_FOUND(HttpStatus.NOT_FOUND, "VOTE_404", "투표 내역이 없습니다."); - // User - USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 사용자입니다."), - ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "USER_409", "이미 온보딩이 완료된 사용자입니다."); + VOTE_NOT_FOUND (HttpStatus.NOT_FOUND, "VOTE_404", "투표 내역이 없습니다."), + VOTE_ALREADY_SUBMITTED(HttpStatus.CONFLICT, "VOTE_409_SUB", "이미 투표가 완료되었습니다."), + INVALID_VOTE_STATUS (HttpStatus.BAD_REQUEST, "VOTE_400_INV", "사전 투표를 진행해야 하거나, 이미 사후 투표가 완료되었습니다."), // 💡 새로 추가됨! + PRE_VOTE_REQUIRED (HttpStatus.CONFLICT, "VOTE_409_PRE", "사전 투표가 필요합니다."), + POST_VOTE_REQUIRED (HttpStatus.CONFLICT, "VOTE_409_PST", "사후 투표가 필요합니다."); private final HttpStatus httpStatus; private final String code; private final String message; -} +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1607f899..77987d26 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,9 +14,6 @@ spring: format_sql: true dialect: org.hibernate.dialect.PostgreSQLDialect - jackson: - property-naming-strategy: SNAKE_CASE - springdoc: default-consumes-media-type: application/json default-produces-media-type: application/json From 6d63f2f87c47812c877e353f626c1df17b5046fa Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Mon, 16 Mar 2026 19:41:59 +0900 Subject: [PATCH 12/94] =?UTF-8?q?#18=20[Feat]=20OAuth2.0=20=EC=97=B0?= =?UTF-8?q?=EB=8F=99=20=EB=B0=8F=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 6 + .../oauth/client/GoogleOAuthClient.java | 58 ++++++ .../domain/oauth/client/KakaoOAuthClient.java | 63 ++++++ .../oauth/controller/AuthController.java | 55 +++++ .../app/domain/oauth/dto/LoginRequest.java | 10 + .../app/domain/oauth/dto/LoginResponse.java | 18 ++ .../app/domain/oauth/dto/OAuthUserInfo.java | 13 ++ .../oauth/dto/google/GoogleTokenResponse.java | 20 ++ .../oauth/dto/google/GoogleUserResponse.java | 15 ++ .../oauth/dto/kakao/KakaoTokenResponse.java | 20 ++ .../oauth/dto/kakao/KakaoUserResponse.java | 18 ++ .../domain/oauth/entity/AuthRefreshToken.java | 47 +++++ .../oauth/entity/UserSocialAccount.java | 48 +++++ .../swyp/app/domain/oauth/jwt/JwtFilter.java | 77 +++++++ .../app/domain/oauth/jwt/JwtProvider.java | 75 +++++++ .../AuthRefreshTokenRepository.java | 14 ++ .../UserSocialAccountRepository.java | 12 ++ .../app/domain/oauth/service/AuthService.java | 188 ++++++++++++++++++ .../dto/response/CommentListResponse.java | 2 +- .../dto/response/CreateCommentResponse.java | 2 +- .../dto/response/PerspectiveListResponse.java | 2 +- .../service/PerspectiveCommentService.java | 4 +- .../service/PerspectiveService.java | 2 +- .../com/swyp/app/domain/user/entity/User.java | 7 +- .../app/domain/user/entity/UserStatus.java | 5 +- .../repository/UserProfileRepository.java | 3 + .../user/repository/UserRepository.java | 3 +- .../domain/user/service/UserQueryService.java | 2 +- .../user/service/UserQueryServiceImpl.java | 9 +- .../global/common/exception/ErrorCode.java | 23 ++- .../exception/GlobalExceptionHandler.java | 2 +- .../app/global/config/SecurityConfig.java | 29 ++- .../swyp/app/global/config/SwaggerConfig.java | 22 +- 33 files changed, 845 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/oauth/client/GoogleOAuthClient.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/client/KakaoOAuthClient.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/controller/AuthController.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/dto/LoginRequest.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/dto/LoginResponse.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/dto/OAuthUserInfo.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleTokenResponse.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleUserResponse.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoTokenResponse.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoUserResponse.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/entity/AuthRefreshToken.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/entity/UserSocialAccount.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/jwt/JwtProvider.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/repository/AuthRefreshTokenRepository.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/repository/UserSocialAccountRepository.java create mode 100644 src/main/java/com/swyp/app/domain/oauth/service/AuthService.java diff --git a/build.gradle b/build.gradle index 4856d4f2..6767d41e 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,12 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // Security implementation 'org.springframework.boot:spring-boot-starter-security' + // JWT + implementation 'io.jsonwebtoken:jjwt-api:0.12.6' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6' + // HTTP Client (소셜 API 호출용) + implementation 'org.springframework.boot:spring-boot-starter-webflux' // Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1' // Lombok diff --git a/src/main/java/com/swyp/app/domain/oauth/client/GoogleOAuthClient.java b/src/main/java/com/swyp/app/domain/oauth/client/GoogleOAuthClient.java new file mode 100644 index 00000000..76f64dfb --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/client/GoogleOAuthClient.java @@ -0,0 +1,58 @@ +package com.swyp.app.domain.oauth.client; + +import com.swyp.app.domain.oauth.dto.OAuthUserInfo; +import com.swyp.app.domain.oauth.dto.google.GoogleTokenResponse; +import com.swyp.app.domain.oauth.dto.google.GoogleUserResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.client.WebClient; + +@Component +@RequiredArgsConstructor +public class GoogleOAuthClient { + + @Value("${oauth.google.client-id}") + private String clientId; + + @Value("${oauth.google.client-secret}") + private String clientSecret; + + // 인가 코드 → 구글 access_token + public String getAccessToken(String code, String redirectUri) { + MultiValueMap body = new LinkedMultiValueMap<>(); + body.add("grant_type", "authorization_code"); + body.add("client_id", clientId); + body.add("client_secret", clientSecret); + body.add("redirect_uri", redirectUri); + body.add("code", code); + + GoogleTokenResponse response = WebClient.create() + .post() + .uri("https://oauth2.googleapis.com/token") + .contentType(MediaType.APPLICATION_FORM_URLENCODED) + .bodyValue(body) + .retrieve() + .bodyToMono(GoogleTokenResponse.class) + .block(); + + return response.getAccessToken(); + } + + // 구글 access_token → 사용자 정보 + public OAuthUserInfo getUserInfo(String accessToken) { + GoogleUserResponse response = WebClient.create() + .get() + .uri("https://www.googleapis.com/oauth2/v2/userinfo") + .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken) + .retrieve() + .bodyToMono(GoogleUserResponse.class) + .block(); + + return new OAuthUserInfo("GOOGLE", response.getId(), response.getEmail()); + } +} diff --git a/src/main/java/com/swyp/app/domain/oauth/client/KakaoOAuthClient.java b/src/main/java/com/swyp/app/domain/oauth/client/KakaoOAuthClient.java new file mode 100644 index 00000000..ba242a63 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/client/KakaoOAuthClient.java @@ -0,0 +1,63 @@ +package com.swyp.app.domain.oauth.client; + +import com.swyp.app.domain.oauth.dto.OAuthUserInfo; +import com.swyp.app.domain.oauth.dto.kakao.KakaoTokenResponse; +import com.swyp.app.domain.oauth.dto.kakao.KakaoUserResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.client.WebClient; + +@Component +@RequiredArgsConstructor +public class KakaoOAuthClient { + + @Value("${oauth.kakao.client-id}") + private String clientId; + + @Value("${oauth.kakao.client-secret:}") + private String clientSecret; + + // 인가 코드 → 카카오 access_token + public String getAccessToken(String code, String redirectUri) { + MultiValueMap body = new LinkedMultiValueMap<>(); + body.add("grant_type", "authorization_code"); + body.add("client_id", clientId); + body.add("redirect_uri", redirectUri); + body.add("code", code); + + if (clientSecret != null && !clientSecret.isEmpty()) { + body.add("client_secret", clientSecret); + } + + KakaoTokenResponse response = WebClient.create() + .post() + .uri("https://kauth.kakao.com/oauth/token") + .contentType(MediaType.APPLICATION_FORM_URLENCODED) + .bodyValue(body) + .retrieve() + .bodyToMono(KakaoTokenResponse.class) + .block(); + + return response.getAccessToken(); + } + + // 카카오 access_token → 사용자 정보 + public OAuthUserInfo getUserInfo(String accessToken) { + KakaoUserResponse response = WebClient.create() + .get() + .uri("https://kapi.kakao.com/v2/user/me") + .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken) + .retrieve() + .bodyToMono(KakaoUserResponse.class) + .block(); + + String providerId = String.valueOf(response.getId()); + + return new OAuthUserInfo("KAKAO", providerId, null); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/controller/AuthController.java b/src/main/java/com/swyp/app/domain/oauth/controller/AuthController.java new file mode 100644 index 00000000..ea9f7cb3 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/controller/AuthController.java @@ -0,0 +1,55 @@ +package com.swyp.app.domain.oauth.controller; + +import com.swyp.app.domain.oauth.dto.LoginRequest; +import com.swyp.app.domain.oauth.dto.LoginResponse; +import com.swyp.app.domain.oauth.service.AuthService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +@Tag(name = "Auth", description = "인증 API") +public class AuthController { + + private final AuthService authService; + + @Operation(summary = "소셜 로그인") + @PostMapping("/auth/login/{provider}") + public ApiResponse login( + @PathVariable String provider, + @RequestBody LoginRequest request + ) { + return ApiResponse.onSuccess(authService.login(provider, request)); + } + + @Operation(summary = "Access Token 재발급") + @PostMapping("/auth/refresh") + public ApiResponse refresh( + @RequestHeader("X-Refresh-Token") String refreshToken + ) { + return ApiResponse.onSuccess(authService.refresh(refreshToken)); + } + + @Operation(summary = "로그아웃") + @PostMapping("/auth/logout") + public ApiResponse logout( + @AuthenticationPrincipal Long userId + ) { + authService.logout(userId); + return ApiResponse.onSuccess(null); + } + + @Operation(summary = "회원 탈퇴") + @DeleteMapping("/me") + public ApiResponse withdraw( + @AuthenticationPrincipal Long userId + ) { + authService.withdraw(userId); + return ApiResponse.onSuccess(null); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/dto/LoginRequest.java b/src/main/java/com/swyp/app/domain/oauth/dto/LoginRequest.java new file mode 100644 index 00000000..c397553c --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/dto/LoginRequest.java @@ -0,0 +1,10 @@ +package com.swyp.app.domain.oauth.dto; + +import lombok.Getter; + +// 클라이언트가 서버로 요청을 보낼 때, 데이터를 담는 DTO +@Getter +public class LoginRequest { + private String authorizationCode; + private String redirectUri; +} diff --git a/src/main/java/com/swyp/app/domain/oauth/dto/LoginResponse.java b/src/main/java/com/swyp/app/domain/oauth/dto/LoginResponse.java new file mode 100644 index 00000000..74503c8f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/dto/LoginResponse.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.oauth.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Getter; + +// 서버가 클라이언트에게 데이터를 돌려줄 때, 데이터를 담는 DTO +@Getter +@AllArgsConstructor +public class LoginResponse { + private String accessToken; + private String refreshToken; + private String userTag; // 회의에서 userTag 반환하는 것으로 통일했기 때문에 userId 대신 userTag 반환 + + @JsonProperty("is_new_user") + private boolean isNewUser; + private String status; +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/dto/OAuthUserInfo.java b/src/main/java/com/swyp/app/domain/oauth/dto/OAuthUserInfo.java new file mode 100644 index 00000000..254ca2ef --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/dto/OAuthUserInfo.java @@ -0,0 +1,13 @@ +package com.swyp.app.domain.oauth.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +// 소셜 API를 호출해서 받아온 사용자 정보를 담는 DTO +@Getter +@AllArgsConstructor +public class OAuthUserInfo { + private String provider; // "KAKAO" or "GOOGLE" + private String providerUserId; // 소셜 고유 ID + private String email; // nullable - 소셜 로그인 시도 시 선택 동의 안함 체크로 인해 +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleTokenResponse.java b/src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleTokenResponse.java new file mode 100644 index 00000000..0c08ff7c --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleTokenResponse.java @@ -0,0 +1,20 @@ +package com.swyp.app.domain.oauth.dto.google; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; + +@Getter +public class GoogleTokenResponse { + + @JsonProperty("access_token") + private String accessToken; + + @JsonProperty("token_type") + private String tokenType; + + @JsonProperty("expires_in") + private int expiresIn; + + @JsonProperty("id_token") + private String idToken; +} diff --git a/src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleUserResponse.java b/src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleUserResponse.java new file mode 100644 index 00000000..b108d7e4 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/dto/google/GoogleUserResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.oauth.dto.google; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; + +@Getter +public class GoogleUserResponse { + + private String id; + private String email; + private String name; + + @JsonProperty("verified_email") + private boolean verifiedEmail; +} diff --git a/src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoTokenResponse.java b/src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoTokenResponse.java new file mode 100644 index 00000000..e62b62d2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoTokenResponse.java @@ -0,0 +1,20 @@ +package com.swyp.app.domain.oauth.dto.kakao; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; + +@Getter +public class KakaoTokenResponse { + + @JsonProperty("access_token") + private String accessToken; + + @JsonProperty("token_type") + private String tokenType; + + @JsonProperty("refresh_token") + private String refreshToken; + + @JsonProperty("expires_in") + private int expiresIn; +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoUserResponse.java b/src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoUserResponse.java new file mode 100644 index 00000000..ac20447d --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/dto/kakao/KakaoUserResponse.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.oauth.dto.kakao; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; + +@Getter +public class KakaoUserResponse { + + private Long id; + + @JsonProperty("kakao_account") + private KakaoAccount kakaoAccount; + + @Getter + public static class KakaoAccount { + private String email; + } +} diff --git a/src/main/java/com/swyp/app/domain/oauth/entity/AuthRefreshToken.java b/src/main/java/com/swyp/app/domain/oauth/entity/AuthRefreshToken.java new file mode 100644 index 00000000..970bf50e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/entity/AuthRefreshToken.java @@ -0,0 +1,47 @@ +package com.swyp.app.domain.oauth.entity; + +import com.swyp.app.domain.user.entity.User; +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@Entity +@Table(name = "auth_refresh_tokens") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@EntityListeners(AuditingEntityListener.class) +public class AuthRefreshToken { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @Column(name = "token_hash", nullable = false) + private String tokenHash; + + @Column(name = "expires_at", nullable = false) + private LocalDateTime expiresAt; + + @CreatedDate + @Column(name = "created_at", updatable = false) + private LocalDateTime createdAt; + + @Builder + public AuthRefreshToken(User user, String tokenHash, LocalDateTime expiresAt) { + this.user = user; + this.tokenHash = tokenHash; + this.expiresAt = expiresAt; + } + + // 만료 여부 확인 + public boolean isExpired() { + return LocalDateTime.now().isAfter(expiresAt); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/entity/UserSocialAccount.java b/src/main/java/com/swyp/app/domain/oauth/entity/UserSocialAccount.java new file mode 100644 index 00000000..6eb522e0 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/entity/UserSocialAccount.java @@ -0,0 +1,48 @@ +package com.swyp.app.domain.oauth.entity; + +import com.swyp.app.domain.user.entity.User; +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@Entity +@Table(name = "user_social_accounts") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@EntityListeners(AuditingEntityListener.class) +public class UserSocialAccount { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // 여러 소셜 계정을 연동할 수 있으므로 1 대 다 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @Column(nullable = false, length = 20) + private String provider; + + @Column(name = "provider_user_id", nullable = false) + private String providerUserId; + + @Column(name = "provider_email") + private String providerEmail; + + @CreatedDate + @Column(name = "created_at", updatable = false) + private LocalDateTime createdAt; + + @Builder + public UserSocialAccount(User user, String provider, + String providerUserId, String providerEmail) { + this.user = user; + this.provider = provider; + this.providerUserId = providerUserId; + this.providerEmail = providerEmail; + } +} diff --git a/src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java b/src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java new file mode 100644 index 00000000..39db18f7 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java @@ -0,0 +1,77 @@ +package com.swyp.app.domain.oauth.jwt; + +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.List; + +@Slf4j +@RequiredArgsConstructor +public class JwtFilter extends OncePerRequestFilter { + + private final JwtProvider jwtProvider; + + // 인증 제외 경로 + private static final List WHITELIST = List.of( + "/api/v1/auth/login", + "/api/v1/auth/refresh", + "/swagger-ui", + "/v3/api-docs" + ); + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) throws ServletException, IOException { + + String requestUri = request.getRequestURI(); + + // 화이트리스트 경로는 토큰 검증 스킵 + if (isWhitelisted(requestUri)) { + filterChain.doFilter(request, response); + return; + } + + // Authorization 헤더에서 토큰 추출 + String token = resolveToken(request); + + if (token == null) { + throw new CustomException(ErrorCode.AUTH_UNAUTHORIZED); + } + + if (!jwtProvider.validateToken(token)) { + throw new CustomException(ErrorCode.AUTH_ACCESS_TOKEN_EXPIRED); + } + + // 토큰에서 userId 추출 후 SecurityContext 에 저장 + Long userId = jwtProvider.getUserId(token); + UsernamePasswordAuthenticationToken authentication = + new UsernamePasswordAuthenticationToken(userId, null, List.of()); + SecurityContextHolder.getContext().setAuthentication(authentication); + + filterChain.doFilter(request, response); + } + + private String resolveToken(HttpServletRequest request) { + String bearerToken = request.getHeader("Authorization"); + if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) { + return bearerToken.substring(7); + } + return null; + } + + private boolean isWhitelisted(String uri) { + return WHITELIST.stream().anyMatch(uri::startsWith); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/jwt/JwtProvider.java b/src/main/java/com/swyp/app/domain/oauth/jwt/JwtProvider.java new file mode 100644 index 00000000..401ba96f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/jwt/JwtProvider.java @@ -0,0 +1,75 @@ +package com.swyp.app.domain.oauth.jwt; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.util.Base64; +import java.util.Date; +import java.util.UUID; + +@Component +@RequiredArgsConstructor +public class JwtProvider { + + @Value("${jwt.secret}") + private String secret; + + @Value("${jwt.access-token-expiration}") + private long accessTokenExpiration; + + @Value("${jwt.refresh-token-expiration}") + private long refreshTokenExpiration; + + private SecretKey key; + + @PostConstruct + public void init() { + byte[] keyBytes = Base64.getDecoder().decode(secret); + this.key = Keys.hmacShaKeyFor(keyBytes); + } + + // access token 생성 + public String createAccessToken(Long userId) { + return Jwts.builder() + .subject(String.valueOf(userId)) + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + accessTokenExpiration)) + .signWith(key) + .compact(); + } + + // refresh token 생성 + public String createRefreshToken() { + return UUID.randomUUID().toString(); + } + + // token 에서 userId 추출 + public Long getUserId(String token) { + Claims claims = Jwts.parser() + .verifyWith(key) + .build() + .parseSignedClaims(token) + .getPayload(); + + return Long.parseLong(claims.getSubject()); + } + + // token 유효성 검증 + public boolean validateToken(String token) { + try { + Jwts.parser() + .verifyWith(key) + .build() + .parseSignedClaims(token); + return true; + } catch (Exception e) { + return false; + } + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/repository/AuthRefreshTokenRepository.java b/src/main/java/com/swyp/app/domain/oauth/repository/AuthRefreshTokenRepository.java new file mode 100644 index 00000000..c62d0fce --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/repository/AuthRefreshTokenRepository.java @@ -0,0 +1,14 @@ +package com.swyp.app.domain.oauth.repository; + +import com.swyp.app.domain.oauth.entity.AuthRefreshToken; +import com.swyp.app.domain.user.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface AuthRefreshTokenRepository extends JpaRepository { + + Optional findByTokenHash(String tokenHash); + + void deleteByUser(User user); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/repository/UserSocialAccountRepository.java b/src/main/java/com/swyp/app/domain/oauth/repository/UserSocialAccountRepository.java new file mode 100644 index 00000000..2fc70816 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/repository/UserSocialAccountRepository.java @@ -0,0 +1,12 @@ +package com.swyp.app.domain.oauth.repository; + +import com.swyp.app.domain.oauth.entity.UserSocialAccount; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface UserSocialAccountRepository extends JpaRepository { + + Optional findByProviderAndProviderUserId( + String provider, String providerUserId); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java b/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java new file mode 100644 index 00000000..4ed465be --- /dev/null +++ b/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java @@ -0,0 +1,188 @@ +package com.swyp.app.domain.oauth.service; + +import com.swyp.app.domain.oauth.client.GoogleOAuthClient; +import com.swyp.app.domain.oauth.client.KakaoOAuthClient; +import com.swyp.app.domain.oauth.dto.LoginRequest; +import com.swyp.app.domain.oauth.dto.LoginResponse; +import com.swyp.app.domain.oauth.dto.OAuthUserInfo; +import com.swyp.app.domain.oauth.entity.AuthRefreshToken; +import com.swyp.app.domain.oauth.entity.UserSocialAccount; +import com.swyp.app.domain.oauth.jwt.JwtProvider; +import com.swyp.app.domain.oauth.repository.AuthRefreshTokenRepository; +import com.swyp.app.domain.oauth.repository.UserSocialAccountRepository; +import com.swyp.app.domain.user.entity.UserRole; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserStatus; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.time.LocalDateTime; +import java.util.Base64; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +@Transactional +public class AuthService { + + private final KakaoOAuthClient kakaoOAuthClient; + private final GoogleOAuthClient googleOAuthClient; + private final UserRepository userRepository; + private final UserSocialAccountRepository socialAccountRepository; + private final AuthRefreshTokenRepository refreshTokenRepository; + private final JwtProvider jwtProvider; + + public LoginResponse login(String provider, LoginRequest request) { + + // 1. provider에 따라 소셜 사용자 정보 조회 + OAuthUserInfo oAuthUserInfo = getOAuthUserInfo(provider, + request.getAuthorizationCode(), request.getRedirectUri()); + + // 2. 기존 소셜 계정 조회 → 없으면 신규 유저 생성 + boolean isNewUser = false; + UserSocialAccount socialAccount = socialAccountRepository + .findByProviderAndProviderUserId(provider, oAuthUserInfo.getProviderUserId()) + .orElse(null); + + User user; + if (socialAccount == null) { + // 신규 유저 생성 + user = User.builder() + .userTag(generateUserTag()) + .role(UserRole.USER) + .status(UserStatus.PENDING) + .onboardingCompleted(false) + .build(); + userRepository.save(user); + + // 소셜 계정 연결 + socialAccount = UserSocialAccount.builder() + .user(user) + .provider(provider.toUpperCase()) + .providerUserId(oAuthUserInfo.getProviderUserId()) + .providerEmail(oAuthUserInfo.getEmail()) + .build(); + socialAccountRepository.save(socialAccount); + isNewUser = true; + } else { + user = socialAccount.getUser(); + } + + // 3. 제재 유저 체크 + if (user.getStatus() == UserStatus.BANNED) { + throw new CustomException(ErrorCode.USER_BANNED); + } + if (user.getStatus() == UserStatus.SUSPENDED) { + throw new CustomException(ErrorCode.USER_SUSPENDED); + } + + // 4. 기존 refresh token 삭제 후 새로 발급 + refreshTokenRepository.deleteByUser(user); + + String accessToken = jwtProvider.createAccessToken(user.getId()); + String refreshToken = jwtProvider.createRefreshToken(); + + // 5. refresh token 해시해서 저장 + refreshTokenRepository.save(AuthRefreshToken.builder() + .user(user) + .tokenHash(hashToken(refreshToken)) + .expiresAt(LocalDateTime.now().plusDays(30)) + .build()); + + return new LoginResponse( + accessToken, + refreshToken, + user.getUserTag(), + isNewUser, + user.getStatus().name() + ); + } + + public LoginResponse refresh(String refreshToken) { + + // 1. refresh token 해시해서 DB 조회 + String tokenHash = hashToken(refreshToken); + AuthRefreshToken authRefreshToken = refreshTokenRepository + .findByTokenHash(tokenHash) + .orElseThrow(() -> new CustomException(ErrorCode.AUTH_REFRESH_TOKEN_EXPIRED)); + + // 2. 만료 여부 확인 + if (authRefreshToken.isExpired()) { + refreshTokenRepository.delete(authRefreshToken); + throw new CustomException(ErrorCode.AUTH_REFRESH_TOKEN_EXPIRED); + } + + // 3. 기존 토큰 삭제 후 새 토큰 발급 + User user = authRefreshToken.getUser(); + refreshTokenRepository.delete(authRefreshToken); + + String newAccessToken = jwtProvider.createAccessToken(user.getId()); + String newRefreshToken = jwtProvider.createRefreshToken(); + + // 4. 새 refresh token 저장 + refreshTokenRepository.save(AuthRefreshToken.builder() + .user(user) + .tokenHash(hashToken(newRefreshToken)) + .expiresAt(LocalDateTime.now().plusDays(30)) + .build()); + + return new LoginResponse( + newAccessToken, + newRefreshToken, + user.getUserTag(), + false, + user.getStatus().name() + ); + } + + public void logout(Long userId) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + refreshTokenRepository.deleteByUser(user); + } + + public void withdraw(Long userId) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + refreshTokenRepository.deleteByUser(user); + user.delete(); + } + + // provider에 따라 소셜 사용자 정보 조회 + private OAuthUserInfo getOAuthUserInfo(String provider, String code, String redirectUri) { + return switch (provider.toUpperCase()) { + case "KAKAO" -> { + String token = kakaoOAuthClient.getAccessToken(code, redirectUri); + yield kakaoOAuthClient.getUserInfo(token); + } + case "GOOGLE" -> { + String token = googleOAuthClient.getAccessToken(code, redirectUri); + yield googleOAuthClient.getUserInfo(token); + } + default -> throw new CustomException(ErrorCode.INVALID_PROVIDER); + }; + } + + // user_tag 랜덤 생성 + private String generateUserTag() { + return "pique-" + UUID.randomUUID().toString().substring(0, 8); + } + + // refresh token 해시 + private String hashToken(String token) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] hash = digest.digest(token.getBytes(StandardCharsets.UTF_8)); + return Base64.getEncoder().encodeToString(hash); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("토큰 해시 실패", e); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java index fb7e85b2..db8529a0 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java @@ -17,5 +17,5 @@ public record Item( LocalDateTime createdAt ) {} - public record UserSummary(String userTag, String nickname, String characterUrl) {} + public record UserSummary(String userTag, String nickname, String characterType) {} } diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java index 3709f6b9..278fcc6a 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java @@ -9,5 +9,5 @@ public record CreateCommentResponse( String content, LocalDateTime createdAt ) { - public record UserSummary(String userTag, String nickname, String characterUrl) {} + public record UserSummary(String userTag, String nickname, String characterType) {} } diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java index a5e535ad..7394f044 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java @@ -23,7 +23,7 @@ public record Item( public record UserSummary( String userTag, String nickname, - String characterUrl + String characterType ) {} public record OptionSummary( diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java index aafddd34..53b408fb 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java @@ -48,7 +48,7 @@ public CreateCommentResponse createComment(UUID perspectiveId, Long userId, Crea UserQueryService.UserSummary user = userQueryService.findSummaryById(userId); return new CreateCommentResponse( comment.getId(), - new CreateCommentResponse.UserSummary(user.userTag(), user.nickname(), user.characterUrl()), + new CreateCommentResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), comment.getContent(), comment.getCreatedAt() ); @@ -70,7 +70,7 @@ public CommentListResponse getComments(UUID perspectiveId, Long userId, String c UserQueryService.UserSummary user = userQueryService.findSummaryById(c.getUserId()); return new CommentListResponse.Item( c.getId(), - new CommentListResponse.UserSummary(user.userTag(), user.nickname(), user.characterUrl()), + new CommentListResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), c.getContent(), c.getUserId().equals(userId), c.getCreatedAt() diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java index 867bd2e6..14990852 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java @@ -87,7 +87,7 @@ public PerspectiveListResponse getPerspectives(UUID battleId, Long userId, Strin boolean isLiked = perspectiveLikeRepository.existsByPerspectiveAndUserId(p, userId); return new PerspectiveListResponse.Item( p.getId(), - new PerspectiveListResponse.UserSummary(user.userTag(), user.nickname(), user.characterUrl()), + new PerspectiveListResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), new PerspectiveListResponse.OptionSummary(option.getId(), option.getLabel().name(), option.getTitle()), p.getContent(), p.getLikeCount(), diff --git a/src/main/java/com/swyp/app/domain/user/entity/User.java b/src/main/java/com/swyp/app/domain/user/entity/User.java index 37c7ee84..ed1afe2c 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/User.java +++ b/src/main/java/com/swyp/app/domain/user/entity/User.java @@ -63,4 +63,9 @@ public void completeOnboarding() { this.status = UserStatus.ACTIVE; this.onboardingCompleted = true; } -} \ No newline at end of file + + public void delete() { + this.status = UserStatus.DELETED; + this.deletedAt = LocalDateTime.now(); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserStatus.java b/src/main/java/com/swyp/app/domain/user/entity/UserStatus.java index 8b6aa8d6..22715ed7 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/UserStatus.java +++ b/src/main/java/com/swyp/app/domain/user/entity/UserStatus.java @@ -1,8 +1,5 @@ package com.swyp.app.domain.user.entity; public enum UserStatus { - PENDING, - ACTIVE, - DELETED, - BANNED + PENDING, ACTIVE, SUSPENDED, BANNED, DELETED } diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java index 510ef9b1..e7c501d7 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/UserProfileRepository.java @@ -1,7 +1,10 @@ package com.swyp.app.domain.user.repository; import com.swyp.app.domain.user.entity.UserProfile; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; public interface UserProfileRepository extends JpaRepository { + + Optional findByUserId(Long userId); } diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java index 7691467c..81e09cbb 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java @@ -1,9 +1,8 @@ package com.swyp.app.domain.user.repository; import com.swyp.app.domain.user.entity.User; -import org.springframework.data.jpa.repository.JpaRepository; - import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { Optional findByUserTag(String userTag); diff --git a/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java b/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java index 7cfa195f..8d0867bd 100644 --- a/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java +++ b/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java @@ -4,5 +4,5 @@ public interface UserQueryService { UserSummary findSummaryById(Long userId); - record UserSummary(String userTag, String nickname, String characterUrl) {} + record UserSummary(String userTag, String nickname, String characterType) {} } diff --git a/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java b/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java index cf2aefe7..e9f2a6b3 100644 --- a/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java @@ -1,6 +1,8 @@ package com.swyp.app.domain.user.service; import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserProfile; +import com.swyp.app.domain.user.repository.UserProfileRepository; import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; @@ -12,11 +14,16 @@ public class UserQueryServiceImpl implements UserQueryService { private final UserRepository userRepository; + private final UserProfileRepository userProfileRepository; @Override public UserSummary findSummaryById(Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - return new UserSummary(user.getUserTag(), user.getNickname(), user.getCharacterUrl()); + + UserProfile profile = userProfileRepository.findByUserId(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + return new UserSummary(user.getUserTag(), profile.getNickname(), profile.getCharacterType().name()); } } diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 95e2aeac..84c8a59b 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -10,12 +10,23 @@ public enum ErrorCode { // Common INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_500", "서버 에러, 관리자에게 문의하세요."), - BAD_REQUEST (HttpStatus.BAD_REQUEST, "COMMON_400", "잘못된 요청입니다."), - AUTH_UNAUTHORIZED (HttpStatus.UNAUTHORIZED, "AUTH_401", "인증 정보가 필요합니다."), + BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON_400", "잘못된 요청입니다."), + COMMON_INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "COMMON_400", "요청 파라미터가 잘못되었습니다."), + + // Auth (Token) + AUTH_UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "AUTH_401", "인증이 필요합니다."), + AUTH_INVALID_CODE(HttpStatus.UNAUTHORIZED, "AUTH_401_CODE", "유효하지 않은 소셜 인가 코드입니다."), + AUTH_ACCESS_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "AUTH_401_ACCESS", "Access Token이 만료되었습니다."), + AUTH_REFRESH_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "AUTH_401_REFRESH", "Refresh Token이 만료되었습니다. 다시 로그인이 필요합니다."), // User - USER_NOT_FOUND (HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 사용자입니다."), - ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "USER_409", "이미 온보딩이 완료된 사용자입니다."), + USER_BANNED(HttpStatus.FORBIDDEN, "USER_403_BAN", "영구 제재된 사용자입니다."), + USER_SUSPENDED(HttpStatus.FORBIDDEN, "USER_403_SUS", "일정 기간 이용 정지된 사용자입니다."), + USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 사용자입니다."), + ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "USER_409", "이미 온보딩이 완료된 사용자입니다."), + + // OAuth (Social Login) + INVALID_PROVIDER(HttpStatus.BAD_REQUEST, "AUTH_400_PROVIDER", "지원하지 않는 소셜 로그인 provider입니다."), // Battle BATTLE_NOT_FOUND (HttpStatus.NOT_FOUND, "BATTLE_404", "존재하지 않는 배틀입니다."), @@ -39,8 +50,8 @@ public enum ErrorCode { PERSPECTIVE_POST_VOTE_REQUIRED(HttpStatus.CONFLICT, "PERSPECTIVE_VOTE_409", "사후 투표가 완료되지 않았습니다."), // Comment - COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_404", "존재하지 않는 댓글입니다."), - COMMENT_FORBIDDEN(HttpStatus.FORBIDDEN, "COMMENT_403", "본인 댓글만 수정/삭제할 수 있습니다."), + COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_NOT_FOUND", "존재하지 않는 댓글입니다."), + COMMENT_FORBIDDEN(HttpStatus.FORBIDDEN, "COMMENT_FORBIDDEN", "본인 댓글만 수정/삭제할 수 있습니다."), // Like LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "LIKE_409", "이미 좋아요를 누른 관점입니다."), diff --git a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java index 135cae06..78c06ddf 100644 --- a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java @@ -31,7 +31,7 @@ public ResponseEntity> handleCustomException(CustomException e }) public ResponseEntity> handleBadRequest(Exception e) { log.warn("Bad Request: {}", e.getMessage()); - ErrorCode code = ErrorCode.BAD_REQUEST; + ErrorCode code = ErrorCode.COMMON_INVALID_PARAMETER; return ResponseEntity .status(code.getHttpStatus()) .body(ApiResponse.onFailure(code.getHttpStatus().value(), code.getCode(), code.getMessage())); diff --git a/src/main/java/com/swyp/app/global/config/SecurityConfig.java b/src/main/java/com/swyp/app/global/config/SecurityConfig.java index 11163d26..51827dce 100644 --- a/src/main/java/com/swyp/app/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/app/global/config/SecurityConfig.java @@ -1,24 +1,45 @@ package com.swyp.app.global.config; +import com.swyp.app.domain.oauth.jwt.JwtFilter; +import com.swyp.app.domain.oauth.jwt.JwtProvider; +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @Configuration @EnableWebSecurity +@RequiredArgsConstructor public class SecurityConfig { + private final JwtProvider jwtProvider; + @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http .csrf(AbstractHttpConfigurer::disable) + .sessionManagement(session -> + session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(auth -> auth - .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() - .anyRequest().permitAll() // 개발 초기 전체 허용 - ); + .requestMatchers( + "/api/v1/auth/**", + "/swagger-ui/**", + "/v3/api-docs/**" + ).permitAll() + .anyRequest().authenticated() + ) + .addFilterBefore(new JwtFilter(jwtProvider), + UsernamePasswordAuthenticationFilter.class); + return http.build(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/app/global/config/SwaggerConfig.java b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java index 7b63e1ad..8c9aef7c 100644 --- a/src/main/java/com/swyp/app/global/config/SwaggerConfig.java +++ b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java @@ -1,7 +1,10 @@ package com.swyp.app.global.config; +import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,10 +13,23 @@ public class SwaggerConfig { @Bean public OpenAPI openAPI() { + SecurityScheme securityScheme = new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT") + .in(SecurityScheme.In.HEADER) + .name("Authorization"); + + SecurityRequirement securityRequirement = + new SecurityRequirement().addList("bearerAuth"); + return new OpenAPI() .info(new Info() - .title("PIQUE API 명세서") - .description("PIQUE 서비스 API 명세서입니다.") - .version("v1.0.0")); + .title("PIQUE API 명세서") + .description("PIQUE 서비스 API 명세서입니다.") + .version("v1.0.0")) + .components(new Components() + .addSecuritySchemes("bearerAuth", securityScheme)) + .addSecurityItem(securityRequirement); } } \ No newline at end of file From 9d5cfe8a7afcbbe3062af2435e58afff1a4a3b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A4=80=ED=98=81?= <127603139+HYH0804@users.noreply.github.com> Date: Wed, 18 Mar 2026 20:57:54 +0900 Subject: [PATCH 13/94] =?UTF-8?q?#25=20[Feat]=20=EA=B4=80=EC=A0=90=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1,=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20GPT=20?= =?UTF-8?q?=EA=B2=80=EC=88=98=20(#31)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ● ## #️⃣ 연관된 이슈 - #25 ## 📝 작업 내용 ### ✨ Feat | 내용 | 파일 | |------|------| | GPT 비동기 검수 서비스 구현 (PENDING → PUBLISHED / REJECTED / MODERATION_FAILED) | `GptModerationService.java` | | 관점 생성/수정 시 GPT 검수 비동기 호출 연동 | `PerspectiveService.java` | | 검수 재시도 API 구현 (`POST /perspectives/{id}/moderation/retry`) | `PerspectiveController.java`, `PerspectiveService.java` | | `MODERATION_FAILED` 상태 추가 | `PerspectiveStatus.java` | | `PERSPECTIVE_MODERATION_NOT_FAILED` 에러 코드 추가 | `ErrorCode.java` | | `@EnableAsync` 설정 추가 | `AsyncConfig.java` | | OpenAI API 설정 추가 (`api-key`, `url`, `model`) | `application.yml` | | 관점 상태 직접 변경 메서드 추가 | `Perspective.java` | ### ♻️ Refactor | 내용 | 파일 | |------|------| | | | ### 🐛 Fix | 내용 | 파일 | |------|------| | | | ## 📌 공유 사항 > 1. OpenAI API Key는 `.env` 에 `OPENAI_API_KEY`로 설정이 필요합니다. 노션 환경 설정 파일 확인 부탁드립니다! > 2. `@Async` + `@Transactional` 동시 사용 시 트랜잭션이 호출 쓰레드에서 커밋되어 비동기 쓰레드에서 DB 반영이 안 되는 문제로, `GptModerationService`에서 `@Transactional` 제거 후 `save()` 명시 호출 방식으로 처리했습니다. ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [x] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 수정 시 아래와 같습니다. 올바른 관점 수정 image image image 욕설 관점 image image image 생성 시 아래와 같습니다. 올바른 관점 생성 image image image 욕설 관점 생성 image image image ## 💬 리뷰 요구사항 > 1. GPT API 호출 실패 시 최대 2회 재시도 후 `MODERATION_FAILED`로 전환되는 구조인데, 재시도 횟수나 대기 시간(현재 2초) 조정이 필요한지 의견 부탁드립니다. > 2. Prompt 의 경우 임시로 ` "당신은 콘텐츠 검수 AI입니다. 입력된 텍스트에 욕설, 혐오 발언, 폭력적 표현, 성적 표현, 특정인을 향한 공격적 내용이 포함되어 있는지 판단하세요. " + "문제가 있으면 'REJECT', 없으면 'APPROVE' 딱 한 단어만 응답하세요.";` 로 진행 중입니다. --------- Co-authored-by: Claude Sonnet 4.6 --- docs/api-specs/perspectives-api.md | 81 +++++++++++++ .../java/com/swyp/app/AppApplication.java | 2 + .../controller/PerspectiveController.java | 9 ++ .../perspective/entity/Perspective.java | 4 + .../perspective/entity/PerspectiveStatus.java | 2 +- .../service/GptModerationService.java | 108 ++++++++++++++++++ .../service/PerspectiveCommentService.java | 9 +- .../service/PerspectiveService.java | 22 +++- .../domain/user/dto/response/UserSummary.java | 3 + .../user/repository/UserRepository.java | 2 +- .../domain/user/service/UserQueryService.java | 8 -- .../user/service/UserQueryServiceImpl.java | 29 ----- .../app/domain/user/service/UserService.java | 8 ++ .../global/common/exception/ErrorCode.java | 11 +- .../swyp/app/global/config/AsyncConfig.java | 9 ++ src/main/resources/application.yml | 6 + 16 files changed, 262 insertions(+), 51 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/perspective/service/GptModerationService.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/UserSummary.java delete mode 100644 src/main/java/com/swyp/app/domain/user/service/UserQueryService.java delete mode 100644 src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java create mode 100644 src/main/java/com/swyp/app/global/config/AsyncConfig.java diff --git a/docs/api-specs/perspectives-api.md b/docs/api-specs/perspectives-api.md index dd60b8f9..5b445aa8 100644 --- a/docs/api-specs/perspectives-api.md +++ b/docs/api-specs/perspectives-api.md @@ -6,6 +6,25 @@ - 관점 API 입니다. - 현재 Creator 뱃지 부분이 ERD 상에선 보이지 않는데 확인 필요 + +### 관점 상태(status) 흐름 + +| status | 설명 | +|--------|------| +| `PENDING` | 생성/수정 직후, GPT 검수 대기 중 | +| `PUBLISHED` | GPT 검수 통과, 목록에 노출됨 | +| `REJECTED` | GPT 검수 거절 (욕설/공격적 표현 포함) | +| `MODERATION_FAILED` | GPT API 호출 실패 (네트워크 오류 등), 재시도 가능 | + +``` +생성/수정 → PENDING → GPT 호출 성공 → APPROVED → PUBLISHED + → REJECT → REJECTED + → GPT 호출 실패 → 1회 재시도 + → 재시도 실패 → MODERATION_FAILED + ↓ (재시도 버튼) + PENDING → GPT 재호출 +``` + --- ## 관점 생성 API @@ -268,6 +287,67 @@ --- +## 관점 검수 재시도 API +### `POST /api/v1/perspectives/{perspective_id}/moderation/retry` + +- `MODERATION_FAILED` 상태의 관점에 대해 GPT 검수를 다시 요청합니다. +- 재시도 후 상태는 `PENDING`으로 변경되며, GPT 응답에 따라 `PUBLISHED` / `REJECTED` / `MODERATION_FAILED`로 전환됩니다. +- 재시도도 실패하면 다시 `MODERATION_FAILED`로 남습니다. + +#### 성공 응답 `200 OK` + +```json +{ + "statusCode": 200, + "data": null, + "error": null +} +``` + +#### 예외 응답 `404 - 관점 없음` + +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "PERSPECTIVE_NOT_FOUND", + "message": "존재하지 않는 관점입니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `400 - 검수 실패 상태 아님` + +```json +{ + "statusCode": 400, + "data": null, + "error": { + "code": "PERSPECTIVE_400", + "message": "검수 실패 상태의 관점이 아닙니다.", + "errors": [] + } +} +``` + +#### 예외 응답 `403 - 본인 관점 아님` + +```json +{ + "statusCode": 403, + "data": null, + "error": { + "code": "PERSPECTIVE_403", + "message": "본인 관점만 수정/삭제할 수 있습니다.", + "errors": [] + } +} +``` + +--- + ## 공통 에러 코드 | Error Code | HTTP Status | 설명 | @@ -290,5 +370,6 @@ | `PERSPECTIVE_ALREADY_EXISTS` | `409` | 해당 배틀에 이미 관점 작성함 | | `PERSPECTIVE_FORBIDDEN` | `403` | 본인 관점 아님 | | `PERSPECTIVE_POST_VOTE_REQUIRED` | `409` | 사후 투표 미완료 | +| `PERSPECTIVE_400` | `400` | 검수 실패 상태의 관점이 아님 (재시도 불가) | --- \ No newline at end of file diff --git a/src/main/java/com/swyp/app/AppApplication.java b/src/main/java/com/swyp/app/AppApplication.java index 01062c0f..ce684d05 100644 --- a/src/main/java/com/swyp/app/AppApplication.java +++ b/src/main/java/com/swyp/app/AppApplication.java @@ -3,9 +3,11 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.scheduling.annotation.EnableAsync; @EnableJpaAuditing @SpringBootApplication +@EnableAsync public class AppApplication { public static void main(String[] args) { SpringApplication.run(AppApplication.class, args); diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java index e0b98bd2..b8b64b39 100644 --- a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java @@ -74,6 +74,15 @@ public ApiResponse deletePerspective(@PathVariable UUID perspectiveId) { return ApiResponse.onSuccess(null); } + @Operation(summary = "관점 검수 재시도", description = "검수 실패(MODERATION_FAILED) 상태의 관점에 대해 GPT 검수를 다시 요청합니다.") + @PostMapping("/perspectives/{perspectiveId}/moderation/retry") + public ApiResponse retryModeration(@PathVariable UUID perspectiveId) { + // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 + Long userId = 1L; + perspectiveService.retryModeration(perspectiveId, userId); + return ApiResponse.onSuccess(null); + } + @Operation(summary = "관점 수정", description = "본인이 작성한 관점의 내용을 수정합니다.") @PatchMapping("/perspectives/{perspectiveId}") public ApiResponse updatePerspective( diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java index b9cee98a..61c51713 100644 --- a/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java +++ b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java @@ -70,6 +70,10 @@ public void updateContent(String content) { this.content = content; } + public void updateStatus(PerspectiveStatus status) { + this.status = status; + } + public void publish() { this.status = PerspectiveStatus.PUBLISHED; } diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java index 21f7ae53..3613c546 100644 --- a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveStatus.java @@ -1,5 +1,5 @@ package com.swyp.app.domain.perspective.entity; public enum PerspectiveStatus { - PENDING, PUBLISHED, REJECTED + PENDING, PUBLISHED, REJECTED, MODERATION_FAILED } diff --git a/src/main/java/com/swyp/app/domain/perspective/service/GptModerationService.java b/src/main/java/com/swyp/app/domain/perspective/service/GptModerationService.java new file mode 100644 index 00000000..f00ec51f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/service/GptModerationService.java @@ -0,0 +1,108 @@ +package com.swyp.app.domain.perspective.service; + +import com.swyp.app.domain.perspective.entity.PerspectiveStatus; +import com.swyp.app.domain.perspective.repository.PerspectiveRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.client.SimpleClientHttpRequestFactory; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestClient; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +@Slf4j +@Service +@RequiredArgsConstructor +public class GptModerationService { + + // 프롬프트는 추후 결정 + private static final String SYSTEM_PROMPT = + "당신은 콘텐츠 검수 AI입니다. 입력된 텍스트에 욕설, 혐오 발언, 폭력적 표현, 성적 표현, 특정인을 향한 공격적 내용이 포함되어 있는지 판단하세요. " + + "문제가 있으면 'REJECT', 없으면 'APPROVE' 딱 한 단어만 응답하세요."; + + private static final int MAX_ATTEMPTS = 2; + private static final int CONNECT_TIMEOUT_MS = 5000; + private static final int READ_TIMEOUT_MS = 10000; + private static final int WAIT_TIMEOUT_MS = 2000; + + private final PerspectiveRepository perspectiveRepository; + + @Value("${openai.api-key}") + private String apiKey; + + @Value("${openai.url}") + private String openaiUrl; + + @Value("${openai.model}") + private String model; + + @Async + public void moderate(UUID perspectiveId, String content) { + Exception lastException = null; + for (int attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) { + try { + String result = callGpt(content); + PerspectiveStatus newStatus = result.contains("APPROVE") + ? PerspectiveStatus.PUBLISHED + : PerspectiveStatus.REJECTED; + + perspectiveRepository.findById(perspectiveId).ifPresent(p -> { + if (p.getStatus() == PerspectiveStatus.PENDING) { + if (newStatus == PerspectiveStatus.PUBLISHED) p.publish(); + else p.reject(); + perspectiveRepository.save(p); + } + }); + return; + } catch (Exception e) { + lastException = e; + if (attempt < MAX_ATTEMPTS) { + try { Thread.sleep(WAIT_TIMEOUT_MS); } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + break; + } + } + } + } + log.error("GPT 검수 최종 실패 (재시도 소진). perspectiveId={}", perspectiveId, lastException); + perspectiveRepository.findById(perspectiveId).ifPresent(p -> { + if (p.getStatus() == PerspectiveStatus.PENDING) { + p.updateStatus(PerspectiveStatus.MODERATION_FAILED); + perspectiveRepository.save(p); + } + }); + } + + private String callGpt(String content) { + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + factory.setConnectTimeout(CONNECT_TIMEOUT_MS); + factory.setReadTimeout(READ_TIMEOUT_MS); + RestClient restClient = RestClient.builder().requestFactory(factory).build(); + + Map requestBody = Map.of( + "model", model, + "messages", List.of( + Map.of("role", "system", "content", SYSTEM_PROMPT), + Map.of("role", "user", "content", content) + ), + "max_tokens", 10 + ); + + Map response = restClient.post() + .uri(openaiUrl) + .header("Authorization", "Bearer " + apiKey) + .header("Content-Type", "application/json") + .body(requestBody) + .retrieve() + .body(Map.class); + + List choices = (List) response.get("choices"); + Map choice = (Map) choices.get(0); + Map message = (Map) choice.get("message"); + return ((String) message.get("content")).trim().toUpperCase(); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java index 53b408fb..ef8bf1ce 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java @@ -9,7 +9,8 @@ import com.swyp.app.domain.perspective.entity.PerspectiveComment; import com.swyp.app.domain.perspective.repository.PerspectiveCommentRepository; import com.swyp.app.domain.perspective.repository.PerspectiveRepository; -import com.swyp.app.domain.user.service.UserQueryService; +import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.service.UserService; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; @@ -30,7 +31,7 @@ public class PerspectiveCommentService { private final PerspectiveRepository perspectiveRepository; private final PerspectiveCommentRepository commentRepository; - private final UserQueryService userQueryService; + private final UserService userQueryService; @Transactional public CreateCommentResponse createComment(UUID perspectiveId, Long userId, CreateCommentRequest request) { @@ -45,7 +46,7 @@ public CreateCommentResponse createComment(UUID perspectiveId, Long userId, Crea commentRepository.save(comment); perspective.incrementCommentCount(); - UserQueryService.UserSummary user = userQueryService.findSummaryById(userId); + UserSummary user = userQueryService.findSummaryById(userId); return new CreateCommentResponse( comment.getId(), new CreateCommentResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), @@ -67,7 +68,7 @@ public CommentListResponse getComments(UUID perspectiveId, Long userId, String c List items = comments.stream() .map(c -> { - UserQueryService.UserSummary user = userQueryService.findSummaryById(c.getUserId()); + UserSummary user = userQueryService.findSummaryById(c.getUserId()); return new CommentListResponse.Item( c.getId(), new CommentListResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java index 14990852..ff9e1068 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java @@ -13,7 +13,8 @@ import com.swyp.app.domain.perspective.entity.Perspective; import com.swyp.app.domain.perspective.repository.PerspectiveLikeRepository; import com.swyp.app.domain.perspective.repository.PerspectiveRepository; -import com.swyp.app.domain.user.service.UserQueryService; +import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.service.UserService; import com.swyp.app.domain.vote.service.VoteService; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; @@ -37,7 +38,8 @@ public class PerspectiveService { private final PerspectiveLikeRepository perspectiveLikeRepository; private final BattleService battleService; private final VoteService voteService; - private final UserQueryService userQueryService; + private final UserService userQueryService; + private final GptModerationService gptModerationService; @Transactional public CreatePerspectiveResponse createPerspective(UUID battleId, Long userId, CreatePerspectiveRequest request) { @@ -57,6 +59,7 @@ public CreatePerspectiveResponse createPerspective(UUID battleId, Long userId, C .build(); Perspective saved = perspectiveRepository.save(perspective); + gptModerationService.moderate(saved.getId(), saved.getContent()); return new CreatePerspectiveResponse(saved.getId(), saved.getStatus(), saved.getCreatedAt()); } @@ -82,7 +85,7 @@ public PerspectiveListResponse getPerspectives(UUID battleId, Long userId, Strin List items = perspectives.stream() .map(p -> { - UserQueryService.UserSummary user = userQueryService.findSummaryById(p.getUserId()); + UserSummary user = userQueryService.findSummaryById(p.getUserId()); BattleOption option = battleService.findOptionById(p.getOptionId()); boolean isLiked = perspectiveLikeRepository.existsByPerspectiveAndUserId(p, userId); return new PerspectiveListResponse.Item( @@ -117,6 +120,8 @@ public UpdatePerspectiveResponse updatePerspective(UUID perspectiveId, Long user Perspective perspective = findPerspectiveById(perspectiveId); validateOwnership(perspective, userId); perspective.updateContent(request.content()); + perspective.updateStatus(PerspectiveStatus.PENDING); + gptModerationService.moderate(perspective.getId(), perspective.getContent()); return new UpdatePerspectiveResponse(perspective.getId(), perspective.getContent(), perspective.getUpdatedAt()); } @@ -133,6 +138,17 @@ public MyPerspectiveResponse getMyPendingPerspective(UUID battleId, Long userId) ); } + @Transactional + public void retryModeration(UUID perspectiveId, Long userId) { + Perspective perspective = findPerspectiveById(perspectiveId); + validateOwnership(perspective, userId); + if (perspective.getStatus() != PerspectiveStatus.MODERATION_FAILED) { + throw new CustomException(ErrorCode.PERSPECTIVE_MODERATION_NOT_FAILED); + } + perspective.updateStatus(PerspectiveStatus.PENDING); + gptModerationService.moderate(perspectiveId, perspective.getContent()); + } + private Perspective findPerspectiveById(UUID perspectiveId) { return perspectiveRepository.findById(perspectiveId) .orElseThrow(() -> new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND)); diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/UserSummary.java b/src/main/java/com/swyp/app/domain/user/dto/response/UserSummary.java new file mode 100644 index 00000000..c4f8b5a5 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/UserSummary.java @@ -0,0 +1,3 @@ +package com.swyp.app.domain.user.dto.response; + +public record UserSummary(String userTag, String nickname, String characterType) {} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java index 81e09cbb..be325200 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/UserRepository.java @@ -1,8 +1,8 @@ package com.swyp.app.domain.user.repository; import com.swyp.app.domain.user.entity.User; -import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; public interface UserRepository extends JpaRepository { Optional findByUserTag(String userTag); diff --git a/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java b/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java deleted file mode 100644 index 8d0867bd..00000000 --- a/src/main/java/com/swyp/app/domain/user/service/UserQueryService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.app.domain.user.service; - -public interface UserQueryService { - - UserSummary findSummaryById(Long userId); - - record UserSummary(String userTag, String nickname, String characterType) {} -} diff --git a/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java b/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java deleted file mode 100644 index e9f2a6b3..00000000 --- a/src/main/java/com/swyp/app/domain/user/service/UserQueryServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.swyp.app.domain.user.service; - -import com.swyp.app.domain.user.entity.User; -import com.swyp.app.domain.user.entity.UserProfile; -import com.swyp.app.domain.user.repository.UserProfileRepository; -import com.swyp.app.domain.user.repository.UserRepository; -import com.swyp.app.global.common.exception.CustomException; -import com.swyp.app.global.common.exception.ErrorCode; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class UserQueryServiceImpl implements UserQueryService { - - private final UserRepository userRepository; - private final UserProfileRepository userProfileRepository; - - @Override - public UserSummary findSummaryById(Long userId) { - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - UserProfile profile = userProfileRepository.findByUserId(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - return new UserSummary(user.getUserTag(), profile.getNickname(), profile.getCharacterType().name()); - } -} diff --git a/src/main/java/com/swyp/app/domain/user/service/UserService.java b/src/main/java/com/swyp/app/domain/user/service/UserService.java index 6332c48e..b9411553 100644 --- a/src/main/java/com/swyp/app/domain/user/service/UserService.java +++ b/src/main/java/com/swyp/app/domain/user/service/UserService.java @@ -13,6 +13,7 @@ import com.swyp.app.domain.user.dto.response.UpdateResultResponse; import com.swyp.app.domain.user.dto.response.UserProfileResponse; import com.swyp.app.domain.user.dto.response.UserSettingsResponse; +import com.swyp.app.domain.user.dto.response.UserSummary; import com.swyp.app.domain.user.entity.AgreementType; import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.user.entity.UserAgreement; @@ -231,6 +232,13 @@ public TendencyScoreHistoryResponse getMyTendencyScoreHistory(Long cursor, Integ return new TendencyScoreHistoryResponse(items, nextCursor); } + public UserSummary findSummaryById(Long userId) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + UserProfile profile = findUserProfile(user.getId()); + return new UserSummary(user.getUserTag(), profile.getNickname(), profile.getCharacterType().name()); + } + private User findUserByTag(String userTag) { return userRepository.findByUserTag(userTag) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 84c8a59b..3872eef0 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -44,10 +44,11 @@ public enum ErrorCode { TAG_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, "TAG_400_LIMIT", "배틀당 태그 최대 개수를 초과했습니다."), // Perspective - PERSPECTIVE_NOT_FOUND (HttpStatus.NOT_FOUND, "PERSPECTIVE_404", "존재하지 않는 관점입니다."), - PERSPECTIVE_ALREADY_EXISTS (HttpStatus.CONFLICT, "PERSPECTIVE_409", "이미 관점을 작성한 배틀입니다."), - PERSPECTIVE_FORBIDDEN (HttpStatus.FORBIDDEN, "PERSPECTIVE_403", "본인 관점만 수정/삭제할 수 있습니다."), - PERSPECTIVE_POST_VOTE_REQUIRED(HttpStatus.CONFLICT, "PERSPECTIVE_VOTE_409", "사후 투표가 완료되지 않았습니다."), + PERSPECTIVE_NOT_FOUND (HttpStatus.NOT_FOUND, "PERSPECTIVE_404", "존재하지 않는 관점입니다."), + PERSPECTIVE_ALREADY_EXISTS (HttpStatus.CONFLICT, "PERSPECTIVE_409", "이미 관점을 작성한 배틀입니다."), + PERSPECTIVE_FORBIDDEN (HttpStatus.FORBIDDEN, "PERSPECTIVE_403", "본인 관점만 수정/삭제할 수 있습니다."), + PERSPECTIVE_POST_VOTE_REQUIRED (HttpStatus.CONFLICT, "PERSPECTIVE_VOTE_409", "사후 투표가 완료되지 않았습니다."), + PERSPECTIVE_MODERATION_NOT_FAILED (HttpStatus.BAD_REQUEST,"PERSPECTIVE_400", "검수 실패 상태의 관점이 아닙니다."), // Comment COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_NOT_FOUND", "존재하지 않는 댓글입니다."), @@ -61,7 +62,7 @@ public enum ErrorCode { // Vote VOTE_NOT_FOUND (HttpStatus.NOT_FOUND, "VOTE_404", "투표 내역이 없습니다."), VOTE_ALREADY_SUBMITTED(HttpStatus.CONFLICT, "VOTE_409_SUB", "이미 투표가 완료되었습니다."), - INVALID_VOTE_STATUS (HttpStatus.BAD_REQUEST, "VOTE_400_INV", "사전 투표를 진행해야 하거나, 이미 사후 투표가 완료되었습니다."), // 💡 새로 추가됨! + INVALID_VOTE_STATUS (HttpStatus.BAD_REQUEST, "VOTE_400_INV", "사전 투표를 진행해야 하거나, 이미 사후 투표가 완료되었습니다."), PRE_VOTE_REQUIRED (HttpStatus.CONFLICT, "VOTE_409_PRE", "사전 투표가 필요합니다."), POST_VOTE_REQUIRED (HttpStatus.CONFLICT, "VOTE_409_PST", "사후 투표가 필요합니다."); diff --git a/src/main/java/com/swyp/app/global/config/AsyncConfig.java b/src/main/java/com/swyp/app/global/config/AsyncConfig.java new file mode 100644 index 00000000..439a397f --- /dev/null +++ b/src/main/java/com/swyp/app/global/config/AsyncConfig.java @@ -0,0 +1,9 @@ +package com.swyp.app.global.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; + +@Configuration +@EnableAsync +public class AsyncConfig { +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 77987d26..9090cc86 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,6 +14,12 @@ spring: format_sql: true dialect: org.hibernate.dialect.PostgreSQLDialect +openai: + api-key: ${OPENAI_API_KEY} + url: https://api.openai.com/v1/chat/completions + model: gpt-4o-mini + + springdoc: default-consumes-media-type: application/json default-produces-media-type: application/json From 352509032db3edab90eb03e0692fa50626b2b99b Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Wed, 18 Mar 2026 21:25:58 +0900 Subject: [PATCH 14/94] =?UTF-8?q?#29=20[Feat]=20=EC=8B=9C=EB=82=98?= =?UTF-8?q?=EB=A6=AC=EC=98=A4=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#32)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 67 +++--- docker-compose.yml | 10 +- .../java/com/swyp/app/AppApplication.java | 1 + .../controller/AdminBattleController.java | 7 +- .../battle/converter/BattleConverter.java | 6 +- .../response/AdminBattleDetailResponse.java | 1 - .../response/BattleUserDetailResponse.java | 2 +- .../battle/service/BattleServiceImpl.java | 9 +- .../controller/ScenarioController.java | 79 +++++++ .../scenario/converter/ScenarioConverter.java | 82 +++++++ .../scenario/dto/request/NodeRequest.java | 11 + .../scenario/dto/request/OptionRequest.java | 6 + .../dto/request/ScenarioCreateRequest.java | 10 + .../request/ScenarioStatusUpdateRequest.java | 7 + .../scenario/dto/request/ScriptRequest.java | 9 + .../dto/response/AdminDeleteResponse.java | 8 + .../dto/response/AdminScenarioResponse.java | 11 + .../scenario/dto/response/NodeResponse.java | 15 ++ .../scenario/dto/response/OptionResponse.java | 10 + .../scenario/dto/response/ScriptResponse.java | 14 ++ .../dto/response/UserScenarioResponse.java | 17 ++ .../scenario/entity/InteractiveOption.java | 41 ++++ .../app/domain/scenario/entity/Scenario.java | 76 +++++++ .../domain/scenario/entity/ScenarioNode.java | 76 +++++++ .../app/domain/scenario/entity/Script.java | 56 +++++ .../domain/scenario/enums/AudioPathType.java | 5 + .../domain/scenario/enums/CreatorType.java | 5 + .../domain/scenario/enums/ScenarioStatus.java | 5 + .../domain/scenario/enums/SpeakerType.java | 5 + .../repository/ScenarioRepository.java | 22 ++ .../scenario/service/AudioProcessor.java | 13 ++ .../scenario/service/FFmpegService.java | 94 ++++++++ .../service/GoogleCloudTtsServiceImpl.java | 72 ++++++ .../service/MockS3UploadServiceImpl.java | 22 ++ .../scenario/service/S3UploadService.java | 10 + .../service/ScenarioAudioPipelineService.java | 147 ++++++++++++ .../scenario/service/ScenarioService.java | 20 ++ .../scenario/service/ScenarioServiceImpl.java | 209 ++++++++++++++++++ .../domain/scenario/service/TtsService.java | 11 + .../app/domain/scenario/util/PathFinder.java | 44 ++++ .../vote/repository/VoteRepository.java | 4 + .../domain/vote/service/VoteServiceImpl.java | 3 + .../global/common/exception/ErrorCode.java | 5 + src/main/resources/application.yml | 42 ++++ 44 files changed, 1327 insertions(+), 42 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/converter/ScenarioConverter.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/request/NodeRequest.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/request/OptionRequest.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioStatusUpdateRequest.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/request/ScriptRequest.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/response/AdminDeleteResponse.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/response/AdminScenarioResponse.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/response/NodeResponse.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/response/OptionResponse.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/response/ScriptResponse.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/dto/response/UserScenarioResponse.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/entity/InteractiveOption.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/entity/Script.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/enums/AudioPathType.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/enums/CreatorType.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/enums/ScenarioStatus.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/enums/SpeakerType.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/repository/ScenarioRepository.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/AudioProcessor.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/FFmpegService.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/GoogleCloudTtsServiceImpl.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/MockS3UploadServiceImpl.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/S3UploadService.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/ScenarioAudioPipelineService.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/ScenarioService.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/service/TtsService.java create mode 100644 src/main/java/com/swyp/app/domain/scenario/util/PathFinder.java diff --git a/build.gradle b/build.gradle index 6767d41e..cabd1d28 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'java' - id 'org.springframework.boot' version '4.0.3' - id 'io.spring.dependency-management' version '1.1.7' + id 'java' + id 'org.springframework.boot' version '3.5.11' + id 'io.spring.dependency-management' version '1.1.7' } group = 'com.swyp' @@ -9,54 +9,67 @@ version = '0.0.1-SNAPSHOT' description = 'SWYP APP 4th' java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } configurations { - compileOnly { - extendsFrom annotationProcessor - } + compileOnly { + extendsFrom annotationProcessor + } } repositories { - mavenCentral() + mavenCentral() } dependencies { // Web - implementation 'org.springframework.boot:spring-boot-starter-webmvc' + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' + // JPA - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + // Security implementation 'org.springframework.boot:spring-boot-starter-security' + // JWT implementation 'io.jsonwebtoken:jjwt-api:0.12.6' runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6' runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6' + // HTTP Client (소셜 API 호출용) implementation 'org.springframework.boot:spring-boot-starter-webflux' - // Swagger - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1' - // Lombok + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.16' + + // Google Cloud TTS + implementation 'com.google.cloud:google-cloud-texttospeech:2.58.0' + + // AWS S3 + implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.3.0' + + // Lombok compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' + // devTools - developmentOnly 'org.springframework.boot:spring-boot-devtools' - // PostgreSQL + developmentOnly 'org.springframework.boot:spring-boot-devtools' + + // DB runtimeOnly 'org.postgresql:postgresql' - // H2 (local 프로필용) - runtimeOnly 'com.h2database:h2' - // Test - testRuntimeOnly 'com.h2database:h2' - testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test' - testImplementation 'org.springframework.boot:spring-boot-starter-security-test' - testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + runtimeOnly 'com.h2database:h2' + + // Test + testRuntimeOnly 'com.h2database:h2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' // JPA, Web 테스트 기능 모두 포함 + testImplementation 'org.springframework.security:spring-security-test' // 시큐리티 전용 테스트 + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } tasks.named('test') { - useJUnitPlatform() -} + useJUnitPlatform() +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0cfd9264..f3a20738 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,5 @@ +version: '3.8' + services: db: image: postgres:15 @@ -8,10 +10,12 @@ services: POSTGRES_USER: ${DB_USER} POSTGRES_PASSWORD: ${DB_PASSWORD} ports: - - "127.0.0.1:${DB_PORT:-5433}:5432" + - "${DB_PORT}:5433" volumes: - ./postgres_data:/var/lib/postgresql/data + networks: + - pique-network networks: - default: - name: pique-network \ No newline at end of file + pique-network: + driver: bridge \ No newline at end of file diff --git a/src/main/java/com/swyp/app/AppApplication.java b/src/main/java/com/swyp/app/AppApplication.java index ce684d05..b2d6e2a4 100644 --- a/src/main/java/com/swyp/app/AppApplication.java +++ b/src/main/java/com/swyp/app/AppApplication.java @@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableAsync; +@EnableAsync @EnableJpaAuditing @SpringBootApplication @EnableAsync diff --git a/src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java index 0c50ee68..3458532e 100644 --- a/src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java +++ b/src/main/java/com/swyp/app/domain/battle/controller/AdminBattleController.java @@ -29,11 +29,8 @@ public ApiResponse createBattle( @RequestBody @Valid AdminBattleCreateRequest request, @AuthenticationPrincipal Long adminUserId ) { - // TODO: 로그인 기능 구현 후 @AuthenticationPrincipal adminUserId로 변경 예정 - // 현재 인증 정보가 없어 null이 들어오므로 테스트용 가짜 ID(1L)를 사용함 - Long testAdminId = (adminUserId != null) ? adminUserId : 1L; - - return ApiResponse.onSuccess(battleService.createBattle(request, testAdminId)); + // 인증된 관리자 ID를 사용하여 배틀을 생성합니다. + return ApiResponse.onSuccess(battleService.createBattle(request, adminUserId)); } @Operation(summary = "배틀 수정 (변경 필드만 포함)") diff --git a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java index a8262d82..b3158e68 100644 --- a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java +++ b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java @@ -103,10 +103,10 @@ private static List toOptionResponses(List o o.getId(), o.getLabel(), o.getTitle(), - o.getRepresentative(), - o.getImageUrl(), o.getStance(), - o.getQuote() + o.getRepresentative(), + o.getQuote(), + o.getImageUrl() )).toList(); } diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java index 28766df1..d1848b64 100644 --- a/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/AdminBattleDetailResponse.java @@ -28,5 +28,4 @@ public record AdminBattleDetailResponse( List options, // 대결 선택지 상세 정보 리스트 LocalDateTime createdAt, // 데이터 생성 일시 LocalDateTime updatedAt // 데이터 최종 수정 일시 -) {} ) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java index d7ea2a21..35b6c5bd 100644 --- a/src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java +++ b/src/main/java/com/swyp/app/domain/battle/dto/response/BattleUserDetailResponse.java @@ -11,7 +11,7 @@ public record BattleUserDetailResponse( BattleSummaryResponse battleInfo, // 기본적인 배틀 정보 (요약 DTO 재사용) String description, // 상세 본문 설명 String shareUrl, // 공유하기 버튼용 링크 - String userVoteStatus, // 현재 유저의 투표 상태 (NONE, A, B...) + String userVoteStatus, // 현재 유저의 투표 상태 List categoryTags, // UI 상단용 카테고리 태그만 분리 List philosopherTags, // UI 하단용 철학자 태그만 분리 List valueTags // 성향 분석용 가치관 태그만 분리 diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java index 03da9eaa..0844ae02 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java @@ -107,9 +107,14 @@ public BattleUserDetailResponse getBattleDetail(UUID battleId) { List allTags = getTagsByBattle(battle); List options = battleOptionRepository.findByBattle(battle); - // 임시 유저 1L의 투표 상태 확인 (추후 수정 필요) + // 🔥 수정됨: findByBattleIdAndUserId -> findByBattleAndUserId 로 변경하여 에러 해결 String voteStatus = voteRepository.findByBattleAndUserId(battle, 1L) - .map(v -> v.getPostVoteOption().getLabel().name()) + .map(v -> { + if (v.getPostVoteOption() != null) { + return v.getPostVoteOption().getLabel().name(); + } + return "NONE"; // 사후 투표를 아직 안 했을 경우를 대비한 안전 처리 + }) .orElse("NONE"); return BattleConverter.toUserDetailResponse(battle, allTags, options, battle.getTotalParticipantsCount(), voteStatus); diff --git a/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java b/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java new file mode 100644 index 00000000..90135980 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java @@ -0,0 +1,79 @@ +package com.swyp.app.domain.scenario.controller; + +import com.swyp.app.domain.scenario.dto.request.ScenarioCreateRequest; +import com.swyp.app.domain.scenario.dto.request.ScenarioStatusUpdateRequest; +import com.swyp.app.domain.scenario.dto.response.AdminDeleteResponse; +import com.swyp.app.domain.scenario.dto.response.AdminScenarioResponse; +import com.swyp.app.domain.scenario.dto.response.UserScenarioResponse; +import com.swyp.app.domain.scenario.service.ScenarioService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.UUID; + +@Tag(name = "시나리오 (Scenario)", description = "시나리오 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class ScenarioController { + + private final ScenarioService scenarioService; + + @Operation(summary = "배틀 - 시나리오 조회") + @GetMapping("/battles/{battleId}/scenario") + public ApiResponse getBattleScenario( + @PathVariable UUID battleId, + @RequestAttribute(value = "userId", required = false) Long userId + ) { + return ApiResponse.onSuccess(scenarioService.getScenarioForUser(battleId, userId)); + } + + @Operation(summary = "시나리오 생성") + @PreAuthorize("hasRole('ADMIN')") + @PostMapping("/admin/scenarios") + @ResponseStatus(HttpStatus.CREATED) + public ApiResponse> createScenario( + @RequestBody ScenarioCreateRequest request) { + + UUID scenarioId = scenarioService.createScenario(request); + return ApiResponse.onSuccess(Map.of("scenarioId", scenarioId, "status", "DRAFT")); + } + + @Operation(summary = "시나리오 내용 수정") + @PreAuthorize("hasRole('ADMIN')") + @PutMapping("/admin/scenarios/{scenarioId}") + public ApiResponse updateScenarioContent( + @PathVariable UUID scenarioId, + @RequestBody ScenarioCreateRequest request) { + + scenarioService.updateScenarioContent(scenarioId, request); + return ApiResponse.onSuccess(null); + } + + @Operation(summary = "시나리오 상태 수정 (PUBLISHED 변경 시 자동 오디오 처리)") + @PreAuthorize("hasRole('ADMIN')") + @PatchMapping("/admin/scenarios/{scenarioId}") + public ApiResponse updateScenarioStatus( + @PathVariable UUID scenarioId, + @RequestBody ScenarioStatusUpdateRequest request) { + + scenarioService.updateScenarioStatus(scenarioId, request.status()); + return ApiResponse.onSuccess(scenarioService.updateScenarioStatus(scenarioId, request.status())); + } + + @Operation(summary = "시나리오 삭제 (Soft Delete)") + @PreAuthorize("hasRole('ADMIN')") + @DeleteMapping("/admin/scenarios/{scenarioId}") + public ApiResponse deleteScenario( + @PathVariable UUID scenarioId) { + + scenarioService.deleteScenario(scenarioId); + return ApiResponse.onSuccess(scenarioService.deleteScenario(scenarioId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/converter/ScenarioConverter.java b/src/main/java/com/swyp/app/domain/scenario/converter/ScenarioConverter.java new file mode 100644 index 00000000..094a9c1f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/converter/ScenarioConverter.java @@ -0,0 +1,82 @@ +package com.swyp.app.domain.scenario.converter; + +import com.swyp.app.domain.scenario.dto.response.NodeResponse; +import com.swyp.app.domain.scenario.dto.response.OptionResponse; +import com.swyp.app.domain.scenario.dto.response.ScriptResponse; +import com.swyp.app.domain.scenario.dto.response.UserScenarioResponse; +import com.swyp.app.domain.scenario.entity.InteractiveOption; +import com.swyp.app.domain.scenario.entity.Scenario; +import com.swyp.app.domain.scenario.entity.ScenarioNode; +import com.swyp.app.domain.scenario.entity.Script; +import com.swyp.app.domain.scenario.enums.AudioPathType; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +@Component +public class ScenarioConverter { + + /** + * Scenario 엔티티를 프론트엔드 전달용 DTO로 변환합니다. + * @param scenario DB에서 조회된 시나리오 엔티티 + * @param recommendedPathKey 사전 투표 결과에 따른 추천 오디오 키 (COMMON, PATH_A, PATH_B) + */ + public UserScenarioResponse toUserResponse(Scenario scenario, AudioPathType recommendedPathKey) { + + // 1. 시작 노드 ID 찾기 + UUID startNodeId = scenario.getNodes().stream() + .filter(node -> Boolean.TRUE.equals(node.getIsStartNode())) + .map(ScenarioNode::getId) + .findFirst() + .orElse(null); + + // 2. 하위 노드 리스트 변환 + List nodeResponses = scenario.getNodes().stream() + .map(this::toNodeResponse) + .collect(Collectors.toList()); + + // 3. 최종 응답 빌드 + return UserScenarioResponse.builder() + .battleId(scenario.getBattle().getId()) + .isInteractive(scenario.getIsInteractive()) + .startNodeId(startNodeId) + .recommendedPathKey(recommendedPathKey) + .audios(scenario.getAudios()) + .nodes(nodeResponses) + .build(); + } + + private NodeResponse toNodeResponse(ScenarioNode node) { + return NodeResponse.builder() + .nodeId(node.getId()) + .nodeName(node.getNodeName()) + .audioDuration(node.getAudioDuration()) // 노드별 재생 시간 전달 + .autoNextNodeId(node.getAutoNextNodeId()) + .scripts(node.getScripts().stream() + .map(this::toScriptResponse) + .collect(Collectors.toList())) + .interactiveOptions(node.getOptions().stream() + .map(this::toOptionResponse) + .collect(Collectors.toList())) + .build(); + } + + private ScriptResponse toScriptResponse(Script script) { + return ScriptResponse.builder() + .scriptId(script.getId()) + .startTimeMs(script.getStartTimeMs()) // 자막 띄우는 핵심 싱크 타이밍 + .speakerType(script.getSpeakerType()) + .speakerName(script.getSpeakerName()) + .text(script.getText()) + .build(); + } + + private OptionResponse toOptionResponse(InteractiveOption option) { + return OptionResponse.builder() + .label(option.getLabel()) + .nextNodeId(option.getNextNodeId()) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/request/NodeRequest.java b/src/main/java/com/swyp/app/domain/scenario/dto/request/NodeRequest.java new file mode 100644 index 00000000..50c3b193 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/request/NodeRequest.java @@ -0,0 +1,11 @@ +package com.swyp.app.domain.scenario.dto.request; + +import java.util.List; + +public record NodeRequest( + String nodeName, + Boolean isStartNode, + String autoNextNode, // 자동 넘김 노드 이름 추가 + List scripts, + List interactiveOptions +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/request/OptionRequest.java b/src/main/java/com/swyp/app/domain/scenario/dto/request/OptionRequest.java new file mode 100644 index 00000000..2654d475 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/request/OptionRequest.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.scenario.dto.request; + +public record OptionRequest( + String label, + String nextNodeName +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java new file mode 100644 index 00000000..f0b116db --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java @@ -0,0 +1,10 @@ +package com.swyp.app.domain.scenario.dto.request; + +import java.util.List; +import java.util.UUID; + +public record ScenarioCreateRequest( + UUID battleId, + Boolean isInteractive, + List nodes +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioStatusUpdateRequest.java b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioStatusUpdateRequest.java new file mode 100644 index 00000000..6cc1e463 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioStatusUpdateRequest.java @@ -0,0 +1,7 @@ +package com.swyp.app.domain.scenario.dto.request; + +import com.swyp.app.domain.scenario.enums.ScenarioStatus; + +public record ScenarioStatusUpdateRequest( + ScenarioStatus status +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/request/ScriptRequest.java b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScriptRequest.java new file mode 100644 index 00000000..7fc1d634 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScriptRequest.java @@ -0,0 +1,9 @@ +package com.swyp.app.domain.scenario.dto.request; + +import com.swyp.app.domain.scenario.enums.SpeakerType; + +public record ScriptRequest( + String speakerName, + SpeakerType speakerType, + String text +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/response/AdminDeleteResponse.java b/src/main/java/com/swyp/app/domain/scenario/dto/response/AdminDeleteResponse.java new file mode 100644 index 00000000..71802d03 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/response/AdminDeleteResponse.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.scenario.dto.response; + +import java.time.LocalDateTime; + +public record AdminDeleteResponse( + boolean success, + LocalDateTime deletedAt +) {} diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/response/AdminScenarioResponse.java b/src/main/java/com/swyp/app/domain/scenario/dto/response/AdminScenarioResponse.java new file mode 100644 index 00000000..8b9e4dcd --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/response/AdminScenarioResponse.java @@ -0,0 +1,11 @@ +package com.swyp.app.domain.scenario.dto.response; + +import com.swyp.app.domain.scenario.enums.ScenarioStatus; + +import java.util.UUID; + +public record AdminScenarioResponse( + UUID scenarioId, + ScenarioStatus status, + String message +) {} diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/response/NodeResponse.java b/src/main/java/com/swyp/app/domain/scenario/dto/response/NodeResponse.java new file mode 100644 index 00000000..4854aeaf --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/response/NodeResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.scenario.dto.response; + +import lombok.Builder; +import java.util.List; +import java.util.UUID; + +@Builder +public record NodeResponse( + UUID nodeId, + String nodeName, + Integer audioDuration, // 프론트엔드 재생 시간 표시에 활용 + UUID autoNextNodeId, + List scripts, + List interactiveOptions +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/response/OptionResponse.java b/src/main/java/com/swyp/app/domain/scenario/dto/response/OptionResponse.java new file mode 100644 index 00000000..3380dd77 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/response/OptionResponse.java @@ -0,0 +1,10 @@ +package com.swyp.app.domain.scenario.dto.response; + +import lombok.Builder; +import java.util.UUID; + +@Builder +public record OptionResponse( + String label, + UUID nextNodeId +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/response/ScriptResponse.java b/src/main/java/com/swyp/app/domain/scenario/dto/response/ScriptResponse.java new file mode 100644 index 00000000..34794a3a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/response/ScriptResponse.java @@ -0,0 +1,14 @@ +package com.swyp.app.domain.scenario.dto.response; + +import com.swyp.app.domain.scenario.enums.SpeakerType; +import lombok.Builder; +import java.util.UUID; + +@Builder +public record ScriptResponse( + UUID scriptId, + Integer startTimeMs, + SpeakerType speakerType, + String speakerName, + String text +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/response/UserScenarioResponse.java b/src/main/java/com/swyp/app/domain/scenario/dto/response/UserScenarioResponse.java new file mode 100644 index 00000000..04fa6c66 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/dto/response/UserScenarioResponse.java @@ -0,0 +1,17 @@ +package com.swyp.app.domain.scenario.dto.response; + +import com.swyp.app.domain.scenario.enums.AudioPathType; +import lombok.Builder; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +@Builder +public record UserScenarioResponse( + UUID battleId, + Boolean isInteractive, + UUID startNodeId, // 프론트가 텍스트 시작점을 잡을 수 있게 전달 + AudioPathType recommendedPathKey, // 사전 투표 기반 추천 오디오 키 (예: PATH_A) + Map audios, // 통합 오디오 파일 맵 + List nodes +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/entity/InteractiveOption.java b/src/main/java/com/swyp/app/domain/scenario/entity/InteractiveOption.java new file mode 100644 index 00000000..7544f105 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/entity/InteractiveOption.java @@ -0,0 +1,41 @@ +package com.swyp.app.domain.scenario.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Entity +@Table(name = "scenario_options") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class InteractiveOption extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + @Column(name = "option_id", updatable = false, nullable = false) + private UUID id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "node_id") + private ScenarioNode node; + + private String label; + + @Column(name = "next_node_id") + private UUID nextNodeId; + + @Builder + public InteractiveOption(String label, UUID nextNodeId) { + this.label = label; + this.nextNodeId = nextNodeId; + } + + public void assignNode(ScenarioNode node) { + this.node = node; + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java b/src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java new file mode 100644 index 00000000..b333c6e6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java @@ -0,0 +1,76 @@ +package com.swyp.app.domain.scenario.entity; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.scenario.enums.AudioPathType; +import com.swyp.app.domain.scenario.enums.CreatorType; +import com.swyp.app.domain.scenario.enums.ScenarioStatus; +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.*; + +@Entity +@Table(name = "scenarios") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Scenario extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + @Column(name = "scenario_id", updatable = false, nullable = false) + private UUID id; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "battle_id", nullable = false) + private Battle battle; + + @Column(name = "is_interactive", nullable = false) + private Boolean isInteractive; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private ScenarioStatus status; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private CreatorType creatorType; + + @ElementCollection + @CollectionTable(name = "scenario_audios", joinColumns = @JoinColumn(name = "scenario_id")) + @MapKeyEnumerated(EnumType.STRING) + @MapKeyColumn(name = "path_key") + @Column(name = "audio_url") + private Map audios = new EnumMap<>(AudioPathType.class); + + @OneToMany(mappedBy = "scenario", cascade = CascadeType.ALL, orphanRemoval = true) + private List nodes = new ArrayList<>(); + + @Builder + public Scenario(Battle battle, Boolean isInteractive, ScenarioStatus status, CreatorType creatorType) { + this.battle = battle; + this.isInteractive = isInteractive; + this.status = status; + this.creatorType = creatorType; + } + + public void updateStatus(ScenarioStatus status) { + this.status = status; + } + + public void addAudioUrl(AudioPathType type, String url) { + this.audios.put(type, url); + } + + public void addNode(ScenarioNode node) { + this.nodes.add(node); + node.assignScenario(this); + } + + public void clearNodes() { + this.nodes.clear(); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java b/src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java new file mode 100644 index 00000000..dde90de6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java @@ -0,0 +1,76 @@ +package com.swyp.app.domain.scenario.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +@Entity +@Table(name = "scenario_nodes") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ScenarioNode extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + @Column(name = "node_id", updatable = false, nullable = false) + private UUID id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "scenario_id") + private Scenario scenario; + + @Column(name = "node_name") + private String nodeName; + + @Column(name = "is_start_node") + private Boolean isStartNode; + + @Column(name = "audio_duration") + private Integer audioDuration; + + @Column(name = "auto_next_node_id") + private UUID autoNextNodeId; + + @OneToMany(mappedBy = "node", cascade = CascadeType.ALL, orphanRemoval = true) + private List + + + + + + + +
+
+

당신의 생각을

+

Pické

+
+ +
+ + + + + + 카카오로 로그인 + + + + + + + + + + Google로 로그인 + +
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/components/form-battle.html b/src/main/resources/templates/admin/components/form-battle.html new file mode 100644 index 00000000..ac676917 --- /dev/null +++ b/src/main/resources/templates/admin/components/form-battle.html @@ -0,0 +1,174 @@ +
+ +
+
+

1 기본 정보

+ BASIC INFO +
+ +
+
+ + +
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ +
+
+

2 대결 설정

+ CHARACTERS +
+ +
+ + +
+

등장인물 A

+ + + + + + + +
+ +
+
+ +
+

등장인물 B

+ + + + + + + +
+ +
+
+
+
+ +
+
+

3 대본 설정

+ SCRIPT BUILDER +
+ +
+
+
+

🎬 오프닝

+ + +
+ +
+
+ +
+ + +
+ + + +
+
+
+

🎬 클로징

+ + +
+ +
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/admin/components/form-quiz.html b/src/main/resources/templates/admin/components/form-quiz.html new file mode 100644 index 00000000..41234947 --- /dev/null +++ b/src/main/resources/templates/admin/components/form-quiz.html @@ -0,0 +1,87 @@ +
+
+
+

1 퀴즈 등록

+ QUIZ +
+ +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ +
+
+ + O 정답 + +
+
+ + +
+
+ + +
+
+
+ +
+ + X 오답 + +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/admin/components/form-vote.html b/src/main/resources/templates/admin/components/form-vote.html new file mode 100644 index 00000000..0a074c7f --- /dev/null +++ b/src/main/resources/templates/admin/components/form-vote.html @@ -0,0 +1,54 @@ +
+
+
+

1 투표 등록

+ VOTE +
+ +
+
+ + +
+ +
+ + +
+ +
+ +
+ +
+ + +
+ + +
+
+ 1 + +
+
+ 2 + +
+
+ 3 + +
+
+ 4 + +
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/admin/fragments/basic-info.html b/src/main/resources/templates/admin/fragments/basic-info.html new file mode 100644 index 00000000..88e2691d --- /dev/null +++ b/src/main/resources/templates/admin/fragments/basic-info.html @@ -0,0 +1,12 @@ +
+
+

1 기본정보

+ BASIC INFO +
+
+
+ + +
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/admin/fragments/header.html b/src/main/resources/templates/admin/fragments/header.html new file mode 100644 index 00000000..ec99dbe3 --- /dev/null +++ b/src/main/resources/templates/admin/fragments/header.html @@ -0,0 +1,8 @@ +
+
+ Pické + Admin +
+ +
ADMIN
+
\ No newline at end of file diff --git a/src/main/resources/templates/admin/fragments/preview.html b/src/main/resources/templates/admin/fragments/preview.html new file mode 100644 index 00000000..00fa2d65 --- /dev/null +++ b/src/main/resources/templates/admin/fragments/preview.html @@ -0,0 +1,200 @@ +
+ +
+ 실시간 미리보기 + BRANCH MODE +
+ +
+
+ +
+ 9:41 +
+ + + +
+
+ +
+ +
+
+
+ +
+
+ + +
+ +
+
+

제목을 입력해주세요

+

콘텐츠에 대한 배경 설명 또는 힌트가 이곳에 표시됩니다.

+ +
+
+
+

A 입장 요약

+

A 이름

+
+
VS
+
+
+

B 입장 요약

+

B 이름

+
+
+ + +
+
+
+ + +
+ + + + + +
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/admin/picke-create.html b/src/main/resources/templates/admin/picke-create.html new file mode 100644 index 00000000..d51be093 --- /dev/null +++ b/src/main/resources/templates/admin/picke-create.html @@ -0,0 +1,132 @@ + + + + + + Pické Admin - 콘텐츠 등록 + + + + + + + +
+ +
+ +
+
+ +
+ + + +
+ +
+
+
+ + + + + +
+
+ +
+
+
+ +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/picke-list.html b/src/main/resources/templates/admin/picke-list.html new file mode 100644 index 00000000..f0cf1767 --- /dev/null +++ b/src/main/resources/templates/admin/picke-list.html @@ -0,0 +1,252 @@ + + + + + + Pické Admin - 콘텐츠 관리 + + + + + + + +
+ +
+
+
+

콘텐츠 관리

+

배틀, 퀴즈, 투표 콘텐츠를 조회하고 관리합니다.

+
+ +
+ +
+ + + + +
+ +
+ + + + + + + + + + + + + + +
ID유형콘텐츠 제목상태등록일관리
+
+
+ 데이터를 불러오는 중... +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 00000000..ef11cb98 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,14 @@ +{ + "compilerOptions": { + "target": "ES6", + "module": "ESNext", + "outDir": "./src/main/resources/static/js/admin", + "rootDir": "./src/main/resources/frontend/ts/admin", + "strict": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true + }, + "include": [ + "src/main/resources/frontend/ts/admin/**/*" + ] +} \ No newline at end of file From c9d8c717791dce80b2b9178fade4430bb7b74ab5 Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sat, 28 Mar 2026 14:14:11 +0900 Subject: [PATCH 27/94] =?UTF-8?q?#36=20[Feat]=20user=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81=20=EB=B0=8F=20?= =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20API=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20(#39)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - #36 - #40 ## 📝 작업 내용 ### ✨ Feat | 내용 | 파일 | |------|------| | 마이페이지 API 추가 (`/me/mypage`, `/me/recap`, `/me/battle-records`, `/me/content-activities`, `/me/notification-settings`, `/me/notices`) | `MypageController.java`, `MypageService.java`, 관련 request/response DTO | | 리캡/배틀기록/활동 조회용 Query Service 추가 및 집계 로직 구현 | `VoteQueryService.java`, `PerspectiveQueryService.java`, `BattleQueryService.java` | | 크레딧 적립/누적 포인트 기반 티어 계산 기능 추가 | `CreditService.java`, `CreditHistory.java`, `CreditHistoryRepository.java`, `TierCode.java`, `CreditType.java` | | | | ### ♻️ Refactor | 내용 | 파일 | |------|------| | onboarding/bootstrap/public-profile 계열 불필요 엔드포인트 및 관련 코드 제거 | `UserController.java`, `AuthService.java`, 관련 DTO | | `UserSettings`, `UserTendencyScore`, `UserTendencyScoreHistory` 필드명을 현재 도메인 용어 기준으로 정리 | `UserSettings.java`, `UserTendencyScore.java`, `UserTendencyScoreHistory.java`, 관련 DTO | | user 내부 공지 구현을 notice 도메인으로 통합하고 중복 로직 제거 | `MypageService.java`, `NoticeService.java` 연동부 | | USER ERD, API 문서, DB 마이그레이션 스크립트 최신화 | `user.puml`, `user-ops.puml`, `user-api.md`, `mypage-api.md`, `20260326_alter_credit_histories_reference_id_not_null.sql` | | | | ### 🧪 Test | 내용 | 파일 | |------|------| | user/mypage/credit 단위 테스트 추가 및 핵심 시나리오 검증 | `UserServiceTest.java`, `MypageServiceTest.java`, `CreditServiceTest.java` | | home/notice 테스트 보강 및 테스트 메서드명 정리 | `HomeServiceTest.java`, `NoticeServiceTest.java` | | `./gradlew test --tests '*UserServiceTest' --tests '*MypageServiceTest' --tests '*CreditServiceTest' --tests '*HomeServiceTest' --tests '*NoticeServiceTest'` 통과 | 테스트 실행 결과 | | | | ## 📌 공유 사항 - 철학자 산출 로직은 아직 확정 전이라 `SOCRATES`, `PLATO`, `MARX`를 임시값으로 사용하고 있습니다. - 크레딧/티어 계산은 붙었지만 실제 적립 이벤트 연결은 아직 남아 있습니다. - 전체 `./gradlew test`는 `AppApplicationTests.contextLoads()`에서 로컬 환경 변수 placeholder 미설정으로 실패했습니다. - 운영 반영 전 스키마 변경 대상(`user_settings`, tendency score 컬럼명, `onboarding_completed`, `credit_histories.reference_id NOT NULL`)은 별도 마이그레이션 검증이 필요합니다. ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [ ] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 > 없음 ## 💬 리뷰 요구사항 > 1. `MypageService`에서 타 도메인 조회를 `QueryService`로 분리한 현재 경계가 적절한지 확인 부탁드립니다. > --------- Co-authored-by: Claude Opus 4.6 --- docs/api-specs/mypage-api.md | 85 ---- docs/api-specs/user-api.md | 328 ++++++++----- ...credit_histories_reference_id_not_null.sql | 13 + docs/erd/user-ops.puml | 12 +- docs/erd/user.puml | 29 +- .../repository/BattleTagRepository.java | 6 + .../battle/service/BattleQueryService.java | 61 +++ .../domain/battle/service/BattleService.java | 2 +- .../battle/service/BattleServiceImpl.java | 2 +- .../domain/notice/entity/NoticePlacement.java | 6 + .../app/domain/notice/entity/NoticeType.java | 6 + .../app/domain/oauth/service/AuthService.java | 3 +- .../PerspectiveCommentRepository.java | 8 + .../repository/PerspectiveLikeRepository.java | 10 + .../service/PerspectiveQueryService.java | 39 ++ .../user/controller/MypageController.java | 96 ++++ .../user/controller/UserController.java | 91 ---- .../CreateOnboardingProfileRequest.java | 15 - .../UpdateNotificationSettingsRequest.java | 11 + .../request/UpdateTendencyScoreRequest.java | 20 - .../request/UpdateUserSettingsRequest.java | 18 - .../response/BattleRecordListResponse.java | 23 + .../user/dto/response/BootstrapResponse.java | 6 - .../response/ContentActivityListResponse.java | 35 ++ .../user/dto/response/MyProfileResponse.java | 2 - .../user/dto/response/MypageResponse.java | 34 ++ .../dto/response/NoticeDetailResponse.java | 15 + .../user/dto/response/NoticeListResponse.java | 21 + .../NotificationSettingsResponse.java | 11 + .../response/OnboardingProfileResponse.java | 16 - .../user/dto/response/RecapResponse.java | 44 ++ .../TendencyScoreHistoryItemResponse.java | 15 - .../TendencyScoreHistoryResponse.java | 9 - .../dto/response/TendencyScoreResponse.java | 16 - .../dto/response/UpdateResultResponse.java | 6 - .../dto/response/UserProfileResponse.java | 13 - .../dto/response/UserSettingsResponse.java | 9 - .../app/domain/user/entity/ActivityType.java | 6 + .../app/domain/user/entity/CreditHistory.java | 45 ++ .../domain/user/entity/PhilosopherType.java | 14 + .../swyp/app/domain/user/entity/TierCode.java | 30 ++ .../com/swyp/app/domain/user/entity/User.java | 11 +- .../app/domain/user/entity/UserSettings.java | 59 ++- .../domain/user/entity/UserTendencyScore.java | 47 +- .../user/entity/UserTendencyScoreHistory.java | 32 +- .../swyp/app/domain/user/entity/VoteSide.java | 6 + .../app/domain/user/enums/CreditType.java | 21 + .../repository/CreditHistoryRepository.java | 15 + .../domain/user/service/CreditService.java | 83 ++++ .../domain/user/service/MypageService.java | 303 ++++++++++++ .../app/domain/user/service/UserService.java | 251 +--------- .../vote/repository/VoteRepository.java | 36 +- .../domain/vote/service/VoteQueryService.java | 71 +++ .../global/common/exception/ErrorCode.java | 4 + .../app/global/config/SecurityConfig.java | 3 +- .../domain/home/service/HomeServiceTest.java | 46 +- .../notice/service/NoticeServiceTest.java | 7 +- .../user/service/CreditServiceTest.java | 105 ++++ .../user/service/MypageServiceTest.java | 450 ++++++++++++++++++ .../domain/user/service/UserServiceTest.java | 191 ++++++++ 60 files changed, 2185 insertions(+), 787 deletions(-) delete mode 100644 docs/api-specs/mypage-api.md create mode 100644 docs/db/20260326_alter_credit_histories_reference_id_not_null.sql create mode 100644 src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java create mode 100644 src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java create mode 100644 src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/service/PerspectiveQueryService.java create mode 100644 src/main/java/com/swyp/app/domain/user/controller/MypageController.java delete mode 100644 src/main/java/com/swyp/app/domain/user/controller/UserController.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/UpdateNotificationSettingsRequest.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/BattleRecordListResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/ContentActivityListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/NotificationSettingsResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/ActivityType.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/TierCode.java create mode 100644 src/main/java/com/swyp/app/domain/user/entity/VoteSide.java create mode 100644 src/main/java/com/swyp/app/domain/user/enums/CreditType.java create mode 100644 src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java create mode 100644 src/main/java/com/swyp/app/domain/user/service/CreditService.java create mode 100644 src/main/java/com/swyp/app/domain/user/service/MypageService.java create mode 100644 src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java create mode 100644 src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java create mode 100644 src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java create mode 100644 src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java diff --git a/docs/api-specs/mypage-api.md b/docs/api-specs/mypage-api.md deleted file mode 100644 index e4945605..00000000 --- a/docs/api-specs/mypage-api.md +++ /dev/null @@ -1,85 +0,0 @@ -# 마이페이지 API 명세서 - -## 1. 설계 메모 - -- 마이페이지는 원천 도메인이 아니라 사용자, 리캡, 활동 이력을 묶는 조회 API 성격이 강합니다. -- 상단 요약과 상세 목록은 분리해서 조회합니다. - ---- - -## 2. 마이페이지 API - -### 2.1 `GET /api/v1/me/mypage` - -마이페이지 상단에 필요한 집계 데이터 조회. - -응답: - -```json -{ - "profile": { - "user_id": "user_001", - "nickname": "생각하는올빼미", - "avatar_emoji": "🦉", - "manner_temperature": 36.5 - }, - "recap_summary": { - "personality_title": "원칙 중심형", - "summary": "감정보다 이성과 규칙을 더 중시하는 편이에요." - }, - "activity_counts": { - "comments": 12, - "posts": 3, - "liked_contents": 8, - "changed_mind_contents": 2 - } -} -``` - -### 2.2 `GET /api/v1/me/recap` - -상세 리캡 정보 조회. - -응답: - -```json -{ - "personality_title": "원칙 중심형", - "summary": "감정보다 이성과 규칙을 더 중시하는 편이에요.", - "scores": { - "score_1": 88, - "score_2": 74, - "score_3": 62, - "score_4": 45, - "score_5": 30, - "score_6": 15 - } -} -``` - -### 2.3 `GET /api/v1/me/activities` - -사용자 행동 이력 조회. - -쿼리 파라미터: - -- `type`: `COMMENT | POST | LIKED_CONTENT | CHANGED_MIND` -- `cursor`: 선택 -- `size`: 선택 - -응답: - -```json -{ - "items": [ - { - "activity_id": "act_001", - "type": "COMMENT", - "title": "안락사 도입, 찬성 vs 반대", - "description": "자기결정권은 가장 기본적인 인권이라고 생각해요.", - "created_at": "2026-03-08T12:00:00Z" - } - ], - "next_cursor": "cursor_002" -} -``` diff --git a/docs/api-specs/user-api.md b/docs/api-specs/user-api.md index ee5898df..bf50c055 100644 --- a/docs/api-specs/user-api.md +++ b/docs/api-specs/user-api.md @@ -1,50 +1,53 @@ -# 사용자 API 명세서 +# 내 정보 / 사용자 API 명세서 ## 1. 설계 메모 -- 사용자 API는 `snake_case` 필드명을 기준으로 합니다. +- 이 문서는 사용자 프로필 수정과 `/api/v1/me/**` 계열 API를 함께 다룹니다. +- 문서 전반은 `snake_case` 필드명을 기준으로 합니다. - 외부 응답에서는 내부 PK인 `user_id`를 노출하지 않고 `user_tag`를 사용합니다. - `nickname`은 중복 허용 프로필명입니다. - `user_tag`는 고유한 공개 식별자이며 저장 시 `@` 없이 관리합니다. - `user_tag`는 prefix 없이 생성되는 8자리 이하의 랜덤 문자열입니다. - 프로필 아바타는 자유 입력 이모지가 아니라 `character_type` 선택 방식으로 관리합니다. -- `character_type`은 소문자 `snake_case` 문자열 값으로 관리합니다. -- 프로필, 설정, 성향 점수는 모두 사용자 도메인 책임입니다. -- 온보딩 완료 시 필수 약관 동의 이력은 서버에서 함께 저장합니다. -- 성향 점수는 현재값을 갱신하면서 이력도 함께 적재합니다. +- `GET /api/v1/me/mypage`는 상단 요약 조회, `GET /api/v1/me/recap`은 상세 리캡 조회에 사용합니다. +- 프론트는 `philosopher_type` 값에 따라 사전 정의된 철학자 카드를 통째로 교체 렌더링합니다. +- 그래서 백엔드는 철학자 카드용 `title`, `description`, 해시태그 문구를 내려주지 않습니다. +- 포인트(`point`)는 새 개념으로 도입하되, 이번 버전에서는 현재 DB에서 계산 가능한 항목만 부분 반영합니다. +- 현재 반영 규칙은 `완료된 사후 투표 x 10P`, `입장 변경 x 20P 보너스`입니다. +- 철학자 산출 로직은 추후 확정 예정이며, 현재는 프론트 연동을 위해 임시로 `SOCRATES`를 반환합니다. + +### 1.1 공통 프로필 응답 필드 + +| 필드 | 타입 | 설명 | +|------|------|------| +| `user_tag` | string | 외부 공개용 사용자 식별자 | +| `nickname` | string | 중복 허용 프로필명 | +| `character_type` | string | 캐릭터 enum 값 | +| `manner_temperature` | number | 사용자 매너 온도 | + +### 1.2 공통 enum 값 + +| 필드 | 가능한 값 | +|------|-----------| +| `philosopher_type` | `SOCRATES \| PLATO \| ARISTOTLE \| KANT \| NIETZSCHE \| MARX \| SARTRE \| CONFUCIUS \| LAOZI \| BUDDHA` | +| `character_type` | `OWL \| FOX \| WOLF \| LION \| PENGUIN \| BEAR \| RABBIT \| CAT` | +| `activity_type` | `COMMENT \| LIKE` | +| `vote_side` | `PRO \| CON` | --- -## 2. 첫 로그인 / 온보딩 API +## 2. 프로필 API -### 2.1 `GET /api/v1/onboarding/bootstrap` +### 2.1 `PATCH /api/v1/me/profile` -첫 로그인 화면 진입 시 필요한 초기 데이터 조회. -이모지는 8개 뿐이라 앱에서 관리하는 버전입니다. - -응답: - -```json -{ - "statusCode": 200, - "data": { - "random_nickname": "생각하는올빼미" - }, - "error": null -} -``` - -### 2.2 `POST /api/v1/onboarding/profile` - -첫 로그인 시 프로필 생성. -owl, wolf, lion 등은 추후 디자인에 따라 정의 +닉네임 및 캐릭터 수정. 요청: ```json { - "nickname": "생각하는올빼미", - "character_type": "owl" + "nickname": "생각하는펭귄", + "character_type": "PENGUIN" } ``` @@ -55,11 +58,9 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 "statusCode": 200, "data": { "user_tag": "a7k2m9q1", - "nickname": "생각하는올빼미", - "character_type": "owl", - "manner_temperature": 36.5, - "status": "ACTIVE", - "onboarding_completed": true + "nickname": "생각하는펭귄", + "character_type": "PENGUIN", + "updated_at": "2026-03-08T12:00:00Z" }, "error": null } @@ -67,11 +68,11 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 --- -## 3. 프로필 API +## 3. 마이페이지 조회 API -### 3.1 `GET /api/v1/users/{user_tag}` +### 3.1 `GET /api/v1/me/mypage` -공개 사용자 프로필 조회. +마이페이지 상단에 필요한 집계 데이터 조회. 응답: @@ -79,20 +80,28 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "a7k2m9q1", - "nickname": "생각하는올빼미", - "character_type": "owl", - "manner_temperature": 36.5 + "profile": { + "user_tag": "a7k2m9q1", + "nickname": "생각하는올빼미", + "character_type": "OWL", + "manner_temperature": 36.5 + }, + "philosopher": { + "philosopher_type": "SOCRATES" + }, + "tier": { + "tier_code": "WANDERER", + "tier_label": "방랑자", + "current_point": 40 + } }, "error": null } ``` ---- - -### 3.2 `GET /api/v1/me/profile` +### 3.2 `GET /api/v1/me/recap` -내 프로필 조회. +상세 리캡 정보 조회. 응답: @@ -100,30 +109,66 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "a7k2m9q1", - "nickname": "생각하는올빼미", - "character_type": "owl", - "manner_temperature": 36.5, - "updated_at": "2026-03-08T12:00:00Z" + "my_card": { + "philosopher_type": "SOCRATES" + }, + "best_match_card": { + "philosopher_type": "PLATO" + }, + "worst_match_card": { + "philosopher_type": "MARX" + }, + "scores": { + "principle": 88, + "reason": 74, + "individual": 62, + "change": 45, + "inner": 30, + "ideal": 15 + }, + "preference_report": { + "total_participation": 47, + "opinion_changes": 12, + "battle_win_rate": 68, + "favorite_topics": [ + { + "rank": 1, + "tag_name": "철학", + "participation_count": 20 + }, + { + "rank": 2, + "tag_name": "문학", + "participation_count": 13 + }, + { + "rank": 3, + "tag_name": "예술", + "participation_count": 8 + }, + { + "rank": 4, + "tag_name": "사회", + "participation_count": 5 + } + ] + } }, "error": null } ``` ---- +### 3.3 `GET /api/v1/me/battle-records` -### 3.3 `PATCH /api/v1/me/profile` - -닉네임 및 캐릭터 수정. +내 배틀 기록 조회. +찬성/반대 탭을 따로 나누지 않고 하나의 목록으로 반환합니다. +각 item의 `vote_side`가 실제 구분자입니다. -요청: +쿼리 파라미터: -```json -{ - "nickname": "생각하는펭귄", - "character_type": "penguin" -} -``` +- `offset`: 선택, 0-based 시작 위치 +- `size`: 선택 +- `vote_side`: 각 item의 구분자이며 가능한 값은 `PRO | CON` 응답: @@ -131,22 +176,34 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "a7k2m9q1", - "nickname": "생각하는펭귄", - "character_type": "penguin", - "updated_at": "2026-03-08T12:00:00Z" + "items": [ + { + "battle_id": "battle_001", + "record_id": "vote_001", + "vote_side": "PRO", + "title": "안락사 도입, 찬성 vs 반대", + "summary": "인간에게 품위 있는 죽음을 허용해야 할까?", + "created_at": "2026-03-07T18:30:00" + } + ], + "next_offset": 20, + "has_next": true }, "error": null } ``` ---- +### 3.4 `GET /api/v1/me/content-activities` -## 4. 설정 API +내 댓글/좋아요 기반 콘텐츠 활동 조회. +댓글/좋아요 탭을 따로 나누지 않고 하나의 목록으로 반환합니다. +각 item의 `activity_type`이 실제 구분자입니다. -### 4.1 `GET /api/v1/me/settings` +쿼리 파라미터: -현재 사용자 설정 조회. +- `offset`: 선택, 0-based 시작 위치 +- `size`: 선택 +- `activity_type`: 각 item의 구분자이며 가능한 값은 `COMMENT | LIKE` 응답: @@ -154,29 +211,34 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "push_enabled": false, - "email_enabled": false, - "debate_request_enabled": false, - "profile_public": false + "items": [ + { + "activity_id": "comment_001", + "activity_type": "COMMENT", + "perspective_id": "perspective_001", + "battle_id": "battle_001", + "battle_title": "안락사 도입, 찬성 vs 반대", + "author": { + "user_tag": "a7k2m9q1", + "nickname": "사색하는고양이", + "character_type": "CAT" + }, + "stance": "반대", + "content": "제도가 무서운 건, 사회적 압력이 선택을 의무로 바꿀 수 있다는 거예요.", + "like_count": 1340, + "created_at": "2026-03-08T12:00:00" + } + ], + "next_offset": 20, + "has_next": true }, "error": null } ``` ---- - -### 4.2 `PATCH /api/v1/me/settings` +### 3.5 `GET /api/v1/me/notification-settings` -사용자 설정 수정. - -요청: - -```json -{ - "push_enabled": false, - "debate_request_enabled": false -} -``` +마이페이지 알림 설정 조회. 응답: @@ -184,31 +246,27 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "updated": true + "new_battle_enabled": false, + "battle_result_enabled": true, + "comment_reply_enabled": true, + "new_comment_enabled": false, + "content_like_enabled": false, + "marketing_event_enabled": true }, "error": null } ``` ---- - -## 5. 성향 점수 API +### 3.6 `PATCH /api/v1/me/notification-settings` -### 5.1 `PUT /api/v1/me/tendency-scores` - -최신 성향 점수 수정 및 이력 저장. -!!! 기획 확정에 따라 필드명 및 규칙 변경될 예정 +마이페이지 알림 설정 부분 수정. 요청: ```json { - "score_1": 30, - "score_2": -20, - "score_3": 55, - "score_4": 10, - "score_5": -75, - "score_6": 42 + "battle_result_enabled": true, + "marketing_event_enabled": false } ``` @@ -218,30 +276,24 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 { "statusCode": 200, "data": { - "user_tag": "a7k2m9q1", - "score_1": 30, - "score_2": -20, - "score_3": 55, - "score_4": 10, - "score_5": -75, - "score_6": 42, - "updated_at": "2026-03-08T12:00:00Z", - "history_saved": true + "new_battle_enabled": false, + "battle_result_enabled": true, + "comment_reply_enabled": true, + "new_comment_enabled": false, + "content_like_enabled": false, + "marketing_event_enabled": false }, "error": null } ``` ---- +### 3.7 `GET /api/v1/me/notices` -### 5.2 `GET /api/v1/me/tendency-scores/history` - -성향 점수 변경 이력 조회. +공지/이벤트 목록 조회. 쿼리 파라미터: -- `cursor`: 선택 -- `size`: 선택 +- `type`: `NOTICE | EVENT` 응답: @@ -251,17 +303,35 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 "data": { "items": [ { - "history_id": 1, - "score_1": 30, - "score_2": -20, - "score_3": 55, - "score_4": 10, - "score_5": -75, - "score_6": 42, - "created_at": "2026-03-08T12:00:00Z" + "notice_id": "notice_001", + "type": "NOTICE", + "title": "3월 신규 딜레마 업데이트", + "body_preview": "매일 새로운 딜레마가 추가돼요.", + "is_pinned": true, + "published_at": "2026-03-01T00:00:00" } - ], - "next_cursor": null + ] + }, + "error": null +} +``` + +### 3.8 `GET /api/v1/me/notices/{noticeId}` + +공지/이벤트 상세 조회. + +응답: + +```json +{ + "statusCode": 200, + "data": { + "notice_id": "notice_001", + "type": "NOTICE", + "title": "3월 신규 딜레마 업데이트", + "body": "매일 새로운 딜레마가 추가돼요.", + "is_pinned": true, + "published_at": "2026-03-01T00:00:00" }, "error": null } @@ -269,21 +339,21 @@ owl, wolf, lion 등은 추후 디자인에 따라 정의 --- -## 6. 에러 코드 +## 4. 에러 코드 -### 6.1 공통 에러 코드 +### 4.1 공통 에러 코드 | Error Code | HTTP Status | 설명 | |------------|:-----------:|------| | `COMMON_INVALID_PARAMETER` | `400` | 요청 파라미터 오류 | | `AUTH_UNAUTHORIZED` | `401` | 인증 실패 | | `AUTH_ACCESS_TOKEN_EXPIRED` | `401` | Access Token 만료 | -| `AUTH_REFRESH_TOKEN_EXPIRED` | `401` | Refresh Token 만료 — 재로그인 필요 | +| `AUTH_REFRESH_TOKEN_EXPIRED` | `401` | Refresh Token 만료 - 재로그인 필요 | | `USER_BANNED` | `403` | 영구 제재된 사용자 | | `USER_SUSPENDED` | `403` | 일정 기간 이용 정지된 사용자 | | `INTERNAL_SERVER_ERROR` | `500` | 서버 오류 | -### 6.2 사용자 에러 코드 +### 4.2 사용자 에러 코드 | Error Code | HTTP Status | 설명 | |------------|:-----------:|------| diff --git a/docs/db/20260326_alter_credit_histories_reference_id_not_null.sql b/docs/db/20260326_alter_credit_histories_reference_id_not_null.sql new file mode 100644 index 00000000..2c90327a --- /dev/null +++ b/docs/db/20260326_alter_credit_histories_reference_id_not_null.sql @@ -0,0 +1,13 @@ +DO $$ +BEGIN + IF EXISTS ( + SELECT 1 + FROM credit_histories + WHERE reference_id IS NULL + ) THEN + RAISE EXCEPTION 'credit_histories.reference_id contains NULL values. Backfill the rows before applying NOT NULL.'; + END IF; +END $$; + +ALTER TABLE credit_histories + ALTER COLUMN reference_id SET NOT NULL; diff --git a/docs/erd/user-ops.puml b/docs/erd/user-ops.puml index 8cf8d1f3..db748bcc 100644 --- a/docs/erd/user-ops.puml +++ b/docs/erd/user-ops.puml @@ -7,7 +7,7 @@ entity "USERS\n서비스 사용자" as users { * id : BIGINT <> -- user_tag : VARCHAR(30) <> - status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') + status : ENUM('PENDING', 'ACTIVE', 'SUSPENDED', 'BANNED', 'DELETED') created_at : timestamp updated_at : timestamp } @@ -15,10 +15,12 @@ entity "USERS\n서비스 사용자" as users { entity "USER_SETTINGS\n사용자 설정" as user_settings { * user_id : BIGINT <> -- - push_enabled : boolean - email_enabled : boolean - debate_request_enabled : boolean - profile_public : boolean + new_battle_enabled : boolean + battle_result_enabled : boolean + comment_reply_enabled : boolean + new_comment_enabled : boolean + content_like_enabled : boolean + marketing_event_enabled : boolean updated_at : timestamp } diff --git a/docs/erd/user.puml b/docs/erd/user.puml index c0572811..be8614fd 100644 --- a/docs/erd/user.puml +++ b/docs/erd/user.puml @@ -7,9 +7,10 @@ entity "USERS\n서비스 사용자" as users { * id : BIGINT <> -- user_tag : VARCHAR(30) <> + nickname : VARCHAR(50) + character_url : TEXT role : ENUM('USER', 'ADMIN') - status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') - onboarding_completed : boolean + status : ENUM('PENDING', 'ACTIVE', 'SUSPENDED', 'BANNED', 'DELETED') created_at : timestamp updated_at : timestamp deleted_at : timestamp (nullable) @@ -27,12 +28,12 @@ entity "USER_PROFILES\n사용자 프로필" as user_profiles { entity "USER_TENDENCY_SCORES\n사용자 성향 점수 현재값" as user_tendency_scores { * user_id : BIGINT <> -- - score_1 : int - score_2 : int - score_3 : int - score_4 : int - score_5 : int - score_6 : int + principle : int + reason : int + individual : int + change : int + inner : int + ideal : int updated_at : timestamp } @@ -40,12 +41,12 @@ entity "USER_TENDENCY_SCORE_HISTORIES\n사용자 성향 점수 변경 이력" as * id : BIGINT <> -- user_id : BIGINT <> - score_1 : int - score_2 : int - score_3 : int - score_4 : int - score_5 : int - score_6 : int + principle : int + reason : int + individual : int + change : int + inner : int + ideal : int created_at : timestamp } diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java index 6bc6e817..6a157fb3 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java @@ -4,6 +4,8 @@ import com.swyp.app.domain.battle.entity.BattleTag; import com.swyp.app.domain.tag.entity.Tag; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -11,4 +13,8 @@ public interface BattleTagRepository extends JpaRepository { List findByBattle(Battle battle); void deleteByBattle(Battle battle); boolean existsByTag(Tag tag); + + // MypageService (recap): 여러 배틀의 태그를 한번에 조회 + @Query("SELECT bt FROM BattleTag bt JOIN FETCH bt.tag WHERE bt.battle.id IN :battleIds") + List findByBattleIdIn(@Param("battleIds") List battleIds); } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java b/src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java new file mode 100644 index 00000000..e3241446 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java @@ -0,0 +1,61 @@ +package com.swyp.app.domain.battle.service; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.entity.BattleTag; +import com.swyp.app.domain.battle.repository.BattleOptionRepository; +import com.swyp.app.domain.battle.repository.BattleRepository; +import com.swyp.app.domain.battle.repository.BattleTagRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class BattleQueryService { + + private final BattleRepository battleRepository; + private final BattleOptionRepository battleOptionRepository; + private final BattleTagRepository battleTagRepository; + + public Map findBattlesByIds(List battleIds) { + return battleRepository.findAllById(battleIds).stream() + .collect(Collectors.toMap(Battle::getId, Function.identity())); + } + + public Map findOptionsByIds(List optionIds) { + return battleOptionRepository.findAllById(optionIds).stream() + .collect(Collectors.toMap(BattleOption::getId, Function.identity())); + } + + /** + * 주어진 배틀 ID 목록에 대해 태그별 빈도를 집계하여 상위 limit개를 반환한다. + * @return Map<태그명, 빈도수> (상위 limit개) + */ + public Map getTopTagsByBattleIds(List battleIds, int limit) { + if (battleIds.isEmpty()) return Map.of(); + + List battleTags = battleTagRepository.findByBattleIdIn(battleIds); + + return battleTags.stream() + .collect(Collectors.groupingBy( + bt -> bt.getTag().getName(), + Collectors.counting() + )) + .entrySet().stream() + .sorted(Map.Entry.comparingByValue().reversed()) + .limit(limit) + .collect(Collectors.toMap( + Map.Entry::getKey, + Map.Entry::getValue, + (a, b) -> a, + java.util.LinkedHashMap::new + )); + } +} diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleService.java b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java index cd8430c4..13488139 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleService.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java @@ -60,4 +60,4 @@ public interface BattleService { // 배틀 삭제 (DB에서 지우지 않고 소프트 딜리트/상태변경을 수행합니다) AdminBattleDeleteResponse deleteBattle(Long battleId); -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java index 1844de81..1bba4127 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java @@ -307,4 +307,4 @@ public BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabe return battleOptionRepository.findByBattleAndLabel(b, label) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java b/src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java new file mode 100644 index 00000000..180382ee --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.notice.entity; + +public enum NoticePlacement { + HOME_TOP, + NOTICE_BOARD +} diff --git a/src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java b/src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java new file mode 100644 index 00000000..be76097a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.notice.entity; + +public enum NoticeType { + ANNOUNCEMENT, + EVENT +} diff --git a/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java b/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java index e5a5f908..a5b5a333 100644 --- a/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java +++ b/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java @@ -60,8 +60,7 @@ public LoginResponse login(String provider, LoginRequest request) { user = User.builder() .userTag(generateUserTag()) .role(UserRole.USER) - .status(UserStatus.PENDING) - .onboardingCompleted(false) + .status(UserStatus.ACTIVE) .build(); userRepository.save(user); diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java index 5822133a..e28e8772 100644 --- a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java @@ -4,6 +4,8 @@ import com.swyp.app.domain.perspective.entity.PerspectiveComment; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.time.LocalDateTime; import java.util.List; @@ -13,4 +15,10 @@ public interface PerspectiveCommentRepository extends JpaRepository findByPerspectiveOrderByCreatedAtDesc(Perspective perspective, Pageable pageable); List findByPerspectiveAndCreatedAtBeforeOrderByCreatedAtDesc(Perspective perspective, LocalDateTime cursor, Pageable pageable); + + // MypageService: 사용자 댓글 활동 조회 (offset 페이지네이션) + @Query("SELECT c FROM PerspectiveComment c JOIN FETCH c.perspective WHERE c.userId = :userId ORDER BY c.createdAt DESC") + List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); + + long countByUserId(Long userId); } diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java index 5153f835..267a6ba4 100644 --- a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java @@ -2,8 +2,12 @@ import com.swyp.app.domain.perspective.entity.Perspective; import com.swyp.app.domain.perspective.entity.PerspectiveLike; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.util.List; import java.util.Optional; public interface PerspectiveLikeRepository extends JpaRepository { @@ -13,4 +17,10 @@ public interface PerspectiveLikeRepository extends JpaRepository findByPerspectiveAndUserId(Perspective perspective, Long userId); long countByPerspective(Perspective perspective); + + // MypageService: 사용자 좋아요 활동 조회 (offset 페이지네이션) + @Query("SELECT l FROM PerspectiveLike l JOIN FETCH l.perspective WHERE l.userId = :userId ORDER BY l.createdAt DESC") + List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); + + long countByUserId(Long userId); } diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveQueryService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveQueryService.java new file mode 100644 index 00000000..bc6a9f2f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveQueryService.java @@ -0,0 +1,39 @@ +package com.swyp.app.domain.perspective.service; + +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import com.swyp.app.domain.perspective.entity.PerspectiveLike; +import com.swyp.app.domain.perspective.repository.PerspectiveCommentRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveLikeRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PerspectiveQueryService { + + private final PerspectiveCommentRepository perspectiveCommentRepository; + private final PerspectiveLikeRepository perspectiveLikeRepository; + + public List findUserComments(Long userId, int offset, int size) { + PageRequest pageable = PageRequest.of(offset / size, size); + return perspectiveCommentRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); + } + + public long countUserComments(Long userId) { + return perspectiveCommentRepository.countByUserId(userId); + } + + public List findUserLikes(Long userId, int offset, int size) { + PageRequest pageable = PageRequest.of(offset / size, size); + return perspectiveLikeRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); + } + + public long countUserLikes(Long userId) { + return perspectiveLikeRepository.countByUserId(userId); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/controller/MypageController.java b/src/main/java/com/swyp/app/domain/user/controller/MypageController.java new file mode 100644 index 00000000..84e03e41 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/controller/MypageController.java @@ -0,0 +1,96 @@ +package com.swyp.app.domain.user.controller; + +import com.swyp.app.domain.user.dto.request.UpdateNotificationSettingsRequest; +import com.swyp.app.domain.user.dto.request.UpdateUserProfileRequest; +import com.swyp.app.domain.user.dto.response.BattleRecordListResponse; +import com.swyp.app.domain.user.dto.response.ContentActivityListResponse; +import com.swyp.app.domain.user.dto.response.MypageResponse; +import com.swyp.app.domain.user.dto.response.MyProfileResponse; +import com.swyp.app.domain.user.dto.response.NoticeDetailResponse; +import com.swyp.app.domain.user.dto.response.NoticeListResponse; +import com.swyp.app.domain.user.dto.response.NotificationSettingsResponse; +import com.swyp.app.domain.user.dto.response.RecapResponse; +import com.swyp.app.domain.notice.enums.NoticeType; +import com.swyp.app.domain.user.entity.ActivityType; +import com.swyp.app.domain.user.entity.VoteSide; + +import com.swyp.app.domain.user.service.MypageService; +import com.swyp.app.domain.user.service.UserService; +import com.swyp.app.global.common.response.ApiResponse; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/me") +public class MypageController { + + private final UserService userService; + private final MypageService mypageService; + + @PatchMapping("/profile") + public ApiResponse updateMyProfile( + @Valid @RequestBody UpdateUserProfileRequest request + ) { + return ApiResponse.onSuccess(userService.updateMyProfile(request)); + } + + @GetMapping("/mypage") + public ApiResponse getMypage() { + return ApiResponse.onSuccess(mypageService.getMypage()); + } + + @GetMapping("/recap") + public ApiResponse getRecap() { + return ApiResponse.onSuccess(mypageService.getRecap()); + } + + @GetMapping("/battle-records") + public ApiResponse getBattleRecords( + @RequestParam(required = false) Integer offset, + @RequestParam(required = false) Integer size, + @RequestParam(name = "vote_side", required = false) VoteSide voteSide + ) { + return ApiResponse.onSuccess(mypageService.getBattleRecords(offset, size, voteSide)); + } + + @GetMapping("/content-activities") + public ApiResponse getContentActivities( + @RequestParam(required = false) Integer offset, + @RequestParam(required = false) Integer size, + @RequestParam(name = "activity_type", required = false) ActivityType activityType + ) { + return ApiResponse.onSuccess(mypageService.getContentActivities(offset, size, activityType)); + } + + @GetMapping("/notification-settings") + public ApiResponse getNotificationSettings() { + return ApiResponse.onSuccess(mypageService.getNotificationSettings()); + } + + @PatchMapping("/notification-settings") + public ApiResponse updateNotificationSettings( + @RequestBody UpdateNotificationSettingsRequest request + ) { + return ApiResponse.onSuccess(mypageService.updateNotificationSettings(request)); + } + + @GetMapping("/notices") + public ApiResponse getNotices( + @RequestParam(required = false) NoticeType type + ) { + return ApiResponse.onSuccess(mypageService.getNotices(type)); + } + + @GetMapping("/notices/{noticeId}") + public ApiResponse getNoticeDetail(@PathVariable Long noticeId) { + return ApiResponse.onSuccess(mypageService.getNoticeDetail(noticeId)); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/controller/UserController.java b/src/main/java/com/swyp/app/domain/user/controller/UserController.java deleted file mode 100644 index 15c1e4ee..00000000 --- a/src/main/java/com/swyp/app/domain/user/controller/UserController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.swyp.app.domain.user.controller; - -import com.swyp.app.domain.user.dto.request.CreateOnboardingProfileRequest; -import com.swyp.app.domain.user.dto.request.UpdateTendencyScoreRequest; -import com.swyp.app.domain.user.dto.request.UpdateUserProfileRequest; -import com.swyp.app.domain.user.dto.request.UpdateUserSettingsRequest; -import com.swyp.app.domain.user.dto.response.BootstrapResponse; -import com.swyp.app.domain.user.dto.response.MyProfileResponse; -import com.swyp.app.domain.user.dto.response.OnboardingProfileResponse; -import com.swyp.app.domain.user.dto.response.TendencyScoreHistoryResponse; -import com.swyp.app.domain.user.dto.response.TendencyScoreResponse; -import com.swyp.app.domain.user.dto.response.UpdateResultResponse; -import com.swyp.app.domain.user.dto.response.UserProfileResponse; -import com.swyp.app.domain.user.dto.response.UserSettingsResponse; -import com.swyp.app.domain.user.service.UserService; -import com.swyp.app.global.common.response.ApiResponse; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/v1") -public class UserController { - - private final UserService userService; - - @GetMapping("/onboarding/bootstrap") - public ApiResponse getBootstrap() { - return ApiResponse.onSuccess(userService.getBootstrap()); - } - - @PostMapping("/onboarding/profile") - public ApiResponse createOnboardingProfile( - @Valid @RequestBody CreateOnboardingProfileRequest request - ) { - return ApiResponse.onSuccess(userService.createOnboardingProfile(request)); - } - - @GetMapping("/users/{userTag}") - public ApiResponse getUserProfile(@PathVariable String userTag) { - return ApiResponse.onSuccess(userService.getUserProfile(userTag)); - } - - @GetMapping("/me/profile") - public ApiResponse getMyProfile() { - return ApiResponse.onSuccess(userService.getMyProfile()); - } - - @PatchMapping("/me/profile") - public ApiResponse updateMyProfile( - @Valid @RequestBody UpdateUserProfileRequest request - ) { - return ApiResponse.onSuccess(userService.updateMyProfile(request)); - } - - @GetMapping("/me/settings") - public ApiResponse getMySettings() { - return ApiResponse.onSuccess(userService.getMySettings()); - } - - @PatchMapping("/me/settings") - public ApiResponse updateMySettings( - @Valid @RequestBody UpdateUserSettingsRequest request - ) { - return ApiResponse.onSuccess(userService.updateMySettings(request)); - } - - @PutMapping("/me/tendency-scores") - public ApiResponse updateMyTendencyScores( - @Valid @RequestBody UpdateTendencyScoreRequest request - ) { - return ApiResponse.onSuccess(userService.updateMyTendencyScores(request)); - } - - @GetMapping("/me/tendency-scores/history") - public ApiResponse getMyTendencyScoreHistory( - @RequestParam(required = false) Long cursor, - @RequestParam(required = false) Integer size - ) { - return ApiResponse.onSuccess(userService.getMyTendencyScoreHistory(cursor, size)); - } -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java deleted file mode 100644 index f00047d7..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/request/CreateOnboardingProfileRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.swyp.app.domain.user.dto.request; - -import com.swyp.app.domain.user.entity.CharacterType; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; - -public record CreateOnboardingProfileRequest( - @NotBlank - @Size(min = 2, max = 20) - String nickname, - @NotNull - CharacterType characterType -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateNotificationSettingsRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateNotificationSettingsRequest.java new file mode 100644 index 00000000..c2ac0529 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateNotificationSettingsRequest.java @@ -0,0 +1,11 @@ +package com.swyp.app.domain.user.dto.request; + +public record UpdateNotificationSettingsRequest( + Boolean newBattleEnabled, + Boolean battleResultEnabled, + Boolean commentReplyEnabled, + Boolean newCommentEnabled, + Boolean contentLikeEnabled, + Boolean marketingEventEnabled +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java deleted file mode 100644 index 2cde0bc2..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateTendencyScoreRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.swyp.app.domain.user.dto.request; - -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; - -public record UpdateTendencyScoreRequest( - @Min(-100) @Max(100) - int score1, - @Min(-100) @Max(100) - int score2, - @Min(-100) @Max(100) - int score3, - @Min(-100) @Max(100) - int score4, - @Min(-100) @Max(100) - int score5, - @Min(-100) @Max(100) - int score6 -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java b/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java deleted file mode 100644 index a0a067b7..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/request/UpdateUserSettingsRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.swyp.app.domain.user.dto.request; - -import jakarta.validation.constraints.AssertTrue; - -public record UpdateUserSettingsRequest( - Boolean pushEnabled, - Boolean emailEnabled, - Boolean debateRequestEnabled, - Boolean profilePublic -) { - @AssertTrue(message = "적어도 하나 이상의 설정값이 필요합니다.") - public boolean hasAnySettingToUpdate() { - return pushEnabled != null - || emailEnabled != null - || debateRequestEnabled != null - || profilePublic != null; - } -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/BattleRecordListResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/BattleRecordListResponse.java new file mode 100644 index 00000000..0436db5b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/BattleRecordListResponse.java @@ -0,0 +1,23 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.user.entity.VoteSide; + +import java.time.LocalDateTime; +import java.util.List; + +public record BattleRecordListResponse( + List items, + Integer nextOffset, + boolean hasNext +) { + + public record BattleRecordItem( + String battleId, + String recordId, + VoteSide voteSide, + String title, + String summary, + LocalDateTime createdAt + ) { + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java deleted file mode 100644 index 60cfd4aa..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/BootstrapResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -public record BootstrapResponse( - String randomNickname -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/ContentActivityListResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/ContentActivityListResponse.java new file mode 100644 index 00000000..586c6a01 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/ContentActivityListResponse.java @@ -0,0 +1,35 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.user.entity.ActivityType; +import com.swyp.app.domain.user.entity.CharacterType; + +import java.time.LocalDateTime; +import java.util.List; + +public record ContentActivityListResponse( + List items, + Integer nextOffset, + boolean hasNext +) { + + public record ContentActivityItem( + String activityId, + ActivityType activityType, + String perspectiveId, + String battleId, + String battleTitle, + AuthorInfo author, + String stance, + String content, + int likeCount, + LocalDateTime createdAt + ) { + } + + public record AuthorInfo( + String userTag, + String nickname, + CharacterType characterType + ) { + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java index 1f7a3578..9e55fff6 100644 --- a/src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java +++ b/src/main/java/com/swyp/app/domain/user/dto/response/MyProfileResponse.java @@ -2,14 +2,12 @@ import com.swyp.app.domain.user.entity.CharacterType; -import java.math.BigDecimal; import java.time.LocalDateTime; public record MyProfileResponse( String userTag, String nickname, CharacterType characterType, - BigDecimal mannerTemperature, LocalDateTime updatedAt ) { } diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java new file mode 100644 index 00000000..9804cf3f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java @@ -0,0 +1,34 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.user.entity.CharacterType; +import com.swyp.app.domain.user.entity.PhilosopherType; +import com.swyp.app.domain.user.entity.TierCode; + +import java.math.BigDecimal; + +public record MypageResponse( + ProfileInfo profile, + PhilosopherInfo philosopher, + TierInfo tier +) { + + public record ProfileInfo( + String userTag, + String nickname, + CharacterType characterType, + BigDecimal mannerTemperature + ) { + } + + public record PhilosopherInfo( + PhilosopherType philosopherType + ) { + } + + public record TierInfo( + TierCode tierCode, + String tierLabel, + int currentPoint + ) { + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java new file mode 100644 index 00000000..845c3683 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.notice.enums.NoticeType; + +import java.time.LocalDateTime; + +public record NoticeDetailResponse( + Long noticeId, + NoticeType type, + String title, + String body, + boolean isPinned, + LocalDateTime publishedAt +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java new file mode 100644 index 00000000..4b0b1da2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java @@ -0,0 +1,21 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.notice.enums.NoticeType; + +import java.time.LocalDateTime; +import java.util.List; + +public record NoticeListResponse( + List items +) { + + public record NoticeItem( + Long noticeId, + NoticeType type, + String title, + String bodyPreview, + boolean isPinned, + LocalDateTime publishedAt + ) { + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/NotificationSettingsResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/NotificationSettingsResponse.java new file mode 100644 index 00000000..cc2a5fb7 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/NotificationSettingsResponse.java @@ -0,0 +1,11 @@ +package com.swyp.app.domain.user.dto.response; + +public record NotificationSettingsResponse( + boolean newBattleEnabled, + boolean battleResultEnabled, + boolean commentReplyEnabled, + boolean newCommentEnabled, + boolean contentLikeEnabled, + boolean marketingEventEnabled +) { +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java deleted file mode 100644 index 6c67ab4a..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/OnboardingProfileResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -import com.swyp.app.domain.user.entity.CharacterType; -import com.swyp.app.domain.user.entity.UserStatus; - -import java.math.BigDecimal; - -public record OnboardingProfileResponse( - String userTag, - String nickname, - CharacterType characterType, - BigDecimal mannerTemperature, - UserStatus status, - boolean onboardingCompleted -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java new file mode 100644 index 00000000..7d7f2450 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java @@ -0,0 +1,44 @@ +package com.swyp.app.domain.user.dto.response; + +import com.swyp.app.domain.user.entity.PhilosopherType; + +import java.util.List; + +public record RecapResponse( + PhilosopherCard myCard, + PhilosopherCard bestMatchCard, + PhilosopherCard worstMatchCard, + Scores scores, + PreferenceReport preferenceReport +) { + + public record PhilosopherCard( + PhilosopherType philosopherType + ) { + } + + public record Scores( + int principle, + int reason, + int individual, + int change, + int inner, + int ideal + ) { + } + + public record PreferenceReport( + int totalParticipation, + int opinionChanges, + int battleWinRate, + List favoriteTopics + ) { + } + + public record FavoriteTopic( + int rank, + String tagName, + int participationCount + ) { + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java deleted file mode 100644 index 96aa08e5..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryItemResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -import java.time.LocalDateTime; - -public record TendencyScoreHistoryItemResponse( - Long historyId, - int score1, - int score2, - int score3, - int score4, - int score5, - int score6, - LocalDateTime createdAt -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java deleted file mode 100644 index d125ef12..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreHistoryResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -import java.util.List; - -public record TendencyScoreHistoryResponse( - List items, - Long nextCursor -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java deleted file mode 100644 index 14b697b8..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/TendencyScoreResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -import java.time.LocalDateTime; - -public record TendencyScoreResponse( - String userTag, - int score1, - int score2, - int score3, - int score4, - int score5, - int score6, - LocalDateTime updatedAt, - boolean historySaved -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java deleted file mode 100644 index c5ee9cb9..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/UpdateResultResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -public record UpdateResultResponse( - boolean updated -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java deleted file mode 100644 index f1bdce73..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/UserProfileResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -import com.swyp.app.domain.user.entity.CharacterType; - -import java.math.BigDecimal; - -public record UserProfileResponse( - String userTag, - String nickname, - CharacterType characterType, - BigDecimal mannerTemperature -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java deleted file mode 100644 index a1c8965b..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/UserSettingsResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -public record UserSettingsResponse( - boolean pushEnabled, - boolean emailEnabled, - boolean debateRequestEnabled, - boolean profilePublic -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/entity/ActivityType.java b/src/main/java/com/swyp/app/domain/user/entity/ActivityType.java new file mode 100644 index 00000000..c6f47e87 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/ActivityType.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.user.entity; + +public enum ActivityType { + COMMENT, + LIKE +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java b/src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java new file mode 100644 index 00000000..ceeea055 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java @@ -0,0 +1,45 @@ +package com.swyp.app.domain.user.entity; + +import com.swyp.app.domain.user.enums.CreditType; +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Index; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "credit_histories", indexes = { + @Index(name = "idx_credit_history_user_id", columnList = "user_id"), + @Index(name = "idx_credit_history_user_type_ref", columnList = "user_id, credit_type, reference_id", unique = true) +}) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class CreditHistory extends BaseEntity { + + @Column(name = "user_id", nullable = false) + private Long userId; + + @Enumerated(EnumType.STRING) + @Column(name = "credit_type", nullable = false, length = 30) + private CreditType creditType; + + @Column(nullable = false) + private int amount; + + @Column(name = "reference_id", nullable = false) + private Long referenceId; + + @Builder + private CreditHistory(Long userId, CreditType creditType, int amount, Long referenceId) { + this.userId = userId; + this.creditType = creditType; + this.amount = amount; + this.referenceId = referenceId; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java b/src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java new file mode 100644 index 00000000..c78ad988 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java @@ -0,0 +1,14 @@ +package com.swyp.app.domain.user.entity; + +public enum PhilosopherType { + SOCRATES, + PLATO, + ARISTOTLE, + KANT, + NIETZSCHE, + MARX, + SARTRE, + CONFUCIUS, + LAOZI, + BUDDHA +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/TierCode.java b/src/main/java/com/swyp/app/domain/user/entity/TierCode.java new file mode 100644 index 00000000..84579f8e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/TierCode.java @@ -0,0 +1,30 @@ +package com.swyp.app.domain.user.entity; + +import lombok.Getter; + +@Getter +public enum TierCode { + WANDERER("방랑자", 0), + STUDENT("학도", 500), + SAGE("현자", 2000), + PHILOSOPHER("철학자", 5000), + MASTER("마스터", 10000); + + private final String label; + private final int minPoints; + + TierCode(String label, int minPoints) { + this.label = label; + this.minPoints = minPoints; + } + + public static TierCode fromPoints(int points) { + TierCode result = WANDERER; + for (TierCode tier : values()) { + if (points >= tier.minPoints) { + result = tier; + } + } + return result; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/entity/User.java b/src/main/java/com/swyp/app/domain/user/entity/User.java index 1cc57d3f..f9b3c734 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/User.java +++ b/src/main/java/com/swyp/app/domain/user/entity/User.java @@ -39,25 +39,16 @@ public class User extends BaseEntity { @Column(nullable = false, length = 20) private UserStatus status; - @Column(name = "onboarding_completed", nullable = false) - private boolean onboardingCompleted; - @Column(name = "deleted_at") private LocalDateTime deletedAt; @Builder - private User(String userTag, String nickname, String characterUrl, UserRole role, UserStatus status, boolean onboardingCompleted) { + private User(String userTag, String nickname, String characterUrl, UserRole role, UserStatus status) { this.userTag = userTag; this.nickname = nickname; this.characterUrl = characterUrl; this.role = role; this.status = status; - this.onboardingCompleted = onboardingCompleted; - } - - public void completeOnboarding() { - this.status = UserStatus.ACTIVE; - this.onboardingCompleted = true; } public void delete() { diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserSettings.java b/src/main/java/com/swyp/app/domain/user/entity/UserSettings.java index 89f6bac2..019236b8 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/UserSettings.java +++ b/src/main/java/com/swyp/app/domain/user/entity/UserSettings.java @@ -1,6 +1,7 @@ package com.swyp.app.domain.user.entity; import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.Id; @@ -23,35 +24,57 @@ public class UserSettings extends BaseEntity { @JoinColumn(name = "user_id") private User user; - private boolean pushEnabled; + @Column(name = "new_battle_enabled") + private boolean newBattleEnabled; - private boolean emailEnabled; + @Column(name = "battle_result_enabled") + private boolean battleResultEnabled; - private boolean debateRequestEnabled; + @Column(name = "comment_reply_enabled") + private boolean commentReplyEnabled; - private boolean profilePublic; + @Column(name = "new_comment_enabled") + private boolean newCommentEnabled; + + @Column(name = "content_like_enabled") + private boolean contentLikeEnabled; + + @Column(name = "marketing_event_enabled") + private boolean marketingEventEnabled; @Builder - private UserSettings(User user, boolean pushEnabled, boolean emailEnabled, boolean debateRequestEnabled, boolean profilePublic) { + private UserSettings(User user, boolean newBattleEnabled, boolean battleResultEnabled, + boolean commentReplyEnabled, boolean newCommentEnabled, + boolean contentLikeEnabled, boolean marketingEventEnabled) { this.user = user; - this.pushEnabled = pushEnabled; - this.emailEnabled = emailEnabled; - this.debateRequestEnabled = debateRequestEnabled; - this.profilePublic = profilePublic; + this.newBattleEnabled = newBattleEnabled; + this.battleResultEnabled = battleResultEnabled; + this.commentReplyEnabled = commentReplyEnabled; + this.newCommentEnabled = newCommentEnabled; + this.contentLikeEnabled = contentLikeEnabled; + this.marketingEventEnabled = marketingEventEnabled; } - public void update(Boolean pushEnabled, Boolean emailEnabled, Boolean debateRequestEnabled, Boolean profilePublic) { - if (pushEnabled != null) { - this.pushEnabled = pushEnabled; + public void update(Boolean newBattleEnabled, Boolean battleResultEnabled, + Boolean commentReplyEnabled, Boolean newCommentEnabled, + Boolean contentLikeEnabled, Boolean marketingEventEnabled) { + if (newBattleEnabled != null) { + this.newBattleEnabled = newBattleEnabled; + } + if (battleResultEnabled != null) { + this.battleResultEnabled = battleResultEnabled; + } + if (commentReplyEnabled != null) { + this.commentReplyEnabled = commentReplyEnabled; } - if (emailEnabled != null) { - this.emailEnabled = emailEnabled; + if (newCommentEnabled != null) { + this.newCommentEnabled = newCommentEnabled; } - if (debateRequestEnabled != null) { - this.debateRequestEnabled = debateRequestEnabled; + if (contentLikeEnabled != null) { + this.contentLikeEnabled = contentLikeEnabled; } - if (profilePublic != null) { - this.profilePublic = profilePublic; + if (marketingEventEnabled != null) { + this.marketingEventEnabled = marketingEventEnabled; } } } diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java index fd8c7a65..b090ff76 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java +++ b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScore.java @@ -23,30 +23,37 @@ public class UserTendencyScore extends BaseEntity { @JoinColumn(name = "user_id") private User user; - private int score1; - private int score2; - private int score3; - private int score4; - private int score5; - private int score6; + private int principle; + + private int reason; + + private int individual; + + private int change; + + private int inner; + + private int ideal; @Builder - private UserTendencyScore(User user, int score1, int score2, int score3, int score4, int score5, int score6) { + private UserTendencyScore(User user, int principle, int reason, int individual, + int change, int inner, int ideal) { this.user = user; - this.score1 = score1; - this.score2 = score2; - this.score3 = score3; - this.score4 = score4; - this.score5 = score5; - this.score6 = score6; + this.principle = principle; + this.reason = reason; + this.individual = individual; + this.change = change; + this.inner = inner; + this.ideal = ideal; } - public void update(int score1, int score2, int score3, int score4, int score5, int score6) { - this.score1 = score1; - this.score2 = score2; - this.score3 = score3; - this.score4 = score4; - this.score5 = score5; - this.score6 = score6; + public void update(int principle, int reason, int individual, + int change, int inner, int ideal) { + this.principle = principle; + this.reason = reason; + this.individual = individual; + this.change = change; + this.inner = inner; + this.ideal = ideal; } } diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java index 7759cc89..526cb205 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java +++ b/src/main/java/com/swyp/app/domain/user/entity/UserTendencyScoreHistory.java @@ -24,21 +24,27 @@ public class UserTendencyScoreHistory extends BaseEntity { @JoinColumn(name = "user_id", nullable = false) private User user; - private int score1; - private int score2; - private int score3; - private int score4; - private int score5; - private int score6; + private int principle; + + private int reason; + + private int individual; + + private int change; + + private int inner; + + private int ideal; @Builder - private UserTendencyScoreHistory(User user, int score1, int score2, int score3, int score4, int score5, int score6) { + private UserTendencyScoreHistory(User user, int principle, int reason, int individual, + int change, int inner, int ideal) { this.user = user; - this.score1 = score1; - this.score2 = score2; - this.score3 = score3; - this.score4 = score4; - this.score5 = score5; - this.score6 = score6; + this.principle = principle; + this.reason = reason; + this.individual = individual; + this.change = change; + this.inner = inner; + this.ideal = ideal; } } diff --git a/src/main/java/com/swyp/app/domain/user/entity/VoteSide.java b/src/main/java/com/swyp/app/domain/user/entity/VoteSide.java new file mode 100644 index 00000000..07d3f8a9 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/entity/VoteSide.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.user.entity; + +public enum VoteSide { + PRO, + CON +} diff --git a/src/main/java/com/swyp/app/domain/user/enums/CreditType.java b/src/main/java/com/swyp/app/domain/user/enums/CreditType.java new file mode 100644 index 00000000..d98917a1 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/enums/CreditType.java @@ -0,0 +1,21 @@ +package com.swyp.app.domain.user.enums; + +import lombok.Getter; + +@Getter +public enum CreditType { + BATTLE_VOTE(10), + QUIZ_VOTE(5), + MAJORITY_WIN(20), + BEST_COMMENT(100), + TOPIC_SUGGEST(30), + TOPIC_ADOPTED(1000), + AD_REWARD(50), + FREE_CHARGE(0); + + private final int defaultAmount; + + CreditType(int defaultAmount) { + this.defaultAmount = defaultAmount; + } +} diff --git a/src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java b/src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java new file mode 100644 index 00000000..a860eef2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.user.repository; + +import com.swyp.app.domain.user.entity.CreditHistory; +import com.swyp.app.domain.user.enums.CreditType; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface CreditHistoryRepository extends JpaRepository { + + @Query("SELECT COALESCE(SUM(c.amount), 0) FROM CreditHistory c WHERE c.userId = :userId") + int sumAmountByUserId(@Param("userId") Long userId); + + boolean existsByUserIdAndCreditTypeAndReferenceId(Long userId, CreditType creditType, Long referenceId); +} diff --git a/src/main/java/com/swyp/app/domain/user/service/CreditService.java b/src/main/java/com/swyp/app/domain/user/service/CreditService.java new file mode 100644 index 00000000..a9c9ce3b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/service/CreditService.java @@ -0,0 +1,83 @@ +package com.swyp.app.domain.user.service; + +import com.swyp.app.domain.user.entity.CreditHistory; +import com.swyp.app.domain.user.entity.TierCode; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.enums.CreditType; +import com.swyp.app.domain.user.repository.CreditHistoryRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class CreditService { + + private final CreditHistoryRepository creditHistoryRepository; + private final UserService userService; + + /** + * 현재 로그인한 유저에게 크레딧 적립 (기본 포인트). + * 일반적인 유저 액션(투표, 관점 작성, 좋아요 등)에서 사용. + * 예: creditService.addCredit(CreditType.BATTLE_VOTE, voteId); + */ + @Transactional + public void addCredit(CreditType creditType, Long referenceId) { + User user = userService.findCurrentUser(); + addCredit(user.getId(), creditType, creditType.getDefaultAmount(), referenceId); + } + + /** + * 특정 유저에게 크레딧 적립 (기본 포인트). + * SecurityContext 없이 호출하는 경우(배치, 스케줄러, 관리자 지급 등)에서 사용. + * 예: creditService.addCredit(authorId, CreditType.BEST_COMMENT, perspectiveId); + */ + @Transactional + public void addCredit(Long userId, CreditType creditType, Long referenceId) { + addCredit(userId, creditType, creditType.getDefaultAmount(), referenceId); + } + + /** + * 특정 유저에게 커스텀 포인트로 크레딧 적립. + * CreditType의 기본 포인트가 아닌 가변 포인트가 필요한 경우(FREE_CHARGE 랜덤 박스 등)에서 사용. + * 예: creditService.addCredit(userId, CreditType.FREE_CHARGE, 15, boxId); + */ + @Transactional + public void addCredit(Long userId, CreditType creditType, int amount, Long referenceId) { + validateReferenceId(referenceId); + + CreditHistory history = CreditHistory.builder() + .userId(userId) + .creditType(creditType) + .amount(amount) + .referenceId(referenceId) + .build(); + + try { + creditHistoryRepository.saveAndFlush(history); + } catch (DataIntegrityViolationException e) { + if (creditHistoryRepository.existsByUserIdAndCreditTypeAndReferenceId(userId, creditType, referenceId)) { + return; + } + throw new CustomException(ErrorCode.CREDIT_SAVE_FAILED); + } + } + + public int getTotalPoints(Long userId) { + return creditHistoryRepository.sumAmountByUserId(userId); + } + + public TierCode getTier(Long userId) { + return TierCode.fromPoints(getTotalPoints(userId)); + } + + private void validateReferenceId(Long referenceId) { + if (referenceId == null) { + throw new CustomException(ErrorCode.CREDIT_REFERENCE_REQUIRED); + } + } +} diff --git a/src/main/java/com/swyp/app/domain/user/service/MypageService.java b/src/main/java/com/swyp/app/domain/user/service/MypageService.java new file mode 100644 index 00000000..9db9a2ea --- /dev/null +++ b/src/main/java/com/swyp/app/domain/user/service/MypageService.java @@ -0,0 +1,303 @@ +package com.swyp.app.domain.user.service; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; +import com.swyp.app.domain.battle.service.BattleQueryService; +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import com.swyp.app.domain.perspective.entity.PerspectiveLike; +import com.swyp.app.domain.perspective.service.PerspectiveQueryService; +import com.swyp.app.domain.user.dto.request.UpdateNotificationSettingsRequest; +import com.swyp.app.domain.user.dto.response.BattleRecordListResponse; +import com.swyp.app.domain.user.dto.response.ContentActivityListResponse; +import com.swyp.app.domain.user.dto.response.MypageResponse; +import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; +import com.swyp.app.domain.notice.enums.NoticePlacement; +import com.swyp.app.domain.notice.enums.NoticeType; +import com.swyp.app.domain.notice.service.NoticeService; +import com.swyp.app.domain.user.dto.response.NoticeDetailResponse; +import com.swyp.app.domain.user.dto.response.NoticeListResponse; +import com.swyp.app.domain.user.dto.response.NotificationSettingsResponse; +import com.swyp.app.domain.user.dto.response.RecapResponse; +import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.entity.ActivityType; +import com.swyp.app.domain.user.entity.CharacterType; +import com.swyp.app.domain.user.entity.PhilosopherType; +import com.swyp.app.domain.user.entity.TierCode; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserProfile; +import com.swyp.app.domain.user.entity.UserSettings; +import com.swyp.app.domain.user.entity.UserTendencyScore; +import com.swyp.app.domain.user.entity.VoteSide; +import com.swyp.app.domain.vote.entity.Vote; +import com.swyp.app.domain.vote.service.VoteQueryService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class MypageService { + + private static final int DEFAULT_PAGE_SIZE = 20; + + private final UserService userService; + private final NoticeService noticeService; + private final CreditService creditService; + private final VoteQueryService voteQueryService; + private final BattleQueryService battleQueryService; + private final PerspectiveQueryService perspectiveQueryService; + + public MypageResponse getMypage() { + User user = userService.findCurrentUser(); + UserProfile profile = userService.findUserProfile(user.getId()); + + MypageResponse.ProfileInfo profileInfo = new MypageResponse.ProfileInfo( + user.getUserTag(), + profile.getNickname(), + profile.getCharacterType(), + profile.getMannerTemperature() + ); + + // TODO: 철학자 산출 로직 확정 후 구현, 현재는 임시로 SOCRATES 반환 + MypageResponse.PhilosopherInfo philosopherInfo = new MypageResponse.PhilosopherInfo( + PhilosopherType.SOCRATES + ); + + int currentPoint = creditService.getTotalPoints(user.getId()); + TierCode tierCode = TierCode.fromPoints(currentPoint); + MypageResponse.TierInfo tierInfo = new MypageResponse.TierInfo( + tierCode, + tierCode.getLabel(), + currentPoint + ); + + return new MypageResponse(profileInfo, philosopherInfo, tierInfo); + } + + public RecapResponse getRecap() { + User user = userService.findCurrentUser(); + UserTendencyScore score = userService.findUserTendencyScore(user.getId()); + + // TODO: 철학자 산출 로직 확정 후 구현, 현재는 임시 값 반환 + RecapResponse.PhilosopherCard myCard = new RecapResponse.PhilosopherCard(PhilosopherType.SOCRATES); + RecapResponse.PhilosopherCard bestMatchCard = new RecapResponse.PhilosopherCard(PhilosopherType.PLATO); + RecapResponse.PhilosopherCard worstMatchCard = new RecapResponse.PhilosopherCard(PhilosopherType.MARX); + + RecapResponse.Scores scores = new RecapResponse.Scores( + score.getPrinciple(), + score.getReason(), + score.getIndividual(), + score.getChange(), + score.getInner(), + score.getIdeal() + ); + + RecapResponse.PreferenceReport preferenceReport = buildPreferenceReport(user.getId()); + + return new RecapResponse(myCard, bestMatchCard, worstMatchCard, scores, preferenceReport); + } + + private RecapResponse.PreferenceReport buildPreferenceReport(Long userId) { + long totalParticipation = voteQueryService.countTotalParticipation(userId); + long opinionChanges = voteQueryService.countOpinionChanges(userId); + int battleWinRate = voteQueryService.calculateBattleWinRate(userId); + + List battleIds = voteQueryService.findParticipatedBattleIds(userId); + Map topTags = battleQueryService.getTopTagsByBattleIds(battleIds, 4); + + List favoriteTopics = new ArrayList<>(); + int rank = 1; + for (Map.Entry entry : topTags.entrySet()) { + favoriteTopics.add(new RecapResponse.FavoriteTopic(rank++, entry.getKey(), entry.getValue().intValue())); + } + + return new RecapResponse.PreferenceReport( + (int) totalParticipation, + (int) opinionChanges, + battleWinRate, + favoriteTopics + ); + } + + public BattleRecordListResponse getBattleRecords(Integer offset, Integer size, VoteSide voteSide) { + User user = userService.findCurrentUser(); + int pageOffset = offset == null || offset < 0 ? 0 : offset; + int pageSize = size == null || size <= 0 ? DEFAULT_PAGE_SIZE : size; + + BattleOptionLabel label = voteSide != null ? toOptionLabel(voteSide) : null; + + List votes = voteQueryService.findUserVotes(user.getId(), pageOffset, pageSize, label); + long totalCount = voteQueryService.countUserVotes(user.getId(), label); + + List items = votes.stream() + .map(vote -> new BattleRecordListResponse.BattleRecordItem( + vote.getBattle().getId().toString(), + vote.getId().toString(), + toVoteSide(vote.getPreVoteOption().getLabel()), + vote.getBattle().getTitle(), + vote.getBattle().getSummary(), + vote.getCreatedAt() + )) + .toList(); + + int nextOffset = pageOffset + pageSize; + boolean hasNext = nextOffset < totalCount; + return new BattleRecordListResponse(items, hasNext ? nextOffset : null, hasNext); + } + + public ContentActivityListResponse getContentActivities(Integer offset, Integer size, ActivityType activityType) { + User user = userService.findCurrentUser(); + int pageOffset = offset == null || offset < 0 ? 0 : offset; + int pageSize = size == null || size <= 0 ? DEFAULT_PAGE_SIZE : size; + + if (activityType == ActivityType.LIKE) { + return buildLikeActivities(user, pageOffset, pageSize); + } + return buildCommentActivities(user, pageOffset, pageSize); + } + + private ContentActivityListResponse buildCommentActivities(User user, int pageOffset, int pageSize) { + List comments = perspectiveQueryService.findUserComments(user.getId(), pageOffset, pageSize); + long totalCount = perspectiveQueryService.countUserComments(user.getId()); + + List perspectives = comments.stream().map(PerspectiveComment::getPerspective).toList(); + Map battleMap = loadBattles(perspectives); + Map optionMap = loadOptions(perspectives); + + List items = comments.stream() + .map(comment -> { + Perspective p = comment.getPerspective(); + return toActivityItem(comment.getId().toString(), ActivityType.COMMENT, p, + battleMap.get(p.getBattleId()), optionMap.get(p.getOptionId()), + comment.getContent(), comment.getCreatedAt()); + }) + .toList(); + + int nextOffset = pageOffset + pageSize; + boolean hasNext = nextOffset < totalCount; + return new ContentActivityListResponse(items, hasNext ? nextOffset : null, hasNext); + } + + private ContentActivityListResponse buildLikeActivities(User user, int pageOffset, int pageSize) { + List likes = perspectiveQueryService.findUserLikes(user.getId(), pageOffset, pageSize); + long totalCount = perspectiveQueryService.countUserLikes(user.getId()); + + List perspectives = likes.stream().map(PerspectiveLike::getPerspective).toList(); + Map battleMap = loadBattles(perspectives); + Map optionMap = loadOptions(perspectives); + + List items = likes.stream() + .map(like -> { + Perspective p = like.getPerspective(); + return toActivityItem(like.getId().toString(), ActivityType.LIKE, p, + battleMap.get(p.getBattleId()), optionMap.get(p.getOptionId()), + p.getContent(), like.getCreatedAt()); + }) + .toList(); + + int nextOffset = pageOffset + pageSize; + boolean hasNext = nextOffset < totalCount; + return new ContentActivityListResponse(items, hasNext ? nextOffset : null, hasNext); + } + + private ContentActivityListResponse.ContentActivityItem toActivityItem( + String activityId, ActivityType activityType, Perspective perspective, + Battle battle, BattleOption option, String content, LocalDateTime createdAt) { + + UserSummary author = userService.findSummaryById(perspective.getUserId()); + ContentActivityListResponse.AuthorInfo authorInfo = new ContentActivityListResponse.AuthorInfo( + author.userTag(), author.nickname(), CharacterType.from(author.characterType()) + ); + + return new ContentActivityListResponse.ContentActivityItem( + activityId, activityType, + perspective.getId().toString(), + perspective.getBattleId().toString(), + battle != null ? battle.getTitle() : null, + authorInfo, + option != null ? option.getStance() : null, + content, + perspective.getLikeCount(), + createdAt + ); + } + + private Map loadBattles(List perspectives) { + List battleIds = perspectives.stream().map(Perspective::getBattleId).distinct().toList(); + return battleQueryService.findBattlesByIds(battleIds); + } + + private Map loadOptions(List perspectives) { + List optionIds = perspectives.stream().map(Perspective::getOptionId).distinct().toList(); + return battleQueryService.findOptionsByIds(optionIds); + } + + public NotificationSettingsResponse getNotificationSettings() { + User user = userService.findCurrentUser(); + UserSettings settings = userService.findUserSettings(user.getId()); + return toNotificationSettingsResponse(settings); + } + + @Transactional + public NotificationSettingsResponse updateNotificationSettings(UpdateNotificationSettingsRequest request) { + User user = userService.findCurrentUser(); + UserSettings settings = userService.findUserSettings(user.getId()); + settings.update( + request.newBattleEnabled(), + request.battleResultEnabled(), + request.commentReplyEnabled(), + request.newCommentEnabled(), + request.contentLikeEnabled(), + request.marketingEventEnabled() + ); + return toNotificationSettingsResponse(settings); + } + + public NoticeListResponse getNotices(NoticeType type) { + List notices = noticeService.getActiveNotices( + NoticePlacement.NOTICE_BOARD, type, null + ); + + List items = notices.stream() + .map(notice -> new NoticeListResponse.NoticeItem( + notice.noticeId(), notice.type(), notice.title(), + notice.body(), notice.pinned(), notice.startsAt() + )) + .toList(); + + return new NoticeListResponse(items); + } + + public NoticeDetailResponse getNoticeDetail(Long noticeId) { + com.swyp.app.domain.notice.dto.response.NoticeDetailResponse notice = + noticeService.getNoticeDetail(noticeId); + return new NoticeDetailResponse( + notice.noticeId(), notice.type(), notice.title(), + notice.body(), notice.pinned(), notice.startsAt() + ); + } + + private VoteSide toVoteSide(BattleOptionLabel label) { + return label == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; + } + + private BattleOptionLabel toOptionLabel(VoteSide voteSide) { + return voteSide == VoteSide.PRO ? BattleOptionLabel.A : BattleOptionLabel.B; + } + + private NotificationSettingsResponse toNotificationSettingsResponse(UserSettings settings) { + return new NotificationSettingsResponse( + settings.isNewBattleEnabled(), settings.isBattleResultEnabled(), + settings.isCommentReplyEnabled(), settings.isNewCommentEnabled(), + settings.isContentLikeEnabled(), settings.isMarketingEventEnabled() + ); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/service/UserService.java b/src/main/java/com/swyp/app/domain/user/service/UserService.java index b9411553..6275bad0 100644 --- a/src/main/java/com/swyp/app/domain/user/service/UserService.java +++ b/src/main/java/com/swyp/app/domain/user/service/UserService.java @@ -1,138 +1,31 @@ package com.swyp.app.domain.user.service; -import com.swyp.app.domain.user.dto.request.CreateOnboardingProfileRequest; -import com.swyp.app.domain.user.dto.request.UpdateTendencyScoreRequest; import com.swyp.app.domain.user.dto.request.UpdateUserProfileRequest; -import com.swyp.app.domain.user.dto.request.UpdateUserSettingsRequest; -import com.swyp.app.domain.user.dto.response.BootstrapResponse; import com.swyp.app.domain.user.dto.response.MyProfileResponse; -import com.swyp.app.domain.user.dto.response.OnboardingProfileResponse; -import com.swyp.app.domain.user.dto.response.TendencyScoreHistoryItemResponse; -import com.swyp.app.domain.user.dto.response.TendencyScoreHistoryResponse; -import com.swyp.app.domain.user.dto.response.TendencyScoreResponse; -import com.swyp.app.domain.user.dto.response.UpdateResultResponse; -import com.swyp.app.domain.user.dto.response.UserProfileResponse; -import com.swyp.app.domain.user.dto.response.UserSettingsResponse; import com.swyp.app.domain.user.dto.response.UserSummary; -import com.swyp.app.domain.user.entity.AgreementType; import com.swyp.app.domain.user.entity.User; -import com.swyp.app.domain.user.entity.UserAgreement; import com.swyp.app.domain.user.entity.UserProfile; -import com.swyp.app.domain.user.entity.UserRole; import com.swyp.app.domain.user.entity.UserSettings; -import com.swyp.app.domain.user.entity.UserStatus; import com.swyp.app.domain.user.entity.UserTendencyScore; -import com.swyp.app.domain.user.entity.UserTendencyScoreHistory; import com.swyp.app.domain.user.repository.UserProfileRepository; -import com.swyp.app.domain.user.repository.UserAgreementRepository; import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.domain.user.repository.UserSettingsRepository; -import com.swyp.app.domain.user.repository.UserTendencyScoreHistoryRepository; import com.swyp.app.domain.user.repository.UserTendencyScoreRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.concurrent.ThreadLocalRandom; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class UserService { - private static final String[] PREFIXES = {"생각하는", "집중하는", "차분한", "기민한", "용감한", "명확한"}; - private static final String[] SUFFIXES = {"올빼미", "여우", "늑대", "사자", "펭귄", "토끼", "고양이", "곰"}; - private static final BigDecimal DEFAULT_MANNER_TEMPERATURE = BigDecimal.valueOf(36.5); - private static final int DEFAULT_HISTORY_SIZE = 20; - private static final String DEFAULT_AGREEMENT_VERSION = "1.0"; - private static final String USER_TAG_CHARACTERS = "abcdefghijklmnopqrstuvwxyz0123456789"; - private static final int USER_TAG_LENGTH = 8; - private final UserRepository userRepository; - private final UserAgreementRepository userAgreementRepository; private final UserProfileRepository userProfileRepository; private final UserSettingsRepository userSettingsRepository; private final UserTendencyScoreRepository userTendencyScoreRepository; - private final UserTendencyScoreHistoryRepository userTendencyScoreHistoryRepository; - - public BootstrapResponse getBootstrap() { - return new BootstrapResponse(generateRandomNickname()); - } - - @Transactional - public OnboardingProfileResponse createOnboardingProfile(CreateOnboardingProfileRequest request) { - User user = userRepository.findTopByOrderByIdDesc() - .orElseGet(this::createPendingUser); - - if (user.isOnboardingCompleted()) { - throw new CustomException(ErrorCode.ONBOARDING_ALREADY_COMPLETED); - } - - UserProfile profile = UserProfile.builder() - .user(user) - .nickname(request.nickname()) - .characterType(request.characterType()) - .mannerTemperature(DEFAULT_MANNER_TEMPERATURE) - .build(); - - UserSettings settings = UserSettings.builder() - .user(user) - .pushEnabled(false) - .emailEnabled(false) - .debateRequestEnabled(false) - .profilePublic(false) - .build(); - - UserTendencyScore tendencyScore = UserTendencyScore.builder() - .user(user) - .score1(0) - .score2(0) - .score3(0) - .score4(0) - .score5(0) - .score6(0) - .build(); - - userProfileRepository.save(profile); - userSettingsRepository.save(settings); - userTendencyScoreRepository.save(tendencyScore); - saveRequiredAgreements(user); - - user.completeOnboarding(); - - return new OnboardingProfileResponse( - user.getUserTag(), - profile.getNickname(), - profile.getCharacterType(), - profile.getMannerTemperature(), - user.getStatus(), - user.isOnboardingCompleted() - ); - } - - public UserProfileResponse getUserProfile(String userTag) { - User user = findUserByTag(userTag); - UserProfile profile = findUserProfile(user.getId()); - return new UserProfileResponse(user.getUserTag(), profile.getNickname(), profile.getCharacterType(), profile.getMannerTemperature()); - } - - public MyProfileResponse getMyProfile() { - User user = findCurrentUser(); - UserProfile profile = findUserProfile(user.getId()); - return new MyProfileResponse( - user.getUserTag(), - profile.getNickname(), - profile.getCharacterType(), - profile.getMannerTemperature(), - profile.getUpdatedAt() - ); - } @Transactional public MyProfileResponse updateMyProfile(UpdateUserProfileRequest request) { @@ -143,95 +36,10 @@ public MyProfileResponse updateMyProfile(UpdateUserProfileRequest request) { user.getUserTag(), profile.getNickname(), profile.getCharacterType(), - profile.getMannerTemperature(), profile.getUpdatedAt() ); } - public UserSettingsResponse getMySettings() { - UserSettings settings = findUserSettings(findCurrentUser().getId()); - return new UserSettingsResponse( - settings.isPushEnabled(), - settings.isEmailEnabled(), - settings.isDebateRequestEnabled(), - settings.isProfilePublic() - ); - } - - @Transactional - public UpdateResultResponse updateMySettings(UpdateUserSettingsRequest request) { - UserSettings settings = findUserSettings(findCurrentUser().getId()); - settings.update( - request.pushEnabled(), - request.emailEnabled(), - request.debateRequestEnabled(), - request.profilePublic() - ); - return new UpdateResultResponse(true); - } - - @Transactional - public TendencyScoreResponse updateMyTendencyScores(UpdateTendencyScoreRequest request) { - User user = findCurrentUser(); - UserTendencyScore score = findUserTendencyScore(user.getId()); - score.update( - request.score1(), - request.score2(), - request.score3(), - request.score4(), - request.score5(), - request.score6() - ); - - userTendencyScoreHistoryRepository.save(UserTendencyScoreHistory.builder() - .user(user) - .score1(request.score1()) - .score2(request.score2()) - .score3(request.score3()) - .score4(request.score4()) - .score5(request.score5()) - .score6(request.score6()) - .build()); - - return new TendencyScoreResponse( - user.getUserTag(), - score.getScore1(), - score.getScore2(), - score.getScore3(), - score.getScore4(), - score.getScore5(), - score.getScore6(), - score.getUpdatedAt(), - true - ); - } - - public TendencyScoreHistoryResponse getMyTendencyScoreHistory(Long cursor, Integer size) { - User user = findCurrentUser(); - int pageSize = size == null || size <= 0 ? DEFAULT_HISTORY_SIZE : size; - PageRequest pageable = PageRequest.of(0, pageSize); - - List histories = cursor == null - ? userTendencyScoreHistoryRepository.findByUserOrderByIdDesc(user, pageable) - : userTendencyScoreHistoryRepository.findByUserAndIdLessThanOrderByIdDesc(user, cursor, pageable); - - List items = histories.stream() - .map(history -> new TendencyScoreHistoryItemResponse( - history.getId(), - history.getScore1(), - history.getScore2(), - history.getScore3(), - history.getScore4(), - history.getScore5(), - history.getScore6(), - history.getCreatedAt() - )) - .toList(); - - Long nextCursor = histories.size() == pageSize ? histories.get(histories.size() - 1).getId() : null; - return new TendencyScoreHistoryResponse(items, nextCursor); - } - public UserSummary findSummaryById(Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); @@ -239,74 +47,23 @@ public UserSummary findSummaryById(Long userId) { return new UserSummary(user.getUserTag(), profile.getNickname(), profile.getCharacterType().name()); } - private User findUserByTag(String userTag) { - return userRepository.findByUserTag(userTag) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - } - - private User findCurrentUser() { + public User findCurrentUser() { return userRepository.findTopByOrderByIdDesc() .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } - private User createPendingUser() { - User user = User.builder() - .userTag(generateUserTag()) - .role(UserRole.USER) - .status(UserStatus.PENDING) - .onboardingCompleted(false) - .build(); - return userRepository.save(user); - } - - private void saveRequiredAgreements(User user) { - LocalDateTime agreedAt = LocalDateTime.now(); - userAgreementRepository.saveAll(List.of( - UserAgreement.builder() - .user(user) - .agreementType(AgreementType.TERMS_OF_SERVICE) - .version(DEFAULT_AGREEMENT_VERSION) - .agreedAt(agreedAt) - .build(), - UserAgreement.builder() - .user(user) - .agreementType(AgreementType.PRIVACY_POLICY) - .version(DEFAULT_AGREEMENT_VERSION) - .agreedAt(agreedAt) - .build() - )); - } - - private UserProfile findUserProfile(Long userId) { + public UserProfile findUserProfile(Long userId) { return userProfileRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } - private UserSettings findUserSettings(Long userId) { + public UserSettings findUserSettings(Long userId) { return userSettingsRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } - private UserTendencyScore findUserTendencyScore(Long userId) { + public UserTendencyScore findUserTendencyScore(Long userId) { return userTendencyScoreRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } - - private String generateRandomNickname() { - return PREFIXES[ThreadLocalRandom.current().nextInt(PREFIXES.length)] - + SUFFIXES[ThreadLocalRandom.current().nextInt(SUFFIXES.length)]; - } - - private String generateUserTag() { - String candidate; - do { - StringBuilder builder = new StringBuilder(USER_TAG_LENGTH); - for (int i = 0; i < USER_TAG_LENGTH; i++) { - int index = ThreadLocalRandom.current().nextInt(USER_TAG_CHARACTERS.length()); - builder.append(USER_TAG_CHARACTERS.charAt(index)); - } - candidate = builder.toString(); - } while (userRepository.existsByUserTag(candidate)); - return candidate; - } } diff --git a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java index 99c9a18a..086be02a 100644 --- a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java +++ b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java @@ -2,10 +2,15 @@ import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.vote.entity.Vote; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.util.List; import java.util.Optional; public interface VoteRepository extends JpaRepository { @@ -21,4 +26,33 @@ public interface VoteRepository extends JpaRepository { long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); -} \ No newline at end of file + + // MypageService: 사용자 투표 기록 조회 (offset 페이지네이션) + @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + "WHERE v.userId = :userId ORDER BY v.createdAt DESC") + List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); + + // MypageService: 사용자 투표 기록 - voteSide(PRO/CON) 필터 + @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + "WHERE v.userId = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") + List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( + @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); + + // MypageService: 사용자 투표 전체 수 + long countByUserId(Long userId); + + // MypageService: 사용자 투표 수 - voteSide 필터 + @Query("SELECT COUNT(v) FROM Vote v WHERE v.userId = :userId AND v.preVoteOption.label = :label") + long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); + + // MypageService (recap): 사후 투표 완료 수 + long countByUserIdAndStatus(Long userId, com.swyp.app.domain.vote.enums.VoteStatus status); + + // MypageService (recap): 입장 변경 수 (사전/사후 투표 옵션이 다른 경우) + @Query("SELECT COUNT(v) FROM Vote v WHERE v.userId = :userId AND v.status = 'POST_VOTED' " + + "AND v.preVoteOption <> v.postVoteOption") + long countOpinionChangesByUserId(@Param("userId") Long userId); + + // MypageService (recap): 사용자가 참여한 모든 투표 (배틀 목록 추출용) + List findByUserId(Long userId); +} diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java b/src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java new file mode 100644 index 00000000..72509196 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java @@ -0,0 +1,71 @@ +package com.swyp.app.domain.vote.service; + +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; +import com.swyp.app.domain.vote.entity.Vote; +import com.swyp.app.domain.vote.enums.VoteStatus; +import com.swyp.app.domain.vote.repository.VoteRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class VoteQueryService { + + private final VoteRepository voteRepository; + + public List findUserVotes(Long userId, int offset, int size, BattleOptionLabel label) { + PageRequest pageable = PageRequest.of(offset / size, size); + return label != null + ? voteRepository.findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc(userId, label, pageable) + : voteRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); + } + + public long countUserVotes(Long userId, BattleOptionLabel label) { + return label != null + ? voteRepository.countByUserIdAndPreVoteOptionLabel(userId, label) + : voteRepository.countByUserId(userId); + } + + public long countTotalParticipation(Long userId) { + return voteRepository.countByUserId(userId); + } + + public long countOpinionChanges(Long userId) { + return voteRepository.countOpinionChangesByUserId(userId); + } + + public int calculateBattleWinRate(Long userId) { + List postVotes = voteRepository.findByUserId(userId).stream() + .filter(v -> v.getStatus() == VoteStatus.POST_VOTED && v.getPostVoteOption() != null) + .toList(); + + if (postVotes.isEmpty()) return 0; + + long wins = postVotes.stream() + .filter(v -> { + BattleOption myOption = v.getPostVoteOption(); + BattleOption otherOption = v.getPreVoteOption(); + if (myOption.getId().equals(otherOption.getId())) { + long totalVotes = v.getBattle().getTotalParticipantsCount(); + return myOption.getVoteCount() > totalVotes - myOption.getVoteCount(); + } + return myOption.getVoteCount() > otherOption.getVoteCount(); + }) + .count(); + + return (int) (wins * 100 / postVotes.size()); + } + + public List findParticipatedBattleIds(Long userId) { + return voteRepository.findByUserId(userId).stream() + .map(v -> v.getBattle().getId()) + .distinct() + .toList(); + } +} diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 8f32a9a7..5b895f11 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -33,6 +33,10 @@ public enum ErrorCode { USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 사용자입니다."), ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "USER_409", "이미 온보딩이 완료된 사용자입니다."), + // Credit + CREDIT_REFERENCE_REQUIRED(HttpStatus.BAD_REQUEST, "CREDIT_400_REF", "크레딧 적립 referenceId는 필수입니다."), + CREDIT_SAVE_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "CREDIT_500_SAVE", "크레딧 적립 처리 중 오류가 발생했습니다."), + // OAuth (Social Login) INVALID_PROVIDER(HttpStatus.BAD_REQUEST, "AUTH_400_PROVIDER", "지원하지 않는 소셜 로그인 provider입니다."), diff --git a/src/main/java/com/swyp/app/global/config/SecurityConfig.java b/src/main/java/com/swyp/app/global/config/SecurityConfig.java index be902b6b..ae11cd1b 100644 --- a/src/main/java/com/swyp/app/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/app/global/config/SecurityConfig.java @@ -31,6 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .authorizeHttpRequests(auth -> auth .requestMatchers( "/", "/api/v1/auth/**", "/api/v1/home", + "/api/v1/notices/**", "/swagger-ui/**", "/v3/api-docs/**", "/js/**", "/css/**", "/images/**", "/favicon.ico", "/api/v1/admin/login", "/api/v1/admin" @@ -51,4 +52,4 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http.build(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java b/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java index 276d4e7d..e7e3403a 100644 --- a/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java +++ b/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java @@ -9,6 +9,7 @@ import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; import com.swyp.app.domain.notice.enums.NoticePlacement; import com.swyp.app.domain.notice.service.NoticeService; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -45,7 +46,8 @@ private Long generateId() { } @Test - void getHome_명세기준으로_섹션별_데이터를_조합한다() { + @DisplayName("명세기준으로 섹션별 데이터를 조합한다") + void getHome_aggregates_sections_by_spec() { TodayBattleResponse editorPick = battle("editor-id", BATTLE); TodayBattleResponse trendingBattle = battle("trending-id", BATTLE); TodayBattleResponse bestBattle = battle("best-id", BATTLE); @@ -99,7 +101,8 @@ private Long generateId() { } @Test - void getHome_데이터가_없으면_false와_빈리스트를_반환한다() { + @DisplayName("데이터가 없으면 false와 빈리스트를 반환한다") + void getHome_returns_false_and_empty_lists_when_no_data() { when(noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, 1)).thenReturn(List.of()); when(battleService.getEditorPicks()).thenReturn(List.of()); when(battleService.getTrendingBattles()).thenReturn(List.of()); @@ -118,6 +121,45 @@ private Long generateId() { assertThat(response.newBattles()).isEmpty(); } + @Test + @DisplayName("에디터픽만 있을때 제외목록이 정확하다") + void getHome_excludes_only_editor_pick_ids() { + TodayBattleResponse editorPick = battle("editor-only", BATTLE); + + when(noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, 1)).thenReturn(List.of()); + when(battleService.getEditorPicks()).thenReturn(List.of(editorPick)); + when(battleService.getTrendingBattles()).thenReturn(List.of()); + when(battleService.getBestBattles()).thenReturn(List.of()); + when(battleService.getTodayPicks(VOTE)).thenReturn(List.of()); + when(battleService.getTodayPicks(QUIZ)).thenReturn(List.of()); + when(battleService.getNewBattles(List.of(editorPick.battleId()))).thenReturn(List.of()); + + homeService.getHome(); + + verify(battleService).getNewBattles(List.of(editorPick.battleId())); + } + + @Test + @DisplayName("공지가 여러개여도 newNotice는 true이다") + void getHome_newNotice_true_with_multiple_notices() { + NoticeSummaryResponse notice1 = new NoticeSummaryResponse( + generateId(), "notice1", "body1", null, + NoticePlacement.HOME_TOP, true, LocalDateTime.now().minusDays(1), null + ); + + when(noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, 1)).thenReturn(List.of(notice1)); + when(battleService.getEditorPicks()).thenReturn(List.of()); + when(battleService.getTrendingBattles()).thenReturn(List.of()); + when(battleService.getBestBattles()).thenReturn(List.of()); + when(battleService.getTodayPicks(VOTE)).thenReturn(List.of()); + when(battleService.getTodayPicks(QUIZ)).thenReturn(List.of()); + when(battleService.getNewBattles(List.of())).thenReturn(List.of()); + + var response = homeService.getHome(); + + assertThat(response.newNotice()).isTrue(); + } + private TodayBattleResponse battle(String title, BattleType type) { return new TodayBattleResponse( generateId(), diff --git a/src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java b/src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java index b503994a..6f5d1963 100644 --- a/src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java +++ b/src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java @@ -5,6 +5,7 @@ import com.swyp.app.domain.notice.enums.NoticeType; import com.swyp.app.domain.notice.repository.NoticeRepository; import com.swyp.app.global.common.exception.CustomException; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -32,7 +33,8 @@ class NoticeServiceTest { private NoticeService noticeService; @Test - void getNoticeList_활성공지_목록을_개수와_함께_반환한다() { + @DisplayName("활성공지 목록을 개수와 함께 반환한다") + void getNoticeList_returns_active_notices_with_count() { Notice notice = Notice.builder() .title("공지") .body("내용") @@ -54,7 +56,8 @@ class NoticeServiceTest { } @Test - void getNoticeDetail_활성공지가_없으면_예외를_던진다() { + @DisplayName("활성공지가 없으면 예외를 던진다") + void getNoticeDetail_throws_when_no_active_notice() { Long noticeId = 1L; when(noticeRepository.findActiveById(eq(noticeId), any(LocalDateTime.class))).thenReturn(Optional.empty()); diff --git a/src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java new file mode 100644 index 00000000..a82f810d --- /dev/null +++ b/src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java @@ -0,0 +1,105 @@ +package com.swyp.app.domain.user.service; + +import com.swyp.app.domain.user.entity.CreditHistory; +import com.swyp.app.domain.user.entity.TierCode; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.enums.CreditType; +import com.swyp.app.domain.user.repository.CreditHistoryRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.dao.DataIntegrityViolationException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class CreditServiceTest { + + @Mock + private CreditHistoryRepository creditHistoryRepository; + + @Mock + private UserService userService; + + @InjectMocks + private CreditService creditService; + + @Test + @DisplayName("현재 로그인 유저에게 기본 크레딧을 적립한다") + void addCredit_forCurrentUser_savesDefaultAmount() { + User user = org.mockito.Mockito.mock(User.class); + when(user.getId()).thenReturn(1L); + when(userService.findCurrentUser()).thenReturn(user); + + creditService.addCredit(CreditType.BATTLE_VOTE, 10L); + + ArgumentCaptor captor = ArgumentCaptor.forClass(CreditHistory.class); + verify(creditHistoryRepository).saveAndFlush(captor.capture()); + + CreditHistory saved = captor.getValue(); + assertThat(saved.getUserId()).isEqualTo(1L); + assertThat(saved.getCreditType()).isEqualTo(CreditType.BATTLE_VOTE); + assertThat(saved.getAmount()).isEqualTo(CreditType.BATTLE_VOTE.getDefaultAmount()); + assertThat(saved.getReferenceId()).isEqualTo(10L); + } + + @Test + @DisplayName("referenceId가 없으면 적립을 거부한다") + void addCredit_withoutReferenceId_throwsException() { + assertThatThrownBy(() -> creditService.addCredit(1L, CreditType.BATTLE_VOTE, 10, null)) + .isInstanceOf(CustomException.class) + .extracting("errorCode") + .isEqualTo(ErrorCode.CREDIT_REFERENCE_REQUIRED); + + verify(creditHistoryRepository, never()).saveAndFlush(any()); + } + + @Test + @DisplayName("중복 적립 충돌이면 조용히 무시한다") + void addCredit_duplicateInsert_ignoresConflict() { + when(creditHistoryRepository.saveAndFlush(any(CreditHistory.class))) + .thenThrow(new DataIntegrityViolationException("duplicate")); + when(creditHistoryRepository.existsByUserIdAndCreditTypeAndReferenceId(1L, CreditType.BATTLE_VOTE, 10L)) + .thenReturn(true); + + creditService.addCredit(1L, CreditType.BATTLE_VOTE, 10, 10L); + + verify(creditHistoryRepository).existsByUserIdAndCreditTypeAndReferenceId(1L, CreditType.BATTLE_VOTE, 10L); + } + + @Test + @DisplayName("중복이 아닌 데이터 무결성 오류는 그대로 던진다") + void addCredit_nonDuplicateIntegrityFailure_rethrows() { + when(creditHistoryRepository.saveAndFlush(any(CreditHistory.class))) + .thenThrow(new DataIntegrityViolationException("broken")); + when(creditHistoryRepository.existsByUserIdAndCreditTypeAndReferenceId(1L, CreditType.BATTLE_VOTE, 10L)) + .thenReturn(false); + + assertThatThrownBy(() -> creditService.addCredit(1L, CreditType.BATTLE_VOTE, 10, 10L)) + .isInstanceOf(CustomException.class) + .extracting("errorCode") + .isEqualTo(ErrorCode.CREDIT_SAVE_FAILED); + } + + @Test + @DisplayName("누적 포인트로 티어를 계산한다") + void getTier_returnsTierFromTotalPoints() { + when(creditHistoryRepository.sumAmountByUserId(eq(1L))).thenReturn(2_500); + + TierCode tier = creditService.getTier(1L); + + assertThat(tier).isEqualTo(TierCode.SAGE); + } +} diff --git a/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java new file mode 100644 index 00000000..617a27bc --- /dev/null +++ b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java @@ -0,0 +1,450 @@ +package com.swyp.app.domain.user.service; + +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; +import com.swyp.app.domain.battle.enums.BattleStatus; +import com.swyp.app.domain.battle.enums.BattleType; +import com.swyp.app.domain.battle.service.BattleQueryService; +import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; +import com.swyp.app.domain.notice.enums.NoticePlacement; +import com.swyp.app.domain.notice.enums.NoticeType; +import com.swyp.app.domain.notice.service.NoticeService; +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import com.swyp.app.domain.perspective.entity.PerspectiveLike; +import com.swyp.app.domain.perspective.service.PerspectiveQueryService; +import com.swyp.app.domain.user.dto.request.UpdateNotificationSettingsRequest; +import com.swyp.app.domain.user.dto.response.BattleRecordListResponse; +import com.swyp.app.domain.user.dto.response.ContentActivityListResponse; +import com.swyp.app.domain.user.dto.response.MypageResponse; +import com.swyp.app.domain.user.dto.response.NoticeDetailResponse; +import com.swyp.app.domain.user.dto.response.NoticeListResponse; +import com.swyp.app.domain.user.dto.response.NotificationSettingsResponse; +import com.swyp.app.domain.user.dto.response.RecapResponse; +import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.entity.ActivityType; +import com.swyp.app.domain.user.entity.CharacterType; +import com.swyp.app.domain.user.entity.PhilosopherType; +import com.swyp.app.domain.user.entity.TierCode; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserProfile; +import com.swyp.app.domain.user.entity.UserRole; +import com.swyp.app.domain.user.entity.UserSettings; +import com.swyp.app.domain.user.entity.UserStatus; +import com.swyp.app.domain.user.entity.UserTendencyScore; +import com.swyp.app.domain.user.entity.VoteSide; +import com.swyp.app.domain.vote.entity.Vote; +import com.swyp.app.domain.vote.service.VoteQueryService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class MypageServiceTest { + + @Mock + private UserService userService; + @Mock + private NoticeService noticeService; + @Mock + private CreditService creditService; + @Mock + private VoteQueryService voteQueryService; + @Mock + private BattleQueryService battleQueryService; + @Mock + private PerspectiveQueryService perspectiveQueryService; + + @InjectMocks + private MypageService mypageService; + + private final AtomicLong idGenerator = new AtomicLong(100L); + + private Long generateId() { + return idGenerator.getAndIncrement(); + } + + @Test + @DisplayName("프로필, 철학자, 티어 정보를 반환한다") + void getMypage_returns_profile_philosopher_tier() { + User user = createUser(1L, "myTag"); + UserProfile profile = createProfile(user, "nick", CharacterType.OWL); + + when(userService.findCurrentUser()).thenReturn(user); + when(userService.findUserProfile(1L)).thenReturn(profile); + when(creditService.getTotalPoints(1L)).thenReturn(0); + + MypageResponse response = mypageService.getMypage(); + + assertThat(response.profile().userTag()).isEqualTo("myTag"); + assertThat(response.profile().nickname()).isEqualTo("nick"); + assertThat(response.profile().characterType()).isEqualTo(CharacterType.OWL); + assertThat(response.profile().mannerTemperature()).isEqualByComparingTo(BigDecimal.valueOf(36.5)); + assertThat(response.philosopher().philosopherType()).isEqualTo(PhilosopherType.SOCRATES); + assertThat(response.tier().tierCode()).isEqualTo(TierCode.WANDERER); + assertThat(response.tier().currentPoint()).isZero(); + } + + @Test + @DisplayName("철학자카드와 성향점수와 선호보고서를 반환한다") + void getRecap_returns_cards_scores_report() { + User user = createUser(1L, "tag"); + UserTendencyScore score = UserTendencyScore.builder() + .user(user) + .principle(10).reason(20).individual(30) + .change(40).inner(50).ideal(60) + .build(); + + when(userService.findCurrentUser()).thenReturn(user); + when(userService.findUserTendencyScore(1L)).thenReturn(score); + when(voteQueryService.countTotalParticipation(1L)).thenReturn(15L); + when(voteQueryService.countOpinionChanges(1L)).thenReturn(3L); + when(voteQueryService.calculateBattleWinRate(1L)).thenReturn(70); + + List battleIds = List.of(generateId()); + when(voteQueryService.findParticipatedBattleIds(1L)).thenReturn(battleIds); + + LinkedHashMap topTags = new LinkedHashMap<>(); + topTags.put("정치", 5L); + topTags.put("경제", 3L); + when(battleQueryService.getTopTagsByBattleIds(battleIds, 4)).thenReturn(topTags); + + RecapResponse response = mypageService.getRecap(); + + assertThat(response.myCard().philosopherType()).isEqualTo(PhilosopherType.SOCRATES); + assertThat(response.bestMatchCard().philosopherType()).isEqualTo(PhilosopherType.PLATO); + assertThat(response.worstMatchCard().philosopherType()).isEqualTo(PhilosopherType.MARX); + assertThat(response.scores().principle()).isEqualTo(10); + assertThat(response.scores().ideal()).isEqualTo(60); + assertThat(response.preferenceReport().totalParticipation()).isEqualTo(15); + assertThat(response.preferenceReport().opinionChanges()).isEqualTo(3); + assertThat(response.preferenceReport().battleWinRate()).isEqualTo(70); + assertThat(response.preferenceReport().favoriteTopics()).hasSize(2); + assertThat(response.preferenceReport().favoriteTopics().get(0).tagName()).isEqualTo("정치"); + } + + @Test + @DisplayName("투표이력이 없으면 선호보고서가 0값이다") + void getRecap_returns_zero_report_when_no_votes() { + User user = createUser(1L, "tag"); + UserTendencyScore score = UserTendencyScore.builder() + .user(user) + .principle(0).reason(0).individual(0) + .change(0).inner(0).ideal(0) + .build(); + + when(userService.findCurrentUser()).thenReturn(user); + when(userService.findUserTendencyScore(1L)).thenReturn(score); + when(voteQueryService.countTotalParticipation(1L)).thenReturn(0L); + when(voteQueryService.countOpinionChanges(1L)).thenReturn(0L); + when(voteQueryService.calculateBattleWinRate(1L)).thenReturn(0); + when(voteQueryService.findParticipatedBattleIds(1L)).thenReturn(List.of()); + when(battleQueryService.getTopTagsByBattleIds(List.of(), 4)).thenReturn(new LinkedHashMap<>()); + + RecapResponse response = mypageService.getRecap(); + + assertThat(response.preferenceReport().totalParticipation()).isZero(); + assertThat(response.preferenceReport().opinionChanges()).isZero(); + assertThat(response.preferenceReport().battleWinRate()).isZero(); + assertThat(response.preferenceReport().favoriteTopics()).isEmpty(); + } + + @Test + @DisplayName("투표기록을 페이지네이션하여 반환한다") + void getBattleRecords_returns_paginated_records() { + User user = createUser(1L, "tag"); + Battle battle = createBattle("배틀 제목"); + BattleOption optionA = createOption(battle, BattleOptionLabel.A); + Vote vote = Vote.builder() + .userId(1L) + .battle(battle) + .preVoteOption(optionA) + .build(); + ReflectionTestUtils.setField(vote, "id", generateId()); + ReflectionTestUtils.setField(vote, "createdAt", LocalDateTime.now()); + + when(userService.findCurrentUser()).thenReturn(user); + when(voteQueryService.findUserVotes(1L, 0, 2, null)).thenReturn(List.of(vote)); + when(voteQueryService.countUserVotes(1L, null)).thenReturn(5L); + + BattleRecordListResponse response = mypageService.getBattleRecords(0, 2, null); + + assertThat(response.items()).hasSize(1); + assertThat(response.items().get(0).voteSide()).isEqualTo(VoteSide.PRO); + assertThat(response.hasNext()).isTrue(); + assertThat(response.nextOffset()).isEqualTo(2); + } + + @Test + @DisplayName("다음페이지가 없으면 hasNext가 false이다") + void getBattleRecords_returns_no_next_when_last_page() { + User user = createUser(1L, "tag"); + Battle battle = createBattle("제목"); + BattleOption optionA = createOption(battle, BattleOptionLabel.A); + Vote vote = Vote.builder() + .userId(1L) + .battle(battle) + .preVoteOption(optionA) + .build(); + ReflectionTestUtils.setField(vote, "id", generateId()); + ReflectionTestUtils.setField(vote, "createdAt", LocalDateTime.now()); + + when(userService.findCurrentUser()).thenReturn(user); + when(voteQueryService.findUserVotes(1L, 0, 20, null)).thenReturn(List.of(vote)); + when(voteQueryService.countUserVotes(1L, null)).thenReturn(1L); + + BattleRecordListResponse response = mypageService.getBattleRecords(null, null, null); + + assertThat(response.hasNext()).isFalse(); + assertThat(response.nextOffset()).isNull(); + } + + @Test + @DisplayName("voteSide 필터가 적용된다") + void getBattleRecords_applies_vote_side_filter() { + User user = createUser(1L, "tag"); + + when(userService.findCurrentUser()).thenReturn(user); + when(voteQueryService.findUserVotes(1L, 0, 20, BattleOptionLabel.A)).thenReturn(List.of()); + when(voteQueryService.countUserVotes(1L, BattleOptionLabel.A)).thenReturn(0L); + + mypageService.getBattleRecords(null, null, VoteSide.PRO); + + verify(voteQueryService).findUserVotes(eq(1L), eq(0), eq(20), eq(BattleOptionLabel.A)); + } + + @Test + @DisplayName("COMMENT 타입으로 댓글활동을 반환한다") + void getContentActivities_returns_comments() { + User user = createUser(1L, "tag"); + Long battleId = generateId(); + Long optionId = generateId(); + Perspective perspective = Perspective.builder() + .battleId(battleId) + .userId(1L) + .optionId(optionId) + .content("관점 내용") + .build(); + ReflectionTestUtils.setField(perspective, "id", generateId()); + + PerspectiveComment comment = PerspectiveComment.builder() + .perspective(perspective) + .userId(1L) + .content("댓글") + .build(); + ReflectionTestUtils.setField(comment, "id", generateId()); + ReflectionTestUtils.setField(comment, "createdAt", LocalDateTime.now()); + + Battle battle = createBattle("배틀"); + ReflectionTestUtils.setField(battle, "id", battleId); + BattleOption option = createOption(battle, BattleOptionLabel.A); + ReflectionTestUtils.setField(option, "id", optionId); + + when(userService.findCurrentUser()).thenReturn(user); + when(perspectiveQueryService.findUserComments(1L, 0, 20)).thenReturn(List.of(comment)); + when(perspectiveQueryService.countUserComments(1L)).thenReturn(1L); + when(battleQueryService.findBattlesByIds(List.of(battleId))).thenReturn(Map.of(battleId, battle)); + when(battleQueryService.findOptionsByIds(List.of(optionId))).thenReturn(Map.of(optionId, option)); + when(userService.findSummaryById(1L)).thenReturn(new UserSummary("tag", "nick", "OWL")); + + ContentActivityListResponse response = mypageService.getContentActivities(null, null, ActivityType.COMMENT); + + assertThat(response.items()).hasSize(1); + assertThat(response.items().get(0).activityType()).isEqualTo(ActivityType.COMMENT); + assertThat(response.items().get(0).content()).isEqualTo("댓글"); + } + + @Test + @DisplayName("LIKE 타입으로 좋아요활동을 반환한다") + void getContentActivities_returns_likes() { + User user = createUser(1L, "tag"); + Long battleId = generateId(); + Long optionId = generateId(); + Perspective perspective = Perspective.builder() + .battleId(battleId) + .userId(1L) + .optionId(optionId) + .content("관점 내용") + .build(); + ReflectionTestUtils.setField(perspective, "id", generateId()); + + PerspectiveLike like = PerspectiveLike.builder() + .perspective(perspective) + .userId(1L) + .build(); + ReflectionTestUtils.setField(like, "id", generateId()); + ReflectionTestUtils.setField(like, "createdAt", LocalDateTime.now()); + + Battle battle = createBattle("배틀"); + ReflectionTestUtils.setField(battle, "id", battleId); + BattleOption option = createOption(battle, BattleOptionLabel.B); + ReflectionTestUtils.setField(option, "id", optionId); + + when(userService.findCurrentUser()).thenReturn(user); + when(perspectiveQueryService.findUserLikes(1L, 0, 20)).thenReturn(List.of(like)); + when(perspectiveQueryService.countUserLikes(1L)).thenReturn(1L); + when(battleQueryService.findBattlesByIds(List.of(battleId))).thenReturn(Map.of(battleId, battle)); + when(battleQueryService.findOptionsByIds(List.of(optionId))).thenReturn(Map.of(optionId, option)); + when(userService.findSummaryById(1L)).thenReturn(new UserSummary("tag", "nick", "OWL")); + + ContentActivityListResponse response = mypageService.getContentActivities(null, null, ActivityType.LIKE); + + assertThat(response.items()).hasSize(1); + assertThat(response.items().get(0).activityType()).isEqualTo(ActivityType.LIKE); + } + + @Test + @DisplayName("알림설정을 반환한다") + void getNotificationSettings_returns_settings() { + User user = createUser(1L, "tag"); + UserSettings settings = UserSettings.builder() + .user(user) + .newBattleEnabled(true) + .battleResultEnabled(false) + .commentReplyEnabled(true) + .newCommentEnabled(true) + .contentLikeEnabled(false) + .marketingEventEnabled(false) + .build(); + + when(userService.findCurrentUser()).thenReturn(user); + when(userService.findUserSettings(1L)).thenReturn(settings); + + NotificationSettingsResponse response = mypageService.getNotificationSettings(); + + assertThat(response.newBattleEnabled()).isTrue(); + assertThat(response.battleResultEnabled()).isFalse(); + assertThat(response.commentReplyEnabled()).isTrue(); + assertThat(response.newCommentEnabled()).isTrue(); + assertThat(response.contentLikeEnabled()).isFalse(); + assertThat(response.marketingEventEnabled()).isFalse(); + } + + @Test + @DisplayName("설정을 업데이트하고 반환한다") + void updateNotificationSettings_updates_and_returns() { + User user = createUser(1L, "tag"); + UserSettings settings = UserSettings.builder() + .user(user) + .newBattleEnabled(false) + .battleResultEnabled(false) + .commentReplyEnabled(false) + .newCommentEnabled(false) + .contentLikeEnabled(false) + .marketingEventEnabled(false) + .build(); + + when(userService.findCurrentUser()).thenReturn(user); + when(userService.findUserSettings(1L)).thenReturn(settings); + + UpdateNotificationSettingsRequest request = new UpdateNotificationSettingsRequest( + true, null, true, null, null, true + ); + + NotificationSettingsResponse response = mypageService.updateNotificationSettings(request); + + assertThat(response.newBattleEnabled()).isTrue(); + assertThat(response.battleResultEnabled()).isFalse(); + assertThat(response.commentReplyEnabled()).isTrue(); + assertThat(response.marketingEventEnabled()).isTrue(); + } + + @Test + @DisplayName("공지사항 목록을 반환한다") + void getNotices_returns_notice_list() { + NoticeSummaryResponse notice = new NoticeSummaryResponse( + 1L, "공지 제목", "본문", + NoticeType.ANNOUNCEMENT, NoticePlacement.NOTICE_BOARD, + true, LocalDateTime.now().minusDays(1), null + ); + + when(noticeService.getActiveNotices(NoticePlacement.NOTICE_BOARD, NoticeType.ANNOUNCEMENT, null)) + .thenReturn(List.of(notice)); + + NoticeListResponse response = mypageService.getNotices(NoticeType.ANNOUNCEMENT); + + assertThat(response.items()).hasSize(1); + assertThat(response.items().get(0).title()).isEqualTo("공지 제목"); + assertThat(response.items().get(0).isPinned()).isTrue(); + } + + @Test + @DisplayName("공지사항 상세를 반환한다") + void getNoticeDetail_returns_notice_detail() { + Long noticeId = 1L; + com.swyp.app.domain.notice.dto.response.NoticeDetailResponse noticeDetail = + new com.swyp.app.domain.notice.dto.response.NoticeDetailResponse( + noticeId, "상세 제목", "상세 본문", + NoticeType.EVENT, NoticePlacement.NOTICE_BOARD, + false, LocalDateTime.now(), null, LocalDateTime.now() + ); + + when(noticeService.getNoticeDetail(noticeId)).thenReturn(noticeDetail); + + NoticeDetailResponse response = mypageService.getNoticeDetail(noticeId); + + assertThat(response.noticeId()).isEqualTo(noticeId); + assertThat(response.title()).isEqualTo("상세 제목"); + assertThat(response.type()).isEqualTo(NoticeType.EVENT); + assertThat(response.isPinned()).isFalse(); + } + + private User createUser(Long id, String userTag) { + User user = User.builder() + .userTag(userTag) + .nickname("nickname") + .role(UserRole.USER) + .status(UserStatus.ACTIVE) + .build(); + ReflectionTestUtils.setField(user, "id", id); + return user; + } + + private UserProfile createProfile(User user, String nickname, CharacterType characterType) { + return UserProfile.builder() + .user(user) + .nickname(nickname) + .characterType(characterType) + .mannerTemperature(BigDecimal.valueOf(36.5)) + .build(); + } + + private Battle createBattle(String title) { + Battle battle = Battle.builder() + .title(title) + .summary("summary") + .type(BattleType.BATTLE) + .status(BattleStatus.PUBLISHED) + .build(); + ReflectionTestUtils.setField(battle, "id", generateId()); + return battle; + } + + private BattleOption createOption(Battle battle, BattleOptionLabel label) { + BattleOption option = BattleOption.builder() + .battle(battle) + .label(label) + .title(label.name()) + .stance("stance-" + label.name()) + .build(); + ReflectionTestUtils.setField(option, "id", generateId()); + return option; + } +} diff --git a/src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java new file mode 100644 index 00000000..56d530fc --- /dev/null +++ b/src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java @@ -0,0 +1,191 @@ +package com.swyp.app.domain.user.service; + +import com.swyp.app.domain.user.dto.request.UpdateUserProfileRequest; +import com.swyp.app.domain.user.dto.response.MyProfileResponse; +import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.entity.CharacterType; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserProfile; +import com.swyp.app.domain.user.entity.UserRole; +import com.swyp.app.domain.user.entity.UserSettings; +import com.swyp.app.domain.user.entity.UserStatus; +import com.swyp.app.domain.user.entity.UserTendencyScore; +import com.swyp.app.domain.user.repository.UserProfileRepository; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.domain.user.repository.UserSettingsRepository; +import com.swyp.app.domain.user.repository.UserTendencyScoreRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; + +import java.math.BigDecimal; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class UserServiceTest { + + @Mock + private UserRepository userRepository; + @Mock + private UserProfileRepository userProfileRepository; + @Mock + private UserSettingsRepository userSettingsRepository; + @Mock + private UserTendencyScoreRepository userTendencyScoreRepository; + + @InjectMocks + private UserService userService; + + @Test + @DisplayName("가장 최근 사용자를 반환한다") + void findCurrentUser_returns_latest_user() { + User user = createUser(1L, "testTag"); + when(userRepository.findTopByOrderByIdDesc()).thenReturn(Optional.of(user)); + + User result = userService.findCurrentUser(); + + assertThat(result.getUserTag()).isEqualTo("testTag"); + } + + @Test + @DisplayName("사용자가 없으면 예외를 던진다") + void findCurrentUser_throws_when_no_user() { + when(userRepository.findTopByOrderByIdDesc()).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> userService.findCurrentUser()) + .isInstanceOf(CustomException.class) + .satisfies(ex -> assertThat(((CustomException) ex).getErrorCode()).isEqualTo(ErrorCode.USER_NOT_FOUND)); + } + + @Test + @DisplayName("사용자 요약정보를 반환한다") + void findSummaryById_returns_user_summary() { + User user = createUser(1L, "summaryTag"); + UserProfile profile = createProfile(user, "nick", CharacterType.OWL); + + when(userRepository.findById(1L)).thenReturn(Optional.of(user)); + when(userProfileRepository.findById(1L)).thenReturn(Optional.of(profile)); + + UserSummary summary = userService.findSummaryById(1L); + + assertThat(summary.userTag()).isEqualTo("summaryTag"); + assertThat(summary.nickname()).isEqualTo("nick"); + assertThat(summary.characterType()).isEqualTo("OWL"); + } + + @Test + @DisplayName("존재하지 않는 사용자의 요약정보 조회 시 예외를 던진다") + void findSummaryById_throws_when_not_found() { + when(userRepository.findById(999L)).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> userService.findSummaryById(999L)) + .isInstanceOf(CustomException.class) + .satisfies(ex -> assertThat(((CustomException) ex).getErrorCode()).isEqualTo(ErrorCode.USER_NOT_FOUND)); + } + + @Test + @DisplayName("닉네임과 캐릭터를 수정한다") + void updateMyProfile_updates_nickname_and_character() { + User user = createUser(1L, "myTag"); + UserProfile profile = createProfile(user, "oldNick", CharacterType.OWL); + + when(userRepository.findTopByOrderByIdDesc()).thenReturn(Optional.of(user)); + when(userProfileRepository.findById(1L)).thenReturn(Optional.of(profile)); + + UpdateUserProfileRequest request = new UpdateUserProfileRequest("newNick", CharacterType.FOX); + MyProfileResponse response = userService.updateMyProfile(request); + + assertThat(response.userTag()).isEqualTo("myTag"); + assertThat(response.nickname()).isEqualTo("newNick"); + assertThat(response.characterType()).isEqualTo(CharacterType.FOX); + } + + @Test + @DisplayName("프로필을 반환한다") + void findUserProfile_returns_profile() { + User user = createUser(1L, "tag"); + UserProfile profile = createProfile(user, "nick", CharacterType.BEAR); + + when(userProfileRepository.findById(1L)).thenReturn(Optional.of(profile)); + + UserProfile result = userService.findUserProfile(1L); + + assertThat(result.getNickname()).isEqualTo("nick"); + assertThat(result.getCharacterType()).isEqualTo(CharacterType.BEAR); + } + + @Test + @DisplayName("설정을 반환한다") + void findUserSettings_returns_settings() { + User user = createUser(1L, "tag"); + UserSettings settings = UserSettings.builder() + .user(user) + .newBattleEnabled(true) + .battleResultEnabled(false) + .commentReplyEnabled(true) + .newCommentEnabled(false) + .contentLikeEnabled(true) + .marketingEventEnabled(false) + .build(); + + when(userSettingsRepository.findById(1L)).thenReturn(Optional.of(settings)); + + UserSettings result = userService.findUserSettings(1L); + + assertThat(result.isNewBattleEnabled()).isTrue(); + assertThat(result.isBattleResultEnabled()).isFalse(); + } + + @Test + @DisplayName("성향점수를 반환한다") + void findUserTendencyScore_returns_score() { + User user = createUser(1L, "tag"); + UserTendencyScore score = UserTendencyScore.builder() + .user(user) + .principle(10) + .reason(20) + .individual(30) + .change(40) + .inner(50) + .ideal(60) + .build(); + + when(userTendencyScoreRepository.findById(1L)).thenReturn(Optional.of(score)); + + UserTendencyScore result = userService.findUserTendencyScore(1L); + + assertThat(result.getPrinciple()).isEqualTo(10); + assertThat(result.getReason()).isEqualTo(20); + assertThat(result.getIdeal()).isEqualTo(60); + } + + private User createUser(Long id, String userTag) { + User user = User.builder() + .userTag(userTag) + .nickname("nickname") + .role(UserRole.USER) + .status(UserStatus.ACTIVE) + .build(); + ReflectionTestUtils.setField(user, "id", id); + return user; + } + + private UserProfile createProfile(User user, String nickname, CharacterType characterType) { + return UserProfile.builder() + .user(user) + .nickname(nickname) + .characterType(characterType) + .mannerTemperature(BigDecimal.valueOf(36.5)) + .build(); + } +} From fccaeba0c80cca4f0e1d45c86bea317b45d00311 Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Sat, 28 Mar 2026 16:27:22 +0900 Subject: [PATCH 28/94] =?UTF-8?q?#60=20[Feat]=20AdMob=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EB=B0=8F=20SSV=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#61)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - #60 ## 📝 작업 내용 ### ✨ Feat | 내용 | 파일 | |------|------| | AdMob 보상 광고 서명 검증(SSV) 컨트롤러 구현 | `AdMobRewardController.java` | | 보상 지급 로직 및 멱등성(중복 방지) 처리 서비스 구현 | `AdMobRewardServiceImpl.java` | | 보상 상태 값(OK, Already Processed) 관리를 위한 Enum 추가 | `AdRewardStatus.java` | | 보상 요청 및 응답 전용 DTO 설계 | `AdMobRewardRequest.java`, `AdMobRewardResponse.java` | | 보상 지급 이력 관리를 위한 엔티티 및 레포지토리 구축 | `AdRewardHistory.java`, `AdRewardHistoryRepository.java` | | Google Tink 기반 서명 검증 빈(Bean) 설정 | `AdMobConfig.java` | ### ♻️ Refactor | 내용 | 파일 | |------|------| | `build.gradle` 내 AdMob SSV 관련 의존성 및 저장소 설정 최적화 | `build.gradle` | | 단위 테스트 내 불필요한 Stubbing 제거 및 검증 로직 정규화 | `AdMobRewardServiceTest.java` | ### 🐛 Fix | 내용 | 파일 | |------|------| | 테스트 환경의 'Cannot resolve symbol android' 참조 오류 수정 | `build.gradle` | | Mockito Strict Stubbing 정책 위반으로 인한 테스트 실패 해결 | `AdMobRewardServiceTest.java` | ## 📌 공유 사항 > 1. @yaeunjess 예은님, 프론트엔드 작업하시면서 실제 시그니처 값 받아서 테스트가 더 필요해보입니다! 작업할 때, 알려주세요! 2. 그리고, 지금 보상 타입 부분인 `reward_item` 부분 `ITEM`, `POINT` 아니면 오류뜨게 해놨는데 오류 말고 기본값을 부여할지도 궁금합니다. ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [x] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 > 성공 스크린샷 2026-03-27 오후 8 08 31 > 응답만 성공 (같은 사용자가 같은 광고를 봤을 때) 스크린샷 2026-03-27 오후 8 08 45 > 에러: 유저 스크린샷 2026-03-27 오후 8 08 57 > 에러: 보상 타입 스크린샷 2026-03-27 오후 8 09 12 > 에러: 시그니처(서명) 검증 오류 스크린샷 2026-03-27 오후 9 24 04 ## 💬 리뷰 요구사항 > 없음 --- build.gradle | 5 + docs/api-specs/reward-api.md | 136 ++++++++++++++++++ docs/erd/admob.puml | 29 ++++ .../controller/AdMobRewardController.java | 42 ++++++ .../dto/request/AdMobRewardRequest.java | 34 +++++ .../dto/response/AdMobRewardResponse.java | 23 +++ .../domain/reward/entity/AdRewardHistory.java | 36 +++++ .../app/domain/reward/enums/RewardItem.java | 18 +++ .../repository/AdRewardHistoryRepository.java | 19 +++ .../reward/service/AdMobRewardService.java | 11 ++ .../service/AdMobRewardServiceImpl.java | 87 +++++++++++ .../global/common/exception/ErrorCode.java | 7 +- .../swyp/app/global/config/AdMobConfig.java | 20 +++ .../service/AdMobRewardServiceTest.java | 89 ++++++++++++ 14 files changed, 555 insertions(+), 1 deletion(-) create mode 100644 docs/api-specs/reward-api.md create mode 100644 docs/erd/admob.puml create mode 100644 src/main/java/com/swyp/app/domain/reward/controller/AdMobRewardController.java create mode 100644 src/main/java/com/swyp/app/domain/reward/dto/request/AdMobRewardRequest.java create mode 100644 src/main/java/com/swyp/app/domain/reward/dto/response/AdMobRewardResponse.java create mode 100644 src/main/java/com/swyp/app/domain/reward/entity/AdRewardHistory.java create mode 100644 src/main/java/com/swyp/app/domain/reward/enums/RewardItem.java create mode 100644 src/main/java/com/swyp/app/domain/reward/repository/AdRewardHistoryRepository.java create mode 100644 src/main/java/com/swyp/app/domain/reward/service/AdMobRewardService.java create mode 100644 src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java create mode 100644 src/main/java/com/swyp/app/global/config/AdMobConfig.java create mode 100644 src/test/java/com/swyp/app/domain/reward/service/AdMobRewardServiceTest.java diff --git a/build.gradle b/build.gradle index 0b17ca96..f9cbebd4 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ configurations { repositories { mavenCentral() + google() } dependencies { @@ -43,6 +44,10 @@ dependencies { // HTTP Client (소셜 API 호출용) implementation 'org.springframework.boot:spring-boot-starter-webflux' + // AdMob SSV 검증을 위한 Tink 라이브러리 + implementation 'com.google.crypto.tink:apps-rewardedads:1.9.1' + testImplementation 'com.google.crypto.tink:apps-rewardedads:1.9.1' + // Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.16' diff --git a/docs/api-specs/reward-api.md b/docs/api-specs/reward-api.md new file mode 100644 index 00000000..24b8a3fe --- /dev/null +++ b/docs/api-specs/reward-api.md @@ -0,0 +1,136 @@ +# 보상(Reward) API 명세서 + +## 1. 설계 메모 + +- AdMob의 **SSV(Server-Side Verification)** 콜백 수신을 위한 API입니다. +- 모든 필드명은 AdMob 가이드라인에 따라 `snake_case`를 사용합니다. +- **중복 지급 방지**: `transaction_id`를 고유 식별자로 사용하여 동일 요청 재유입 시 차단(Idempotency)합니다. +- **유저 식별**: `custom_data` 필드에 담긴 값을 내부 `user_id`로 매핑하여 처리합니다. +- **타입 검증**: `reward_item` 값은 내부 `RewardType` Enum과 매핑하며, 정의되지 않은 값(예: "123")은 에러 처리합니다. +- **데이터 보존**: 보상 요청의 성공 이력을 `ad_reward_history` 테이블에 적재합니다. + +--- + +## 2. AdMob 보상 콜백 API + +### 2.1 `GET /api/v1/admob/reward` + +광고 시청 완료 후 구글 서버에서 보내는 보상 지급 콜백 수신. + +**쿼리 파라미터:** + +| Parameter | Type | Required | 설명 | +|-----------|:----:|:---:|------| +| `ad_unit_id` | `String` | Y | 광고 단위 ID | +| `custom_data` | `String` | Y | 유저 식별자 (내부 User ID) | +| `reward_amount` | `int` | Y | 보상 수량 | +| `reward_item` | `String` | Y | 보상 아이템 이름 (e.g., "POINT") | +| `timestamp` | `long` | Y | 요청 생성 시간 | +| `transaction_id` | `String` | Y | **중복 방지용 고유 ID** | +| `signature` | `String` | N | 검증용 서명 | +| `key_id` | `String` | N | 검증용 공개키 ID | + +**응답 (성공):** + +```json +{ + "statusCode": 200, + "data": { + "reward_status": "OK" + } +} +``` + +**응답 (중복 요청 시):** + +```JSON + +{ + "statusCode": 200, + "data": { + "reward_status": "Already Processed" + } +} +``` + +--- + +## 3. 내 보상 이력 API + +### 3.1 GET /api/v1/me/rewards/history + +로그인한 사용자의 보상 획득 이력 조회.쿼리 파라미터 + +```JSON +{ + "statusCode": 200, + "data": { + "items": [ + { + "history_id": 105, + "reward_type": "POINT", + "reward_amount": 100, + "transaction_id": "unique_trans_id_20260327_001", + "created_at": "2026-03-27T18:00:00Z" + } + ], + "next_cursor": 104 + }, + "error": null + } +``` + +## 4. 에러 코드 + +### 4.1 보상 관련 에러 코드 + +### 🚨 보상 API 에러 응답 JSON 샘플 + +**1. 유저를 찾을 수 없을 때 (REWARD_INVALID_USER)** +- 상황: `custom_data`로 넘어온 ID가 DB에 없는 유저일 경우 +```json +{ + "statusCode": 404, + "data": null, + "error": { + "code": "REWARD_INVALID_USER", + "message": "해당 유저를 찾을 수 없습니다. (custom_data: 1)" + } +} +``` + +**2. 잘못된 보상 타입일 때 (REWARD_INVALID_TYPE)** +- 상황: `reward_item`에 Enum에 정의되지 않은 값(예: "123")이 들어온 경우 +```json +{ + "statusCode": 400, + "data": null, + "error": { + "code": "REWARD_INVALID_TYPE", + "message": "지원하지 않는 reward_item 타입입니다. (입력값: 123)" + } +} +``` + +**3. 서명 검증 실패 시 (REWARD_VERIFICATION_FAILED)** +- 상황: AdMob이 보낸 `signature`가 올바르지 않아 위변조가 의심될 경우 +```json +{ + "statusCode": 401, + "data": null, + "error": { + "code": "REWARD_INVALID_SIGNATURE", + "message": "AdMob 서명 검증에 실패하였습니다. 요청의 유효성을 확인하세요." + } +} +``` +--- + +## 공통 에러 코드 + +| Error Code | HTTP Status | 설명 | +|------------|:-----------:|-------------------------------------| +| `REWARD_INVALID_USER` | `404` | custom_data에 해당하는 유저가 존재하지 않음 | +| `REWARD_INVALID_TYPE` | `400` | 지원하지 않는 reward_item 타입 (Enum 미매칭) | +| `REWARD_INVALID_SIGNATURE` | `401` | AdMob 서명(Signature) 검증 실패 또는 위변조 의심 | +--- \ No newline at end of file diff --git a/docs/erd/admob.puml b/docs/erd/admob.puml new file mode 100644 index 00000000..a14df6b6 --- /dev/null +++ b/docs/erd/admob.puml @@ -0,0 +1,29 @@ +@startuml +!theme plain +skinparam Linetype ortho + +' 1. 서비스 사용자 참조 +entity "users" { + * id : LONG <> + -- + user_tag : VARCHAR(30) <> + status : ENUM('PENDING', 'ACTIVE', 'DELETED', 'BANNED') + created_at : TIMESTAMP + updated_at : TIMESTAMP +} + +' 2. 사용자 광고 이력 테이블 +entity "ad_reward_history" { + * id : LONG <> + -- + user_id : LONG <> + transaction_id : VARCHAR(255) UNIQUE + reward_amount : INT NOT NULL + reward_type : enum('POINT', 'ITEM') + created_at : TIMESTAMP +} + +' 관계 설정 +users ||--o{ ad_reward_history : "사용자 보상 이력" + +@enduml diff --git a/src/main/java/com/swyp/app/domain/reward/controller/AdMobRewardController.java b/src/main/java/com/swyp/app/domain/reward/controller/AdMobRewardController.java new file mode 100644 index 00000000..7082acc7 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/controller/AdMobRewardController.java @@ -0,0 +1,42 @@ +package com.swyp.app.domain.reward.controller; + +import com.swyp.app.domain.reward.dto.request.AdMobRewardRequest; +import com.swyp.app.domain.reward.dto.response.AdMobRewardResponse; +import com.swyp.app.domain.reward.service.AdMobRewardService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@Tag(name = "보상 (Reward)", description = "AdMob 광고 보상 관련 API") +@RestController +@RequestMapping("/api/v1/admob") +@RequiredArgsConstructor +public class AdMobRewardController { + + private final AdMobRewardService rewardService; + + /** + * // 1. AdMob SSV 콜백 수신 엔드포인트 + * 호출 경로: GET /api/v1/admob/reward + */ + @Operation(summary = "AdMob 보상 콜백 수신") + @GetMapping("/reward") + public ApiResponse handleAdMobReward( + @ParameterObject @ModelAttribute AdMobRewardRequest request) { + log.info("AdMob SSV 콜백 수신: transaction_id={}", request.transaction_id()); + + // 서비스에서 "OK" 또는 "Already Processed" 수신 + String status = rewardService.processReward(request); + + // DTO로 감싸서 반환 (명세서의 data { "reward_status": "..." } 구조 완성) + return ApiResponse.onSuccess(AdMobRewardResponse.from(status)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/reward/dto/request/AdMobRewardRequest.java b/src/main/java/com/swyp/app/domain/reward/dto/request/AdMobRewardRequest.java new file mode 100644 index 00000000..02b36a5c --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/dto/request/AdMobRewardRequest.java @@ -0,0 +1,34 @@ +package com.swyp.app.domain.reward.dto.request; + +import com.swyp.app.domain.reward.enums.RewardItem; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; + +public record AdMobRewardRequest( + String ad_unit_id, + String custom_data, + int reward_amount, + String reward_item, + long timestamp, + String transaction_id, + String signature, + String key_id +) { + // 구글이 보낸 유저 데이터를 우리 데이터베이스에서 찾기 위해 메소드 추가 + public Long getUserId() { + try { + return Long.parseLong(this.custom_data); + } catch (NumberFormatException e) { + throw new CustomException(ErrorCode.REWARD_INVALID_USER); + } + } + + // 실제 우리가 제공하는 보상 유형이랑 동일한지 확인 enum에서! + public RewardItem getRewardType() { + try { + return RewardItem.valueOf(this.reward_item.toUpperCase()); + } catch (IllegalArgumentException | NullPointerException e) { + throw new CustomException(ErrorCode.REWARD_INVALID_TYPE); + } + } +} diff --git a/src/main/java/com/swyp/app/domain/reward/dto/response/AdMobRewardResponse.java b/src/main/java/com/swyp/app/domain/reward/dto/response/AdMobRewardResponse.java new file mode 100644 index 00000000..3eafa797 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/dto/response/AdMobRewardResponse.java @@ -0,0 +1,23 @@ +package com.swyp.app.domain.reward.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Schema(description = "AdMob 보상 처리 결과 응답") +public class AdMobRewardResponse { + + @Schema(description = "처리 결과 코드 (OK, Already Processed)", example = "OK") + private final String reward_status; + + public static AdMobRewardResponse from(String status) { + return AdMobRewardResponse.builder() + .reward_status(status) + .build(); + } +} diff --git a/src/main/java/com/swyp/app/domain/reward/entity/AdRewardHistory.java b/src/main/java/com/swyp/app/domain/reward/entity/AdRewardHistory.java new file mode 100644 index 00000000..b77c9439 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/entity/AdRewardHistory.java @@ -0,0 +1,36 @@ +package com.swyp.app.domain.reward.entity; + +import com.swyp.app.domain.reward.enums.RewardItem; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Table(name = "ad_reward_history") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class AdRewardHistory extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @Column(name = "transaction_id", unique = true, nullable = false) + private String transactionId; + + @Column(name = "reward_amount", nullable = false) + private int rewardAmount; + + @Enumerated(EnumType.STRING) + @Column(name = "reward_item", nullable = false) + private RewardItem rewardItem; + + @Builder + public AdRewardHistory(User user, String transactionId, int rewardAmount, RewardItem rewardItem) { + this.user = user; + this.transactionId = transactionId; + this.rewardAmount = rewardAmount; + this.rewardItem = rewardItem; + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/reward/enums/RewardItem.java b/src/main/java/com/swyp/app/domain/reward/enums/RewardItem.java new file mode 100644 index 00000000..f04a2dd1 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/enums/RewardItem.java @@ -0,0 +1,18 @@ +package com.swyp.app.domain.reward.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum RewardItem { + POINT, ITEM; + + public static RewardItem from(String value) { + for (RewardItem type : RewardItem.values()) { + if (type.name().equalsIgnoreCase(value)) return type; + } + + throw new IllegalArgumentException("REWARD_INVALID_TYPE"); + } +} diff --git a/src/main/java/com/swyp/app/domain/reward/repository/AdRewardHistoryRepository.java b/src/main/java/com/swyp/app/domain/reward/repository/AdRewardHistoryRepository.java new file mode 100644 index 00000000..7f95fef2 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/repository/AdRewardHistoryRepository.java @@ -0,0 +1,19 @@ +package com.swyp.app.domain.reward.repository; + +import com.swyp.app.domain.reward.entity.AdRewardHistory; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AdRewardHistoryRepository extends JpaRepository { + + /** + * 1. 중복 보상 지급 방지를 위한 검증 메서드 + * @param transactionId 구글에서 보낸 고유 트랜잭션 ID + * @return 존재하면 true, 없으면 false + */ + + // transactionId는 한 광고의 시청 영수증 번호라고 생각해주세요! + boolean existsByTransactionId(String transactionId); + +} diff --git a/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardService.java b/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardService.java new file mode 100644 index 00000000..e54f62be --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardService.java @@ -0,0 +1,11 @@ +package com.swyp.app.domain.reward.service; + +import com.swyp.app.domain.reward.dto.request.AdMobRewardRequest; + +// 서비스를 인터페이스로 분리하면 서비스를 변경할 때, Impl 파일만 수정하면 됨! +// 테스트 코드 짜기 용이! +public interface AdMobRewardService { + + String processReward(AdMobRewardRequest request); + +} diff --git a/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java b/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java new file mode 100644 index 00000000..70114fa3 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java @@ -0,0 +1,87 @@ +package com.swyp.app.domain.reward.service; + +import com.google.crypto.tink.apps.rewardedads.RewardedAdsVerifier; +import com.swyp.app.domain.reward.dto.request.AdMobRewardRequest; +import com.swyp.app.domain.reward.entity.AdRewardHistory; +import com.swyp.app.domain.reward.repository.AdRewardHistoryRepository; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import jakarta.transaction.Transactional; +import java.security.GeneralSecurityException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class AdMobRewardServiceImpl implements AdMobRewardService { + + private final RewardedAdsVerifier rewardedAdsVerifier; + private final AdRewardHistoryRepository adRewardHistoryRepository; + private final UserRepository userRepository; + + @Override + @Transactional + public String processReward(AdMobRewardRequest request) { + // 2. 서명 검증 (구글이 보낸 진짜 신호인지 확인) + if (!verifyAdMobSignature(request)) { + log.warn("AdMob 서명 검증 실패: transaction_id={}", request.transaction_id()); + throw new CustomException(ErrorCode.REWARD_INVALID_SIGNATURE); + } + + // 3. 중복 처리 방지 (멱등성 유지) + if (adRewardHistoryRepository.existsByTransactionId(request.transaction_id())) { + log.info("이미 처리된 광고 요청입니다: transaction_id={}", request.transaction_id()); + return "Already Processed"; + } + + // 4. 유저 존재 여부 확인 (DTO의 getUserId 활용) + User user = userRepository.findById(request.getUserId()) + .orElseThrow(() -> new CustomException(ErrorCode.REWARD_INVALID_USER)); + + // 5. 보상 이력 저장 (영수증 남기기) + AdRewardHistory history = AdRewardHistory.builder() + .transactionId(request.transaction_id()) + .user(user) + .rewardAmount(request.reward_amount()) + .rewardItem(request.getRewardType()) + .build(); + + adRewardHistoryRepository.save(history); + + // 6. TODO: 작업 중인 포인트 합산 로직 호출 지점 + // user.addPoint(request.reward_amount()); + + log.info("보상 지급 완료: user={}, amount={}", user.getId(), request.reward_amount()); + return "OK"; + } + + /** + * Google Tink를 이용한 SSV 서명 검증 로직 + */ + private boolean verifyAdMobSignature(AdMobRewardRequest request) { + try { + // signature와 key_id까지 모두 포함된 전체 쿼리 스트링을 만듭니다. + // (구글이 우리 서버에 쏜 URL의 뒷부분 전체라고 보시면 됩니다.) + String fullQueryString = String.format( + "ad_unit_id=%s&custom_data=%s&reward_amount=%d&reward_item=%s×tamp=%d&transaction_id=%s&signature=%s&key_id=%s", + request.ad_unit_id(), request.custom_data(), request.reward_amount(), + request.reward_item(), request.timestamp(), request.transaction_id(), + request.signature(), request.key_id() + ); + + rewardedAdsVerifier.verify(fullQueryString); + return true; + + } catch (GeneralSecurityException e) { + log.error("AdMob 서명 검증 실패: {}", e.getMessage()); + return false; + } catch (Exception e) { + log.error("검증 중 알 수 없는 오류: {}", e.getMessage()); + return false; + } + } +} diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 5b895f11..553116af 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -84,7 +84,12 @@ public enum ErrorCode { VOTE_ALREADY_SUBMITTED(HttpStatus.CONFLICT, "VOTE_409_SUB", "이미 투표가 완료되었습니다."), INVALID_VOTE_STATUS (HttpStatus.BAD_REQUEST, "VOTE_400_INV", "사전 투표를 진행해야 하거나, 이미 사후 투표가 완료되었습니다."), PRE_VOTE_REQUIRED (HttpStatus.CONFLICT, "VOTE_409_PRE", "사전 투표가 필요합니다."), - POST_VOTE_REQUIRED (HttpStatus.CONFLICT, "VOTE_409_PST", "사후 투표가 필요합니다."); + POST_VOTE_REQUIRED (HttpStatus.CONFLICT, "VOTE_409_PST", "사후 투표가 필요합니다."), + + // Reward + REWARD_INVALID_USER(HttpStatus.NOT_FOUND, "REWARD_404", "해당 유저를 찾을 수 없습니다."), + REWARD_INVALID_TYPE(HttpStatus.BAD_REQUEST, "REWARD_400", "지원하지 않는 보상 아이템 타입입니다."), + REWARD_INVALID_SIGNATURE(HttpStatus.UNAUTHORIZED, "REWARD_401", "AdMob 서명 검증에 실패하였습니다."); private final HttpStatus httpStatus; private final String code; diff --git a/src/main/java/com/swyp/app/global/config/AdMobConfig.java b/src/main/java/com/swyp/app/global/config/AdMobConfig.java new file mode 100644 index 00000000..8653a7f2 --- /dev/null +++ b/src/main/java/com/swyp/app/global/config/AdMobConfig.java @@ -0,0 +1,20 @@ +package com.swyp.app.global.config; + +import com.google.crypto.tink.apps.rewardedads.RewardedAdsVerifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class AdMobConfig { + + @Bean + public RewardedAdsVerifier rewardedAdsVerifier() { + try { + return new RewardedAdsVerifier.Builder() + .setVerifyingPublicKeys("https://www.gstatic.com/admob/reward/verifier-keys.json") + .build(); + } catch (Exception e) { + throw new RuntimeException("AdMob Verifier 초기화 실패!", e); + } + } +} \ No newline at end of file diff --git a/src/test/java/com/swyp/app/domain/reward/service/AdMobRewardServiceTest.java b/src/test/java/com/swyp/app/domain/reward/service/AdMobRewardServiceTest.java new file mode 100644 index 00000000..cfdf56be --- /dev/null +++ b/src/test/java/com/swyp/app/domain/reward/service/AdMobRewardServiceTest.java @@ -0,0 +1,89 @@ +package com.swyp.app.domain.reward.service; + +import com.google.crypto.tink.apps.rewardedads.RewardedAdsVerifier; +import com.swyp.app.domain.reward.dto.request.AdMobRewardRequest; +import com.swyp.app.domain.reward.entity.AdRewardHistory; +import com.swyp.app.domain.reward.repository.AdRewardHistoryRepository; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.security.GeneralSecurityException; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +class AdMobRewardServiceTest { + + @InjectMocks + private AdMobRewardServiceImpl rewardService; + + @Mock + private AdRewardHistoryRepository adRewardHistoryRepository; + + @Mock + private UserRepository userRepository; + + @Mock + private RewardedAdsVerifier rewardedAdsVerifier; + + @Test + @DisplayName("1. 정상적인 광고 시청 시 보상 이력이 저장되고 OK를 반환한다.") + void processReward_Success() throws Exception { + // given + AdMobRewardRequest request = createSampleRequest("unique-id"); + User mockUser = mock(User.class); + + given(adRewardHistoryRepository.existsByTransactionId(request.transaction_id())).willReturn(false); + doNothing().when(rewardedAdsVerifier).verify(anyString()); + given(userRepository.findById(1L)).willReturn(Optional.of(mockUser)); + + // when + String result = rewardService.processReward(request); + + // then + assertThat(result).isEqualTo("OK"); + verify(adRewardHistoryRepository, times(1)).save(any(AdRewardHistory.class)); + } + + @Test + @DisplayName("2. 서명 검증에 실패하면 REWARD_INVALID_SIGNATURE 예외가 발생한다.") + void processReward_InvalidSignature() throws Exception { + // given + AdMobRewardRequest request = createSampleRequest("trans-id"); + + // // 1. 불필요한 existsByTransactionId 스터빙 제거 (만약 서비스에서 검증을 먼저 한다면 호출 안 될 수 있음) + // // 만약 호출이 반드시 일어난다면 아래 주석을 풀고 사용하세요. + lenient().when(adRewardHistoryRepository.existsByTransactionId(anyString())).thenReturn(false); + + // // 2. 서명 검증 실패 시뮬레이션 + doThrow(new GeneralSecurityException("Invalid signature")) + .when(rewardedAdsVerifier).verify(anyString()); + + // when & then + assertThatThrownBy(() -> rewardService.processReward(request)) + .isInstanceOf(CustomException.class) + .hasFieldOrPropertyWithValue("errorCode", ErrorCode.REWARD_INVALID_SIGNATURE); + + verify(adRewardHistoryRepository, never()).save(any()); + } + + private AdMobRewardRequest createSampleRequest(String transId) { + return new AdMobRewardRequest( + "ad-unit-123", "1", 100, "POINT", 123456789L, + transId, "sig-123", "key-123" + ); + } +} \ No newline at end of file From b7f9fe7b3288508d9a46645e64987b084cf8b3ca Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sat, 28 Mar 2026 23:13:04 +0900 Subject: [PATCH 29/94] =?UTF-8?q?#64=20[Feat]=20Home/MyPage/Search=20?= =?UTF-8?q?=ED=83=AD=20=EA=B0=9C=EC=84=A0=20(#65)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - S3 Presigned URL 인프라 구축 및 홈 API 응답 구조를 섹션별 전용 DTO로 리팩토링 - 철학자·캐릭터 enum에 이미지 매핑(imageKey, label) 추가 및 정규화 - 마이페이지 철학자 유형 산출 로직 구현 (최초 5회 투표 → PHILOSOPHER 태그 기반 자동 산출·저장) - PhilosopherType 확장: typeName, description, bestMatch/worstMatch, 6축 고정 성향 점수 - 탐색 탭 배틀 검색 API 신설 (`GET /api/v1/search/battles`) — 카테고리 필터, 인기순/최신순 정렬, offset 페이지네이션 ## Changes - **홈 API**: `HomeResponse`를 6개 섹션별 DTO로 분리 (EditorPick, Trending, BestBattle, TodayQuiz, TodayVote, NewBattle) - **S3**: `S3PresignedUrlService`, `S3Config` 신설, `FileUploadController` presigned URL 응답 추가 - **Enum**: `PhilosopherType` 10종 (label, typeName, description, bestMatch, worstMatch, 6축 점수, imageKey), `CharacterType` 8종 정규화 - **마이페이지**: `UserProfile.philosopherType` 필드 추가, `MypageService.resolvePhilosopherType()` 산출 로직 - **서치**: `search` 도메인 신설 (Controller, Service, DTO, Enum), `BattleRepository` 검색 쿼리 추가 ## Test plan - [x] `./gradlew build` 컴파일 확인 (contextLoads 제외 전 테스트 통과) - [ ] Swagger에서 홈 API 호출 → 섹션별 응답 확인 - [ ] Swagger에서 마이페이지 API → 철학자 유형 산출 확인 (5회 투표 후) - [ ] Swagger에서 탐색 API → 카테고리 필터/정렬 확인 Closes #64 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 --- .../battle/converter/BattleConverter.java | 8 +- .../dto/response/TodayBattleResponse.java | 9 +- .../battle/repository/BattleRepository.java | 18 +++ .../battle/service/BattleQueryService.java | 19 +++ .../dto/response/HomeBestBattleResponse.java | 15 ++ .../dto/response/HomeEditorPickResponse.java | 16 ++ ...sponse.java => HomeNewBattleResponse.java} | 19 ++- .../home/dto/response/HomeResponse.java | 14 +- .../dto/response/HomeTodayQuizResponse.java | 12 ++ ....java => HomeTodayVoteOptionResponse.java} | 7 +- .../dto/response/HomeTodayVoteResponse.java | 12 ++ .../dto/response/HomeTrendingResponse.java | 14 ++ .../app/domain/home/service/HomeService.java | 139 +++++++++++++----- .../search/controller/SearchController.java | 29 ++++ .../response/SearchBattleListResponse.java | 25 ++++ .../domain/search/enums/SearchSortType.java | 6 + .../domain/search/service/SearchService.java | 90 ++++++++++++ .../user/dto/response/MypageResponse.java | 8 +- .../user/dto/response/RecapResponse.java | 6 +- .../app/domain/user/entity/CharacterType.java | 40 +++-- .../user/entity/CharacterTypeConverter.java | 2 +- .../domain/user/entity/PhilosopherType.java | 102 +++++++++++-- .../app/domain/user/entity/UserProfile.java | 9 ++ .../domain/user/service/MypageService.java | 83 ++++++++--- .../vote/repository/VoteRepository.java | 4 + .../domain/vote/service/VoteQueryService.java | 7 + .../com/swyp/app/global/config/S3Config.java | 27 ++++ .../s3/controller/FileUploadController.java | 14 +- .../infra/s3/dto/FileUploadResponse.java | 4 + .../global/infra/s3/enums/FileCategory.java | 1 + .../s3/service/S3PresignedUrlService.java | 65 ++++++++ .../infra/s3/service/S3UploadServiceImpl.java | 8 +- src/main/resources/application.yml | 5 +- .../domain/home/service/HomeServiceTest.java | 82 ++++++----- .../user/service/MypageServiceTest.java | 53 +++---- 35 files changed, 778 insertions(+), 194 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/home/dto/response/HomeBestBattleResponse.java create mode 100644 src/main/java/com/swyp/app/domain/home/dto/response/HomeEditorPickResponse.java rename src/main/java/com/swyp/app/domain/home/dto/response/{HomeBattleResponse.java => HomeNewBattleResponse.java} (57%) create mode 100644 src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayQuizResponse.java rename src/main/java/com/swyp/app/domain/home/dto/response/{HomeBattleOptionResponse.java => HomeTodayVoteOptionResponse.java} (67%) create mode 100644 src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayVoteResponse.java create mode 100644 src/main/java/com/swyp/app/domain/home/dto/response/HomeTrendingResponse.java create mode 100644 src/main/java/com/swyp/app/domain/search/controller/SearchController.java create mode 100644 src/main/java/com/swyp/app/domain/search/dto/response/SearchBattleListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/search/enums/SearchSortType.java create mode 100644 src/main/java/com/swyp/app/domain/search/service/SearchService.java create mode 100644 src/main/java/com/swyp/app/global/config/S3Config.java create mode 100644 src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java create mode 100644 src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java diff --git a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java index 3c7d63a5..2cf1dd9e 100644 --- a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java +++ b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java @@ -54,7 +54,13 @@ public TodayBattleResponse toTodayResponse(Battle b, List tags, List tags, // 상단 태그 리스트 - List options // 중앙 세로형 대결 카드 데이터 + List options, // 중앙 세로형 대결 카드 데이터 + // 퀴즈·투표 전용 필드 + String titlePrefix, // 투표 접두사 (예: "도덕의 기준은") + String titleSuffix, // 투표 접미사 (예: "이다") + String itemA, // 퀴즈 O 선택지 + String itemADesc, // 퀴즈 O 설명 + String itemB, // 퀴즈 X 선택지 + String itemBDesc // 퀴즈 X 설명 ) {} diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java index eef4f44c..4c888e01 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java @@ -54,4 +54,22 @@ public interface BattleRepository extends JpaRepository { // 기본 조회용 List findByTargetDateAndStatusAndDeletedAtIsNull(LocalDate date, BattleStatus status); + + // 탐색 탭: 전체 배틀 검색 (정렬은 Pageable Sort로 처리) + @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + List searchAll(Pageable pageable); + + @Query("SELECT COUNT(b) FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + long countSearchAll(); + + // 탐색 탭: 카테고리 태그 필터 배틀 검색 + @Query("SELECT DISTINCT b FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + List searchByCategory(@Param("categoryName") String categoryName, Pageable pageable); + + @Query("SELECT COUNT(DISTINCT b) FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + long countSearchByCategory(@Param("categoryName") String categoryName); } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java b/src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java index e3241446..1dc6d7b5 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleQueryService.java @@ -10,8 +10,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.swyp.app.domain.tag.enums.TagType; + import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; @@ -58,4 +61,20 @@ public Map getTopTagsByBattleIds(List battleIds, int limit) java.util.LinkedHashMap::new )); } + + public Optional getTopPhilosopherTagName(List battleIds) { + if (battleIds.isEmpty()) return Optional.empty(); + + List battleTags = battleTagRepository.findByBattleIdIn(battleIds); + + return battleTags.stream() + .filter(bt -> bt.getTag().getType() == TagType.PHILOSOPHER) + .collect(Collectors.groupingBy( + bt -> bt.getTag().getName(), + Collectors.counting() + )) + .entrySet().stream() + .max(Map.Entry.comparingByValue()) + .map(Map.Entry::getKey); + } } diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeBestBattleResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeBestBattleResponse.java new file mode 100644 index 00000000..85688985 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeBestBattleResponse.java @@ -0,0 +1,15 @@ +package com.swyp.app.domain.home.dto.response; + +import com.swyp.app.domain.battle.dto.response.BattleTagResponse; + +import java.util.List; + +public record HomeBestBattleResponse( + Long battleId, + String philosopherA, + String philosopherB, + String title, + List tags, + Integer audioDuration, + Integer viewCount +) {} diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeEditorPickResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeEditorPickResponse.java new file mode 100644 index 00000000..24862c78 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeEditorPickResponse.java @@ -0,0 +1,16 @@ +package com.swyp.app.domain.home.dto.response; + +import com.swyp.app.domain.battle.dto.response.BattleTagResponse; + +import java.util.List; + +public record HomeEditorPickResponse( + Long battleId, + String thumbnailUrl, + String optionATitle, + String optionBTitle, + String title, + String summary, + List tags, + Integer viewCount +) {} diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeBattleResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeNewBattleResponse.java similarity index 57% rename from src/main/java/com/swyp/app/domain/home/dto/response/HomeBattleResponse.java rename to src/main/java/com/swyp/app/domain/home/dto/response/HomeNewBattleResponse.java index c00da9d7..52e883b0 100644 --- a/src/main/java/com/swyp/app/domain/home/dto/response/HomeBattleResponse.java +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeNewBattleResponse.java @@ -1,20 +1,19 @@ package com.swyp.app.domain.home.dto.response; import com.swyp.app.domain.battle.dto.response.BattleTagResponse; -import com.swyp.app.domain.battle.enums.BattleType; import java.util.List; -public record HomeBattleResponse( +public record HomeNewBattleResponse( Long battleId, + String thumbnailUrl, String title, String summary, - String thumbnailUrl, - BattleType type, - Integer viewCount, - Long participantsCount, - Integer audioDuration, + String philosopherA, + String philosopherAImageUrl, + String philosopherB, + String philosopherBImageUrl, List tags, - List options -) { -} + Integer audioDuration, + Integer viewCount +) {} diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeResponse.java index 525680ad..8aa1b67b 100644 --- a/src/main/java/com/swyp/app/domain/home/dto/response/HomeResponse.java +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeResponse.java @@ -4,10 +4,10 @@ public record HomeResponse( boolean newNotice, - List editorPicks, - List trendingBattles, - List bestBattles, - List todayPicks, - List newBattles -) { -} + List editorPicks, + List trendingBattles, + List bestBattles, + List todayQuizzes, + List todayVotes, + List newBattles +) {} diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayQuizResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayQuizResponse.java new file mode 100644 index 00000000..00eb2b1b --- /dev/null +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayQuizResponse.java @@ -0,0 +1,12 @@ +package com.swyp.app.domain.home.dto.response; + +public record HomeTodayQuizResponse( + Long battleId, + String title, + String summary, + Long participantsCount, + String itemA, + String itemADesc, + String itemB, + String itemBDesc +) {} diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeBattleOptionResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayVoteOptionResponse.java similarity index 67% rename from src/main/java/com/swyp/app/domain/home/dto/response/HomeBattleOptionResponse.java rename to src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayVoteOptionResponse.java index b2ce088f..0c3f73dc 100644 --- a/src/main/java/com/swyp/app/domain/home/dto/response/HomeBattleOptionResponse.java +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayVoteOptionResponse.java @@ -2,8 +2,7 @@ import com.swyp.app.domain.battle.enums.BattleOptionLabel; -public record HomeBattleOptionResponse( +public record HomeTodayVoteOptionResponse( BattleOptionLabel label, - String text -) { -} + String title +) {} diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayVoteResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayVoteResponse.java new file mode 100644 index 00000000..33fd5b11 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTodayVoteResponse.java @@ -0,0 +1,12 @@ +package com.swyp.app.domain.home.dto.response; + +import java.util.List; + +public record HomeTodayVoteResponse( + Long battleId, + String titlePrefix, + String titleSuffix, + String summary, + Long participantsCount, + List options +) {} diff --git a/src/main/java/com/swyp/app/domain/home/dto/response/HomeTrendingResponse.java b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTrendingResponse.java new file mode 100644 index 00000000..30d1a2a1 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/home/dto/response/HomeTrendingResponse.java @@ -0,0 +1,14 @@ +package com.swyp.app.domain.home.dto.response; + +import com.swyp.app.domain.battle.dto.response.BattleTagResponse; + +import java.util.List; + +public record HomeTrendingResponse( + Long battleId, + String thumbnailUrl, + String title, + List tags, + Integer audioDuration, + Integer viewCount +) {} diff --git a/src/main/java/com/swyp/app/domain/home/service/HomeService.java b/src/main/java/com/swyp/app/domain/home/service/HomeService.java index 49198974..ee31bb84 100644 --- a/src/main/java/com/swyp/app/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/app/domain/home/service/HomeService.java @@ -1,20 +1,21 @@ package com.swyp.app.domain.home.service; +import com.swyp.app.domain.battle.dto.response.BattleTagResponse; import com.swyp.app.domain.battle.dto.response.TodayBattleResponse; import com.swyp.app.domain.battle.dto.response.TodayOptionResponse; +import com.swyp.app.domain.battle.enums.BattleOptionLabel; import com.swyp.app.domain.battle.enums.BattleType; +import com.swyp.app.domain.tag.enums.TagType; import com.swyp.app.domain.battle.service.BattleService; -import com.swyp.app.domain.home.dto.response.HomeBattleOptionResponse; -import com.swyp.app.domain.home.dto.response.HomeBattleResponse; -import com.swyp.app.domain.home.dto.response.HomeResponse; +import com.swyp.app.domain.home.dto.response.*; import com.swyp.app.domain.notice.enums.NoticePlacement; import com.swyp.app.domain.notice.service.NoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; +import java.util.Optional; @Service @RequiredArgsConstructor @@ -29,59 +30,119 @@ public class HomeService { public HomeResponse getHome() { boolean newNotice = !noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, NOTICE_EXISTS_LIMIT).isEmpty(); - List editorPicks = toHomeBattles(battleService.getEditorPicks()); - List trendingBattles = toHomeBattles(battleService.getTrendingBattles()); - List bestBattles = toHomeBattles(battleService.getBestBattles()); + List editorPickRaw = battleService.getEditorPicks(); + List trendingRaw = battleService.getTrendingBattles(); + List bestRaw = battleService.getBestBattles(); + List voteRaw = battleService.getTodayPicks(BattleType.VOTE); + List quizRaw = battleService.getTodayPicks(BattleType.QUIZ); - List todayPicks = new ArrayList<>(); - todayPicks.addAll(toHomeBattles(battleService.getTodayPicks(BattleType.VOTE))); - todayPicks.addAll(toHomeBattles(battleService.getTodayPicks(BattleType.QUIZ))); - - List excludeIds = collectBattleIds(editorPicks, trendingBattles, bestBattles, todayPicks); - List newBattles = toHomeBattles(battleService.getNewBattles(excludeIds)); + List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw, voteRaw, quizRaw); + List newRaw = battleService.getNewBattles(excludeIds); return new HomeResponse( newNotice, - editorPicks, - trendingBattles, - bestBattles, - todayPicks, - newBattles + editorPickRaw.stream().map(this::toEditorPick).toList(), + trendingRaw.stream().map(this::toTrending).toList(), + bestRaw.stream().map(this::toBestBattle).toList(), + quizRaw.stream().map(this::toTodayQuiz).toList(), + voteRaw.stream().map(this::toTodayVote).toList(), + newRaw.stream().map(this::toNewBattle).toList() + ); + } + + private HomeEditorPickResponse toEditorPick(TodayBattleResponse b) { + String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); + String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); + return new HomeEditorPickResponse( + b.battleId(), b.thumbnailUrl(), + optionA, optionB, + b.title(), b.summary(), + b.tags(), b.viewCount() + ); + } + + private HomeTrendingResponse toTrending(TodayBattleResponse b) { + return new HomeTrendingResponse( + b.battleId(), b.thumbnailUrl(), + b.title(), b.tags(), + b.audioDuration(), b.viewCount() + ); + } + + private HomeBestBattleResponse toBestBattle(TodayBattleResponse b) { + List philosophers = findPhilosopherNames(b.tags()); + String philoA = philosophers.size() > 0 ? philosophers.get(0) : null; + String philoB = philosophers.size() > 1 ? philosophers.get(1) : null; + return new HomeBestBattleResponse( + b.battleId(), + philoA, philoB, + b.title(), b.tags(), + b.audioDuration(), b.viewCount() ); } - private List toHomeBattles(List battles) { - return battles.stream() - .map(this::toHomeBattle) + private HomeTodayQuizResponse toTodayQuiz(TodayBattleResponse b) { + return new HomeTodayQuizResponse( + b.battleId(), b.title(), b.summary(), + b.participantsCount(), + b.itemA(), b.itemADesc(), + b.itemB(), b.itemBDesc() + ); + } + + private HomeTodayVoteResponse toTodayVote(TodayBattleResponse b) { + List options = b.options().stream() + .map(o -> new HomeTodayVoteOptionResponse(o.label(), o.title())) .toList(); + return new HomeTodayVoteResponse( + b.battleId(), + b.titlePrefix(), b.titleSuffix(), + b.summary(), b.participantsCount(), + options + ); } - private HomeBattleResponse toHomeBattle(TodayBattleResponse battle) { - return new HomeBattleResponse( - battle.battleId(), - battle.title(), - battle.summary(), - battle.thumbnailUrl(), - battle.type(), - battle.viewCount(), - battle.participantsCount(), - battle.audioDuration(), - battle.tags(), - battle.options().stream() - .map(this::toHomeOption) - .toList() + private HomeNewBattleResponse toNewBattle(TodayBattleResponse b) { + List philosophers = findPhilosopherNames(b.tags()); + String philoA = philosophers.size() > 0 ? philosophers.get(0) : null; + String philoB = philosophers.size() > 1 ? philosophers.get(1) : null; + String imageA = findOptionImageUrl(b.options(), BattleOptionLabel.A); + String imageB = findOptionImageUrl(b.options(), BattleOptionLabel.B); + return new HomeNewBattleResponse( + b.battleId(), b.thumbnailUrl(), + b.title(), b.summary(), + philoA, imageA, + philoB, imageB, + b.tags(), b.audioDuration(), b.viewCount() ); } - private HomeBattleOptionResponse toHomeOption(TodayOptionResponse option) { - return new HomeBattleOptionResponse(option.label(), option.title()); + private String findOptionTitle(List options, BattleOptionLabel label) { + return Optional.ofNullable(options).orElse(List.of()).stream() + .filter(o -> o.label() == label) + .map(TodayOptionResponse::title) + .findFirst().orElse(null); + } + + private List findPhilosopherNames(List tags) { + return Optional.ofNullable(tags).orElse(List.of()).stream() + .filter(t -> t.type() == TagType.PHILOSOPHER) + .map(BattleTagResponse::name) + .toList(); + } + + private String findOptionImageUrl(List options, BattleOptionLabel label) { + return Optional.ofNullable(options).orElse(List.of()).stream() + .filter(o -> o.label() == label) + .map(TodayOptionResponse::imageUrl) + .findFirst().orElse(null); } @SafeVarargs - private List collectBattleIds(List... groups) { + private List collectBattleIds(List... groups) { return List.of(groups).stream() .flatMap(List::stream) - .map(HomeBattleResponse::battleId) + .map(TodayBattleResponse::battleId) .distinct() .toList(); } diff --git a/src/main/java/com/swyp/app/domain/search/controller/SearchController.java b/src/main/java/com/swyp/app/domain/search/controller/SearchController.java new file mode 100644 index 00000000..e3468edb --- /dev/null +++ b/src/main/java/com/swyp/app/domain/search/controller/SearchController.java @@ -0,0 +1,29 @@ +package com.swyp.app.domain.search.controller; + +import com.swyp.app.domain.search.dto.response.SearchBattleListResponse; +import com.swyp.app.domain.search.enums.SearchSortType; +import com.swyp.app.domain.search.service.SearchService; +import com.swyp.app.global.common.response.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/search") +public class SearchController { + + private final SearchService searchService; + + @GetMapping("/battles") + public ApiResponse searchBattles( + @RequestParam(required = false) String category, + @RequestParam(required = false) SearchSortType sort, + @RequestParam(required = false) Integer offset, + @RequestParam(required = false) Integer size + ) { + return ApiResponse.onSuccess(searchService.searchBattles(category, sort, offset, size)); + } +} diff --git a/src/main/java/com/swyp/app/domain/search/dto/response/SearchBattleListResponse.java b/src/main/java/com/swyp/app/domain/search/dto/response/SearchBattleListResponse.java new file mode 100644 index 00000000..bb5b7688 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/search/dto/response/SearchBattleListResponse.java @@ -0,0 +1,25 @@ +package com.swyp.app.domain.search.dto.response; + +import com.swyp.app.domain.battle.dto.response.BattleTagResponse; +import com.swyp.app.domain.battle.enums.BattleType; + +import java.util.List; + +public record SearchBattleListResponse( + List items, + Integer nextOffset, + boolean hasNext +) { + + public record SearchBattleItem( + Long battleId, + String thumbnailUrl, + BattleType type, + String title, + String summary, + List tags, + Integer audioDuration, + Integer viewCount + ) { + } +} diff --git a/src/main/java/com/swyp/app/domain/search/enums/SearchSortType.java b/src/main/java/com/swyp/app/domain/search/enums/SearchSortType.java new file mode 100644 index 00000000..e0ace4a3 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/search/enums/SearchSortType.java @@ -0,0 +1,6 @@ +package com.swyp.app.domain.search.enums; + +public enum SearchSortType { + POPULAR, + LATEST +} diff --git a/src/main/java/com/swyp/app/domain/search/service/SearchService.java b/src/main/java/com/swyp/app/domain/search/service/SearchService.java new file mode 100644 index 00000000..713442c0 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/search/service/SearchService.java @@ -0,0 +1,90 @@ +package com.swyp.app.domain.search.service; + +import com.swyp.app.domain.battle.dto.response.BattleTagResponse; +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleTag; +import com.swyp.app.domain.battle.repository.BattleRepository; +import com.swyp.app.domain.battle.repository.BattleTagRepository; +import com.swyp.app.domain.search.dto.response.SearchBattleListResponse; +import com.swyp.app.domain.search.enums.SearchSortType; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class SearchService { + + private static final int DEFAULT_PAGE_SIZE = 20; + + private final BattleRepository battleRepository; + private final BattleTagRepository battleTagRepository; + + public SearchBattleListResponse searchBattles(String category, SearchSortType sort, Integer offset, Integer size) { + int pageOffset = offset == null || offset < 0 ? 0 : offset; + int pageSize = size == null || size <= 0 ? DEFAULT_PAGE_SIZE : size; + SearchSortType sortType = sort == null ? SearchSortType.POPULAR : sort; + + Sort pageSort = sortType == SearchSortType.LATEST + ? Sort.by(Sort.Direction.DESC, "createdAt") + : Sort.by(Sort.Direction.DESC, "viewCount"); + Pageable pageable = PageRequest.of(pageOffset / pageSize, pageSize, pageSort); + + List battles; + long totalCount; + + if (category == null || category.isBlank()) { + battles = battleRepository.searchAll(pageable); + totalCount = battleRepository.countSearchAll(); + } else { + battles = battleRepository.searchByCategory(category, pageable); + totalCount = battleRepository.countSearchByCategory(category); + } + + Map> tagMap = loadTagMap(battles); + + List items = battles.stream() + .map(battle -> new SearchBattleListResponse.SearchBattleItem( + battle.getId(), + battle.getThumbnailUrl(), + battle.getType(), + battle.getTitle(), + battle.getSummary(), + tagMap.getOrDefault(battle.getId(), List.of()), + battle.getAudioDuration(), + battle.getViewCount() + )) + .toList(); + + int nextOffset = pageOffset + pageSize; + boolean hasNext = nextOffset < totalCount; + return new SearchBattleListResponse(items, hasNext ? nextOffset : null, hasNext); + } + + private Map> loadTagMap(List battles) { + List battleIds = battles.stream().map(Battle::getId).toList(); + if (battleIds.isEmpty()) return Map.of(); + + List battleTags = battleTagRepository.findByBattleIdIn(battleIds); + return battleTags.stream() + .collect(Collectors.groupingBy( + bt -> bt.getBattle().getId(), + Collectors.mapping( + bt -> new BattleTagResponse( + bt.getTag().getId(), + bt.getTag().getName(), + bt.getTag().getType() + ), + Collectors.toList() + ) + )); + } +} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java index 9804cf3f..ab5149af 100644 --- a/src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java +++ b/src/main/java/com/swyp/app/domain/user/dto/response/MypageResponse.java @@ -16,12 +16,18 @@ public record ProfileInfo( String userTag, String nickname, CharacterType characterType, + String characterLabel, + String characterImageUrl, BigDecimal mannerTemperature ) { } public record PhilosopherInfo( - PhilosopherType philosopherType + PhilosopherType philosopherType, + String philosopherLabel, + String typeName, + String description, + String imageUrl ) { } diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java index 7d7f2450..ac76fe99 100644 --- a/src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java +++ b/src/main/java/com/swyp/app/domain/user/dto/response/RecapResponse.java @@ -13,7 +13,11 @@ public record RecapResponse( ) { public record PhilosopherCard( - PhilosopherType philosopherType + PhilosopherType philosopherType, + String philosopherLabel, + String typeName, + String description, + String imageUrl ) { } diff --git a/src/main/java/com/swyp/app/domain/user/entity/CharacterType.java b/src/main/java/com/swyp/app/domain/user/entity/CharacterType.java index e26e5b6d..4bc8cf00 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/CharacterType.java +++ b/src/main/java/com/swyp/app/domain/user/entity/CharacterType.java @@ -1,36 +1,32 @@ package com.swyp.app.domain.user.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; import java.util.Arrays; +@Getter public enum CharacterType { - OWL("owl"), - FOX("fox"), - WOLF("wolf"), - LION("lion"), - PENGUIN("penguin"), - BEAR("bear"), - RABBIT("rabbit"), - CAT("cat"); + OWL("부엉이", "images/characters/owl.png"), + FOX("여우", "images/characters/fox.png"), + WOLF("늑대", "images/characters/wolf.png"), + LION("사자", "images/characters/lion.png"), + PENGUIN("펭귄", "images/characters/penguin.png"), + BEAR("곰", "images/characters/bear.png"), + RABBIT("토끼", "images/characters/rabbit.png"), + CAT("고양이", "images/characters/cat.png"); - private final String value; + private final String label; + private final String imageKey; - CharacterType(String value) { - this.value = value; + CharacterType(String label, String imageKey) { + this.label = label; + this.imageKey = imageKey; } - @JsonValue - public String getValue() { - return value; - } - - @JsonCreator - public static CharacterType from(String value) { + public static CharacterType from(String input) { return Arrays.stream(values()) - .filter(type -> type.value.equalsIgnoreCase(value)) + .filter(type -> type.name().equalsIgnoreCase(input) || type.label.equals(input)) .findFirst() - .orElseThrow(() -> new IllegalArgumentException("Unknown character type: " + value)); + .orElseThrow(() -> new IllegalArgumentException("Unknown character type: " + input)); } } diff --git a/src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java b/src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java index 287a5209..b4e84db3 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java +++ b/src/main/java/com/swyp/app/domain/user/entity/CharacterTypeConverter.java @@ -8,7 +8,7 @@ public class CharacterTypeConverter implements AttributeConverter type.label.equals(label)) + .findFirst() + .orElse(null); + } } diff --git a/src/main/java/com/swyp/app/domain/user/entity/UserProfile.java b/src/main/java/com/swyp/app/domain/user/entity/UserProfile.java index 7e063f56..6131b7bd 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/UserProfile.java +++ b/src/main/java/com/swyp/app/domain/user/entity/UserProfile.java @@ -2,6 +2,8 @@ import com.swyp.app.global.common.BaseEntity; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; @@ -29,6 +31,9 @@ public class UserProfile extends BaseEntity { private CharacterType characterType; + @Enumerated(EnumType.STRING) + private PhilosopherType philosopherType; + private BigDecimal mannerTemperature; @Builder @@ -47,4 +52,8 @@ public void update(String nickname, CharacterType characterType) { this.characterType = characterType; } } + + public void updatePhilosopherType(PhilosopherType philosopherType) { + this.philosopherType = philosopherType; + } } diff --git a/src/main/java/com/swyp/app/domain/user/service/MypageService.java b/src/main/java/com/swyp/app/domain/user/service/MypageService.java index 9db9a2ea..fa45e85f 100644 --- a/src/main/java/com/swyp/app/domain/user/service/MypageService.java +++ b/src/main/java/com/swyp/app/domain/user/service/MypageService.java @@ -28,10 +28,10 @@ import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.user.entity.UserProfile; import com.swyp.app.domain.user.entity.UserSettings; -import com.swyp.app.domain.user.entity.UserTendencyScore; import com.swyp.app.domain.user.entity.VoteSide; import com.swyp.app.domain.vote.entity.Vote; import com.swyp.app.domain.vote.service.VoteQueryService; +import com.swyp.app.global.infra.s3.service.S3PresignedUrlService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,22 +54,35 @@ public class MypageService { private final VoteQueryService voteQueryService; private final BattleQueryService battleQueryService; private final PerspectiveQueryService perspectiveQueryService; + private final S3PresignedUrlService s3PresignedUrlService; + @Transactional public MypageResponse getMypage() { User user = userService.findCurrentUser(); UserProfile profile = userService.findUserProfile(user.getId()); + CharacterType characterType = profile.getCharacterType(); + String characterImageUrl = characterType != null + ? s3PresignedUrlService.generatePresignedUrl(characterType.getImageKey()) : null; + MypageResponse.ProfileInfo profileInfo = new MypageResponse.ProfileInfo( user.getUserTag(), profile.getNickname(), - profile.getCharacterType(), + characterType, + characterType != null ? characterType.getLabel() : null, + characterImageUrl, profile.getMannerTemperature() ); - // TODO: 철학자 산출 로직 확정 후 구현, 현재는 임시로 SOCRATES 반환 - MypageResponse.PhilosopherInfo philosopherInfo = new MypageResponse.PhilosopherInfo( - PhilosopherType.SOCRATES - ); + PhilosopherType philosopherType = resolvePhilosopherType(user.getId(), profile); + MypageResponse.PhilosopherInfo philosopherInfo = philosopherType != null + ? new MypageResponse.PhilosopherInfo( + philosopherType, + philosopherType.getLabel(), + philosopherType.getTypeName(), + philosopherType.getDescription(), + s3PresignedUrlService.generatePresignedUrl(philosopherType.getImageKey())) + : null; int currentPoint = creditService.getTotalPoints(user.getId()); TierCode tierCode = TierCode.fromPoints(currentPoint); @@ -84,20 +97,24 @@ public MypageResponse getMypage() { public RecapResponse getRecap() { User user = userService.findCurrentUser(); - UserTendencyScore score = userService.findUserTendencyScore(user.getId()); + UserProfile profile = userService.findUserProfile(user.getId()); - // TODO: 철학자 산출 로직 확정 후 구현, 현재는 임시 값 반환 - RecapResponse.PhilosopherCard myCard = new RecapResponse.PhilosopherCard(PhilosopherType.SOCRATES); - RecapResponse.PhilosopherCard bestMatchCard = new RecapResponse.PhilosopherCard(PhilosopherType.PLATO); - RecapResponse.PhilosopherCard worstMatchCard = new RecapResponse.PhilosopherCard(PhilosopherType.MARX); + PhilosopherType philosopherType = profile.getPhilosopherType(); + if (philosopherType == null) { + return null; + } + + RecapResponse.PhilosopherCard myCard = toPhilosopherCard(philosopherType); + RecapResponse.PhilosopherCard bestMatchCard = toPhilosopherCard(philosopherType.getBestMatch()); + RecapResponse.PhilosopherCard worstMatchCard = toPhilosopherCard(philosopherType.getWorstMatch()); RecapResponse.Scores scores = new RecapResponse.Scores( - score.getPrinciple(), - score.getReason(), - score.getIndividual(), - score.getChange(), - score.getInner(), - score.getIdeal() + philosopherType.getPrinciple(), + philosopherType.getReason(), + philosopherType.getIndividual(), + philosopherType.getChange(), + philosopherType.getInner(), + philosopherType.getIdeal() ); RecapResponse.PreferenceReport preferenceReport = buildPreferenceReport(user.getId()); @@ -285,6 +302,38 @@ public NoticeDetailResponse getNoticeDetail(Long noticeId) { ); } + private static final int PHILOSOPHER_CALC_THRESHOLD = 5; + + private PhilosopherType resolvePhilosopherType(Long userId, UserProfile profile) { + if (profile.getPhilosopherType() != null) { + return profile.getPhilosopherType(); + } + + long totalVotes = voteQueryService.countTotalParticipation(userId); + if (totalVotes < PHILOSOPHER_CALC_THRESHOLD) { + return null; + } + + List battleIds = voteQueryService.findFirstNBattleIds(userId, PHILOSOPHER_CALC_THRESHOLD); + return battleQueryService.getTopPhilosopherTagName(battleIds) + .map(PhilosopherType::fromLabel) + .map(type -> { + profile.updatePhilosopherType(type); + return type; + }) + .orElse(null); + } + + private RecapResponse.PhilosopherCard toPhilosopherCard(PhilosopherType type) { + return new RecapResponse.PhilosopherCard( + type, + type.getLabel(), + type.getTypeName(), + type.getDescription(), + s3PresignedUrlService.generatePresignedUrl(type.getImageKey()) + ); + } + private VoteSide toVoteSide(BattleOptionLabel label) { return label == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; } diff --git a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java index 086be02a..da6a67ed 100644 --- a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java +++ b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java @@ -55,4 +55,8 @@ List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( // MypageService (recap): 사용자가 참여한 모든 투표 (배틀 목록 추출용) List findByUserId(Long userId); + + // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) + @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.userId = :userId ORDER BY v.createdAt ASC") + List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); } diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java b/src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java index 72509196..b7d00c72 100644 --- a/src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteQueryService.java @@ -68,4 +68,11 @@ public List findParticipatedBattleIds(Long userId) { .distinct() .toList(); } + + public List findFirstNBattleIds(Long userId, int n) { + return voteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() + .map(v -> v.getBattle().getId()) + .distinct() + .toList(); + } } diff --git a/src/main/java/com/swyp/app/global/config/S3Config.java b/src/main/java/com/swyp/app/global/config/S3Config.java new file mode 100644 index 00000000..f2ae86f2 --- /dev/null +++ b/src/main/java/com/swyp/app/global/config/S3Config.java @@ -0,0 +1,27 @@ +package com.swyp.app.global.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; +import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.s3.presigner.S3Presigner; + +// TODO: S3 Presigned URL 정식 구현 시 교체 필요 (임시 구현) +@Configuration +public class S3Config { + + @Bean + public S3Presigner s3Presigner( + @Value("${spring.cloud.aws.region.static}") String region, + @Value("${spring.cloud.aws.credentials.access-key}") String accessKey, + @Value("${spring.cloud.aws.credentials.secret-key}") String secretKey) { + + return S3Presigner.builder() + .region(Region.of(region)) + .credentialsProvider(StaticCredentialsProvider.create( + AwsBasicCredentials.create(accessKey, secretKey))) + .build(); + } +} diff --git a/src/main/java/com/swyp/app/global/infra/s3/controller/FileUploadController.java b/src/main/java/com/swyp/app/global/infra/s3/controller/FileUploadController.java index 14b28593..c17c9b4e 100644 --- a/src/main/java/com/swyp/app/global/infra/s3/controller/FileUploadController.java +++ b/src/main/java/com/swyp/app/global/infra/s3/controller/FileUploadController.java @@ -1,7 +1,9 @@ package com.swyp.app.global.infra.s3.controller; import com.swyp.app.global.common.response.ApiResponse; +import com.swyp.app.global.infra.s3.dto.FileUploadResponse; import com.swyp.app.global.infra.s3.enums.FileCategory; +import com.swyp.app.global.infra.s3.service.S3PresignedUrlService; import com.swyp.app.global.infra.s3.service.S3UploadService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -26,10 +28,11 @@ public class FileUploadController { private final S3UploadService s3UploadService; + private final S3PresignedUrlService s3PresignedUrlService; @Operation(summary = "S3 파일 업로드", description = "도메인 카테고리(PHILOSOPHER, BATTLE, SCENARIO)에 맞춰 파일을 업로드합니다.") @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public ApiResponse uploadFile( + public ApiResponse uploadFile( @Parameter(description = "업로드할 파일", content = @Content(mediaType = MediaType.MULTIPART_FORM_DATA_VALUE)) @RequestParam("file") MultipartFile multipartFile, @@ -42,10 +45,13 @@ public ApiResponse uploadFile( // 2. 경로 생성 (예: images/battles/UUID_thumb.png) String fileName = category.getPath() + "/" + UUID.randomUUID() + "_" + multipartFile.getOriginalFilename(); - // 3. S3 업로드 - String s3Url = s3UploadService.uploadFile(fileName, tempFile); + // 3. S3 업로드 (S3 키 반환) + String s3Key = s3UploadService.uploadFile(fileName, tempFile); - return ApiResponse.onSuccess(s3Url); + // 4. 미리보기용 Presigned URL 생성 + String presignedUrl = s3PresignedUrlService.generatePresignedUrl(s3Key); + + return ApiResponse.onSuccess(new FileUploadResponse(s3Key, presignedUrl)); } private File convertMultiPartToFile(MultipartFile file) throws IOException { diff --git a/src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java b/src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java new file mode 100644 index 00000000..beaf366f --- /dev/null +++ b/src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java @@ -0,0 +1,4 @@ +package com.swyp.app.global.infra.s3.dto; + +// TODO: S3 Presigned URL 정식 구현 시 교체 필요 (임시 구현) +public record FileUploadResponse(String s3Key, String presignedUrl) {} diff --git a/src/main/java/com/swyp/app/global/infra/s3/enums/FileCategory.java b/src/main/java/com/swyp/app/global/infra/s3/enums/FileCategory.java index f6659ba6..11cd0e89 100644 --- a/src/main/java/com/swyp/app/global/infra/s3/enums/FileCategory.java +++ b/src/main/java/com/swyp/app/global/infra/s3/enums/FileCategory.java @@ -6,6 +6,7 @@ public enum FileCategory { PHILOSOPHER("images/philosophers"), // 철학자 이미지 + CHARACTER("images/characters"), // 캐릭터 프로필 이미지 BATTLE("images/battles"), // 배틀 썸네일 SCENARIO("audio/scenarios"); // 시나리오 음성 diff --git a/src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java b/src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java new file mode 100644 index 00000000..ca1fe2e3 --- /dev/null +++ b/src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java @@ -0,0 +1,65 @@ +package com.swyp.app.global.infra.s3.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import software.amazon.awssdk.services.s3.model.GetObjectRequest; +import software.amazon.awssdk.services.s3.presigner.S3Presigner; +import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest; + +import java.time.Duration; +import java.util.Map; +import java.util.stream.Collectors; + +// TODO: S3 Presigned URL 정식 구현 시 교체 필요 (임시 구현) +@Service +@RequiredArgsConstructor +public class S3PresignedUrlService { + + private final S3Presigner s3Presigner; + + @Value("${spring.cloud.aws.s3.bucket}") + private String bucketName; + + @Value("${app.s3.presigned-url.expiration-hours:6}") + private int expirationHours; + + public String generatePresignedUrl(String s3KeyOrUrl) { + if (s3KeyOrUrl == null || s3KeyOrUrl.isBlank()) { + return null; + } + + String key = extractKey(s3KeyOrUrl); + + GetObjectRequest getObjectRequest = GetObjectRequest.builder() + .bucket(bucketName) + .key(key) + .build(); + + GetObjectPresignRequest presignRequest = GetObjectPresignRequest.builder() + .signatureDuration(Duration.ofHours(expirationHours)) + .getObjectRequest(getObjectRequest) + .build(); + + return s3Presigner.presignGetObject(presignRequest).url().toString(); + } + + public Map generatePresignedUrls(Map keyMap) { + if (keyMap == null || keyMap.isEmpty()) { + return keyMap; + } + return keyMap.entrySet().stream() + .collect(Collectors.toMap( + Map.Entry::getKey, + e -> generatePresignedUrl(e.getValue()) + )); + } + + private String extractKey(String input) { + if (input.startsWith("https://") && input.contains(".s3.") && input.contains(".amazonaws.com/")) { + int idx = input.indexOf(".amazonaws.com/") + ".amazonaws.com/".length(); + return input.substring(idx); + } + return input; + } +} diff --git a/src/main/java/com/swyp/app/global/infra/s3/service/S3UploadServiceImpl.java b/src/main/java/com/swyp/app/global/infra/s3/service/S3UploadServiceImpl.java index b11a7332..9151a592 100644 --- a/src/main/java/com/swyp/app/global/infra/s3/service/S3UploadServiceImpl.java +++ b/src/main/java/com/swyp/app/global/infra/s3/service/S3UploadServiceImpl.java @@ -24,9 +24,6 @@ public class S3UploadServiceImpl implements S3UploadService { @Value("${spring.cloud.aws.s3.bucket}") private String bucketName; - @Value("${spring.cloud.aws.region.static}") - private String region; - @Override public String uploadFile(String key, File file) { if (file == null || !file.exists()) { @@ -49,10 +46,9 @@ public String uploadFile(String key, File file) { s3Client.putObject(putObjectRequest, RequestBody.fromFile(file)); - String fileUrl = String.format("https://%s.s3.%s.amazonaws.com/%s", bucketName, region, key); - log.info("[AWS S3] 업로드 완료! 실제 URL: {}, Content-Type: {}", fileUrl, contentType); + log.info("[AWS S3] 업로드 완료! 키: {}, Content-Type: {}", key, contentType); - return fileUrl; + return key; } catch (Exception e) { log.error("[AWS S3] 파일 업로드 실패 - 키: {}", key, e); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2199e273..0a5bf3b3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -95,4 +95,7 @@ jwt: refresh-token-expiration: 1209600000 # 14일 app: - baseUrl: http://localhost:8080 \ No newline at end of file + baseUrl: http://localhost:8080 + s3: + presigned-url: + expiration-hours: 6 \ No newline at end of file diff --git a/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java b/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java index e7e3403a..254a1943 100644 --- a/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java +++ b/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java @@ -5,7 +5,7 @@ import com.swyp.app.domain.battle.enums.BattleOptionLabel; import com.swyp.app.domain.battle.enums.BattleType; import com.swyp.app.domain.battle.service.BattleService; -import com.swyp.app.domain.home.dto.response.HomeBattleResponse; +import com.swyp.app.domain.home.dto.response.*; import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; import com.swyp.app.domain.notice.enums.NoticePlacement; import com.swyp.app.domain.notice.service.NoticeService; @@ -51,8 +51,8 @@ void getHome_aggregates_sections_by_spec() { TodayBattleResponse editorPick = battle("editor-id", BATTLE); TodayBattleResponse trendingBattle = battle("trending-id", BATTLE); TodayBattleResponse bestBattle = battle("best-id", BATTLE); - TodayBattleResponse todayVotePick = battle("today-vote-id", VOTE); - TodayBattleResponse quizBattle = quiz("quiz-id"); + TodayBattleResponse todayVote = vote("vote-id"); + TodayBattleResponse todayQuiz = quiz("quiz-id"); TodayBattleResponse newBattle = battle("new-id", BATTLE); NoticeSummaryResponse notice = new NoticeSummaryResponse( @@ -70,33 +70,36 @@ void getHome_aggregates_sections_by_spec() { when(battleService.getEditorPicks()).thenReturn(List.of(editorPick)); when(battleService.getTrendingBattles()).thenReturn(List.of(trendingBattle)); when(battleService.getBestBattles()).thenReturn(List.of(bestBattle)); - when(battleService.getTodayPicks(VOTE)).thenReturn(List.of(todayVotePick)); - when(battleService.getTodayPicks(QUIZ)).thenReturn(List.of(quizBattle)); + when(battleService.getTodayPicks(VOTE)).thenReturn(List.of(todayVote)); + when(battleService.getTodayPicks(QUIZ)).thenReturn(List.of(todayQuiz)); when(battleService.getNewBattles(List.of( editorPick.battleId(), trendingBattle.battleId(), bestBattle.battleId(), - todayVotePick.battleId(), - quizBattle.battleId() + todayVote.battleId(), + todayQuiz.battleId() ))).thenReturn(List.of(newBattle)); var response = homeService.getHome(); assertThat(response.newNotice()).isTrue(); - assertThat(response.editorPicks()).extracting(HomeBattleResponse::title).containsExactly("editor-id"); - assertThat(response.trendingBattles()).extracting(HomeBattleResponse::title).containsExactly("trending-id"); - assertThat(response.bestBattles()).extracting(HomeBattleResponse::title).containsExactly("best-id"); - assertThat(response.todayPicks()).extracting(HomeBattleResponse::title).containsExactly("today-vote-id", "quiz-id"); - assertThat(response.newBattles()).extracting(HomeBattleResponse::title).containsExactly("new-id"); - assertThat(response.todayPicks().get(0).options()).extracting(option -> option.text()).containsExactly("A", "B"); - assertThat(response.todayPicks().get(1).options()).extracting(option -> option.text()).containsExactly("A", "B", "C", "D"); + assertThat(response.editorPicks()).extracting(HomeEditorPickResponse::title).containsExactly("editor-id"); + assertThat(response.trendingBattles()).extracting(HomeTrendingResponse::title).containsExactly("trending-id"); + assertThat(response.bestBattles()).extracting(HomeBestBattleResponse::title).containsExactly("best-id"); + assertThat(response.todayQuizzes()).extracting(HomeTodayQuizResponse::title).containsExactly("quiz-id"); + assertThat(response.todayVotes()).hasSize(1); + assertThat(response.todayVotes().get(0).titlePrefix()).isEqualTo("도덕의 기준은"); + assertThat(response.todayVotes().get(0).options()).extracting(HomeTodayVoteOptionResponse::title) + .containsExactly("결과", "의도", "규칙", "덕"); + assertThat(response.todayQuizzes().get(0).itemA()).isEqualTo("정답"); + assertThat(response.newBattles()).extracting(HomeNewBattleResponse::title).containsExactly("new-id"); verify(battleService).getNewBattles(argThat(ids -> ids.equals(List.of( editorPick.battleId(), trendingBattle.battleId(), bestBattle.battleId(), - todayVotePick.battleId(), - quizBattle.battleId() + todayVote.battleId(), + todayQuiz.battleId() )))); } @@ -117,7 +120,8 @@ void getHome_returns_false_and_empty_lists_when_no_data() { assertThat(response.editorPicks()).isEmpty(); assertThat(response.trendingBattles()).isEmpty(); assertThat(response.bestBattles()).isEmpty(); - assertThat(response.todayPicks()).isEmpty(); + assertThat(response.todayQuizzes()).isEmpty(); + assertThat(response.todayVotes()).isEmpty(); assertThat(response.newBattles()).isEmpty(); } @@ -162,39 +166,39 @@ void getHome_newNotice_true_with_multiple_notices() { private TodayBattleResponse battle(String title, BattleType type) { return new TodayBattleResponse( - generateId(), - title, - "summary", - "thumbnail", - type, - 10, - 20L, - 90, + generateId(), title, "summary", "thumbnail", type, + 10, 20L, 90, List.of(), List.of( new TodayOptionResponse(generateId(), BattleOptionLabel.A, "A", "rep-a", "stance-a", "image-a"), new TodayOptionResponse(generateId(), BattleOptionLabel.B, "B", "rep-b", "stance-b", "image-b") - ) + ), + null, null, null, null, null, null ); } private TodayBattleResponse quiz(String title) { return new TodayBattleResponse( - generateId(), - title, - "summary", - "thumbnail", - QUIZ, - 30, - 40L, - 60, + generateId(), title, "summary", "thumbnail", QUIZ, + 30, 40L, 60, + List.of(), + List.of(), + null, null, "정답", "정답 설명", "오답", "오답 설명" + ); + } + + private TodayBattleResponse vote(String title) { + return new TodayBattleResponse( + generateId(), title, "summary", "thumbnail", VOTE, + 50, 60L, 0, List.of(), List.of( - new TodayOptionResponse(generateId(), BattleOptionLabel.A, "A", "rep-a", "stance-a", "image-a"), - new TodayOptionResponse(generateId(), BattleOptionLabel.B, "B", "rep-b", "stance-b", "image-b"), - new TodayOptionResponse(generateId(), BattleOptionLabel.C, "C", "rep-c", "stance-c", "image-c"), - new TodayOptionResponse(generateId(), BattleOptionLabel.D, "D", "rep-d", "stance-d", "image-d") - ) + new TodayOptionResponse(generateId(), BattleOptionLabel.A, "결과", null, null, null), + new TodayOptionResponse(generateId(), BattleOptionLabel.B, "의도", null, null, null), + new TodayOptionResponse(generateId(), BattleOptionLabel.C, "규칙", null, null, null), + new TodayOptionResponse(generateId(), BattleOptionLabel.D, "덕", null, null, null) + ), + "도덕의 기준은", "이다", null, null, null, null ); } } diff --git a/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java index 617a27bc..5ce1473e 100644 --- a/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java +++ b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java @@ -32,10 +32,10 @@ import com.swyp.app.domain.user.entity.UserRole; import com.swyp.app.domain.user.entity.UserSettings; import com.swyp.app.domain.user.entity.UserStatus; -import com.swyp.app.domain.user.entity.UserTendencyScore; import com.swyp.app.domain.user.entity.VoteSide; import com.swyp.app.domain.vote.entity.Vote; import com.swyp.app.domain.vote.service.VoteQueryService; +import com.swyp.app.global.infra.s3.service.S3PresignedUrlService; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -52,6 +52,7 @@ import java.util.concurrent.atomic.AtomicLong; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -71,6 +72,8 @@ class MypageServiceTest { private BattleQueryService battleQueryService; @Mock private PerspectiveQueryService perspectiveQueryService; + @Mock + private S3PresignedUrlService s3PresignedUrlService; @InjectMocks private MypageService mypageService; @@ -86,10 +89,12 @@ private Long generateId() { void getMypage_returns_profile_philosopher_tier() { User user = createUser(1L, "myTag"); UserProfile profile = createProfile(user, "nick", CharacterType.OWL); + profile.updatePhilosopherType(PhilosopherType.KANT); when(userService.findCurrentUser()).thenReturn(user); when(userService.findUserProfile(1L)).thenReturn(profile); when(creditService.getTotalPoints(1L)).thenReturn(0); + when(s3PresignedUrlService.generatePresignedUrl(anyString())).thenReturn("https://presigned-url"); MypageResponse response = mypageService.getMypage(); @@ -97,7 +102,9 @@ void getMypage_returns_profile_philosopher_tier() { assertThat(response.profile().nickname()).isEqualTo("nick"); assertThat(response.profile().characterType()).isEqualTo(CharacterType.OWL); assertThat(response.profile().mannerTemperature()).isEqualByComparingTo(BigDecimal.valueOf(36.5)); - assertThat(response.philosopher().philosopherType()).isEqualTo(PhilosopherType.SOCRATES); + assertThat(response.philosopher().philosopherType()).isEqualTo(PhilosopherType.KANT); + assertThat(response.philosopher().typeName()).isEqualTo("원칙형"); + assertThat(response.philosopher().description()).isNotNull(); assertThat(response.tier().tierCode()).isEqualTo(TierCode.WANDERER); assertThat(response.tier().currentPoint()).isZero(); } @@ -106,14 +113,12 @@ void getMypage_returns_profile_philosopher_tier() { @DisplayName("철학자카드와 성향점수와 선호보고서를 반환한다") void getRecap_returns_cards_scores_report() { User user = createUser(1L, "tag"); - UserTendencyScore score = UserTendencyScore.builder() - .user(user) - .principle(10).reason(20).individual(30) - .change(40).inner(50).ideal(60) - .build(); + UserProfile profile = createProfile(user, "nick", CharacterType.OWL); + profile.updatePhilosopherType(PhilosopherType.KANT); when(userService.findCurrentUser()).thenReturn(user); - when(userService.findUserTendencyScore(1L)).thenReturn(score); + when(userService.findUserProfile(1L)).thenReturn(profile); + when(s3PresignedUrlService.generatePresignedUrl(anyString())).thenReturn("https://presigned-url"); when(voteQueryService.countTotalParticipation(1L)).thenReturn(15L); when(voteQueryService.countOpinionChanges(1L)).thenReturn(3L); when(voteQueryService.calculateBattleWinRate(1L)).thenReturn(70); @@ -128,11 +133,11 @@ void getRecap_returns_cards_scores_report() { RecapResponse response = mypageService.getRecap(); - assertThat(response.myCard().philosopherType()).isEqualTo(PhilosopherType.SOCRATES); - assertThat(response.bestMatchCard().philosopherType()).isEqualTo(PhilosopherType.PLATO); - assertThat(response.worstMatchCard().philosopherType()).isEqualTo(PhilosopherType.MARX); - assertThat(response.scores().principle()).isEqualTo(10); - assertThat(response.scores().ideal()).isEqualTo(60); + assertThat(response.myCard().philosopherType()).isEqualTo(PhilosopherType.KANT); + assertThat(response.bestMatchCard().philosopherType()).isEqualTo(PhilosopherType.CONFUCIUS); + assertThat(response.worstMatchCard().philosopherType()).isEqualTo(PhilosopherType.NIETZSCHE); + assertThat(response.scores().principle()).isEqualTo(92); + assertThat(response.scores().ideal()).isEqualTo(45); assertThat(response.preferenceReport().totalParticipation()).isEqualTo(15); assertThat(response.preferenceReport().opinionChanges()).isEqualTo(3); assertThat(response.preferenceReport().battleWinRate()).isEqualTo(70); @@ -141,29 +146,17 @@ void getRecap_returns_cards_scores_report() { } @Test - @DisplayName("투표이력이 없으면 선호보고서가 0값이다") - void getRecap_returns_zero_report_when_no_votes() { + @DisplayName("철학자유형이 미산출이면 recap은 null이다") + void getRecap_returns_null_when_no_philosopher() { User user = createUser(1L, "tag"); - UserTendencyScore score = UserTendencyScore.builder() - .user(user) - .principle(0).reason(0).individual(0) - .change(0).inner(0).ideal(0) - .build(); + UserProfile profile = createProfile(user, "nick", CharacterType.OWL); when(userService.findCurrentUser()).thenReturn(user); - when(userService.findUserTendencyScore(1L)).thenReturn(score); - when(voteQueryService.countTotalParticipation(1L)).thenReturn(0L); - when(voteQueryService.countOpinionChanges(1L)).thenReturn(0L); - when(voteQueryService.calculateBattleWinRate(1L)).thenReturn(0); - when(voteQueryService.findParticipatedBattleIds(1L)).thenReturn(List.of()); - when(battleQueryService.getTopTagsByBattleIds(List.of(), 4)).thenReturn(new LinkedHashMap<>()); + when(userService.findUserProfile(1L)).thenReturn(profile); RecapResponse response = mypageService.getRecap(); - assertThat(response.preferenceReport().totalParticipation()).isZero(); - assertThat(response.preferenceReport().opinionChanges()).isZero(); - assertThat(response.preferenceReport().battleWinRate()).isZero(); - assertThat(response.preferenceReport().favoriteTopics()).isEmpty(); + assertThat(response).isNull(); } @Test From 005ac768b45c25e291aea1c34387fc326370d82a Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sat, 28 Mar 2026 23:20:58 +0900 Subject: [PATCH 30/94] =?UTF-8?q?#51=20[Refactor]=20User=20=EC=97=94?= =?UTF-8?q?=ED=8B=B0=ED=8B=B0=20=EC=97=B0=EA=B2=B0=20=EB=B0=8F=20=EC=A0=84?= =?UTF-8?q?=20=EB=8F=84=EB=A9=94=EC=9D=B8=20TODO=20=ED=95=B4=EC=86=8C=20(#?= =?UTF-8?q?66)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - Vote, Perspective, PerspectiveComment, PerspectiveLike, CreditHistory의 `Long userId` → `@ManyToOne User` 엔티티 관계로 전환 - Perspective의 `Long battleId`, `Long optionId` → `@ManyToOne Battle`, `@ManyToOne BattleOption`으로 전환 - 전 도메인 컨트롤러의 `Long userId = 1L` 하드코딩 → `@AuthenticationPrincipal Long userId`로 교체 (VoteController, PerspectiveController, PerspectiveCommentController, PerspectiveLikeController) - 해소된 TODO 주석 제거 (S3 임시 구현 3건, AdMob 포인트 합산, Prevote 체크) - #64 작업 포함: S3 Presigned URL, 홈 API 섹션별 DTO, 철학자 유형 산출/확장, 탐색 탭 검색 API ## Changes (29 files) - **Entities** (5): Vote, Perspective, PerspectiveComment, PerspectiveLike, CreditHistory - **Repositories** (5): VoteRepository, PerspectiveRepository, PerspectiveCommentRepository, PerspectiveLikeRepository, CreditHistoryRepository - **Services** (10): VoteServiceImpl, VoteQueryService, PerspectiveService, PerspectiveCommentService, PerspectiveLikeService, PerspectiveQueryService, CreditService, MypageService, ScenarioServiceImpl, BattleServiceImpl - **Controllers** (5): VoteController, PerspectiveController, PerspectiveCommentController, PerspectiveLikeController, ScenarioController - **Infra** (3): S3Config, S3PresignedUrlService, FileUploadResponse — TODO 제거 - **Tests** (2): CreditServiceTest, MypageServiceTest ## Test plan - [x] `./gradlew compileJava compileTestJava` 컴파일 성공 - [x] CreditServiceTest 5개 통과 - [x] MypageServiceTest 12개 통과 - [ ] 로컬 Swagger에서 @AuthenticationPrincipal 동작 확인 - [ ] 투표 → 관점 → 좋아요/댓글 플로우 E2E 확인 Closes #51 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 --- .../battle/service/BattleServiceImpl.java | 2 +- .../PerspectiveCommentController.java | 15 +++---- .../controller/PerspectiveController.java | 29 ++++++------ .../controller/PerspectiveLikeController.java | 13 +++--- .../perspective/entity/Perspective.java | 35 ++++++++------- .../entity/PerspectiveComment.java | 11 ++--- .../perspective/entity/PerspectiveLike.java | 12 ++--- .../PerspectiveCommentRepository.java | 3 +- .../repository/PerspectiveLikeRepository.java | 3 +- .../service/PerspectiveCommentService.java | 19 +++++--- .../service/PerspectiveLikeService.java | 9 +++- .../service/PerspectiveService.java | 22 ++++++---- .../service/AdMobRewardServiceImpl.java | 3 -- .../controller/ScenarioController.java | 2 +- .../scenario/service/ScenarioServiceImpl.java | 2 +- .../app/domain/user/entity/CreditHistory.java | 12 +++-- .../repository/CreditHistoryRepository.java | 2 +- .../domain/user/service/CreditService.java | 7 ++- .../domain/user/service/MypageService.java | 12 ++--- .../vote/controller/VoteController.java | 15 +++---- .../com/swyp/app/domain/vote/entity/Vote.java | 22 ++++------ .../vote/repository/VoteRepository.java | 24 ++++------ .../app/domain/vote/service/VoteService.java | 3 +- .../domain/vote/service/VoteServiceImpl.java | 27 ++++++++---- .../com/swyp/app/global/config/S3Config.java | 1 - .../infra/s3/dto/FileUploadResponse.java | 1 - .../s3/service/S3PresignedUrlService.java | 1 - .../user/service/CreditServiceTest.java | 13 +++++- .../user/service/MypageServiceTest.java | 44 +++++++++---------- 29 files changed, 192 insertions(+), 172 deletions(-) diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java index 1bba4127..ea0671a9 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java @@ -137,7 +137,7 @@ public BattleUserDetailResponse getBattleDetail(Long battleId) { List allTags = getTagsByBattle(battle); List options = battleOptionRepository.findByBattle(battle); - String voteStatus = voteRepository.findByBattleAndUserId(battle, 1L) + String voteStatus = voteRepository.findByBattleIdAndUserId(battleId, 1L) .map(v -> v.getPostVoteOption() != null ? v.getPostVoteOption().getLabel().name() : "NONE") .orElse("NONE"); diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java index d869a230..f7c78c9e 100644 --- a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveCommentController.java @@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; @@ -33,10 +34,9 @@ public class PerspectiveCommentController { @PostMapping("/perspectives/{perspectiveId}/comments") public ApiResponse createComment( @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId, @RequestBody @Valid CreateCommentRequest request ) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(commentService.createComment(perspectiveId, userId, request)); } @@ -44,11 +44,10 @@ public ApiResponse createComment( @GetMapping("/perspectives/{perspectiveId}/comments") public ApiResponse getComments( @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId, @RequestParam(required = false) String cursor, @RequestParam(required = false) Integer size ) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(commentService.getComments(perspectiveId, userId, cursor, size)); } @@ -56,10 +55,9 @@ public ApiResponse getComments( @DeleteMapping("/perspectives/{perspectiveId}/comments/{commentId}") public ApiResponse deleteComment( @PathVariable Long perspectiveId, - @PathVariable Long commentId + @PathVariable Long commentId, + @AuthenticationPrincipal Long userId ) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; commentService.deleteComment(perspectiveId, commentId, userId); return ApiResponse.onSuccess(null); } @@ -69,10 +67,9 @@ public ApiResponse deleteComment( public ApiResponse updateComment( @PathVariable Long perspectiveId, @PathVariable Long commentId, + @AuthenticationPrincipal Long userId, @RequestBody @Valid UpdateCommentRequest request ) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(commentService.updateComment(perspectiveId, commentId, userId, request)); } } diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java index 4ad31255..e1e4bc1d 100644 --- a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java @@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; @@ -30,15 +31,13 @@ public class PerspectiveController { private final PerspectiveService perspectiveService; - // TODO: Prevote 의 여부를 Vote 도메인 개발 이후 교체 @Operation(summary = "관점 생성", description = "특정 배틀에 대한 관점을 생성합니다. 사전 투표가 완료된 경우에만 가능합니다.") @PostMapping("/battles/{battleId}/perspectives") public ApiResponse createPerspective( @PathVariable Long battleId, + @AuthenticationPrincipal Long userId, @RequestBody @Valid CreatePerspectiveRequest request ) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(perspectiveService.createPerspective(battleId, userId, request)); } @@ -46,37 +45,36 @@ public ApiResponse createPerspective( @GetMapping("/battles/{battleId}/perspectives") public ApiResponse getPerspectives( @PathVariable Long battleId, + @AuthenticationPrincipal Long userId, @RequestParam(required = false) String cursor, @RequestParam(required = false) Integer size, @RequestParam(required = false) String optionLabel ) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(perspectiveService.getPerspectives(battleId, userId, cursor, size, optionLabel)); } @Operation(summary = "내 PENDING 관점 조회", description = "특정 배틀에서 내가 작성한 관점이 PENDING 상태인 경우 반환합니다. PENDING 관점이 없으면 404를 반환합니다.") @GetMapping("/battles/{battleId}/perspectives/me/pending") - public ApiResponse getMyPendingPerspective(@PathVariable Long battleId) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; + public ApiResponse getMyPendingPerspective( + @PathVariable Long battleId, + @AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(perspectiveService.getMyPendingPerspective(battleId, userId)); } @Operation(summary = "관점 삭제", description = "본인이 작성한 관점을 삭제합니다.") @DeleteMapping("/perspectives/{perspectiveId}") - public ApiResponse deletePerspective(@PathVariable Long perspectiveId) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; + public ApiResponse deletePerspective( + @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId) { perspectiveService.deletePerspective(perspectiveId, userId); return ApiResponse.onSuccess(null); } @Operation(summary = "관점 검수 재시도", description = "검수 실패(MODERATION_FAILED) 상태의 관점에 대해 GPT 검수를 다시 요청합니다.") @PostMapping("/perspectives/{perspectiveId}/moderation/retry") - public ApiResponse retryModeration(@PathVariable Long perspectiveId) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; + public ApiResponse retryModeration( + @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId) { perspectiveService.retryModeration(perspectiveId, userId); return ApiResponse.onSuccess(null); } @@ -85,10 +83,9 @@ public ApiResponse retryModeration(@PathVariable Long perspectiveId) { @PatchMapping("/perspectives/{perspectiveId}") public ApiResponse updatePerspective( @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId, @RequestBody @Valid UpdatePerspectiveRequest request ) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(perspectiveService.updatePerspective(perspectiveId, userId, request)); } } diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java index c73d0f45..abe7cc7a 100644 --- a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveLikeController.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -30,17 +31,17 @@ public ApiResponse getLikeCount(@PathVariable Long perspectiv @Operation(summary = "좋아요 등록", description = "특정 관점에 좋아요를 등록합니다.") @PostMapping("/perspectives/{perspectiveId}/likes") - public ApiResponse addLike(@PathVariable Long perspectiveId) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; + public ApiResponse addLike( + @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(likeService.addLike(perspectiveId, userId)); } @Operation(summary = "좋아요 취소", description = "특정 관점에 등록한 좋아요를 취소합니다.") @DeleteMapping("/perspectives/{perspectiveId}/likes") - public ApiResponse removeLike(@PathVariable Long perspectiveId) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; + public ApiResponse removeLike( + @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(likeService.removeLike(perspectiveId, userId)); } } diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java index 622633e1..48ece7a8 100644 --- a/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java +++ b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java @@ -1,14 +1,17 @@ package com.swyp.app.domain.perspective.entity; +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; import com.swyp.app.domain.perspective.enums.PerspectiveStatus; +import com.swyp.app.domain.user.entity.User; import com.swyp.app.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; import lombok.AccessLevel; @@ -25,17 +28,17 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Perspective extends BaseEntity { - // TODO: Battle 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "battle_id") 로 교체 - @Column(name = "battle_id", nullable = false) - private Long battleId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "battle_id", nullable = false) + private Battle battle; - // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 - @Column(name = "user_id", nullable = false) - private Long userId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; - // TODO: BattleOption 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "option_id") 로 교체 - @Column(name = "option_id", nullable = false) - private Long optionId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "option_id", nullable = false) + private BattleOption option; @Column(nullable = false, columnDefinition = "TEXT") private String content; @@ -51,10 +54,10 @@ public class Perspective extends BaseEntity { private PerspectiveStatus status; @Builder - private Perspective(Long battleId, Long userId, Long optionId, String content) { - this.battleId = battleId; - this.userId = userId; - this.optionId = optionId; + private Perspective(Battle battle, User user, BattleOption option, String content) { + this.battle = battle; + this.user = user; + this.option = option; this.content = content; this.likeCount = 0; this.commentCount = 0; diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java index 19a940af..bf41727d 100644 --- a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java @@ -1,5 +1,6 @@ package com.swyp.app.domain.perspective.entity; +import com.swyp.app.domain.user.entity.User; import com.swyp.app.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -22,17 +23,17 @@ public class PerspectiveComment extends BaseEntity { @JoinColumn(name = "perspective_id", nullable = false) private Perspective perspective; - // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 - @Column(name = "user_id", nullable = false) - private Long userId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; @Column(nullable = false, columnDefinition = "TEXT") private String content; @Builder - private PerspectiveComment(Perspective perspective, Long userId, String content) { + private PerspectiveComment(Perspective perspective, User user, String content) { this.perspective = perspective; - this.userId = userId; + this.user = user; this.content = content; } diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java index 3850c32c..db399a6e 100644 --- a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveLike.java @@ -1,7 +1,7 @@ package com.swyp.app.domain.perspective.entity; +import com.swyp.app.domain.user.entity.User; import com.swyp.app.global.common.BaseEntity; -import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; @@ -26,13 +26,13 @@ public class PerspectiveLike extends BaseEntity { @JoinColumn(name = "perspective_id", nullable = false) private Perspective perspective; - // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 - @Column(name = "user_id", nullable = false) - private Long userId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; @Builder - private PerspectiveLike(Perspective perspective, Long userId) { + private PerspectiveLike(Perspective perspective, User user) { this.perspective = perspective; - this.userId = userId; + this.user = user; } } diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java index e28e8772..ad441966 100644 --- a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveCommentRepository.java @@ -16,8 +16,7 @@ public interface PerspectiveCommentRepository extends JpaRepository findByPerspectiveAndCreatedAtBeforeOrderByCreatedAtDesc(Perspective perspective, LocalDateTime cursor, Pageable pageable); - // MypageService: 사용자 댓글 활동 조회 (offset 페이지네이션) - @Query("SELECT c FROM PerspectiveComment c JOIN FETCH c.perspective WHERE c.userId = :userId ORDER BY c.createdAt DESC") + @Query("SELECT c FROM PerspectiveComment c JOIN FETCH c.perspective WHERE c.user.id = :userId ORDER BY c.createdAt DESC") List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); long countByUserId(Long userId); diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java index 267a6ba4..f71877c9 100644 --- a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveLikeRepository.java @@ -18,8 +18,7 @@ public interface PerspectiveLikeRepository extends JpaRepository findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); long countByUserId(Long userId); diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java index df7fc6ec..88ded3ce 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java @@ -10,6 +10,8 @@ import com.swyp.app.domain.perspective.repository.PerspectiveCommentRepository; import com.swyp.app.domain.perspective.repository.PerspectiveRepository; import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.domain.user.service.UserService; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; @@ -30,25 +32,28 @@ public class PerspectiveCommentService { private final PerspectiveRepository perspectiveRepository; private final PerspectiveCommentRepository commentRepository; + private final UserRepository userRepository; private final UserService userQueryService; @Transactional public CreateCommentResponse createComment(Long perspectiveId, Long userId, CreateCommentRequest request) { Perspective perspective = findPerspectiveById(perspectiveId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); PerspectiveComment comment = PerspectiveComment.builder() .perspective(perspective) - .userId(userId) + .user(user) .content(request.content()) .build(); commentRepository.save(comment); perspective.incrementCommentCount(); - UserSummary user = userQueryService.findSummaryById(userId); + UserSummary userSummary = userQueryService.findSummaryById(userId); return new CreateCommentResponse( comment.getId(), - new CreateCommentResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), + new CreateCommentResponse.UserSummary(userSummary.userTag(), userSummary.nickname(), userSummary.characterType()), comment.getContent(), comment.getCreatedAt() ); @@ -67,12 +72,12 @@ public CommentListResponse getComments(Long perspectiveId, Long userId, String c List items = comments.stream() .map(c -> { - UserSummary user = userQueryService.findSummaryById(c.getUserId()); + UserSummary author = userQueryService.findSummaryById(c.getUser().getId()); return new CommentListResponse.Item( c.getId(), - new CommentListResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), + new CommentListResponse.UserSummary(author.userTag(), author.nickname(), author.characterType()), c.getContent(), - c.getUserId().equals(userId), + c.getUser().getId().equals(userId), c.getCreatedAt() ); }) @@ -116,7 +121,7 @@ private PerspectiveComment findCommentById(Long commentId) { } private void validateOwnership(PerspectiveComment comment, Long userId) { - if (!comment.getUserId().equals(userId)) { + if (!comment.getUser().getId().equals(userId)) { throw new CustomException(ErrorCode.COMMENT_FORBIDDEN); } } diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java index 3b773926..24b3e959 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveLikeService.java @@ -6,6 +6,8 @@ import com.swyp.app.domain.perspective.entity.PerspectiveLike; import com.swyp.app.domain.perspective.repository.PerspectiveLikeRepository; import com.swyp.app.domain.perspective.repository.PerspectiveRepository; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; @@ -19,6 +21,7 @@ public class PerspectiveLikeService { private final PerspectiveRepository perspectiveRepository; private final PerspectiveLikeRepository likeRepository; + private final UserRepository userRepository; public LikeCountResponse getLikeCount(Long perspectiveId) { Perspective perspective = findPerspectiveById(perspectiveId); @@ -29,8 +32,10 @@ public LikeCountResponse getLikeCount(Long perspectiveId) { @Transactional public LikeResponse addLike(Long perspectiveId, Long userId) { Perspective perspective = findPerspectiveById(perspectiveId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - if (perspective.getUserId().equals(userId)) { + if (perspective.getUser().getId().equals(userId)) { throw new CustomException(ErrorCode.LIKE_SELF_FORBIDDEN); } @@ -40,7 +45,7 @@ public LikeResponse addLike(Long perspectiveId, Long userId) { likeRepository.save(PerspectiveLike.builder() .perspective(perspective) - .userId(userId) + .user(user) .build()); perspective.incrementLikeCount(); diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java index 4e752783..f9107666 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java @@ -1,9 +1,12 @@ package com.swyp.app.domain.perspective.service; +import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleOption; import com.swyp.app.domain.battle.enums.BattleOptionLabel; import com.swyp.app.domain.battle.service.BattleService; import com.swyp.app.domain.perspective.enums.PerspectiveStatus; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.domain.perspective.dto.request.CreatePerspectiveRequest; import com.swyp.app.domain.perspective.dto.request.UpdatePerspectiveRequest; import com.swyp.app.domain.perspective.dto.response.CreatePerspectiveResponse; @@ -38,22 +41,25 @@ public class PerspectiveService { private final BattleService battleService; private final VoteService voteService; private final UserService userQueryService; + private final UserRepository userRepository; private final GptModerationService gptModerationService; @Transactional public CreatePerspectiveResponse createPerspective(Long battleId, Long userId, CreatePerspectiveRequest request) { - battleService.findById(battleId); + Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); if (perspectiveRepository.existsByBattleIdAndUserId(battleId, userId)) { throw new CustomException(ErrorCode.PERSPECTIVE_ALREADY_EXISTS); } - Long optionId = voteService.findPreVoteOptionId(battleId, userId); + BattleOption option = voteService.findPreVoteOption(battleId, userId); Perspective perspective = Perspective.builder() - .battleId(battleId) - .userId(userId) - .optionId(optionId) + .battle(battle) + .user(user) + .option(option) .content(request.content()) .build(); @@ -84,8 +90,8 @@ public PerspectiveListResponse getPerspectives(Long battleId, Long userId, Strin List items = perspectives.stream() .map(p -> { - UserSummary user = userQueryService.findSummaryById(p.getUserId()); - BattleOption option = battleService.findOptionById(p.getOptionId()); + UserSummary user = userQueryService.findSummaryById(p.getUser().getId()); + BattleOption option = p.getOption(); boolean isLiked = perspectiveLikeRepository.existsByPerspectiveAndUserId(p, userId); return new PerspectiveListResponse.Item( p.getId(), @@ -154,7 +160,7 @@ private Perspective findPerspectiveById(Long perspectiveId) { } private void validateOwnership(Perspective perspective, Long userId) { - if (!perspective.getUserId().equals(userId)) { + if (!perspective.getUser().getId().equals(userId)) { throw new CustomException(ErrorCode.PERSPECTIVE_FORBIDDEN); } } diff --git a/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java b/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java index 70114fa3..365a6c1d 100644 --- a/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/reward/service/AdMobRewardServiceImpl.java @@ -52,9 +52,6 @@ public String processReward(AdMobRewardRequest request) { adRewardHistoryRepository.save(history); - // 6. TODO: 작업 중인 포인트 합산 로직 호출 지점 - // user.addPoint(request.reward_amount()); - log.info("보상 지급 완료: user={}, amount={}", user.getId(), request.reward_amount()); return "OK"; } diff --git a/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java b/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java index 59c7d987..926b0484 100644 --- a/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java +++ b/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java @@ -3,7 +3,7 @@ import com.swyp.app.domain.scenario.dto.request.ScenarioCreateRequest; import com.swyp.app.domain.scenario.dto.request.ScenarioStatusUpdateRequest; import com.swyp.app.domain.scenario.dto.response.AdminDeleteResponse; -import com.swyp.app.domain.scenario.dto.response.AdminScenarioDetailResponse; // 🚀 추가 (상세 조회용) +import com.swyp.app.domain.scenario.dto.response.AdminScenarioDetailResponse; import com.swyp.app.domain.scenario.dto.response.AdminScenarioResponse; import com.swyp.app.domain.scenario.dto.response.UserScenarioResponse; import com.swyp.app.domain.scenario.service.ScenarioService; diff --git a/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java b/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java index 8dadc05b..a5d4b4ed 100644 --- a/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java @@ -8,7 +8,7 @@ import com.swyp.app.domain.scenario.dto.request.ScenarioCreateRequest; import com.swyp.app.domain.scenario.dto.request.ScriptRequest; import com.swyp.app.domain.scenario.dto.response.AdminDeleteResponse; -import com.swyp.app.domain.scenario.dto.response.AdminScenarioDetailResponse; // 🚀 추가 +import com.swyp.app.domain.scenario.dto.response.AdminScenarioDetailResponse; import com.swyp.app.domain.scenario.dto.response.AdminScenarioResponse; import com.swyp.app.domain.scenario.dto.response.UserScenarioResponse; import com.swyp.app.domain.scenario.entity.InteractiveOption; diff --git a/src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java b/src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java index ceeea055..e3000ff0 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java +++ b/src/main/java/com/swyp/app/domain/user/entity/CreditHistory.java @@ -6,7 +6,10 @@ import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; @@ -22,8 +25,9 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class CreditHistory extends BaseEntity { - @Column(name = "user_id", nullable = false) - private Long userId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; @Enumerated(EnumType.STRING) @Column(name = "credit_type", nullable = false, length = 30) @@ -36,8 +40,8 @@ public class CreditHistory extends BaseEntity { private Long referenceId; @Builder - private CreditHistory(Long userId, CreditType creditType, int amount, Long referenceId) { - this.userId = userId; + private CreditHistory(User user, CreditType creditType, int amount, Long referenceId) { + this.user = user; this.creditType = creditType; this.amount = amount; this.referenceId = referenceId; diff --git a/src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java b/src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java index a860eef2..775b23c9 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/CreditHistoryRepository.java @@ -8,7 +8,7 @@ public interface CreditHistoryRepository extends JpaRepository { - @Query("SELECT COALESCE(SUM(c.amount), 0) FROM CreditHistory c WHERE c.userId = :userId") + @Query("SELECT COALESCE(SUM(c.amount), 0) FROM CreditHistory c WHERE c.user.id = :userId") int sumAmountByUserId(@Param("userId") Long userId); boolean existsByUserIdAndCreditTypeAndReferenceId(Long userId, CreditType creditType, Long referenceId); diff --git a/src/main/java/com/swyp/app/domain/user/service/CreditService.java b/src/main/java/com/swyp/app/domain/user/service/CreditService.java index a9c9ce3b..77047919 100644 --- a/src/main/java/com/swyp/app/domain/user/service/CreditService.java +++ b/src/main/java/com/swyp/app/domain/user/service/CreditService.java @@ -5,6 +5,7 @@ import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.user.enums.CreditType; import com.swyp.app.domain.user.repository.CreditHistoryRepository; +import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; @@ -18,6 +19,7 @@ public class CreditService { private final CreditHistoryRepository creditHistoryRepository; + private final UserRepository userRepository; private final UserService userService; /** @@ -50,8 +52,11 @@ public void addCredit(Long userId, CreditType creditType, Long referenceId) { public void addCredit(Long userId, CreditType creditType, int amount, Long referenceId) { validateReferenceId(referenceId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + CreditHistory history = CreditHistory.builder() - .userId(userId) + .user(user) .creditType(creditType) .amount(amount) .referenceId(referenceId) diff --git a/src/main/java/com/swyp/app/domain/user/service/MypageService.java b/src/main/java/com/swyp/app/domain/user/service/MypageService.java index fa45e85f..3fcd2bad 100644 --- a/src/main/java/com/swyp/app/domain/user/service/MypageService.java +++ b/src/main/java/com/swyp/app/domain/user/service/MypageService.java @@ -193,7 +193,7 @@ private ContentActivityListResponse buildCommentActivities(User user, int pageOf .map(comment -> { Perspective p = comment.getPerspective(); return toActivityItem(comment.getId().toString(), ActivityType.COMMENT, p, - battleMap.get(p.getBattleId()), optionMap.get(p.getOptionId()), + battleMap.get(p.getBattle().getId()), optionMap.get(p.getOption().getId()), comment.getContent(), comment.getCreatedAt()); }) .toList(); @@ -215,7 +215,7 @@ private ContentActivityListResponse buildLikeActivities(User user, int pageOffse .map(like -> { Perspective p = like.getPerspective(); return toActivityItem(like.getId().toString(), ActivityType.LIKE, p, - battleMap.get(p.getBattleId()), optionMap.get(p.getOptionId()), + battleMap.get(p.getBattle().getId()), optionMap.get(p.getOption().getId()), p.getContent(), like.getCreatedAt()); }) .toList(); @@ -229,7 +229,7 @@ private ContentActivityListResponse.ContentActivityItem toActivityItem( String activityId, ActivityType activityType, Perspective perspective, Battle battle, BattleOption option, String content, LocalDateTime createdAt) { - UserSummary author = userService.findSummaryById(perspective.getUserId()); + UserSummary author = userService.findSummaryById(perspective.getUser().getId()); ContentActivityListResponse.AuthorInfo authorInfo = new ContentActivityListResponse.AuthorInfo( author.userTag(), author.nickname(), CharacterType.from(author.characterType()) ); @@ -237,7 +237,7 @@ private ContentActivityListResponse.ContentActivityItem toActivityItem( return new ContentActivityListResponse.ContentActivityItem( activityId, activityType, perspective.getId().toString(), - perspective.getBattleId().toString(), + perspective.getBattle().getId().toString(), battle != null ? battle.getTitle() : null, authorInfo, option != null ? option.getStance() : null, @@ -248,12 +248,12 @@ private ContentActivityListResponse.ContentActivityItem toActivityItem( } private Map loadBattles(List perspectives) { - List battleIds = perspectives.stream().map(Perspective::getBattleId).distinct().toList(); + List battleIds = perspectives.stream().map(p -> p.getBattle().getId()).distinct().toList(); return battleQueryService.findBattlesByIds(battleIds); } private Map loadOptions(List perspectives) { - List optionIds = perspectives.stream().map(Perspective::getOptionId).distinct().toList(); + List optionIds = perspectives.stream().map(p -> p.getOption().getId()).distinct().toList(); return battleQueryService.findOptionsByIds(optionIds); } diff --git a/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java b/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java index 1d703fd8..4bdb9b82 100644 --- a/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java +++ b/src/main/java/com/swyp/app/domain/vote/controller/VoteController.java @@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @Tag(name = "투표 (Vote)", description = "사전/사후 투표 실행 및 통계, 내 투표 내역 조회 API") @@ -23,9 +24,8 @@ public class VoteController { @PostMapping("/battles/{battleId}/votes/pre") public ApiResponse preVote( @PathVariable Long battleId, + @AuthenticationPrincipal Long userId, @RequestBody VoteRequest request) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(voteService.preVote(battleId, userId, request)); } @@ -33,9 +33,8 @@ public ApiResponse preVote( @PostMapping("/battles/{battleId}/votes/post") public ApiResponse postVote( @PathVariable Long battleId, + @AuthenticationPrincipal Long userId, @RequestBody VoteRequest request) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; return ApiResponse.onSuccess(voteService.postVote(battleId, userId, request)); } @@ -47,9 +46,9 @@ public ApiResponse getVoteStats(@PathVariable Long battleId) @Operation(summary = "내 투표 내역 조회", description = "특정 배틀에 대한 내 사전/사후 투표 내역과 현재 상태를 조회합니다.") @GetMapping("/battles/{battleId}/votes/me") - public ApiResponse getMyVote(@PathVariable Long battleId) { - // TODO: Security 적용 후 @AuthenticationPrincipal로 userId 교체 - Long userId = 1L; + public ApiResponse getMyVote( + @PathVariable Long battleId, + @AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(voteService.getMyVote(battleId, userId)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/app/domain/vote/entity/Vote.java b/src/main/java/com/swyp/app/domain/vote/entity/Vote.java index fe9a24be..2c469b1e 100644 --- a/src/main/java/com/swyp/app/domain/vote/entity/Vote.java +++ b/src/main/java/com/swyp/app/domain/vote/entity/Vote.java @@ -2,6 +2,7 @@ import com.swyp.app.domain.battle.entity.Battle; import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.vote.enums.VoteStatus; import com.swyp.app.global.common.BaseEntity; import jakarta.persistence.Column; @@ -9,9 +10,6 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; @@ -26,9 +24,9 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Vote extends BaseEntity { - // TODO: User 엔티티 병합 후 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") 로 교체 - @Column(name = "user_id", nullable = false) - private Long userId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "battle_id", nullable = false) @@ -47,28 +45,26 @@ public class Vote extends BaseEntity { private VoteStatus status; @Builder - private Vote(Long userId, Battle battle, BattleOption preVoteOption, + private Vote(User user, Battle battle, BattleOption preVoteOption, BattleOption postVoteOption, VoteStatus status) { - this.userId = userId; + this.user = user; this.battle = battle; this.preVoteOption = preVoteOption; this.postVoteOption = postVoteOption; this.status = status; } - // 사전 투표 생성 팩토리 메서드 - public static Vote createPreVote(Long userId, Battle battle, BattleOption option) { + public static Vote createPreVote(User user, Battle battle, BattleOption option) { return Vote.builder() - .userId(userId) + .user(user) .battle(battle) .preVoteOption(option) .status(VoteStatus.PRE_VOTED) .build(); } - // 사후 투표 실행 상태 변경 메서드 public void doPostVote(BattleOption postOption) { this.postVoteOption = postOption; this.status = VoteStatus.POST_VOTED; } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java index da6a67ed..cd0ed291 100644 --- a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java +++ b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java @@ -5,6 +5,7 @@ import com.swyp.app.domain.battle.enums.BattleOptionLabel; import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.vote.entity.Vote; +import com.swyp.app.domain.vote.enums.VoteStatus; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -15,11 +16,9 @@ public interface VoteRepository extends JpaRepository { - // ScenarioService : Battle 엔티티 조회 없이 ID만으로 투표 내역 확인 Optional findByBattleIdAndUserId(Long battleId, Long userId); - // VoteService : 이미 조회된 Battle 엔티티를 활용하여 투표 내역 확인 - Optional findByBattleAndUserId(Battle battle, Long userId); + Optional findByBattleAndUser(Battle battle, User user); long countByBattle(Battle battle); @@ -27,36 +26,29 @@ public interface VoteRepository extends JpaRepository { Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); - // MypageService: 사용자 투표 기록 조회 (offset 페이지네이션) @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + - "WHERE v.userId = :userId ORDER BY v.createdAt DESC") + "WHERE v.user.id = :userId ORDER BY v.createdAt DESC") List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); - // MypageService: 사용자 투표 기록 - voteSide(PRO/CON) 필터 @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + - "WHERE v.userId = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") + "WHERE v.user.id = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); - // MypageService: 사용자 투표 전체 수 long countByUserId(Long userId); - // MypageService: 사용자 투표 수 - voteSide 필터 - @Query("SELECT COUNT(v) FROM Vote v WHERE v.userId = :userId AND v.preVoteOption.label = :label") + @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); - // MypageService (recap): 사후 투표 완료 수 - long countByUserIdAndStatus(Long userId, com.swyp.app.domain.vote.enums.VoteStatus status); + long countByUserIdAndStatus(Long userId, VoteStatus status); - // MypageService (recap): 입장 변경 수 (사전/사후 투표 옵션이 다른 경우) - @Query("SELECT COUNT(v) FROM Vote v WHERE v.userId = :userId AND v.status = 'POST_VOTED' " + + @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.status = 'POST_VOTED' " + "AND v.preVoteOption <> v.postVoteOption") long countOpinionChangesByUserId(@Param("userId") Long userId); - // MypageService (recap): 사용자가 참여한 모든 투표 (배틀 목록 추출용) List findByUserId(Long userId); // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) - @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.userId = :userId ORDER BY v.createdAt ASC") + @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); } diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteService.java b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java index ba47ef5a..70e95a76 100644 --- a/src/main/java/com/swyp/app/domain/vote/service/VoteService.java +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java @@ -1,5 +1,6 @@ package com.swyp.app.domain.vote.service; +import com.swyp.app.domain.battle.entity.BattleOption; import com.swyp.app.domain.vote.dto.request.VoteRequest; import com.swyp.app.domain.vote.dto.response.MyVoteResponse; import com.swyp.app.domain.vote.dto.response.VoteResultResponse; @@ -7,7 +8,7 @@ public interface VoteService { - Long findPreVoteOptionId(Long battleId, Long userId); + BattleOption findPreVoteOption(Long battleId, Long userId); VoteStatsResponse getVoteStats(Long battleId); diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java index df702249..c76898b5 100644 --- a/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java @@ -4,6 +4,8 @@ import com.swyp.app.domain.battle.entity.BattleOption; import com.swyp.app.domain.battle.repository.BattleOptionRepository; import com.swyp.app.domain.battle.service.BattleService; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.domain.vote.converter.VoteConverter; import com.swyp.app.domain.vote.dto.request.VoteRequest; import com.swyp.app.domain.vote.dto.response.MyVoteResponse; @@ -29,18 +31,21 @@ public class VoteServiceImpl implements VoteService { private final VoteRepository voteRepository; private final BattleService battleService; private final BattleOptionRepository battleOptionRepository; + private final UserRepository userRepository; @Override - public Long findPreVoteOptionId(Long battleId, Long userId) { + public BattleOption findPreVoteOption(Long battleId, Long userId) { Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUserId(battle, userId) + Vote vote = voteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); if (vote.getPreVoteOption() == null) { throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); } - return vote.getPreVoteOption().getId(); + return vote.getPreVoteOption(); } @Override @@ -70,8 +75,10 @@ public VoteStatsResponse getVoteStats(Long battleId) { @Override public MyVoteResponse getMyVote(Long battleId, Long userId) { Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUserId(battle, userId) + Vote vote = voteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); return VoteConverter.toMyVoteResponse(vote); @@ -81,15 +88,16 @@ public MyVoteResponse getMyVote(Long battleId, Long userId) { @Transactional public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request) { Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - // 이미 투표 내역이 존재하는지 검증 - if (voteRepository.findByBattleAndUserId(battle, userId).isPresent()) { + if (voteRepository.findByBattleAndUser(battle, user).isPresent()) { throw new CustomException(ErrorCode.VOTE_ALREADY_SUBMITTED); } - Vote vote = Vote.createPreVote(userId, battle, option); + Vote vote = Vote.createPreVote(user, battle, option); voteRepository.save(vote); return VoteConverter.toVoteResultResponse(vote); @@ -99,13 +107,14 @@ public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest reques @Transactional public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest request) { Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUserId(battle, userId) + Vote vote = voteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - // 사전 투표 상태일 때만 사후 투표 가능 if (vote.getStatus() != VoteStatus.PRE_VOTED) { throw new CustomException(ErrorCode.INVALID_VOTE_STATUS); } diff --git a/src/main/java/com/swyp/app/global/config/S3Config.java b/src/main/java/com/swyp/app/global/config/S3Config.java index f2ae86f2..cac7a59d 100644 --- a/src/main/java/com/swyp/app/global/config/S3Config.java +++ b/src/main/java/com/swyp/app/global/config/S3Config.java @@ -8,7 +8,6 @@ import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.presigner.S3Presigner; -// TODO: S3 Presigned URL 정식 구현 시 교체 필요 (임시 구현) @Configuration public class S3Config { diff --git a/src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java b/src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java index beaf366f..4a510acb 100644 --- a/src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java +++ b/src/main/java/com/swyp/app/global/infra/s3/dto/FileUploadResponse.java @@ -1,4 +1,3 @@ package com.swyp.app.global.infra.s3.dto; -// TODO: S3 Presigned URL 정식 구현 시 교체 필요 (임시 구현) public record FileUploadResponse(String s3Key, String presignedUrl) {} diff --git a/src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java b/src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java index ca1fe2e3..fc7b0be2 100644 --- a/src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java +++ b/src/main/java/com/swyp/app/global/infra/s3/service/S3PresignedUrlService.java @@ -11,7 +11,6 @@ import java.util.Map; import java.util.stream.Collectors; -// TODO: S3 Presigned URL 정식 구현 시 교체 필요 (임시 구현) @Service @RequiredArgsConstructor public class S3PresignedUrlService { diff --git a/src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java index a82f810d..2a53ae99 100644 --- a/src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java +++ b/src/test/java/com/swyp/app/domain/user/service/CreditServiceTest.java @@ -5,6 +5,7 @@ import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.user.enums.CreditType; import com.swyp.app.domain.user.repository.CreditHistoryRepository; +import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import org.junit.jupiter.api.DisplayName; @@ -16,6 +17,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.dao.DataIntegrityViolationException; +import java.util.Optional; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -30,6 +33,9 @@ class CreditServiceTest { @Mock private CreditHistoryRepository creditHistoryRepository; + @Mock + private UserRepository userRepository; + @Mock private UserService userService; @@ -42,6 +48,7 @@ void addCredit_forCurrentUser_savesDefaultAmount() { User user = org.mockito.Mockito.mock(User.class); when(user.getId()).thenReturn(1L); when(userService.findCurrentUser()).thenReturn(user); + when(userRepository.findById(1L)).thenReturn(Optional.of(user)); creditService.addCredit(CreditType.BATTLE_VOTE, 10L); @@ -49,7 +56,7 @@ void addCredit_forCurrentUser_savesDefaultAmount() { verify(creditHistoryRepository).saveAndFlush(captor.capture()); CreditHistory saved = captor.getValue(); - assertThat(saved.getUserId()).isEqualTo(1L); + assertThat(saved.getUser().getId()).isEqualTo(1L); assertThat(saved.getCreditType()).isEqualTo(CreditType.BATTLE_VOTE); assertThat(saved.getAmount()).isEqualTo(CreditType.BATTLE_VOTE.getDefaultAmount()); assertThat(saved.getReferenceId()).isEqualTo(10L); @@ -69,6 +76,8 @@ void addCredit_withoutReferenceId_throwsException() { @Test @DisplayName("중복 적립 충돌이면 조용히 무시한다") void addCredit_duplicateInsert_ignoresConflict() { + User user = org.mockito.Mockito.mock(User.class); + when(userRepository.findById(1L)).thenReturn(Optional.of(user)); when(creditHistoryRepository.saveAndFlush(any(CreditHistory.class))) .thenThrow(new DataIntegrityViolationException("duplicate")); when(creditHistoryRepository.existsByUserIdAndCreditTypeAndReferenceId(1L, CreditType.BATTLE_VOTE, 10L)) @@ -82,6 +91,8 @@ void addCredit_duplicateInsert_ignoresConflict() { @Test @DisplayName("중복이 아닌 데이터 무결성 오류는 그대로 던진다") void addCredit_nonDuplicateIntegrityFailure_rethrows() { + User user = org.mockito.Mockito.mock(User.class); + when(userRepository.findById(1L)).thenReturn(Optional.of(user)); when(creditHistoryRepository.saveAndFlush(any(CreditHistory.class))) .thenThrow(new DataIntegrityViolationException("broken")); when(creditHistoryRepository.existsByUserIdAndCreditTypeAndReferenceId(1L, CreditType.BATTLE_VOTE, 10L)) diff --git a/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java index 5ce1473e..08908ac9 100644 --- a/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java +++ b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java @@ -166,7 +166,7 @@ void getBattleRecords_returns_paginated_records() { Battle battle = createBattle("배틀 제목"); BattleOption optionA = createOption(battle, BattleOptionLabel.A); Vote vote = Vote.builder() - .userId(1L) + .user(user) .battle(battle) .preVoteOption(optionA) .build(); @@ -192,7 +192,7 @@ void getBattleRecords_returns_no_next_when_last_page() { Battle battle = createBattle("제목"); BattleOption optionA = createOption(battle, BattleOptionLabel.A); Vote vote = Vote.builder() - .userId(1L) + .user(user) .battle(battle) .preVoteOption(optionA) .build(); @@ -227,29 +227,27 @@ void getBattleRecords_applies_vote_side_filter() { @DisplayName("COMMENT 타입으로 댓글활동을 반환한다") void getContentActivities_returns_comments() { User user = createUser(1L, "tag"); - Long battleId = generateId(); - Long optionId = generateId(); + Battle battle = createBattle("배틀"); + Long battleId = battle.getId(); + BattleOption option = createOption(battle, BattleOptionLabel.A); + Long optionId = option.getId(); + Perspective perspective = Perspective.builder() - .battleId(battleId) - .userId(1L) - .optionId(optionId) + .battle(battle) + .user(user) + .option(option) .content("관점 내용") .build(); ReflectionTestUtils.setField(perspective, "id", generateId()); PerspectiveComment comment = PerspectiveComment.builder() .perspective(perspective) - .userId(1L) + .user(user) .content("댓글") .build(); ReflectionTestUtils.setField(comment, "id", generateId()); ReflectionTestUtils.setField(comment, "createdAt", LocalDateTime.now()); - Battle battle = createBattle("배틀"); - ReflectionTestUtils.setField(battle, "id", battleId); - BattleOption option = createOption(battle, BattleOptionLabel.A); - ReflectionTestUtils.setField(option, "id", optionId); - when(userService.findCurrentUser()).thenReturn(user); when(perspectiveQueryService.findUserComments(1L, 0, 20)).thenReturn(List.of(comment)); when(perspectiveQueryService.countUserComments(1L)).thenReturn(1L); @@ -268,28 +266,26 @@ void getContentActivities_returns_comments() { @DisplayName("LIKE 타입으로 좋아요활동을 반환한다") void getContentActivities_returns_likes() { User user = createUser(1L, "tag"); - Long battleId = generateId(); - Long optionId = generateId(); + Battle battle = createBattle("배틀"); + Long battleId = battle.getId(); + BattleOption option = createOption(battle, BattleOptionLabel.B); + Long optionId = option.getId(); + Perspective perspective = Perspective.builder() - .battleId(battleId) - .userId(1L) - .optionId(optionId) + .battle(battle) + .user(user) + .option(option) .content("관점 내용") .build(); ReflectionTestUtils.setField(perspective, "id", generateId()); PerspectiveLike like = PerspectiveLike.builder() .perspective(perspective) - .userId(1L) + .user(user) .build(); ReflectionTestUtils.setField(like, "id", generateId()); ReflectionTestUtils.setField(like, "createdAt", LocalDateTime.now()); - Battle battle = createBattle("배틀"); - ReflectionTestUtils.setField(battle, "id", battleId); - BattleOption option = createOption(battle, BattleOptionLabel.B); - ReflectionTestUtils.setField(option, "id", optionId); - when(userService.findCurrentUser()).thenReturn(user); when(perspectiveQueryService.findUserLikes(1L, 0, 20)).thenReturn(List.of(like)); when(perspectiveQueryService.countUserLikes(1L)).thenReturn(1L); From a2b753ed111882cf680619f28276832f4072ea8f Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sun, 29 Mar 2026 08:17:45 +0900 Subject: [PATCH 31/94] =?UTF-8?q?#67=20=EC=95=8C=EB=A6=BC(Notification)=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=8B=A0=EC=84=A4=20=EB=B0=8F=20?= =?UTF-8?q?notice=20=ED=86=B5=ED=95=A9=20(#68)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 신규 소셜 가입 user 초기화 및 조회 로직 수정 (Hotfix) - `notification` 도메인 신설: 알림 적재(개인/브로드캐스트), 목록 조회(카테고리 필터, 페이지네이션), 읽음 처리 - `notice` 도메인 전체 삭제 → `notification`으로 통합 (공지/이벤트는 `user=null` 브로드캐스트) - MypageController의 notice 엔드포인트 제거, HomeService를 NotificationService로 전환 --- .../app/domain/home/service/HomeService.java | 10 +- .../notice/controller/NoticeController.java | 41 ------ .../dto/response/NoticeDetailResponse.java | 19 --- .../dto/response/NoticeListResponse.java | 9 -- .../dto/response/NoticeSummaryResponse.java | 18 --- .../swyp/app/domain/notice/entity/Notice.java | 61 --------- .../domain/notice/entity/NoticePlacement.java | 6 - .../app/domain/notice/entity/NoticeType.java | 6 - .../domain/notice/enums/NoticePlacement.java | 6 - .../app/domain/notice/enums/NoticeType.java | 6 - .../notice/repository/NoticeRepository.java | 35 ----- .../domain/notice/service/NoticeService.java | 71 ---------- .../controller/NotificationController.java | 53 ++++++++ .../response/NotificationListResponse.java | 8 ++ .../response/NotificationSummaryResponse.java | 17 +++ .../notification/entity/Notification.java | 73 +++++++++++ .../enums/NotificationCategory.java | 8 ++ .../enums/NotificationDetailCode.java | 24 ++++ .../repository/NotificationRepository.java | 34 +++++ .../service/NotificationService.java | 108 +++++++++++++++ .../app/domain/oauth/service/AuthService.java | 41 +++++- .../user/controller/MypageController.java | 14 -- .../dto/response/NoticeDetailResponse.java | 15 --- .../user/dto/response/NoticeListResponse.java | 21 --- .../repository/UserSettingsRepository.java | 3 + .../UserTendencyScoreRepository.java | 3 + .../domain/user/service/MypageService.java | 31 ----- .../app/domain/user/service/UserService.java | 6 +- .../global/common/exception/ErrorCode.java | 3 + .../domain/home/service/HomeServiceTest.java | 36 ++--- .../notice/service/NoticeServiceTest.java | 67 ---------- .../service/NotificationServiceTest.java | 124 ++++++++++++++++++ .../oauth/service/OAuthServiceTest.java | 40 +++++- .../user/service/MypageServiceTest.java | 48 ------- .../domain/user/service/UserServiceTest.java | 10 +- 35 files changed, 557 insertions(+), 518 deletions(-) delete mode 100644 src/main/java/com/swyp/app/domain/notice/controller/NoticeController.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/dto/response/NoticeDetailResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/dto/response/NoticeListResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/dto/response/NoticeSummaryResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/entity/Notice.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/enums/NoticePlacement.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/enums/NoticeType.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/repository/NoticeRepository.java delete mode 100644 src/main/java/com/swyp/app/domain/notice/service/NoticeService.java create mode 100644 src/main/java/com/swyp/app/domain/notification/controller/NotificationController.java create mode 100644 src/main/java/com/swyp/app/domain/notification/dto/response/NotificationListResponse.java create mode 100644 src/main/java/com/swyp/app/domain/notification/dto/response/NotificationSummaryResponse.java create mode 100644 src/main/java/com/swyp/app/domain/notification/entity/Notification.java create mode 100644 src/main/java/com/swyp/app/domain/notification/enums/NotificationCategory.java create mode 100644 src/main/java/com/swyp/app/domain/notification/enums/NotificationDetailCode.java create mode 100644 src/main/java/com/swyp/app/domain/notification/repository/NotificationRepository.java create mode 100644 src/main/java/com/swyp/app/domain/notification/service/NotificationService.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java delete mode 100644 src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java delete mode 100644 src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java create mode 100644 src/test/java/com/swyp/app/domain/notification/service/NotificationServiceTest.java diff --git a/src/main/java/com/swyp/app/domain/home/service/HomeService.java b/src/main/java/com/swyp/app/domain/home/service/HomeService.java index ee31bb84..2bb1ee9c 100644 --- a/src/main/java/com/swyp/app/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/app/domain/home/service/HomeService.java @@ -8,8 +8,8 @@ import com.swyp.app.domain.tag.enums.TagType; import com.swyp.app.domain.battle.service.BattleService; import com.swyp.app.domain.home.dto.response.*; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.service.NoticeService; +import com.swyp.app.domain.notification.enums.NotificationCategory; +import com.swyp.app.domain.notification.service.NotificationService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,13 +22,11 @@ @Transactional(readOnly = true) public class HomeService { - private static final int NOTICE_EXISTS_LIMIT = 1; - private final BattleService battleService; - private final NoticeService noticeService; + private final NotificationService notificationService; public HomeResponse getHome() { - boolean newNotice = !noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, NOTICE_EXISTS_LIMIT).isEmpty(); + boolean newNotice = notificationService.hasNewBroadcast(NotificationCategory.NOTICE); List editorPickRaw = battleService.getEditorPicks(); List trendingRaw = battleService.getTrendingBattles(); diff --git a/src/main/java/com/swyp/app/domain/notice/controller/NoticeController.java b/src/main/java/com/swyp/app/domain/notice/controller/NoticeController.java deleted file mode 100644 index bc054034..00000000 --- a/src/main/java/com/swyp/app/domain/notice/controller/NoticeController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.swyp.app.domain.notice.controller; - -import com.swyp.app.domain.notice.dto.response.NoticeDetailResponse; -import com.swyp.app.domain.notice.dto.response.NoticeListResponse; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; -import com.swyp.app.domain.notice.service.NoticeService; -import com.swyp.app.global.common.response.ApiResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@Tag(name = "공지 API", description = "공지사항 조회") -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/v1/notices") -public class NoticeController { - - private final NoticeService noticeService; - - @Operation(summary = "활성 공지 목록 조회") - @GetMapping - public ApiResponse getNotices( - @RequestParam(required = false) NoticeType type, - @RequestParam(required = false) NoticePlacement placement, - @RequestParam(required = false) Integer limit - ) { - return ApiResponse.onSuccess(noticeService.getNoticeList(type, placement, limit)); - } - - @Operation(summary = "활성 공지 상세 조회") - @GetMapping("/{noticeId}") - public ApiResponse getNoticeDetail(@PathVariable Long noticeId) { - return ApiResponse.onSuccess(noticeService.getNoticeDetail(noticeId)); - } -} diff --git a/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeDetailResponse.java b/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeDetailResponse.java deleted file mode 100644 index 0a23be80..00000000 --- a/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeDetailResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.swyp.app.domain.notice.dto.response; - -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; - -import java.time.LocalDateTime; - -public record NoticeDetailResponse( - Long noticeId, - String title, - String body, - NoticeType type, - NoticePlacement placement, - boolean pinned, - LocalDateTime startsAt, - LocalDateTime endsAt, - LocalDateTime createdAt -) { -} diff --git a/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeListResponse.java b/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeListResponse.java deleted file mode 100644 index d83f91ae..00000000 --- a/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeListResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.swyp.app.domain.notice.dto.response; - -import java.util.List; - -public record NoticeListResponse( - List items, - int totalCount -) { -} diff --git a/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeSummaryResponse.java b/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeSummaryResponse.java deleted file mode 100644 index f72b9c95..00000000 --- a/src/main/java/com/swyp/app/domain/notice/dto/response/NoticeSummaryResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.swyp.app.domain.notice.dto.response; - -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; - -import java.time.LocalDateTime; - -public record NoticeSummaryResponse( - Long noticeId, - String title, - String body, - NoticeType type, - NoticePlacement placement, - boolean pinned, - LocalDateTime startsAt, - LocalDateTime endsAt -) { -} diff --git a/src/main/java/com/swyp/app/domain/notice/entity/Notice.java b/src/main/java/com/swyp/app/domain/notice/entity/Notice.java deleted file mode 100644 index 5563848f..00000000 --- a/src/main/java/com/swyp/app/domain/notice/entity/Notice.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.swyp.app.domain.notice.entity; - -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; -import com.swyp.app.global.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -@Getter -@Entity -@Table(name = "notices") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Notice extends BaseEntity { - - @Column(nullable = false, length = 150) - private String title; - - @Column(nullable = false, columnDefinition = "TEXT") - private String body; - - @Enumerated(EnumType.STRING) - @Column(name = "notice_type", nullable = false, length = 30) - private NoticeType type; - - @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 30) - private NoticePlacement placement; - - @Column(name = "is_pinned", nullable = false) - private boolean pinned; - - @Column(name = "starts_at", nullable = false) - private LocalDateTime startsAt; - - @Column(name = "ends_at") - private LocalDateTime endsAt; - - @Column(name = "deleted_at") - private LocalDateTime deletedAt; - - @Builder - private Notice(String title, String body, NoticeType type, NoticePlacement placement, boolean pinned, - LocalDateTime startsAt, LocalDateTime endsAt) { - this.title = title; - this.body = body; - this.type = type; - this.placement = placement; - this.pinned = pinned; - this.startsAt = startsAt; - this.endsAt = endsAt; - } -} diff --git a/src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java b/src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java deleted file mode 100644 index 180382ee..00000000 --- a/src/main/java/com/swyp/app/domain/notice/entity/NoticePlacement.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.swyp.app.domain.notice.entity; - -public enum NoticePlacement { - HOME_TOP, - NOTICE_BOARD -} diff --git a/src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java b/src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java deleted file mode 100644 index be76097a..00000000 --- a/src/main/java/com/swyp/app/domain/notice/entity/NoticeType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.swyp.app.domain.notice.entity; - -public enum NoticeType { - ANNOUNCEMENT, - EVENT -} diff --git a/src/main/java/com/swyp/app/domain/notice/enums/NoticePlacement.java b/src/main/java/com/swyp/app/domain/notice/enums/NoticePlacement.java deleted file mode 100644 index 83564bd6..00000000 --- a/src/main/java/com/swyp/app/domain/notice/enums/NoticePlacement.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.swyp.app.domain.notice.enums; - -public enum NoticePlacement { - HOME_TOP, - NOTICE_BOARD -} diff --git a/src/main/java/com/swyp/app/domain/notice/enums/NoticeType.java b/src/main/java/com/swyp/app/domain/notice/enums/NoticeType.java deleted file mode 100644 index edf16d7b..00000000 --- a/src/main/java/com/swyp/app/domain/notice/enums/NoticeType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.swyp.app.domain.notice.enums; - -public enum NoticeType { - ANNOUNCEMENT, - EVENT -} diff --git a/src/main/java/com/swyp/app/domain/notice/repository/NoticeRepository.java b/src/main/java/com/swyp/app/domain/notice/repository/NoticeRepository.java deleted file mode 100644 index b8bfd855..00000000 --- a/src/main/java/com/swyp/app/domain/notice/repository/NoticeRepository.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.swyp.app.domain.notice.repository; - -import com.swyp.app.domain.notice.entity.Notice; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - -public interface NoticeRepository extends JpaRepository { - - @Query("SELECT notice FROM Notice notice " + - "WHERE notice.deletedAt IS NULL " + - "AND notice.startsAt <= :now " + - "AND (notice.endsAt IS NULL OR notice.endsAt >= :now) " + - "AND (:type IS NULL OR notice.type = :type) " + - "AND (:placement IS NULL OR notice.placement = :placement) " + - "ORDER BY notice.pinned DESC, notice.startsAt DESC, notice.createdAt DESC") - List findActiveNotices(@Param("now") LocalDateTime now, - @Param("type") NoticeType type, - @Param("placement") NoticePlacement placement, - Pageable pageable); - - @Query("SELECT notice FROM Notice notice " + - "WHERE notice.id = :noticeId " + - "AND notice.deletedAt IS NULL " + - "AND notice.startsAt <= :now " + - "AND (notice.endsAt IS NULL OR notice.endsAt >= :now)") - Optional findActiveById(@Param("noticeId") Long noticeId, @Param("now") LocalDateTime now); -} diff --git a/src/main/java/com/swyp/app/domain/notice/service/NoticeService.java b/src/main/java/com/swyp/app/domain/notice/service/NoticeService.java deleted file mode 100644 index 411c7717..00000000 --- a/src/main/java/com/swyp/app/domain/notice/service/NoticeService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.swyp.app.domain.notice.service; - -import com.swyp.app.domain.notice.dto.response.NoticeDetailResponse; -import com.swyp.app.domain.notice.dto.response.NoticeListResponse; -import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; -import com.swyp.app.domain.notice.entity.Notice; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; -import com.swyp.app.domain.notice.repository.NoticeRepository; -import com.swyp.app.global.common.exception.CustomException; -import com.swyp.app.global.common.exception.ErrorCode; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.PageRequest; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.List; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class NoticeService { - - private static final int DEFAULT_LIMIT = 20; - - private final NoticeRepository noticeRepository; - - public List getActiveNotices(NoticePlacement placement, NoticeType type, Integer limit) { - int pageSize = limit == null || limit <= 0 ? DEFAULT_LIMIT : limit; - return noticeRepository.findActiveNotices(LocalDateTime.now(), type, placement, PageRequest.of(0, pageSize)) - .stream() - .map(this::toSummaryResponse) - .toList(); - } - - public NoticeListResponse getNoticeList(NoticeType type, NoticePlacement placement, Integer limit) { - List items = getActiveNotices(placement, type, limit); - return new NoticeListResponse(items, items.size()); - } - - public NoticeDetailResponse getNoticeDetail(Long noticeId) { - Notice notice = noticeRepository.findActiveById(noticeId, LocalDateTime.now()) - .orElseThrow(() -> new CustomException(ErrorCode.NOTICE_NOT_FOUND)); - - return new NoticeDetailResponse( - notice.getId(), - notice.getTitle(), - notice.getBody(), - notice.getType(), - notice.getPlacement(), - notice.isPinned(), - notice.getStartsAt(), - notice.getEndsAt(), - notice.getCreatedAt() - ); - } - - private NoticeSummaryResponse toSummaryResponse(Notice notice) { - return new NoticeSummaryResponse( - notice.getId(), - notice.getTitle(), - notice.getBody(), - notice.getType(), - notice.getPlacement(), - notice.isPinned(), - notice.getStartsAt(), - notice.getEndsAt() - ); - } -} diff --git a/src/main/java/com/swyp/app/domain/notification/controller/NotificationController.java b/src/main/java/com/swyp/app/domain/notification/controller/NotificationController.java new file mode 100644 index 00000000..5dbbfccf --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/controller/NotificationController.java @@ -0,0 +1,53 @@ +package com.swyp.app.domain.notification.controller; + +import com.swyp.app.domain.notification.dto.response.NotificationListResponse; +import com.swyp.app.domain.notification.enums.NotificationCategory; +import com.swyp.app.domain.notification.service.NotificationService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "알림 API", description = "알림 조회 및 읽음 처리") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/notifications") +public class NotificationController { + + private final NotificationService notificationService; + + @Operation(summary = "알림 목록 조회") + @GetMapping + public ApiResponse getNotifications( + @AuthenticationPrincipal Long userId, + @RequestParam(required = false) NotificationCategory category, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size + ) { + return ApiResponse.onSuccess(notificationService.getNotifications(userId, category, page, size)); + } + + @Operation(summary = "알림 개별 읽음 처리") + @PatchMapping("/{notificationId}/read") + public ApiResponse markAsRead( + @AuthenticationPrincipal Long userId, + @PathVariable Long notificationId + ) { + notificationService.markAsRead(userId, notificationId); + return ApiResponse.onSuccess(null); + } + + @Operation(summary = "알림 전체 읽음 처리") + @PatchMapping("/read-all") + public ApiResponse markAllAsRead(@AuthenticationPrincipal Long userId) { + notificationService.markAllAsRead(userId); + return ApiResponse.onSuccess(null); + } +} diff --git a/src/main/java/com/swyp/app/domain/notification/dto/response/NotificationListResponse.java b/src/main/java/com/swyp/app/domain/notification/dto/response/NotificationListResponse.java new file mode 100644 index 00000000..68d03ab1 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/dto/response/NotificationListResponse.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.notification.dto.response; + +import java.util.List; + +public record NotificationListResponse( + List items, + boolean hasNext +) {} diff --git a/src/main/java/com/swyp/app/domain/notification/dto/response/NotificationSummaryResponse.java b/src/main/java/com/swyp/app/domain/notification/dto/response/NotificationSummaryResponse.java new file mode 100644 index 00000000..56ffb3ac --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/dto/response/NotificationSummaryResponse.java @@ -0,0 +1,17 @@ +package com.swyp.app.domain.notification.dto.response; + +import com.swyp.app.domain.notification.enums.NotificationCategory; +import com.swyp.app.domain.notification.enums.NotificationDetailCode; + +import java.time.LocalDateTime; + +public record NotificationSummaryResponse( + Long notificationId, + NotificationCategory category, + int detailCode, + String title, + String body, + Long referenceId, + boolean isRead, + LocalDateTime createdAt +) {} diff --git a/src/main/java/com/swyp/app/domain/notification/entity/Notification.java b/src/main/java/com/swyp/app/domain/notification/entity/Notification.java new file mode 100644 index 00000000..7d8dff66 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/entity/Notification.java @@ -0,0 +1,73 @@ +package com.swyp.app.domain.notification.entity; + +import com.swyp.app.domain.notification.enums.NotificationCategory; +import com.swyp.app.domain.notification.enums.NotificationDetailCode; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Getter +@Entity +@Table(name = "notifications") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Notification extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private NotificationCategory category; + + @Enumerated(EnumType.STRING) + @Column(name = "detail_code", nullable = false, length = 30) + private NotificationDetailCode detailCode; + + @Column(nullable = false, length = 150) + private String title; + + @Column(columnDefinition = "TEXT") + private String body; + + @Column(name = "reference_id") + private Long referenceId; + + @Column(name = "is_read", nullable = false) + private boolean read; + + @Column(name = "read_at") + private LocalDateTime readAt; + + @Builder + private Notification(User user, NotificationCategory category, NotificationDetailCode detailCode, + String title, String body, Long referenceId) { + this.user = user; + this.category = category; + this.detailCode = detailCode; + this.title = title; + this.body = body; + this.referenceId = referenceId; + this.read = false; + } + + public void markAsRead() { + if (!this.read) { + this.read = true; + this.readAt = LocalDateTime.now(); + } + } +} diff --git a/src/main/java/com/swyp/app/domain/notification/enums/NotificationCategory.java b/src/main/java/com/swyp/app/domain/notification/enums/NotificationCategory.java new file mode 100644 index 00000000..0429c3c4 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/enums/NotificationCategory.java @@ -0,0 +1,8 @@ +package com.swyp.app.domain.notification.enums; + +public enum NotificationCategory { + ALL, + CONTENT, + NOTICE, + EVENT +} diff --git a/src/main/java/com/swyp/app/domain/notification/enums/NotificationDetailCode.java b/src/main/java/com/swyp/app/domain/notification/enums/NotificationDetailCode.java new file mode 100644 index 00000000..0720cc1a --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/enums/NotificationDetailCode.java @@ -0,0 +1,24 @@ +package com.swyp.app.domain.notification.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum NotificationDetailCode { + + // CONTENT (1~3) + NEW_BATTLE(1, NotificationCategory.CONTENT, "새로운 배틀이 시작되었어요"), + VOTE_RESULT(2, NotificationCategory.CONTENT, "투표 결과가 나왔어요"), + CREDIT_EARNED(3, NotificationCategory.CONTENT, "포인트 적립"), + + // NOTICE (4) + POLICY_CHANGE(4, NotificationCategory.NOTICE, "공지사항"), + + // EVENT (5) + PROMOTION(5, NotificationCategory.EVENT, "이벤트"); + + private final int code; + private final NotificationCategory category; + private final String defaultTitle; +} diff --git a/src/main/java/com/swyp/app/domain/notification/repository/NotificationRepository.java b/src/main/java/com/swyp/app/domain/notification/repository/NotificationRepository.java new file mode 100644 index 00000000..cd49b5b4 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/repository/NotificationRepository.java @@ -0,0 +1,34 @@ +package com.swyp.app.domain.notification.repository; + +import com.swyp.app.domain.notification.entity.Notification; +import com.swyp.app.domain.notification.enums.NotificationCategory; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface NotificationRepository extends JpaRepository { + + @Query(""" + SELECT n FROM Notification n + WHERE (n.user.id = :userId OR n.user IS NULL) + AND (:category IS NULL OR n.category = :category) + ORDER BY n.createdAt DESC + """) + Slice findByUserOrBroadcast( + @Param("userId") Long userId, + @Param("category") NotificationCategory category, + Pageable pageable + ); + + boolean existsByUserIsNullAndCategory(NotificationCategory category); + + @Modifying + @Query(""" + UPDATE Notification n SET n.read = true, n.readAt = CURRENT_TIMESTAMP + WHERE n.user.id = :userId AND n.read = false + """) + int markAllAsReadByUserId(@Param("userId") Long userId); +} diff --git a/src/main/java/com/swyp/app/domain/notification/service/NotificationService.java b/src/main/java/com/swyp/app/domain/notification/service/NotificationService.java new file mode 100644 index 00000000..dc05b05e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/notification/service/NotificationService.java @@ -0,0 +1,108 @@ +package com.swyp.app.domain.notification.service; + +import com.swyp.app.domain.notification.dto.response.NotificationListResponse; +import com.swyp.app.domain.notification.dto.response.NotificationSummaryResponse; +import com.swyp.app.domain.notification.entity.Notification; +import com.swyp.app.domain.notification.enums.NotificationCategory; +import com.swyp.app.domain.notification.enums.NotificationDetailCode; +import com.swyp.app.domain.notification.repository.NotificationRepository; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class NotificationService { + + private static final int DEFAULT_PAGE_SIZE = 20; + + private final NotificationRepository notificationRepository; + private final UserRepository userRepository; + + @Transactional + public Notification createNotification(Long userId, NotificationDetailCode detailCode, String body, Long referenceId) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + Notification notification = Notification.builder() + .user(user) + .category(detailCode.getCategory()) + .detailCode(detailCode) + .title(detailCode.getDefaultTitle()) + .body(body) + .referenceId(referenceId) + .build(); + + return notificationRepository.save(notification); + } + + @Transactional + public Notification createBroadcastNotification(NotificationDetailCode detailCode, String body, Long referenceId) { + Notification notification = Notification.builder() + .user(null) + .category(detailCode.getCategory()) + .detailCode(detailCode) + .title(detailCode.getDefaultTitle()) + .body(body) + .referenceId(referenceId) + .build(); + + return notificationRepository.save(notification); + } + + public NotificationListResponse getNotifications(Long userId, NotificationCategory category, int page, int size) { + int pageSize = size <= 0 ? DEFAULT_PAGE_SIZE : size; + NotificationCategory filterCategory = (category == NotificationCategory.ALL) ? null : category; + Slice slice = notificationRepository.findByUserOrBroadcast( + userId, filterCategory, PageRequest.of(page, pageSize)); + + return new NotificationListResponse( + slice.getContent().stream().map(this::toSummaryResponse).toList(), + slice.hasNext() + ); + } + + @Transactional + public void markAsRead(Long userId, Long notificationId) { + Notification notification = notificationRepository.findById(notificationId) + .orElseThrow(() -> new CustomException(ErrorCode.NOTIFICATION_NOT_FOUND)); + + boolean isOwner = notification.getUser() != null && notification.getUser().getId().equals(userId); + boolean isBroadcast = notification.getUser() == null; + + if (!isOwner && !isBroadcast) { + throw new CustomException(ErrorCode.NOTIFICATION_NOT_FOUND); + } + + notification.markAsRead(); + } + + @Transactional + public int markAllAsRead(Long userId) { + return notificationRepository.markAllAsReadByUserId(userId); + } + + public boolean hasNewBroadcast(NotificationCategory category) { + return notificationRepository.existsByUserIsNullAndCategory(category); + } + + private NotificationSummaryResponse toSummaryResponse(Notification notification) { + return new NotificationSummaryResponse( + notification.getId(), + notification.getCategory(), + notification.getDetailCode().getCode(), + notification.getTitle(), + notification.getBody(), + notification.getReferenceId(), + notification.isRead(), + notification.getCreatedAt() + ); + } +} diff --git a/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java b/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java index a5b5a333..f3f30817 100644 --- a/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java +++ b/src/main/java/com/swyp/app/domain/oauth/service/AuthService.java @@ -12,14 +12,21 @@ import com.swyp.app.domain.oauth.repository.UserSocialAccountRepository; import com.swyp.app.domain.user.entity.UserRole; import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.entity.UserProfile; +import com.swyp.app.domain.user.entity.UserSettings; import com.swyp.app.domain.user.entity.UserStatus; +import com.swyp.app.domain.user.entity.UserTendencyScore; +import com.swyp.app.domain.user.repository.UserProfileRepository; import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.domain.user.repository.UserSettingsRepository; +import com.swyp.app.domain.user.repository.UserTendencyScoreRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -37,6 +44,9 @@ public class AuthService { private final UserRepository userRepository; private final UserSocialAccountRepository socialAccountRepository; private final AuthRefreshTokenRepository refreshTokenRepository; + private final UserProfileRepository userProfileRepository; + private final UserSettingsRepository userSettingsRepository; + private final UserTendencyScoreRepository userTendencyScoreRepository; private final JwtProvider jwtProvider; public LoginResponse login(String provider, LoginRequest request) { @@ -63,6 +73,7 @@ public LoginResponse login(String provider, LoginRequest request) { .status(UserStatus.ACTIVE) .build(); userRepository.save(user); + initializeUserDomain(user); // 소셜 계정 연결 socialAccount = UserSocialAccount.builder() @@ -177,6 +188,34 @@ private String generateUserTag() { return "pique-" + UUID.randomUUID().toString().substring(0, 8); } + private void initializeUserDomain(User user) { + userProfileRepository.save(UserProfile.builder() + .user(user) + .nickname(user.getUserTag()) + .mannerTemperature(BigDecimal.valueOf(36.5)) + .build()); + + userSettingsRepository.save(UserSettings.builder() + .user(user) + .newBattleEnabled(false) + .battleResultEnabled(true) + .commentReplyEnabled(true) + .newCommentEnabled(false) + .contentLikeEnabled(false) + .marketingEventEnabled(true) + .build()); + + userTendencyScoreRepository.save(UserTendencyScore.builder() + .user(user) + .principle(0) + .reason(0) + .individual(0) + .change(0) + .inner(0) + .ideal(0) + .build()); + } + // refresh token 해시 private String hashToken(String token) { try { @@ -187,4 +226,4 @@ private String hashToken(String token) { throw new RuntimeException("토큰 해시 실패", e); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/app/domain/user/controller/MypageController.java b/src/main/java/com/swyp/app/domain/user/controller/MypageController.java index 84e03e41..62741f06 100644 --- a/src/main/java/com/swyp/app/domain/user/controller/MypageController.java +++ b/src/main/java/com/swyp/app/domain/user/controller/MypageController.java @@ -6,11 +6,8 @@ import com.swyp.app.domain.user.dto.response.ContentActivityListResponse; import com.swyp.app.domain.user.dto.response.MypageResponse; import com.swyp.app.domain.user.dto.response.MyProfileResponse; -import com.swyp.app.domain.user.dto.response.NoticeDetailResponse; -import com.swyp.app.domain.user.dto.response.NoticeListResponse; import com.swyp.app.domain.user.dto.response.NotificationSettingsResponse; import com.swyp.app.domain.user.dto.response.RecapResponse; -import com.swyp.app.domain.notice.enums.NoticeType; import com.swyp.app.domain.user.entity.ActivityType; import com.swyp.app.domain.user.entity.VoteSide; @@ -82,15 +79,4 @@ public ApiResponse updateNotificationSettings( return ApiResponse.onSuccess(mypageService.updateNotificationSettings(request)); } - @GetMapping("/notices") - public ApiResponse getNotices( - @RequestParam(required = false) NoticeType type - ) { - return ApiResponse.onSuccess(mypageService.getNotices(type)); - } - - @GetMapping("/notices/{noticeId}") - public ApiResponse getNoticeDetail(@PathVariable Long noticeId) { - return ApiResponse.onSuccess(mypageService.getNoticeDetail(noticeId)); - } } diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java deleted file mode 100644 index 845c3683..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/NoticeDetailResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -import com.swyp.app.domain.notice.enums.NoticeType; - -import java.time.LocalDateTime; - -public record NoticeDetailResponse( - Long noticeId, - NoticeType type, - String title, - String body, - boolean isPinned, - LocalDateTime publishedAt -) { -} diff --git a/src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java b/src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java deleted file mode 100644 index 4b0b1da2..00000000 --- a/src/main/java/com/swyp/app/domain/user/dto/response/NoticeListResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.swyp.app.domain.user.dto.response; - -import com.swyp.app.domain.notice.enums.NoticeType; - -import java.time.LocalDateTime; -import java.util.List; - -public record NoticeListResponse( - List items -) { - - public record NoticeItem( - Long noticeId, - NoticeType type, - String title, - String bodyPreview, - boolean isPinned, - LocalDateTime publishedAt - ) { - } -} diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java index 6559e6fe..2908f0d5 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/UserSettingsRepository.java @@ -1,7 +1,10 @@ package com.swyp.app.domain.user.repository; import com.swyp.app.domain.user.entity.UserSettings; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; public interface UserSettingsRepository extends JpaRepository { + + Optional findByUserId(Long userId); } diff --git a/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java b/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java index db4324d6..770218df 100644 --- a/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java +++ b/src/main/java/com/swyp/app/domain/user/repository/UserTendencyScoreRepository.java @@ -1,7 +1,10 @@ package com.swyp.app.domain.user.repository; import com.swyp.app.domain.user.entity.UserTendencyScore; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; public interface UserTendencyScoreRepository extends JpaRepository { + + Optional findByUserId(Long userId); } diff --git a/src/main/java/com/swyp/app/domain/user/service/MypageService.java b/src/main/java/com/swyp/app/domain/user/service/MypageService.java index 3fcd2bad..fc4cefe8 100644 --- a/src/main/java/com/swyp/app/domain/user/service/MypageService.java +++ b/src/main/java/com/swyp/app/domain/user/service/MypageService.java @@ -12,12 +12,6 @@ import com.swyp.app.domain.user.dto.response.BattleRecordListResponse; import com.swyp.app.domain.user.dto.response.ContentActivityListResponse; import com.swyp.app.domain.user.dto.response.MypageResponse; -import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; -import com.swyp.app.domain.notice.service.NoticeService; -import com.swyp.app.domain.user.dto.response.NoticeDetailResponse; -import com.swyp.app.domain.user.dto.response.NoticeListResponse; import com.swyp.app.domain.user.dto.response.NotificationSettingsResponse; import com.swyp.app.domain.user.dto.response.RecapResponse; import com.swyp.app.domain.user.dto.response.UserSummary; @@ -49,7 +43,6 @@ public class MypageService { private static final int DEFAULT_PAGE_SIZE = 20; private final UserService userService; - private final NoticeService noticeService; private final CreditService creditService; private final VoteQueryService voteQueryService; private final BattleQueryService battleQueryService; @@ -278,30 +271,6 @@ public NotificationSettingsResponse updateNotificationSettings(UpdateNotificatio return toNotificationSettingsResponse(settings); } - public NoticeListResponse getNotices(NoticeType type) { - List notices = noticeService.getActiveNotices( - NoticePlacement.NOTICE_BOARD, type, null - ); - - List items = notices.stream() - .map(notice -> new NoticeListResponse.NoticeItem( - notice.noticeId(), notice.type(), notice.title(), - notice.body(), notice.pinned(), notice.startsAt() - )) - .toList(); - - return new NoticeListResponse(items); - } - - public NoticeDetailResponse getNoticeDetail(Long noticeId) { - com.swyp.app.domain.notice.dto.response.NoticeDetailResponse notice = - noticeService.getNoticeDetail(noticeId); - return new NoticeDetailResponse( - notice.noticeId(), notice.type(), notice.title(), - notice.body(), notice.pinned(), notice.startsAt() - ); - } - private static final int PHILOSOPHER_CALC_THRESHOLD = 5; private PhilosopherType resolvePhilosopherType(Long userId, UserProfile profile) { diff --git a/src/main/java/com/swyp/app/domain/user/service/UserService.java b/src/main/java/com/swyp/app/domain/user/service/UserService.java index 6275bad0..d9d2e080 100644 --- a/src/main/java/com/swyp/app/domain/user/service/UserService.java +++ b/src/main/java/com/swyp/app/domain/user/service/UserService.java @@ -53,17 +53,17 @@ public User findCurrentUser() { } public UserProfile findUserProfile(Long userId) { - return userProfileRepository.findById(userId) + return userProfileRepository.findByUserId(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } public UserSettings findUserSettings(Long userId) { - return userSettingsRepository.findById(userId) + return userSettingsRepository.findByUserId(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } public UserTendencyScore findUserTendencyScore(Long userId) { - return userTendencyScoreRepository.findById(userId) + return userTendencyScoreRepository.findByUserId(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } } diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 553116af..54754977 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -43,6 +43,9 @@ public enum ErrorCode { // Notice NOTICE_NOT_FOUND(HttpStatus.NOT_FOUND, "NOTICE_404", "존재하지 않는 공지사항입니다."), + // Notification + NOTIFICATION_NOT_FOUND(HttpStatus.NOT_FOUND, "NOTIFICATION_404", "존재하지 않는 알림입니다."), + // Battle BATTLE_NOT_FOUND (HttpStatus.NOT_FOUND, "BATTLE_404", "존재하지 않는 배틀입니다."), BATTLE_CLOSED (HttpStatus.CONFLICT, "BATTLE_409_CLS", "종료된 배틀입니다."), diff --git a/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java b/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java index 254a1943..a558e868 100644 --- a/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java +++ b/src/test/java/com/swyp/app/domain/home/service/HomeServiceTest.java @@ -6,9 +6,8 @@ import com.swyp.app.domain.battle.enums.BattleType; import com.swyp.app.domain.battle.service.BattleService; import com.swyp.app.domain.home.dto.response.*; -import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.service.NoticeService; +import com.swyp.app.domain.notification.enums.NotificationCategory; +import com.swyp.app.domain.notification.service.NotificationService; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,7 +15,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.atomic.AtomicLong; @@ -34,7 +32,7 @@ class HomeServiceTest { @Mock private BattleService battleService; @Mock - private NoticeService noticeService; + private NotificationService notificationService; @InjectMocks private HomeService homeService; @@ -55,18 +53,7 @@ void getHome_aggregates_sections_by_spec() { TodayBattleResponse todayQuiz = quiz("quiz-id"); TodayBattleResponse newBattle = battle("new-id", BATTLE); - NoticeSummaryResponse notice = new NoticeSummaryResponse( - generateId(), - "notice", - "body", - null, - NoticePlacement.HOME_TOP, - true, - LocalDateTime.now().minusDays(1), - null - ); - - when(noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, 1)).thenReturn(List.of(notice)); + when(notificationService.hasNewBroadcast(NotificationCategory.NOTICE)).thenReturn(true); when(battleService.getEditorPicks()).thenReturn(List.of(editorPick)); when(battleService.getTrendingBattles()).thenReturn(List.of(trendingBattle)); when(battleService.getBestBattles()).thenReturn(List.of(bestBattle)); @@ -106,7 +93,7 @@ void getHome_aggregates_sections_by_spec() { @Test @DisplayName("데이터가 없으면 false와 빈리스트를 반환한다") void getHome_returns_false_and_empty_lists_when_no_data() { - when(noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, 1)).thenReturn(List.of()); + when(notificationService.hasNewBroadcast(NotificationCategory.NOTICE)).thenReturn(false); when(battleService.getEditorPicks()).thenReturn(List.of()); when(battleService.getTrendingBattles()).thenReturn(List.of()); when(battleService.getBestBattles()).thenReturn(List.of()); @@ -130,7 +117,7 @@ void getHome_returns_false_and_empty_lists_when_no_data() { void getHome_excludes_only_editor_pick_ids() { TodayBattleResponse editorPick = battle("editor-only", BATTLE); - when(noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, 1)).thenReturn(List.of()); + when(notificationService.hasNewBroadcast(NotificationCategory.NOTICE)).thenReturn(false); when(battleService.getEditorPicks()).thenReturn(List.of(editorPick)); when(battleService.getTrendingBattles()).thenReturn(List.of()); when(battleService.getBestBattles()).thenReturn(List.of()); @@ -144,14 +131,9 @@ void getHome_excludes_only_editor_pick_ids() { } @Test - @DisplayName("공지가 여러개여도 newNotice는 true이다") - void getHome_newNotice_true_with_multiple_notices() { - NoticeSummaryResponse notice1 = new NoticeSummaryResponse( - generateId(), "notice1", "body1", null, - NoticePlacement.HOME_TOP, true, LocalDateTime.now().minusDays(1), null - ); - - when(noticeService.getActiveNotices(NoticePlacement.HOME_TOP, null, 1)).thenReturn(List.of(notice1)); + @DisplayName("공지 브로드캐스트가 있으면 newNotice는 true이다") + void getHome_newNotice_true_with_broadcast() { + when(notificationService.hasNewBroadcast(NotificationCategory.NOTICE)).thenReturn(true); when(battleService.getEditorPicks()).thenReturn(List.of()); when(battleService.getTrendingBattles()).thenReturn(List.of()); when(battleService.getBestBattles()).thenReturn(List.of()); diff --git a/src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java b/src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java deleted file mode 100644 index 6f5d1963..00000000 --- a/src/test/java/com/swyp/app/domain/notice/service/NoticeServiceTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.swyp.app.domain.notice.service; - -import com.swyp.app.domain.notice.entity.Notice; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; -import com.swyp.app.domain.notice.repository.NoticeRepository; -import com.swyp.app.global.common.exception.CustomException; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.data.domain.Pageable; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.when; - -@ExtendWith(MockitoExtension.class) -class NoticeServiceTest { - - @Mock - private NoticeRepository noticeRepository; - - @InjectMocks - private NoticeService noticeService; - - @Test - @DisplayName("활성공지 목록을 개수와 함께 반환한다") - void getNoticeList_returns_active_notices_with_count() { - Notice notice = Notice.builder() - .title("공지") - .body("내용") - .type(NoticeType.ANNOUNCEMENT) - .placement(NoticePlacement.HOME_TOP) - .pinned(true) - .startsAt(LocalDateTime.now().minusDays(1)) - .endsAt(LocalDateTime.now().plusDays(1)) - .build(); - - when(noticeRepository.findActiveNotices(any(LocalDateTime.class), eq(NoticeType.ANNOUNCEMENT), - eq(NoticePlacement.HOME_TOP), any(Pageable.class))).thenReturn(List.of(notice)); - - var response = noticeService.getNoticeList(NoticeType.ANNOUNCEMENT, NoticePlacement.HOME_TOP, 5); - - assertThat(response.totalCount()).isEqualTo(1); - assertThat(response.items()).hasSize(1); - assertThat(response.items().getFirst().title()).isEqualTo("공지"); - } - - @Test - @DisplayName("활성공지가 없으면 예외를 던진다") - void getNoticeDetail_throws_when_no_active_notice() { - Long noticeId = 1L; - when(noticeRepository.findActiveById(eq(noticeId), any(LocalDateTime.class))).thenReturn(Optional.empty()); - - assertThatThrownBy(() -> noticeService.getNoticeDetail(noticeId)) - .isInstanceOf(CustomException.class); - } -} diff --git a/src/test/java/com/swyp/app/domain/notification/service/NotificationServiceTest.java b/src/test/java/com/swyp/app/domain/notification/service/NotificationServiceTest.java new file mode 100644 index 00000000..5b97761c --- /dev/null +++ b/src/test/java/com/swyp/app/domain/notification/service/NotificationServiceTest.java @@ -0,0 +1,124 @@ +package com.swyp.app.domain.notification.service; + +import com.swyp.app.domain.notification.dto.response.NotificationListResponse; +import com.swyp.app.domain.notification.entity.Notification; +import com.swyp.app.domain.notification.enums.NotificationCategory; +import com.swyp.app.domain.notification.enums.NotificationDetailCode; +import com.swyp.app.domain.notification.repository.NotificationRepository; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.global.common.exception.CustomException; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.SliceImpl; + +import java.util.List; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class NotificationServiceTest { + + @Mock + private NotificationRepository notificationRepository; + + @Mock + private UserRepository userRepository; + + @InjectMocks + private NotificationService notificationService; + + @Test + @DisplayName("개인 알림을 생성한다") + void createNotification_creates_personal_notification() { + Long userId = 1L; + User user = createMockUser(); + when(userRepository.findById(userId)).thenReturn(Optional.of(user)); + when(notificationRepository.save(any(Notification.class))).thenAnswer(i -> i.getArgument(0)); + + Notification result = notificationService.createNotification( + userId, NotificationDetailCode.NEW_BATTLE, "새 배틀이 시작되었습니다", 100L); + + assertThat(result.getCategory()).isEqualTo(NotificationCategory.CONTENT); + assertThat(result.getDetailCode()).isEqualTo(NotificationDetailCode.NEW_BATTLE); + assertThat(result.getBody()).isEqualTo("새 배틀이 시작되었습니다"); + assertThat(result.getReferenceId()).isEqualTo(100L); + } + + @Test + @DisplayName("브로드캐스트 알림을 생성한다") + void createBroadcastNotification_creates_with_null_user() { + when(notificationRepository.save(any(Notification.class))).thenAnswer(i -> i.getArgument(0)); + + Notification result = notificationService.createBroadcastNotification( + NotificationDetailCode.POLICY_CHANGE, "서비스 정책이 변경되었습니다", 50L); + + assertThat(result.getUser()).isNull(); + assertThat(result.getCategory()).isEqualTo(NotificationCategory.NOTICE); + assertThat(result.getDetailCode()).isEqualTo(NotificationDetailCode.POLICY_CHANGE); + } + + @Test + @DisplayName("알림 목록을 카테고리별로 조회한다") + void getNotifications_returns_filtered_list() { + Long userId = 1L; + Notification notification = Notification.builder() + .user(null) + .category(NotificationCategory.CONTENT) + .detailCode(NotificationDetailCode.NEW_BATTLE) + .title("새로운 배틀이 시작되었어요") + .body("배틀 내용") + .referenceId(1L) + .build(); + + when(notificationRepository.findByUserOrBroadcast(eq(userId), eq(NotificationCategory.CONTENT), any(Pageable.class))) + .thenReturn(new SliceImpl<>(List.of(notification))); + + NotificationListResponse response = notificationService.getNotifications(userId, NotificationCategory.CONTENT, 0, 20); + + assertThat(response.items()).hasSize(1); + assertThat(response.items().getFirst().category()).isEqualTo(NotificationCategory.CONTENT); + assertThat(response.items().getFirst().detailCode()).isEqualTo(1); + assertThat(response.hasNext()).isFalse(); + } + + @Test + @DisplayName("존재하지 않는 알림 읽음 처리 시 예외를 던진다") + void markAsRead_throws_when_not_found() { + when(notificationRepository.findById(999L)).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> notificationService.markAsRead(1L, 999L)) + .isInstanceOf(CustomException.class); + } + + @Test + @DisplayName("전체 읽음 처리를 실행한다") + void markAllAsRead_calls_repository() { + Long userId = 1L; + when(notificationRepository.markAllAsReadByUserId(userId)).thenReturn(5); + + int count = notificationService.markAllAsRead(userId); + + assertThat(count).isEqualTo(5); + verify(notificationRepository).markAllAsReadByUserId(userId); + } + + private User createMockUser() { + return User.builder() + .userTag("test-user-tag") + .nickname("테스트유저") + .build(); + } +} diff --git a/src/test/java/com/swyp/app/domain/oauth/service/OAuthServiceTest.java b/src/test/java/com/swyp/app/domain/oauth/service/OAuthServiceTest.java index a77bb0b6..dc253ce5 100644 --- a/src/test/java/com/swyp/app/domain/oauth/service/OAuthServiceTest.java +++ b/src/test/java/com/swyp/app/domain/oauth/service/OAuthServiceTest.java @@ -11,7 +11,10 @@ import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.user.entity.UserRole; import com.swyp.app.domain.user.entity.UserStatus; +import com.swyp.app.domain.user.repository.UserProfileRepository; import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.domain.user.repository.UserSettingsRepository; +import com.swyp.app.domain.user.repository.UserTendencyScoreRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -33,6 +36,9 @@ class OAuthServiceTest { @Mock private UserRepository userRepository; @Mock private UserSocialAccountRepository socialAccountRepository; @Mock private AuthRefreshTokenRepository refreshTokenRepository; + @Mock private UserProfileRepository userProfileRepository; + @Mock private UserSettingsRepository userSettingsRepository; + @Mock private UserTendencyScoreRepository userTendencyScoreRepository; @Mock private JwtProvider jwtProvider; private AuthService authService; @@ -42,7 +48,9 @@ void setUp() { // 수동 주입으로 안정성 확보 authService = new AuthService( kakaoOAuthClient, googleOAuthClient, userRepository, - socialAccountRepository, refreshTokenRepository, jwtProvider + socialAccountRepository, refreshTokenRepository, + userProfileRepository, userSettingsRepository, userTendencyScoreRepository, + jwtProvider ); } @@ -81,4 +89,32 @@ void setUp() { assertThat(response.isNewUser()).isFalse(); verify(refreshTokenRepository).save(any()); } -} \ No newline at end of file + + @Test + void login_구글_신규유저_기본_user_domain_초기화() { + String provider = "GOOGLE"; + LoginRequest request = new LoginRequest("auth-code", "redirect-uri"); + OAuthUserInfo userInfo = new OAuthUserInfo("google_123", "new@test.com", "profile_url"); + + User savedUser = User.builder() + .userTag("pique-test") + .role(UserRole.USER) + .status(UserStatus.ACTIVE) + .build(); + + when(googleOAuthClient.getAccessToken(anyString(), anyString())).thenReturn("mock-access-token"); + when(googleOAuthClient.getUserInfo(anyString())).thenReturn(userInfo); + when(socialAccountRepository.findByProviderAndProviderUserId(anyString(), anyString())) + .thenReturn(Optional.empty()); + when(userRepository.save(any(User.class))).thenReturn(savedUser); + when(jwtProvider.createAccessToken(any(), anyString())).thenReturn("jwt-access"); + when(jwtProvider.createRefreshToken()).thenReturn("jwt-refresh"); + + LoginResponse response = authService.login(provider, request); + + assertThat(response.isNewUser()).isTrue(); + verify(userProfileRepository).save(any()); + verify(userSettingsRepository).save(any()); + verify(userTendencyScoreRepository).save(any()); + } +} diff --git a/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java index 08908ac9..2141d499 100644 --- a/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java +++ b/src/test/java/com/swyp/app/domain/user/service/MypageServiceTest.java @@ -6,10 +6,6 @@ import com.swyp.app.domain.battle.enums.BattleStatus; import com.swyp.app.domain.battle.enums.BattleType; import com.swyp.app.domain.battle.service.BattleQueryService; -import com.swyp.app.domain.notice.dto.response.NoticeSummaryResponse; -import com.swyp.app.domain.notice.enums.NoticePlacement; -import com.swyp.app.domain.notice.enums.NoticeType; -import com.swyp.app.domain.notice.service.NoticeService; import com.swyp.app.domain.perspective.entity.Perspective; import com.swyp.app.domain.perspective.entity.PerspectiveComment; import com.swyp.app.domain.perspective.entity.PerspectiveLike; @@ -18,8 +14,6 @@ import com.swyp.app.domain.user.dto.response.BattleRecordListResponse; import com.swyp.app.domain.user.dto.response.ContentActivityListResponse; import com.swyp.app.domain.user.dto.response.MypageResponse; -import com.swyp.app.domain.user.dto.response.NoticeDetailResponse; -import com.swyp.app.domain.user.dto.response.NoticeListResponse; import com.swyp.app.domain.user.dto.response.NotificationSettingsResponse; import com.swyp.app.domain.user.dto.response.RecapResponse; import com.swyp.app.domain.user.dto.response.UserSummary; @@ -63,8 +57,6 @@ class MypageServiceTest { @Mock private UserService userService; @Mock - private NoticeService noticeService; - @Mock private CreditService creditService; @Mock private VoteQueryService voteQueryService; @@ -355,46 +347,6 @@ void updateNotificationSettings_updates_and_returns() { assertThat(response.marketingEventEnabled()).isTrue(); } - @Test - @DisplayName("공지사항 목록을 반환한다") - void getNotices_returns_notice_list() { - NoticeSummaryResponse notice = new NoticeSummaryResponse( - 1L, "공지 제목", "본문", - NoticeType.ANNOUNCEMENT, NoticePlacement.NOTICE_BOARD, - true, LocalDateTime.now().minusDays(1), null - ); - - when(noticeService.getActiveNotices(NoticePlacement.NOTICE_BOARD, NoticeType.ANNOUNCEMENT, null)) - .thenReturn(List.of(notice)); - - NoticeListResponse response = mypageService.getNotices(NoticeType.ANNOUNCEMENT); - - assertThat(response.items()).hasSize(1); - assertThat(response.items().get(0).title()).isEqualTo("공지 제목"); - assertThat(response.items().get(0).isPinned()).isTrue(); - } - - @Test - @DisplayName("공지사항 상세를 반환한다") - void getNoticeDetail_returns_notice_detail() { - Long noticeId = 1L; - com.swyp.app.domain.notice.dto.response.NoticeDetailResponse noticeDetail = - new com.swyp.app.domain.notice.dto.response.NoticeDetailResponse( - noticeId, "상세 제목", "상세 본문", - NoticeType.EVENT, NoticePlacement.NOTICE_BOARD, - false, LocalDateTime.now(), null, LocalDateTime.now() - ); - - when(noticeService.getNoticeDetail(noticeId)).thenReturn(noticeDetail); - - NoticeDetailResponse response = mypageService.getNoticeDetail(noticeId); - - assertThat(response.noticeId()).isEqualTo(noticeId); - assertThat(response.title()).isEqualTo("상세 제목"); - assertThat(response.type()).isEqualTo(NoticeType.EVENT); - assertThat(response.isPinned()).isFalse(); - } - private User createUser(Long id, String userTag) { User user = User.builder() .userTag(userTag) diff --git a/src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java b/src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java index 56d530fc..409f289a 100644 --- a/src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java +++ b/src/test/java/com/swyp/app/domain/user/service/UserServiceTest.java @@ -74,7 +74,7 @@ void findSummaryById_returns_user_summary() { UserProfile profile = createProfile(user, "nick", CharacterType.OWL); when(userRepository.findById(1L)).thenReturn(Optional.of(user)); - when(userProfileRepository.findById(1L)).thenReturn(Optional.of(profile)); + when(userProfileRepository.findByUserId(1L)).thenReturn(Optional.of(profile)); UserSummary summary = userService.findSummaryById(1L); @@ -100,7 +100,7 @@ void updateMyProfile_updates_nickname_and_character() { UserProfile profile = createProfile(user, "oldNick", CharacterType.OWL); when(userRepository.findTopByOrderByIdDesc()).thenReturn(Optional.of(user)); - when(userProfileRepository.findById(1L)).thenReturn(Optional.of(profile)); + when(userProfileRepository.findByUserId(1L)).thenReturn(Optional.of(profile)); UpdateUserProfileRequest request = new UpdateUserProfileRequest("newNick", CharacterType.FOX); MyProfileResponse response = userService.updateMyProfile(request); @@ -116,7 +116,7 @@ void findUserProfile_returns_profile() { User user = createUser(1L, "tag"); UserProfile profile = createProfile(user, "nick", CharacterType.BEAR); - when(userProfileRepository.findById(1L)).thenReturn(Optional.of(profile)); + when(userProfileRepository.findByUserId(1L)).thenReturn(Optional.of(profile)); UserProfile result = userService.findUserProfile(1L); @@ -138,7 +138,7 @@ void findUserSettings_returns_settings() { .marketingEventEnabled(false) .build(); - when(userSettingsRepository.findById(1L)).thenReturn(Optional.of(settings)); + when(userSettingsRepository.findByUserId(1L)).thenReturn(Optional.of(settings)); UserSettings result = userService.findUserSettings(1L); @@ -160,7 +160,7 @@ void findUserTendencyScore_returns_score() { .ideal(60) .build(); - when(userTendencyScoreRepository.findById(1L)).thenReturn(Optional.of(score)); + when(userTendencyScoreRepository.findByUserId(1L)).thenReturn(Optional.of(score)); UserTendencyScore result = userService.findUserTendencyScore(1L); From 68453d0f540e3d21f2db88915b53b40a3a603891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A4=80=ED=98=81?= <127603139+HYH0804@users.noreply.github.com> Date: Sun, 29 Mar 2026 10:43:57 +0900 Subject: [PATCH 32/94] =?UTF-8?q?#62=20[Feat]=20=ED=9D=A5=EB=AF=B8?= =?UTF-8?q?=EB=A1=9C=EC=9A=B4=20=EB=B0=B0=ED=8B=80=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#70)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - #62 ## 📝 작업 내용 ### ✨ Feat t | 내용 | 파일 | |------|------| | 철학자 유형 기반 흥미로운 배틀 추천 API 구현 | `RecommendationController.java`, `RecommendationService.java` | | 관점/댓글 신고 API 구현 (10회 누적 시 자동 숨김) | `ReportController.java`, `ReportService.java`, `PerspectiveReport.java`, `CommentReport.java` | | 철학자 결과 공유 딥링크 리다이렉트 페이지 구현 | `ShareController.java`, `result.html` | | 내 투표 내역 응답에 `battleTitle`, `opinionChanged` 추가 | `MyVoteResponse.java`, `VoteConverter.java` | | 관점/댓글 응답에 캐릭터 이미지 Presigned URL 추가 | `PerspectiveService.java`, `PerspectiveCommentService.java` | | 철학자 유형 산출 로직 구현 (투표 이력 기반) | `UserService.java` | | 테스트용 JWT 발급 엔드포인트 추가 | `TestController.java` | ### ♻️ Refactor | 내용 | 파일 | |------|------| | 내 관점 조회 API 상태 필터 제거 및 응답 구조 확장 (`/me/pending` → `/me`) | `PerspectiveController.java`, `PerspectiveService.java`, `MyPerspectiveResponse.java` | | `RecommendationController` userId 추출 방식 `@RequestParam` → `@AuthenticationPrincipal` 변경 | `RecommendationController.java` | ### 🐛 Fix | 내용 | 파일 | |------|------| | `findUserProfile` `findById` → `findByUserId` 수정 (user_id FK 기준 조회) | `UserService.java` | | `PerspectiveStatus`에 `HIDDEN` 추가 및 DB CHECK 제약 조건 대응 | `PerspectiveStatus.java` | ## 📌 공유 사항 > 1. 공유 링크(`GET /result/{userId}`) 내 딥링크 스킴(`picke://`), Android 패키지명(`com.swyp.picke`), iOS App Store ID는 앱팀 확인 후 교체 필요합니다. > 2. 신고 임계값은 현재 10회로 설정되어 있습니다. (`ReportService.REPORT_THRESHOLD`) > 3. 캐릭터/철학자 이미지는 S3 버킷에 `images/characters/`, `images/philosophers/` 경로로 파일이 업로드되어 있어야 Presigned URL이 정상 동작합니다. ## ✅ 체크리스트 - [ x ] Reviewer에 팀원들을 선택했나요? - [ x ] Assignees에 본인을 선택했나요? - [ x ] 컨벤션에 맞는 Type을 선택했나요? - [ x ] Development에 이슈를 연동했나요? - [ x ] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [ x ] 컨벤션을 지키고 있나요? - [ x ] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [ x ] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 ## 💬 리뷰 요구사항 > 1. 천수님이 작업하신 이후 로컬에서 pull 받고 한거라 이미 반영되어있는 코드들이라서 크게 보실건 없습니다. > 2. 그래도 보시겠다 하시면 RecommendationService.java , ReportService.java , ShareController.java에서 출발하여 타임리프의 result.html에서 처리되는 딥링크 , S3 Presigned URL로 바꾼 `PerspectiveService.java`, `PerspectiveCommentService.java` --------- Co-authored-by: Claude Sonnet 4.6 --- .gitignore | 3 +- docker-compose.yml | 2 +- .../battle/repository/BattleRepository.java | 22 ++++ .../swyp/app/domain/oauth/jwt/JwtFilter.java | 4 +- .../controller/CommentLikeController.java | 37 ++++++ .../controller/PerspectiveController.java | 25 ++-- .../controller/ReportController.java | 40 +++++++ .../dto/request/CreatePerspectiveRequest.java | 2 + .../dto/request/UpdatePerspectiveRequest.java | 2 + .../dto/response/CommentListResponse.java | 5 +- .../dto/response/CreateCommentResponse.java | 6 +- .../dto/response/MyPerspectiveResponse.java | 11 +- .../response/PerspectiveDetailResponse.java | 19 +++ .../dto/response/PerspectiveListResponse.java | 7 +- .../perspective/entity/CommentLike.java | 37 ++++++ .../perspective/entity/CommentReport.java | 36 ++++++ .../perspective/entity/Perspective.java | 4 + .../entity/PerspectiveComment.java | 20 ++++ .../perspective/entity/PerspectiveReport.java | 36 ++++++ .../perspective/enums/PerspectiveStatus.java | 2 +- .../repository/CommentLikeRepository.java | 14 +++ .../repository/CommentReportRepository.java | 12 ++ .../PerspectiveReportRepository.java | 12 ++ .../repository/PerspectiveRepository.java | 4 + .../service/CommentLikeService.java | 60 ++++++++++ .../service/PerspectiveCommentService.java | 41 ++++++- .../service/PerspectiveService.java | 68 +++++++++-- .../perspective/service/ReportService.java | 80 +++++++++++++ .../controller/RecommendationController.java | 9 +- .../response/RecommendationListResponse.java | 6 +- .../service/RecommendationService.java | 110 +++++++++++++++++- .../share/controller/ShareController.java | 16 +++ .../test/controller/TestController.java | 17 ++- .../app/domain/user/service/UserService.java | 33 ++++++ .../domain/vote/converter/VoteConverter.java | 7 +- .../vote/dto/response/MyVoteResponse.java | 4 +- .../vote/repository/VoteRepository.java | 12 ++ .../app/domain/vote/service/VoteService.java | 2 + .../domain/vote/service/VoteServiceImpl.java | 7 ++ .../global/common/exception/ErrorCode.java | 5 + .../exception/GlobalExceptionHandler.java | 14 ++- .../app/global/config/SecurityConfig.java | 9 +- .../resources/templates/share/result.html | 92 +++++++++++++++ 43 files changed, 906 insertions(+), 48 deletions(-) create mode 100644 src/main/java/com/swyp/app/domain/perspective/controller/CommentLikeController.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/controller/ReportController.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveDetailResponse.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/entity/CommentLike.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/entity/CommentReport.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveReport.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/repository/CommentLikeRepository.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/repository/CommentReportRepository.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveReportRepository.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/service/CommentLikeService.java create mode 100644 src/main/java/com/swyp/app/domain/perspective/service/ReportService.java create mode 100644 src/main/java/com/swyp/app/domain/share/controller/ShareController.java create mode 100644 src/main/resources/templates/share/result.html diff --git a/.gitignore b/.gitignore index 2020e070..162d9972 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,5 @@ out/ ### Setting ### .env postgres_data/ -src/main/resources/application-local.yml \ No newline at end of file +src/main/resources/application-local.yml +.claude \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f3a20738..c2bde651 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: POSTGRES_USER: ${DB_USER} POSTGRES_PASSWORD: ${DB_PASSWORD} ports: - - "${DB_PORT}:5433" + - "${DB_PORT}:5432" volumes: - ./postgres_data:/var/lib/postgresql/data networks: diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java index 4c888e01..7d590755 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java @@ -72,4 +72,26 @@ public interface BattleRepository extends JpaRepository { "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") long countSearchByCategory(@Param("categoryName") String categoryName); + + // 추천 폴백용: 전체 배틀 대상 인기 점수순 조회 (철학자 유형 로직 미구현 시 사용) + // Score = V*1.0 + C*1.5 + Vw*0.2 + @Query("SELECT b FROM Battle b " + + "WHERE b.id NOT IN :excludeBattleIds " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") + List findPopularBattlesExcluding( + @Param("excludeBattleIds") List excludeBattleIds, + Pageable pageable); + + // 추천용: 특정 유저들이 참여한 배틀 중 이미 참여한 배틀 제외하고 인기 점수순 조회 + // Score = V*1.0 + C*1.5 + Vw*0.2 (R은 추후 반영 예정) + @Query("SELECT b FROM Battle b " + + "WHERE b.id IN :candidateBattleIds " + + "AND b.id NOT IN :excludeBattleIds " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") + List findRecommendedBattles( + @Param("candidateBattleIds") List candidateBattleIds, + @Param("excludeBattleIds") List excludeBattleIds, + Pageable pageable); } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java b/src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java index a25ef4f6..5fbf408d 100644 --- a/src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java +++ b/src/main/java/com/swyp/app/domain/oauth/jwt/JwtFilter.java @@ -39,7 +39,9 @@ public class JwtFilter extends OncePerRequestFilter { "/swagger-ui", // 스웨거 UI 리소스 전체 "/v3/api-docs", // OpenAPI 스펙 전체 "/api/v1/home", // 홈 화면 - "/api/v1/notices" // 공지사항 + "/api/v1/notices", // 공지사항 + "/api/test", // 테스트용 + "/result" // 공유 링크 리다이렉트 ); @Override diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/CommentLikeController.java b/src/main/java/com/swyp/app/domain/perspective/controller/CommentLikeController.java new file mode 100644 index 00000000..652e01fc --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/controller/CommentLikeController.java @@ -0,0 +1,37 @@ +package com.swyp.app.domain.perspective.controller; + +import com.swyp.app.domain.perspective.dto.response.LikeResponse; +import com.swyp.app.domain.perspective.service.CommentLikeService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "댓글 좋아요 (Comment Like)", description = "댓글 좋아요 등록, 취소 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class CommentLikeController { + + private final CommentLikeService commentLikeService; + + @Operation(summary = "댓글 좋아요 등록", description = "특정 댓글에 좋아요를 등록합니다.") + @PostMapping("/comments/{commentId}/likes") + public ApiResponse addLike(@PathVariable Long commentId, + @AuthenticationPrincipal Long userId) { + return ApiResponse.onSuccess(commentLikeService.addLike(commentId, userId)); + } + + @Operation(summary = "댓글 좋아요 취소", description = "특정 댓글에 등록한 좋아요를 취소합니다.") + @DeleteMapping("/comments/{commentId}/likes") + public ApiResponse removeLike(@PathVariable Long commentId, + @AuthenticationPrincipal Long userId) { + return ApiResponse.onSuccess(commentLikeService.removeLike(commentId, userId)); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java index e1e4bc1d..c5971a57 100644 --- a/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java +++ b/src/main/java/com/swyp/app/domain/perspective/controller/PerspectiveController.java @@ -4,6 +4,7 @@ import com.swyp.app.domain.perspective.dto.request.UpdatePerspectiveRequest; import com.swyp.app.domain.perspective.dto.response.CreatePerspectiveResponse; import com.swyp.app.domain.perspective.dto.response.MyPerspectiveResponse; +import com.swyp.app.domain.perspective.dto.response.PerspectiveDetailResponse; import com.swyp.app.domain.perspective.dto.response.PerspectiveListResponse; import com.swyp.app.domain.perspective.dto.response.UpdatePerspectiveResponse; import com.swyp.app.domain.perspective.service.PerspectiveService; @@ -31,6 +32,15 @@ public class PerspectiveController { private final PerspectiveService perspectiveService; + @Operation(summary = "관점 단건 조회", description = "특정 관점의 상세 정보를 조회합니다.") + @GetMapping("/perspectives/{perspectiveId}") + public ApiResponse getPerspectiveDetail( + @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId) { + return ApiResponse.onSuccess(perspectiveService.getPerspectiveDetail(perspectiveId, userId)); + } + + // TODO: Prevote 의 여부를 Vote 도메인 개발 이후 교체 @Operation(summary = "관점 생성", description = "특정 배틀에 대한 관점을 생성합니다. 사전 투표가 완료된 경우에만 가능합니다.") @PostMapping("/battles/{battleId}/perspectives") public ApiResponse createPerspective( @@ -41,24 +51,25 @@ public ApiResponse createPerspective( return ApiResponse.onSuccess(perspectiveService.createPerspective(battleId, userId, request)); } - @Operation(summary = "관점 리스트 조회", description = "특정 배틀의 관점 목록을 커서 기반 페이지네이션으로 조회합니다. optionLabel(A/B)로 필터링 가능합니다.") + @Operation(summary = "관점 리스트 조회", description = "특정 배틀의 관점 목록을 커서 기반 페이지네이션으로 조회합니다. optionLabel(A/B)로 필터링, sort(latest/popular)로 정렬 가능합니다.") @GetMapping("/battles/{battleId}/perspectives") public ApiResponse getPerspectives( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, @RequestParam(required = false) String cursor, @RequestParam(required = false) Integer size, - @RequestParam(required = false) String optionLabel + @RequestParam(required = false) String optionLabel, + @RequestParam(required = false, defaultValue = "latest") String sort ) { - return ApiResponse.onSuccess(perspectiveService.getPerspectives(battleId, userId, cursor, size, optionLabel)); + return ApiResponse.onSuccess(perspectiveService.getPerspectives(battleId, userId, cursor, size, optionLabel, sort)); } - @Operation(summary = "내 PENDING 관점 조회", description = "특정 배틀에서 내가 작성한 관점이 PENDING 상태인 경우 반환합니다. PENDING 관점이 없으면 404를 반환합니다.") - @GetMapping("/battles/{battleId}/perspectives/me/pending") - public ApiResponse getMyPendingPerspective( + @Operation(summary = "내 관점 조회", description = "특정 배틀에서 내가 작성한 관점을 조회합니다. 상태(PENDING/PUBLISHED/REJECTED 등)와 무관하게 반환하며, 작성한 관점이 없으면 404를 반환합니다.") + @GetMapping("/battles/{battleId}/perspectives/me") + public ApiResponse getMyPerspective( @PathVariable Long battleId, @AuthenticationPrincipal Long userId) { - return ApiResponse.onSuccess(perspectiveService.getMyPendingPerspective(battleId, userId)); + return ApiResponse.onSuccess(perspectiveService.getMyPerspective(battleId, userId)); } @Operation(summary = "관점 삭제", description = "본인이 작성한 관점을 삭제합니다.") diff --git a/src/main/java/com/swyp/app/domain/perspective/controller/ReportController.java b/src/main/java/com/swyp/app/domain/perspective/controller/ReportController.java new file mode 100644 index 00000000..8bf749de --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/controller/ReportController.java @@ -0,0 +1,40 @@ +package com.swyp.app.domain.perspective.controller; + +import com.swyp.app.domain.perspective.service.ReportService; +import com.swyp.app.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "신고 (Report)", description = "관점/댓글 신고 API") +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class ReportController { + + private final ReportService reportService; + + @Operation(summary = "관점 신고", description = "관점을 신고합니다. 신고 5회 누적 시 자동 숨김 처리됩니다.") + @PostMapping("/perspectives/{perspectiveId}/reports") + public ApiResponse reportPerspective( + @PathVariable Long perspectiveId, + @AuthenticationPrincipal Long userId) { + reportService.reportPerspective(perspectiveId, userId); + return ApiResponse.onSuccess(null); + } + + @Operation(summary = "댓글 신고", description = "댓글을 신고합니다. 신고 5회 누적 시 자동 숨김 처리됩니다.") + @PostMapping("/perspectives/{perspectiveId}/comments/{commentId}/reports") + public ApiResponse reportComment( + @PathVariable Long perspectiveId, + @PathVariable Long commentId, + @AuthenticationPrincipal Long userId) { + reportService.reportComment(commentId, userId); + return ApiResponse.onSuccess(null); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java b/src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java index 04994b34..b152fc81 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/request/CreatePerspectiveRequest.java @@ -1,8 +1,10 @@ package com.swyp.app.domain.perspective.dto.request; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; public record CreatePerspectiveRequest( @NotBlank + @Size(max = 200) String content ) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java b/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java index 0cc75f38..0408ba60 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/request/UpdatePerspectiveRequest.java @@ -1,8 +1,10 @@ package com.swyp.app.domain.perspective.dto.request; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; public record UpdatePerspectiveRequest( @NotBlank + @Size(max = 200) String content ) {} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java index 3bcab1c1..59f36bda 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/CommentListResponse.java @@ -11,10 +11,13 @@ public record CommentListResponse( public record Item( Long commentId, UserSummary user, + String stance, String content, + int likeCount, + boolean isLiked, boolean isMine, LocalDateTime createdAt ) {} - public record UserSummary(String userTag, String nickname, String characterType) {} + public record UserSummary(String userTag, String nickname, String characterType, String characterImageUrl) {} } diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java index b6ac69dc..21e4d734 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/CreateCommentResponse.java @@ -5,8 +5,12 @@ public record CreateCommentResponse( Long commentId, UserSummary user, + String stance, String content, + int likeCount, + boolean isLiked, + boolean isMine, LocalDateTime createdAt ) { - public record UserSummary(String userTag, String nickname, String characterType) {} + public record UserSummary(String userTag, String nickname, String characterType, String characterImageUrl) {} } diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java index c7dd6895..80f2b421 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/MyPerspectiveResponse.java @@ -6,7 +6,16 @@ public record MyPerspectiveResponse( Long perspectiveId, + UserSummary user, + OptionSummary option, String content, + int likeCount, + int commentCount, + boolean isLiked, PerspectiveStatus status, LocalDateTime createdAt -) {} +) { + public record UserSummary(String userTag, String nickname, String characterType, String characterImageUrl) {} + + public record OptionSummary(Long optionId, String label, String title, String stance) {} +} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveDetailResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveDetailResponse.java new file mode 100644 index 00000000..5732bd20 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveDetailResponse.java @@ -0,0 +1,19 @@ +package com.swyp.app.domain.perspective.dto.response; + +import java.time.LocalDateTime; + +public record PerspectiveDetailResponse( + Long perspectiveId, + UserSummary user, + OptionSummary option, + String content, + int likeCount, + int commentCount, + boolean isLiked, + boolean isMyPerspective, + LocalDateTime createdAt +) { + public record UserSummary(String userTag, String nickname, String characterType, String characterImageUrl) {} + + public record OptionSummary(Long optionId, String label, String title, String stance) {} +} diff --git a/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java index 23cfa6e0..5c5b846f 100644 --- a/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java +++ b/src/main/java/com/swyp/app/domain/perspective/dto/response/PerspectiveListResponse.java @@ -16,18 +16,21 @@ public record Item( int likeCount, int commentCount, boolean isLiked, + boolean isMyPerspective, LocalDateTime createdAt ) {} public record UserSummary( String userTag, String nickname, - String characterType + String characterType, + String characterImageUrl ) {} public record OptionSummary( Long optionId, String label, - String title + String title, + String stance ) {} } diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/CommentLike.java b/src/main/java/com/swyp/app/domain/perspective/entity/CommentLike.java new file mode 100644 index 00000000..2210a5cb --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/entity/CommentLike.java @@ -0,0 +1,37 @@ +package com.swyp.app.domain.perspective.entity; + +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table( + name = "comment_likes", + uniqueConstraints = @UniqueConstraint(columnNames = {"comment_id", "user_id"}) +) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class CommentLike extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "comment_id", nullable = false) + private PerspectiveComment comment; + + @Column(name = "user_id", nullable = false) + private Long userId; + + @Builder + private CommentLike(PerspectiveComment comment, Long userId) { + this.comment = comment; + this.userId = userId; + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/CommentReport.java b/src/main/java/com/swyp/app/domain/perspective/entity/CommentReport.java new file mode 100644 index 00000000..958265ce --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/entity/CommentReport.java @@ -0,0 +1,36 @@ +package com.swyp.app.domain.perspective.entity; + +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "comment_reports", + uniqueConstraints = @UniqueConstraint(columnNames = {"comment_id", "user_id"})) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class CommentReport extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "comment_id", nullable = false) + private PerspectiveComment comment; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @Builder + private CommentReport(PerspectiveComment comment, User user) { + this.comment = comment; + this.user = user; + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java index 48ece7a8..ecc3a3ca 100644 --- a/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java +++ b/src/main/java/com/swyp/app/domain/perspective/entity/Perspective.java @@ -80,6 +80,10 @@ public void reject() { this.status = PerspectiveStatus.REJECTED; } + public void hide() { + this.status = PerspectiveStatus.HIDDEN; + } + public void incrementLikeCount() { this.likeCount++; } diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java index bf41727d..b69156d8 100644 --- a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveComment.java @@ -30,14 +30,34 @@ public class PerspectiveComment extends BaseEntity { @Column(nullable = false, columnDefinition = "TEXT") private String content; + @Column(name = "like_count", nullable = false) + private int likeCount = 0; + + @Column(nullable = false) + private boolean hidden = false; + @Builder private PerspectiveComment(Perspective perspective, User user, String content) { this.perspective = perspective; this.user = user; this.content = content; + this.likeCount = 0; + this.hidden = false; + } + + public void hide() { + this.hidden = true; } public void updateContent(String content) { this.content = content; } + + public void incrementLikeCount() { + this.likeCount++; + } + + public void decrementLikeCount() { + if (this.likeCount > 0) this.likeCount--; + } } diff --git a/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveReport.java b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveReport.java new file mode 100644 index 00000000..63467c0e --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/entity/PerspectiveReport.java @@ -0,0 +1,36 @@ +package com.swyp.app.domain.perspective.entity; + +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "perspective_reports", + uniqueConstraints = @UniqueConstraint(columnNames = {"perspective_id", "user_id"})) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PerspectiveReport extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "perspective_id", nullable = false) + private Perspective perspective; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @Builder + private PerspectiveReport(Perspective perspective, User user) { + this.perspective = perspective; + this.user = user; + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/enums/PerspectiveStatus.java b/src/main/java/com/swyp/app/domain/perspective/enums/PerspectiveStatus.java index f7ce2ce8..cd497007 100644 --- a/src/main/java/com/swyp/app/domain/perspective/enums/PerspectiveStatus.java +++ b/src/main/java/com/swyp/app/domain/perspective/enums/PerspectiveStatus.java @@ -1,5 +1,5 @@ package com.swyp.app.domain.perspective.enums; public enum PerspectiveStatus { - PENDING, PUBLISHED, REJECTED, MODERATION_FAILED + PENDING, PUBLISHED, REJECTED, MODERATION_FAILED, HIDDEN } diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/CommentLikeRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/CommentLikeRepository.java new file mode 100644 index 00000000..0359f109 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/repository/CommentLikeRepository.java @@ -0,0 +1,14 @@ +package com.swyp.app.domain.perspective.repository; + +import com.swyp.app.domain.perspective.entity.CommentLike; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface CommentLikeRepository extends JpaRepository { + + boolean existsByCommentAndUserId(PerspectiveComment comment, Long userId); + + Optional findByCommentAndUserId(PerspectiveComment comment, Long userId); +} diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/CommentReportRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/CommentReportRepository.java new file mode 100644 index 00000000..47de545f --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/repository/CommentReportRepository.java @@ -0,0 +1,12 @@ +package com.swyp.app.domain.perspective.repository; + +import com.swyp.app.domain.perspective.entity.CommentReport; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CommentReportRepository extends JpaRepository { + + boolean existsByCommentAndUserId(PerspectiveComment comment, Long userId); + + long countByComment(PerspectiveComment comment); +} diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveReportRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveReportRepository.java new file mode 100644 index 00000000..20a1fa5c --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveReportRepository.java @@ -0,0 +1,12 @@ +package com.swyp.app.domain.perspective.repository; + +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveReport; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PerspectiveReportRepository extends JpaRepository { + + boolean existsByPerspectiveAndUserId(Perspective perspective, Long userId); + + long countByPerspective(Perspective perspective); +} diff --git a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java index 7f4d50b1..4a86ec20 100644 --- a/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java +++ b/src/main/java/com/swyp/app/domain/perspective/repository/PerspectiveRepository.java @@ -22,4 +22,8 @@ public interface PerspectiveRepository extends JpaRepository List findByBattleIdAndOptionIdAndStatusOrderByCreatedAtDesc(Long battleId, Long optionId, PerspectiveStatus status, Pageable pageable); List findByBattleIdAndOptionIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(Long battleId, Long optionId, PerspectiveStatus status, LocalDateTime cursor, Pageable pageable); + + List findByBattleIdAndStatusOrderByLikeCountDescCreatedAtDesc(Long battleId, PerspectiveStatus status, Pageable pageable); + + List findByBattleIdAndOptionIdAndStatusOrderByLikeCountDescCreatedAtDesc(Long battleId, Long optionId, PerspectiveStatus status, Pageable pageable); } diff --git a/src/main/java/com/swyp/app/domain/perspective/service/CommentLikeService.java b/src/main/java/com/swyp/app/domain/perspective/service/CommentLikeService.java new file mode 100644 index 00000000..ca5b04e6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/service/CommentLikeService.java @@ -0,0 +1,60 @@ +package com.swyp.app.domain.perspective.service; + +import com.swyp.app.domain.perspective.dto.response.LikeResponse; +import com.swyp.app.domain.perspective.entity.CommentLike; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import com.swyp.app.domain.perspective.repository.CommentLikeRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveCommentRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class CommentLikeService { + + private final PerspectiveCommentRepository commentRepository; + private final CommentLikeRepository commentLikeRepository; + + @Transactional + public LikeResponse addLike(Long commentId, Long userId) { + PerspectiveComment comment = findCommentById(commentId); + + if (comment.getUser().getId().equals(userId)) { + throw new CustomException(ErrorCode.LIKE_SELF_FORBIDDEN); + } + + if (commentLikeRepository.existsByCommentAndUserId(comment, userId)) { + throw new CustomException(ErrorCode.LIKE_ALREADY_EXISTS); + } + + commentLikeRepository.save(CommentLike.builder() + .comment(comment) + .userId(userId) + .build()); + comment.incrementLikeCount(); + + return new LikeResponse(comment.getId(), comment.getLikeCount(), true); + } + + @Transactional + public LikeResponse removeLike(Long commentId, Long userId) { + PerspectiveComment comment = findCommentById(commentId); + + CommentLike like = commentLikeRepository.findByCommentAndUserId(comment, userId) + .orElseThrow(() -> new CustomException(ErrorCode.LIKE_NOT_FOUND)); + + commentLikeRepository.delete(like); + comment.decrementLikeCount(); + + return new LikeResponse(comment.getId(), comment.getLikeCount(), false); + } + + private PerspectiveComment findCommentById(Long commentId) { + return commentRepository.findById(commentId) + .orElseThrow(() -> new CustomException(ErrorCode.COMMENT_NOT_FOUND)); + } +} diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java index 88ded3ce..39c0d6b1 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveCommentService.java @@ -1,5 +1,7 @@ package com.swyp.app.domain.perspective.service; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.service.BattleService; import com.swyp.app.domain.perspective.dto.request.CreateCommentRequest; import com.swyp.app.domain.perspective.dto.request.UpdateCommentRequest; import com.swyp.app.domain.perspective.dto.response.CommentListResponse; @@ -7,14 +9,18 @@ import com.swyp.app.domain.perspective.dto.response.UpdateCommentResponse; import com.swyp.app.domain.perspective.entity.Perspective; import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import com.swyp.app.domain.perspective.repository.CommentLikeRepository; import com.swyp.app.domain.perspective.repository.PerspectiveCommentRepository; import com.swyp.app.domain.perspective.repository.PerspectiveRepository; import com.swyp.app.domain.user.dto.response.UserSummary; import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.domain.user.entity.CharacterType; import com.swyp.app.domain.user.service.UserService; +import com.swyp.app.domain.vote.service.VoteService; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; +import com.swyp.app.global.infra.s3.service.S3PresignedUrlService; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; @@ -33,7 +39,11 @@ public class PerspectiveCommentService { private final PerspectiveRepository perspectiveRepository; private final PerspectiveCommentRepository commentRepository; private final UserRepository userRepository; + private final CommentLikeRepository commentLikeRepository; private final UserService userQueryService; + private final VoteService voteService; + private final BattleService battleService; + private final S3PresignedUrlService s3PresignedUrlService; @Transactional public CreateCommentResponse createComment(Long perspectiveId, Long userId, CreateCommentRequest request) { @@ -51,10 +61,21 @@ public CreateCommentResponse createComment(Long perspectiveId, Long userId, Crea perspective.incrementCommentCount(); UserSummary userSummary = userQueryService.findSummaryById(userId); + String characterImageUrl = s3PresignedUrlService.generatePresignedUrl( + CharacterType.from(userSummary.characterType()).getImageKey()); + Long postVoteOptionId = voteService.findPostVoteOptionId(perspective.getBattle().getId(), userId); + String stance = null; + if (postVoteOptionId != null) { + stance = battleService.findOptionById(postVoteOptionId).getStance(); + } return new CreateCommentResponse( comment.getId(), - new CreateCommentResponse.UserSummary(userSummary.userTag(), userSummary.nickname(), userSummary.characterType()), + new CreateCommentResponse.UserSummary(userSummary.userTag(), userSummary.nickname(), userSummary.characterType(), characterImageUrl), + stance, comment.getContent(), + 0, + false, + true, comment.getCreatedAt() ); } @@ -70,13 +91,27 @@ public CommentListResponse getComments(Long perspectiveId, Long userId, String c : commentRepository.findByPerspectiveAndCreatedAtBeforeOrderByCreatedAtDesc( perspective, LocalDateTime.parse(cursor), pageable); + Long battleId = perspective.getBattle().getId(); List items = comments.stream() + .filter(c -> !c.isHidden()) .map(c -> { - UserSummary author = userQueryService.findSummaryById(c.getUser().getId()); + UserSummary user = userQueryService.findSummaryById(c.getUser().getId()); + String characterImageUrl = s3PresignedUrlService.generatePresignedUrl( + CharacterType.from(user.characterType()).getImageKey()); + Long postVoteOptionId = voteService.findPostVoteOptionId(battleId, c.getUser().getId()); + String stance = null; + if (postVoteOptionId != null) { + BattleOption option = battleService.findOptionById(postVoteOptionId); + stance = option.getStance(); + } + boolean isLiked = commentLikeRepository.existsByCommentAndUserId(c, userId); return new CommentListResponse.Item( c.getId(), - new CommentListResponse.UserSummary(author.userTag(), author.nickname(), author.characterType()), + new CommentListResponse.UserSummary(user.userTag(), user.nickname(), user.characterType(), characterImageUrl), + stance, c.getContent(), + c.getLikeCount(), + isLiked, c.getUser().getId().equals(userId), c.getCreatedAt() ); diff --git a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java index f9107666..43d64f6e 100644 --- a/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/app/domain/perspective/service/PerspectiveService.java @@ -11,16 +11,19 @@ import com.swyp.app.domain.perspective.dto.request.UpdatePerspectiveRequest; import com.swyp.app.domain.perspective.dto.response.CreatePerspectiveResponse; import com.swyp.app.domain.perspective.dto.response.MyPerspectiveResponse; +import com.swyp.app.domain.perspective.dto.response.PerspectiveDetailResponse; import com.swyp.app.domain.perspective.dto.response.PerspectiveListResponse; import com.swyp.app.domain.perspective.dto.response.UpdatePerspectiveResponse; import com.swyp.app.domain.perspective.entity.Perspective; import com.swyp.app.domain.perspective.repository.PerspectiveLikeRepository; import com.swyp.app.domain.perspective.repository.PerspectiveRepository; import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.entity.CharacterType; import com.swyp.app.domain.user.service.UserService; import com.swyp.app.domain.vote.service.VoteService; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; +import com.swyp.app.global.infra.s3.service.S3PresignedUrlService; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; @@ -43,6 +46,30 @@ public class PerspectiveService { private final UserService userQueryService; private final UserRepository userRepository; private final GptModerationService gptModerationService; + private final S3PresignedUrlService s3PresignedUrlService; + + public PerspectiveDetailResponse getPerspectiveDetail(Long perspectiveId, Long userId) { + Perspective perspective = findPerspectiveById(perspectiveId); + if (perspective.getStatus() == PerspectiveStatus.HIDDEN) { + throw new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND); + } + UserSummary user = userQueryService.findSummaryById(perspective.getUser().getId()); + String characterImageUrl = s3PresignedUrlService.generatePresignedUrl( + CharacterType.from(user.characterType()).getImageKey()); + BattleOption option = perspective.getOption(); + boolean isLiked = perspectiveLikeRepository.existsByPerspectiveAndUserId(perspective, userId); + return new PerspectiveDetailResponse( + perspective.getId(), + new PerspectiveDetailResponse.UserSummary(user.userTag(), user.nickname(), user.characterType(), characterImageUrl), + new PerspectiveDetailResponse.OptionSummary(option.getId(), option.getLabel().name(), option.getTitle(), option.getStance()), + perspective.getContent(), + perspective.getLikeCount(), + perspective.getCommentCount(), + isLiked, + perspective.getUser().getId().equals(userId), + perspective.getCreatedAt() + ); + } @Transactional public CreatePerspectiveResponse createPerspective(Long battleId, Long userId, CreatePerspectiveRequest request) { @@ -68,39 +95,47 @@ public CreatePerspectiveResponse createPerspective(Long battleId, Long userId, C return new CreatePerspectiveResponse(saved.getId(), saved.getStatus(), saved.getCreatedAt()); } - public PerspectiveListResponse getPerspectives(Long battleId, Long userId, String cursor, Integer size, String optionLabel) { + public PerspectiveListResponse getPerspectives(Long battleId, Long userId, String cursor, Integer size, String optionLabel, String sort) { battleService.findById(battleId); int pageSize = (size == null || size <= 0) ? DEFAULT_PAGE_SIZE : size; PageRequest pageable = PageRequest.of(0, pageSize); + boolean isPopular = "popular".equalsIgnoreCase(sort); List perspectives; if (optionLabel != null) { BattleOptionLabel label = BattleOptionLabel.valueOf(optionLabel.toUpperCase()); BattleOption option = battleService.findOptionByBattleIdAndLabel(battleId, label); - perspectives = cursor == null - ? perspectiveRepository.findByBattleIdAndOptionIdAndStatusOrderByCreatedAtDesc(battleId, option.getId(), PerspectiveStatus.PUBLISHED, pageable) - : perspectiveRepository.findByBattleIdAndOptionIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(battleId, option.getId(), PerspectiveStatus.PUBLISHED, LocalDateTime.parse(cursor), pageable); + perspectives = isPopular + ? perspectiveRepository.findByBattleIdAndOptionIdAndStatusOrderByLikeCountDescCreatedAtDesc(battleId, option.getId(), PerspectiveStatus.PUBLISHED, pageable) + : cursor == null + ? perspectiveRepository.findByBattleIdAndOptionIdAndStatusOrderByCreatedAtDesc(battleId, option.getId(), PerspectiveStatus.PUBLISHED, pageable) + : perspectiveRepository.findByBattleIdAndOptionIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(battleId, option.getId(), PerspectiveStatus.PUBLISHED, LocalDateTime.parse(cursor), pageable); } else { - perspectives = cursor == null - ? perspectiveRepository.findByBattleIdAndStatusOrderByCreatedAtDesc(battleId, PerspectiveStatus.PUBLISHED, pageable) - : perspectiveRepository.findByBattleIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(battleId, PerspectiveStatus.PUBLISHED, LocalDateTime.parse(cursor), pageable); + perspectives = isPopular + ? perspectiveRepository.findByBattleIdAndStatusOrderByLikeCountDescCreatedAtDesc(battleId, PerspectiveStatus.PUBLISHED, pageable) + : cursor == null + ? perspectiveRepository.findByBattleIdAndStatusOrderByCreatedAtDesc(battleId, PerspectiveStatus.PUBLISHED, pageable) + : perspectiveRepository.findByBattleIdAndStatusAndCreatedAtBeforeOrderByCreatedAtDesc(battleId, PerspectiveStatus.PUBLISHED, LocalDateTime.parse(cursor), pageable); } List items = perspectives.stream() .map(p -> { UserSummary user = userQueryService.findSummaryById(p.getUser().getId()); + String characterImageUrl = s3PresignedUrlService.generatePresignedUrl( + CharacterType.from(user.characterType()).getImageKey()); BattleOption option = p.getOption(); boolean isLiked = perspectiveLikeRepository.existsByPerspectiveAndUserId(p, userId); return new PerspectiveListResponse.Item( p.getId(), - new PerspectiveListResponse.UserSummary(user.userTag(), user.nickname(), user.characterType()), - new PerspectiveListResponse.OptionSummary(option.getId(), option.getLabel().name(), option.getTitle()), + new PerspectiveListResponse.UserSummary(user.userTag(), user.nickname(), user.characterType(), characterImageUrl), + new PerspectiveListResponse.OptionSummary(option.getId(), option.getLabel().name(), option.getTitle(), option.getStance()), p.getContent(), p.getLikeCount(), p.getCommentCount(), isLiked, + p.getUser().getId().equals(userId), p.getCreatedAt() ); }) @@ -130,14 +165,25 @@ public UpdatePerspectiveResponse updatePerspective(Long perspectiveId, Long user return new UpdatePerspectiveResponse(perspective.getId(), perspective.getContent(), perspective.getUpdatedAt()); } - public MyPerspectiveResponse getMyPendingPerspective(Long battleId, Long userId) { + public MyPerspectiveResponse getMyPerspective(Long battleId, Long userId) { battleService.findById(battleId); Perspective perspective = perspectiveRepository.findByBattleIdAndUserId(battleId, userId) - .filter(p -> p.getStatus() == PerspectiveStatus.PENDING) .orElseThrow(() -> new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND)); + + UserSummary user = userQueryService.findSummaryById(userId); + String characterImageUrl = s3PresignedUrlService.generatePresignedUrl( + CharacterType.from(user.characterType()).getImageKey()); + BattleOption option = perspective.getOption(); + boolean isLiked = perspectiveLikeRepository.existsByPerspectiveAndUserId(perspective, userId); + return new MyPerspectiveResponse( perspective.getId(), + new MyPerspectiveResponse.UserSummary(user.userTag(), user.nickname(), user.characterType(), characterImageUrl), + new MyPerspectiveResponse.OptionSummary(option.getId(), option.getLabel().name(), option.getTitle(), option.getStance()), perspective.getContent(), + perspective.getLikeCount(), + perspective.getCommentCount(), + isLiked, perspective.getStatus(), perspective.getCreatedAt() ); diff --git a/src/main/java/com/swyp/app/domain/perspective/service/ReportService.java b/src/main/java/com/swyp/app/domain/perspective/service/ReportService.java new file mode 100644 index 00000000..b94cb7e0 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/perspective/service/ReportService.java @@ -0,0 +1,80 @@ +package com.swyp.app.domain.perspective.service; + +import com.swyp.app.domain.perspective.entity.CommentReport; +import com.swyp.app.domain.perspective.entity.Perspective; +import com.swyp.app.domain.perspective.entity.PerspectiveComment; +import com.swyp.app.domain.perspective.entity.PerspectiveReport; +import com.swyp.app.domain.perspective.repository.CommentReportRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveCommentRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveReportRepository; +import com.swyp.app.domain.perspective.repository.PerspectiveRepository; +import com.swyp.app.domain.user.entity.User; +import com.swyp.app.domain.user.repository.UserRepository; +import com.swyp.app.global.common.exception.CustomException; +import com.swyp.app.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ReportService { + + private static final int REPORT_THRESHOLD = 10; + + private final PerspectiveRepository perspectiveRepository; + private final PerspectiveCommentRepository commentRepository; + private final PerspectiveReportRepository perspectiveReportRepository; + private final CommentReportRepository commentReportRepository; + private final UserRepository userRepository; + + @Transactional + public void reportPerspective(Long perspectiveId, Long userId) { + Perspective perspective = perspectiveRepository.findById(perspectiveId) + .orElseThrow(() -> new CustomException(ErrorCode.PERSPECTIVE_NOT_FOUND)); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + if (perspective.getUser().getId().equals(userId)) { + throw new CustomException(ErrorCode.REPORT_SELF_FORBIDDEN); + } + if (perspectiveReportRepository.existsByPerspectiveAndUserId(perspective, userId)) { + throw new CustomException(ErrorCode.REPORT_ALREADY_EXISTS); + } + + perspectiveReportRepository.save(PerspectiveReport.builder() + .perspective(perspective) + .user(user) + .build()); + + long reportCount = perspectiveReportRepository.countByPerspective(perspective); + if (reportCount >= REPORT_THRESHOLD) { + perspective.hide(); + } + } + + @Transactional + public void reportComment(Long commentId, Long userId) { + PerspectiveComment comment = commentRepository.findById(commentId) + .orElseThrow(() -> new CustomException(ErrorCode.COMMENT_NOT_FOUND)); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + if (comment.getUser().getId().equals(userId)) { + throw new CustomException(ErrorCode.REPORT_SELF_FORBIDDEN); + } + if (commentReportRepository.existsByCommentAndUserId(comment, userId)) { + throw new CustomException(ErrorCode.REPORT_ALREADY_EXISTS); + } + + commentReportRepository.save(CommentReport.builder() + .comment(comment) + .user(user) + .build()); + + long reportCount = commentReportRepository.countByComment(comment); + if (reportCount >= REPORT_THRESHOLD) { + comment.hide(); + } + } +} diff --git a/src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java b/src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java index 4fb50761..b4500f3d 100644 --- a/src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java +++ b/src/main/java/com/swyp/app/domain/recommendation/controller/RecommendationController.java @@ -6,10 +6,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @Tag(name = "추천 (Recommendation)", description = "배틀 추천 API") @@ -20,12 +20,11 @@ public class RecommendationController { private final RecommendationService recommendationService; - @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀 기반으로 흥미로운 배틀 목록을 추천합니다. (추천 정책 미확정)") + @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀 기반으로 흥미로운 배틀 목록을 추천합니다.") @GetMapping("/battles/{battleId}/recommendations/interesting") public ApiResponse getInterestingBattles( @PathVariable Long battleId, - @RequestParam(required = false) String cursor, - @RequestParam(required = false) Integer size) { - return ApiResponse.onSuccess(recommendationService.getInterestingBattles(battleId, cursor, size)); + @AuthenticationPrincipal Long userId) { + return ApiResponse.onSuccess(recommendationService.getInterestingBattles(battleId, userId)); } } diff --git a/src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java b/src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java index 05b11903..b6241f7e 100644 --- a/src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java +++ b/src/main/java/com/swyp/app/domain/recommendation/dto/response/RecommendationListResponse.java @@ -7,8 +7,11 @@ public record RecommendationListResponse(List items, String nextCursor, bo public record Item( Long battleId, String title, + String summary, + Integer audioDuration, + Integer viewCount, List tags, - int participantsCount, + long participantsCount, List options ) {} @@ -18,6 +21,7 @@ public record OptionSummary( Long optionId, String label, String title, + String stance, String representative, String imageUrl ) {} diff --git a/src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java b/src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java index da8beab7..88202cd3 100644 --- a/src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java +++ b/src/main/java/com/swyp/app/domain/recommendation/service/RecommendationService.java @@ -1,27 +1,127 @@ package com.swyp.app.domain.recommendation.service; +import com.swyp.app.domain.battle.entity.Battle; +import com.swyp.app.domain.battle.entity.BattleOption; +import com.swyp.app.domain.battle.entity.BattleOptionTag; +import com.swyp.app.domain.battle.repository.BattleOptionRepository; +import com.swyp.app.domain.battle.repository.BattleOptionTagRepository; +import com.swyp.app.domain.battle.repository.BattleRepository; import com.swyp.app.domain.battle.service.BattleService; import com.swyp.app.domain.recommendation.dto.response.RecommendationListResponse; -import com.swyp.app.domain.tag.service.TagService; +import com.swyp.app.domain.tag.enums.TagType; +import com.swyp.app.domain.user.entity.PhilosopherType; +import com.swyp.app.domain.user.service.UserService; +import com.swyp.app.domain.vote.repository.VoteRepository; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class RecommendationService { + private static final int SAME_TYPE_COUNT = 3; + private static final int OPPOSITE_TYPE_COUNT = 2; + private final BattleService battleService; - private final TagService tagService; + private final BattleRepository battleRepository; + private final BattleOptionRepository battleOptionRepository; + private final BattleOptionTagRepository battleOptionTagRepository; + private final VoteRepository voteRepository; + private final UserService userService; - public RecommendationListResponse getInterestingBattles(Long battleId, String cursor, Integer size) { + public RecommendationListResponse getInterestingBattles(Long battleId, Long userId) { battleService.findById(battleId); - // TODO: 흥미 기반 배틀 추천 정책 미확정 (추후 구현) + // 현재 유저의 철학자 유형 및 반대 유형 + PhilosopherType myType = userService.getPhilosopherType(userId); + PhilosopherType oppositeType = myType.getWorstMatch(); + + // 현재 유저가 이미 참여한 배틀 ID 목록 (제외 대상) + List excludeBattleIds = voteRepository.findParticipatedBattleIdsByUserId(userId); + if (excludeBattleIds.isEmpty()) excludeBattleIds = List.of(-1L); + + List sameTypeUserIds = findUserIdsByPhilosopherType(myType); + List oppositeTypeUserIds = findUserIdsByPhilosopherType(oppositeType); + + // 같은 유형 유저들이 참여한 배틀 후보 ID + List sameCandidateIds = sameTypeUserIds.isEmpty() + ? List.of() + : voteRepository.findParticipatedBattleIdsByUserIds(sameTypeUserIds); + + // 반대 유형 유저들이 참여한 배틀 후보 ID + List oppositeCandidateIds = oppositeTypeUserIds.isEmpty() + ? List.of() + : voteRepository.findParticipatedBattleIdsByUserIds(oppositeTypeUserIds); + + // 인기 점수 기준 배틀 조회 (Score = V*1.0 + C*1.5 + Vw*0.2) + // 철학자 유형 로직 미구현 시 인기 배틀로 폴백 + List sameBattles = sameCandidateIds.isEmpty() + ? battleRepository.findPopularBattlesExcluding(excludeBattleIds, PageRequest.of(0, SAME_TYPE_COUNT)) + : battleRepository.findRecommendedBattles(sameCandidateIds, excludeBattleIds, PageRequest.of(0, SAME_TYPE_COUNT)); + + List oppositeBattles = oppositeCandidateIds.isEmpty() + ? battleRepository.findPopularBattlesExcluding(excludeBattleIds, PageRequest.of(0, OPPOSITE_TYPE_COUNT)) + : battleRepository.findRecommendedBattles(oppositeCandidateIds, excludeBattleIds, PageRequest.of(0, OPPOSITE_TYPE_COUNT)); + + List result = new ArrayList<>(); + result.addAll(sameBattles); + result.addAll(oppositeBattles); + + List items = result.stream() + .map(this::toItem) + .collect(Collectors.toList()); + + return new RecommendationListResponse(items, null, false); + } + + private RecommendationListResponse.Item toItem(Battle battle) { + List options = battleOptionRepository.findByBattle(battle); + + List optionSummaries = options.stream() + .map(opt -> new RecommendationListResponse.OptionSummary( + opt.getId(), + opt.getLabel().name(), + opt.getTitle(), + opt.getStance(), + opt.getRepresentative(), + opt.getImageUrl() + )) + .toList(); + + // CATEGORY 태그만 노출 + List tagSummaries = options.stream() + .flatMap(opt -> battleOptionTagRepository.findByBattleOption(opt).stream()) + .map(BattleOptionTag::getTag) + .filter(tag -> tag.getType() == TagType.CATEGORY) + .distinct() + .map(tag -> new RecommendationListResponse.TagSummary(tag.getId(), tag.getName())) + .toList(); + + return new RecommendationListResponse.Item( + battle.getId(), + battle.getTitle(), + battle.getSummary(), + battle.getAudioDuration(), + battle.getViewCount(), + tagSummaries, + battle.getTotalParticipantsCount(), + optionSummaries + ); + } - return new RecommendationListResponse(List.of(), null, false); + /** + * TODO: 철학자 유형별 유저 ID 조회 구현 필요 + * - 사후투표 시 BattleOptionTag(PHILOSOPHER 타입) 기반으로 유저별 철학자 점수 누적 테이블 구현 후 대체 + * - 현재는 빈 리스트 반환 + */ + private List findUserIdsByPhilosopherType(PhilosopherType type) { + return List.of(); } } diff --git a/src/main/java/com/swyp/app/domain/share/controller/ShareController.java b/src/main/java/com/swyp/app/domain/share/controller/ShareController.java new file mode 100644 index 00000000..f5542fa6 --- /dev/null +++ b/src/main/java/com/swyp/app/domain/share/controller/ShareController.java @@ -0,0 +1,16 @@ +package com.swyp.app.domain.share.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +@Controller +public class ShareController { + + @GetMapping("/result/{userId}") + public String result(@PathVariable Long userId, Model model) { + model.addAttribute("userId", userId); + return "share/result"; + } +} diff --git a/src/main/java/com/swyp/app/domain/test/controller/TestController.java b/src/main/java/com/swyp/app/domain/test/controller/TestController.java index 40a9d9c6..97094bf5 100644 --- a/src/main/java/com/swyp/app/domain/test/controller/TestController.java +++ b/src/main/java/com/swyp/app/domain/test/controller/TestController.java @@ -1,19 +1,34 @@ package com.swyp.app.domain.test.controller; -import com.swyp.app.global.common.response.ApiResponse; // 패키지 경로 확인! +import com.swyp.app.domain.oauth.jwt.JwtProvider; +import com.swyp.app.global.common.response.ApiResponse; +import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; @RestController @RequestMapping("/api/test") +@RequiredArgsConstructor public class TestController { + private final JwtProvider jwtProvider; + @GetMapping("/response") public ApiResponse> testResponse() { List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); return ApiResponse.onSuccess(teamMembers); } + + @GetMapping("/token") + public ApiResponse> getTestToken( + @RequestParam(defaultValue = "1") Long userId + ) { + String token = jwtProvider.createAccessToken(userId, "USER"); + return ApiResponse.onSuccess(Map.of("accessToken", token)); + } } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/user/service/UserService.java b/src/main/java/com/swyp/app/domain/user/service/UserService.java index d9d2e080..b4279863 100644 --- a/src/main/java/com/swyp/app/domain/user/service/UserService.java +++ b/src/main/java/com/swyp/app/domain/user/service/UserService.java @@ -1,8 +1,10 @@ package com.swyp.app.domain.user.service; +import com.swyp.app.domain.battle.service.BattleQueryService; import com.swyp.app.domain.user.dto.request.UpdateUserProfileRequest; import com.swyp.app.domain.user.dto.response.MyProfileResponse; import com.swyp.app.domain.user.dto.response.UserSummary; +import com.swyp.app.domain.user.entity.PhilosopherType; import com.swyp.app.domain.user.entity.User; import com.swyp.app.domain.user.entity.UserProfile; import com.swyp.app.domain.user.entity.UserSettings; @@ -11,21 +13,28 @@ import com.swyp.app.domain.user.repository.UserRepository; import com.swyp.app.domain.user.repository.UserSettingsRepository; import com.swyp.app.domain.user.repository.UserTendencyScoreRepository; +import com.swyp.app.domain.vote.service.VoteQueryService; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class UserService { + private static final int PHILOSOPHER_CALC_THRESHOLD = 5; + private final UserRepository userRepository; private final UserProfileRepository userProfileRepository; private final UserSettingsRepository userSettingsRepository; private final UserTendencyScoreRepository userTendencyScoreRepository; + private final VoteQueryService voteQueryService; + private final BattleQueryService battleQueryService; @Transactional public MyProfileResponse updateMyProfile(UpdateUserProfileRequest request) { @@ -40,6 +49,30 @@ public MyProfileResponse updateMyProfile(UpdateUserProfileRequest request) { ); } + @Transactional + public PhilosopherType getPhilosopherType(Long userId) { + UserProfile profile = findUserProfile(userId); + + if (profile.getPhilosopherType() != null) { + return profile.getPhilosopherType(); + } + + long totalVotes = voteQueryService.countTotalParticipation(userId); + if (totalVotes < PHILOSOPHER_CALC_THRESHOLD) { + return PhilosopherType.SOCRATES; + } + + List battleIds = voteQueryService.findFirstNBattleIds(userId, PHILOSOPHER_CALC_THRESHOLD); + return battleQueryService.getTopPhilosopherTagName(battleIds) + .map(PhilosopherType::fromLabel) + .map(type -> { + profile.updatePhilosopherType(type); + return type; + }) + .orElse(PhilosopherType.SOCRATES); + } + + public UserSummary findSummaryById(Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); diff --git a/src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java b/src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java index 13322446..ed03722e 100644 --- a/src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java +++ b/src/main/java/com/swyp/app/domain/vote/converter/VoteConverter.java @@ -18,10 +18,15 @@ public static VoteResultResponse toVoteResultResponse(Vote vote) { // 내 투표 내역 변환 public static MyVoteResponse toMyVoteResponse(Vote vote) { + boolean opinionChanged = vote.getPreVoteOption() != null + && vote.getPostVoteOption() != null + && !vote.getPreVoteOption().getId().equals(vote.getPostVoteOption().getId()); return new MyVoteResponse( + vote.getBattle().getTitle(), toOptionInfo(vote.getPreVoteOption()), toOptionInfo(vote.getPostVoteOption()), - vote.getStatus() + vote.getStatus(), + opinionChanged ); } diff --git a/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java b/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java index 378463fb..fa3f98f9 100644 --- a/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java +++ b/src/main/java/com/swyp/app/domain/vote/dto/response/MyVoteResponse.java @@ -3,9 +3,11 @@ import com.swyp.app.domain.vote.enums.VoteStatus; public record MyVoteResponse( + String battleTitle, OptionInfo preVote, OptionInfo postVote, - VoteStatus status + VoteStatus status, + boolean opinionChanged ) { public record OptionInfo(Long optionId, String label, String title) {} } diff --git a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java index cd0ed291..d26084cc 100644 --- a/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java +++ b/src/main/java/com/swyp/app/domain/vote/repository/VoteRepository.java @@ -51,4 +51,16 @@ List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); + + // 추천용: 유저가 참여한 배틀 ID 조회 + @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id = :userId") + List findParticipatedBattleIdsByUserId(@Param("userId") Long userId); + + // 추천용: 특정 배틀에 참여한 유저 ID 조회 + @Query("SELECT DISTINCT v.user.id FROM Vote v WHERE v.battle.id IN :battleIds") + List findUserIdsByBattleIds(@Param("battleIds") List battleIds); + + // 추천용: 특정 유저들이 참여한 배틀 ID 조회 + @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id IN :userIds") + List findParticipatedBattleIdsByUserIds(@Param("userIds") List userIds); } diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteService.java b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java index 70e95a76..2606da78 100644 --- a/src/main/java/com/swyp/app/domain/vote/service/VoteService.java +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteService.java @@ -10,6 +10,8 @@ public interface VoteService { BattleOption findPreVoteOption(Long battleId, Long userId); + Long findPostVoteOptionId(Long battleId, Long userId); + VoteStatsResponse getVoteStats(Long battleId); MyVoteResponse getMyVote(Long battleId, Long userId); diff --git a/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java index c76898b5..89c0fe33 100644 --- a/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/vote/service/VoteServiceImpl.java @@ -48,6 +48,13 @@ public BattleOption findPreVoteOption(Long battleId, Long userId) { return vote.getPreVoteOption(); } + @Override + public Long findPostVoteOptionId(Long battleId, Long userId) { + return voteRepository.findByBattleIdAndUserId(battleId, userId) + .map(vote -> vote.getPostVoteOption() != null ? vote.getPostVoteOption().getId() : null) + .orElse(null); + } + @Override public VoteStatsResponse getVoteStats(Long battleId) { Battle battle = battleService.findById(battleId); diff --git a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java index 54754977..d29456d2 100644 --- a/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/app/global/common/exception/ErrorCode.java @@ -72,6 +72,7 @@ public enum ErrorCode { PERSPECTIVE_FORBIDDEN (HttpStatus.FORBIDDEN, "PERSPECTIVE_403", "본인 관점만 수정/삭제할 수 있습니다."), PERSPECTIVE_POST_VOTE_REQUIRED (HttpStatus.CONFLICT, "PERSPECTIVE_VOTE_409", "사후 투표가 완료되지 않았습니다."), PERSPECTIVE_MODERATION_NOT_FAILED (HttpStatus.BAD_REQUEST,"PERSPECTIVE_400", "검수 실패 상태의 관점이 아닙니다."), + PERSPECTIVE_CONTENT_TOO_LONG (HttpStatus.BAD_REQUEST,"PERSPECTIVE_400_LEN", "관점 내용은 200자를 초과할 수 없습니다."), // Comment COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_NOT_FOUND", "존재하지 않는 댓글입니다."), @@ -82,6 +83,10 @@ public enum ErrorCode { LIKE_NOT_FOUND (HttpStatus.NOT_FOUND, "LIKE_404", "좋아요를 누른 적 없는 관점입니다."), LIKE_SELF_FORBIDDEN(HttpStatus.FORBIDDEN, "LIKE_403", "본인 관점에는 좋아요를 누를 수 없습니다."), + // Report + REPORT_ALREADY_EXISTS(HttpStatus.CONFLICT, "REPORT_409", "이미 신고한 항목입니다."), + REPORT_SELF_FORBIDDEN(HttpStatus.FORBIDDEN, "REPORT_403", "본인 글은 신고할 수 없습니다."), + // Vote VOTE_NOT_FOUND (HttpStatus.NOT_FOUND, "VOTE_404", "투표 내역이 없습니다."), VOTE_ALREADY_SUBMITTED(HttpStatus.CONFLICT, "VOTE_409_SUB", "이미 투표가 완료되었습니다."), diff --git a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java index 156bd9ac..5efe311e 100644 --- a/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/swyp/app/global/common/exception/GlobalExceptionHandler.java @@ -24,10 +24,22 @@ public ResponseEntity> handleCustomException(CustomException e .body(ApiResponse.onFailure(code.getHttpStatus().value(), code.getCode(), code.getMessage())); } + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleValidation(MethodArgumentNotValidException e) { + boolean isContentSizeViolation = e.getBindingResult().getFieldErrors().stream() + .anyMatch(fe -> "content".equals(fe.getField()) && "Size".equals(fe.getCode())); + ErrorCode code = isContentSizeViolation + ? ErrorCode.PERSPECTIVE_CONTENT_TOO_LONG + : ErrorCode.COMMON_INVALID_PARAMETER; + log.warn("Validation failed: {}", e.getMessage()); + return ResponseEntity + .status(code.getHttpStatus()) + .body(ApiResponse.onFailure(code.getHttpStatus().value(), code.getCode(), code.getMessage())); + } + @ExceptionHandler({ HttpMessageNotReadableException.class, MethodArgumentTypeMismatchException.class, - MethodArgumentNotValidException.class, ConstraintViolationException.class, IllegalArgumentException.class }) diff --git a/src/main/java/com/swyp/app/global/config/SecurityConfig.java b/src/main/java/com/swyp/app/global/config/SecurityConfig.java index ae11cd1b..43eceb25 100644 --- a/src/main/java/com/swyp/app/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/app/global/config/SecurityConfig.java @@ -18,7 +18,8 @@ @EnableWebSecurity @EnableMethodSecurity @RequiredArgsConstructor -public class SecurityConfig { +public class +SecurityConfig { private final JwtProvider jwtProvider; @@ -32,9 +33,11 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers( "/", "/api/v1/auth/**", "/api/v1/home", "/api/v1/notices/**", - "/swagger-ui/**", "/v3/api-docs/**", + "/api/test/**", + "/swagger-ui/**", "/swagger-ui.html", "/v3/api-docs/**", "/js/**", "/css/**", "/images/**", "/favicon.ico", - "/api/v1/admin/login", "/api/v1/admin" + "/api/v1/admin/login", "/api/v1/admin", + "/result/**" ).permitAll() // 2. 관리자 HTML 화면 렌더링 요청 diff --git a/src/main/resources/templates/share/result.html b/src/main/resources/templates/share/result.html new file mode 100644 index 00000000..b75c451f --- /dev/null +++ b/src/main/resources/templates/share/result.html @@ -0,0 +1,92 @@ + + + + + + Pické - 철학자 유형 결과 + + + + + + + +
+ + + + + + + +
+ + + + + From 3e2485c6dd1371fd53082e58854afd1fdb814bd7 Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sun, 29 Mar 2026 15:57:51 +0900 Subject: [PATCH 33/94] =?UTF-8?q?[Hotfix]=20Home=20API=20NPE=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=B2=A0=ED=95=99=EC=9E=90=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20presigned=20URL=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/converter/BattleConverter.java | 3 +++ .../app/domain/home/service/HomeService.java | 19 ++++++++++----- .../domain/user/entity/PhilosopherType.java | 24 ++++++++++++++++--- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java index 2cf1dd9e..932e3c50 100644 --- a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java +++ b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java @@ -126,6 +126,7 @@ public BattleUserDetailResponse toUserDetailResponse(Battle b, List tags, L } private List toOptionResponses(List options) { + if (options == null) return List.of(); return options.stream() .map(o -> { List optionTags = optionTagRepository.findByBattleOption(o).stream() @@ -141,12 +142,14 @@ private List toOptionResponses(List options) } private List toTodayOptionResponses(List options) { + if (options == null) return List.of(); return options.stream().map(o -> new TodayOptionResponse( o.getId(), o.getLabel(), o.getTitle(), o.getRepresentative(), o.getStance(), o.getImageUrl() )).toList(); } private List toTagResponses(List tags, TagType targetType) { + if (tags == null) return List.of(); return tags.stream() .filter(t -> targetType == null || t.getType() == targetType) .map(t -> new BattleTagResponse(t.getId(), t.getName(), t.getType())) diff --git a/src/main/java/com/swyp/app/domain/home/service/HomeService.java b/src/main/java/com/swyp/app/domain/home/service/HomeService.java index 2bb1ee9c..32fc7037 100644 --- a/src/main/java/com/swyp/app/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/app/domain/home/service/HomeService.java @@ -10,6 +10,8 @@ import com.swyp.app.domain.home.dto.response.*; import com.swyp.app.domain.notification.enums.NotificationCategory; import com.swyp.app.domain.notification.service.NotificationService; +import com.swyp.app.domain.user.entity.PhilosopherType; +import com.swyp.app.global.infra.s3.service.S3PresignedUrlService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +26,7 @@ public class HomeService { private final BattleService battleService; private final NotificationService notificationService; + private final S3PresignedUrlService s3PresignedUrlService; public HomeResponse getHome() { boolean newNotice = notificationService.hasNewBroadcast(NotificationCategory.NOTICE); @@ -89,7 +92,7 @@ private HomeTodayQuizResponse toTodayQuiz(TodayBattleResponse b) { } private HomeTodayVoteResponse toTodayVote(TodayBattleResponse b) { - List options = b.options().stream() + List options = Optional.ofNullable(b.options()).orElse(List.of()).stream() .map(o -> new HomeTodayVoteOptionResponse(o.label(), o.title())) .toList(); return new HomeTodayVoteResponse( @@ -104,8 +107,8 @@ private HomeNewBattleResponse toNewBattle(TodayBattleResponse b) { List philosophers = findPhilosopherNames(b.tags()); String philoA = philosophers.size() > 0 ? philosophers.get(0) : null; String philoB = philosophers.size() > 1 ? philosophers.get(1) : null; - String imageA = findOptionImageUrl(b.options(), BattleOptionLabel.A); - String imageB = findOptionImageUrl(b.options(), BattleOptionLabel.B); + String imageA = findRepresentativeImageUrl(b.options(), BattleOptionLabel.A); + String imageB = findRepresentativeImageUrl(b.options(), BattleOptionLabel.B); return new HomeNewBattleResponse( b.battleId(), b.thumbnailUrl(), b.title(), b.summary(), @@ -129,11 +132,15 @@ private List findPhilosopherNames(List tags) { .toList(); } - private String findOptionImageUrl(List options, BattleOptionLabel label) { + private String findRepresentativeImageUrl(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() .filter(o -> o.label() == label) - .map(TodayOptionResponse::imageUrl) - .findFirst().orElse(null); + .map(TodayOptionResponse::representative) + .findFirst() + .map(PhilosopherType::fromLabel) + .map(PhilosopherType::getImageKey) + .map(s3PresignedUrlService::generatePresignedUrl) + .orElse(null); } @SafeVarargs diff --git a/src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java b/src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java index 3b70e6af..cf4eaee9 100644 --- a/src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java +++ b/src/main/java/com/swyp/app/domain/user/entity/PhilosopherType.java @@ -45,7 +45,25 @@ public enum PhilosopherType { BUDDHA("붓다", "내면형", "외부의 소음에서 벗어나 마음속 깊은 평화와 고요를 찾는 수행자", "LAOZI", "ARISTOTLE", 35, 55, 42, 48, 96, 62, - "images/philosophers/buddha.png"); + "images/philosophers/buddha.png"), + AQUINAS("토마스 아퀴나스", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/aquinas.png"), + CAMUS("카뮈", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/camus.png"), + CHOE_HANGI("최한기", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/choe_hangi.png"), + DESCARTES("데카르트", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/descartes.png"), + EPICURUS("에피쿠로스", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/epicurus.png"), + FROMM("에리히 프롬", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/fromm.png"), + HOBBES("홉스", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/hobbes.png"), + HUME("흄", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/hume.png"), + JEONG_YAKYONG("정약용", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/jeong_yakyong.png"), + JUNG("융", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/jung.png"), + LEIBNIZ("라이프니츠", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/leibniz.png"), + MENCIUS("맹자", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/mencius.png"), + MILL("존 스튜어트 밀", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/mill.png"), + RAWLS("롤스", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/rawls.png"), + SCHOPENHAUER("쇼펜하우어", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/schopenhauer.png"), + XUNZI("순자", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/xunzi.png"), + YI_HWANG("이황", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/yi_hwang.png"), + YI_I("이이", null, null, null, null, 0, 0, 0, 0, 0, 0, "images/philosophers/yi_i.png"); private final String label; private final String typeName; @@ -80,11 +98,11 @@ public enum PhilosopherType { } public PhilosopherType getBestMatch() { - return valueOf(bestMatchName); + return bestMatchName != null ? valueOf(bestMatchName) : null; } public PhilosopherType getWorstMatch() { - return valueOf(worstMatchName); + return worstMatchName != null ? valueOf(worstMatchName) : null; } public static PhilosopherType fromLabel(String label) { From 0fc3f5423aba67ca66dd800fa7d5ac9efcc9deda Mon Sep 17 00:00:00 2001 From: Dante0922 <101305519+Dante0922@users.noreply.github.com> Date: Sun, 29 Mar 2026 16:11:43 +0900 Subject: [PATCH 34/94] =?UTF-8?q?[Hotfix]=20HomeService=20stream=20NPE=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - `findRepresentativeImageUrl`, `findOptionTitle`에서 `representative`/`title`이 null일 때 `findFirst()` → `Optional.of(null)` NPE 발생하는 문제 수정 - `.filter(Objects::nonNull)`을 `findFirst()` 앞에 추가 ## Test plan - [ ] Home API (`GET /api/v1/home`) 정상 응답 확인 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.6 --- .../java/com/swyp/app/domain/home/service/HomeService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/swyp/app/domain/home/service/HomeService.java b/src/main/java/com/swyp/app/domain/home/service/HomeService.java index 32fc7037..a23475f7 100644 --- a/src/main/java/com/swyp/app/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/app/domain/home/service/HomeService.java @@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Objects; import java.util.Optional; @Service @@ -122,6 +123,7 @@ private String findOptionTitle(List options, BattleOptionLa return Optional.ofNullable(options).orElse(List.of()).stream() .filter(o -> o.label() == label) .map(TodayOptionResponse::title) + .filter(Objects::nonNull) .findFirst().orElse(null); } @@ -136,6 +138,7 @@ private String findRepresentativeImageUrl(List options, Bat return Optional.ofNullable(options).orElse(List.of()).stream() .filter(o -> o.label() == label) .map(TodayOptionResponse::representative) + .filter(Objects::nonNull) .findFirst() .map(PhilosopherType::fromLabel) .map(PhilosopherType::getImageKey) From 0cfd73dc74b79230c4cf0d7de8bb1a2536697bf4 Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Sun, 29 Mar 2026 16:12:00 +0900 Subject: [PATCH 35/94] =?UTF-8?q?#63=20[CI/CD]=20Nginx=20Reverse=20Proxy?= =?UTF-8?q?=20=EB=B0=8F=20Certbot=20=EA=B8=B0=EB=B0=98=EC=9D=98=20SSL=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20(#71)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swyp/app/global/config/SwaggerConfig.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/main/java/com/swyp/app/global/config/SwaggerConfig.java b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java index 8c9aef7c..932907e0 100644 --- a/src/main/java/com/swyp/app/global/config/SwaggerConfig.java +++ b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java @@ -5,8 +5,13 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; +import java.util.Arrays; +import java.util.List; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @Configuration public class SwaggerConfig { @@ -32,4 +37,30 @@ public OpenAPI openAPI() { .addSecuritySchemes("bearerAuth", securityScheme)) .addSecurityItem(securityRequirement); } + + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + + // 허용할 오리진(도메인) 설정 + configuration.setAllowedOrigins(List.of( + "http://localhost:3000", + "https://picke.store", + "https://www.picke.store" + )); + + // 허용할 HTTP 메서드 + configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); + + // 허용할 헤더 + configuration.setAllowedHeaders(List.of("*")); + + // 자격 증명(쿠키, Authorization 헤더 등) 허용 + configuration.setAllowCredentials(true); + + // 모든 경로(/**)에 대해 위 설정 적용 + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } } \ No newline at end of file From e5515777bd47781c09f2f100cd633ad8a38bdd6e Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Sun, 29 Mar 2026 17:22:39 +0900 Subject: [PATCH 36/94] =?UTF-8?q?#75=20[Hotfix]=20=EB=B8=8C=EB=9D=BC?= =?UTF-8?q?=EC=9A=B0=EC=A0=80=20=EC=9E=90=EC=B2=B4=20=EC=B0=A8=EB=8B=A8=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/global/config/SecurityConfig.java | 31 +++++++++++++ .../swyp/app/global/config/SwaggerConfig.java | 43 ++++++------------- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/swyp/app/global/config/SecurityConfig.java b/src/main/java/com/swyp/app/global/config/SecurityConfig.java index 43eceb25..a197f588 100644 --- a/src/main/java/com/swyp/app/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/app/global/config/SecurityConfig.java @@ -2,6 +2,8 @@ import com.swyp.app.domain.oauth.jwt.JwtFilter; import com.swyp.app.domain.oauth.jwt.JwtProvider; +import java.util.Arrays; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,6 +15,9 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @Configuration @EnableWebSecurity @@ -55,4 +60,30 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http.build(); } + + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + + // 허용할 오리진(도메인) 설정 + configuration.setAllowedOrigins(List.of( + "http://localhost:3000", + "https://picke.store", + "https://www.picke.store" + )); + + // 허용할 HTTP 메서드 + configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); + + // 허용할 헤더 + configuration.setAllowedHeaders(List.of("*")); + + // 자격 증명(쿠키, Authorization 헤더 등) 허용 + configuration.setAllowCredentials(true); + + // 모든 경로(/**)에 대해 위 설정 적용 + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } } diff --git a/src/main/java/com/swyp/app/global/config/SwaggerConfig.java b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java index 932907e0..d908faa1 100644 --- a/src/main/java/com/swyp/app/global/config/SwaggerConfig.java +++ b/src/main/java/com/swyp/app/global/config/SwaggerConfig.java @@ -5,19 +5,26 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; -import java.util.Arrays; +import io.swagger.v3.oas.models.servers.Server; import java.util.List; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.CorsConfigurationSource; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @Configuration public class SwaggerConfig { @Bean public OpenAPI openAPI() { + // 1. 운영 서버 주소 명시 + Server prodServer = new Server(); + prodServer.setUrl("https://picke.store"); + prodServer.setDescription("Production Server"); + + // 2. 로컬 테스트용 서버 주소 + Server localServer = new Server(); + localServer.setUrl("http://localhost:8080"); + localServer.setDescription("Local Development Server"); + SecurityScheme securityScheme = new SecurityScheme() .type(SecurityScheme.Type.HTTP) .scheme("bearer") @@ -29,6 +36,8 @@ public OpenAPI openAPI() { new SecurityRequirement().addList("bearerAuth"); return new OpenAPI() + // 3. 서버 리스트 등록 + .servers(List.of(prodServer, localServer)) .info(new Info() .title("PIQUE API 명세서") .description("PIQUE 서비스 API 명세서입니다.") @@ -37,30 +46,4 @@ public OpenAPI openAPI() { .addSecuritySchemes("bearerAuth", securityScheme)) .addSecurityItem(securityRequirement); } - - @Bean - public CorsConfigurationSource corsConfigurationSource() { - CorsConfiguration configuration = new CorsConfiguration(); - - // 허용할 오리진(도메인) 설정 - configuration.setAllowedOrigins(List.of( - "http://localhost:3000", - "https://picke.store", - "https://www.picke.store" - )); - - // 허용할 HTTP 메서드 - configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); - - // 허용할 헤더 - configuration.setAllowedHeaders(List.of("*")); - - // 자격 증명(쿠키, Authorization 헤더 등) 허용 - configuration.setAllowCredentials(true); - - // 모든 경로(/**)에 대해 위 설정 적용 - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", configuration); - return source; - } } \ No newline at end of file From 8fa6b6e6a398933c9ce9287b42f07ef68567b0d2 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Sun, 29 Mar 2026 23:47:55 +0900 Subject: [PATCH 37/94] =?UTF-8?q?#69=20[Feat]=20S3=20=EB=B3=B4=EC=95=88=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=B0=8F=20TTS=20=EC=9E=AC=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EC=A0=84=EB=9E=B5=20=EB=8F=84=EC=9E=85,=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8F=BC=20=EA=B0=9C=ED=8E=B8=20?= =?UTF-8?q?=EB=B0=8F=20N+1=20=EA=B0=9C=EC=84=A0=20(#77)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/converter/BattleConverter.java | 56 ++++-- .../dto/request/AdminBattleCreateRequest.java | 2 + .../repository/BattleOptionRepository.java | 2 +- .../battle/repository/BattleRepository.java | 4 +- .../repository/BattleTagRepository.java | 4 +- .../domain/battle/service/BattleService.java | 10 +- .../battle/service/BattleServiceImpl.java | 124 +++++++----- .../app/domain/home/service/HomeService.java | 54 +++-- .../controller/ScenarioController.java | 10 +- .../dto/request/ScenarioCreateRequest.java | 2 + .../app/domain/scenario/entity/Scenario.java | 4 +- .../domain/scenario/entity/ScenarioNode.java | 9 + .../app/domain/scenario/entity/Script.java | 13 ++ .../service/ScenarioAudioPipelineService.java | 32 ++- .../scenario/service/ScenarioServiceImpl.java | 190 ++++++++++++++---- .../global/common/exception/ErrorCode.java | 1 + .../infra/media/service/FFmpegService.java | 63 +++--- .../infra/s3/service/S3UploadService.java | 4 + .../infra/s3/service/S3UploadServiceImpl.java | 126 ++++++++++-- src/main/resources/application.yml | 15 +- .../resources/static/js/admin/api/api-load.js | 135 ++++++++++--- .../resources/static/js/admin/api/api-save.js | 59 +++++- .../static/js/admin/chat/chat-editor.js | 42 ++-- .../static/js/admin/chat/chat-preview.js | 4 +- .../resources/static/js/admin/ui/ui-sync.js | 15 +- .../admin/components/form-battle.html | 94 ++++++--- .../templates/admin/fragments/preview.html | 14 +- .../templates/admin/picke-create.html | 7 +- .../resources/templates/admin/picke-list.html | 3 +- .../domain/home/service/HomeServiceTest.java | 60 +++--- 30 files changed, 856 insertions(+), 302 deletions(-) diff --git a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java index 932e3c50..dc75c267 100644 --- a/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java +++ b/src/main/java/com/swyp/app/domain/battle/converter/BattleConverter.java @@ -6,14 +6,15 @@ import com.swyp.app.domain.battle.entity.BattleOption; import com.swyp.app.domain.battle.entity.BattleOptionTag; import com.swyp.app.domain.battle.enums.BattleCreatorType; -import com.swyp.app.domain.battle.enums.BattleStatus; import com.swyp.app.domain.battle.repository.BattleOptionTagRepository; import com.swyp.app.domain.tag.entity.Tag; import com.swyp.app.domain.tag.enums.TagType; import com.swyp.app.domain.user.entity.User; +import com.swyp.app.global.infra.s3.service.S3UploadService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import java.time.Duration; import java.util.List; @Component @@ -37,7 +38,7 @@ public Battle toEntity(AdminBattleCreateRequest request, User admin) { .thumbnailUrl(request.thumbnailUrl()) .type(request.type()) .targetDate(request.targetDate()) - .status(BattleStatus.PENDING) + .status(request.status()) .creatorType(BattleCreatorType.ADMIN) .creator(admin) .build(); @@ -74,7 +75,15 @@ public BattleSimpleResponse toSimpleResponse(Battle b) { ); } - public AdminBattleDetailResponse toAdminDetailResponse(Battle b, List tags, List opts) { + // 관리자용 상세 응답 변환 (보안 URL 적용) + public AdminBattleDetailResponse toAdminDetailResponse( + Battle b, List tags, List opts, S3UploadService s3Service) { + + // 썸네일 보안 URL + String secureThumbnail = (b.getThumbnailUrl() != null && !b.getThumbnailUrl().isBlank()) + ? s3Service.getPresignedUrl(b.getThumbnailUrl(), Duration.ofMinutes(10)) + : null; + return new AdminBattleDetailResponse( b.getId(), b.getTitle(), @@ -82,7 +91,7 @@ public AdminBattleDetailResponse toAdminDetailResponse(Battle b, List tags, b.getTitleSuffix(), b.getSummary(), b.getDescription(), - b.getThumbnailUrl(), + secureThumbnail, b.getType(), b.getItemA(), b.getItemADesc(), @@ -92,20 +101,29 @@ public AdminBattleDetailResponse toAdminDetailResponse(Battle b, List tags, b.getStatus(), b.getCreatorType(), toTagResponses(tags, null), - toOptionResponses(opts), + toOptionResponses(opts, s3Service), b.getCreatedAt(), b.getUpdatedAt() ); } - public BattleUserDetailResponse toUserDetailResponse(Battle b, List tags, List opts, Long partCount, String voteStatus) { + // 유저 상세 응답 변환 + public BattleUserDetailResponse toUserDetailResponse( + Battle b, List tags, List opts, + Long partCount, String voteStatus, String secureThumbnail, + S3UploadService s3Service) { + BattleSummaryResponse summary = new BattleSummaryResponse( - b.getId(), b.getTitle(), b.getSummary(), b.getThumbnailUrl(), b.getType(), + b.getId(), + b.getTitle(), + b.getSummary(), + secureThumbnail, + b.getType(), b.getViewCount() == null ? 0 : b.getViewCount(), partCount == null ? 0L : partCount, b.getAudioDuration() == null ? 0 : b.getAudioDuration(), toTagResponses(tags, null), - toOptionResponses(opts) + toOptionResponses(opts, s3Service) ); return new BattleUserDetailResponse( @@ -125,22 +143,35 @@ public BattleUserDetailResponse toUserDetailResponse(Battle b, List tags, L ); } - private List toOptionResponses(List options) { + // 철학자 이미지 보안 처리를 포함한 옵션 응답 변환 + private List toOptionResponses(List options, S3UploadService s3Service) { if (options == null) return List.of(); + return options.stream() .map(o -> { List optionTags = optionTagRepository.findByBattleOption(o).stream() .map(BattleOptionTag::getTag) .toList(); + // 철학자 이미지 방어 로직 (null/공백일 경우 s3Service 호출 안 함) + String securePhilosopherImg = (o.getImageUrl() != null && !o.getImageUrl().isBlank()) + ? s3Service.getPresignedUrl(o.getImageUrl(), Duration.ofMinutes(10)) + : null; + return new BattleOptionResponse( - o.getId(), o.getLabel(), o.getTitle(), o.getStance(), - o.getRepresentative(), o.getQuote(), o.getImageUrl(), + o.getId(), + o.getLabel(), + o.getTitle(), + o.getStance(), + o.getRepresentative(), + o.getQuote(), + securePhilosopherImg, toTagResponses(optionTags, null) ); }).toList(); } + // 투데이 옵션 응답 변환 private List toTodayOptionResponses(List options) { if (options == null) return List.of(); return options.stream().map(o -> new TodayOptionResponse( @@ -148,6 +179,7 @@ private List toTodayOptionResponses(List opti )).toList(); } + // 태그 응답 변환 private List toTagResponses(List tags, TagType targetType) { if (tags == null) return List.of(); return tags.stream() @@ -155,4 +187,4 @@ private List toTagResponses(List tags, TagType targetTyp .map(t -> new BattleTagResponse(t.getId(), t.getName(), t.getType())) .toList(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java index 451dd724..fb1781dd 100644 --- a/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java +++ b/src/main/java/com/swyp/app/domain/battle/dto/request/AdminBattleCreateRequest.java @@ -1,5 +1,6 @@ package com.swyp.app.domain.battle.dto.request; +import com.swyp.app.domain.battle.enums.BattleStatus; import com.swyp.app.domain.battle.enums.BattleType; import java.time.LocalDate; import java.util.List; @@ -12,6 +13,7 @@ public record AdminBattleCreateRequest( String description, String thumbnailUrl, BattleType type, + BattleStatus status, String itemA, String itemADesc, String itemB, diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java index e97d03d7..9eb83259 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleOptionRepository.java @@ -12,5 +12,5 @@ public interface BattleOptionRepository extends JpaRepository findByBattle(Battle battle); Optional findByBattleAndLabel(Battle battle, BattleOptionLabel label); - + List findByBattleIn(List battles); } diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java index 7d590755..957a57ef 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleRepository.java @@ -35,11 +35,11 @@ public interface BattleRepository extends JpaRepository { "ORDER BY (battle.totalParticipantsCount + (battle.commentCount * 5)) DESC") List findBestBattles(Pageable pageable); - // 4. 오늘의 Pické (단일 타입) + // 4. 오늘의 Pické @Query("SELECT battle FROM Battle battle " + "WHERE battle.type = :type AND battle.targetDate = :today " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL") - List findTodayPicks(@Param("type") BattleType type, @Param("today") LocalDate today); + List findTodayPicks(@Param("type") BattleType type, @Param("today") LocalDate today, Pageable pageable); // 5. 새로운 배틀 @Query("SELECT battle FROM Battle battle " + diff --git a/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java index 6a157fb3..cfeaee0c 100644 --- a/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java +++ b/src/main/java/com/swyp/app/domain/battle/repository/BattleTagRepository.java @@ -13,7 +13,9 @@ public interface BattleTagRepository extends JpaRepository { List findByBattle(Battle battle); void deleteByBattle(Battle battle); boolean existsByTag(Tag tag); - + // N+1 방지를 위해 Tag까지 한 번에 가져오는 쿼리 + @Query("SELECT bt FROM BattleTag bt JOIN FETCH bt.tag WHERE bt.battle IN :battles") + List findByBattleIn(@Param("battles") List battles); // MypageService (recap): 여러 배틀의 태그를 한번에 조회 @Query("SELECT bt FROM BattleTag bt JOIN FETCH bt.tag WHERE bt.battle.id IN :battleIds") List findByBattleIdIn(@Param("battleIds") List battleIds); diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleService.java b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java index 13488139..5a137264 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleService.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleService.java @@ -20,19 +20,19 @@ public interface BattleService { // === [사용자용 - 홈 화면 5단 로직 지원 API] === // 1. 에디터 픽 조회 (isEditorPick = true) - List getEditorPicks(); + List getEditorPicks(int limit); // 2. 지금 뜨는 배틀 조회 (최근 24시간 투표 급증순) - List getTrendingBattles(); + List getTrendingBattles(int limit); // 3. Best 배틀 조회 (누적 지표 랭킹) - List getBestBattles(); + List getBestBattles(int limit); // 4. 오늘의 Pické 조회 (단일 타입 매칭) - List getTodayPicks(BattleType type); + List getTodayPicks(BattleType type, int limit); // 5. 새로운 배틀 조회 (중복 제외 리스트) - List getNewBattles(List excludeIds); + List getNewBattles(List excludeIds, int limit); // === [사용자용 - 기본 API] === diff --git a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java index ea0671a9..46813bf3 100644 --- a/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/battle/service/BattleServiceImpl.java @@ -22,6 +22,7 @@ import com.swyp.app.domain.vote.repository.VoteRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; +import com.swyp.app.global.infra.s3.service.S3UploadService; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -29,10 +30,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.Duration; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -47,6 +52,7 @@ public class BattleServiceImpl implements BattleService { private final UserRepository userRepository; private final VoteRepository voteRepository; private final BattleConverter battleConverter; + private final S3UploadService s3UploadService; @Override public Battle findById(Long battleId) { @@ -62,35 +68,36 @@ public Battle findById(Long battleId) { // [사용자용 - 홈 화면 5단 로직] @Override - public List getEditorPicks() { - List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, PageRequest.of(0, 10)); + public List getEditorPicks(int limit) { + List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, PageRequest.of(0, limit)); return convertToTodayResponses(battles); } @Override - public List getTrendingBattles() { + public List getTrendingBattles(int limit) { LocalDateTime yesterday = LocalDateTime.now().minusDays(1); - List battles = battleRepository.findTrendingBattles(yesterday, PageRequest.of(0, 5)); + List battles = battleRepository.findTrendingBattles(yesterday, PageRequest.of(0, limit)); return convertToTodayResponses(battles); } @Override - public List getBestBattles() { - List battles = battleRepository.findBestBattles(PageRequest.of(0, 5)); + public List getBestBattles(int limit) { + List battles = battleRepository.findBestBattles(PageRequest.of(0, limit)); return convertToTodayResponses(battles); } @Override - public List getTodayPicks(BattleType type) { - List battles = battleRepository.findTodayPicks(type, LocalDate.now()); + public List getTodayPicks(BattleType type, int limit) { + // findTodayPicks 레포지토리 메서드에 Pageable을 이미 추가하셨다면 문제없이 동작합니다! + List battles = battleRepository.findTodayPicks(type, LocalDate.now(), PageRequest.of(0, limit)); return convertToTodayResponses(battles); } @Override - public List getNewBattles(List excludeIds) { + public List getNewBattles(List excludeIds, int limit) { List finalExcludeIds = (excludeIds == null || excludeIds.isEmpty()) ? List.of(-1L) : excludeIds; - List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, PageRequest.of(0, 10)); + List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, PageRequest.of(0, limit)); return convertToTodayResponses(battles); } @@ -129,19 +136,30 @@ public TodayBattleListResponse getTodayBattles() { return new TodayBattleListResponse(items, items.size()); } + // [사용자용 상세 조회] - 썸네일 + 철학자 이미지 보안 처리 @Override + @Transactional(readOnly = true) public BattleUserDetailResponse getBattleDetail(Long battleId) { Battle battle = findById(battleId); - battle.increaseViewCount(); - - List allTags = getTagsByBattle(battle); + List tags = getTagsByBattle(battle); List options = battleOptionRepository.findByBattle(battle); + // 1. 썸네일 보안 URL 생성 + String secureThumbnail = s3UploadService.getPresignedUrl(battle.getThumbnailUrl(), Duration.ofMinutes(10)); String voteStatus = voteRepository.findByBattleIdAndUserId(battleId, 1L) .map(v -> v.getPostVoteOption() != null ? v.getPostVoteOption().getLabel().name() : "NONE") .orElse("NONE"); - return battleConverter.toUserDetailResponse(battle, allTags, options, battle.getTotalParticipantsCount(), voteStatus); + // 2. 컨버터를 통해 전체 조립 (철학자 이미지는 컨버터 내부에서 s3UploadService로 처리) + return battleConverter.toUserDetailResponse( + battle, + tags, + options, + battle.getTotalParticipantsCount(), + "NONE", + secureThumbnail, + s3UploadService // 철학자 이미지 변환을 위해 전달 + ); } @Override @@ -166,6 +184,7 @@ public BattleVoteResponse vote(Long battleId, Long optionId) { // [관리자용 API] + // [관리자용 생성] - 생성 직후 결과 화면에서도 이미지가 보이게 처리 @Override @Transactional @PreAuthorize("hasRole('ADMIN')") @@ -196,7 +215,9 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, } savedOptions.add(option); } - return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), savedOptions); + + // 생성 후 응답 시 s3UploadService 전달 + return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), savedOptions, s3UploadService); } private void saveBattleOptionTags(BattleOption option, List tagIds) { @@ -207,42 +228,33 @@ private void saveBattleOptionTags(BattleOption option, List tagIds) { )); } + // [관리자용 수정] - 수정 완료 후 결과 화면에서도 이미지가 보이게 처리 @Override @Transactional @PreAuthorize("hasRole('ADMIN')") public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request) { - // [STEP 2] 서버 터미널에 출력 - System.out.println("====== [백엔드 수신 로그] ======"); - System.out.println("ID: " + battleId); - System.out.println("제목: " + request.title()); - System.out.println("공연A: " + request.itemA()); - System.out.println("A설명: " + request.itemADesc()); - System.out.println("선택지A: " + (request.options() != null ? request.options().get(0).title() : "null")); - System.out.println("=============================="); - Battle battle = findById(battleId); - // 1. 배틀 필드 업데이트 + // 썸네일 이미지가 변경되었다면 기존 S3 파일 삭제 (스토리지 낭비 방지) + if (battle.getThumbnailUrl() != null && !battle.getThumbnailUrl().equals(request.thumbnailUrl())) { + s3UploadService.deleteFile(battle.getThumbnailUrl()); + } + + // 배틀 필드 업데이트 battle.update( - request.title(), - request.titlePrefix(), - request.titleSuffix(), - request.itemA(), - request.itemADesc(), - request.itemB(), - request.itemBDesc(), - request.summary(), - request.description(), - request.thumbnailUrl(), - request.targetDate(), - request.audioDuration(), - request.status() + request.title(), request.titlePrefix(), request.titleSuffix(), + request.itemA(), request.itemADesc(), request.itemB(), request.itemBDesc(), + request.summary(), request.description(), request.thumbnailUrl(), + request.targetDate(), request.audioDuration(), request.status() ); - // 2. 태그 업데이트 + // 태그 업데이트 if (request.tagIds() != null) { battleTagRepository.deleteByBattle(battle); - saveBattleTags(battle, request.tagIds()); + battleTagRepository.flush(); // DB에 DELETE 쿼리를 즉시 전송해서 완전히 비워버림 + + // request.tagIds()에 혹시 모를 중복값이 있으면 distinct()로 제거하고 저장 + saveBattleTags(battle, request.tagIds().stream().distinct().toList()); } // 3. 선택지 업데이트 @@ -253,14 +265,19 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe .filter(o -> o.getLabel() == optReq.label()) .findFirst() .ifPresent(o -> { + // 철학자/선택지 이미지가 변경되었다면 기존 S3 파일 삭제 + if (o.getImageUrl() != null && !o.getImageUrl().equals(optReq.imageUrl())) { + s3UploadService.deleteFile(o.getImageUrl()); + } + o.update(optReq.title(), optReq.stance(), optReq.representative(), optReq.quote(), optReq.imageUrl()); }); } } - // 변경된 옵션 다시 조회해서 응답 포함 List updatedOptions = battleOptionRepository.findByBattle(battle); - return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), updatedOptions); + // 업데이트 후 응답 시 s3UploadService 전달 + return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), updatedOptions, s3UploadService); } @Override @@ -274,10 +291,27 @@ public AdminBattleDeleteResponse deleteBattle(Long battleId) { // [공통 헬퍼 메서드] + // N+1 개선 버전 private List convertToTodayResponses(List battles) { + if (battles == null || battles.isEmpty()) { + return Collections.emptyList(); + } + + // 1. IN 쿼리로 모든 옵션과 태그를 한 번에 가져와서 배틀 ID별로 그룹핑 + Map> optionsMap = battleOptionRepository.findByBattleIn(battles) + .stream().collect(Collectors.groupingBy(battleOption -> battleOption.getBattle().getId())); + + Map> tagsMap = battleTagRepository.findByBattleIn(battles) + .stream().collect(Collectors.groupingBy( + battleTag -> battleTag.getBattle().getId(), + Collectors.mapping(BattleTag::getTag, Collectors.toList()) + )); + + // 2. DB 쿼리 없이 메모리(Map)에서 꺼내서 조립만 수행 return battles.stream().map(battle -> { - List tags = getTagsByBattle(battle); - List options = battleOptionRepository.findByBattle(battle); + List tags = tagsMap.getOrDefault(battle.getId(), Collections.emptyList()); + List options = optionsMap.getOrDefault(battle.getId(), Collections.emptyList()); + return battleConverter.toTodayResponse(battle, tags, options); }).toList(); } @@ -307,4 +341,4 @@ public BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabe return battleOptionRepository.findByBattleAndLabel(b, label) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/home/service/HomeService.java b/src/main/java/com/swyp/app/domain/home/service/HomeService.java index a23475f7..868013a0 100644 --- a/src/main/java/com/swyp/app/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/app/domain/home/service/HomeService.java @@ -32,14 +32,15 @@ public class HomeService { public HomeResponse getHome() { boolean newNotice = notificationService.hasNewBroadcast(NotificationCategory.NOTICE); - List editorPickRaw = battleService.getEditorPicks(); - List trendingRaw = battleService.getTrendingBattles(); - List bestRaw = battleService.getBestBattles(); - List voteRaw = battleService.getTodayPicks(BattleType.VOTE); - List quizRaw = battleService.getTodayPicks(BattleType.QUIZ); + // DB 쿼리 단계에서 LIMIT을 걸어 필요한 개수만 깔끔하게 조회! + List editorPickRaw = battleService.getEditorPicks(10); + List trendingRaw = battleService.getTrendingBattles(4); + List bestRaw = battleService.getBestBattles(3); + List voteRaw = battleService.getTodayPicks(BattleType.VOTE, 1); + List quizRaw = battleService.getTodayPicks(BattleType.QUIZ, 1); List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw, voteRaw, quizRaw); - List newRaw = battleService.getNewBattles(excludeIds); + List newRaw = battleService.getNewBattles(excludeIds, 3); return new HomeResponse( newNotice, @@ -52,29 +53,38 @@ public HomeResponse getHome() { ); } + // 에디터픽 썸네일 Presigned URL 적용 private HomeEditorPickResponse toEditorPick(TodayBattleResponse b) { String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); + + String secureThumb = (b.thumbnailUrl() != null && !b.thumbnailUrl().isBlank()) + ? s3PresignedUrlService.generatePresignedUrl(b.thumbnailUrl()) : null; + return new HomeEditorPickResponse( - b.battleId(), b.thumbnailUrl(), + b.battleId(), secureThumb, optionA, optionB, b.title(), b.summary(), b.tags(), b.viewCount() ); } + // 트렌딩 썸네일 Presigned URL 적용 private HomeTrendingResponse toTrending(TodayBattleResponse b) { + String secureThumb = (b.thumbnailUrl() != null && !b.thumbnailUrl().isBlank()) + ? s3PresignedUrlService.generatePresignedUrl(b.thumbnailUrl()) : null; + return new HomeTrendingResponse( - b.battleId(), b.thumbnailUrl(), + b.battleId(), secureThumb, b.title(), b.tags(), b.audioDuration(), b.viewCount() ); } private HomeBestBattleResponse toBestBattle(TodayBattleResponse b) { - List philosophers = findPhilosopherNames(b.tags()); - String philoA = philosophers.size() > 0 ? philosophers.get(0) : null; - String philoB = philosophers.size() > 1 ? philosophers.get(1) : null; + String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); + String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); + return new HomeBestBattleResponse( b.battleId(), philoA, philoB, @@ -104,14 +114,19 @@ private HomeTodayVoteResponse toTodayVote(TodayBattleResponse b) { ); } + // newBattle 썸네일 Presigned URL 적용 private HomeNewBattleResponse toNewBattle(TodayBattleResponse b) { - List philosophers = findPhilosopherNames(b.tags()); - String philoA = philosophers.size() > 0 ? philosophers.get(0) : null; - String philoB = philosophers.size() > 1 ? philosophers.get(1) : null; + String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); + String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); + String imageA = findRepresentativeImageUrl(b.options(), BattleOptionLabel.A); String imageB = findRepresentativeImageUrl(b.options(), BattleOptionLabel.B); + + String secureThumb = (b.thumbnailUrl() != null && !b.thumbnailUrl().isBlank()) + ? s3PresignedUrlService.generatePresignedUrl(b.thumbnailUrl()) : null; + return new HomeNewBattleResponse( - b.battleId(), b.thumbnailUrl(), + b.battleId(), secureThumb, b.title(), b.summary(), philoA, imageA, philoB, imageB, @@ -127,6 +142,15 @@ private String findOptionTitle(List options, BattleOptionLa .findFirst().orElse(null); } + // 옵션에서 철학자 이름(Representative)을 추출하는 메서드 + private String findOptionRepresentative(List options, BattleOptionLabel label) { + return Optional.ofNullable(options).orElse(List.of()).stream() + .filter(o -> o.label() == label) + .map(TodayOptionResponse::representative) + .filter(Objects::nonNull) + .findFirst().orElse(null); + } + private List findPhilosopherNames(List tags) { return Optional.ofNullable(tags).orElse(List.of()).stream() .filter(t -> t.type() == TagType.PHILOSOPHER) diff --git a/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java b/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java index 926b0484..fa739655 100644 --- a/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java +++ b/src/main/java/com/swyp/app/domain/scenario/controller/ScenarioController.java @@ -50,7 +50,15 @@ public ApiResponse> createScenario( @RequestBody ScenarioCreateRequest request) { Long scenarioId = scenarioService.createScenario(request); - return ApiResponse.onSuccess(Map.of("scenarioId", scenarioId, "status", "DRAFT")); + + // Map.of 대신 null에도 안전한 HashMap 사용 + Map response = new java.util.HashMap<>(); + response.put("scenarioId", scenarioId); + + // 고정값 대신 프론트에서 보낸 상태값(PENDING 등)을 그대로 반환! + response.put("status", request.status()); + + return ApiResponse.onSuccess(response); } @Operation(summary = "시나리오 내용 수정") diff --git a/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java index 71bf3756..feb4004b 100644 --- a/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java +++ b/src/main/java/com/swyp/app/domain/scenario/dto/request/ScenarioCreateRequest.java @@ -1,9 +1,11 @@ package com.swyp.app.domain.scenario.dto.request; +import com.swyp.app.domain.scenario.enums.ScenarioStatus; import java.util.List; public record ScenarioCreateRequest( Long battleId, Boolean isInteractive, + ScenarioStatus status, List nodes ) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java b/src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java index 94ed4da2..edc3a5cd 100644 --- a/src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java +++ b/src/main/java/com/swyp/app/domain/scenario/entity/Scenario.java @@ -65,7 +65,7 @@ public void addNode(ScenarioNode node) { node.assignScenario(this); } - public void clearNodes() { - this.nodes.clear(); + public void clearAudios() { + this.audios.clear(); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java b/src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java index f5891d9d..88ef845f 100644 --- a/src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java +++ b/src/main/java/com/swyp/app/domain/scenario/entity/ScenarioNode.java @@ -60,6 +60,15 @@ public void addOption(InteractiveOption option) { option.assignNode(this); } + public void updateBasicInfo(Boolean isStartNode) { + this.isStartNode = isStartNode; + } + + public void clearOptionsAndLinks() { + this.autoNextNodeId = null; + this.options.clear(); + } + public void updateAutoNextNodeId(Long autoNextNodeId) { this.autoNextNodeId = autoNextNodeId; } diff --git a/src/main/java/com/swyp/app/domain/scenario/entity/Script.java b/src/main/java/com/swyp/app/domain/scenario/entity/Script.java index 07c8b352..10d0e544 100644 --- a/src/main/java/com/swyp/app/domain/scenario/entity/Script.java +++ b/src/main/java/com/swyp/app/domain/scenario/entity/Script.java @@ -31,6 +31,9 @@ public class Script extends BaseEntity { @Column(columnDefinition = "TEXT") private String text; // SSML 태그가 포함된 텍스트 + @Column(name = "audio_url") + private String audioUrl; + @Builder public Script(Integer startTimeMs, SpeakerType speakerType, String speakerName, String text) { this.startTimeMs = startTimeMs; @@ -39,6 +42,16 @@ public Script(Integer startTimeMs, SpeakerType speakerType, String speakerName, this.text = text; } + public void updateAudioUrl(String audioUrl) { + this.audioUrl = audioUrl; + } + + public void updateContent(SpeakerType speakerType, String speakerName, String newText) { + this.speakerType = speakerType; + this.speakerName = speakerName; + this.text = newText; + } + public void assignNode(ScenarioNode node) { this.node = node; } diff --git a/src/main/java/com/swyp/app/domain/scenario/service/ScenarioAudioPipelineService.java b/src/main/java/com/swyp/app/domain/scenario/service/ScenarioAudioPipelineService.java index d41b3a9b..2107bd3c 100644 --- a/src/main/java/com/swyp/app/domain/scenario/service/ScenarioAudioPipelineService.java +++ b/src/main/java/com/swyp/app/domain/scenario/service/ScenarioAudioPipelineService.java @@ -31,9 +31,9 @@ public class ScenarioAudioPipelineService { private static final int SILENCE_MS = 600; @Async - @Transactional(propagation = Propagation.REQUIRES_NEW) // 비동기 전용 독립 트랜잭션 보장 + @Transactional(propagation = Propagation.REQUIRES_NEW) public void generateAndMergeAudioAsync(Long scenarioId) { - // 부모 트랜잭션이 커밋된 후에 도는 것이므로 데이터가 완벽하게 보임 + Scenario scenario = scenarioRepository.findById(scenarioId).orElseThrow(); log.info("\n=================================================="); @@ -41,18 +41,38 @@ public void generateAndMergeAudioAsync(Long scenarioId) { log.info("[시나리오 타입] 인터랙티브(분기) 여부: {}", scenario.getIsInteractive()); try { - log.info("--- [1단계] TTS API 호출 및 캐싱 ---"); + log.info("--- [1단계] TTS API 호출 및 캐싱 (S3 조각 활용) ---"); Map ttsCache = new HashMap<>(); int apiCallCount = 0; for (ScenarioNode node : scenario.getNodes()) { for (Script script : node.getScripts()) { - ttsCache.put(script.getId(), ttsService.generateTtsWithSsml(script.getText(), script.getSpeakerType())); - apiCallCount++; + File audioFile; + + // 1. 텍스트가 안 바뀌어서 DB에 S3 URL이 살아있다면? (재사용) + if (script.getAudioUrl() != null) { + log.info(">> 기존 오디오 재사용 (S3 다운로드): 스크립트 ID {}", script.getId()); + audioFile = s3UploadService.downloadFile(script.getAudioUrl()); + } + // 2. 텍스트가 바뀌었거나 새로 추가되었다면? (새로 생성 후 S3에 저장) + else { + log.info(">> 새 오디오 생성 (TTS API 호출): 스크립트 ID {}", script.getId()); + audioFile = ttsService.generateTtsWithSsml(script.getText(), script.getSpeakerType()); + + // 새로 만든 조각 파일을 다음 수정을 위해 S3에 업로드 (chunks 폴더) + String chunkKey = FileCategory.SCENARIO.getPath() + "/chunks/" + UUID.randomUUID() + ".mp3"; + String chunkUrl = s3UploadService.uploadFile(chunkKey, audioFile); + + // DB 엔티티에 새로 만든 S3 주소 기록 (dirty checking으로 자동 저장됨) + script.updateAudioUrl(chunkUrl); + + apiCallCount++; + } + + ttsCache.put(script.getId(), audioFile); } } log.info("[API 호출 통계] 💳 TTS API가 총 {}회 호출되어 캐시에 저장되었습니다.", apiCallCount); - File silence = ffmpegService.createSilenceFile(SILENCE_MS); // 경로 탐색 diff --git a/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java b/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java index a5d4b4ed..047139fc 100644 --- a/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java +++ b/src/main/java/com/swyp/app/domain/scenario/service/ScenarioServiceImpl.java @@ -23,6 +23,7 @@ import com.swyp.app.domain.vote.repository.VoteRepository; import com.swyp.app.global.common.exception.CustomException; import com.swyp.app.global.common.exception.ErrorCode; +import com.swyp.app.global.infra.s3.service.S3UploadService; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; @@ -45,6 +46,7 @@ public class ScenarioServiceImpl implements ScenarioService { private final VoteRepository voteRepository; private final ScenarioConverter scenarioConverter; private final ScenarioAudioPipelineService audioPipelineService; + private final S3UploadService s3Service; // [유저용] 시나리오 조회 (투표 기반 맞춤 오디오 제공) @Override @@ -94,11 +96,19 @@ public Long createScenario(ScenarioCreateRequest request) { Scenario scenario = Scenario.builder() .battle(battle) .isInteractive(request.isInteractive()) - .status(ScenarioStatus.PENDING) + .status(request.status()) .creatorType(CreatorType.ADMIN) .build(); - mapAndAddNodesToScenario(scenario, request); + // 1. 부모 시나리오 먼저 저장 (ID 발급) + scenarioRepository.save(scenario); + + // 2. 노드 및 스크립트 저장 (이때 모든 Script의 audioUrl은 null 상태) + smartUpdateNodesToScenario(scenario, request); + + // 3. 오디오 파이프라인 호출 (트랜잭션 커밋 후 비동기 실행) + triggerAudioPipeline(scenario.getId()); + return scenario.getId(); } @@ -113,10 +123,18 @@ public void updateScenarioContent(Long scenarioId, ScenarioCreateRequest request throw new CustomException(ErrorCode.SCENARIO_ALREADY_PUBLISHED); } - scenario.clearNodes(); - scenarioRepository.flush(); + // 스마트 업데이트 로직 호출 (수정 사항이 있었는지 boolean으로 반환받음) + boolean isModified = smartUpdateNodesToScenario(scenario, request); - mapAndAddNodesToScenario(scenario, request); + // 대본 내용(노드, 대사 등)이 하나라도 바뀌었다면? + if (isModified) { + // 1. 기존에 만들어둔 '최종 병합 오디오(A루트, B루트 등)'를 S3에서 전부 삭제! + for (String mergedAudioUrl : scenario.getAudios().values()) { + if (mergedAudioUrl != null) s3Service.deleteFile(mergedAudioUrl); + } + // 2. DB에서 최종 오디오 URL 초기화 + scenario.clearAudios(); + } } @Override @@ -126,10 +144,6 @@ public AdminScenarioResponse updateScenarioStatus(Long scenarioId, ScenarioStatu Scenario scenario = scenarioRepository.findById(scenarioId) .orElseThrow(() -> new CustomException(ErrorCode.SCENARIO_NOT_FOUND)); - if (scenario.getStatus() == status) { - return new AdminScenarioResponse(scenario.getId(), scenario.getStatus(), "이미 처리된 요청입니다."); - } - scenario.updateStatus(status); scenarioRepository.saveAndFlush(scenario); @@ -158,58 +172,146 @@ public AdminDeleteResponse deleteScenario(Long scenarioId) { return new AdminDeleteResponse(true, LocalDateTime.now()); } - private void mapAndAddNodesToScenario(Scenario scenario, ScenarioCreateRequest request) { - Map nodeMap = new HashMap<>(); + // 부분 업데이트 및 노드 삭제 시 S3 정리 로직 + private boolean smartUpdateNodesToScenario(Scenario scenario, ScenarioCreateRequest request) { + boolean isModified = false; + Map existingNodeMap = new HashMap<>(); + for (ScenarioNode node : scenario.getNodes()) { + existingNodeMap.put(node.getNodeName(), node); + } + Map updatedNodeMap = new HashMap<>(); for (NodeRequest nodeReq : request.nodes()) { - ScenarioNode node = ScenarioNode.builder() - .nodeName(nodeReq.nodeName()) - .isStartNode(nodeReq.isStartNode()) - .audioDuration(0) - .build(); - - if (nodeReq.scripts() != null) { - for (ScriptRequest scriptReq : nodeReq.scripts()) { - node.addScript(Script.builder() - .startTimeMs(0) - .speakerType(scriptReq.speakerType()) - .speakerName(scriptReq.speakerName()) - .text(scriptReq.text()) - .build()); + ScenarioNode existingNode = existingNodeMap.get(nodeReq.nodeName()); + + if (existingNode != null) { + existingNode.updateBasicInfo(nodeReq.isStartNode()); + + // 대사 변경 여부 체크 + boolean scriptChanged = updateScriptsSmartly(existingNode, nodeReq.scripts()); + if (scriptChanged) isModified = true; + + updatedNodeMap.put(existingNode.getNodeName(), existingNode); + existingNode.clearOptionsAndLinks(); + } else { + isModified = true; // 새 노드 생성됨 + ScenarioNode newNode = ScenarioNode.builder() + .nodeName(nodeReq.nodeName()) + .isStartNode(nodeReq.isStartNode()) + .audioDuration(0) + .build(); + + if (nodeReq.scripts() != null) { + for (ScriptRequest scriptReq : nodeReq.scripts()) { + newNode.addScript(Script.builder() + .startTimeMs(0) + .speakerType(scriptReq.speakerType()) + .speakerName(scriptReq.speakerName()) + .text(scriptReq.text()) + .build()); + } } + scenario.addNode(newNode); + updatedNodeMap.put(newNode.getNodeName(), newNode); } - scenario.addNode(node); } - scenarioRepository.saveAndFlush(scenario); + // 노드가 삭제될 때, 그 안에 있던 개별 대사의 오디오 파일도 S3에서 삭제 + boolean nodesRemoved = scenario.getNodes().removeIf(node -> { + boolean shouldRemove = !updatedNodeMap.containsKey(node.getNodeName()); + if (shouldRemove) { + for (Script script : node.getScripts()) { + if (script.getAudioUrl() != null) { + s3Service.deleteFile(script.getAudioUrl()); // S3에서 삭제 + } + } + } + return shouldRemove; + }); - for (ScenarioNode savedNode : scenario.getNodes()) { - nodeMap.put(savedNode.getNodeName(), savedNode); - } + if (nodesRemoved) isModified = true; + scenarioRepository.flush(); + // 링크 재구축 로직 for (NodeRequest nodeReq : request.nodes()) { - ScenarioNode parentNode = nodeMap.get(nodeReq.nodeName()); - + ScenarioNode parentNode = updatedNodeMap.get(nodeReq.nodeName()); if (nodeReq.autoNextNode() != null && !nodeReq.autoNextNode().isBlank()) { - ScenarioNode targetAutoNode = nodeMap.get(nodeReq.autoNextNode()); - if (targetAutoNode != null) { - parentNode.updateAutoNextNodeId(targetAutoNode.getId()); - } + Optional.ofNullable(updatedNodeMap.get(nodeReq.autoNextNode())) + .ifPresent(target -> parentNode.updateAutoNextNodeId(target.getId())); } - if (nodeReq.interactiveOptions() != null) { for (OptionRequest optReq : nodeReq.interactiveOptions()) { - ScenarioNode targetNode = nodeMap.get(optReq.nextNodeName()); - if (targetNode != null) { - parentNode.addOption(InteractiveOption.builder() - .label(optReq.label()) - .nextNodeId(targetNode.getId()) - .build()); + Optional.ofNullable(updatedNodeMap.get(optReq.nextNodeName())) + .ifPresent(target -> parentNode.addOption(InteractiveOption.builder() + .label(optReq.label()) + .nextNodeId(target.getId()) + .build())); + } + } + } + scenarioRepository.flush(); + return isModified; + } + + /** + * 공통 로직: 트랜잭션이 성공적으로 DB에 반영(Commit)된 후 비동기 오디오 작업 시작 + */ + private void triggerAudioPipeline(Long scenarioId) { + TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { + @Override + public void afterCommit() { + audioPipelineService.generateAndMergeAudioAsync(scenarioId); + } + }); + } + + // 텍스트 변경 및 대사 삭제 시 S3 정리 로직 + private boolean updateScriptsSmartly(ScenarioNode existingNode, java.util.List requestedScripts) { + boolean isModified = false; + if (requestedScripts == null) return false; + java.util.List + + + + + +
+
🦉
+

Pické

+

+ 배틀에 참여하려면
모바일 앱에서 확인하세요. +

+
+

앱을 설치하고 배틀에 참여해보세요

+
+ + Google Play + +
+
+
+ + + diff --git a/src/main/resources/templates/share/report.html b/src/main/resources/templates/share/report.html new file mode 100644 index 00000000..b7e692a6 --- /dev/null +++ b/src/main/resources/templates/share/report.html @@ -0,0 +1,33 @@ + + + + + + Pické - 철학자 리포트 + + + + + + + +
+
🦉
+

Pické

+

+ 친구의 철학자 리포트를 보려면
모바일 앱에서 확인하세요. +

+
+

앱을 설치하고 리포트를 확인해보세요

+
+ + Google Play + +
+
+
+ + + diff --git a/src/main/resources/templates/share/result.html b/src/main/resources/templates/share/result.html deleted file mode 100644 index b75c451f..00000000 --- a/src/main/resources/templates/share/result.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - Pické - 철학자 유형 결과 - - - - - - - -
- - - - - - - -
- - - - - From 35cff39d6b721b15b8b594a552f344e7312f3a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A4=80=ED=98=81?= <127603139+HYH0804@users.noreply.github.com> Date: Fri, 10 Apr 2026 08:05:58 +0900 Subject: [PATCH 72/94] =?UTF-8?q?#145=20[Feat]=20=EB=94=A5=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EA=B3=B5=EC=9C=A0=20API=20=EA=B5=AC=ED=98=84=20(?= =?UTF-8?q?=EB=A6=AC=ED=8F=AC=ED=8A=B8/=EB=B0=B0=ED=8B=80)=20=20(#147)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - #145 ## 📝 작업 내용 ### ✨ Feat ─ | 내용 | 파일 | |------|------| | 철학자 리포트 공유 URL 생성 API 구현 | `ShareApiController.java` | | 배틀 공유 URL 생성 API 구현 | `ShareApiController.java` | | 딥링크 수신 시 UA 기반 분기 처리 (Android → Play Store 리다이렉트, PC → 랜딩 페이지) | `ShareController.java` | | Android App Links 인증 파일 추가 | `.well-known/assetlinks.json` | | 리포트/배틀 PC 랜딩 페이지 추가 | `report.html`, `battle.html` | | JwtFilter 및 SecurityConfig 공유 경로 인증 제외 처리 | `JwtFilter.java`, `SecurityConfig.java` | ## 📌 공유 사항 > 1. Android 앱 팀에서 `AndroidManifest.xml`에 `/report/**`, `/battle/**` 경로에 대한 App Links intent-filter 추가 필요 > 2. NavHost에서 `https://picke.store/report/{reportId}`, `https://picke.store/battle/{battleId}` 딥링크 라우팅 처리 필요 > 3. Release keystore SHA-256 fingerprint는 이미 `assetlinks.json`에 반영 완료 ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [x] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 ## 💬 리뷰 요구사항 > 1. 없음 --------- Co-authored-by: Claude Sonnet 4.6 --- src/main/java/com/swyp/picke/domain/oauth/jwt/JwtFilter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/swyp/picke/domain/oauth/jwt/JwtFilter.java b/src/main/java/com/swyp/picke/domain/oauth/jwt/JwtFilter.java index 0f3477e7..40e5d210 100644 --- a/src/main/java/com/swyp/picke/domain/oauth/jwt/JwtFilter.java +++ b/src/main/java/com/swyp/picke/domain/oauth/jwt/JwtFilter.java @@ -43,6 +43,9 @@ public class JwtFilter extends OncePerRequestFilter { "/api/v1/notices", // 공지사항 "/api/test", // 테스트용 "/result", // 공유 링크 리다이렉트 + "/report", // 철학자 리포트 딥링크 + "/battle", // 배틀 딥링크 + "/.well-known", // Android App Links 인증 "/api/v1/resources" // 이미지, 오디오 파일 (Presigned URL) ); From 7d810a83871ec508450fe7bcf870c6af4a1485ad Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Fri, 10 Apr 2026 12:19:12 +0900 Subject: [PATCH 73/94] =?UTF-8?q?#139=20[CI/CD]=20=EB=B0=B0=ED=8F=AC=20/?= =?UTF-8?q?=20=EA=B0=9C=EB=B0=9C=20=EC=84=9C=EB=B2=84=20=EB=B6=84=EB=A6=AC?= =?UTF-8?q?=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-dev.yml | 55 +++++++++++++++++++ .../workflows/{deploy.yml => deploy-main.yml} | 18 +++--- .../picke/global/config/SwaggerConfig.java | 28 +++++++--- 3 files changed, 84 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/deploy-dev.yml rename .github/workflows/{deploy.yml => deploy-main.yml} (71%) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml new file mode 100644 index 00000000..7fa8b424 --- /dev/null +++ b/.github/workflows/deploy-dev.yml @@ -0,0 +1,55 @@ +name: Java CI/CD with Gradle (Dev Server) + +on: + push: + branches: [ "dev" ] # 1. 데브 브랜치 전용 + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + cache: 'gradle' + + - name: Build with Gradle + run: | + chmod +x ./gradlew + ./gradlew build -x test + + - name: Create .env file from Secret + run: | + cat <<'EOF' > .env + ${{ secrets.ENV_VARIABLES }} + EOF + + - name: Copy JAR and .env to EC2 + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + source: "build/libs/*-SNAPSHOT.jar, .env" + target: "~/dev-server" # 2. 데브 전용 폴더 + strip_components: 2 + + - name: Deploy to EC2 + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + script: | + # 3. 8081 포트만 종료 (8080은 건드리지 않음) + fuser -k 8081/tcp || true + + cd ~/dev-server + chmod +x *.jar + # 4. 8081 포트로 실행 + nohup java -jar -Dserver.port=8081 *-SNAPSHOT.jar > dev-app.log 2>&1 & \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy-main.yml similarity index 71% rename from .github/workflows/deploy.yml rename to .github/workflows/deploy-main.yml index 0f809702..e00e324b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy-main.yml @@ -1,9 +1,9 @@ -name: Java CI/CD with Gradle +name: Java CI/CD with Gradle (Main Server) on: push: - branches: [ "dev" ] # dev 브랜치에 푸시할 때 작동 - workflow_dispatch: # + branches: [ "main" ] # 1. 메인 브랜치 전용 + workflow_dispatch: jobs: deploy: @@ -16,7 +16,7 @@ jobs: with: java-version: '21' distribution: 'temurin' - cache: 'gradle' # 캐싱 추가: 빌드 속도가 훨씬 빨라집니다. + cache: 'gradle' - name: Build with Gradle run: | @@ -35,9 +35,8 @@ jobs: host: ${{ secrets.EC2_HOST }} username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} - # -plain.jar는 배포에 필요 없으므로 제외합니다. source: "build/libs/*-SNAPSHOT.jar, .env" - target: "~/" + target: "~/main-server" # 2. 메인 전용 폴더 strip_components: 2 - name: Deploy to EC2 @@ -47,7 +46,10 @@ jobs: username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} script: | + # 3. 8080 포트만 종료 fuser -k 8080/tcp || true - chmod +x ~/start.sh - ~/start.sh \ No newline at end of file + cd ~/main-server + chmod +x *.jar + # 4. 8080 포트 명시적 실행 + nohup java -jar -Dserver.port=8080 *-SNAPSHOT.jar > main-app.log 2>&1 & \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java b/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java index ba27e743..803b3ea8 100644 --- a/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java +++ b/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java @@ -15,15 +15,25 @@ public class SwaggerConfig { @Bean public OpenAPI openAPI() { - // 1. 운영 서버 주소 명시 - Server prodServer = new Server(); - prodServer.setUrl("https://picke.store"); - prodServer.setDescription("Production Server"); + // 1. 운영 서버 (8080) + Server prodServer = new Server() + .url("https://picke.store") + .description("Production Server"); - // 2. 로컬 테스트용 서버 주소 - Server localServer = new Server(); - localServer.setUrl("http://localhost:8080"); - localServer.setDescription("Local Development Server"); + // 2. 로컬 개발 서버 (8080) + Server local8080 = new Server() + .url("http://localhost:8080") + .description("Local Development Server (8080)"); + + // 3. 로컬 개발 서버 (8081) + Server local8081 = new Server() + .url("http://localhost:8081") + .description("Local Development Server (8081)"); + + // 4. 실제 EC2 데브 서버 (8081) - 나중에 배포 후 확인용 + Server devServer = new Server() + .url("http://picke.store:8081") + .description("Remote Dev Server (8081)"); SecurityScheme securityScheme = new SecurityScheme() .type(SecurityScheme.Type.HTTP) @@ -37,7 +47,7 @@ public OpenAPI openAPI() { return new OpenAPI() // 3. 서버 리스트 등록 - .servers(List.of(prodServer, localServer)) + .servers(List.of(prodServer, local8080, local8081, devServer)) .info(new Info() .title("PIQUE API 명세서") .description("PIQUE 서비스 API 명세서입니다.") From 33b669c711dc476ac3cd8553ca814afcb0b2ebb2 Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Fri, 10 Apr 2026 20:18:10 +0900 Subject: [PATCH 74/94] =?UTF-8?q?#149=20[Chore]=208081=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C=20=EC=84=9C=EB=B2=84=20SSL=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=EC=84=9C=20=EB=B0=8F=20.env=20=ED=8C=8C=EC=9D=BC=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-dev.yml | 23 ++++++++++++++++------- .github/workflows/deploy-main.yml | 23 ++++++++++++++++------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 7fa8b424..bf54da91 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -29,15 +29,23 @@ jobs: ${{ secrets.ENV_VARIABLES }} EOF - - name: Copy JAR and .env to EC2 + # // 1. 전송용 폴더를 만들어서 JAR와 .env를 한데 모으기 + - name: Prepare deployment files + run: | + mkdir -p deploy + cp build/libs/*-SNAPSHOT.jar deploy/ + cp .env deploy/ + + # // 2. 모아둔 deploy 폴더의 내용물만 EC2로 전송 + - name: Copy files to EC2 uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.EC2_HOST }} username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} - source: "build/libs/*-SNAPSHOT.jar, .env" - target: "~/dev-server" # 2. 데브 전용 폴더 - strip_components: 2 + source: "deploy/*" + target: "~/dev-server" # 데브 전용 폴더 + strip_components: 1 # 'deploy' 폴더명만 깎아서 내용물(.jar, .env)만 전송 - name: Deploy to EC2 uses: appleboy/ssh-action@v1.0.3 @@ -46,10 +54,11 @@ jobs: username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 3. 8081 포트만 종료 (8080은 건드리지 않음) + # 3. 8081 포트만 종료 fuser -k 8081/tcp || true cd ~/dev-server chmod +x *.jar - # 4. 8081 포트로 실행 - nohup java -jar -Dserver.port=8081 *-SNAPSHOT.jar > dev-app.log 2>&1 & \ No newline at end of file + + # // 2. .env 파일을 읽어서 환경변수로 등록 후 8081 포트로 실행 + export $(grep -v '^#' .env | xargs) && nohup java -jar -Dserver.port=8081 *-SNAPSHOT.jar > dev-app.log 2>&1 & \ No newline at end of file diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index e00e324b..3558c7ac 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -29,15 +29,23 @@ jobs: ${{ secrets.ENV_VARIABLES }} EOF - - name: Copy JAR and .env to EC2 + # // 1. 전송용 폴더 준비 + - name: Prepare deployment files + run: | + mkdir -p deploy + cp build/libs/*-SNAPSHOT.jar deploy/ + cp .env deploy/ + + # // 2. 메인 서버 폴더로 전송 + - name: Copy files to EC2 uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.EC2_HOST }} username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} - source: "build/libs/*-SNAPSHOT.jar, .env" - target: "~/main-server" # 2. 메인 전용 폴더 - strip_components: 2 + source: "deploy/*" + target: "~/main-server" + strip_components: 1 - name: Deploy to EC2 uses: appleboy/ssh-action@v1.0.3 @@ -46,10 +54,11 @@ jobs: username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 3. 8080 포트만 종료 + # 3. 8080 포트 종료 fuser -k 8080/tcp || true cd ~/main-server chmod +x *.jar - # 4. 8080 포트 명시적 실행 - nohup java -jar -Dserver.port=8080 *-SNAPSHOT.jar > main-app.log 2>&1 & \ No newline at end of file + + # // 2. 환경변수 등록 후 8080 포트로 실행 + export $(grep -v '^#' .env | xargs) && nohup java -jar -Dserver.port=8080 *-SNAPSHOT.jar > main-app.log 2>&1 & \ No newline at end of file From 705e53a4b61b5b52b7904e520590d7261ac50ef9 Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Sat, 11 Apr 2026 18:53:06 +0900 Subject: [PATCH 75/94] =?UTF-8?q?#159=20[CI/CD]=20=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EB=A9=94=EB=AA=A8=EB=A6=AC=20=EC=A0=9C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## #️⃣ 연관된 이슈 - closed #159 ## 📝 작업 내용 ### 👷 Chore | 내용 | 파일 | |------|------| | 서버 메모리 제한 | `deploy-dev.yml`, `deploy-main.yml` | | | | ## 📌 공유 사항 > 1. 서버 메모리 제한했습니다. 나중에 개발 서버 및 배포 서버 데이터베이스 분리해야할 것 같은데 나중에 의논해보면 좋을 것 같습니다. ## ✅ 체크리스트 - [x] Reviewer에 팀원들을 선택했나요? - [x] Assignees에 본인을 선택했나요? - [x] 컨벤션에 맞는 Type을 선택했나요? - [x] Development에 이슈를 연동했나요? - [x] Merge 하려는 브랜치가 올바르게 설정되어 있나요? - [x] 컨벤션을 지키고 있나요? - [x] 로컬에서 실행했을 때 에러가 발생하지 않나요? - [x] 팀원들에게 PR 링크 공유를 했나요? ## 📸 스크린샷 > 없음 ## 💬 리뷰 요구사항 > 없음 --- .github/workflows/deploy-dev.yml | 32 +++++++++++++++---------------- .github/workflows/deploy-main.yml | 30 +++++++++++++++-------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index bf54da91..a8a8ecb8 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -2,7 +2,7 @@ name: Java CI/CD with Gradle (Dev Server) on: push: - branches: [ "dev" ] # 1. 데브 브랜치 전용 + branches: [ "dev" ] workflow_dispatch: jobs: @@ -23,20 +23,13 @@ jobs: chmod +x ./gradlew ./gradlew build -x test - - name: Create .env file from Secret - run: | - cat <<'EOF' > .env - ${{ secrets.ENV_VARIABLES }} - EOF - - # // 1. 전송용 폴더를 만들어서 JAR와 .env를 한데 모으기 + # // 1. JAR 파일만 전송 준비 (환경변수는 서버에서 직접 생성하는게 더 깔끔해) - name: Prepare deployment files run: | mkdir -p deploy cp build/libs/*-SNAPSHOT.jar deploy/ - cp .env deploy/ - # // 2. 모아둔 deploy 폴더의 내용물만 EC2로 전송 + # // 2. JAR 파일 EC2로 전송 - name: Copy files to EC2 uses: appleboy/scp-action@v0.1.7 with: @@ -44,9 +37,10 @@ jobs: username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} source: "deploy/*" - target: "~/dev-server" # 데브 전용 폴더 - strip_components: 1 # 'deploy' 폴더명만 깎아서 내용물(.jar, .env)만 전송 + target: "~/dev-server" + strip_components: 1 + # // 3. EC2 서버에서 실행 스크립트 - name: Deploy to EC2 uses: appleboy/ssh-action@v1.0.3 with: @@ -54,11 +48,17 @@ jobs: username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 3. 8081 포트만 종료 + # 1. 기존 8081 프로세스 종료 fuser -k 8081/tcp || true cd ~/dev-server - chmod +x *.jar - # // 2. .env 파일을 읽어서 환경변수로 등록 후 8081 포트로 실행 - export $(grep -v '^#' .env | xargs) && nohup java -jar -Dserver.port=8081 *-SNAPSHOT.jar > dev-app.log 2>&1 & \ No newline at end of file + # 2. .env 파일 생성 + cat <<'EOF' > .env + ${{ secrets.ENV_VARIABLES }} + EOF + + # 3. 환경 변수 로드 및 메모리 제한 걸어서 실행 + # // 1. set -a로 .env 로드, -Xmx256m으로 메모리 방어 + set -a; source .env; set +a + nohup java -Xmx256m -Dserver.port=8081 -jar *-SNAPSHOT.jar > dev-app.log 2>&1 & \ No newline at end of file diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 3558c7ac..ea37df10 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -2,7 +2,7 @@ name: Java CI/CD with Gradle (Main Server) on: push: - branches: [ "main" ] # 1. 메인 브랜치 전용 + branches: [ "main" ] workflow_dispatch: jobs: @@ -23,20 +23,13 @@ jobs: chmod +x ./gradlew ./gradlew build -x test - - name: Create .env file from Secret - run: | - cat <<'EOF' > .env - ${{ secrets.ENV_VARIABLES }} - EOF - - # // 1. 전송용 폴더 준비 + # // 1. 전송용 폴더에 JAR 파일만 준비 (환경변수는 보안상 서버에서 직접 생성) - name: Prepare deployment files run: | mkdir -p deploy cp build/libs/*-SNAPSHOT.jar deploy/ - cp .env deploy/ - # // 2. 메인 서버 폴더로 전송 + # // 2. 메인 서버 폴더로 JAR 전송 - name: Copy files to EC2 uses: appleboy/scp-action@v0.1.7 with: @@ -47,6 +40,7 @@ jobs: target: "~/main-server" strip_components: 1 + # // 3. 운영 서버 실행 스크립트 - name: Deploy to EC2 uses: appleboy/ssh-action@v1.0.3 with: @@ -54,11 +48,19 @@ jobs: username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 3. 8080 포트 종료 + # 1. 기존 8080 프로세스 종료 fuser -k 8080/tcp || true + # 2. 운영 서버 폴더 이동 cd ~/main-server - chmod +x *.jar - # // 2. 환경변수 등록 후 8080 포트로 실행 - export $(grep -v '^#' .env | xargs) && nohup java -jar -Dserver.port=8080 *-SNAPSHOT.jar > main-app.log 2>&1 & \ No newline at end of file + # 3. .env 파일 생성 (운영 전용 Secrets 사용) + # // 1. EOF를 써서 특수문자 깨짐 없이 안전하게 저장 + cat <<'EOF' > .env + ${{ secrets.ENV_VARIABLES }} + EOF + + # 4. 환경 변수 로드 및 운영 서버 실행 + # // 2. 운영은 400MB 제한으로 안정성 확보 + set -a; source .env; set +a + nohup java -Xmx400m -Dserver.port=8080 -jar *-SNAPSHOT.jar > server.log 2>&1 & \ No newline at end of file From f8c734bcd4647e10a771ec8e32f682351c141c1f Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Sat, 11 Apr 2026 21:46:17 +0900 Subject: [PATCH 76/94] =?UTF-8?q?#137=20[Hotfix]=20QuizVoteResponse.Option?= =?UTF-8?q?Stat=20stance=20=ED=95=84=EB=93=9C=20=EB=88=84=EB=9D=BD=20?= =?UTF-8?q?=EA=B8=B4=EA=B8=89=20=EC=88=98=EC=A0=95=20(#138)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vote/dto/response/QuizVoteResponse.java | 9 ++++++++- .../picke/domain/vote/service/QuizVoteServiceImpl.java | 10 +++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/response/QuizVoteResponse.java b/src/main/java/com/swyp/picke/domain/vote/dto/response/QuizVoteResponse.java index 2f54b012..d1cf23e8 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/response/QuizVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/response/QuizVoteResponse.java @@ -8,5 +8,12 @@ public record QuizVoteResponse( long totalCount, List stats ) { - public record OptionStat(Long optionId, String label, String title, Boolean isCorrect, long voteCount, double ratio) {} + public record OptionStat(Long optionId, + String label, + String title, + Boolean isCorrect, + long voteCount, + double ratio, + String stance + ) {} } diff --git a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java index 322b1838..d258624f 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java @@ -89,9 +89,12 @@ public QuizVoteResponse getMyQuizVote(Long battleId, Long userId) { calcStats(battle, totalCount) )) .orElseGet(() -> { - // [투표 전] 전체 참여자 수(totalCount)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 + // [투표 전] 전체 참여자 수(totalCount), 선택지 설명(stance)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 List blindStats = battleOptionRepository.findByBattle(battle).stream() - .map(o -> new QuizVoteResponse.OptionStat(o.getId(), o.getLabel().name(), o.getTitle(), o.getIsCorrect(), 0L, 0.0)) + .map(o -> new QuizVoteResponse.OptionStat( + o.getId(), o.getLabel().name(), o.getTitle(), + o.getIsCorrect(), 0L, 0.0, o.getStance() + )) .toList(); return new QuizVoteResponse(battleId, null, totalCount, blindStats); }); @@ -183,7 +186,8 @@ private List calcStats(Battle battle, long totalCou o.getTitle(), o.getIsCorrect(), count, - ratio + ratio, + null ); }).toList(); } From 25d3d2d858415db38653fbd8f5d7759a45f6a4f0 Mon Sep 17 00:00:00 2001 From: Youwol <153346797+si-zero@users.noreply.github.com> Date: Sat, 11 Apr 2026 21:57:01 +0900 Subject: [PATCH 77/94] =?UTF-8?q?#161=20[Chore]=20=EA=B0=9C=EB=B0=9C=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=A3=BC=EC=86=8C=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EC=B6=98=20=ED=99=98=EA=B2=BD=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/swyp/picke/global/config/SecurityConfig.java | 3 ++- .../com/swyp/picke/global/config/SwaggerConfig.java | 11 +++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java index 379c1266..c61fd52d 100644 --- a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java @@ -76,7 +76,8 @@ public CorsConfigurationSource corsConfigurationSource() { "http://localhost:3000", "http://localhost:8080", "https://picke.store", - "https://www.picke.store" + "https://www.picke.store", + "https://dev.picke.store" )); configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); diff --git a/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java b/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java index 803b3ea8..28009e06 100644 --- a/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java +++ b/src/main/java/com/swyp/picke/global/config/SwaggerConfig.java @@ -25,14 +25,9 @@ public OpenAPI openAPI() { .url("http://localhost:8080") .description("Local Development Server (8080)"); - // 3. 로컬 개발 서버 (8081) - Server local8081 = new Server() - .url("http://localhost:8081") - .description("Local Development Server (8081)"); - - // 4. 실제 EC2 데브 서버 (8081) - 나중에 배포 후 확인용 + // 3. 개발 서버 (8081) Server devServer = new Server() - .url("http://picke.store:8081") + .url("https://dev.picke.store") .description("Remote Dev Server (8081)"); SecurityScheme securityScheme = new SecurityScheme() @@ -47,7 +42,7 @@ public OpenAPI openAPI() { return new OpenAPI() // 3. 서버 리스트 등록 - .servers(List.of(prodServer, local8080, local8081, devServer)) + .servers(List.of(prodServer, local8080, devServer)) .info(new Info() .title("PIQUE API 명세서") .description("PIQUE 서비스 API 명세서입니다.") From c1813e91da407dcb088fa3c18d71b0d659708c81 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Sat, 11 Apr 2026 22:04:06 +0900 Subject: [PATCH 78/94] =?UTF-8?q?#140=20[Breaking=20Change]=20Battle/Quiz/?= =?UTF-8?q?Poll=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20Vote=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=9E=AC=ED=8E=B8=20(#154)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminBattleController.java | 51 --- .../battle/controller/BattleController.java | 26 +- .../battle/converter/BattleConverter.java | 72 ++-- .../dto/request/AdminBattleCreateRequest.java | 24 -- .../dto/request/AdminBattleOptionRequest.java | 16 - .../dto/request/AdminBattleUpdateRequest.java | 23 -- .../response/AdminBattleDeleteResponse.java | 13 - .../response/AdminBattleDetailResponse.java | 36 -- .../dto/response/BattleOptionResponse.java | 3 +- .../dto/response/BattleScenarioResponse.java | 3 +- .../dto/response/BattleSimpleResponse.java | 3 +- .../dto/response/BattleSummaryResponse.java | 28 +- .../response/BattleUserDetailResponse.java | 26 +- .../dto/response/BattleVoteResponse.java | 2 +- .../dto/response/TodayBattleListResponse.java | 2 +- .../dto/response/TodayBattleResponse.java | 32 +- .../dto/response/TodayOptionResponse.java | 18 +- .../picke/domain/battle/entity/Battle.java | 120 +++--- .../domain/battle/entity/BattleOption.java | 64 ++- .../picke/domain/battle/enums/BattleType.java | 5 - .../repository/BattleOptionRepository.java | 14 +- .../repository/BattleOptionTagRepository.java | 2 + .../battle/repository/BattleRepository.java | 77 ++-- .../domain/battle/service/BattleService.java | 53 +-- .../battle/service/BattleServiceImpl.java | 375 ++++++++++++++---- .../home/controller/HomeController.java | 4 +- .../domain/home/service/HomeService.java | 215 +++++----- .../oauth/controller/AuthController.java | 2 +- .../controller/CommentLikeController.java | 4 +- .../PerspectiveCommentController.java | 6 +- .../controller/PerspectiveController.java | 13 +- .../controller/PerspectiveLikeController.java | 4 +- .../controller/ReportController.java | 2 +- .../service/PerspectiveCommentService.java | 12 +- .../service/PerspectiveService.java | 8 +- .../poll/controller/PollController.java | 38 ++ .../domain/poll/converter/PollConverter.java | 85 ++++ .../poll/dto/response/PollDetailResponse.java | 14 + .../poll/dto/response/PollListResponse.java | 13 + .../poll/dto/response/PollOptionResponse.java | 14 + .../poll/dto/response/PollSimpleResponse.java | 15 + .../poll/dto/response/PollTagResponse.java | 12 + .../swyp/picke/domain/poll/entity/Poll.java | 70 ++++ .../picke/domain/poll/entity/PollOption.java | 65 +++ .../poll/entity/PollOptionValueTagMap.java | 39 ++ .../poll/entity/PollOptionValueTagMapId.java | 16 + .../picke/domain/poll/entity/PollTagMap.java | 39 ++ .../domain/poll/entity/PollTagMapId.java | 16 + .../domain/poll/entity/PollUserVote.java | 43 ++ .../domain/poll/enums/PollOptionLabel.java | 5 + .../picke/domain/poll/enums/PollStatus.java | 8 + .../poll/repository/PollOptionRepository.java | 14 + .../PollOptionValueTagMapRepository.java | 14 + .../poll/repository/PollRepository.java | 37 ++ .../poll/repository/PollTagMapRepository.java | 14 + .../repository/PollUserVoteRepository.java | 16 + .../domain/poll/service/PollService.java | 35 ++ .../domain/poll/service/PollServiceImpl.java | 186 +++++++++ .../quiz/controller/QuizController.java | 38 ++ .../domain/quiz/converter/QuizConverter.java | 85 ++++ .../quiz/dto/response/QuizDetailResponse.java | 17 + .../quiz/dto/response/QuizListResponse.java | 13 + .../quiz/dto/response/QuizOptionResponse.java | 12 + .../quiz/dto/response/QuizSimpleResponse.java | 15 + .../quiz/dto/response/QuizTagResponse.java | 12 + .../swyp/picke/domain/quiz/entity/Quiz.java | 65 +++ .../picke/domain/quiz/entity/QuizOption.java | 71 ++++ .../quiz/entity/QuizOptionValueTagMap.java | 39 ++ .../quiz/entity/QuizOptionValueTagMapId.java | 16 + .../picke/domain/quiz/entity/QuizTagMap.java | 39 ++ .../domain/quiz/entity/QuizTagMapId.java | 16 + .../domain/quiz/entity/QuizUserVote.java | 43 ++ .../domain/quiz/enums/QuizOptionLabel.java | 6 + .../picke/domain/quiz/enums/QuizStatus.java | 8 + .../quiz/repository/QuizOptionRepository.java | 14 + .../QuizOptionValueTagMapRepository.java | 14 + .../quiz/repository/QuizRepository.java | 37 ++ .../quiz/repository/QuizTagMapRepository.java | 14 + .../repository/QuizUserVoteRepository.java | 16 + .../domain/quiz/service/QuizService.java | 35 ++ .../domain/quiz/service/QuizServiceImpl.java | 189 +++++++++ .../controller/RecommendationController.java | 4 +- .../service/RecommendationService.java | 12 +- .../controller/AdMobRewardController.java | 4 +- .../response/SearchBattleListResponse.java | 2 - .../domain/search/service/SearchService.java | 1 - .../domain/tag/controller/TagController.java | 49 +-- .../domain/tag/converter/TagConverter.java | 6 +- .../domain/tag/dto/request/TagRequest.java | 13 - .../tag/dto/response/TagDeleteResponse.java | 8 - .../tag/dto/response/TagListResponse.java | 1 + .../domain/tag/dto/response/TagResponse.java | 12 - .../picke/domain/tag/entity/CategoryTag.java | 35 ++ .../domain/tag/entity/PhilosopherTag.java | 36 ++ .../picke/domain/tag/entity/ValueTag.java | 36 ++ .../tag/repository/CategoryTagRepository.java | 8 + .../repository/PhilosopherTagRepository.java | 8 + .../tag/repository/ValueTagRepository.java | 8 + .../picke/domain/tag/service/TagService.java | 7 +- .../domain/tag/service/TagServiceImpl.java | 19 +- .../test/controller/TestController.java | 34 -- .../domain/user/service/MypageService.java | 20 +- .../domain/user/service/UserService.java | 4 +- .../vote/controller/VoteController.java | 85 ++-- .../domain/vote/converter/VoteConverter.java | 23 +- .../vote/dto/request/PollVoteRequest.java | 7 + .../vote/dto/request/QuizVoteRequest.java | 2 +- .../vote/dto/response/MyVoteResponse.java | 2 +- .../vote/dto/response/PollVoteResponse.java | 2 +- .../entity/{Vote.java => BattleVote.java} | 26 +- .../picke/domain/vote/entity/PollVote.java | 45 +++ .../picke/domain/vote/entity/QuizVote.java | 24 +- ...ository.java => BattleVoteRepository.java} | 42 +- .../vote/repository/PollVoteRepository.java | 14 + .../vote/repository/QuizVoteRepository.java | 12 +- ...oteService.java => BattleVoteService.java} | 2 +- ...ceImpl.java => BattleVoteServiceImpl.java} | 78 ++-- .../domain/vote/service/PollVoteService.java | 10 + .../vote/service/PollVoteServiceImpl.java | 140 +++++++ .../domain/vote/service/QuizVoteService.java | 4 +- .../vote/service/QuizVoteServiceImpl.java | 209 ++++------ .../domain/vote/service/VoteQueryService.java | 46 ++- .../picke/global/config/SecurityConfig.java | 9 +- 123 files changed, 2998 insertions(+), 1091 deletions(-) delete mode 100644 src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/controller/PollController.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/Poll.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/service/PollService.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/test/controller/TestController.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java rename src/main/java/com/swyp/picke/domain/vote/entity/{Vote.java => BattleVote.java} (77%) create mode 100644 src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java rename src/main/java/com/swyp/picke/domain/vote/repository/{VoteRepository.java => BattleVoteRepository.java} (51%) create mode 100644 src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java rename src/main/java/com/swyp/picke/domain/vote/service/{VoteService.java => BattleVoteService.java} (95%) rename src/main/java/com/swyp/picke/domain/vote/service/{VoteServiceImpl.java => BattleVoteServiceImpl.java} (70%) create mode 100644 src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java deleted file mode 100644 index b115abc3..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.swyp.picke.domain.battle.controller; - -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDeleteResponse; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDetailResponse; -import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.global.common.response.ApiResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.*; - -@Tag(name = "배틀 API (관리자)", description = "배틀 생성/수정/삭제 (관리자 전용)") -@RestController -@RequestMapping("/api/v1/admin/battles") -@RequiredArgsConstructor -@PreAuthorize("hasRole('ADMIN')") -public class AdminBattleController { - - private final BattleService battleService; - - @Operation(summary = "배틀 생성") - @PostMapping - public ApiResponse createBattle( - @RequestBody @Valid AdminBattleCreateRequest request, - @AuthenticationPrincipal Long adminUserId - ) { - return ApiResponse.onSuccess(battleService.createBattle(request, adminUserId)); - } - - @Operation(summary = "배틀 수정 (변경 필드만 포함)") - @PatchMapping("/{battleId}") - public ApiResponse updateBattle( - @PathVariable Long battleId, - @RequestBody @Valid AdminBattleUpdateRequest request - ) { - return ApiResponse.onSuccess(battleService.updateBattle(battleId, request)); - } - - @Operation(summary = "배틀 삭제") - @DeleteMapping("/{battleId}") - public ApiResponse deleteBattle( - @PathVariable Long battleId - ) { - return ApiResponse.onSuccess(battleService.deleteBattle(battleId)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java index 9450a078..eafacd8b 100644 --- a/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java +++ b/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java @@ -10,9 +10,13 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -@Tag(name = "배틀 API (사용자)", description = "배틀 조회") +@Tag(name = "배틀 API", description = "배틀 조회") @RestController @RequestMapping("/api/v1/battles") @RequiredArgsConstructor @@ -20,36 +24,34 @@ public class BattleController { private final BattleService battleService; - @Operation(summary = "오늘의 배틀 목록 조회 (스와이프 UI용, 최대 5개)") + @Operation(summary = "오늘의 배틀 목록 조회 (최대 5개)") @GetMapping("/today") public ApiResponse getTodayBattles() { return ApiResponse.onSuccess(battleService.getTodayBattles()); } - @Operation(summary = "배틀 전체 목록 조회", description = "페이징 및 타입별(ALL, BATTLE, QUIZ, VOTE) 필터링된 배틀 목록을 조회합니다.") + @Operation(summary = "배틀 목록 조회") @GetMapping public ApiResponse getBattles( @Parameter(description = "페이지 번호 (1부터 시작)", example = "1") @RequestParam(value = "page", defaultValue = "1") int page, @Parameter(description = "페이지 크기", example = "10") @RequestParam(value = "size", defaultValue = "10") int size, - @Parameter(description = "콘텐츠 타입 (ALL, BATTLE, QUIZ, VOTE)", example = "ALL") - @RequestParam(value = "type", required = false, defaultValue = "ALL") String type + @Parameter(description = "콘텐츠 상태 (ALL, PENDING, PUBLISHED, REJECTED, ARCHIVED)", example = "ALL") + @RequestParam(value = "status", required = false, defaultValue = "ALL") String status ) { - return ApiResponse.onSuccess(battleService.getBattles(page, size, type)); + return ApiResponse.onSuccess(battleService.getBattles(page, size, status)); } @Operation(summary = "배틀 상세 조회") @GetMapping("/{battleId}") - public ApiResponse getBattleDetail( - @PathVariable Long battleId - ) { + public ApiResponse getBattleDetail(@PathVariable Long battleId) { return ApiResponse.onSuccess(battleService.getBattleDetail(battleId)); } - @Operation(summary = "사용자 배틀 진행 상태 조회 (사전투표/TTS/사후투표)") + @Operation(summary = "사용자 배틀 진행 상태 조회") @GetMapping("/{battleId}/status") public ApiResponse getUserBattleStatus(@PathVariable Long battleId) { return ApiResponse.onSuccess(battleService.getUserBattleStatus(battleId)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java index 3511d521..71d5c27a 100644 --- a/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java +++ b/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java @@ -1,21 +1,22 @@ package com.swyp.picke.domain.battle.converter; -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; import com.swyp.picke.domain.battle.dto.response.*; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleCreatorType; -import com.swyp.picke.domain.user.enums.PhilosopherType; -import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.user.enums.VoteSide; import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import java.util.Comparator; import java.util.List; import java.util.Map; @@ -25,21 +26,17 @@ public class BattleConverter { private final ResourceUrlProvider urlProvider; private static final String BASE_SHARE_URL = "https://pique.app/battles/"; + private static final Comparator OPTION_SORTER = + Comparator.comparing((BattleOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(BattleOption::getId); public Battle toEntity(AdminBattleCreateRequest request, User admin) { return Battle.builder() .title(request.title()) - .titlePrefix(request.titlePrefix()) - .titleSuffix(request.titleSuffix()) - .itemA(request.itemA()) - .itemADesc(request.itemADesc()) - .itemB(request.itemB()) - .itemBDesc(request.itemBDesc()) .summary(request.summary()) .description(request.description()) .thumbnailUrl(request.thumbnailUrl()) - .type(request.type()) - .targetDate(request.targetDate()) .status(request.status()) .creatorType(BattleCreatorType.ADMIN) .creator(admin) @@ -52,18 +49,11 @@ public TodayBattleResponse toTodayResponse(Battle battle, List tags, List return new AdminBattleDetailResponse( battle.getId(), battle.getTitle(), - battle.getTitlePrefix(), - battle.getTitleSuffix(), battle.getSummary(), battle.getDescription(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), - battle.getType(), - battle.getItemA(), - battle.getItemADesc(), - battle.getItemB(), - battle.getItemBDesc(), + battle.getAudioDuration(), battle.getTargetDate(), battle.getStatus(), battle.getCreatorType(), @@ -111,7 +94,6 @@ public BattleUserDetailResponse toUserDetailResponse( battle.getTitle(), battle.getSummary(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), - battle.getType(), battle.getViewCount() == null ? 0 : battle.getViewCount(), participantsCount == null ? 0L : participantsCount, battle.getAudioDuration() == null ? 0 : battle.getAudioDuration(), @@ -121,12 +103,6 @@ public BattleUserDetailResponse toUserDetailResponse( return new BattleUserDetailResponse( summary, - battle.getTitlePrefix(), - battle.getTitleSuffix(), - battle.getItemA(), - battle.getItemADesc(), - battle.getItemB(), - battle.getItemBDesc(), battle.getDescription(), BASE_SHARE_URL + battle.getId(), userVoteStatus, @@ -143,8 +119,7 @@ public BattleScenarioResponse toScenarioResponse(Battle battle, List toOptionResponses(List options, Map> optionTagsMap) { if (options == null) return List.of(); return options.stream() + .sorted(OPTION_SORTER) .map(option -> { List optionTags = optionTagsMap.getOrDefault(option.getId(), List.of()); return new BattleOptionResponse( @@ -161,8 +137,7 @@ private List toOptionResponses(List options, option.getTitle(), option.getStance(), option.getRepresentative(), - option.getQuote(), - urlProvider.getImageUrl(FileCategory.PHILOSOPHER, PhilosopherType.resolveImageKey(option.getRepresentative())), + urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()), toTagResponses(optionTags, null) ); }).toList(); @@ -170,15 +145,16 @@ private List toOptionResponses(List options, private List toTodayOptionResponses(List options) { if (options == null) return List.of(); - return options.stream().map(option -> new TodayOptionResponse( - option.getId(), - option.getLabel(), - option.getTitle(), - option.getRepresentative(), - option.getStance(), - urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()), - option.getIsCorrect() - )).toList(); + return options.stream() + .sorted(OPTION_SORTER) + .map(option -> new TodayOptionResponse( + option.getId(), + option.getLabel(), + option.getTitle(), + option.getRepresentative(), + option.getStance(), + urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()) + )).toList(); } private List toTagResponses(List tags, TagType targetType) { @@ -188,4 +164,4 @@ private List toTagResponses(List tags, TagType targetTyp .map(tag -> new BattleTagResponse(tag.getId(), tag.getName(), tag.getType())) .toList(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java deleted file mode 100644 index 48aa5b4a..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; -import java.time.LocalDate; -import java.util.List; - -public record AdminBattleCreateRequest( - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - BattleType type, - BattleStatus status, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - List tagIds, - List options -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java deleted file mode 100644 index 36c1c212..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleOptionLabel; - -import java.util.List; - -public record AdminBattleOptionRequest( - BattleOptionLabel label, - String title, - String stance, - String representative, - String quote, - String imageUrl, - Boolean isCorrect, - List tagIds // 옵션 전용 태그 (철학자, 가치관 - 추후 사용자 유형 분석에 사용) -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java deleted file mode 100644 index aa5e4477..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleStatus; -import java.time.LocalDate; -import java.util.List; - -public record AdminBattleUpdateRequest( - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - Integer audioDuration, - BattleStatus status, - List tagIds, - List options -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java deleted file mode 100644 index 43c64d66..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.battle.dto.response; - -import java.time.LocalDateTime; - -/** - * 관리자 - 배틀 삭제 응답 - * 역할: 배틀이 성공적으로 소프트 딜리트 되었는지 확인하고 삭제 시점을 반환합니다. - */ - -public record AdminBattleDeleteResponse( - Boolean success, // 삭제 성공 여부 - LocalDateTime deletedAt // 삭제 처리된 일시 (Soft Delete) -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java deleted file mode 100644 index fd382332..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.swyp.picke.domain.battle.dto.response; - -import com.swyp.picke.domain.battle.enums.BattleCreatorType; -import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -/** - * 관리자 - 배틀 상세 상세 조회 응답 - * 역할: 관리자가 배틀의 모든 설정 값(상태, 생성자 타입, 수정일 등)을 확인하고 수정할 때 사용합니다. - */ - -public record AdminBattleDetailResponse( - Long battleId, - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - BattleType type, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - BattleStatus status, - BattleCreatorType creatorType, - List tags, - List options, - LocalDateTime createdAt, - LocalDateTime updatedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java index 51ca1760..ce34930d 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java @@ -10,7 +10,6 @@ public record BattleOptionResponse( String title, String stance, String representative, - String quote, String imageUrl, List tags -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java index de611ff9..1208010c 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java @@ -10,7 +10,6 @@ public record PhilosopherProfileResponse( String label, String name, String stance, - String quote, String imageUrl ) {} -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java index feef39fa..6ce79150 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java @@ -6,7 +6,6 @@ public record BattleSimpleResponse( Long battleId, String title, String thumbnailUrl, - String type, String status, LocalDateTime createdAt -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java index cd39f4d5..60cd7f24 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java @@ -1,23 +1,15 @@ package com.swyp.picke.domain.battle.dto.response; -import com.swyp.picke.domain.battle.enums.BattleType; - import java.util.List; -/** - * 유저 - 배틀 요약 정보 응답 - * 역할: 홈 화면의 각 섹션 카드나 리스트에서 '미리보기' 형태로 보여줄 데이터입니다. - */ - public record BattleSummaryResponse( - Long battleId, // 배틀 고유 ID - String title, // 배틀 제목 - String summary, // 배틀 요약 (누군가는 이것을...) - String thumbnailUrl, // 카드 배경 이미지 URL - BattleType type, // 배틀 타입 태그 (#BATTLE, #VOTE 등) - Integer viewCount, // 조회수 - Long participantsCount, // 누적 참여자 수 - Integer audioDuration, // 오디오 소요 시간 - List tags, // 카테고리/인물 태그 리스트 - List options // 선택지 요약 (A vs B) -) {} \ No newline at end of file + Long battleId, + String title, + String summary, + String thumbnailUrl, + Integer viewCount, + Long participantsCount, + Integer audioDuration, + List tags, + List options +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java index b08b9455..9b50d068 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java @@ -5,23 +5,13 @@ import java.util.List; -/** - * 유저 - 배틀 상세 페이지 응답 (시안 4, 5번) - * 역할: 배틀 클릭 시 진입하는 상세 화면의 모든 정보를 담습니다. 투표 여부에 따라 UI가 변합니다. - */ public record BattleUserDetailResponse( - BattleSummaryResponse battleInfo, // 기본적인 배틀 정보 (요약 DTO 재사용) - String titlePrefix, - String titleSuffix, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - String description, // 상세 본문 설명 - String shareUrl, // 공유하기 버튼용 링크 - VoteSide userVoteStatus, // 현재 유저의 투표 상태 + BattleSummaryResponse battleInfo, + String description, + String shareUrl, + VoteSide userVoteStatus, UserBattleStep currentStep, - List categoryTags, // UI 상단용 카테고리 태그 - List philosopherTags, // UI 하단용 철학자 태그 - List valueTags // 성향 분석용 가치관 태그 -) {} \ No newline at end of file + List categoryTags, + List philosopherTags, + List valueTags +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java index 64720c5b..fe2cdac5 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java @@ -12,4 +12,4 @@ public record BattleVoteResponse( Long selectedOptionId, // 유저가 방금 선택한 옵션 ID Long totalParticipants, // 실시간 전체 참여자 수 List results // 옵션별 득표 현황 리스트 -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java index 26e9567f..235a7f26 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java @@ -10,4 +10,4 @@ public record TodayBattleListResponse( List items, // 오늘의 배틀 리스트 Integer totalCount // 목록 총 개수 -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java index 8b14041d..097a0061 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java @@ -1,29 +1,15 @@ package com.swyp.picke.domain.battle.dto.response; -import com.swyp.picke.domain.battle.enums.BattleType; - import java.util.List; -/** - * 유저 - 오늘의 배틀 상세 응답 (시안 6번) - * 역할: 어두운 배경의 풀스크린 UI에 필요한 배경 이미지, 시간 등을 담습니다. - */ public record TodayBattleResponse( - Long battleId, // 배틀 고유 ID - String title, // 배틀 제목 - String summary, // 중간 요약 문구 - String thumbnailUrl, // 풀스크린 배경 이미지 URL - BattleType type, // 타입 태그 - Integer viewCount, // 조회수 - Long participantsCount, // 누적 참여자 수 - Integer audioDuration, // 소요 시간 (분:초 변환용 데이터) - List tags, // 상단 태그 리스트 - List options, // 중앙 세로형 대결 카드 데이터 - // 퀴즈·투표 전용 필드 - String titlePrefix, // 투표 접두사 (예: "도덕의 기준은") - String titleSuffix, // 투표 접미사 (예: "이다") - String itemA, // 퀴즈 O 선택지 - String itemADesc, // 퀴즈 O 설명 - String itemB, // 퀴즈 X 선택지 - String itemBDesc // 퀴즈 X 설명 + Long battleId, + String title, + String summary, + String thumbnailUrl, + Integer viewCount, + Long participantsCount, + Integer audioDuration, + List tags, + List options ) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java index 2fd15871..2da90246 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java @@ -2,17 +2,11 @@ import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -/** - * 유저 - 오늘의 배틀 전용 옵션 응답 - * 역할: 오늘의 배틀 시안의 세로형 카드에 들어가는 인물, 입장, 아바타 정보를 담습니다. - */ - public record TodayOptionResponse( - Long optionId, // 옵션 ID - BattleOptionLabel label,// 라벨 (A, B) - String title, // 제목 (예: 찬성한다) - String representative, // 인물 (예: 피터 싱어) - String stance, // 한 줄 입장 (예: 고통을 끝낼 권리는..) - String imageUrl, // 아바타 이미지 URL - Boolean isCorrect // 퀴즈 정답 여부 + Long optionId, + BattleOptionLabel label, + String title, + String representative, + String stance, + String imageUrl ) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java b/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java index 7a3ac8d5..e9905040 100644 --- a/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java +++ b/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java @@ -2,18 +2,27 @@ import com.swyp.picke.domain.battle.enums.BattleCreatorType; import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.*; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import java.time.LocalDate; -import java.time.LocalDateTime; - @Getter @Entity @Table(name = "battles") @@ -31,28 +40,6 @@ public class Battle extends BaseEntity { @Column(name = "thumbnail_url", length = 500) private String thumbnailUrl; - @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 20) - private BattleType type; - - @Column(name = "title_prefix") - private String titlePrefix; - - @Column(name = "title_suffix") - private String titleSuffix; - - @Column(name = "item_a") - private String itemA; - - @Column(name = "item_a_desc") - private String itemADesc; - - @Column(name = "item_b") - private String itemB; - - @Column(name = "item_b_desc") - private String itemBDesc; - @Column(name = "view_count") private Integer viewCount = 0; @@ -77,7 +64,8 @@ public class Battle extends BaseEntity { @JoinColumn(name = "creator_id") private User creator; - // 홈 화면 5단 기획을 위한 필드들 + @OneToMany(mappedBy = "battle", cascade = CascadeType.ALL, orphanRemoval = true) + private final List options = new ArrayList<>(); @Column(name = "is_editor_pick") private Boolean isEditorPick = false; @@ -89,22 +77,21 @@ public class Battle extends BaseEntity { private LocalDateTime deletedAt; @Builder - public Battle(String title, String summary, String description, String thumbnailUrl, - BattleType type, String titlePrefix, String titleSuffix, - String itemA, String itemADesc, String itemB, String itemBDesc, - LocalDate targetDate, Integer audioDuration, BattleStatus status, - BattleCreatorType creatorType, User creator) { + public Battle( + String title, + String summary, + String description, + String thumbnailUrl, + LocalDate targetDate, + Integer audioDuration, + BattleStatus status, + BattleCreatorType creatorType, + User creator + ) { this.title = title; this.summary = summary; this.description = description; this.thumbnailUrl = thumbnailUrl; - this.type = type; - this.titlePrefix = titlePrefix; - this.titleSuffix = titleSuffix; - this.itemA = itemA; - this.itemADesc = itemADesc; - this.itemB = itemB; - this.itemBDesc = itemBDesc; this.targetDate = targetDate; this.audioDuration = audioDuration; this.status = status; @@ -117,26 +104,34 @@ public Battle(String title, String summary, String description, String thumbnail this.deletedAt = null; } - public void update(String title, String titlePrefix, String titleSuffix, - String itemA, String itemADesc, String itemB, String itemBDesc, - String summary, String description, - String thumbnailUrl, LocalDate targetDate, - Integer audioDuration, BattleStatus status) { - if (title != null) this.title = title; - if (titlePrefix != null) this.titlePrefix = titlePrefix; - if (titleSuffix != null) this.titleSuffix = titleSuffix; - - if (itemA != null) this.itemA = itemA; - if (itemADesc != null) this.itemADesc = itemADesc; - if (itemB != null) this.itemB = itemB; - if (itemBDesc != null) this.itemBDesc = itemBDesc; - - if (summary != null) this.summary = summary; - if (description != null) this.description = description; - if (thumbnailUrl != null) this.thumbnailUrl = thumbnailUrl; - if (targetDate != null) this.targetDate = targetDate; - if (audioDuration != null) this.audioDuration = audioDuration; - if (status != null) this.status = status; + public void update( + String title, + String summary, + String description, + String thumbnailUrl, + BattleStatus status + ) { + if (title != null) { + this.title = title; + } + if (summary != null) { + this.summary = summary; + } + if (description != null) { + this.description = description; + } + if (thumbnailUrl != null) { + this.thumbnailUrl = thumbnailUrl; + } + if (targetDate != null) { + this.targetDate = targetDate; + } + if (audioDuration != null) { + this.audioDuration = audioDuration; + } + if (status != null) { + this.status = status; + } } public void delete() { @@ -155,4 +150,9 @@ public void addParticipant() { public void updateAudioDuration(Integer audioDuration) { this.audioDuration = audioDuration; } + + public void updateTargetDate(LocalDate targetDate) { + this.targetDate = targetDate; + } + } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java b/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java index 8be17ceb..ab5ee23a 100644 --- a/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java +++ b/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java @@ -2,7 +2,18 @@ import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.*; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.util.ArrayList; +import java.util.List; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -31,29 +42,35 @@ public class BattleOption extends BaseEntity { @Column(length = 100) private String representative; - @Column(columnDefinition = "TEXT") - private String quote; - @Column(name = "vote_count") private Long voteCount = 0L; - @Column(name = "is_correct") - private Boolean isCorrect = false; - @Column(name = "image_url", length = 500) private String imageUrl; + @Column(name = "display_order") + private Integer displayOrder; + + @OneToMany(mappedBy = "battleOption", cascade = CascadeType.ALL, orphanRemoval = true) + private final List tags = new ArrayList<>(); + @Builder - public BattleOption(Battle battle, BattleOptionLabel label, String title, String stance, - String representative, String quote, String imageUrl, Boolean isCorrect) { + public BattleOption( + Battle battle, + BattleOptionLabel label, + String title, + String stance, + String representative, + String imageUrl, + Integer displayOrder + ) { this.battle = battle; this.label = label; this.title = title; this.stance = stance; this.representative = representative; - this.quote = quote; this.imageUrl = imageUrl; - this.isCorrect = (isCorrect != null) && isCorrect; + this.displayOrder = displayOrder; this.voteCount = 0L; } @@ -67,12 +84,21 @@ public void decreaseVoteCount() { } } - public void update(String title, String stance, String representative, String quote, String imageUrl, Boolean isCorrect) { - if (title != null) this.title = title; - if (stance != null) this.stance = stance; - if (representative != null) this.representative = representative; - if (quote != null) this.quote = quote; - if (imageUrl != null) this.imageUrl = imageUrl; - if (isCorrect != null) this.isCorrect = isCorrect; + public void update(String title, String stance, String representative, String imageUrl) { + if (title != null) { + this.title = title; + } + if (stance != null) { + this.stance = stance; + } + if (representative != null) { + this.representative = representative; + } + if (imageUrl != null) { + this.imageUrl = imageUrl; + } + if (displayOrder != null) { + this.displayOrder = displayOrder; + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java deleted file mode 100644 index 648e1eff..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.swyp.picke.domain.battle.enums; - -public enum BattleType { - BATTLE, QUIZ, VOTE -} diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java index d30f2a8e..2260ed8e 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java @@ -4,13 +4,23 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; import java.util.Optional; public interface BattleOptionRepository extends JpaRepository { - List findByBattle(Battle battle); + @Query("SELECT bo FROM BattleOption bo " + + "WHERE bo.battle = :battle " + + "ORDER BY COALESCE(bo.displayOrder, 9999), bo.label, bo.id") + List findByBattle(@Param("battle") Battle battle); + Optional findByBattleAndLabel(Battle battle, BattleOptionLabel label); - List findByBattleIn(List battles); + + @Query("SELECT bo FROM BattleOption bo " + + "WHERE bo.battle IN :battles " + + "ORDER BY bo.battle.id, COALESCE(bo.displayOrder, 9999), bo.label, bo.id") + List findByBattleIn(@Param("battles") List battles); } diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java index fb2ffce2..23f0d3dd 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java @@ -3,6 +3,7 @@ import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.entity.BattleOptionTag; +import com.swyp.picke.domain.tag.entity.Tag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -11,6 +12,7 @@ public interface BattleOptionTagRepository extends JpaRepository { List findByBattleOption(BattleOption battleOption); + boolean existsByTag(Tag tag); @Query("SELECT bot FROM BattleOptionTag bot JOIN FETCH bot.tag WHERE bot.battleOption.battle = :battle") List findByBattleWithTags(@Param("battle") Battle battle); diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java index c4aa3d8d..d4d5dd31 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java @@ -2,100 +2,103 @@ import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.data.domain.Page; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; public interface BattleRepository extends JpaRepository { - // 1. EDITOR PICK - type 파라미터 추가 + // 1. EDITOR PICK @Query("SELECT battle FROM Battle battle " + "WHERE battle.isEditorPick = true AND battle.status = :status " + - "AND battle.type = :type AND battle.deletedAt IS NULL " + + "AND battle.deletedAt IS NULL " + "ORDER BY battle.createdAt DESC") - List findEditorPicks(@Param("status") BattleStatus status, @Param("type") BattleType type, Pageable pageable); + List findEditorPicks(@Param("status") BattleStatus status, Pageable pageable); - // 2. 지금 뜨는 배틀 - type 파라미터 추가 - @Query("SELECT battle FROM Battle battle JOIN Vote vote ON vote.battle = battle " + - "WHERE vote.createdAt >= :yesterday AND battle.type = :type " + + // 2. 지금 뜨는 배틀 + @Query("SELECT battle FROM Battle battle JOIN BattleVote vote ON vote.battle = battle " + + "WHERE vote.createdAt >= :yesterday " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "GROUP BY battle ORDER BY COUNT(vote) DESC") - List findTrendingBattles(@Param("yesterday") LocalDateTime yesterday, @Param("type") BattleType type, Pageable pageable); + List findTrendingBattles(@Param("yesterday") LocalDateTime yesterday, Pageable pageable); - // 3. Best 배틀 - type 파라미터 추가 + // 3. Best 배틀 @Query("SELECT battle FROM Battle battle " + - "WHERE battle.status = 'PUBLISHED' AND battle.type = :type AND battle.deletedAt IS NULL " + + "WHERE battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "ORDER BY (battle.totalParticipantsCount + (battle.commentCount * 5)) DESC") - List findBestBattles(@Param("type") BattleType type, Pageable pageable); + List findBestBattles(Pageable pageable); // 4. 오늘의 Pické @Query("SELECT battle FROM Battle battle " + - "WHERE battle.type = :type AND battle.targetDate = :today " + + "WHERE battle.targetDate = :today " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL") - List findTodayPicks(@Param("type") BattleType type, @Param("today") LocalDate today, Pageable pageable); + List findTodayPicks(@Param("today") LocalDate today, Pageable pageable); - // 5. 새로운 배틀 - type 파라미터 추가 + // 5. 새로운 배틀 @Query("SELECT battle FROM Battle battle " + - "WHERE battle.id NOT IN :excludeIds AND battle.type = :type " + + "WHERE battle.status = 'PUBLISHED' " + + "AND battle.deletedAt IS NULL " + + "AND (battle.targetDate IS NULL OR battle.targetDate < :today) " + + "ORDER BY CASE WHEN battle.targetDate IS NULL THEN 0 ELSE 1 END, battle.targetDate ASC, battle.createdAt ASC") + List findAutoAssignableTodayPicks(@Param("today") LocalDate today, Pageable pageable); + + @Query("SELECT battle FROM Battle battle " + + "WHERE battle.id NOT IN :excludeIds " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "ORDER BY battle.createdAt DESC") - List findNewBattlesExcluding(@Param("excludeIds") List excludeIds, @Param("type") BattleType type, Pageable pageable); + List findNewBattlesExcluding(@Param("excludeIds") List excludeIds, Pageable pageable); - // 6. 전체 배틀 목록 조회 (페이징, 삭제된 항목 제외, 최신순) + // 6. 전체 배틀 목록 조회 Page findByDeletedAtIsNullOrderByCreatedAtDesc(Pageable pageable); - Page findByTypeAndDeletedAtIsNullOrderByCreatedAtDesc(BattleType type, Pageable pageable); + Page findByStatusAndDeletedAtIsNullOrderByCreatedAtDesc(BattleStatus status, Pageable pageable); // 기본 조회용 List findByTargetDateAndStatusAndDeletedAtIsNull(LocalDate date, BattleStatus status); - List findByTargetDateAndStatusAndTypeAndDeletedAtIsNull(LocalDate targetDate, BattleStatus status, BattleType type); - - // 탐색 탭: 전체 배틀 검색 (정렬은 Pageable Sort로 처리) - @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + // 탐색 탭: 전체 배틀 검색 + @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") List searchAll(Pageable pageable); - @Query("SELECT COUNT(b) FROM Battle b WHERE b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + @Query("SELECT COUNT(b) FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") long countSearchAll(); // 탐색 탭: 카테고리 태그 필터 배틀 검색 @Query("SELECT DISTINCT b FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + - "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + - "AND b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") List searchByCategory(@Param("categoryName") String categoryName, Pageable pageable); @Query("SELECT COUNT(DISTINCT b) FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + - "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + - "AND b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") long countSearchByCategory(@Param("categoryName") String categoryName); // 추천 폴백용: 전체 배틀 대상 인기 점수순 조회 (철학자 유형 로직 미구현 시 사용) // Score = V*1.0 + C*1.5 + Vw*0.2 @Query("SELECT b FROM Battle b " + "WHERE b.id NOT IN :excludeBattleIds " + - "AND b.type = 'BATTLE' " + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") List findPopularBattlesExcluding( @Param("excludeBattleIds") List excludeBattleIds, - Pageable pageable); + Pageable pageable + ); // 추천용: 특정 유저들이 참여한 배틀 중 이미 참여한 배틀 제외하고 인기 점수순 조회 // Score = V*1.0 + C*1.5 + Vw*0.2 (R은 추후 반영 예정) @Query("SELECT b FROM Battle b " + "WHERE b.id IN :candidateBattleIds " + "AND b.id NOT IN :excludeBattleIds " + - "AND b.type = 'BATTLE' " + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") List findRecommendedBattles( @Param("candidateBattleIds") List candidateBattleIds, @Param("excludeBattleIds") List excludeBattleIds, - Pageable pageable); -} \ No newline at end of file + Pageable pageable + ); +} diff --git a/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java b/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java index baf96eb4..a5d1df46 100644 --- a/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java +++ b/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java @@ -1,67 +1,56 @@ package com.swyp.picke.domain.battle.service; -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.battle.dto.response.*; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.battle.dto.response.BattleListResponse; +import com.swyp.picke.domain.battle.dto.response.BattleScenarioResponse; +import com.swyp.picke.domain.battle.dto.response.BattleUserDetailResponse; +import com.swyp.picke.domain.battle.dto.response.BattleVoteResponse; +import com.swyp.picke.domain.battle.dto.response.TodayBattleListResponse; +import com.swyp.picke.domain.battle.dto.response.TodayBattleResponse; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; - import java.util.List; public interface BattleService { - // === [내부 공통/조회 메서드] === Battle findById(Long battleId); - BattleOption findOptionById(Long optionId); - BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabel label); - - // === [사용자용 - 홈 화면 5단 로직 지원 API] === - // 1. 에디터 픽 조회 (isEditorPick = true) - List getEditorPicks(int limit); + BattleOption findOptionById(Long optionId); - // 2. 지금 뜨는 배틀 조회 (최근 24시간 투표 급증순) - List getTrendingBattles(int limit); + BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabel label); - // 3. Best 배틀 조회 (누적 지표 랭킹) - List getBestBattles(int limit); + List getEditorPicks(); - // 4. 오늘의 Pické 조회 (단일 타입 매칭) - List getTodayPicks(BattleType type, int limit); + List getTrendingBattles(); - // 5. 새로운 배틀 조회 (중복 제외 리스트) - List getNewBattles(List excludeIds, int limit); + List getBestBattles(); + List getTodayPicks(); - // === [사용자용 - 기본 API] === + List getNewBattles(List excludeIds); - // 전체 배틀 목록 페이징 조회 - BattleListResponse getBattles(int page, int size, String type); + BattleListResponse getBattles(int page, int size, String status); - // 오늘의 배틀 (기존 로직 유지용) TodayBattleListResponse getTodayBattles(); - // 배틀 상세 정보 BattleUserDetailResponse getBattleDetail(Long battleId); - // 투표 실행 및 실시간 통계 결과 반환 - BattleVoteResponse vote(Long battleId, Long optionId); + BattleVoteResponse BattleVote(Long battleId, Long optionId); BattleScenarioResponse getBattleScenario(Long battleId); UserBattleStatusResponse getUserBattleStatus(Long battleId); - // === [관리자용 API] === - - // 배틀 생성 AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, Long adminUserId); - // 배틀 수정 + AdminBattleDetailResponse getAdminBattleDetail(Long battleId); + AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request); - // 배틀 삭제 (DB에서 지우지 않고 소프트 딜리트/상태변경을 수행합니다) AdminBattleDeleteResponse deleteBattle(Long battleId); } diff --git a/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java index 5956d719..e8b59d6c 100644 --- a/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java @@ -1,8 +1,11 @@ package com.swyp.picke.domain.battle.service; import com.swyp.picke.domain.battle.converter.BattleConverter; -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleOptionRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; import com.swyp.picke.domain.battle.dto.response.*; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; @@ -10,7 +13,6 @@ import com.swyp.picke.domain.battle.entity.BattleTag; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.battle.repository.BattleOptionRepository; @@ -18,15 +20,18 @@ import com.swyp.picke.domain.battle.repository.BattleRepository; import com.swyp.picke.domain.battle.repository.BattleTagRepository; import com.swyp.picke.domain.tag.entity.Tag; +import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.repository.TagRepository; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.enums.VoteSide; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.user.service.UserBattleService; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; +import com.swyp.picke.global.infra.local.service.LocalDraftFileStorageService; +import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.service.S3UploadService; import com.swyp.picke.global.util.SecurityUtil; import lombok.RequiredArgsConstructor; @@ -38,6 +43,9 @@ import java.time.LocalDate; import java.time.LocalDateTime; +import java.net.URI; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.*; import java.util.stream.Collectors; @@ -46,15 +54,23 @@ @Transactional(readOnly = true) public class BattleServiceImpl implements BattleService { + private static final int HOME_EDITOR_PICK_LIMIT = 10; + private static final int HOME_TRENDING_LIMIT = 4; + private static final int HOME_BEST_LIMIT = 3; + private static final int HOME_TODAY_PICK_LIMIT = 1; + private static final int HOME_NEW_LIMIT = 3; + private static final Pattern RESOURCE_IMAGE_PATH_PATTERN = Pattern.compile("/api/v1/resources/images/([A-Z_]+)/(.+)"); + private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; private final BattleTagRepository battleTagRepository; private final BattleOptionTagRepository battleOptionTagRepository; private final TagRepository tagRepository; private final UserRepository userRepository; - private final VoteRepository voteRepository; + private final BattleVoteRepository battleVoteRepository; private final BattleConverter battleConverter; private final S3UploadService s3UploadService; + private final LocalDraftFileStorageService localDraftFileStorageService; private final UserBattleService userBattleService; @Override @@ -68,49 +84,81 @@ public Battle findById(Long battleId) { } @Override - public List getEditorPicks(int limit) { - List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, BattleType.BATTLE, PageRequest.of(0, limit)); - return convertToTodayResponses(battles); + public List getEditorPicks() { + return loadEditorPicks(HOME_EDITOR_PICK_LIMIT); + } + + @Override + public List getTrendingBattles() { + return loadTrendingBattles(HOME_TRENDING_LIMIT); + } + + @Override + public List getBestBattles() { + return loadBestBattles(HOME_BEST_LIMIT); + } + + @Override + @Transactional + public List getTodayPicks() { + return loadTodayPicks(HOME_TODAY_PICK_LIMIT); } @Override - public List getTrendingBattles(int limit) { + public List getNewBattles(List excludeIds) { + return loadNewBattles(excludeIds, HOME_NEW_LIMIT); + } + + private List loadEditorPicks(int limit) { + int safeLimit = Math.max(1, limit); + List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, PageRequest.of(0, safeLimit)); + return convertToTodayResponses(battles); + } + + private List loadTrendingBattles(int limit) { + int safeLimit = Math.max(1, limit); LocalDateTime yesterday = LocalDateTime.now().minusDays(1); - List battles = battleRepository.findTrendingBattles(yesterday, BattleType.BATTLE, PageRequest.of(0, limit)); + List battles = battleRepository.findTrendingBattles(yesterday, PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } - @Override - public List getBestBattles(int limit) { - List battles = battleRepository.findBestBattles(BattleType.BATTLE, PageRequest.of(0, limit)); + private List loadBestBattles(int limit) { + int safeLimit = Math.max(1, limit); + List battles = battleRepository.findBestBattles(PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } - @Override - public List getTodayPicks(BattleType type, int limit) { - List battles = battleRepository.findTodayPicks(type, LocalDate.now(), PageRequest.of(0, limit)); + private List loadTodayPicks(int limit) { + int safeLimit = Math.max(1, limit); + LocalDate today = LocalDate.now(); + ensureTodayPicks(today, safeLimit); + + List battles = battleRepository.findTodayPicks(today, PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } - @Override - public List getNewBattles(List excludeIds, int limit) { + private List loadNewBattles(List excludeIds, int limit) { + int safeLimit = Math.max(1, limit); List finalExcludeIds = (excludeIds == null || excludeIds.isEmpty()) ? List.of(-1L) : excludeIds; - List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, BattleType.BATTLE, PageRequest.of(0, limit)); + List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } @Override - public BattleListResponse getBattles(int page, int size, String type) { + public BattleListResponse getBattles(int page, int size, String status) { int pageNumber = Math.max(0, page - 1); PageRequest pageRequest = PageRequest.of(pageNumber, size); - Page battlePage; + BattleStatus battleStatusFilter = parseBattleStatus(status); - if (type == null || type.equals("ALL")) { + Page battlePage; + if (battleStatusFilter == null) { battlePage = battleRepository.findByDeletedAtIsNullOrderByCreatedAtDesc(pageRequest); } else { - battlePage = battleRepository.findByTypeAndDeletedAtIsNullOrderByCreatedAtDesc( - BattleType.valueOf(type), pageRequest); + battlePage = battleRepository.findByStatusAndDeletedAtIsNullOrderByCreatedAtDesc( + battleStatusFilter, + pageRequest + ); } List items = battlePage.getContent().stream() @@ -126,9 +174,11 @@ public BattleListResponse getBattles(int page, int size, String type) { } @Override + @Transactional public TodayBattleListResponse getTodayBattles() { - List battles = battleRepository.findByTargetDateAndStatusAndTypeAndDeletedAtIsNull( - LocalDate.now(), BattleStatus.PUBLISHED, BattleType.BATTLE); + LocalDate today = LocalDate.now(); + ensureTodayPicks(today, 5); + List battles = battleRepository.findByTargetDateAndStatusAndDeletedAtIsNull(today, BattleStatus.PUBLISHED); List limitedBattles = battles.stream() .limit(5) @@ -139,6 +189,17 @@ public TodayBattleListResponse getTodayBattles() { return new TodayBattleListResponse(items, items.size()); } + private void ensureTodayPicks(LocalDate today, int requiredCount) { + List todays = battleRepository.findTodayPicks(today, PageRequest.of(0, requiredCount)); + int missingCount = requiredCount - todays.size(); + if (missingCount <= 0) return; + + List candidates = battleRepository.findAutoAssignableTodayPicks(today, PageRequest.of(0, missingCount)); + for (Battle candidate : candidates) { + candidate.updateTargetDate(today); + } + } + @Override @Transactional(readOnly = true) public BattleUserDetailResponse getBattleDetail(Long battleId) { @@ -158,11 +219,11 @@ public BattleUserDetailResponse getBattleDetail(Long battleId) { UserBattleStatusResponse statusResponse = userBattleService.getUserBattleStatus(user, battle); UserBattleStep currentStep = statusResponse.step(); - Optional optionalVote = voteRepository.findByBattleIdAndUserIdWithOption(battleId, currentUserId); + Optional optionalVote = battleVoteRepository.findByBattleIdAndUserIdWithOption(battleId, currentUserId); VoteSide voteStatus = optionalVote - .map(vote -> { - if (vote.getPostVoteOption() != null) { - return vote.getPostVoteOption().getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; + .map(BattleVote -> { + if (BattleVote.getPostVoteOption() != null) { + return BattleVote.getPostVoteOption().getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; } return null; }) @@ -195,7 +256,7 @@ public UserBattleStatusResponse getUserBattleStatus(Long battleId) { @Override @Transactional - public BattleVoteResponse vote(Long battleId, Long optionId) { + public BattleVoteResponse BattleVote(Long battleId, Long optionId) { Battle battle = findById(battleId); BattleOption newOption = battleOptionRepository.findById(optionId) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); @@ -204,7 +265,7 @@ public BattleVoteResponse vote(Long battleId, Long optionId) { User user = userRepository.findById(currentUserId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - voteRepository.save(Vote.builder() + battleVoteRepository.save(BattleVote.builder() .user(user) .battle(battle) .preVoteOption(newOption) @@ -232,29 +293,46 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, User admin = userRepository.findById(adminUserId == null ? 1L : adminUserId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Battle battle = battleRepository.save(battleConverter.toEntity(request, admin)); + validateBattleOptionCount(request.options()); + + String resolvedThumbnailKey = resolveStoredImageKey(request.thumbnailUrl(), request.status(), FileCategory.BATTLE); + Battle battle = battleConverter.toEntity(request, admin); + battle.update( + request.title(), + request.summary(), + request.description(), + resolvedThumbnailKey, + request.status() + ); + battle = battleRepository.save(battle); if (request.tagIds() != null) { saveBattleTags(battle, request.tagIds().stream().distinct().toList()); } List savedOptions = new ArrayList<>(); - for (var optionRequest : request.options()) { - BattleOption option = battleOptionRepository.save(BattleOption.builder() - .battle(battle) - .label(optionRequest.label()) - .title(optionRequest.title()) - .stance(optionRequest.stance()) - .representative(optionRequest.representative()) - .quote(optionRequest.quote()) - .imageUrl(optionRequest.imageUrl()) - .isCorrect(optionRequest.isCorrect()) - .build()); - - if (optionRequest.tagIds() != null) { - saveBattleOptionTags(option, optionRequest.tagIds().stream().distinct().toList()); + if (request.options() != null) { + for (AdminBattleOptionRequest optionRequest : request.options()) { + String resolvedImageKey = resolveStoredImageKey( + optionRequest.imageUrl(), + request.status(), + FileCategory.PHILOSOPHER + ); + BattleOption option = BattleOption.builder() + .battle(battle) + .label(optionRequest.label()) + .title(optionRequest.title()) + .stance(optionRequest.stance()) + .representative(optionRequest.representative()) + .imageUrl(resolvedImageKey) + .build(); + option = battleOptionRepository.save(option); + + if (optionRequest.tagIds() != null) { + saveBattleOptionTags(option, optionRequest.tagIds().stream().distinct().toList()); + } + savedOptions.add(option); } - savedOptions.add(option); } Map> optionTagsMap = battleOptionTagRepository.findByBattleWithTags(battle) @@ -267,21 +345,41 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), savedOptions, optionTagsMap); } + @Override + @Transactional(readOnly = true) + @PreAuthorize("hasRole('ADMIN')") + public AdminBattleDetailResponse getAdminBattleDetail(Long battleId) { + Battle battle = findById(battleId); + List options = battleOptionRepository.findByBattle(battle); + Map> optionTagsMap = battleOptionTagRepository.findByBattleWithTags(battle) + .stream() + .collect(Collectors.groupingBy( + bot -> bot.getBattleOption().getId(), + Collectors.mapping(BattleOptionTag::getTag, Collectors.toList()) + )); + + return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), options, optionTagsMap); + } + @Override @Transactional @PreAuthorize("hasRole('ADMIN')") public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request) { Battle battle = findById(battleId); + validateBattleOptionCount(request.options()); - if (battle.getThumbnailUrl() != null && !battle.getThumbnailUrl().equals(request.thumbnailUrl())) { - s3UploadService.deleteFile(battle.getThumbnailUrl()); + String existingThumbnailKey = normalizeStoredImageReference(battle.getThumbnailUrl(), FileCategory.BATTLE); + String resolvedThumbnailKey = resolveStoredImageKey(request.thumbnailUrl(), request.status(), FileCategory.BATTLE); + if (existingThumbnailKey != null && !existingThumbnailKey.equals(resolvedThumbnailKey)) { + deleteStoredAsset(existingThumbnailKey); } battle.update( - request.title(), request.titlePrefix(), request.titleSuffix(), - request.itemA(), request.itemADesc(), request.itemB(), request.itemBDesc(), - request.summary(), request.description(), request.thumbnailUrl(), - request.targetDate(), request.audioDuration(), request.status() + request.title(), + request.summary(), + request.description(), + resolvedThumbnailKey, + request.status() ); if (request.tagIds() != null) { @@ -292,17 +390,56 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe if (request.options() != null) { List existingOptions = battleOptionRepository.findByBattle(battle); - for (var optionRequest : request.options()) { - existingOptions.stream() - .filter(option -> option.getLabel() == optionRequest.label()) - .findFirst() - .ifPresent(option -> { - if (option.getImageUrl() != null && !option.getImageUrl().equals(optionRequest.imageUrl())) { - s3UploadService.deleteFile(option.getImageUrl()); - } - option.update(optionRequest.title(), optionRequest.stance(), - optionRequest.representative(), optionRequest.quote(), optionRequest.imageUrl(), optionRequest.isCorrect()); - }); + Map existingOptionMap = existingOptions.stream() + .collect(Collectors.toMap(BattleOption::getLabel, option -> option)); + + Set requestedLabels = new HashSet<>(); + + for (AdminBattleOptionRequest optionRequest : request.options()) { + requestedLabels.add(optionRequest.label()); + + BattleOption option = existingOptionMap.get(optionRequest.label()); + String resolvedOptionImageKey = resolveStoredImageKey( + optionRequest.imageUrl(), + request.status(), + FileCategory.PHILOSOPHER + ); + if (option == null) { + option = BattleOption.builder() + .battle(battle) + .label(optionRequest.label()) + .title(optionRequest.title()) + .stance(optionRequest.stance()) + .representative(optionRequest.representative()) + .imageUrl(resolvedOptionImageKey) + .build(); + option = battleOptionRepository.save(option); + } else { + String existingOptionImageKey = normalizeStoredImageReference(option.getImageUrl(), FileCategory.PHILOSOPHER); + if (existingOptionImageKey != null && !existingOptionImageKey.equals(resolvedOptionImageKey)) { + deleteStoredAsset(existingOptionImageKey); + } + option.update(optionRequest.title(), optionRequest.stance(), + optionRequest.representative(), resolvedOptionImageKey); + } + + replaceBattleOptionTags(option, optionRequest.tagIds()); + } + + List removedOptions = existingOptions.stream() + .filter(existing -> !requestedLabels.contains(existing.getLabel())) + .toList(); + + for (BattleOption removedOption : removedOptions) { + deleteStoredAsset(removedOption.getImageUrl()); + List optionTags = battleOptionTagRepository.findByBattleOption(removedOption); + if (!optionTags.isEmpty()) { + battleOptionTagRepository.deleteAll(optionTags); + } + } + + if (!removedOptions.isEmpty()) { + battleOptionRepository.deleteAll(removedOptions); } } @@ -355,6 +492,7 @@ private List getTagsByBattle(Battle battle) { private void saveBattleTags(Battle battle, List ids) { tagRepository.findAllById(ids).stream() .filter(tag -> tag.getDeletedAt() == null) + .filter(tag -> tag.getType() == TagType.CATEGORY) .forEach(tag -> battleTagRepository.save( BattleTag.builder().battle(battle).tag(tag).build())); } @@ -362,10 +500,22 @@ private void saveBattleTags(Battle battle, List ids) { private void saveBattleOptionTags(BattleOption option, List tagIds) { tagRepository.findAllById(tagIds).stream() .filter(tag -> tag.getDeletedAt() == null) + .filter(tag -> tag.getType() == TagType.PHILOSOPHER || tag.getType() == TagType.VALUE) .forEach(tag -> battleOptionTagRepository.save( BattleOptionTag.builder().battleOption(option).tag(tag).build())); } + private void replaceBattleOptionTags(BattleOption option, List tagIds) { + if (tagIds == null) return; + + List existingTags = battleOptionTagRepository.findByBattleOption(option); + if (!existingTags.isEmpty()) { + battleOptionTagRepository.deleteAll(existingTags); + } + + saveBattleOptionTags(option, tagIds.stream().distinct().toList()); + } + @Override public BattleOption findOptionById(Long optionId) { return battleOptionRepository.findById(optionId) @@ -378,4 +528,95 @@ public BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabe return battleOptionRepository.findByBattleAndLabel(battle, label) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); } -} \ No newline at end of file + + private String resolveStoredImageKey(String rawReference, BattleStatus targetStatus, FileCategory fallbackCategory) { + String normalized = normalizeStoredImageReference(rawReference, fallbackCategory); + if (normalized == null) { + return null; + } + if (targetStatus == BattleStatus.PUBLISHED && localDraftFileStorageService.isLocalDraftReference(normalized)) { + return localDraftFileStorageService.promoteLocalDraftToS3(normalized, fallbackCategory, s3UploadService); + } + return normalized; + } + + private String normalizeStoredImageReference(String rawReference, FileCategory fallbackCategory) { + if (rawReference == null || rawReference.isBlank()) { + return null; + } + + String trimmed = rawReference.trim(); + String localNormalized = localDraftFileStorageService.normalizeLocalDraftKey(trimmed); + if (localDraftFileStorageService.isLocalDraftReference(localNormalized)) { + return localNormalized; + } + + String path = extractPath(trimmed); + Matcher matcher = RESOURCE_IMAGE_PATH_PATTERN.matcher(path); + if (matcher.find()) { + String categoryName = matcher.group(1); + String fileName = matcher.group(2); + try { + FileCategory category = FileCategory.valueOf(categoryName); + return category.getPath() + "/" + fileName; + } catch (IllegalArgumentException ignored) { + if (fallbackCategory != null) { + return fallbackCategory.getPath() + "/" + fileName; + } + } + } + + return trimmed; + } + + private String extractPath(String value) { + if (value.startsWith("http://") || value.startsWith("https://")) { + try { + URI uri = URI.create(value); + return uri.getPath(); + } catch (IllegalArgumentException ignored) { + return value; + } + } + return value; + } + + private void deleteStoredAsset(String rawReference) { + String normalized = normalizeStoredImageReference(rawReference, null); + if (normalized == null) { + return; + } + + if (localDraftFileStorageService.isLocalDraftReference(normalized)) { + localDraftFileStorageService.deleteIfLocalReference(normalized); + return; + } + + s3UploadService.deleteFile(normalized); + } + + private BattleStatus parseBattleStatus(String status) { + if (status == null || status.isBlank() || "ALL".equalsIgnoreCase(status)) { + return null; + } + + try { + return BattleStatus.valueOf(status.trim().toUpperCase()); + } catch (IllegalArgumentException e) { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + private void validateBattleOptionCount(List options) { + if (options == null) { + throw new CustomException(ErrorCode.BATTLE_INVALID_OPTION_COUNT); + } + int count = options.size(); + if (count < 2 || count > 4) { + throw new CustomException(ErrorCode.BATTLE_INVALID_OPTION_COUNT); + } + } +} + + + diff --git a/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java b/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java index 2cfddac7..e466fb6a 100644 --- a/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java +++ b/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "홈 API", description = "홈 화면 집계 조회") +@Tag(name = "홈 API", description = "홈 화면 데이터 조회") @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") @@ -19,7 +19,7 @@ public class HomeController { private final HomeService homeService; - @Operation(summary = "홈 화면 집계 조회") + @Operation(summary = "홈 화면 데이터 조회") @GetMapping("/home") public ApiResponse getHome(@AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(homeService.getHome(userId)); diff --git a/src/main/java/com/swyp/picke/domain/home/service/HomeService.java b/src/main/java/com/swyp/picke/domain/home/service/HomeService.java index 6aa4f55b..4d3082cd 100644 --- a/src/main/java/com/swyp/picke/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/picke/domain/home/service/HomeService.java @@ -1,30 +1,47 @@ package com.swyp.picke.domain.home.service; -import com.swyp.picke.domain.battle.dto.response.BattleTagResponse; import com.swyp.picke.domain.battle.dto.response.TodayBattleResponse; import com.swyp.picke.domain.battle.dto.response.TodayOptionResponse; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.battle.enums.BattleType; -import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.domain.home.dto.response.*; +import com.swyp.picke.domain.home.dto.response.HomeBestBattleResponse; +import com.swyp.picke.domain.home.dto.response.HomeEditorPickResponse; +import com.swyp.picke.domain.home.dto.response.HomeNewBattleResponse; +import com.swyp.picke.domain.home.dto.response.HomeResponse; +import com.swyp.picke.domain.home.dto.response.HomeTodayQuizResponse; +import com.swyp.picke.domain.home.dto.response.HomeTodayVoteOptionResponse; +import com.swyp.picke.domain.home.dto.response.HomeTodayVoteResponse; +import com.swyp.picke.domain.home.dto.response.HomeTrendingResponse; import com.swyp.picke.domain.notification.enums.NotificationCategory; import com.swyp.picke.domain.notification.service.NotificationService; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.service.PollService; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import com.swyp.picke.domain.quiz.service.QuizService; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - +import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.Optional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class HomeService { + private static final int HOME_TODAY_PICK_LIMIT = 1; + private static final String QUIZ_SUMMARY = "왼쪽과 오른쪽 중 정답을 선택하세요"; + private static final String POLL_SUMMARY = "빈칸에 들어갈 가장 적절한 답을 골라주세요"; + private final BattleService battleService; + private final QuizService quizService; + private final PollService pollService; private final NotificationService notificationService; private final S3PresignedUrlService s3PresignedUrlService; @@ -33,15 +50,15 @@ public HomeResponse getHome(Long userId) { if (userId != null) { newNotice = notificationService.hasNewBroadcast(userId, NotificationCategory.NOTICE); } - // DB 쿼리 단계에서 LIMIT을 걸어 필요한 개수만 깔끔하게 조회! - List editorPickRaw = battleService.getEditorPicks(10); - List trendingRaw = battleService.getTrendingBattles(4); - List bestRaw = battleService.getBestBattles(3); - List voteRaw = battleService.getTodayPicks(BattleType.VOTE, 1); - List quizRaw = battleService.getTodayPicks(BattleType.QUIZ, 1); - List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw, voteRaw, quizRaw); - List newRaw = battleService.getNewBattles(excludeIds, 3); + List editorPickRaw = battleService.getEditorPicks(); + List trendingRaw = battleService.getTrendingBattles(); + List bestRaw = battleService.getBestBattles(); + List quizRaw = quizService.getTodayPicks(HOME_TODAY_PICK_LIMIT); + List pollRaw = pollService.getTodayPicks(HOME_TODAY_PICK_LIMIT); + + List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw); + List newRaw = battleService.getNewBattles(excludeIds); return new HomeResponse( newNotice, @@ -49,131 +66,145 @@ public HomeResponse getHome(Long userId) { trendingRaw.stream().map(this::toTrending).toList(), bestRaw.stream().map(this::toBestBattle).toList(), quizRaw.stream().map(this::toTodayQuiz).toList(), - voteRaw.stream().map(this::toTodayVote).toList(), + pollRaw.stream().map(this::toTodayVote).toList(), newRaw.stream().map(this::toNewBattle).toList() ); } - // 에디터픽 썸네일 Presigned URL 적용 - private HomeEditorPickResponse toEditorPick(TodayBattleResponse b) { - String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); - String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); - - String secureThumb = b.thumbnailUrl(); - + private HomeEditorPickResponse toEditorPick(TodayBattleResponse battle) { return new HomeEditorPickResponse( - b.battleId(), secureThumb, - optionA, optionB, - b.title(), b.summary(), - b.tags(), b.viewCount() + battle.battleId(), + battle.thumbnailUrl(), + findOptionTitle(battle.options(), BattleOptionLabel.A), + findOptionTitle(battle.options(), BattleOptionLabel.B), + battle.title(), + battle.summary(), + battle.tags(), + battle.viewCount() ); } - private HomeTrendingResponse toTrending(TodayBattleResponse b) { + private HomeTrendingResponse toTrending(TodayBattleResponse battle) { return new HomeTrendingResponse( - b.battleId(), b.thumbnailUrl(), - b.title(), b.tags(), - b.audioDuration(), b.viewCount() + battle.battleId(), + battle.thumbnailUrl(), + battle.title(), + battle.tags(), + battle.audioDuration(), + battle.viewCount() ); } - private HomeBestBattleResponse toBestBattle(TodayBattleResponse b) { - String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); - String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); - + private HomeBestBattleResponse toBestBattle(TodayBattleResponse battle) { return new HomeBestBattleResponse( - b.battleId(), - philoA, philoB, - b.title(), b.tags(), - b.audioDuration(), b.viewCount() + battle.battleId(), + findOptionRepresentative(battle.options(), BattleOptionLabel.A), + findOptionRepresentative(battle.options(), BattleOptionLabel.B), + battle.title(), + battle.tags(), + battle.audioDuration(), + battle.viewCount() ); } - private HomeTodayQuizResponse toTodayQuiz(TodayBattleResponse b) { + private HomeTodayQuizResponse toTodayQuiz(Quiz quiz) { + List options = quizService.getOptions(quiz); + long participantsCount = quizService.countVotes(quiz); + + QuizOption optionA = findQuizOption(options, QuizOptionLabel.A); + QuizOption optionB = findQuizOption(options, QuizOptionLabel.B); + return new HomeTodayQuizResponse( - b.battleId(), b.title(), b.summary(), - b.participantsCount(), - b.itemA(), b.itemADesc(), - findOptionIsCorrect(b.options(), BattleOptionLabel.A), - b.itemB(), b.itemBDesc(), - findOptionIsCorrect(b.options(), BattleOptionLabel.B) + quiz.getId(), + quiz.getTitle(), + QUIZ_SUMMARY, + participantsCount, + optionA != null ? optionA.getText() : null, + optionA != null ? optionA.getDetailText() : null, + false, + optionB != null ? optionB.getText() : null, + optionB != null ? optionB.getDetailText() : null, + false ); } - private HomeTodayVoteResponse toTodayVote(TodayBattleResponse b) { - List options = Optional.ofNullable(b.options()).orElse(List.of()).stream() - .map(o -> new HomeTodayVoteOptionResponse(o.label(), o.title())) + private HomeTodayVoteResponse toTodayVote(Poll poll) { + List options = pollService.getOptions(poll); + long participantsCount = pollService.countVotes(poll); + + List homeOptions = options.stream() + .sorted(Comparator + .comparing((PollOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(option -> option.getId() == null ? Long.MAX_VALUE : option.getId())) + .map(option -> new HomeTodayVoteOptionResponse( + BattleOptionLabel.valueOf(option.getLabel().name()), + option.getTitle() + )) .toList(); + return new HomeTodayVoteResponse( - b.battleId(), - b.titlePrefix(), b.titleSuffix(), - b.summary(), b.participantsCount(), - options + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + POLL_SUMMARY, + participantsCount, + homeOptions ); } - // newBattle 썸네일 Presigned URL 적용 - private HomeNewBattleResponse toNewBattle(TodayBattleResponse b) { - String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); - String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); - - String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); - String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); - - String imageA = findRepresentativeImageUrl(b.options(), BattleOptionLabel.A); - String imageB = findRepresentativeImageUrl(b.options(), BattleOptionLabel.B); - + private HomeNewBattleResponse toNewBattle(TodayBattleResponse battle) { return new HomeNewBattleResponse( - b.battleId(), b.thumbnailUrl(), - b.title(), b.summary(), - philoA, optionA, imageA, - philoB, optionB, imageB, - b.tags(), b.audioDuration(), b.viewCount() + battle.battleId(), + battle.thumbnailUrl(), + battle.title(), + battle.summary(), + findOptionRepresentative(battle.options(), BattleOptionLabel.A), + findOptionTitle(battle.options(), BattleOptionLabel.A), + findRepresentativeImageUrl(battle.options(), BattleOptionLabel.A), + findOptionRepresentative(battle.options(), BattleOptionLabel.B), + findOptionTitle(battle.options(), BattleOptionLabel.B), + findRepresentativeImageUrl(battle.options(), BattleOptionLabel.B), + battle.tags(), + battle.audioDuration(), + battle.viewCount() ); } - private Boolean findOptionIsCorrect(List options, BattleOptionLabel label) { - return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) - .map(TodayOptionResponse::isCorrect) - .findFirst() - .map(Boolean.TRUE::equals) - .orElse(false); - } - private String findOptionTitle(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) + .filter(option -> option.label() == label) .map(TodayOptionResponse::title) .filter(Objects::nonNull) - .findFirst().orElse(null); + .findFirst() + .orElse(null); } - // 옵션에서 철학자 이름(Representative)을 추출하는 메서드 private String findOptionRepresentative(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) + .filter(option -> option.label() == label) .map(TodayOptionResponse::representative) .filter(Objects::nonNull) - .findFirst().orElse(null); - } - - private List findPhilosopherNames(List tags) { - return Optional.ofNullable(tags).orElse(List.of()).stream() - .filter(t -> t.type() == TagType.PHILOSOPHER) - .map(BattleTagResponse::name) - .toList(); + .findFirst() + .orElse(null); } private String findRepresentativeImageUrl(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) + .filter(option -> option.label() == label) .map(TodayOptionResponse::imageUrl) .filter(Objects::nonNull) .findFirst() .orElse(null); } + private QuizOption findQuizOption(List options, QuizOptionLabel label) { + return options.stream() + .filter(option -> option.getLabel() == label) + .findFirst() + .orElse(null); + } + @SafeVarargs private List collectBattleIds(List... groups) { return List.of(groups).stream() diff --git a/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java b/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java index b7150503..0ac93e0a 100644 --- a/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java +++ b/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java @@ -17,7 +17,7 @@ @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor -@Tag(name = "인증 (Auth)", description = "인증 API") +@Tag(name = "인증 API", description = "소셜 로그인, 토큰 재발급, 로그아웃, 회원 탈퇴") public class AuthController { private final AuthService authService; diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java index 76541533..c17eba4c 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "댓글 좋아요 (Comment Like)", description = "댓글 좋아요 등록, 취소 API") +@Tag(name = "댓글 좋아요 API", description = "댓글 좋아요 등록 및 취소") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -28,7 +28,7 @@ public ApiResponse addLike(@PathVariable Long commentId, return ApiResponse.onSuccess(commentLikeService.addLike(commentId, userId)); } - @Operation(summary = "댓글 좋아요 취소", description = "특정 댓글에 등록한 좋아요를 취소합니다.") + @Operation(summary = "댓글 좋아요 취소", description = "특정 댓글의 좋아요를 취소합니다.") @DeleteMapping("/comments/{commentId}/likes") public ApiResponse removeLike(@PathVariable Long commentId, @AuthenticationPrincipal Long userId) { diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java index d702d8aa..728a7fea 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 댓글 (Comment)", description = "관점 댓글 생성, 조회, 수정, 삭제 API") +@Tag(name = "관점 댓글 API", description = "관점 댓글 생성, 조회, 수정, 삭제") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -51,7 +51,7 @@ public ApiResponse getComments( return ApiResponse.onSuccess(commentService.getComments(perspectiveId, userId, cursor, size)); } - @Operation(summary = "댓글 목록 조회 (옵션 라벨)", description = "특정 관점의 댓글 목록을 커서 기반 페이지네이션으로 조회합니다. stance는 투표한 옵션의 라벨(A/B)로 반환됩니다.") + @Operation(summary = "댓글 목록 조회 (옵션 라벨)", description = "특정 관점의 댓글 목록을 커서 기반 페이지네이션으로 조회하며, stance를 투표한 옵션 라벨(A/B)로 반환합니다.") @GetMapping("/perspectives/{perspectiveId}/comments/labeled") public ApiResponse getCommentsWithLabel( @PathVariable Long perspectiveId, @@ -73,7 +73,7 @@ public ApiResponse deleteComment( return ApiResponse.onSuccess(null); } - @Operation(summary = "댓글 수정", description = "본인이 작성한 댓글의 내용을 수정합니다.") + @Operation(summary = "댓글 수정", description = "본인이 작성한 댓글 내용을 수정합니다.") @PatchMapping("/perspectives/{perspectiveId}/comments/{commentId}") public ApiResponse updateComment( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java index 545f8146..03c9aa3f 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 (Perspective)", description = "관점 생성, 조회, 수정, 삭제 API") +@Tag(name = "관점 API", description = "관점 생성, 조회, 수정, 삭제") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -32,7 +32,7 @@ public class PerspectiveController { private final PerspectiveService perspectiveService; - @Operation(summary = "관점 단건 조회", description = "특정 관점의 상세 정보를 조회합니다.") + @Operation(summary = "관점 상세 조회", description = "특정 관점의 상세 정보를 조회합니다.") @GetMapping("/perspectives/{perspectiveId}") public ApiResponse getPerspectiveDetail( @PathVariable Long perspectiveId, @@ -40,8 +40,7 @@ public ApiResponse getPerspectiveDetail( return ApiResponse.onSuccess(perspectiveService.getPerspectiveDetail(perspectiveId, userId)); } - // TODO: Prevote 의 여부를 Vote 도메인 개발 이후 교체 - @Operation(summary = "관점 생성", description = "특정 배틀에 대한 관점을 생성합니다. 사전 투표가 완료된 경우에만 가능합니다.") + @Operation(summary = "관점 생성", description = "특정 배틀에 대한 사용자 관점을 생성합니다.") @PostMapping("/battles/{battleId}/perspectives") public ApiResponse createPerspective( @PathVariable Long battleId, @@ -51,7 +50,7 @@ public ApiResponse createPerspective( return ApiResponse.onSuccess(perspectiveService.createPerspective(battleId, userId, request)); } - @Operation(summary = "관점 리스트 조회", description = "특정 배틀의 관점 목록을 커서 기반 페이지네이션으로 조회합니다. optionLabel(A/B)로 필터링, sort(latest/popular)로 정렬 가능합니다.") + @Operation(summary = "관점 목록 조회", description = "특정 배틀의 관점 목록을 커서 기반으로 조회합니다.") @GetMapping("/battles/{battleId}/perspectives") public ApiResponse getPerspectives( @PathVariable Long battleId, @@ -64,7 +63,7 @@ public ApiResponse getPerspectives( return ApiResponse.onSuccess(perspectiveService.getPerspectives(battleId, userId, cursor, size, optionLabel, sort)); } - @Operation(summary = "내 관점 조회", description = "특정 배틀에서 내가 작성한 관점을 조회합니다. 상태(PENDING/PUBLISHED/REJECTED 등)와 무관하게 반환하며, 작성한 관점이 없으면 404를 반환합니다.") + @Operation(summary = "내 관점 조회", description = "해당 배틀에서 본인이 작성한 관점을 조회합니다.") @GetMapping("/battles/{battleId}/perspectives/me") public ApiResponse getMyPerspective( @PathVariable Long battleId, @@ -81,7 +80,7 @@ public ApiResponse deletePerspective( return ApiResponse.onSuccess(null); } - @Operation(summary = "관점 검수 재시도", description = "검수 실패(MODERATION_FAILED) 상태의 관점에 대해 GPT 검수를 다시 요청합니다.") + @Operation(summary = "관점 검수 재요청", description = "검수 실패 상태의 관점에 대해 검수를 다시 요청합니다.") @PostMapping("/perspectives/{perspectiveId}/moderation/retry") public ApiResponse retryModeration( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java index 75a6a1b4..7e090575 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 좋아요 (Like)", description = "관점 좋아요 조회, 등록, 취소 API") +@Tag(name = "관점 좋아요 API", description = "관점 좋아요 조회, 등록, 취소") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -37,7 +37,7 @@ public ApiResponse addLike( return ApiResponse.onSuccess(likeService.addLike(perspectiveId, userId)); } - @Operation(summary = "좋아요 취소", description = "특정 관점에 등록한 좋아요를 취소합니다.") + @Operation(summary = "좋아요 취소", description = "특정 관점의 좋아요를 취소합니다.") @DeleteMapping("/perspectives/{perspectiveId}/likes") public ApiResponse removeLike( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java index 438cc00f..eb227348 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "신고 (Report)", description = "관점/댓글 신고 API") +@Tag(name = "신고 API", description = "관점/댓글 신고") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor diff --git a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java index ac225705..c7808893 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java +++ b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java @@ -17,7 +17,7 @@ import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.service.UserService; -import com.swyp.picke.domain.vote.service.VoteService; +import com.swyp.picke.domain.vote.service.BattleVoteService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; @@ -41,7 +41,7 @@ public class PerspectiveCommentService { private final UserRepository userRepository; private final CommentLikeRepository commentLikeRepository; private final UserService userQueryService; - private final VoteService voteService; + private final BattleVoteService BattleVoteService; private final BattleService battleService; private final S3PresignedUrlService s3PresignedUrlService; @@ -62,7 +62,7 @@ public CreateCommentResponse createComment(Long perspectiveId, Long userId, Crea UserSummary userSummary = userQueryService.findSummaryById(userId); String characterImageUrl = resolveCharacterImageUrl(userSummary.characterType()); - Long postVoteOptionId = voteService.findPostVoteOptionId(perspective.getBattle().getId(), userId); + Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(perspective.getBattle().getId(), userId); String stance = null; if (postVoteOptionId != null) { stance = battleService.findOptionById(postVoteOptionId).getStance(); @@ -96,7 +96,7 @@ public CommentListResponse getComments(Long perspectiveId, Long userId, String c .map(c -> { UserSummary user = userQueryService.findSummaryById(c.getUser().getId()); String characterImageUrl = resolveCharacterImageUrl(user.characterType()); - Long postVoteOptionId = voteService.findPostVoteOptionId(battleId, c.getUser().getId()); + Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(battleId, c.getUser().getId()); String stance = null; if (postVoteOptionId != null) { BattleOption option = battleService.findOptionById(postVoteOptionId); @@ -140,7 +140,7 @@ public CommentListResponse getCommentsWithLabel(Long perspectiveId, Long userId, .map(c -> { UserSummary user = userQueryService.findSummaryById(c.getUser().getId()); String characterImageUrl = resolveCharacterImageUrl(user.characterType()); - Long postVoteOptionId = voteService.findPostVoteOptionId(battleId, c.getUser().getId()); + Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(battleId, c.getUser().getId()); String stance = null; if (postVoteOptionId != null) { BattleOption option = battleService.findOptionById(postVoteOptionId); @@ -209,4 +209,4 @@ private String resolveCharacterImageUrl(String characterType) { } return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java index e366aa63..ed8d596c 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java @@ -21,7 +21,7 @@ import com.swyp.picke.domain.user.dto.response.UserSummary; import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.service.UserService; -import com.swyp.picke.domain.vote.service.VoteService; +import com.swyp.picke.domain.vote.service.BattleVoteService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; @@ -44,7 +44,7 @@ public class PerspectiveService { private final PerspectiveCommentRepository perspectiveCommentRepository; private final PerspectiveLikeRepository perspectiveLikeRepository; private final BattleService battleService; - private final VoteService voteService; + private final BattleVoteService BattleVoteService; private final UserService userQueryService; private final UserRepository userRepository; private final GptModerationService gptModerationService; @@ -82,7 +82,7 @@ public CreatePerspectiveResponse createPerspective(Long battleId, Long userId, C throw new CustomException(ErrorCode.PERSPECTIVE_ALREADY_EXISTS); } - BattleOption option = voteService.findPreVoteOption(battleId, userId); + BattleOption option = BattleVoteService.findPreVoteOption(battleId, userId); Perspective perspective = Perspective.builder() .battle(battle) @@ -217,4 +217,4 @@ private String resolveCharacterImageUrl(String characterType) { } return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java b/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java new file mode 100644 index 00000000..97344834 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java @@ -0,0 +1,38 @@ +package com.swyp.picke.domain.poll.controller; + +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.service.PollService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "투표 콘텐츠 API", description = "투표 콘텐츠 조회") +@RestController +@RequestMapping("/api/v1/polls") +@RequiredArgsConstructor +public class PollController { + + private final PollService pollService; + + @Operation(summary = "투표 콘텐츠 목록 조회") + @GetMapping + public ApiResponse getPolls( + @RequestParam(value = "page", defaultValue = "1") int page, + @RequestParam(value = "size", defaultValue = "10") int size + ) { + return ApiResponse.onSuccess(pollService.getPolls(page, size)); + } + + @Operation(summary = "투표 콘텐츠 상세 조회") + @GetMapping("/{pollId}") + public ApiResponse getPollDetail(@PathVariable Long pollId) { + return ApiResponse.onSuccess(pollService.getPollDetail(pollId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java b/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java new file mode 100644 index 00000000..03d74fec --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java @@ -0,0 +1,85 @@ +package com.swyp.picke.domain.poll.converter; + +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.dto.response.PollOptionResponse; +import com.swyp.picke.domain.poll.dto.response.PollSimpleResponse; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import java.util.Comparator; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Component; + +@Component +public class PollConverter { + + private static final Comparator OPTION_SORTER = + Comparator.comparing((PollOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(PollOption::getId); + + public Poll toEntity(AdminPollCreateRequest request) { + return Poll.builder() + .titlePrefix(request.titlePrefix()) + .titleSuffix(request.titleSuffix()) + .status(request.status()) + .build(); + } + + public PollListResponse toListResponse(Page pollPage) { + List items = pollPage.getContent().stream() + .map(this::toSimpleResponse) + .toList(); + return new PollListResponse(items, pollPage.getNumber() + 1, pollPage.getTotalPages(), pollPage.getTotalElements()); + } + + public PollSimpleResponse toSimpleResponse(Poll poll) { + return new PollSimpleResponse( + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + poll.getStatus() + ); + } + + public AdminPollDetailResponse toAdminDetailResponse(Poll poll, List options) { + return new AdminPollDetailResponse( + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + poll.getTargetDate(), + poll.getStatus(), + toOptionResponses(options) + ); + } + + public PollDetailResponse toDetailResponse(Poll poll, List options) { + return new PollDetailResponse( + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + poll.getTargetDate(), + poll.getStatus(), + toOptionResponses(options) + ); + } + + private List toOptionResponses(List options) { + if (options == null) { + return List.of(); + } + return options.stream() + .sorted(OPTION_SORTER) + .map(option -> new PollOptionResponse( + option.getId(), + option.getLabel(), + option.getTitle(), + option.getDisplayOrder(), + option.getVoteCount() + )) + .toList(); + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java new file mode 100644 index 00000000..04f4db50 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.poll.enums.PollStatus; +import java.time.LocalDate; +import java.util.List; + +public record PollDetailResponse( + Long pollId, + String titlePrefix, + String titleSuffix, + LocalDate targetDate, + PollStatus status, + List options +) {} diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java new file mode 100644 index 00000000..76f89133 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.poll.dto.response; + +import java.util.List; + +public record PollListResponse( + List items, + int page, + int totalPages, + long totalElements +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java new file mode 100644 index 00000000..b619a55f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.poll.enums.PollOptionLabel; + +public record PollOptionResponse( + Long optionId, + PollOptionLabel label, + String title, + Integer displayOrder, + Long voteCount +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java new file mode 100644 index 00000000..de4a34e2 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.poll.enums.PollStatus; + +import java.time.LocalDateTime; + +public record PollSimpleResponse( + Long pollId, + String titlePrefix, + String titleSuffix, + PollStatus status +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java new file mode 100644 index 00000000..4c334ae8 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.tag.enums.TagType; + +public record PollTagResponse( + Long tagId, + String name, + TagType type +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java b/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java new file mode 100644 index 00000000..447a9081 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java @@ -0,0 +1,70 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.poll.enums.PollStatus; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Getter +@Entity +@Table(name = "poll_contents") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Poll extends BaseEntity { + + @Column(name = "title_prefix", nullable = false, length = 200) + private String titlePrefix; + + @Column(name = "title_suffix", length = 200) + private String titleSuffix; + + @Column(name = "target_date") + private LocalDate targetDate; + + @Column(name = "total_participants_count", nullable = false) + private Long totalParticipantsCount; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private PollStatus status; + + @OneToMany(mappedBy = "poll", cascade = CascadeType.ALL, orphanRemoval = true) + private final List options = new ArrayList<>(); + + @Builder + public Poll(String titlePrefix, String titleSuffix, LocalDate targetDate, PollStatus status) { + this.titlePrefix = titlePrefix; + this.titleSuffix = titleSuffix; + this.targetDate = targetDate; + this.status = status; + this.totalParticipantsCount = 0L; + } + + public void update(String titlePrefix, String titleSuffix, LocalDate targetDate, PollStatus status) { + if (titlePrefix != null) this.titlePrefix = titlePrefix; + if (titleSuffix != null) this.titleSuffix = titleSuffix; + if (targetDate != null) this.targetDate = targetDate; + if (status != null) this.status = status; + } + + public void increaseTotalParticipantsCount() { + this.totalParticipantsCount = (this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount) + 1L; + } + + public void decreaseTotalParticipantsCount() { + long current = this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount; + this.totalParticipantsCount = Math.max(0L, current - 1L); + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java new file mode 100644 index 00000000..c0f86e9b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java @@ -0,0 +1,65 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.poll.enums.PollOptionLabel; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_options") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollOption extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 10) + private PollOptionLabel label; + + @Column(nullable = false, length = 200) + private String title; + + @Column(name = "display_order", nullable = false) + private Integer displayOrder; + + @Column(name = "vote_count", nullable = false) + private Long voteCount; + + @Builder + public PollOption(Poll poll, PollOptionLabel label, String title, Integer displayOrder, Long voteCount) { + this.poll = poll; + this.label = label; + this.title = title; + this.displayOrder = displayOrder; + this.voteCount = voteCount == null ? 0L : voteCount; + } + + + public void update(String title) { + if (title != null) this.title = title; + if (displayOrder != null) this.displayOrder = displayOrder; + } + + public void increaseVoteCount() { + this.voteCount = (this.voteCount == null ? 0L : this.voteCount) + 1; + } + + public void decreaseVoteCount() { + if (this.voteCount != null && this.voteCount > 0) { + this.voteCount--; + } + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java new file mode 100644 index 00000000..e148a80c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.tag.entity.ValueTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_option_value_tags") +@IdClass(PollOptionValueTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollOptionValueTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_option_id", nullable = false) + private PollOption pollOption; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "value_tag_id", nullable = false) + private ValueTag valueTag; + + @Builder + public PollOptionValueTagMap(PollOption pollOption, ValueTag valueTag) { + this.pollOption = pollOption; + this.valueTag = valueTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java new file mode 100644 index 00000000..627f6ab4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.poll.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class PollOptionValueTagMapId implements Serializable { + private Long pollOption; + private Long valueTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java new file mode 100644 index 00000000..1220879c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.tag.entity.CategoryTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_tags") +@IdClass(PollTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "category_tag_id", nullable = false) + private CategoryTag categoryTag; + + @Builder + public PollTagMap(Poll poll, CategoryTag categoryTag) { + this.poll = poll; + this.categoryTag = categoryTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java new file mode 100644 index 00000000..29263b1f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.poll.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class PollTagMapId implements Serializable { + private Long poll; + private Long categoryTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java new file mode 100644 index 00000000..15502d92 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java @@ -0,0 +1,43 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_user_votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollUserVote extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "option_id", nullable = false) + private PollOption selectedOption; + + @Builder + public PollUserVote(User user, Poll poll, PollOption selectedOption) { + this.user = user; + this.poll = poll; + this.selectedOption = selectedOption; + } + + public void updateOption(PollOption option) { + this.selectedOption = option; + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java b/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java new file mode 100644 index 00000000..5dc3dc74 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java @@ -0,0 +1,5 @@ +package com.swyp.picke.domain.poll.enums; + +public enum PollOptionLabel { + A, B, C, D +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java b/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java new file mode 100644 index 00000000..49757284 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.poll.enums; + +public enum PollStatus { + PENDING, + PUBLISHED, + ARCHIVED +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java new file mode 100644 index 00000000..47e2e727 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.enums.PollOptionLabel; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface PollOptionRepository extends JpaRepository { + List findByPollOrderByDisplayOrderAscLabelAscIdAsc(Poll poll); + Optional findByPollAndLabel(Poll poll, PollOptionLabel label); +} diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java new file mode 100644 index 00000000..1d9fcf9c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.entity.PollOptionValueTagMap; +import com.swyp.picke.domain.poll.entity.PollOptionValueTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface PollOptionValueTagMapRepository extends JpaRepository { + List findByPollOption(PollOption pollOption); + void deleteByPollOption(PollOption pollOption); +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java new file mode 100644 index 00000000..535eec6c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java @@ -0,0 +1,37 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.enums.PollStatus; +import java.time.LocalDate; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface PollRepository extends JpaRepository { + Page findAllByOrderByCreatedAtDesc(Pageable pageable); + + @Query("SELECT p FROM Poll p WHERE p.status = :status AND p.targetDate = :targetDate ORDER BY p.createdAt ASC") + List findTodayPicks( + @Param("status") PollStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); + + @Query(""" + SELECT p + FROM Poll p + WHERE p.status = :status + AND (p.targetDate IS NULL OR p.targetDate <> :targetDate) + ORDER BY CASE WHEN p.targetDate IS NULL THEN 0 ELSE 1 END, + p.targetDate ASC, + p.createdAt ASC + """) + List findAutoAssignableTodayPicks( + @Param("status") PollStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); +} diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java new file mode 100644 index 00000000..77e8e9da --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollTagMap; +import com.swyp.picke.domain.poll.entity.PollTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface PollTagMapRepository extends JpaRepository { + List findByPoll(Poll poll); + void deleteByPoll(Poll poll); +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java new file mode 100644 index 00000000..dd2039d9 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.entity.PollUserVote; +import com.swyp.picke.domain.user.entity.User; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PollUserVoteRepository extends JpaRepository { + Optional findByPollAndUser(Poll poll, User user); + long countByPoll(Poll poll); + long countByPollAndSelectedOption(Poll poll, PollOption selectedOption); + List findAllByPoll(Poll poll); +} diff --git a/src/main/java/com/swyp/picke/domain/poll/service/PollService.java b/src/main/java/com/swyp/picke/domain/poll/service/PollService.java new file mode 100644 index 00000000..9b64a0f3 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/service/PollService.java @@ -0,0 +1,35 @@ +package com.swyp.picke.domain.poll.service; + +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import java.util.List; + +public interface PollService { + Poll findById(Long pollId); + + PollListResponse getPolls(int page, int size); + + List getTodayPicks(int limit); + + List getOptions(Poll poll); + + long countVotes(Poll poll); + + PollDetailResponse getPollDetail(Long pollId); + + AdminPollDetailResponse getAdminPollDetail(Long pollId); + + AdminPollDetailResponse createPoll(AdminPollCreateRequest request); + + AdminPollDetailResponse updatePoll(Long pollId, AdminPollUpdateRequest request); + + AdminPollDeleteResponse deletePoll(Long pollId); +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java b/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java new file mode 100644 index 00000000..4d3f9958 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java @@ -0,0 +1,186 @@ +package com.swyp.picke.domain.poll.service; + +import com.swyp.picke.domain.poll.converter.PollConverter; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollOptionRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.enums.PollOptionLabel; +import com.swyp.picke.domain.poll.enums.PollStatus; +import com.swyp.picke.domain.poll.repository.PollOptionRepository; +import com.swyp.picke.domain.poll.repository.PollRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PollServiceImpl implements PollService { + + private final PollRepository pollRepository; + private final PollOptionRepository pollOptionRepository; + private final PollConverter pollConverter; + + @Override + public Poll findById(Long pollId) { + return pollRepository.findById(pollId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + } + + @Override + public PollListResponse getPolls(int page, int size) { + int pageNumber = Math.max(0, page - 1); + Page pollPage = pollRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(pageNumber, size)); + return pollConverter.toListResponse(pollPage); + } + + @Override + @Transactional + public List getTodayPicks(int limit) { + int safeLimit = Math.max(1, limit); + LocalDate today = LocalDate.now(); + + ensureTodayPicks(today, safeLimit); + return pollRepository.findTodayPicks(PollStatus.PUBLISHED, today, PageRequest.of(0, safeLimit)); + } + + @Override + public List getOptions(Poll poll) { + return pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + } + + @Override + public long countVotes(Poll poll) { + return poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); + } + + @Override + public PollDetailResponse getPollDetail(Long pollId) { + Poll poll = findById(pollId); + List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + return pollConverter.toDetailResponse(poll, options); + } + + @Override + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDetailResponse getAdminPollDetail(Long pollId) { + Poll poll = findById(pollId); + List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + return pollConverter.toAdminDetailResponse(poll, options); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDetailResponse createPoll(AdminPollCreateRequest request) { + Poll poll = pollConverter.toEntity(request); + poll = pollRepository.save(poll); + + List savedOptions = new ArrayList<>(); + if (request.options() != null) { + for (AdminPollOptionRequest optionRequest : request.options()) { + PollOption option = PollOption.builder() + .poll(poll) + .label(optionRequest.label()) + .title(optionRequest.title()) + .build(); + option = pollOptionRepository.save(option); + savedOptions.add(option); + } + } + + return pollConverter.toAdminDetailResponse(poll, savedOptions); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDetailResponse updatePoll(Long pollId, AdminPollUpdateRequest request) { + Poll poll = findById(pollId); + poll.update( + request.titlePrefix(), + request.titleSuffix(), + request.targetDate(), + request.status() + ); + + if (request.options() != null) { + List existingOptions = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + Map existingOptionMap = new HashMap<>(); + for (PollOption option : existingOptions) { + existingOptionMap.put(option.getLabel(), option); + } + + Set requestedLabels = new HashSet<>(); + for (AdminPollOptionRequest optionRequest : request.options()) { + requestedLabels.add(optionRequest.label()); + PollOption option = existingOptionMap.get(optionRequest.label()); + + if (option == null) { + option = PollOption.builder() + .poll(poll) + .label(optionRequest.label()) + .title(optionRequest.title()) + .build(); + option = pollOptionRepository.save(option); + } else { + option.update(optionRequest.title()); + } + } + + for (PollOption existingOption : existingOptions) { + if (requestedLabels.contains(existingOption.getLabel())) continue; + pollOptionRepository.delete(existingOption); + } + } + + return getAdminPollDetail(pollId); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDeleteResponse deletePoll(Long pollId) { + Poll poll = findById(pollId); + List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + pollOptionRepository.deleteAll(options); + pollRepository.delete(poll); + return new AdminPollDeleteResponse(true, LocalDateTime.now()); + } + + private void ensureTodayPicks(LocalDate today, int requiredCount) { + List todays = pollRepository.findTodayPicks(PollStatus.PUBLISHED, today, PageRequest.of(0, requiredCount)); + int missingCount = requiredCount - todays.size(); + if (missingCount <= 0) return; + + List candidates = pollRepository.findAutoAssignableTodayPicks( + PollStatus.PUBLISHED, + today, + PageRequest.of(0, missingCount) + ); + for (Poll candidate : candidates) { + candidate.update(null, null, today, null); + } + } +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java b/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java new file mode 100644 index 00000000..f290b147 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java @@ -0,0 +1,38 @@ +package com.swyp.picke.domain.quiz.controller; + +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.service.QuizService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "퀴즈 API", description = "퀴즈 콘텐츠 조회") +@RestController +@RequestMapping("/api/v1/quizzes") +@RequiredArgsConstructor +public class QuizController { + + private final QuizService quizService; + + @Operation(summary = "퀴즈 목록 조회") + @GetMapping + public ApiResponse getQuizzes( + @RequestParam(value = "page", defaultValue = "1") int page, + @RequestParam(value = "size", defaultValue = "10") int size + ) { + return ApiResponse.onSuccess(quizService.getQuizzes(page, size)); + } + + @Operation(summary = "퀴즈 상세 조회") + @GetMapping("/{quizId}") + public ApiResponse getQuizDetail(@PathVariable Long quizId) { + return ApiResponse.onSuccess(quizService.getQuizDetail(quizId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java b/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java new file mode 100644 index 00000000..bdcb8bbd --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java @@ -0,0 +1,85 @@ +package com.swyp.picke.domain.quiz.converter; + +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizOptionResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizSimpleResponse; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import java.util.Comparator; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Component; + +@Component +public class QuizConverter { + + private static final Comparator OPTION_SORTER = + Comparator.comparing((QuizOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(QuizOption::getId); + + public Quiz toEntity(AdminQuizCreateRequest request) { + return Quiz.builder() + .title(request.title()) + .status(request.status()) + .build(); + } + + public QuizListResponse toListResponse(Page quizPage) { + List items = quizPage.getContent().stream() + .map(this::toSimpleResponse) + .toList(); + return new QuizListResponse(items, quizPage.getNumber() + 1, quizPage.getTotalPages(), quizPage.getTotalElements()); + } + + public QuizSimpleResponse toSimpleResponse(Quiz quiz) { + return new QuizSimpleResponse( + quiz.getId(), + quiz.getTitle(), + quiz.getStatus(), + quiz.getCreatedAt() + ); + } + + public AdminQuizDetailResponse toAdminDetailResponse(Quiz quiz, List options) { + return new AdminQuizDetailResponse( + quiz.getId(), + quiz.getTitle(), + quiz.getTargetDate(), + quiz.getStatus(), + toOptionResponses(options) + ); + } + + public QuizDetailResponse toDetailResponse(Quiz quiz, List options) { + return new QuizDetailResponse( + quiz.getId(), + quiz.getTitle(), + quiz.getTargetDate(), + quiz.getStatus(), + toOptionResponses(options), + quiz.getCreatedAt(), + quiz.getUpdatedAt() + ); + } + + private List toOptionResponses(List options) { + if (options == null) { + return List.of(); + } + return options.stream() + .sorted(OPTION_SORTER) + .map(option -> new QuizOptionResponse( + option.getId(), + option.getLabel(), + option.getText(), + option.getDetailText(), + option.getIsCorrect(), + option.getDisplayOrder() + )) + .toList(); + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java new file mode 100644 index 00000000..c5409dec --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java @@ -0,0 +1,17 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +public record QuizDetailResponse( + Long quizId, + String title, + LocalDate targetDate, + QuizStatus status, + List options, + LocalDateTime createdAt, + LocalDateTime updatedAt +) { +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java new file mode 100644 index 00000000..ded527d5 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import java.util.List; + +public record QuizListResponse( + List items, + int page, + int totalPages, + long totalElements +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java new file mode 100644 index 00000000..5f83007b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; + +public record QuizOptionResponse( + Long optionId, + QuizOptionLabel label, + String text, + String detailText, + Boolean isCorrect, + Integer displayOrder +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java new file mode 100644 index 00000000..85556fc9 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; + +import java.time.LocalDateTime; + +public record QuizSimpleResponse( + Long quizId, + String title, + QuizStatus status, + LocalDateTime createdAt +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java new file mode 100644 index 00000000..b283ca95 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.tag.enums.TagType; + +public record QuizTagResponse( + Long tagId, + String name, + TagType type +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java b/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java new file mode 100644 index 00000000..aade8606 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java @@ -0,0 +1,65 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Getter +@Entity +@Table(name = "quizzes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Quiz extends BaseEntity { + + @Column(nullable = false, length = 200) + private String title; + + @Column(name = "target_date") + private LocalDate targetDate; + + @Column(name = "total_participants_count", nullable = false) + private Long totalParticipantsCount; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private QuizStatus status; + + @OneToMany(mappedBy = "quiz", cascade = CascadeType.ALL, orphanRemoval = true) + private final List options = new ArrayList<>(); + + @Builder + public Quiz(String title, LocalDate targetDate, QuizStatus status) { + this.title = title; + this.targetDate = targetDate; + this.status = status; + this.totalParticipantsCount = 0L; + } + + public void update(String title, LocalDate targetDate, QuizStatus status) { + if (title != null) this.title = title; + if (targetDate != null) this.targetDate = targetDate; + if (status != null) this.status = status; + } + + public void increaseTotalParticipantsCount() { + this.totalParticipantsCount = (this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount) + 1L; + } + + public void decreaseTotalParticipantsCount() { + long current = this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount; + this.totalParticipantsCount = Math.max(0L, current - 1L); + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java new file mode 100644 index 00000000..85fd73e0 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java @@ -0,0 +1,71 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_options") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizOption extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 10) + private QuizOptionLabel label; + + @Column(nullable = false, length = 300) + private String text; + + @Column(name = "detail_text", length = 1000) + private String detailText; + + @Column(name = "is_correct", nullable = false) + private Boolean isCorrect = false; + + @Column(name = "display_order", nullable = false) + private Integer displayOrder; + + @Builder + public QuizOption( + Quiz quiz, + QuizOptionLabel label, + String text, + String detailText, + Boolean isCorrect, + Integer displayOrder + ) { + this.quiz = quiz; + this.label = label; + this.text = text; + this.detailText = detailText; + this.isCorrect = (isCorrect != null) ? isCorrect : false; + this.displayOrder = displayOrder; + } + + void assignQuiz(Quiz quiz) { + this.quiz = quiz; + } + + public void update(String text, String detailText, Boolean isCorrect) { + if (text != null) this.text = text; + if (detailText != null) this.detailText = detailText; + if (isCorrect != null) this.isCorrect = isCorrect; + if (displayOrder != null) this.displayOrder = displayOrder; + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java new file mode 100644 index 00000000..43e94781 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.tag.entity.ValueTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_option_value_tags") +@IdClass(QuizOptionValueTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizOptionValueTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_option_id", nullable = false) + private QuizOption quizOption; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "value_tag_id", nullable = false) + private ValueTag valueTag; + + @Builder + public QuizOptionValueTagMap(QuizOption quizOption, ValueTag valueTag) { + this.quizOption = quizOption; + this.valueTag = valueTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java new file mode 100644 index 00000000..ce65910d --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.quiz.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class QuizOptionValueTagMapId implements Serializable { + private Long quizOption; + private Long valueTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java new file mode 100644 index 00000000..bb19afa4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.tag.entity.CategoryTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_tags") +@IdClass(QuizTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "category_tag_id", nullable = false) + private CategoryTag categoryTag; + + @Builder + public QuizTagMap(Quiz quiz, CategoryTag categoryTag) { + this.quiz = quiz; + this.categoryTag = categoryTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java new file mode 100644 index 00000000..e61597e7 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.quiz.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class QuizTagMapId implements Serializable { + private Long quiz; + private Long categoryTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java new file mode 100644 index 00000000..f159720f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java @@ -0,0 +1,43 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_user_votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizUserVote extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "option_id", nullable = false) + private QuizOption selectedOption; + + @Builder + public QuizUserVote(User user, Quiz quiz, QuizOption selectedOption) { + this.user = user; + this.quiz = quiz; + this.selectedOption = selectedOption; + } + + public void updateOption(QuizOption option) { + this.selectedOption = option; + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java new file mode 100644 index 00000000..2eeb5355 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java @@ -0,0 +1,6 @@ +package com.swyp.picke.domain.quiz.enums; + +public enum QuizOptionLabel { + A, B, C, D +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java new file mode 100644 index 00000000..a6063700 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.quiz.enums; + +public enum QuizStatus { + PENDING, + PUBLISHED, + ARCHIVED +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java new file mode 100644 index 00000000..f4c3c9b7 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface QuizOptionRepository extends JpaRepository { + List findByQuizOrderByDisplayOrderAscLabelAscIdAsc(Quiz quiz); + Optional findByQuizAndLabel(Quiz quiz, QuizOptionLabel label); +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java new file mode 100644 index 00000000..bacf283b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.entity.QuizOptionValueTagMap; +import com.swyp.picke.domain.quiz.entity.QuizOptionValueTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface QuizOptionValueTagMapRepository extends JpaRepository { + List findByQuizOption(QuizOption quizOption); + void deleteByQuizOption(QuizOption quizOption); +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java new file mode 100644 index 00000000..f84f5583 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java @@ -0,0 +1,37 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import java.time.LocalDate; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface QuizRepository extends JpaRepository { + Page findAllByOrderByCreatedAtDesc(Pageable pageable); + + @Query("SELECT q FROM Quiz q WHERE q.status = :status AND q.targetDate = :targetDate ORDER BY q.createdAt ASC") + List findTodayPicks( + @Param("status") QuizStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); + + @Query(""" + SELECT q + FROM Quiz q + WHERE q.status = :status + AND (q.targetDate IS NULL OR q.targetDate <> :targetDate) + ORDER BY CASE WHEN q.targetDate IS NULL THEN 0 ELSE 1 END, + q.targetDate ASC, + q.createdAt ASC + """) + List findAutoAssignableTodayPicks( + @Param("status") QuizStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java new file mode 100644 index 00000000..aeb7ebe9 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizTagMap; +import com.swyp.picke.domain.quiz.entity.QuizTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface QuizTagMapRepository extends JpaRepository { + List findByQuiz(Quiz quiz); + void deleteByQuiz(Quiz quiz); +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java new file mode 100644 index 00000000..07f26949 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.entity.QuizUserVote; +import com.swyp.picke.domain.user.entity.User; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface QuizUserVoteRepository extends JpaRepository { + Optional findByQuizAndUser(Quiz quiz, User user); + long countByQuiz(Quiz quiz); + long countByQuizAndSelectedOption(Quiz quiz, QuizOption selectedOption); + List findAllByQuiz(Quiz quiz); +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java b/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java new file mode 100644 index 00000000..c6d1678f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java @@ -0,0 +1,35 @@ +package com.swyp.picke.domain.quiz.service; + +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import java.util.List; + +public interface QuizService { + Quiz findById(Long quizId); + + QuizListResponse getQuizzes(int page, int size); + + List getTodayPicks(int limit); + + List getOptions(Quiz quiz); + + long countVotes(Quiz quiz); + + QuizDetailResponse getQuizDetail(Long quizId); + + AdminQuizDetailResponse getAdminQuizDetail(Long quizId); + + AdminQuizDetailResponse createQuiz(AdminQuizCreateRequest request); + + AdminQuizDetailResponse updateQuiz(Long quizId, AdminQuizUpdateRequest request); + + AdminQuizDeleteResponse deleteQuiz(Long quizId); +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java b/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java new file mode 100644 index 00000000..3ee12e08 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java @@ -0,0 +1,189 @@ +package com.swyp.picke.domain.quiz.service; + +import com.swyp.picke.domain.quiz.converter.QuizConverter; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizOptionRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import com.swyp.picke.domain.quiz.repository.QuizOptionRepository; +import com.swyp.picke.domain.quiz.repository.QuizRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class QuizServiceImpl implements QuizService { + + private final QuizRepository quizRepository; + private final QuizOptionRepository quizOptionRepository; + private final QuizConverter quizConverter; + + @Override + public Quiz findById(Long quizId) { + return quizRepository.findById(quizId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + } + + @Override + public QuizListResponse getQuizzes(int page, int size) { + int pageNumber = Math.max(0, page - 1); + Page quizPage = quizRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(pageNumber, size)); + return quizConverter.toListResponse(quizPage); + } + + @Override + @Transactional + public List getTodayPicks(int limit) { + int safeLimit = Math.max(1, limit); + LocalDate today = LocalDate.now(); + + ensureTodayPicks(today, safeLimit); + return quizRepository.findTodayPicks(QuizStatus.PUBLISHED, today, PageRequest.of(0, safeLimit)); + } + + @Override + public List getOptions(Quiz quiz) { + return quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + } + + @Override + public long countVotes(Quiz quiz) { + return quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); + } + + @Override + public QuizDetailResponse getQuizDetail(Long quizId) { + Quiz quiz = findById(quizId); + List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + return quizConverter.toDetailResponse(quiz, options); + } + + @Override + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDetailResponse getAdminQuizDetail(Long quizId) { + Quiz quiz = findById(quizId); + List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + return quizConverter.toAdminDetailResponse(quiz, options); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDetailResponse createQuiz(AdminQuizCreateRequest request) { + Quiz quiz = quizConverter.toEntity(request); + quiz = quizRepository.save(quiz); + + List savedOptions = new ArrayList<>(); + if (request.options() != null) { + for (AdminQuizOptionRequest optionRequest : request.options()) { + QuizOption option = QuizOption.builder() + .quiz(quiz) + .label(optionRequest.label()) + .text(optionRequest.text()) + .detailText(optionRequest.detailText()) + .isCorrect(optionRequest.isCorrect()) + .build(); + option = quizOptionRepository.save(option); + savedOptions.add(option); + } + } + + return quizConverter.toAdminDetailResponse(quiz, savedOptions); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDetailResponse updateQuiz(Long quizId, AdminQuizUpdateRequest request) { + Quiz quiz = findById(quizId); + quiz.update(request.title(), request.targetDate(), request.status()); + + if (request.options() != null) { + List existingOptions = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + Map existingOptionMap = new HashMap<>(); + for (QuizOption option : existingOptions) { + existingOptionMap.put(option.getLabel(), option); + } + + Set requestedLabels = new HashSet<>(); + for (AdminQuizOptionRequest optionRequest : request.options()) { + requestedLabels.add(optionRequest.label()); + QuizOption option = existingOptionMap.get(optionRequest.label()); + + if (option == null) { + option = QuizOption.builder() + .quiz(quiz) + .label(optionRequest.label()) + .text(optionRequest.text()) + .detailText(optionRequest.detailText()) + .isCorrect(optionRequest.isCorrect()) + .build(); + option = quizOptionRepository.save(option); + } else { + option.update( + optionRequest.text(), + optionRequest.detailText(), + optionRequest.isCorrect() + ); + } + } + + for (QuizOption existingOption : existingOptions) { + if (requestedLabels.contains(existingOption.getLabel())) continue; + quizOptionRepository.delete(existingOption); + } + } + + return getAdminQuizDetail(quizId); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDeleteResponse deleteQuiz(Long quizId) { + Quiz quiz = findById(quizId); + List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + quizOptionRepository.deleteAll(options); + quizRepository.delete(quiz); + return new AdminQuizDeleteResponse(true, LocalDateTime.now()); + } + + private void ensureTodayPicks(LocalDate today, int requiredCount) { + List todays = quizRepository.findTodayPicks(QuizStatus.PUBLISHED, today, PageRequest.of(0, requiredCount)); + int missingCount = requiredCount - todays.size(); + if (missingCount <= 0) return; + + List candidates = quizRepository.findAutoAssignableTodayPicks( + QuizStatus.PUBLISHED, + today, + PageRequest.of(0, missingCount) + ); + for (Quiz candidate : candidates) { + candidate.update(null, today, null); + } + } +} + diff --git a/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java b/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java index c05a07c7..45dad51d 100644 --- a/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java +++ b/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "추천 (Recommendation)", description = "배틀 추천 API") +@Tag(name = "추천 API", description = "배틀 추천 조회") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -20,7 +20,7 @@ public class RecommendationController { private final RecommendationService recommendationService; - @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀 기반으로 흥미로운 배틀 목록을 추천합니다.") + @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀을 기준으로 흥미로운 배틀 목록을 추천합니다.") @GetMapping("/battles/{battleId}/recommendations/interesting") public ApiResponse getInterestingBattles( @PathVariable Long battleId, diff --git a/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java b/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java index 1a37f32f..00d3bb86 100644 --- a/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java +++ b/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java @@ -13,7 +13,7 @@ import com.swyp.picke.domain.user.service.UserService; import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; @@ -35,7 +35,7 @@ public class RecommendationService { private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; private final BattleOptionTagRepository battleOptionTagRepository; - private final VoteRepository voteRepository; + private final BattleVoteRepository BattleVoteRepository; private final UserService userService; private final ResourceUrlProvider urlProvider; @@ -47,7 +47,7 @@ public RecommendationListResponse getInterestingBattles(Long battleId, Long user PhilosopherType oppositeType = myType.getWorstMatch(); // 현재 유저가 이미 참여한 배틀 ID 목록 (제외 대상) - List excludeBattleIds = voteRepository.findParticipatedBattleIdsByUserId(userId); + List excludeBattleIds = BattleVoteRepository.findParticipatedBattleIdsByUserId(userId); if (excludeBattleIds.isEmpty()) excludeBattleIds = List.of(-1L); List sameTypeUserIds = findUserIdsByPhilosopherType(myType); @@ -56,12 +56,12 @@ public RecommendationListResponse getInterestingBattles(Long battleId, Long user // 같은 유형 유저들이 참여한 배틀 후보 ID List sameCandidateIds = sameTypeUserIds.isEmpty() ? List.of() - : voteRepository.findParticipatedBattleIdsByUserIds(sameTypeUserIds); + : BattleVoteRepository.findParticipatedBattleIdsByUserIds(sameTypeUserIds); // 반대 유형 유저들이 참여한 배틀 후보 ID List oppositeCandidateIds = oppositeTypeUserIds.isEmpty() ? List.of() - : voteRepository.findParticipatedBattleIdsByUserIds(oppositeTypeUserIds); + : BattleVoteRepository.findParticipatedBattleIdsByUserIds(oppositeTypeUserIds); // 인기 점수 기준 배틀 조회 (Score = V*1.0 + C*1.5 + Vw*0.2) // 철학자 유형 로직 미구현 시 인기 배틀로 폴백 @@ -130,4 +130,4 @@ private RecommendationListResponse.Item toItem(Battle battle) { private List findUserIdsByPhilosopherType(PhilosopherType type) { return List.of(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java b/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java index 723be0d9..71a4f239 100644 --- a/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java +++ b/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java @@ -8,14 +8,12 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springdoc.core.annotations.ParameterObject; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Slf4j -@Tag(name = "보상 (Reward)", description = "AdMob 광고 보상 관련 API") +@Tag(name = "보상 API", description = "AdMob 광고 보상 관련 API") @RestController @RequestMapping("/api/v1/admob") @RequiredArgsConstructor diff --git a/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java b/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java index d3fef5da..9cec0289 100644 --- a/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java +++ b/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java @@ -1,7 +1,6 @@ package com.swyp.picke.domain.search.dto.response; import com.swyp.picke.domain.battle.dto.response.BattleTagResponse; -import com.swyp.picke.domain.battle.enums.BattleType; import java.util.List; @@ -14,7 +13,6 @@ public record SearchBattleListResponse( public record SearchBattleItem( Long battleId, String thumbnailUrl, - BattleType type, String title, String summary, List tags, diff --git a/src/main/java/com/swyp/picke/domain/search/service/SearchService.java b/src/main/java/com/swyp/picke/domain/search/service/SearchService.java index 3d66a5b1..b309fbe7 100644 --- a/src/main/java/com/swyp/picke/domain/search/service/SearchService.java +++ b/src/main/java/com/swyp/picke/domain/search/service/SearchService.java @@ -58,7 +58,6 @@ public SearchBattleListResponse searchBattles(String category, SearchSortType so .map(battle -> new SearchBattleListResponse.SearchBattleItem( battle.getId(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), - battle.getType(), battle.getTitle(), battle.getSummary(), tagMap.getOrDefault(battle.getId(), List.of()), diff --git a/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java b/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java index 094f8982..12a96ce9 100644 --- a/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java +++ b/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java @@ -1,19 +1,19 @@ package com.swyp.picke.domain.tag.controller; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.*; +import com.swyp.picke.domain.tag.dto.response.TagListResponse; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.service.TagService; import com.swyp.picke.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -@Tag(name = "태그 (Tag)", description = "태그 조회 및 관리 API") +@Tag(name = "태그 API", description = "태그 조회") @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") @@ -21,46 +21,13 @@ public class TagController { private final TagService tagService; - @Operation(summary = "태그 목록 조회", description = "전체 태그 목록을 조회합니다. 특정 타입(type)을 지정하여 필터링할 수 있습니다.") + @Operation(summary = "태그 목록 조회") @GetMapping("/tags") public ApiResponse getTags( - @Parameter(description = "필터링할 태그 타입 (예: BATTLE 등)", required = false) + @Parameter(description = "태그 타입 필터(선택)", required = false) @RequestParam(name = "type", required = false) TagType type) { TagListResponse response = tagService.getTags(type); return ApiResponse.onSuccess(response); } - - @Operation(summary = "태그 생성 (관리자)", description = "관리자가 새로운 태그를 생성합니다.") - @PreAuthorize("hasRole('ADMIN')") - @PostMapping("/admin/tags") - public ApiResponse createTag( - @Valid @RequestBody TagRequest request) { - - TagResponse response = tagService.createTag(request); - return ApiResponse.onSuccess(response); - } - - @Operation(summary = "태그 수정 (관리자)", description = "관리자가 기존 태그의 이름이나 정보를 수정합니다.") - @PreAuthorize("hasRole('ADMIN')") - @PatchMapping("/admin/tags/{tag_id}") - public ApiResponse updateTag( - @Parameter(description = "수정할 태그의 ID", example = "1") - @PathVariable("tag_id") Long tagId, - @Valid @RequestBody TagRequest request) { - - TagResponse response = tagService.updateTag(tagId, request); - return ApiResponse.onSuccess(response); - } - - @Operation(summary = "태그 삭제 (관리자)", description = "관리자가 특정 태그를 삭제합니다. 단, 배틀에 사용 중인 태그는 삭제할 수 없습니다.") - @PreAuthorize("hasRole('ADMIN')") - @DeleteMapping("/admin/tags/{tag_id}") - public ApiResponse deleteTag( - @Parameter(description = "삭제할 태그의 ID", example = "1") - @PathVariable("tag_id") Long tagId) { - - TagDeleteResponse response = tagService.deleteTag(tagId); - return ApiResponse.onSuccess(response); - } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java b/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java index b3860d45..26382626 100644 --- a/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java +++ b/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java @@ -1,7 +1,9 @@ package com.swyp.picke.domain.tag.converter; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.*; +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; +import com.swyp.picke.domain.tag.dto.response.TagListResponse; import com.swyp.picke.domain.tag.entity.Tag; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java b/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java deleted file mode 100644 index 736bfda6..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.tag.dto.request; - -import com.swyp.picke.domain.tag.enums.TagType; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -public record TagRequest( - @NotBlank(message = "태그 이름을 입력해주세요.") - String name, - - @NotNull(message = "태그 타입을 선택해주세요.") - TagType type -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java deleted file mode 100644 index 71b350e8..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.tag.dto.response; - -import java.time.LocalDateTime; - -public record TagDeleteResponse( - boolean success, - LocalDateTime deletedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java index 5e258e8d..6bf53599 100644 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java +++ b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java @@ -1,5 +1,6 @@ package com.swyp.picke.domain.tag.dto.response; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; import java.util.List; public record TagListResponse( diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java deleted file mode 100644 index 70554dde..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.swyp.picke.domain.tag.dto.response; - -import com.swyp.picke.domain.tag.enums.TagType; -import java.time.LocalDateTime; - -public record TagResponse( - Long tagId, - String name, - TagType type, - LocalDateTime createdAt, - LocalDateTime updatedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java new file mode 100644 index 00000000..41b4561a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java @@ -0,0 +1,35 @@ +package com.swyp.picke.domain.tag.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "category_tags") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class CategoryTag { + + @Id + @Column(name = "tag_id") + private Long tagId; + + @OneToOne(fetch = FetchType.LAZY, optional = false) + @MapsId + @JoinColumn(name = "tag_id", nullable = false) + private Tag tag; + + @Builder + public CategoryTag(Tag tag) { + this.tag = tag; + } +} diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java new file mode 100644 index 00000000..ba54480b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.tag.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "philosopher_tags") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PhilosopherTag { + + @Id + @Column(name = "tag_id") + private Long tagId; + + @OneToOne(fetch = FetchType.LAZY, optional = false) + @MapsId + @JoinColumn(name = "tag_id", nullable = false) + private Tag tag; + + @Builder + public PhilosopherTag(Tag tag) { + this.tag = tag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java new file mode 100644 index 00000000..6c9c0303 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.tag.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "value_tags") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ValueTag { + + @Id + @Column(name = "tag_id") + private Long tagId; + + @OneToOne(fetch = FetchType.LAZY, optional = false) + @MapsId + @JoinColumn(name = "tag_id", nullable = false) + private Tag tag; + + @Builder + public ValueTag(Tag tag) { + this.tag = tag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java new file mode 100644 index 00000000..9d71ad27 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.repository; + +import com.swyp.picke.domain.tag.entity.CategoryTag; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CategoryTagRepository extends JpaRepository { +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java new file mode 100644 index 00000000..fdca62b4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.repository; + +import com.swyp.picke.domain.tag.entity.PhilosopherTag; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PhilosopherTagRepository extends JpaRepository { +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java new file mode 100644 index 00000000..f731d490 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.repository; + +import com.swyp.picke.domain.tag.entity.ValueTag; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ValueTagRepository extends JpaRepository { +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/service/TagService.java b/src/main/java/com/swyp/picke/domain/tag/service/TagService.java index 97ceca46..2074a1e8 100644 --- a/src/main/java/com/swyp/picke/domain/tag/service/TagService.java +++ b/src/main/java/com/swyp/picke/domain/tag/service/TagService.java @@ -1,9 +1,9 @@ package com.swyp.picke.domain.tag.service; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; import com.swyp.picke.domain.tag.dto.response.TagListResponse; -import com.swyp.picke.domain.tag.dto.response.TagResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; @@ -11,7 +11,6 @@ public interface TagService { List findByBattleId(Long battleId); - TagListResponse getTags(TagType type); TagResponse createTag(TagRequest request); TagResponse updateTag(Long tagId, TagRequest request); diff --git a/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java b/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java index d1bf3b96..8f7b0950 100644 --- a/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java @@ -1,11 +1,14 @@ package com.swyp.picke.domain.tag.service; import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.battle.repository.BattleOptionTagRepository; import com.swyp.picke.domain.battle.repository.BattleRepository; import com.swyp.picke.domain.battle.repository.BattleTagRepository; import com.swyp.picke.domain.tag.converter.TagConverter; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.*; +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; +import com.swyp.picke.domain.tag.dto.response.TagListResponse; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.repository.TagRepository; @@ -25,6 +28,7 @@ public class TagServiceImpl implements TagService { private final TagRepository tagRepository; private final BattleTagRepository battleTagRepository; + private final BattleOptionTagRepository battleOptionTagRepository; private final BattleRepository battleRepository; @Override @@ -62,11 +66,16 @@ public TagResponse createTag(TagRequest request) { @PreAuthorize("hasRole('ADMIN')") public TagResponse updateTag(Long tagId, TagRequest request) { Tag tag = findTagById(tagId); + boolean typeChanged = tag.getType() != request.type(); if (!tag.getName().equals(request.name()) || tag.getType() != request.type()) { validateDuplicateTag(request.name(), request.type()); } + if (typeChanged && isTagInUse(tag)) { + throw new CustomException(ErrorCode.TAG_TYPE_CHANGE_FORBIDDEN); + } + tag.updateTag(request.name(), request.type()); return TagConverter.toDetailResponse(tag); } @@ -77,7 +86,7 @@ public TagResponse updateTag(Long tagId, TagRequest request) { public TagDeleteResponse deleteTag(Long tagId) { Tag tag = findTagById(tagId); - if (battleTagRepository.existsByTag(tag)) { + if (isTagInUse(tag)) { throw new CustomException(ErrorCode.TAG_IN_USE); } @@ -95,4 +104,8 @@ private void validateDuplicateTag(String name, TagType type) { throw new CustomException(ErrorCode.TAG_DUPLICATED); } } + + private boolean isTagInUse(Tag tag) { + return battleTagRepository.existsByTag(tag) || battleOptionTagRepository.existsByTag(tag); + } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java deleted file mode 100644 index c937631e..00000000 --- a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.swyp.picke.domain.test.controller; - -import com.swyp.picke.domain.oauth.jwt.JwtProvider; -import com.swyp.picke.global.common.response.ApiResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/api/test") -@RequiredArgsConstructor -public class TestController { - - private final JwtProvider jwtProvider; - - @GetMapping("/response") - public ApiResponse> testResponse() { - List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); - return ApiResponse.onSuccess(teamMembers); - } - - @GetMapping("/token") - public ApiResponse> getTestToken( - @RequestParam(defaultValue = "1") Long userId - ) { - String token = jwtProvider.createAccessToken(userId, "USER"); - return ApiResponse.onSuccess(Map.of("accessToken", token)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/user/service/MypageService.java b/src/main/java/com/swyp/picke/domain/user/service/MypageService.java index 2650044d..f97ae6a8 100644 --- a/src/main/java/com/swyp/picke/domain/user/service/MypageService.java +++ b/src/main/java/com/swyp/picke/domain/user/service/MypageService.java @@ -18,7 +18,7 @@ import com.swyp.picke.domain.user.entity.UserProfile; import com.swyp.picke.domain.user.entity.UserSettings; import com.swyp.picke.domain.user.enums.VoteSide; -import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.entity.BattleVote; import com.swyp.picke.domain.vote.service.VoteQueryService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; @@ -142,29 +142,29 @@ public BattleRecordListResponse getBattleRecords(Integer offset, Integer size, V BattleOptionLabel label = voteSide != null ? toOptionLabel(voteSide) : null; - List votes = voteQueryService.findUserVotes(user.getId(), pageOffset, pageSize, label); + List votes = voteQueryService.findUserVotes(user.getId(), pageOffset, pageSize, label); long totalCount = voteQueryService.countUserVotes(user.getId(), label); List battleIds = votes.stream().map(v -> v.getBattle().getId()).toList(); - Map categoryMap = battleQueryService.getCategoryNamesByBattleIds(battleIds); // 추가 필요 + Map categoryMap = battleQueryService.getCategoryNamesByBattleIds(battleIds); // 異붽? ?꾩슂 List items = votes.stream() - .map(vote -> { - Battle battle = vote.getBattle(); - BattleOption selectedOption = vote.getPostVoteOption() != null - ? vote.getPostVoteOption() : vote.getPreVoteOption(); + .map(BattleVote -> { + Battle battle = BattleVote.getBattle(); + BattleOption selectedOption = BattleVote.getPostVoteOption() != null + ? BattleVote.getPostVoteOption() : BattleVote.getPreVoteOption(); VoteSide side = selectedOption.getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; String category = categoryMap.get(battle.getId()); return new BattleRecordListResponse.BattleRecordItem( battle.getId().toString(), - vote.getId().toString(), + BattleVote.getId().toString(), side, category, battle.getTitle(), battle.getSummary(), - vote.getCreatedAt() + BattleVote.getCreatedAt() ); }) .toList(); @@ -360,3 +360,5 @@ private String resolveCharacterImageUrl(String characterType) { return s3PresignedUrlService.generatePresignedUrl(imageKey); } } + + diff --git a/src/main/java/com/swyp/picke/domain/user/service/UserService.java b/src/main/java/com/swyp/picke/domain/user/service/UserService.java index b87beb08..0e735100 100644 --- a/src/main/java/com/swyp/picke/domain/user/service/UserService.java +++ b/src/main/java/com/swyp/picke/domain/user/service/UserService.java @@ -74,7 +74,7 @@ public PhilosopherType getPhilosopherType(Long userId) { return PhilosopherType.SOCRATES; } - List optionIds = voteQueryService.findFirstNBattleIds(userId, PHILOSOPHER_CALC_THRESHOLD); + List optionIds = voteQueryService.findFirstNVotedOptionIds(userId, PHILOSOPHER_CALC_THRESHOLD); return battleQueryService.getTopPhilosopherTagNameFromOptions(optionIds) .map(PhilosopherType::fromLabel) .map(type -> { @@ -124,4 +124,4 @@ public UserTendencyScore findUserTendencyScore(Long userId) { return userTendencyScoreRepository.findByUserId(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java b/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java index bf9ee7ae..0c864ca1 100644 --- a/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java +++ b/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java @@ -1,35 +1,47 @@ package com.swyp.picke.domain.vote.controller; +import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; import com.swyp.picke.domain.vote.dto.request.VoteRequest; -import com.swyp.picke.domain.vote.dto.response.*; +import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; +import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; +import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; +import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; +import com.swyp.picke.domain.vote.service.BattleVoteService; +import com.swyp.picke.domain.vote.service.PollVoteService; import com.swyp.picke.domain.vote.service.QuizVoteService; -import com.swyp.picke.domain.vote.service.VoteService; import com.swyp.picke.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -@Tag(name = "투표 (Vote)", description = "사전/사후 투표 실행 및 통계, 내 투표 내역 조회 API") +@Tag(name = "투표 API", description = "배틀/퀴즈/투표 투표 처리") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor public class VoteController { - // 배틀(BATTLE) 전용 서비스 - private final VoteService voteService; - // 퀴즈(QUIZ) & 투표(POLL) 전용 서비스 + private final BattleVoteService battleVoteService; private final QuizVoteService quizVoteService; + private final PollVoteService pollVoteService; - @Operation(summary = "[퀴즈] 선택 제출") + @Operation(summary = "[퀴즈] 답안 제출") @PostMapping("/battles/{battleId}/quiz-vote") public ApiResponse submitQuiz( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody QuizVoteRequest request) { + @RequestBody QuizVoteRequest request + ) { return ApiResponse.onSuccess(quizVoteService.submitQuiz(battleId, userId, request)); } @@ -38,15 +50,17 @@ public ApiResponse submitQuiz( public ApiResponse submitPoll( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody QuizVoteRequest request) { - return ApiResponse.onSuccess(quizVoteService.submitPoll(battleId, userId, request)); + @RequestBody PollVoteRequest request + ) { + return ApiResponse.onSuccess(pollVoteService.submitPoll(battleId, userId, request)); } @Operation(summary = "[퀴즈] 내 퀴즈 참여 내역 조회", description = "내가 선택한 퀴즈 옵션과 통계를 조회합니다.") @GetMapping("/battles/{battleId}/quiz-vote/me") public ApiResponse getMyQuizVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { + @AuthenticationPrincipal Long userId + ) { return ApiResponse.onSuccess(quizVoteService.getMyQuizVote(battleId, userId)); } @@ -54,19 +68,19 @@ public ApiResponse getMyQuizVote( @GetMapping("/battles/{battleId}/poll-vote/me") public ApiResponse getMyPollVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { - return ApiResponse.onSuccess(quizVoteService.getMyPollVote(battleId, userId)); + @AuthenticationPrincipal Long userId + ) { + return ApiResponse.onSuccess(pollVoteService.getMyPollVote(battleId, userId)); } - // 2. 배틀(BATTLE) 관련 API - @Operation(summary = "[배틀] 사전 투표 실행", description = "배틀 진입 시 첫 투표(사전 투표)를 진행합니다.") @PostMapping("/battles/{battleId}/votes/pre") public ApiResponse preVote( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody VoteRequest request) { - return ApiResponse.onSuccess(voteService.preVote(battleId, userId, request)); + @RequestBody VoteRequest request + ) { + return ApiResponse.onSuccess(battleVoteService.preVote(battleId, userId, request)); } @Operation(summary = "[배틀] 사후 투표 실행", description = "콘텐츠 소비 후 최종 투표(사후 투표)를 진행합니다.") @@ -74,46 +88,57 @@ public ApiResponse preVote( public ApiResponse postVote( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody VoteRequest request) { - return ApiResponse.onSuccess(voteService.postVote(battleId, userId, request)); + @RequestBody VoteRequest request + ) { + return ApiResponse.onSuccess(battleVoteService.postVote(battleId, userId, request)); } @Operation(summary = "[배틀] 투표 통계 조회", description = "특정 배틀의 옵션별 투표 수와 비율을 조회합니다.") @GetMapping("/battles/{battleId}/vote-stats") public ApiResponse getVoteStats(@PathVariable Long battleId) { - return ApiResponse.onSuccess(voteService.getVoteStats(battleId)); + return ApiResponse.onSuccess(battleVoteService.getVoteStats(battleId)); } @Operation(summary = "[배틀] 내 투표 내역 조회", description = "특정 배틀에 대한 내 사전/사후 투표 내역과 현재 상태를 조회합니다.") @GetMapping("/battles/{battleId}/votes/me") public ApiResponse getMyVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { - return ApiResponse.onSuccess(voteService.getMyVote(battleId, userId)); + @AuthenticationPrincipal Long userId + ) { + return ApiResponse.onSuccess(battleVoteService.getMyVote(battleId, userId)); } @Operation(summary = "[배틀] 오디오(TTS) 청취 완료 처리", description = "사전 투표 후, 오디오 재생이 완료되었을 때 호출하여 상태를 업데이트합니다.") @PostMapping("/battles/{battleId}/votes/tts-complete") public ApiResponse completeTts( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { - voteService.completeTts(battleId, userId); + @AuthenticationPrincipal Long userId + ) { + battleVoteService.completeTts(battleId, userId); return ApiResponse.onSuccess(null); } - @Operation(summary = "[관리자] 배틀 투표 삭제") + @Operation(summary = "[관리자] 배틀 투표 기록 삭제") @DeleteMapping("/admin/votes/battle/{battleId}") @PreAuthorize("hasRole('ADMIN')") public ApiResponse deleteBattleVote(@PathVariable Long battleId) { - voteService.deleteVotesByBattleId(battleId); + battleVoteService.deleteVotesByBattleId(battleId); return ApiResponse.onSuccess(null); } - @Operation(summary = "[관리자] 퀴즈/일반투표 기록 삭제") - @DeleteMapping("/admin/votes/quiz-poll/{battleId}") + @Operation(summary = "[관리자] 퀴즈 투표 기록 삭제") + @DeleteMapping("/admin/votes/quiz/{battleId}") @PreAuthorize("hasRole('ADMIN')") - public ApiResponse deleteQuizPollVote(@PathVariable Long battleId) { + public ApiResponse deleteQuizVote(@PathVariable Long battleId) { quizVoteService.deleteQuizVoteByBattleId(battleId); return ApiResponse.onSuccess(null); } + + @Operation(summary = "[관리자] 투표 콘텐츠 투표 기록 삭제") + @DeleteMapping("/admin/votes/poll/{battleId}") + @PreAuthorize("hasRole('ADMIN')") + public ApiResponse deletePollVote(@PathVariable Long battleId) { + pollVoteService.deletePollVoteByBattleId(battleId); + return ApiResponse.onSuccess(null); + } } diff --git a/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java b/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java index 4c4b741f..23e0b340 100644 --- a/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java +++ b/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java @@ -5,20 +5,17 @@ import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.Vote; - +import com.swyp.picke.domain.vote.entity.BattleVote; import java.time.LocalDateTime; import java.util.List; public class VoteConverter { - // [수정] UserBattleStep을 인자로 받도록 변경 - public static VoteResultResponse toVoteResultResponse(Vote vote, UserBattleStep step) { + public static VoteResultResponse toVoteResultResponse(BattleVote vote, UserBattleStep step) { return new VoteResultResponse(vote.getId(), step); } - // [수정] UserBattleStep을 인자로 받아 MyVoteResponse의 status 필드에 매핑 - public static MyVoteResponse toMyVoteResponse(Vote vote, UserBattleStep step) { + public static MyVoteResponse toMyVoteResponse(BattleVote vote, UserBattleStep step) { boolean opinionChanged = vote.getPreVoteOption() != null && vote.getPostVoteOption() != null && !vote.getPreVoteOption().getId().equals(vote.getPostVoteOption().getId()); @@ -27,19 +24,23 @@ public static MyVoteResponse toMyVoteResponse(Vote vote, UserBattleStep step) { vote.getBattle().getTitle(), toOptionInfo(vote.getPreVoteOption()), toOptionInfo(vote.getPostVoteOption()), - step, // 외부에서 넘겨받은 UserBattleStep 사용 + step, opinionChanged ); } - // 투표 통계 변환 - public static VoteStatsResponse toVoteStatsResponse(List stats, long totalCount, LocalDateTime updatedAt) { + public static VoteStatsResponse toVoteStatsResponse( + List stats, + long totalCount, + LocalDateTime updatedAt + ) { return new VoteStatsResponse(stats, totalCount, updatedAt); } - // 옵션 정보를 응답용으로 변환 (null 안전 처리) private static MyVoteResponse.OptionInfo toOptionInfo(BattleOption option) { - if (option == null) return null; + if (option == null) { + return null; + } return new MyVoteResponse.OptionInfo(option.getId(), option.getLabel().name(), option.getTitle()); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java b/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java new file mode 100644 index 00000000..1a37a99a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java @@ -0,0 +1,7 @@ +package com.swyp.picke.domain.vote.dto.request; + +public record PollVoteRequest( + Long optionId +) {} + + diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java b/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java index 7ff37c42..212547fa 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java @@ -2,4 +2,4 @@ public record QuizVoteRequest( Long optionId -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java b/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java index 6a41eb6d..0dd199d8 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java @@ -10,4 +10,4 @@ public record MyVoteResponse( boolean opinionChanged ) { public record OptionInfo(Long optionId, String label, String title) {} -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java b/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java index 3c508760..4303b5dc 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java @@ -9,4 +9,4 @@ public record PollVoteResponse( List stats ) { public record OptionStat(Long optionId, String label, String title, long voteCount, double ratio) {} -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java b/src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java similarity index 77% rename from src/main/java/com/swyp/picke/domain/vote/entity/Vote.java rename to src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java index 47054b65..1551e80c 100644 --- a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java +++ b/src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java @@ -19,7 +19,7 @@ @Entity @Table(name = "votes") @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Vote extends BaseEntity { +public class BattleVote extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id", nullable = false) @@ -41,7 +41,7 @@ public class Vote extends BaseEntity { private Boolean isTtsListened = false; @Builder - private Vote(User user, Battle battle, BattleOption preVoteOption, + private BattleVote(User user, Battle battle, BattleOption preVoteOption, BattleOption postVoteOption, Boolean isTtsListened) { this.user = user; this.battle = battle; @@ -50,38 +50,26 @@ private Vote(User user, Battle battle, BattleOption preVoteOption, this.isTtsListened = isTtsListened != null ? isTtsListened : false; } - /** - * 최초 투표(사전 투표) 시 사용하는 정적 팩토리 메서드 - */ - public static Vote createPreVote(User user, Battle battle, BattleOption option) { - return Vote.builder() + public static BattleVote createPreVote(User user, Battle battle, BattleOption option) { + return BattleVote.builder() .user(user) .battle(battle) .preVoteOption(option) .isTtsListened(false) - // status 설정 삭제됨 + // status ?ㅼ젙 ??젣?? .build(); } - /** - * 사전 투표 옵션 수정 메서드 - */ public void updatePreVote(BattleOption preVoteOption) { this.preVoteOption = preVoteOption; } - /** - * 사후 투표 업데이트 - */ public void doPostVote(BattleOption postOption) { this.postVoteOption = postOption; - // status 업데이트 삭제됨 } - /** - * TTS 청취 상태 업데이트 - */ public void completeTts() { this.isTtsListened = true; } -} \ No newline at end of file +} + diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java b/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java new file mode 100644 index 00000000..7f650b2e --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java @@ -0,0 +1,45 @@ +package com.swyp.picke.domain.vote.entity; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_user_votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollVote extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "option_id", nullable = false) + private PollOption selectedOption; + + @Builder + public PollVote(User user, Poll poll, PollOption selectedOption) { + this.user = user; + this.poll = poll; + this.selectedOption = selectedOption; + } + + public void updateOption(PollOption option) { + this.selectedOption = option; + } +} diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java b/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java index 7bc13514..bb6c4a7a 100644 --- a/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java +++ b/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java @@ -1,10 +1,14 @@ package com.swyp.picke.domain.vote.entity; -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -12,7 +16,7 @@ @Getter @Entity -@Table(name = "quiz_votes") +@Table(name = "quiz_user_votes") @NoArgsConstructor(access = AccessLevel.PROTECTED) public class QuizVote extends BaseEntity { @@ -21,21 +25,21 @@ public class QuizVote extends BaseEntity { private User user; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "battle_id", nullable = false) - private Battle battle; + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "option_id", nullable = false) - private BattleOption selectedOption; + private QuizOption selectedOption; @Builder - public QuizVote(User user, Battle battle, BattleOption selectedOption) { + public QuizVote(User user, Quiz quiz, QuizOption selectedOption) { this.user = user; - this.battle = battle; + this.quiz = quiz; this.selectedOption = selectedOption; } - public void updateOption(BattleOption option) { + public void updateOption(QuizOption option) { this.selectedOption = option; } } diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java similarity index 51% rename from src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java rename to src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java index 4159beb1..2e98f96c 100644 --- a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java +++ b/src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java @@ -4,7 +4,7 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.entity.BattleVote; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -13,57 +13,57 @@ import java.util.List; import java.util.Optional; -public interface VoteRepository extends JpaRepository { +public interface BattleVoteRepository extends JpaRepository { - List findAllByBattle(Battle battle); + List findAllByBattle(Battle battle); - Optional findByBattleIdAndUserId(Long battleId, Long userId); + Optional findByBattleIdAndUserId(Long battleId, Long userId); - @Query("SELECT v FROM Vote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") - Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); + @Query("SELECT v FROM BattleVote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") + Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); - Optional findByBattleAndUser(Battle battle, User user); + Optional findByBattleAndUser(Battle battle, User user); long countByBattle(Battle battle); long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); - Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); + Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + "WHERE v.user.id = :userId ORDER BY v.createdAt DESC") - List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); + List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + "WHERE v.user.id = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") - List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( + List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); long countByUserId(Long userId); - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") + @Query("SELECT COUNT(v) FROM BattleVote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId " + + @Query("SELECT COUNT(v) FROM BattleVote v WHERE v.user.id = :userId " + "AND v.postVoteOption IS NOT NULL " + "AND v.preVoteOption <> v.postVoteOption") long countOpinionChangesByUserId(@Param("userId") Long userId); - List findByUserId(Long userId); + List findByUserId(Long userId); // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) - @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") - List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); + @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") + List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); // 추천용: 유저가 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id = :userId") + @Query("SELECT v.battle.id FROM BattleVote v WHERE v.user.id = :userId") List findParticipatedBattleIdsByUserId(@Param("userId") Long userId); // 추천용: 특정 배틀에 참여한 유저 ID 조회 - @Query("SELECT DISTINCT v.user.id FROM Vote v WHERE v.battle.id IN :battleIds") + @Query("SELECT DISTINCT v.user.id FROM BattleVote v WHERE v.battle.id IN :battleIds") List findUserIdsByBattleIds(@Param("battleIds") List battleIds); // 추천용: 특정 유저들이 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id IN :userIds") + @Query("SELECT v.battle.id FROM BattleVote v WHERE v.user.id IN :userIds") List findParticipatedBattleIdsByUserIds(@Param("userIds") List userIds); -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java new file mode 100644 index 00000000..814fc16f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.vote.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.vote.entity.PollVote; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PollVoteRepository extends JpaRepository { + Optional findByPollAndUser(Poll poll, User user); + long countByPoll(Poll poll); + List findAllByPoll(Poll poll); +} diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java index 060f2938..5cfd4064 100644 --- a/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java +++ b/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java @@ -1,15 +1,15 @@ package com.swyp.picke.domain.vote.repository; -import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.vote.entity.QuizVote; -import org.springframework.data.jpa.repository.JpaRepository; - import java.util.List; import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; public interface QuizVoteRepository extends JpaRepository { - Optional findByBattleAndUser(Battle battle, User user); - long countByBattle(Battle battle); - List findAllByBattle(Battle battle); + Optional findByQuizAndUser(Quiz quiz, User user); + List findAllByQuiz(Quiz quiz); + long countByQuizAndSelectedOption(Quiz quiz, QuizOption selectedOption); } diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java similarity index 95% rename from src/main/java/com/swyp/picke/domain/vote/service/VoteService.java rename to src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java index 77d68fe6..6fac6bbf 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java @@ -6,7 +6,7 @@ import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -public interface VoteService { +public interface BattleVoteService { BattleOption findPreVoteOption(Long battleId, Long userId); Long findPostVoteOptionId(Long battleId, Long userId); VoteStatsResponse getVoteStats(Long battleId); diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java similarity index 70% rename from src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java rename to src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java index 32a2d956..74342d90 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java @@ -14,24 +14,23 @@ import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; +import java.time.LocalDateTime; +import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class VoteServiceImpl implements VoteService { +public class BattleVoteServiceImpl implements BattleVoteService { - private final VoteRepository voteRepository; + private final BattleVoteRepository battleVoteRepository; private final BattleService battleService; private final BattleOptionRepository battleOptionRepository; private final UserRepository userRepository; @@ -43,7 +42,7 @@ public BattleOption findPreVoteOption(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); if (vote.getPreVoteOption() == null) { @@ -54,7 +53,7 @@ public BattleOption findPreVoteOption(Long battleId, Long userId) { @Override public Long findPostVoteOptionId(Long battleId, Long userId) { - return voteRepository.findByBattleIdAndUserId(battleId, userId) + return battleVoteRepository.findByBattleIdAndUserId(battleId, userId) .map(vote -> vote.getPostVoteOption() != null ? vote.getPostVoteOption().getId() : null) .orElse(null); } @@ -63,21 +62,26 @@ public Long findPostVoteOptionId(Long battleId, Long userId) { public VoteStatsResponse getVoteStats(Long battleId) { Battle battle = battleService.findById(battleId); List options = battleOptionRepository.findByBattle(battle); - long totalCount = voteRepository.countByBattle(battle); + long totalCount = battleVoteRepository.countByBattle(battle); List stats = options.stream() .map(option -> { - long count = voteRepository.countByBattleAndPreVoteOption(battle, option); + long count = battleVoteRepository.countByBattleAndPreVoteOption(battle, option); double ratio = totalCount > 0 ? Math.round((double) count / totalCount * 1000.0) / 10.0 : 0.0; return new VoteStatsResponse.OptionStat( - option.getId(), option.getLabel().name(), option.getTitle(), count, ratio); + option.getId(), + option.getLabel().name(), + option.getTitle(), + count, + ratio + ); }) .toList(); - LocalDateTime updatedAt = voteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) - .map(Vote::getUpdatedAt) + LocalDateTime updatedAt = battleVoteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) + .map(BattleVote::getUpdatedAt) .orElse(null); return VoteConverter.toVoteStatsResponse(stats, totalCount, updatedAt); @@ -89,7 +93,7 @@ public MyVoteResponse getMyVote(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); @@ -99,37 +103,32 @@ public MyVoteResponse getMyVote(Long battleId, Long userId) { @Override @Transactional public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request) { - // 1. 기본 정보 조회 (배틀, 유저, 선택한 옵션) Battle battle = battleService.findById(battleId); User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - // 2. 기존 투표 여부 확인 (에러 대신 Optional로 받음) - Optional existingVote = voteRepository.findByBattleAndUser(battle, user); - Vote vote; + Optional existingVote = battleVoteRepository.findByBattleAndUser(battle, user); + BattleVote vote; if (existingVote.isPresent()) { vote = existingVote.get(); vote.updatePreVote(option); } else { - vote = Vote.createPreVote(user, battle, option); - voteRepository.save(vote); + vote = BattleVote.createPreVote(user, battle, option); + battleVoteRepository.save(vote); battle.addParticipant(); } - // 3. 현재 유저의 진행 단계 확인 UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - - // 4. 단계 업데이트 (처음 참여하는 경우에만 단계를 PRE_VOTE로 변경) - // 이미 POST_VOTE나 COMPLETED라면 단계를 강제로 낮추지 않음 if (status.step() == UserBattleStep.NONE) { userBattleService.upsertStep(user, battle, UserBattleStep.PRE_VOTE); } - // 5. 현재 유지 중인 단계를 반환 (수정 후에도 COMPLETED 유지 가능) - UserBattleStep currentStep = (status.step() == UserBattleStep.NONE) ? UserBattleStep.PRE_VOTE : status.step(); + UserBattleStep currentStep = status.step() == UserBattleStep.NONE + ? UserBattleStep.PRE_VOTE + : status.step(); return new VoteResultResponse(vote.getId(), currentStep); } @@ -142,19 +141,15 @@ public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest reque BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - // [검증] 사전 투표를 완료한 상태(혹은 오디오 청취 완료 상태)인지 확인 UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); if (status.step() == UserBattleStep.NONE) { throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); } - // 1. 사후 투표 업데이트 vote.doPostVote(option); - - // 2. 최종 완료 단계(COMPLETED)로 업데이트 userBattleService.upsertStep(user, battle, UserBattleStep.COMPLETED); return new VoteResultResponse(vote.getId(), UserBattleStep.COMPLETED); @@ -163,23 +158,14 @@ public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest reque @Override @Transactional public void deleteVotesByBattleId(Long battleId) { - // 1. 배틀 조회 Battle battle = battleService.findById(battleId); + List votes = battleVoteRepository.findAllByBattle(battle); - // 2. 해당 배틀의 모든 투표 조회 - List votes = voteRepository.findAllByBattle(battle); - - for (Vote vote : votes) { - // 3. 유저의 진행 단계 초기화 (이건 유저별로 다 해줘야 함) + for (BattleVote vote : votes) { userBattleService.upsertStep(vote.getUser(), battle, UserBattleStep.NONE); - - // 4. 옵션별 카운트 감소 (필요 시) - if (vote.getPreVoteOption() != null) { /* 감소 로직 */ } - if (vote.getPostVoteOption() != null) { /* 감소 로직 */ } } - // 5. 투표 데이터 일괄 삭제 - voteRepository.deleteAllInBatch(votes); + battleVoteRepository.deleteAllInBatch(votes); } @Override @@ -189,12 +175,10 @@ public void completeTts(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - // 1. 엔티티 상태 변경 (isTtsListened = true) - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); vote.completeTts(); - // 2. 단계를 POST_VOTE(사후 투표 가능 단계)로 업데이트 userBattleService.upsertStep(user, battle, UserBattleStep.POST_VOTE); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java new file mode 100644 index 00000000..55fd9163 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java @@ -0,0 +1,10 @@ +package com.swyp.picke.domain.vote.service; + +import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; + +public interface PollVoteService { + PollVoteResponse submitPoll(Long battleId, Long userId, PollVoteRequest request); + PollVoteResponse getMyPollVote(Long battleId, Long userId); + void deletePollVoteByBattleId(Long battleId); +} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java new file mode 100644 index 00000000..49af6548 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java @@ -0,0 +1,140 @@ +package com.swyp.picke.domain.vote.service; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.repository.PollOptionRepository; +import com.swyp.picke.domain.poll.service.PollService; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.repository.UserRepository; +import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; +import com.swyp.picke.domain.vote.entity.PollVote; +import com.swyp.picke.domain.vote.repository.PollVoteRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PollVoteServiceImpl implements PollVoteService { + + private final PollService pollService; + private final PollOptionRepository pollOptionRepository; + private final PollVoteRepository pollVoteRepository; + private final UserRepository userRepository; + + @Override + @Transactional + public PollVoteResponse submitPoll(Long battleId, Long userId, PollVoteRequest request) { + Long pollId = battleId; + Poll poll = pollService.findById(pollId); + + PollOption selectedOption = pollOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); + + if (!selectedOption.getPoll().getId().equals(poll.getId())) { + throw new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND); + } + + PollVote pollVote = saveOrUpdate(poll, userId, selectedOption); + long totalCount = poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); + + return new PollVoteResponse( + pollId, + pollVote.getSelectedOption().getId(), + totalCount, + buildStats(poll, totalCount, true) + ); + } + + @Override + public PollVoteResponse getMyPollVote(Long battleId, Long userId) { + Long pollId = battleId; + Poll poll = pollService.findById(pollId); + + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + long totalCount = poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); + + return pollVoteRepository.findByPollAndUser(poll, user) + .map(pollVote -> new PollVoteResponse( + pollId, + pollVote.getSelectedOption().getId(), + totalCount, + buildStats(poll, totalCount, true) + )) + .orElseGet(() -> new PollVoteResponse( + pollId, + null, + totalCount, + buildStats(poll, totalCount, false) + )); + } + + @Override + @Transactional + public void deletePollVoteByBattleId(Long battleId) { + Long pollId = battleId; + Poll poll = pollService.findById(pollId); + + List votes = pollVoteRepository.findAllByPoll(poll); + for (PollVote pollVote : votes) { + poll.decreaseTotalParticipantsCount(); + if (pollVote.getSelectedOption() != null) { + pollVote.getSelectedOption().decreaseVoteCount(); + } + } + pollVoteRepository.deleteAllInBatch(votes); + } + + private PollVote saveOrUpdate(Poll poll, Long userId, PollOption selectedOption) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + return pollVoteRepository.findByPollAndUser(poll, user) + .map(pollVote -> { + if (!pollVote.getSelectedOption().equals(selectedOption)) { + pollVote.getSelectedOption().decreaseVoteCount(); + selectedOption.increaseVoteCount(); + pollVote.updateOption(selectedOption); + } + return pollVote; + }) + .orElseGet(() -> { + selectedOption.increaseVoteCount(); + poll.increaseTotalParticipantsCount(); + return pollVoteRepository.save( + PollVote.builder() + .user(user) + .poll(poll) + .selectedOption(selectedOption) + .build() + ); + }); + } + + private List buildStats(Poll poll, long totalCount, boolean revealCounts) { + return pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll).stream() + .map(option -> { + long count = revealCounts ? (option.getVoteCount() == null ? 0L : option.getVoteCount()) : 0L; + double ratio = (!revealCounts || totalCount == 0) + ? 0.0 + : Math.round((double) count / totalCount * 1000) / 10.0; + + return new PollVoteResponse.OptionStat( + option.getId(), + option.getLabel().name(), + option.getTitle(), + count, + ratio + ); + }) + .toList(); + } +} + diff --git a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java index 52e34ba6..57963d10 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java @@ -1,13 +1,11 @@ package com.swyp.picke.domain.vote.service; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; -import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; public interface QuizVoteService { QuizVoteResponse submitQuiz(Long battleId, Long userId, QuizVoteRequest request); - PollVoteResponse submitPoll(Long battleId, Long userId, QuizVoteRequest request); QuizVoteResponse getMyQuizVote(Long battleId, Long userId); - PollVoteResponse getMyPollVote(Long battleId, Long userId); void deleteQuizVoteByBattleId(Long battleId); } + diff --git a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java index d258624f..9eac2082 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java @@ -1,194 +1,143 @@ package com.swyp.picke.domain.vote.service; -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.battle.repository.BattleOptionRepository; -import com.swyp.picke.domain.battle.service.BattleService; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.repository.QuizOptionRepository; +import com.swyp.picke.domain.quiz.service.QuizService; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; -import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; import com.swyp.picke.domain.vote.entity.QuizVote; import com.swyp.picke.domain.vote.repository.QuizVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class QuizVoteServiceImpl implements QuizVoteService { + private final QuizService quizService; + private final QuizOptionRepository quizOptionRepository; private final QuizVoteRepository quizVoteRepository; - private final BattleService battleService; - private final BattleOptionRepository battleOptionRepository; private final UserRepository userRepository; @Override @Transactional public QuizVoteResponse submitQuiz(Long battleId, Long userId, QuizVoteRequest request) { - Battle battle = battleService.findById(battleId); - if (!"QUIZ".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_QUIZ); - } - - QuizVote v = saveOrUpdate(battle, userId, request.optionId()); - long totalCount = quizVoteRepository.countByBattle(v.getBattle()); + Long quizId = battleId; + Quiz quiz = quizService.findById(quizId); - return new QuizVoteResponse( - battleId, - v.getSelectedOption().getId(), - totalCount, - calcStats(v.getBattle(), totalCount) - ); - } + QuizOption selectedOption = quizOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - @Override - @Transactional - public PollVoteResponse submitPoll(Long battleId, Long userId, QuizVoteRequest request) { - Battle battle = battleService.findById(battleId); - if (!"VOTE".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_POLL); + if (!selectedOption.getQuiz().getId().equals(quiz.getId())) { + throw new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND); } - QuizVote v = saveOrUpdate(battle, userId, request.optionId()); - long totalCount = quizVoteRepository.countByBattle(v.getBattle()); + QuizVote quizVote = saveOrUpdate(quiz, userId, selectedOption); + long totalCount = quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); - return new PollVoteResponse( - battleId, - v.getSelectedOption().getId(), + return new QuizVoteResponse( + quizId, + quizVote.getSelectedOption().getId(), totalCount, - calcStats(v.getBattle(), totalCount).stream() - .map(s -> new PollVoteResponse.OptionStat(s.optionId(), s.label(), s.title(), s.voteCount(), s.ratio())) - .toList() + buildStats(quiz, totalCount, true, true) ); } @Override public QuizVoteResponse getMyQuizVote(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - if (!"QUIZ".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_QUIZ); - } + Long quizId = battleId; + Quiz quiz = quizService.findById(quizId); User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - long totalCount = quizVoteRepository.countByBattle(battle); + long totalCount = quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); - return quizVoteRepository.findByBattleAndUser(battle, user) - .map(v -> new QuizVoteResponse( - battleId, - v.getSelectedOption().getId(), + return quizVoteRepository.findByQuizAndUser(quiz, user) + .map(quizVote -> new QuizVoteResponse( + quizId, + quizVote.getSelectedOption().getId(), totalCount, - calcStats(battle, totalCount) + buildStats(quiz, totalCount, true, true) )) - .orElseGet(() -> { - // [투표 전] 전체 참여자 수(totalCount), 선택지 설명(stance)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 - List blindStats = battleOptionRepository.findByBattle(battle).stream() - .map(o -> new QuizVoteResponse.OptionStat( - o.getId(), o.getLabel().name(), o.getTitle(), - o.getIsCorrect(), 0L, 0.0, o.getStance() - )) - .toList(); - return new QuizVoteResponse(battleId, null, totalCount, blindStats); - }); + .orElseGet(() -> new QuizVoteResponse( + quizId, + null, + totalCount, + buildStats(quiz, totalCount, false, false) + )); } @Override - public PollVoteResponse getMyPollVote(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - if (!"VOTE".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_POLL); - } - - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - long totalCount = quizVoteRepository.countByBattle(battle); - - return quizVoteRepository.findByBattleAndUser(battle, user) - .map(v -> { - List stats = calcStats(battle, totalCount).stream() - .map(s -> new PollVoteResponse.OptionStat(s.optionId(), s.label(), s.title(), s.voteCount(), s.ratio())) - .toList(); - - return new PollVoteResponse( - battleId, - v.getSelectedOption().getId(), - totalCount, - stats - ); - }) - .orElseGet(() -> { - // [투표 전] 전체 참여자 수(totalCount)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 - List blindStats = battleOptionRepository.findByBattle(battle).stream() - .map(o -> new PollVoteResponse.OptionStat(o.getId(), o.getLabel().name(), o.getTitle(), 0L, 0.0)) - .toList(); - return new PollVoteResponse(battleId, null, totalCount, blindStats); - }); - } - @Transactional public void deleteQuizVoteByBattleId(Long battleId) { - // 배틀 확인 - Battle battle = battleService.findById(battleId); - - // 해당 배틀의 모든 투표 조회 - List votes = quizVoteRepository.findAllByBattle(battle); + Long quizId = battleId; + Quiz quiz = quizService.findById(quizId); - // 투표수 감소 (배틀 옵션에 반영) - for (QuizVote v : votes) { - if (v.getSelectedOption() != null) { - v.getSelectedOption().decreaseVoteCount(); - } + List votes = quizVoteRepository.findAllByQuiz(quiz); + for (QuizVote ignored : votes) { + quiz.decreaseTotalParticipantsCount(); } quizVoteRepository.deleteAllInBatch(votes); } - private QuizVote saveOrUpdate(Battle battle, Long userId, Long optionId) { + private QuizVote saveOrUpdate(Quiz quiz, Long userId, QuizOption selectedOption) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleOption newOption = battleOptionRepository.findById(optionId) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - return quizVoteRepository.findByBattleAndUser(battle, user) - .map(v -> { - // 옵션을 바꾼다면 기존 옵션 -1, 새 옵션 +1 - if (!v.getSelectedOption().equals(newOption)) { - v.getSelectedOption().decreaseVoteCount(); - newOption.increaseVoteCount(); - v.updateOption(newOption); + return quizVoteRepository.findByQuizAndUser(quiz, user) + .map(quizVote -> { + if (!quizVote.getSelectedOption().equals(selectedOption)) { + quizVote.updateOption(selectedOption); } - return v; + return quizVote; }) .orElseGet(() -> { - // 처음 투표한다면 새 옵션 +1 - battle.addParticipant(); - newOption.increaseVoteCount(); + quiz.increaseTotalParticipantsCount(); return quizVoteRepository.save( - QuizVote.builder().user(user).battle(battle).selectedOption(newOption).build()); + QuizVote.builder() + .user(user) + .quiz(quiz) + .selectedOption(selectedOption) + .build() + ); }); - } + } - private List calcStats(Battle battle, long totalCount) { - return battleOptionRepository.findByBattle(battle).stream().map(o -> { - long count = (o.getVoteCount() == null) ? 0L : o.getVoteCount(); - double ratio = totalCount == 0 ? 0.0 : Math.round((double) count / totalCount * 1000) / 10.0; - return new QuizVoteResponse.OptionStat( - o.getId(), - o.getLabel().name(), - o.getTitle(), - o.getIsCorrect(), - count, - ratio, - null - ); - }).toList(); + private List buildStats( + Quiz quiz, + long totalCount, + boolean revealCorrect, + boolean revealCounts + ) { + return quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz).stream() + .map(option -> { + long voteCount = revealCounts + ? quizVoteRepository.countByQuizAndSelectedOption(quiz, option) + : 0L; + + double ratio = (!revealCounts || totalCount == 0) + ? 0.0 + : Math.round((double) voteCount / totalCount * 1000) / 10.0; + + return new QuizVoteResponse.OptionStat( + option.getId(), + option.getLabel().name(), + option.getText(), + revealCorrect ? option.getIsCorrect() : null, + voteCount, + ratio, + null + ); + }) + .toList(); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java index fab804f0..5401ef8a 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java @@ -2,49 +2,51 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; +import java.util.List; +import java.util.Objects; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class VoteQueryService { - private final VoteRepository voteRepository; + private final BattleVoteRepository battleVoteRepository; - public List findUserVotes(Long userId, int offset, int size, BattleOptionLabel label) { + public List findUserVotes(Long userId, int offset, int size, BattleOptionLabel label) { PageRequest pageable = PageRequest.of(offset / size, size); return label != null - ? voteRepository.findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc(userId, label, pageable) - : voteRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); + ? battleVoteRepository.findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc(userId, label, pageable) + : battleVoteRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); } public long countUserVotes(Long userId, BattleOptionLabel label) { return label != null - ? voteRepository.countByUserIdAndPreVoteOptionLabel(userId, label) - : voteRepository.countByUserId(userId); + ? battleVoteRepository.countByUserIdAndPreVoteOptionLabel(userId, label) + : battleVoteRepository.countByUserId(userId); } public long countTotalParticipation(Long userId) { - return voteRepository.countByUserId(userId); + return battleVoteRepository.countByUserId(userId); } public long countOpinionChanges(Long userId) { - return voteRepository.countOpinionChangesByUserId(userId); + return battleVoteRepository.countOpinionChangesByUserId(userId); } public int calculateBattleWinRate(Long userId) { - List postVotes = voteRepository.findByUserId(userId).stream() + List postVotes = battleVoteRepository.findByUserId(userId).stream() .filter(v -> v.getPostVoteOption() != null) .toList(); - if (postVotes.isEmpty()) return 0; + if (postVotes.isEmpty()) { + return 0; + } long wins = postVotes.stream() .filter(v -> { @@ -62,27 +64,31 @@ public int calculateBattleWinRate(Long userId) { } public List findParticipatedBattleIds(Long userId) { - return voteRepository.findByUserId(userId).stream() + return battleVoteRepository.findByUserId(userId).stream() .map(v -> v.getBattle().getId()) .distinct() .toList(); } public List findFirstNBattleIds(Long userId, int n) { - return voteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() + return battleVoteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() .map(v -> v.getBattle().getId()) .distinct() .toList(); } public List findFirstNVotedOptionIds(Long userId, int n) { - return voteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() + return battleVoteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() .map(v -> { - if (v.getPostVoteOption() != null) return v.getPostVoteOption().getId(); - if (v.getPreVoteOption() != null) return v.getPreVoteOption().getId(); + if (v.getPostVoteOption() != null) { + return v.getPostVoteOption().getId(); + } + if (v.getPreVoteOption() != null) { + return v.getPreVoteOption().getId(); + } return null; }) - .filter(java.util.Objects::nonNull) + .filter(Objects::nonNull) .distinct() .toList(); } diff --git a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java index c61fd52d..78c1fc2b 100644 --- a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java @@ -43,12 +43,13 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { "/js/**", "/css/**", "/favicon.ico", "/api/v1/admin/login", "/api/v1/admin", "/result/**", - "/report/**", - "/battle/**", - "/.well-known/**", "/api/v1/resources/images/**", "/api/v1/resources/audio/**", - "/api/v1/admob/reward/**" + "/api/v1/resources/local/**", + "/api/v1/admob/reward/**", + "/report/**", + "/battle/**", + "/.well-known/**" ).permitAll() // 2. 관리자 HTML 화면 렌더링 요청 From 05b68f2cc8662255bdf1298d6f90a493b1703af7 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Sat, 11 Apr 2026 22:41:29 +0900 Subject: [PATCH 79/94] =?UTF-8?q?Revert=20"#140=20[Breaking=20Change]=20Ba?= =?UTF-8?q?ttle/Quiz/Poll=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20Vote=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=9E=AC=ED=8E=B8"=20(#163)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminBattleController.java | 51 +++ .../battle/controller/BattleController.java | 26 +- .../battle/converter/BattleConverter.java | 72 ++-- .../dto/request/AdminBattleCreateRequest.java | 24 ++ .../dto/request/AdminBattleOptionRequest.java | 16 + .../dto/request/AdminBattleUpdateRequest.java | 23 ++ .../response/AdminBattleDeleteResponse.java | 13 + .../response/AdminBattleDetailResponse.java | 36 ++ .../dto/response/BattleOptionResponse.java | 3 +- .../dto/response/BattleScenarioResponse.java | 3 +- .../dto/response/BattleSimpleResponse.java | 3 +- .../dto/response/BattleSummaryResponse.java | 28 +- .../response/BattleUserDetailResponse.java | 26 +- .../dto/response/BattleVoteResponse.java | 2 +- .../dto/response/TodayBattleListResponse.java | 2 +- .../dto/response/TodayBattleResponse.java | 32 +- .../dto/response/TodayOptionResponse.java | 18 +- .../picke/domain/battle/entity/Battle.java | 120 +++--- .../domain/battle/entity/BattleOption.java | 64 +-- .../picke/domain/battle/enums/BattleType.java | 5 + .../repository/BattleOptionRepository.java | 14 +- .../repository/BattleOptionTagRepository.java | 2 - .../battle/repository/BattleRepository.java | 77 ++-- .../domain/battle/service/BattleService.java | 53 ++- .../battle/service/BattleServiceImpl.java | 375 ++++-------------- .../home/controller/HomeController.java | 4 +- .../domain/home/service/HomeService.java | 215 +++++----- .../oauth/controller/AuthController.java | 2 +- .../controller/CommentLikeController.java | 4 +- .../PerspectiveCommentController.java | 6 +- .../controller/PerspectiveController.java | 13 +- .../controller/PerspectiveLikeController.java | 4 +- .../controller/ReportController.java | 2 +- .../service/PerspectiveCommentService.java | 12 +- .../service/PerspectiveService.java | 8 +- .../poll/controller/PollController.java | 38 -- .../domain/poll/converter/PollConverter.java | 85 ---- .../poll/dto/response/PollDetailResponse.java | 14 - .../poll/dto/response/PollListResponse.java | 13 - .../poll/dto/response/PollOptionResponse.java | 14 - .../poll/dto/response/PollSimpleResponse.java | 15 - .../poll/dto/response/PollTagResponse.java | 12 - .../swyp/picke/domain/poll/entity/Poll.java | 70 ---- .../picke/domain/poll/entity/PollOption.java | 65 --- .../poll/entity/PollOptionValueTagMap.java | 39 -- .../poll/entity/PollOptionValueTagMapId.java | 16 - .../picke/domain/poll/entity/PollTagMap.java | 39 -- .../domain/poll/entity/PollTagMapId.java | 16 - .../domain/poll/entity/PollUserVote.java | 43 -- .../domain/poll/enums/PollOptionLabel.java | 5 - .../picke/domain/poll/enums/PollStatus.java | 8 - .../poll/repository/PollOptionRepository.java | 14 - .../PollOptionValueTagMapRepository.java | 14 - .../poll/repository/PollRepository.java | 37 -- .../poll/repository/PollTagMapRepository.java | 14 - .../repository/PollUserVoteRepository.java | 16 - .../domain/poll/service/PollService.java | 35 -- .../domain/poll/service/PollServiceImpl.java | 186 --------- .../quiz/controller/QuizController.java | 38 -- .../domain/quiz/converter/QuizConverter.java | 85 ---- .../quiz/dto/response/QuizDetailResponse.java | 17 - .../quiz/dto/response/QuizListResponse.java | 13 - .../quiz/dto/response/QuizOptionResponse.java | 12 - .../quiz/dto/response/QuizSimpleResponse.java | 15 - .../quiz/dto/response/QuizTagResponse.java | 12 - .../swyp/picke/domain/quiz/entity/Quiz.java | 65 --- .../picke/domain/quiz/entity/QuizOption.java | 71 ---- .../quiz/entity/QuizOptionValueTagMap.java | 39 -- .../quiz/entity/QuizOptionValueTagMapId.java | 16 - .../picke/domain/quiz/entity/QuizTagMap.java | 39 -- .../domain/quiz/entity/QuizTagMapId.java | 16 - .../domain/quiz/entity/QuizUserVote.java | 43 -- .../domain/quiz/enums/QuizOptionLabel.java | 6 - .../picke/domain/quiz/enums/QuizStatus.java | 8 - .../quiz/repository/QuizOptionRepository.java | 14 - .../QuizOptionValueTagMapRepository.java | 14 - .../quiz/repository/QuizRepository.java | 37 -- .../quiz/repository/QuizTagMapRepository.java | 14 - .../repository/QuizUserVoteRepository.java | 16 - .../domain/quiz/service/QuizService.java | 35 -- .../domain/quiz/service/QuizServiceImpl.java | 189 --------- .../controller/RecommendationController.java | 4 +- .../service/RecommendationService.java | 12 +- .../controller/AdMobRewardController.java | 4 +- .../response/SearchBattleListResponse.java | 2 + .../domain/search/service/SearchService.java | 1 + .../domain/tag/controller/TagController.java | 49 ++- .../domain/tag/converter/TagConverter.java | 6 +- .../domain/tag/dto/request/TagRequest.java | 13 + .../tag/dto/response/TagDeleteResponse.java | 8 + .../tag/dto/response/TagListResponse.java | 1 - .../domain/tag/dto/response/TagResponse.java | 12 + .../picke/domain/tag/entity/CategoryTag.java | 35 -- .../domain/tag/entity/PhilosopherTag.java | 36 -- .../picke/domain/tag/entity/ValueTag.java | 36 -- .../tag/repository/CategoryTagRepository.java | 8 - .../repository/PhilosopherTagRepository.java | 8 - .../tag/repository/ValueTagRepository.java | 8 - .../picke/domain/tag/service/TagService.java | 7 +- .../domain/tag/service/TagServiceImpl.java | 19 +- .../test/controller/TestController.java | 34 ++ .../domain/user/service/MypageService.java | 20 +- .../domain/user/service/UserService.java | 4 +- .../vote/controller/VoteController.java | 85 ++-- .../domain/vote/converter/VoteConverter.java | 23 +- .../vote/dto/request/PollVoteRequest.java | 7 - .../vote/dto/request/QuizVoteRequest.java | 2 +- .../vote/dto/response/MyVoteResponse.java | 2 +- .../vote/dto/response/PollVoteResponse.java | 2 +- .../picke/domain/vote/entity/PollVote.java | 45 --- .../picke/domain/vote/entity/QuizVote.java | 24 +- .../entity/{BattleVote.java => Vote.java} | 26 +- .../vote/repository/PollVoteRepository.java | 14 - .../vote/repository/QuizVoteRepository.java | 12 +- ...oteRepository.java => VoteRepository.java} | 42 +- .../domain/vote/service/PollVoteService.java | 10 - .../vote/service/PollVoteServiceImpl.java | 140 ------- .../domain/vote/service/QuizVoteService.java | 4 +- .../vote/service/QuizVoteServiceImpl.java | 211 ++++++---- .../domain/vote/service/VoteQueryService.java | 46 +-- ...attleVoteService.java => VoteService.java} | 2 +- ...eServiceImpl.java => VoteServiceImpl.java} | 78 ++-- .../picke/global/config/SecurityConfig.java | 9 +- 123 files changed, 1092 insertions(+), 2999 deletions(-) create mode 100644 src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/controller/PollController.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/Poll.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/service/PollService.java delete mode 100644 src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java delete mode 100644 src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/test/controller/TestController.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java rename src/main/java/com/swyp/picke/domain/vote/entity/{BattleVote.java => Vote.java} (77%) delete mode 100644 src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java rename src/main/java/com/swyp/picke/domain/vote/repository/{BattleVoteRepository.java => VoteRepository.java} (51%) delete mode 100644 src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java rename src/main/java/com/swyp/picke/domain/vote/service/{BattleVoteService.java => VoteService.java} (95%) rename src/main/java/com/swyp/picke/domain/vote/service/{BattleVoteServiceImpl.java => VoteServiceImpl.java} (70%) diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java new file mode 100644 index 00000000..b115abc3 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java @@ -0,0 +1,51 @@ +package com.swyp.picke.domain.battle.controller; + +import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.battle.dto.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.battle.dto.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.battle.service.BattleService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "배틀 API (관리자)", description = "배틀 생성/수정/삭제 (관리자 전용)") +@RestController +@RequestMapping("/api/v1/admin/battles") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminBattleController { + + private final BattleService battleService; + + @Operation(summary = "배틀 생성") + @PostMapping + public ApiResponse createBattle( + @RequestBody @Valid AdminBattleCreateRequest request, + @AuthenticationPrincipal Long adminUserId + ) { + return ApiResponse.onSuccess(battleService.createBattle(request, adminUserId)); + } + + @Operation(summary = "배틀 수정 (변경 필드만 포함)") + @PatchMapping("/{battleId}") + public ApiResponse updateBattle( + @PathVariable Long battleId, + @RequestBody @Valid AdminBattleUpdateRequest request + ) { + return ApiResponse.onSuccess(battleService.updateBattle(battleId, request)); + } + + @Operation(summary = "배틀 삭제") + @DeleteMapping("/{battleId}") + public ApiResponse deleteBattle( + @PathVariable Long battleId + ) { + return ApiResponse.onSuccess(battleService.deleteBattle(battleId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java index eafacd8b..9450a078 100644 --- a/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java +++ b/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java @@ -10,13 +10,9 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -@Tag(name = "배틀 API", description = "배틀 조회") +@Tag(name = "배틀 API (사용자)", description = "배틀 조회") @RestController @RequestMapping("/api/v1/battles") @RequiredArgsConstructor @@ -24,34 +20,36 @@ public class BattleController { private final BattleService battleService; - @Operation(summary = "오늘의 배틀 목록 조회 (최대 5개)") + @Operation(summary = "오늘의 배틀 목록 조회 (스와이프 UI용, 최대 5개)") @GetMapping("/today") public ApiResponse getTodayBattles() { return ApiResponse.onSuccess(battleService.getTodayBattles()); } - @Operation(summary = "배틀 목록 조회") + @Operation(summary = "배틀 전체 목록 조회", description = "페이징 및 타입별(ALL, BATTLE, QUIZ, VOTE) 필터링된 배틀 목록을 조회합니다.") @GetMapping public ApiResponse getBattles( @Parameter(description = "페이지 번호 (1부터 시작)", example = "1") @RequestParam(value = "page", defaultValue = "1") int page, @Parameter(description = "페이지 크기", example = "10") @RequestParam(value = "size", defaultValue = "10") int size, - @Parameter(description = "콘텐츠 상태 (ALL, PENDING, PUBLISHED, REJECTED, ARCHIVED)", example = "ALL") - @RequestParam(value = "status", required = false, defaultValue = "ALL") String status + @Parameter(description = "콘텐츠 타입 (ALL, BATTLE, QUIZ, VOTE)", example = "ALL") + @RequestParam(value = "type", required = false, defaultValue = "ALL") String type ) { - return ApiResponse.onSuccess(battleService.getBattles(page, size, status)); + return ApiResponse.onSuccess(battleService.getBattles(page, size, type)); } @Operation(summary = "배틀 상세 조회") @GetMapping("/{battleId}") - public ApiResponse getBattleDetail(@PathVariable Long battleId) { + public ApiResponse getBattleDetail( + @PathVariable Long battleId + ) { return ApiResponse.onSuccess(battleService.getBattleDetail(battleId)); } - @Operation(summary = "사용자 배틀 진행 상태 조회") + @Operation(summary = "사용자 배틀 진행 상태 조회 (사전투표/TTS/사후투표)") @GetMapping("/{battleId}/status") public ApiResponse getUserBattleStatus(@PathVariable Long battleId) { return ApiResponse.onSuccess(battleService.getUserBattleStatus(battleId)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java index 71d5c27a..3511d521 100644 --- a/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java +++ b/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java @@ -1,22 +1,21 @@ package com.swyp.picke.domain.battle.converter; -import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; import com.swyp.picke.domain.battle.dto.response.*; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleCreatorType; +import com.swyp.picke.domain.user.enums.PhilosopherType; +import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.user.enums.VoteSide; import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import java.util.Comparator; import java.util.List; import java.util.Map; @@ -26,17 +25,21 @@ public class BattleConverter { private final ResourceUrlProvider urlProvider; private static final String BASE_SHARE_URL = "https://pique.app/battles/"; - private static final Comparator OPTION_SORTER = - Comparator.comparing((BattleOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) - .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) - .thenComparing(BattleOption::getId); public Battle toEntity(AdminBattleCreateRequest request, User admin) { return Battle.builder() .title(request.title()) + .titlePrefix(request.titlePrefix()) + .titleSuffix(request.titleSuffix()) + .itemA(request.itemA()) + .itemADesc(request.itemADesc()) + .itemB(request.itemB()) + .itemBDesc(request.itemBDesc()) .summary(request.summary()) .description(request.description()) .thumbnailUrl(request.thumbnailUrl()) + .type(request.type()) + .targetDate(request.targetDate()) .status(request.status()) .creatorType(BattleCreatorType.ADMIN) .creator(admin) @@ -49,11 +52,18 @@ public TodayBattleResponse toTodayResponse(Battle battle, List tags, List return new AdminBattleDetailResponse( battle.getId(), battle.getTitle(), + battle.getTitlePrefix(), + battle.getTitleSuffix(), battle.getSummary(), battle.getDescription(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), - battle.getAudioDuration(), + battle.getType(), + battle.getItemA(), + battle.getItemADesc(), + battle.getItemB(), + battle.getItemBDesc(), battle.getTargetDate(), battle.getStatus(), battle.getCreatorType(), @@ -94,6 +111,7 @@ public BattleUserDetailResponse toUserDetailResponse( battle.getTitle(), battle.getSummary(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), + battle.getType(), battle.getViewCount() == null ? 0 : battle.getViewCount(), participantsCount == null ? 0L : participantsCount, battle.getAudioDuration() == null ? 0 : battle.getAudioDuration(), @@ -103,6 +121,12 @@ public BattleUserDetailResponse toUserDetailResponse( return new BattleUserDetailResponse( summary, + battle.getTitlePrefix(), + battle.getTitleSuffix(), + battle.getItemA(), + battle.getItemADesc(), + battle.getItemB(), + battle.getItemBDesc(), battle.getDescription(), BASE_SHARE_URL + battle.getId(), userVoteStatus, @@ -119,7 +143,8 @@ public BattleScenarioResponse toScenarioResponse(Battle battle, List toOptionResponses(List options, Map> optionTagsMap) { if (options == null) return List.of(); return options.stream() - .sorted(OPTION_SORTER) .map(option -> { List optionTags = optionTagsMap.getOrDefault(option.getId(), List.of()); return new BattleOptionResponse( @@ -137,7 +161,8 @@ private List toOptionResponses(List options, option.getTitle(), option.getStance(), option.getRepresentative(), - urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()), + option.getQuote(), + urlProvider.getImageUrl(FileCategory.PHILOSOPHER, PhilosopherType.resolveImageKey(option.getRepresentative())), toTagResponses(optionTags, null) ); }).toList(); @@ -145,16 +170,15 @@ private List toOptionResponses(List options, private List toTodayOptionResponses(List options) { if (options == null) return List.of(); - return options.stream() - .sorted(OPTION_SORTER) - .map(option -> new TodayOptionResponse( - option.getId(), - option.getLabel(), - option.getTitle(), - option.getRepresentative(), - option.getStance(), - urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()) - )).toList(); + return options.stream().map(option -> new TodayOptionResponse( + option.getId(), + option.getLabel(), + option.getTitle(), + option.getRepresentative(), + option.getStance(), + urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()), + option.getIsCorrect() + )).toList(); } private List toTagResponses(List tags, TagType targetType) { @@ -164,4 +188,4 @@ private List toTagResponses(List tags, TagType targetTyp .map(tag -> new BattleTagResponse(tag.getId(), tag.getName(), tag.getType())) .toList(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java new file mode 100644 index 00000000..48aa5b4a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java @@ -0,0 +1,24 @@ +package com.swyp.picke.domain.battle.dto.request; + +import com.swyp.picke.domain.battle.enums.BattleStatus; +import com.swyp.picke.domain.battle.enums.BattleType; +import java.time.LocalDate; +import java.util.List; + +public record AdminBattleCreateRequest( + String title, + String titlePrefix, + String titleSuffix, + String summary, + String description, + String thumbnailUrl, + BattleType type, + BattleStatus status, + String itemA, + String itemADesc, + String itemB, + String itemBDesc, + LocalDate targetDate, + List tagIds, + List options +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java new file mode 100644 index 00000000..36c1c212 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.battle.dto.request; + +import com.swyp.picke.domain.battle.enums.BattleOptionLabel; + +import java.util.List; + +public record AdminBattleOptionRequest( + BattleOptionLabel label, + String title, + String stance, + String representative, + String quote, + String imageUrl, + Boolean isCorrect, + List tagIds // 옵션 전용 태그 (철학자, 가치관 - 추후 사용자 유형 분석에 사용) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java new file mode 100644 index 00000000..aa5e4477 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java @@ -0,0 +1,23 @@ +package com.swyp.picke.domain.battle.dto.request; + +import com.swyp.picke.domain.battle.enums.BattleStatus; +import java.time.LocalDate; +import java.util.List; + +public record AdminBattleUpdateRequest( + String title, + String titlePrefix, + String titleSuffix, + String summary, + String description, + String thumbnailUrl, + String itemA, + String itemADesc, + String itemB, + String itemBDesc, + LocalDate targetDate, + Integer audioDuration, + BattleStatus status, + List tagIds, + List options +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java new file mode 100644 index 00000000..43c64d66 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.battle.dto.response; + +import java.time.LocalDateTime; + +/** + * 관리자 - 배틀 삭제 응답 + * 역할: 배틀이 성공적으로 소프트 딜리트 되었는지 확인하고 삭제 시점을 반환합니다. + */ + +public record AdminBattleDeleteResponse( + Boolean success, // 삭제 성공 여부 + LocalDateTime deletedAt // 삭제 처리된 일시 (Soft Delete) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java new file mode 100644 index 00000000..fd382332 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.battle.dto.response; + +import com.swyp.picke.domain.battle.enums.BattleCreatorType; +import com.swyp.picke.domain.battle.enums.BattleStatus; +import com.swyp.picke.domain.battle.enums.BattleType; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 관리자 - 배틀 상세 상세 조회 응답 + * 역할: 관리자가 배틀의 모든 설정 값(상태, 생성자 타입, 수정일 등)을 확인하고 수정할 때 사용합니다. + */ + +public record AdminBattleDetailResponse( + Long battleId, + String title, + String titlePrefix, + String titleSuffix, + String summary, + String description, + String thumbnailUrl, + BattleType type, + String itemA, + String itemADesc, + String itemB, + String itemBDesc, + LocalDate targetDate, + BattleStatus status, + BattleCreatorType creatorType, + List tags, + List options, + LocalDateTime createdAt, + LocalDateTime updatedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java index ce34930d..51ca1760 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java @@ -10,6 +10,7 @@ public record BattleOptionResponse( String title, String stance, String representative, + String quote, String imageUrl, List tags -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java index 1208010c..de611ff9 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java @@ -10,6 +10,7 @@ public record PhilosopherProfileResponse( String label, String name, String stance, + String quote, String imageUrl ) {} -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java index 6ce79150..feef39fa 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java @@ -6,6 +6,7 @@ public record BattleSimpleResponse( Long battleId, String title, String thumbnailUrl, + String type, String status, LocalDateTime createdAt -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java index 60cd7f24..cd39f4d5 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java @@ -1,15 +1,23 @@ package com.swyp.picke.domain.battle.dto.response; +import com.swyp.picke.domain.battle.enums.BattleType; + import java.util.List; +/** + * 유저 - 배틀 요약 정보 응답 + * 역할: 홈 화면의 각 섹션 카드나 리스트에서 '미리보기' 형태로 보여줄 데이터입니다. + */ + public record BattleSummaryResponse( - Long battleId, - String title, - String summary, - String thumbnailUrl, - Integer viewCount, - Long participantsCount, - Integer audioDuration, - List tags, - List options -) {} + Long battleId, // 배틀 고유 ID + String title, // 배틀 제목 + String summary, // 배틀 요약 (누군가는 이것을...) + String thumbnailUrl, // 카드 배경 이미지 URL + BattleType type, // 배틀 타입 태그 (#BATTLE, #VOTE 등) + Integer viewCount, // 조회수 + Long participantsCount, // 누적 참여자 수 + Integer audioDuration, // 오디오 소요 시간 + List tags, // 카테고리/인물 태그 리스트 + List options // 선택지 요약 (A vs B) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java index 9b50d068..b08b9455 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java @@ -5,13 +5,23 @@ import java.util.List; +/** + * 유저 - 배틀 상세 페이지 응답 (시안 4, 5번) + * 역할: 배틀 클릭 시 진입하는 상세 화면의 모든 정보를 담습니다. 투표 여부에 따라 UI가 변합니다. + */ public record BattleUserDetailResponse( - BattleSummaryResponse battleInfo, - String description, - String shareUrl, - VoteSide userVoteStatus, + BattleSummaryResponse battleInfo, // 기본적인 배틀 정보 (요약 DTO 재사용) + String titlePrefix, + String titleSuffix, + String itemA, + String itemADesc, + String itemB, + String itemBDesc, + String description, // 상세 본문 설명 + String shareUrl, // 공유하기 버튼용 링크 + VoteSide userVoteStatus, // 현재 유저의 투표 상태 UserBattleStep currentStep, - List categoryTags, - List philosopherTags, - List valueTags -) {} + List categoryTags, // UI 상단용 카테고리 태그 + List philosopherTags, // UI 하단용 철학자 태그 + List valueTags // 성향 분석용 가치관 태그 +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java index fe2cdac5..64720c5b 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java @@ -12,4 +12,4 @@ public record BattleVoteResponse( Long selectedOptionId, // 유저가 방금 선택한 옵션 ID Long totalParticipants, // 실시간 전체 참여자 수 List results // 옵션별 득표 현황 리스트 -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java index 235a7f26..26e9567f 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java @@ -10,4 +10,4 @@ public record TodayBattleListResponse( List items, // 오늘의 배틀 리스트 Integer totalCount // 목록 총 개수 -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java index 097a0061..8b14041d 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java @@ -1,15 +1,29 @@ package com.swyp.picke.domain.battle.dto.response; +import com.swyp.picke.domain.battle.enums.BattleType; + import java.util.List; +/** + * 유저 - 오늘의 배틀 상세 응답 (시안 6번) + * 역할: 어두운 배경의 풀스크린 UI에 필요한 배경 이미지, 시간 등을 담습니다. + */ public record TodayBattleResponse( - Long battleId, - String title, - String summary, - String thumbnailUrl, - Integer viewCount, - Long participantsCount, - Integer audioDuration, - List tags, - List options + Long battleId, // 배틀 고유 ID + String title, // 배틀 제목 + String summary, // 중간 요약 문구 + String thumbnailUrl, // 풀스크린 배경 이미지 URL + BattleType type, // 타입 태그 + Integer viewCount, // 조회수 + Long participantsCount, // 누적 참여자 수 + Integer audioDuration, // 소요 시간 (분:초 변환용 데이터) + List tags, // 상단 태그 리스트 + List options, // 중앙 세로형 대결 카드 데이터 + // 퀴즈·투표 전용 필드 + String titlePrefix, // 투표 접두사 (예: "도덕의 기준은") + String titleSuffix, // 투표 접미사 (예: "이다") + String itemA, // 퀴즈 O 선택지 + String itemADesc, // 퀴즈 O 설명 + String itemB, // 퀴즈 X 선택지 + String itemBDesc // 퀴즈 X 설명 ) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java index 2da90246..2fd15871 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java @@ -2,11 +2,17 @@ import com.swyp.picke.domain.battle.enums.BattleOptionLabel; +/** + * 유저 - 오늘의 배틀 전용 옵션 응답 + * 역할: 오늘의 배틀 시안의 세로형 카드에 들어가는 인물, 입장, 아바타 정보를 담습니다. + */ + public record TodayOptionResponse( - Long optionId, - BattleOptionLabel label, - String title, - String representative, - String stance, - String imageUrl + Long optionId, // 옵션 ID + BattleOptionLabel label,// 라벨 (A, B) + String title, // 제목 (예: 찬성한다) + String representative, // 인물 (예: 피터 싱어) + String stance, // 한 줄 입장 (예: 고통을 끝낼 권리는..) + String imageUrl, // 아바타 이미지 URL + Boolean isCorrect // 퀴즈 정답 여부 ) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java b/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java index e9905040..7a3ac8d5 100644 --- a/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java +++ b/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java @@ -2,27 +2,18 @@ import com.swyp.picke.domain.battle.enums.BattleCreatorType; import com.swyp.picke.domain.battle.enums.BattleStatus; +import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import java.time.LocalDate; +import java.time.LocalDateTime; + @Getter @Entity @Table(name = "battles") @@ -40,6 +31,28 @@ public class Battle extends BaseEntity { @Column(name = "thumbnail_url", length = 500) private String thumbnailUrl; + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private BattleType type; + + @Column(name = "title_prefix") + private String titlePrefix; + + @Column(name = "title_suffix") + private String titleSuffix; + + @Column(name = "item_a") + private String itemA; + + @Column(name = "item_a_desc") + private String itemADesc; + + @Column(name = "item_b") + private String itemB; + + @Column(name = "item_b_desc") + private String itemBDesc; + @Column(name = "view_count") private Integer viewCount = 0; @@ -64,8 +77,7 @@ public class Battle extends BaseEntity { @JoinColumn(name = "creator_id") private User creator; - @OneToMany(mappedBy = "battle", cascade = CascadeType.ALL, orphanRemoval = true) - private final List options = new ArrayList<>(); + // 홈 화면 5단 기획을 위한 필드들 @Column(name = "is_editor_pick") private Boolean isEditorPick = false; @@ -77,21 +89,22 @@ public class Battle extends BaseEntity { private LocalDateTime deletedAt; @Builder - public Battle( - String title, - String summary, - String description, - String thumbnailUrl, - LocalDate targetDate, - Integer audioDuration, - BattleStatus status, - BattleCreatorType creatorType, - User creator - ) { + public Battle(String title, String summary, String description, String thumbnailUrl, + BattleType type, String titlePrefix, String titleSuffix, + String itemA, String itemADesc, String itemB, String itemBDesc, + LocalDate targetDate, Integer audioDuration, BattleStatus status, + BattleCreatorType creatorType, User creator) { this.title = title; this.summary = summary; this.description = description; this.thumbnailUrl = thumbnailUrl; + this.type = type; + this.titlePrefix = titlePrefix; + this.titleSuffix = titleSuffix; + this.itemA = itemA; + this.itemADesc = itemADesc; + this.itemB = itemB; + this.itemBDesc = itemBDesc; this.targetDate = targetDate; this.audioDuration = audioDuration; this.status = status; @@ -104,34 +117,26 @@ public Battle( this.deletedAt = null; } - public void update( - String title, - String summary, - String description, - String thumbnailUrl, - BattleStatus status - ) { - if (title != null) { - this.title = title; - } - if (summary != null) { - this.summary = summary; - } - if (description != null) { - this.description = description; - } - if (thumbnailUrl != null) { - this.thumbnailUrl = thumbnailUrl; - } - if (targetDate != null) { - this.targetDate = targetDate; - } - if (audioDuration != null) { - this.audioDuration = audioDuration; - } - if (status != null) { - this.status = status; - } + public void update(String title, String titlePrefix, String titleSuffix, + String itemA, String itemADesc, String itemB, String itemBDesc, + String summary, String description, + String thumbnailUrl, LocalDate targetDate, + Integer audioDuration, BattleStatus status) { + if (title != null) this.title = title; + if (titlePrefix != null) this.titlePrefix = titlePrefix; + if (titleSuffix != null) this.titleSuffix = titleSuffix; + + if (itemA != null) this.itemA = itemA; + if (itemADesc != null) this.itemADesc = itemADesc; + if (itemB != null) this.itemB = itemB; + if (itemBDesc != null) this.itemBDesc = itemBDesc; + + if (summary != null) this.summary = summary; + if (description != null) this.description = description; + if (thumbnailUrl != null) this.thumbnailUrl = thumbnailUrl; + if (targetDate != null) this.targetDate = targetDate; + if (audioDuration != null) this.audioDuration = audioDuration; + if (status != null) this.status = status; } public void delete() { @@ -150,9 +155,4 @@ public void addParticipant() { public void updateAudioDuration(Integer audioDuration) { this.audioDuration = audioDuration; } - - public void updateTargetDate(LocalDate targetDate) { - this.targetDate = targetDate; - } - } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java b/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java index ab5ee23a..8be17ceb 100644 --- a/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java +++ b/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java @@ -2,18 +2,7 @@ import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import java.util.ArrayList; -import java.util.List; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -42,35 +31,29 @@ public class BattleOption extends BaseEntity { @Column(length = 100) private String representative; + @Column(columnDefinition = "TEXT") + private String quote; + @Column(name = "vote_count") private Long voteCount = 0L; + @Column(name = "is_correct") + private Boolean isCorrect = false; + @Column(name = "image_url", length = 500) private String imageUrl; - @Column(name = "display_order") - private Integer displayOrder; - - @OneToMany(mappedBy = "battleOption", cascade = CascadeType.ALL, orphanRemoval = true) - private final List tags = new ArrayList<>(); - @Builder - public BattleOption( - Battle battle, - BattleOptionLabel label, - String title, - String stance, - String representative, - String imageUrl, - Integer displayOrder - ) { + public BattleOption(Battle battle, BattleOptionLabel label, String title, String stance, + String representative, String quote, String imageUrl, Boolean isCorrect) { this.battle = battle; this.label = label; this.title = title; this.stance = stance; this.representative = representative; + this.quote = quote; this.imageUrl = imageUrl; - this.displayOrder = displayOrder; + this.isCorrect = (isCorrect != null) && isCorrect; this.voteCount = 0L; } @@ -84,21 +67,12 @@ public void decreaseVoteCount() { } } - public void update(String title, String stance, String representative, String imageUrl) { - if (title != null) { - this.title = title; - } - if (stance != null) { - this.stance = stance; - } - if (representative != null) { - this.representative = representative; - } - if (imageUrl != null) { - this.imageUrl = imageUrl; - } - if (displayOrder != null) { - this.displayOrder = displayOrder; - } + public void update(String title, String stance, String representative, String quote, String imageUrl, Boolean isCorrect) { + if (title != null) this.title = title; + if (stance != null) this.stance = stance; + if (representative != null) this.representative = representative; + if (quote != null) this.quote = quote; + if (imageUrl != null) this.imageUrl = imageUrl; + if (isCorrect != null) this.isCorrect = isCorrect; } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java new file mode 100644 index 00000000..648e1eff --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java @@ -0,0 +1,5 @@ +package com.swyp.picke.domain.battle.enums; + +public enum BattleType { + BATTLE, QUIZ, VOTE +} diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java index 2260ed8e..d30f2a8e 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java @@ -4,23 +4,13 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import java.util.List; import java.util.Optional; public interface BattleOptionRepository extends JpaRepository { - @Query("SELECT bo FROM BattleOption bo " + - "WHERE bo.battle = :battle " + - "ORDER BY COALESCE(bo.displayOrder, 9999), bo.label, bo.id") - List findByBattle(@Param("battle") Battle battle); - + List findByBattle(Battle battle); Optional findByBattleAndLabel(Battle battle, BattleOptionLabel label); - - @Query("SELECT bo FROM BattleOption bo " + - "WHERE bo.battle IN :battles " + - "ORDER BY bo.battle.id, COALESCE(bo.displayOrder, 9999), bo.label, bo.id") - List findByBattleIn(@Param("battles") List battles); + List findByBattleIn(List battles); } diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java index 23f0d3dd..fb2ffce2 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java @@ -3,7 +3,6 @@ import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.entity.BattleOptionTag; -import com.swyp.picke.domain.tag.entity.Tag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -12,7 +11,6 @@ public interface BattleOptionTagRepository extends JpaRepository { List findByBattleOption(BattleOption battleOption); - boolean existsByTag(Tag tag); @Query("SELECT bot FROM BattleOptionTag bot JOIN FETCH bot.tag WHERE bot.battleOption.battle = :battle") List findByBattleWithTags(@Param("battle") Battle battle); diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java index d4d5dd31..c4aa3d8d 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java @@ -2,103 +2,100 @@ import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.enums.BattleStatus; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; -import org.springframework.data.domain.Page; +import com.swyp.picke.domain.battle.enums.BattleType; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.data.domain.Page; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; public interface BattleRepository extends JpaRepository { - // 1. EDITOR PICK + // 1. EDITOR PICK - type 파라미터 추가 @Query("SELECT battle FROM Battle battle " + "WHERE battle.isEditorPick = true AND battle.status = :status " + - "AND battle.deletedAt IS NULL " + + "AND battle.type = :type AND battle.deletedAt IS NULL " + "ORDER BY battle.createdAt DESC") - List findEditorPicks(@Param("status") BattleStatus status, Pageable pageable); + List findEditorPicks(@Param("status") BattleStatus status, @Param("type") BattleType type, Pageable pageable); - // 2. 지금 뜨는 배틀 - @Query("SELECT battle FROM Battle battle JOIN BattleVote vote ON vote.battle = battle " + - "WHERE vote.createdAt >= :yesterday " + + // 2. 지금 뜨는 배틀 - type 파라미터 추가 + @Query("SELECT battle FROM Battle battle JOIN Vote vote ON vote.battle = battle " + + "WHERE vote.createdAt >= :yesterday AND battle.type = :type " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "GROUP BY battle ORDER BY COUNT(vote) DESC") - List findTrendingBattles(@Param("yesterday") LocalDateTime yesterday, Pageable pageable); + List findTrendingBattles(@Param("yesterday") LocalDateTime yesterday, @Param("type") BattleType type, Pageable pageable); - // 3. Best 배틀 + // 3. Best 배틀 - type 파라미터 추가 @Query("SELECT battle FROM Battle battle " + - "WHERE battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + + "WHERE battle.status = 'PUBLISHED' AND battle.type = :type AND battle.deletedAt IS NULL " + "ORDER BY (battle.totalParticipantsCount + (battle.commentCount * 5)) DESC") - List findBestBattles(Pageable pageable); + List findBestBattles(@Param("type") BattleType type, Pageable pageable); // 4. 오늘의 Pické @Query("SELECT battle FROM Battle battle " + - "WHERE battle.targetDate = :today " + + "WHERE battle.type = :type AND battle.targetDate = :today " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL") - List findTodayPicks(@Param("today") LocalDate today, Pageable pageable); + List findTodayPicks(@Param("type") BattleType type, @Param("today") LocalDate today, Pageable pageable); - // 5. 새로운 배틀 + // 5. 새로운 배틀 - type 파라미터 추가 @Query("SELECT battle FROM Battle battle " + - "WHERE battle.status = 'PUBLISHED' " + - "AND battle.deletedAt IS NULL " + - "AND (battle.targetDate IS NULL OR battle.targetDate < :today) " + - "ORDER BY CASE WHEN battle.targetDate IS NULL THEN 0 ELSE 1 END, battle.targetDate ASC, battle.createdAt ASC") - List findAutoAssignableTodayPicks(@Param("today") LocalDate today, Pageable pageable); - - @Query("SELECT battle FROM Battle battle " + - "WHERE battle.id NOT IN :excludeIds " + + "WHERE battle.id NOT IN :excludeIds AND battle.type = :type " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "ORDER BY battle.createdAt DESC") - List findNewBattlesExcluding(@Param("excludeIds") List excludeIds, Pageable pageable); + List findNewBattlesExcluding(@Param("excludeIds") List excludeIds, @Param("type") BattleType type, Pageable pageable); - // 6. 전체 배틀 목록 조회 + // 6. 전체 배틀 목록 조회 (페이징, 삭제된 항목 제외, 최신순) Page findByDeletedAtIsNullOrderByCreatedAtDesc(Pageable pageable); - Page findByStatusAndDeletedAtIsNullOrderByCreatedAtDesc(BattleStatus status, Pageable pageable); + Page findByTypeAndDeletedAtIsNullOrderByCreatedAtDesc(BattleType type, Pageable pageable); // 기본 조회용 List findByTargetDateAndStatusAndDeletedAtIsNull(LocalDate date, BattleStatus status); - // 탐색 탭: 전체 배틀 검색 - @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + List findByTargetDateAndStatusAndTypeAndDeletedAtIsNull(LocalDate targetDate, BattleStatus status, BattleType type); + + // 탐색 탭: 전체 배틀 검색 (정렬은 Pageable Sort로 처리) + @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") List searchAll(Pageable pageable); - @Query("SELECT COUNT(b) FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + @Query("SELECT COUNT(b) FROM Battle b WHERE b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") long countSearchAll(); // 탐색 탭: 카테고리 태그 필터 배틀 검색 @Query("SELECT DISTINCT b FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + - "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + - "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") List searchByCategory(@Param("categoryName") String categoryName, Pageable pageable); @Query("SELECT COUNT(DISTINCT b) FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + - "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + - "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") long countSearchByCategory(@Param("categoryName") String categoryName); // 추천 폴백용: 전체 배틀 대상 인기 점수순 조회 (철학자 유형 로직 미구현 시 사용) // Score = V*1.0 + C*1.5 + Vw*0.2 @Query("SELECT b FROM Battle b " + "WHERE b.id NOT IN :excludeBattleIds " + + "AND b.type = 'BATTLE' " + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") List findPopularBattlesExcluding( @Param("excludeBattleIds") List excludeBattleIds, - Pageable pageable - ); + Pageable pageable); // 추천용: 특정 유저들이 참여한 배틀 중 이미 참여한 배틀 제외하고 인기 점수순 조회 // Score = V*1.0 + C*1.5 + Vw*0.2 (R은 추후 반영 예정) @Query("SELECT b FROM Battle b " + "WHERE b.id IN :candidateBattleIds " + "AND b.id NOT IN :excludeBattleIds " + + "AND b.type = 'BATTLE' " + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") List findRecommendedBattles( @Param("candidateBattleIds") List candidateBattleIds, @Param("excludeBattleIds") List excludeBattleIds, - Pageable pageable - ); -} + Pageable pageable); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java b/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java index a5d1df46..baf96eb4 100644 --- a/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java +++ b/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java @@ -1,56 +1,67 @@ package com.swyp.picke.domain.battle.service; -import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; -import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; -import com.swyp.picke.domain.battle.dto.response.BattleListResponse; -import com.swyp.picke.domain.battle.dto.response.BattleScenarioResponse; -import com.swyp.picke.domain.battle.dto.response.BattleUserDetailResponse; -import com.swyp.picke.domain.battle.dto.response.BattleVoteResponse; -import com.swyp.picke.domain.battle.dto.response.TodayBattleListResponse; -import com.swyp.picke.domain.battle.dto.response.TodayBattleResponse; +import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.battle.dto.response.*; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; +import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; + import java.util.List; public interface BattleService { + // === [내부 공통/조회 메서드] === Battle findById(Long battleId); - BattleOption findOptionById(Long optionId); - BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabel label); - List getEditorPicks(); + // === [사용자용 - 홈 화면 5단 로직 지원 API] === + + // 1. 에디터 픽 조회 (isEditorPick = true) + List getEditorPicks(int limit); - List getTrendingBattles(); + // 2. 지금 뜨는 배틀 조회 (최근 24시간 투표 급증순) + List getTrendingBattles(int limit); - List getBestBattles(); + // 3. Best 배틀 조회 (누적 지표 랭킹) + List getBestBattles(int limit); - List getTodayPicks(); + // 4. 오늘의 Pické 조회 (단일 타입 매칭) + List getTodayPicks(BattleType type, int limit); - List getNewBattles(List excludeIds); + // 5. 새로운 배틀 조회 (중복 제외 리스트) + List getNewBattles(List excludeIds, int limit); - BattleListResponse getBattles(int page, int size, String status); + // === [사용자용 - 기본 API] === + + // 전체 배틀 목록 페이징 조회 + BattleListResponse getBattles(int page, int size, String type); + + // 오늘의 배틀 (기존 로직 유지용) TodayBattleListResponse getTodayBattles(); + // 배틀 상세 정보 BattleUserDetailResponse getBattleDetail(Long battleId); - BattleVoteResponse BattleVote(Long battleId, Long optionId); + // 투표 실행 및 실시간 통계 결과 반환 + BattleVoteResponse vote(Long battleId, Long optionId); BattleScenarioResponse getBattleScenario(Long battleId); UserBattleStatusResponse getUserBattleStatus(Long battleId); - AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, Long adminUserId); + // === [관리자용 API] === - AdminBattleDetailResponse getAdminBattleDetail(Long battleId); + // 배틀 생성 + AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, Long adminUserId); + // 배틀 수정 AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request); + // 배틀 삭제 (DB에서 지우지 않고 소프트 딜리트/상태변경을 수행합니다) AdminBattleDeleteResponse deleteBattle(Long battleId); } diff --git a/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java index e8b59d6c..5956d719 100644 --- a/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java @@ -1,11 +1,8 @@ package com.swyp.picke.domain.battle.service; import com.swyp.picke.domain.battle.converter.BattleConverter; -import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleOptionRequest; -import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; -import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; import com.swyp.picke.domain.battle.dto.response.*; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; @@ -13,6 +10,7 @@ import com.swyp.picke.domain.battle.entity.BattleTag; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.domain.battle.enums.BattleStatus; +import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.battle.repository.BattleOptionRepository; @@ -20,18 +18,15 @@ import com.swyp.picke.domain.battle.repository.BattleRepository; import com.swyp.picke.domain.battle.repository.BattleTagRepository; import com.swyp.picke.domain.tag.entity.Tag; -import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.repository.TagRepository; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.enums.VoteSide; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.user.service.UserBattleService; -import com.swyp.picke.domain.vote.entity.BattleVote; -import com.swyp.picke.domain.vote.repository.BattleVoteRepository; +import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.repository.VoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; -import com.swyp.picke.global.infra.local.service.LocalDraftFileStorageService; -import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.service.S3UploadService; import com.swyp.picke.global.util.SecurityUtil; import lombok.RequiredArgsConstructor; @@ -43,9 +38,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import java.net.URI; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.*; import java.util.stream.Collectors; @@ -54,23 +46,15 @@ @Transactional(readOnly = true) public class BattleServiceImpl implements BattleService { - private static final int HOME_EDITOR_PICK_LIMIT = 10; - private static final int HOME_TRENDING_LIMIT = 4; - private static final int HOME_BEST_LIMIT = 3; - private static final int HOME_TODAY_PICK_LIMIT = 1; - private static final int HOME_NEW_LIMIT = 3; - private static final Pattern RESOURCE_IMAGE_PATH_PATTERN = Pattern.compile("/api/v1/resources/images/([A-Z_]+)/(.+)"); - private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; private final BattleTagRepository battleTagRepository; private final BattleOptionTagRepository battleOptionTagRepository; private final TagRepository tagRepository; private final UserRepository userRepository; - private final BattleVoteRepository battleVoteRepository; + private final VoteRepository voteRepository; private final BattleConverter battleConverter; private final S3UploadService s3UploadService; - private final LocalDraftFileStorageService localDraftFileStorageService; private final UserBattleService userBattleService; @Override @@ -84,81 +68,49 @@ public Battle findById(Long battleId) { } @Override - public List getEditorPicks() { - return loadEditorPicks(HOME_EDITOR_PICK_LIMIT); - } - - @Override - public List getTrendingBattles() { - return loadTrendingBattles(HOME_TRENDING_LIMIT); - } - - @Override - public List getBestBattles() { - return loadBestBattles(HOME_BEST_LIMIT); - } - - @Override - @Transactional - public List getTodayPicks() { - return loadTodayPicks(HOME_TODAY_PICK_LIMIT); - } - - @Override - public List getNewBattles(List excludeIds) { - return loadNewBattles(excludeIds, HOME_NEW_LIMIT); - } - - private List loadEditorPicks(int limit) { - int safeLimit = Math.max(1, limit); - List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, PageRequest.of(0, safeLimit)); + public List getEditorPicks(int limit) { + List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, BattleType.BATTLE, PageRequest.of(0, limit)); return convertToTodayResponses(battles); } - private List loadTrendingBattles(int limit) { - int safeLimit = Math.max(1, limit); + @Override + public List getTrendingBattles(int limit) { LocalDateTime yesterday = LocalDateTime.now().minusDays(1); - List battles = battleRepository.findTrendingBattles(yesterday, PageRequest.of(0, safeLimit)); + List battles = battleRepository.findTrendingBattles(yesterday, BattleType.BATTLE, PageRequest.of(0, limit)); return convertToTodayResponses(battles); } - private List loadBestBattles(int limit) { - int safeLimit = Math.max(1, limit); - List battles = battleRepository.findBestBattles(PageRequest.of(0, safeLimit)); + @Override + public List getBestBattles(int limit) { + List battles = battleRepository.findBestBattles(BattleType.BATTLE, PageRequest.of(0, limit)); return convertToTodayResponses(battles); } - private List loadTodayPicks(int limit) { - int safeLimit = Math.max(1, limit); - LocalDate today = LocalDate.now(); - ensureTodayPicks(today, safeLimit); - - List battles = battleRepository.findTodayPicks(today, PageRequest.of(0, safeLimit)); + @Override + public List getTodayPicks(BattleType type, int limit) { + List battles = battleRepository.findTodayPicks(type, LocalDate.now(), PageRequest.of(0, limit)); return convertToTodayResponses(battles); } - private List loadNewBattles(List excludeIds, int limit) { - int safeLimit = Math.max(1, limit); + @Override + public List getNewBattles(List excludeIds, int limit) { List finalExcludeIds = (excludeIds == null || excludeIds.isEmpty()) ? List.of(-1L) : excludeIds; - List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, PageRequest.of(0, safeLimit)); + List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, BattleType.BATTLE, PageRequest.of(0, limit)); return convertToTodayResponses(battles); } @Override - public BattleListResponse getBattles(int page, int size, String status) { + public BattleListResponse getBattles(int page, int size, String type) { int pageNumber = Math.max(0, page - 1); PageRequest pageRequest = PageRequest.of(pageNumber, size); - BattleStatus battleStatusFilter = parseBattleStatus(status); - Page battlePage; - if (battleStatusFilter == null) { + + if (type == null || type.equals("ALL")) { battlePage = battleRepository.findByDeletedAtIsNullOrderByCreatedAtDesc(pageRequest); } else { - battlePage = battleRepository.findByStatusAndDeletedAtIsNullOrderByCreatedAtDesc( - battleStatusFilter, - pageRequest - ); + battlePage = battleRepository.findByTypeAndDeletedAtIsNullOrderByCreatedAtDesc( + BattleType.valueOf(type), pageRequest); } List items = battlePage.getContent().stream() @@ -174,11 +126,9 @@ public BattleListResponse getBattles(int page, int size, String status) { } @Override - @Transactional public TodayBattleListResponse getTodayBattles() { - LocalDate today = LocalDate.now(); - ensureTodayPicks(today, 5); - List battles = battleRepository.findByTargetDateAndStatusAndDeletedAtIsNull(today, BattleStatus.PUBLISHED); + List battles = battleRepository.findByTargetDateAndStatusAndTypeAndDeletedAtIsNull( + LocalDate.now(), BattleStatus.PUBLISHED, BattleType.BATTLE); List limitedBattles = battles.stream() .limit(5) @@ -189,17 +139,6 @@ public TodayBattleListResponse getTodayBattles() { return new TodayBattleListResponse(items, items.size()); } - private void ensureTodayPicks(LocalDate today, int requiredCount) { - List todays = battleRepository.findTodayPicks(today, PageRequest.of(0, requiredCount)); - int missingCount = requiredCount - todays.size(); - if (missingCount <= 0) return; - - List candidates = battleRepository.findAutoAssignableTodayPicks(today, PageRequest.of(0, missingCount)); - for (Battle candidate : candidates) { - candidate.updateTargetDate(today); - } - } - @Override @Transactional(readOnly = true) public BattleUserDetailResponse getBattleDetail(Long battleId) { @@ -219,11 +158,11 @@ public BattleUserDetailResponse getBattleDetail(Long battleId) { UserBattleStatusResponse statusResponse = userBattleService.getUserBattleStatus(user, battle); UserBattleStep currentStep = statusResponse.step(); - Optional optionalVote = battleVoteRepository.findByBattleIdAndUserIdWithOption(battleId, currentUserId); + Optional optionalVote = voteRepository.findByBattleIdAndUserIdWithOption(battleId, currentUserId); VoteSide voteStatus = optionalVote - .map(BattleVote -> { - if (BattleVote.getPostVoteOption() != null) { - return BattleVote.getPostVoteOption().getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; + .map(vote -> { + if (vote.getPostVoteOption() != null) { + return vote.getPostVoteOption().getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; } return null; }) @@ -256,7 +195,7 @@ public UserBattleStatusResponse getUserBattleStatus(Long battleId) { @Override @Transactional - public BattleVoteResponse BattleVote(Long battleId, Long optionId) { + public BattleVoteResponse vote(Long battleId, Long optionId) { Battle battle = findById(battleId); BattleOption newOption = battleOptionRepository.findById(optionId) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); @@ -265,7 +204,7 @@ public BattleVoteResponse BattleVote(Long battleId, Long optionId) { User user = userRepository.findById(currentUserId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - battleVoteRepository.save(BattleVote.builder() + voteRepository.save(Vote.builder() .user(user) .battle(battle) .preVoteOption(newOption) @@ -293,46 +232,29 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, User admin = userRepository.findById(adminUserId == null ? 1L : adminUserId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - validateBattleOptionCount(request.options()); - - String resolvedThumbnailKey = resolveStoredImageKey(request.thumbnailUrl(), request.status(), FileCategory.BATTLE); - Battle battle = battleConverter.toEntity(request, admin); - battle.update( - request.title(), - request.summary(), - request.description(), - resolvedThumbnailKey, - request.status() - ); - battle = battleRepository.save(battle); + Battle battle = battleRepository.save(battleConverter.toEntity(request, admin)); if (request.tagIds() != null) { saveBattleTags(battle, request.tagIds().stream().distinct().toList()); } List savedOptions = new ArrayList<>(); - if (request.options() != null) { - for (AdminBattleOptionRequest optionRequest : request.options()) { - String resolvedImageKey = resolveStoredImageKey( - optionRequest.imageUrl(), - request.status(), - FileCategory.PHILOSOPHER - ); - BattleOption option = BattleOption.builder() - .battle(battle) - .label(optionRequest.label()) - .title(optionRequest.title()) - .stance(optionRequest.stance()) - .representative(optionRequest.representative()) - .imageUrl(resolvedImageKey) - .build(); - option = battleOptionRepository.save(option); - - if (optionRequest.tagIds() != null) { - saveBattleOptionTags(option, optionRequest.tagIds().stream().distinct().toList()); - } - savedOptions.add(option); + for (var optionRequest : request.options()) { + BattleOption option = battleOptionRepository.save(BattleOption.builder() + .battle(battle) + .label(optionRequest.label()) + .title(optionRequest.title()) + .stance(optionRequest.stance()) + .representative(optionRequest.representative()) + .quote(optionRequest.quote()) + .imageUrl(optionRequest.imageUrl()) + .isCorrect(optionRequest.isCorrect()) + .build()); + + if (optionRequest.tagIds() != null) { + saveBattleOptionTags(option, optionRequest.tagIds().stream().distinct().toList()); } + savedOptions.add(option); } Map> optionTagsMap = battleOptionTagRepository.findByBattleWithTags(battle) @@ -345,41 +267,21 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), savedOptions, optionTagsMap); } - @Override - @Transactional(readOnly = true) - @PreAuthorize("hasRole('ADMIN')") - public AdminBattleDetailResponse getAdminBattleDetail(Long battleId) { - Battle battle = findById(battleId); - List options = battleOptionRepository.findByBattle(battle); - Map> optionTagsMap = battleOptionTagRepository.findByBattleWithTags(battle) - .stream() - .collect(Collectors.groupingBy( - bot -> bot.getBattleOption().getId(), - Collectors.mapping(BattleOptionTag::getTag, Collectors.toList()) - )); - - return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), options, optionTagsMap); - } - @Override @Transactional @PreAuthorize("hasRole('ADMIN')") public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request) { Battle battle = findById(battleId); - validateBattleOptionCount(request.options()); - String existingThumbnailKey = normalizeStoredImageReference(battle.getThumbnailUrl(), FileCategory.BATTLE); - String resolvedThumbnailKey = resolveStoredImageKey(request.thumbnailUrl(), request.status(), FileCategory.BATTLE); - if (existingThumbnailKey != null && !existingThumbnailKey.equals(resolvedThumbnailKey)) { - deleteStoredAsset(existingThumbnailKey); + if (battle.getThumbnailUrl() != null && !battle.getThumbnailUrl().equals(request.thumbnailUrl())) { + s3UploadService.deleteFile(battle.getThumbnailUrl()); } battle.update( - request.title(), - request.summary(), - request.description(), - resolvedThumbnailKey, - request.status() + request.title(), request.titlePrefix(), request.titleSuffix(), + request.itemA(), request.itemADesc(), request.itemB(), request.itemBDesc(), + request.summary(), request.description(), request.thumbnailUrl(), + request.targetDate(), request.audioDuration(), request.status() ); if (request.tagIds() != null) { @@ -390,56 +292,17 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe if (request.options() != null) { List existingOptions = battleOptionRepository.findByBattle(battle); - Map existingOptionMap = existingOptions.stream() - .collect(Collectors.toMap(BattleOption::getLabel, option -> option)); - - Set requestedLabels = new HashSet<>(); - - for (AdminBattleOptionRequest optionRequest : request.options()) { - requestedLabels.add(optionRequest.label()); - - BattleOption option = existingOptionMap.get(optionRequest.label()); - String resolvedOptionImageKey = resolveStoredImageKey( - optionRequest.imageUrl(), - request.status(), - FileCategory.PHILOSOPHER - ); - if (option == null) { - option = BattleOption.builder() - .battle(battle) - .label(optionRequest.label()) - .title(optionRequest.title()) - .stance(optionRequest.stance()) - .representative(optionRequest.representative()) - .imageUrl(resolvedOptionImageKey) - .build(); - option = battleOptionRepository.save(option); - } else { - String existingOptionImageKey = normalizeStoredImageReference(option.getImageUrl(), FileCategory.PHILOSOPHER); - if (existingOptionImageKey != null && !existingOptionImageKey.equals(resolvedOptionImageKey)) { - deleteStoredAsset(existingOptionImageKey); - } - option.update(optionRequest.title(), optionRequest.stance(), - optionRequest.representative(), resolvedOptionImageKey); - } - - replaceBattleOptionTags(option, optionRequest.tagIds()); - } - - List removedOptions = existingOptions.stream() - .filter(existing -> !requestedLabels.contains(existing.getLabel())) - .toList(); - - for (BattleOption removedOption : removedOptions) { - deleteStoredAsset(removedOption.getImageUrl()); - List optionTags = battleOptionTagRepository.findByBattleOption(removedOption); - if (!optionTags.isEmpty()) { - battleOptionTagRepository.deleteAll(optionTags); - } - } - - if (!removedOptions.isEmpty()) { - battleOptionRepository.deleteAll(removedOptions); + for (var optionRequest : request.options()) { + existingOptions.stream() + .filter(option -> option.getLabel() == optionRequest.label()) + .findFirst() + .ifPresent(option -> { + if (option.getImageUrl() != null && !option.getImageUrl().equals(optionRequest.imageUrl())) { + s3UploadService.deleteFile(option.getImageUrl()); + } + option.update(optionRequest.title(), optionRequest.stance(), + optionRequest.representative(), optionRequest.quote(), optionRequest.imageUrl(), optionRequest.isCorrect()); + }); } } @@ -492,7 +355,6 @@ private List getTagsByBattle(Battle battle) { private void saveBattleTags(Battle battle, List ids) { tagRepository.findAllById(ids).stream() .filter(tag -> tag.getDeletedAt() == null) - .filter(tag -> tag.getType() == TagType.CATEGORY) .forEach(tag -> battleTagRepository.save( BattleTag.builder().battle(battle).tag(tag).build())); } @@ -500,22 +362,10 @@ private void saveBattleTags(Battle battle, List ids) { private void saveBattleOptionTags(BattleOption option, List tagIds) { tagRepository.findAllById(tagIds).stream() .filter(tag -> tag.getDeletedAt() == null) - .filter(tag -> tag.getType() == TagType.PHILOSOPHER || tag.getType() == TagType.VALUE) .forEach(tag -> battleOptionTagRepository.save( BattleOptionTag.builder().battleOption(option).tag(tag).build())); } - private void replaceBattleOptionTags(BattleOption option, List tagIds) { - if (tagIds == null) return; - - List existingTags = battleOptionTagRepository.findByBattleOption(option); - if (!existingTags.isEmpty()) { - battleOptionTagRepository.deleteAll(existingTags); - } - - saveBattleOptionTags(option, tagIds.stream().distinct().toList()); - } - @Override public BattleOption findOptionById(Long optionId) { return battleOptionRepository.findById(optionId) @@ -528,95 +378,4 @@ public BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabe return battleOptionRepository.findByBattleAndLabel(battle, label) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); } - - private String resolveStoredImageKey(String rawReference, BattleStatus targetStatus, FileCategory fallbackCategory) { - String normalized = normalizeStoredImageReference(rawReference, fallbackCategory); - if (normalized == null) { - return null; - } - if (targetStatus == BattleStatus.PUBLISHED && localDraftFileStorageService.isLocalDraftReference(normalized)) { - return localDraftFileStorageService.promoteLocalDraftToS3(normalized, fallbackCategory, s3UploadService); - } - return normalized; - } - - private String normalizeStoredImageReference(String rawReference, FileCategory fallbackCategory) { - if (rawReference == null || rawReference.isBlank()) { - return null; - } - - String trimmed = rawReference.trim(); - String localNormalized = localDraftFileStorageService.normalizeLocalDraftKey(trimmed); - if (localDraftFileStorageService.isLocalDraftReference(localNormalized)) { - return localNormalized; - } - - String path = extractPath(trimmed); - Matcher matcher = RESOURCE_IMAGE_PATH_PATTERN.matcher(path); - if (matcher.find()) { - String categoryName = matcher.group(1); - String fileName = matcher.group(2); - try { - FileCategory category = FileCategory.valueOf(categoryName); - return category.getPath() + "/" + fileName; - } catch (IllegalArgumentException ignored) { - if (fallbackCategory != null) { - return fallbackCategory.getPath() + "/" + fileName; - } - } - } - - return trimmed; - } - - private String extractPath(String value) { - if (value.startsWith("http://") || value.startsWith("https://")) { - try { - URI uri = URI.create(value); - return uri.getPath(); - } catch (IllegalArgumentException ignored) { - return value; - } - } - return value; - } - - private void deleteStoredAsset(String rawReference) { - String normalized = normalizeStoredImageReference(rawReference, null); - if (normalized == null) { - return; - } - - if (localDraftFileStorageService.isLocalDraftReference(normalized)) { - localDraftFileStorageService.deleteIfLocalReference(normalized); - return; - } - - s3UploadService.deleteFile(normalized); - } - - private BattleStatus parseBattleStatus(String status) { - if (status == null || status.isBlank() || "ALL".equalsIgnoreCase(status)) { - return null; - } - - try { - return BattleStatus.valueOf(status.trim().toUpperCase()); - } catch (IllegalArgumentException e) { - throw new CustomException(ErrorCode.BAD_REQUEST); - } - } - - private void validateBattleOptionCount(List options) { - if (options == null) { - throw new CustomException(ErrorCode.BATTLE_INVALID_OPTION_COUNT); - } - int count = options.size(); - if (count < 2 || count > 4) { - throw new CustomException(ErrorCode.BATTLE_INVALID_OPTION_COUNT); - } - } -} - - - +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java b/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java index e466fb6a..2cfddac7 100644 --- a/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java +++ b/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "홈 API", description = "홈 화면 데이터 조회") +@Tag(name = "홈 API", description = "홈 화면 집계 조회") @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") @@ -19,7 +19,7 @@ public class HomeController { private final HomeService homeService; - @Operation(summary = "홈 화면 데이터 조회") + @Operation(summary = "홈 화면 집계 조회") @GetMapping("/home") public ApiResponse getHome(@AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(homeService.getHome(userId)); diff --git a/src/main/java/com/swyp/picke/domain/home/service/HomeService.java b/src/main/java/com/swyp/picke/domain/home/service/HomeService.java index 4d3082cd..6aa4f55b 100644 --- a/src/main/java/com/swyp/picke/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/picke/domain/home/service/HomeService.java @@ -1,47 +1,30 @@ package com.swyp.picke.domain.home.service; +import com.swyp.picke.domain.battle.dto.response.BattleTagResponse; import com.swyp.picke.domain.battle.dto.response.TodayBattleResponse; import com.swyp.picke.domain.battle.dto.response.TodayOptionResponse; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; +import com.swyp.picke.domain.battle.enums.BattleType; +import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.domain.home.dto.response.HomeBestBattleResponse; -import com.swyp.picke.domain.home.dto.response.HomeEditorPickResponse; -import com.swyp.picke.domain.home.dto.response.HomeNewBattleResponse; -import com.swyp.picke.domain.home.dto.response.HomeResponse; -import com.swyp.picke.domain.home.dto.response.HomeTodayQuizResponse; -import com.swyp.picke.domain.home.dto.response.HomeTodayVoteOptionResponse; -import com.swyp.picke.domain.home.dto.response.HomeTodayVoteResponse; -import com.swyp.picke.domain.home.dto.response.HomeTrendingResponse; +import com.swyp.picke.domain.home.dto.response.*; import com.swyp.picke.domain.notification.enums.NotificationCategory; import com.swyp.picke.domain.notification.service.NotificationService; -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import com.swyp.picke.domain.poll.service.PollService; -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; -import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; -import com.swyp.picke.domain.quiz.service.QuizService; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; -import java.util.Comparator; -import java.util.List; -import java.util.Objects; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class HomeService { - private static final int HOME_TODAY_PICK_LIMIT = 1; - private static final String QUIZ_SUMMARY = "왼쪽과 오른쪽 중 정답을 선택하세요"; - private static final String POLL_SUMMARY = "빈칸에 들어갈 가장 적절한 답을 골라주세요"; - private final BattleService battleService; - private final QuizService quizService; - private final PollService pollService; private final NotificationService notificationService; private final S3PresignedUrlService s3PresignedUrlService; @@ -50,15 +33,15 @@ public HomeResponse getHome(Long userId) { if (userId != null) { newNotice = notificationService.hasNewBroadcast(userId, NotificationCategory.NOTICE); } + // DB 쿼리 단계에서 LIMIT을 걸어 필요한 개수만 깔끔하게 조회! + List editorPickRaw = battleService.getEditorPicks(10); + List trendingRaw = battleService.getTrendingBattles(4); + List bestRaw = battleService.getBestBattles(3); + List voteRaw = battleService.getTodayPicks(BattleType.VOTE, 1); + List quizRaw = battleService.getTodayPicks(BattleType.QUIZ, 1); - List editorPickRaw = battleService.getEditorPicks(); - List trendingRaw = battleService.getTrendingBattles(); - List bestRaw = battleService.getBestBattles(); - List quizRaw = quizService.getTodayPicks(HOME_TODAY_PICK_LIMIT); - List pollRaw = pollService.getTodayPicks(HOME_TODAY_PICK_LIMIT); - - List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw); - List newRaw = battleService.getNewBattles(excludeIds); + List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw, voteRaw, quizRaw); + List newRaw = battleService.getNewBattles(excludeIds, 3); return new HomeResponse( newNotice, @@ -66,145 +49,131 @@ public HomeResponse getHome(Long userId) { trendingRaw.stream().map(this::toTrending).toList(), bestRaw.stream().map(this::toBestBattle).toList(), quizRaw.stream().map(this::toTodayQuiz).toList(), - pollRaw.stream().map(this::toTodayVote).toList(), + voteRaw.stream().map(this::toTodayVote).toList(), newRaw.stream().map(this::toNewBattle).toList() ); } - private HomeEditorPickResponse toEditorPick(TodayBattleResponse battle) { + // 에디터픽 썸네일 Presigned URL 적용 + private HomeEditorPickResponse toEditorPick(TodayBattleResponse b) { + String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); + String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); + + String secureThumb = b.thumbnailUrl(); + return new HomeEditorPickResponse( - battle.battleId(), - battle.thumbnailUrl(), - findOptionTitle(battle.options(), BattleOptionLabel.A), - findOptionTitle(battle.options(), BattleOptionLabel.B), - battle.title(), - battle.summary(), - battle.tags(), - battle.viewCount() + b.battleId(), secureThumb, + optionA, optionB, + b.title(), b.summary(), + b.tags(), b.viewCount() ); } - private HomeTrendingResponse toTrending(TodayBattleResponse battle) { + private HomeTrendingResponse toTrending(TodayBattleResponse b) { return new HomeTrendingResponse( - battle.battleId(), - battle.thumbnailUrl(), - battle.title(), - battle.tags(), - battle.audioDuration(), - battle.viewCount() + b.battleId(), b.thumbnailUrl(), + b.title(), b.tags(), + b.audioDuration(), b.viewCount() ); } - private HomeBestBattleResponse toBestBattle(TodayBattleResponse battle) { + private HomeBestBattleResponse toBestBattle(TodayBattleResponse b) { + String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); + String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); + return new HomeBestBattleResponse( - battle.battleId(), - findOptionRepresentative(battle.options(), BattleOptionLabel.A), - findOptionRepresentative(battle.options(), BattleOptionLabel.B), - battle.title(), - battle.tags(), - battle.audioDuration(), - battle.viewCount() + b.battleId(), + philoA, philoB, + b.title(), b.tags(), + b.audioDuration(), b.viewCount() ); } - private HomeTodayQuizResponse toTodayQuiz(Quiz quiz) { - List options = quizService.getOptions(quiz); - long participantsCount = quizService.countVotes(quiz); - - QuizOption optionA = findQuizOption(options, QuizOptionLabel.A); - QuizOption optionB = findQuizOption(options, QuizOptionLabel.B); - + private HomeTodayQuizResponse toTodayQuiz(TodayBattleResponse b) { return new HomeTodayQuizResponse( - quiz.getId(), - quiz.getTitle(), - QUIZ_SUMMARY, - participantsCount, - optionA != null ? optionA.getText() : null, - optionA != null ? optionA.getDetailText() : null, - false, - optionB != null ? optionB.getText() : null, - optionB != null ? optionB.getDetailText() : null, - false + b.battleId(), b.title(), b.summary(), + b.participantsCount(), + b.itemA(), b.itemADesc(), + findOptionIsCorrect(b.options(), BattleOptionLabel.A), + b.itemB(), b.itemBDesc(), + findOptionIsCorrect(b.options(), BattleOptionLabel.B) ); } - private HomeTodayVoteResponse toTodayVote(Poll poll) { - List options = pollService.getOptions(poll); - long participantsCount = pollService.countVotes(poll); - - List homeOptions = options.stream() - .sorted(Comparator - .comparing((PollOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) - .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) - .thenComparing(option -> option.getId() == null ? Long.MAX_VALUE : option.getId())) - .map(option -> new HomeTodayVoteOptionResponse( - BattleOptionLabel.valueOf(option.getLabel().name()), - option.getTitle() - )) + private HomeTodayVoteResponse toTodayVote(TodayBattleResponse b) { + List options = Optional.ofNullable(b.options()).orElse(List.of()).stream() + .map(o -> new HomeTodayVoteOptionResponse(o.label(), o.title())) .toList(); - return new HomeTodayVoteResponse( - poll.getId(), - poll.getTitlePrefix(), - poll.getTitleSuffix(), - POLL_SUMMARY, - participantsCount, - homeOptions + b.battleId(), + b.titlePrefix(), b.titleSuffix(), + b.summary(), b.participantsCount(), + options ); } - private HomeNewBattleResponse toNewBattle(TodayBattleResponse battle) { + // newBattle 썸네일 Presigned URL 적용 + private HomeNewBattleResponse toNewBattle(TodayBattleResponse b) { + String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); + String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); + + String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); + String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); + + String imageA = findRepresentativeImageUrl(b.options(), BattleOptionLabel.A); + String imageB = findRepresentativeImageUrl(b.options(), BattleOptionLabel.B); + return new HomeNewBattleResponse( - battle.battleId(), - battle.thumbnailUrl(), - battle.title(), - battle.summary(), - findOptionRepresentative(battle.options(), BattleOptionLabel.A), - findOptionTitle(battle.options(), BattleOptionLabel.A), - findRepresentativeImageUrl(battle.options(), BattleOptionLabel.A), - findOptionRepresentative(battle.options(), BattleOptionLabel.B), - findOptionTitle(battle.options(), BattleOptionLabel.B), - findRepresentativeImageUrl(battle.options(), BattleOptionLabel.B), - battle.tags(), - battle.audioDuration(), - battle.viewCount() + b.battleId(), b.thumbnailUrl(), + b.title(), b.summary(), + philoA, optionA, imageA, + philoB, optionB, imageB, + b.tags(), b.audioDuration(), b.viewCount() ); } + private Boolean findOptionIsCorrect(List options, BattleOptionLabel label) { + return Optional.ofNullable(options).orElse(List.of()).stream() + .filter(o -> o.label() == label) + .map(TodayOptionResponse::isCorrect) + .findFirst() + .map(Boolean.TRUE::equals) + .orElse(false); + } + private String findOptionTitle(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(option -> option.label() == label) + .filter(o -> o.label() == label) .map(TodayOptionResponse::title) .filter(Objects::nonNull) - .findFirst() - .orElse(null); + .findFirst().orElse(null); } + // 옵션에서 철학자 이름(Representative)을 추출하는 메서드 private String findOptionRepresentative(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(option -> option.label() == label) + .filter(o -> o.label() == label) .map(TodayOptionResponse::representative) .filter(Objects::nonNull) - .findFirst() - .orElse(null); + .findFirst().orElse(null); + } + + private List findPhilosopherNames(List tags) { + return Optional.ofNullable(tags).orElse(List.of()).stream() + .filter(t -> t.type() == TagType.PHILOSOPHER) + .map(BattleTagResponse::name) + .toList(); } private String findRepresentativeImageUrl(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(option -> option.label() == label) + .filter(o -> o.label() == label) .map(TodayOptionResponse::imageUrl) .filter(Objects::nonNull) .findFirst() .orElse(null); } - private QuizOption findQuizOption(List options, QuizOptionLabel label) { - return options.stream() - .filter(option -> option.getLabel() == label) - .findFirst() - .orElse(null); - } - @SafeVarargs private List collectBattleIds(List... groups) { return List.of(groups).stream() diff --git a/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java b/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java index 0ac93e0a..b7150503 100644 --- a/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java +++ b/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java @@ -17,7 +17,7 @@ @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor -@Tag(name = "인증 API", description = "소셜 로그인, 토큰 재발급, 로그아웃, 회원 탈퇴") +@Tag(name = "인증 (Auth)", description = "인증 API") public class AuthController { private final AuthService authService; diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java index c17eba4c..76541533 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "댓글 좋아요 API", description = "댓글 좋아요 등록 및 취소") +@Tag(name = "댓글 좋아요 (Comment Like)", description = "댓글 좋아요 등록, 취소 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -28,7 +28,7 @@ public ApiResponse addLike(@PathVariable Long commentId, return ApiResponse.onSuccess(commentLikeService.addLike(commentId, userId)); } - @Operation(summary = "댓글 좋아요 취소", description = "특정 댓글의 좋아요를 취소합니다.") + @Operation(summary = "댓글 좋아요 취소", description = "특정 댓글에 등록한 좋아요를 취소합니다.") @DeleteMapping("/comments/{commentId}/likes") public ApiResponse removeLike(@PathVariable Long commentId, @AuthenticationPrincipal Long userId) { diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java index 728a7fea..d702d8aa 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 댓글 API", description = "관점 댓글 생성, 조회, 수정, 삭제") +@Tag(name = "관점 댓글 (Comment)", description = "관점 댓글 생성, 조회, 수정, 삭제 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -51,7 +51,7 @@ public ApiResponse getComments( return ApiResponse.onSuccess(commentService.getComments(perspectiveId, userId, cursor, size)); } - @Operation(summary = "댓글 목록 조회 (옵션 라벨)", description = "특정 관점의 댓글 목록을 커서 기반 페이지네이션으로 조회하며, stance를 투표한 옵션 라벨(A/B)로 반환합니다.") + @Operation(summary = "댓글 목록 조회 (옵션 라벨)", description = "특정 관점의 댓글 목록을 커서 기반 페이지네이션으로 조회합니다. stance는 투표한 옵션의 라벨(A/B)로 반환됩니다.") @GetMapping("/perspectives/{perspectiveId}/comments/labeled") public ApiResponse getCommentsWithLabel( @PathVariable Long perspectiveId, @@ -73,7 +73,7 @@ public ApiResponse deleteComment( return ApiResponse.onSuccess(null); } - @Operation(summary = "댓글 수정", description = "본인이 작성한 댓글 내용을 수정합니다.") + @Operation(summary = "댓글 수정", description = "본인이 작성한 댓글의 내용을 수정합니다.") @PatchMapping("/perspectives/{perspectiveId}/comments/{commentId}") public ApiResponse updateComment( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java index 03c9aa3f..545f8146 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 API", description = "관점 생성, 조회, 수정, 삭제") +@Tag(name = "관점 (Perspective)", description = "관점 생성, 조회, 수정, 삭제 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -32,7 +32,7 @@ public class PerspectiveController { private final PerspectiveService perspectiveService; - @Operation(summary = "관점 상세 조회", description = "특정 관점의 상세 정보를 조회합니다.") + @Operation(summary = "관점 단건 조회", description = "특정 관점의 상세 정보를 조회합니다.") @GetMapping("/perspectives/{perspectiveId}") public ApiResponse getPerspectiveDetail( @PathVariable Long perspectiveId, @@ -40,7 +40,8 @@ public ApiResponse getPerspectiveDetail( return ApiResponse.onSuccess(perspectiveService.getPerspectiveDetail(perspectiveId, userId)); } - @Operation(summary = "관점 생성", description = "특정 배틀에 대한 사용자 관점을 생성합니다.") + // TODO: Prevote 의 여부를 Vote 도메인 개발 이후 교체 + @Operation(summary = "관점 생성", description = "특정 배틀에 대한 관점을 생성합니다. 사전 투표가 완료된 경우에만 가능합니다.") @PostMapping("/battles/{battleId}/perspectives") public ApiResponse createPerspective( @PathVariable Long battleId, @@ -50,7 +51,7 @@ public ApiResponse createPerspective( return ApiResponse.onSuccess(perspectiveService.createPerspective(battleId, userId, request)); } - @Operation(summary = "관점 목록 조회", description = "특정 배틀의 관점 목록을 커서 기반으로 조회합니다.") + @Operation(summary = "관점 리스트 조회", description = "특정 배틀의 관점 목록을 커서 기반 페이지네이션으로 조회합니다. optionLabel(A/B)로 필터링, sort(latest/popular)로 정렬 가능합니다.") @GetMapping("/battles/{battleId}/perspectives") public ApiResponse getPerspectives( @PathVariable Long battleId, @@ -63,7 +64,7 @@ public ApiResponse getPerspectives( return ApiResponse.onSuccess(perspectiveService.getPerspectives(battleId, userId, cursor, size, optionLabel, sort)); } - @Operation(summary = "내 관점 조회", description = "해당 배틀에서 본인이 작성한 관점을 조회합니다.") + @Operation(summary = "내 관점 조회", description = "특정 배틀에서 내가 작성한 관점을 조회합니다. 상태(PENDING/PUBLISHED/REJECTED 등)와 무관하게 반환하며, 작성한 관점이 없으면 404를 반환합니다.") @GetMapping("/battles/{battleId}/perspectives/me") public ApiResponse getMyPerspective( @PathVariable Long battleId, @@ -80,7 +81,7 @@ public ApiResponse deletePerspective( return ApiResponse.onSuccess(null); } - @Operation(summary = "관점 검수 재요청", description = "검수 실패 상태의 관점에 대해 검수를 다시 요청합니다.") + @Operation(summary = "관점 검수 재시도", description = "검수 실패(MODERATION_FAILED) 상태의 관점에 대해 GPT 검수를 다시 요청합니다.") @PostMapping("/perspectives/{perspectiveId}/moderation/retry") public ApiResponse retryModeration( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java index 7e090575..75a6a1b4 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 좋아요 API", description = "관점 좋아요 조회, 등록, 취소") +@Tag(name = "관점 좋아요 (Like)", description = "관점 좋아요 조회, 등록, 취소 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -37,7 +37,7 @@ public ApiResponse addLike( return ApiResponse.onSuccess(likeService.addLike(perspectiveId, userId)); } - @Operation(summary = "좋아요 취소", description = "특정 관점의 좋아요를 취소합니다.") + @Operation(summary = "좋아요 취소", description = "특정 관점에 등록한 좋아요를 취소합니다.") @DeleteMapping("/perspectives/{perspectiveId}/likes") public ApiResponse removeLike( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java index eb227348..438cc00f 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "신고 API", description = "관점/댓글 신고") +@Tag(name = "신고 (Report)", description = "관점/댓글 신고 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor diff --git a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java index c7808893..ac225705 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java +++ b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java @@ -17,7 +17,7 @@ import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.service.UserService; -import com.swyp.picke.domain.vote.service.BattleVoteService; +import com.swyp.picke.domain.vote.service.VoteService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; @@ -41,7 +41,7 @@ public class PerspectiveCommentService { private final UserRepository userRepository; private final CommentLikeRepository commentLikeRepository; private final UserService userQueryService; - private final BattleVoteService BattleVoteService; + private final VoteService voteService; private final BattleService battleService; private final S3PresignedUrlService s3PresignedUrlService; @@ -62,7 +62,7 @@ public CreateCommentResponse createComment(Long perspectiveId, Long userId, Crea UserSummary userSummary = userQueryService.findSummaryById(userId); String characterImageUrl = resolveCharacterImageUrl(userSummary.characterType()); - Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(perspective.getBattle().getId(), userId); + Long postVoteOptionId = voteService.findPostVoteOptionId(perspective.getBattle().getId(), userId); String stance = null; if (postVoteOptionId != null) { stance = battleService.findOptionById(postVoteOptionId).getStance(); @@ -96,7 +96,7 @@ public CommentListResponse getComments(Long perspectiveId, Long userId, String c .map(c -> { UserSummary user = userQueryService.findSummaryById(c.getUser().getId()); String characterImageUrl = resolveCharacterImageUrl(user.characterType()); - Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(battleId, c.getUser().getId()); + Long postVoteOptionId = voteService.findPostVoteOptionId(battleId, c.getUser().getId()); String stance = null; if (postVoteOptionId != null) { BattleOption option = battleService.findOptionById(postVoteOptionId); @@ -140,7 +140,7 @@ public CommentListResponse getCommentsWithLabel(Long perspectiveId, Long userId, .map(c -> { UserSummary user = userQueryService.findSummaryById(c.getUser().getId()); String characterImageUrl = resolveCharacterImageUrl(user.characterType()); - Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(battleId, c.getUser().getId()); + Long postVoteOptionId = voteService.findPostVoteOptionId(battleId, c.getUser().getId()); String stance = null; if (postVoteOptionId != null) { BattleOption option = battleService.findOptionById(postVoteOptionId); @@ -209,4 +209,4 @@ private String resolveCharacterImageUrl(String characterType) { } return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java index ed8d596c..e366aa63 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java @@ -21,7 +21,7 @@ import com.swyp.picke.domain.user.dto.response.UserSummary; import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.service.UserService; -import com.swyp.picke.domain.vote.service.BattleVoteService; +import com.swyp.picke.domain.vote.service.VoteService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; @@ -44,7 +44,7 @@ public class PerspectiveService { private final PerspectiveCommentRepository perspectiveCommentRepository; private final PerspectiveLikeRepository perspectiveLikeRepository; private final BattleService battleService; - private final BattleVoteService BattleVoteService; + private final VoteService voteService; private final UserService userQueryService; private final UserRepository userRepository; private final GptModerationService gptModerationService; @@ -82,7 +82,7 @@ public CreatePerspectiveResponse createPerspective(Long battleId, Long userId, C throw new CustomException(ErrorCode.PERSPECTIVE_ALREADY_EXISTS); } - BattleOption option = BattleVoteService.findPreVoteOption(battleId, userId); + BattleOption option = voteService.findPreVoteOption(battleId, userId); Perspective perspective = Perspective.builder() .battle(battle) @@ -217,4 +217,4 @@ private String resolveCharacterImageUrl(String characterType) { } return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java b/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java deleted file mode 100644 index 97344834..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.swyp.picke.domain.poll.controller; - -import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; -import com.swyp.picke.domain.poll.dto.response.PollListResponse; -import com.swyp.picke.domain.poll.service.PollService; -import com.swyp.picke.global.common.response.ApiResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@Tag(name = "투표 콘텐츠 API", description = "투표 콘텐츠 조회") -@RestController -@RequestMapping("/api/v1/polls") -@RequiredArgsConstructor -public class PollController { - - private final PollService pollService; - - @Operation(summary = "투표 콘텐츠 목록 조회") - @GetMapping - public ApiResponse getPolls( - @RequestParam(value = "page", defaultValue = "1") int page, - @RequestParam(value = "size", defaultValue = "10") int size - ) { - return ApiResponse.onSuccess(pollService.getPolls(page, size)); - } - - @Operation(summary = "투표 콘텐츠 상세 조회") - @GetMapping("/{pollId}") - public ApiResponse getPollDetail(@PathVariable Long pollId) { - return ApiResponse.onSuccess(pollService.getPollDetail(pollId)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java b/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java deleted file mode 100644 index 03d74fec..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.swyp.picke.domain.poll.converter; - -import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; -import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; -import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; -import com.swyp.picke.domain.poll.dto.response.PollListResponse; -import com.swyp.picke.domain.poll.dto.response.PollOptionResponse; -import com.swyp.picke.domain.poll.dto.response.PollSimpleResponse; -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import java.util.Comparator; -import java.util.List; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Component; - -@Component -public class PollConverter { - - private static final Comparator OPTION_SORTER = - Comparator.comparing((PollOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) - .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) - .thenComparing(PollOption::getId); - - public Poll toEntity(AdminPollCreateRequest request) { - return Poll.builder() - .titlePrefix(request.titlePrefix()) - .titleSuffix(request.titleSuffix()) - .status(request.status()) - .build(); - } - - public PollListResponse toListResponse(Page pollPage) { - List items = pollPage.getContent().stream() - .map(this::toSimpleResponse) - .toList(); - return new PollListResponse(items, pollPage.getNumber() + 1, pollPage.getTotalPages(), pollPage.getTotalElements()); - } - - public PollSimpleResponse toSimpleResponse(Poll poll) { - return new PollSimpleResponse( - poll.getId(), - poll.getTitlePrefix(), - poll.getTitleSuffix(), - poll.getStatus() - ); - } - - public AdminPollDetailResponse toAdminDetailResponse(Poll poll, List options) { - return new AdminPollDetailResponse( - poll.getId(), - poll.getTitlePrefix(), - poll.getTitleSuffix(), - poll.getTargetDate(), - poll.getStatus(), - toOptionResponses(options) - ); - } - - public PollDetailResponse toDetailResponse(Poll poll, List options) { - return new PollDetailResponse( - poll.getId(), - poll.getTitlePrefix(), - poll.getTitleSuffix(), - poll.getTargetDate(), - poll.getStatus(), - toOptionResponses(options) - ); - } - - private List toOptionResponses(List options) { - if (options == null) { - return List.of(); - } - return options.stream() - .sorted(OPTION_SORTER) - .map(option -> new PollOptionResponse( - option.getId(), - option.getLabel(), - option.getTitle(), - option.getDisplayOrder(), - option.getVoteCount() - )) - .toList(); - } -} diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java deleted file mode 100644 index 04f4db50..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.poll.dto.response; - -import com.swyp.picke.domain.poll.enums.PollStatus; -import java.time.LocalDate; -import java.util.List; - -public record PollDetailResponse( - Long pollId, - String titlePrefix, - String titleSuffix, - LocalDate targetDate, - PollStatus status, - List options -) {} diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java deleted file mode 100644 index 76f89133..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.poll.dto.response; - -import java.util.List; - -public record PollListResponse( - List items, - int page, - int totalPages, - long totalElements -) { -} - - diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java deleted file mode 100644 index b619a55f..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.poll.dto.response; - -import com.swyp.picke.domain.poll.enums.PollOptionLabel; - -public record PollOptionResponse( - Long optionId, - PollOptionLabel label, - String title, - Integer displayOrder, - Long voteCount -) { -} - - diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java deleted file mode 100644 index de4a34e2..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.swyp.picke.domain.poll.dto.response; - -import com.swyp.picke.domain.poll.enums.PollStatus; - -import java.time.LocalDateTime; - -public record PollSimpleResponse( - Long pollId, - String titlePrefix, - String titleSuffix, - PollStatus status -) { -} - - diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java deleted file mode 100644 index 4c334ae8..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.swyp.picke.domain.poll.dto.response; - -import com.swyp.picke.domain.tag.enums.TagType; - -public record PollTagResponse( - Long tagId, - String name, - TagType type -) { -} - - diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java b/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java deleted file mode 100644 index 447a9081..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.swyp.picke.domain.poll.entity; - -import com.swyp.picke.domain.poll.enums.PollStatus; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; - -@Getter -@Entity -@Table(name = "poll_contents") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Poll extends BaseEntity { - - @Column(name = "title_prefix", nullable = false, length = 200) - private String titlePrefix; - - @Column(name = "title_suffix", length = 200) - private String titleSuffix; - - @Column(name = "target_date") - private LocalDate targetDate; - - @Column(name = "total_participants_count", nullable = false) - private Long totalParticipantsCount; - - @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 20) - private PollStatus status; - - @OneToMany(mappedBy = "poll", cascade = CascadeType.ALL, orphanRemoval = true) - private final List options = new ArrayList<>(); - - @Builder - public Poll(String titlePrefix, String titleSuffix, LocalDate targetDate, PollStatus status) { - this.titlePrefix = titlePrefix; - this.titleSuffix = titleSuffix; - this.targetDate = targetDate; - this.status = status; - this.totalParticipantsCount = 0L; - } - - public void update(String titlePrefix, String titleSuffix, LocalDate targetDate, PollStatus status) { - if (titlePrefix != null) this.titlePrefix = titlePrefix; - if (titleSuffix != null) this.titleSuffix = titleSuffix; - if (targetDate != null) this.targetDate = targetDate; - if (status != null) this.status = status; - } - - public void increaseTotalParticipantsCount() { - this.totalParticipantsCount = (this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount) + 1L; - } - - public void decreaseTotalParticipantsCount() { - long current = this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount; - this.totalParticipantsCount = Math.max(0L, current - 1L); - } -} diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java deleted file mode 100644 index c0f86e9b..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.swyp.picke.domain.poll.entity; - -import com.swyp.picke.domain.poll.enums.PollOptionLabel; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "poll_options") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class PollOption extends BaseEntity { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "poll_id", nullable = false) - private Poll poll; - - @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 10) - private PollOptionLabel label; - - @Column(nullable = false, length = 200) - private String title; - - @Column(name = "display_order", nullable = false) - private Integer displayOrder; - - @Column(name = "vote_count", nullable = false) - private Long voteCount; - - @Builder - public PollOption(Poll poll, PollOptionLabel label, String title, Integer displayOrder, Long voteCount) { - this.poll = poll; - this.label = label; - this.title = title; - this.displayOrder = displayOrder; - this.voteCount = voteCount == null ? 0L : voteCount; - } - - - public void update(String title) { - if (title != null) this.title = title; - if (displayOrder != null) this.displayOrder = displayOrder; - } - - public void increaseVoteCount() { - this.voteCount = (this.voteCount == null ? 0L : this.voteCount) + 1; - } - - public void decreaseVoteCount() { - if (this.voteCount != null && this.voteCount > 0) { - this.voteCount--; - } - } -} diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java deleted file mode 100644 index e148a80c..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.swyp.picke.domain.poll.entity; - -import com.swyp.picke.domain.tag.entity.ValueTag; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "poll_option_value_tags") -@IdClass(PollOptionValueTagMapId.class) -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class PollOptionValueTagMap { - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "poll_option_id", nullable = false) - private PollOption pollOption; - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "value_tag_id", nullable = false) - private ValueTag valueTag; - - @Builder - public PollOptionValueTagMap(PollOption pollOption, ValueTag valueTag) { - this.pollOption = pollOption; - this.valueTag = valueTag; - } -} - diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java deleted file mode 100644 index 627f6ab4..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.poll.entity; - -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Getter -@NoArgsConstructor -@EqualsAndHashCode -public class PollOptionValueTagMapId implements Serializable { - private Long pollOption; - private Long valueTag; -} - diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java deleted file mode 100644 index 1220879c..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.swyp.picke.domain.poll.entity; - -import com.swyp.picke.domain.tag.entity.CategoryTag; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "poll_tags") -@IdClass(PollTagMapId.class) -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class PollTagMap { - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "poll_id", nullable = false) - private Poll poll; - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "category_tag_id", nullable = false) - private CategoryTag categoryTag; - - @Builder - public PollTagMap(Poll poll, CategoryTag categoryTag) { - this.poll = poll; - this.categoryTag = categoryTag; - } -} - diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java deleted file mode 100644 index 29263b1f..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.poll.entity; - -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Getter -@NoArgsConstructor -@EqualsAndHashCode -public class PollTagMapId implements Serializable { - private Long poll; - private Long categoryTag; -} - diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java deleted file mode 100644 index 15502d92..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.swyp.picke.domain.poll.entity; - -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "poll_user_votes") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class PollUserVote extends BaseEntity { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) - private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "poll_id", nullable = false) - private Poll poll; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "option_id", nullable = false) - private PollOption selectedOption; - - @Builder - public PollUserVote(User user, Poll poll, PollOption selectedOption) { - this.user = user; - this.poll = poll; - this.selectedOption = selectedOption; - } - - public void updateOption(PollOption option) { - this.selectedOption = option; - } -} diff --git a/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java b/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java deleted file mode 100644 index 5dc3dc74..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.swyp.picke.domain.poll.enums; - -public enum PollOptionLabel { - A, B, C, D -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java b/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java deleted file mode 100644 index 49757284..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.poll.enums; - -public enum PollStatus { - PENDING, - PUBLISHED, - ARCHIVED -} - diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java deleted file mode 100644 index 47e2e727..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.poll.repository; - -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import com.swyp.picke.domain.poll.enums.PollOptionLabel; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.Optional; - -public interface PollOptionRepository extends JpaRepository { - List findByPollOrderByDisplayOrderAscLabelAscIdAsc(Poll poll); - Optional findByPollAndLabel(Poll poll, PollOptionLabel label); -} diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java deleted file mode 100644 index 1d9fcf9c..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.poll.repository; - -import com.swyp.picke.domain.poll.entity.PollOption; -import com.swyp.picke.domain.poll.entity.PollOptionValueTagMap; -import com.swyp.picke.domain.poll.entity.PollOptionValueTagMapId; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface PollOptionValueTagMapRepository extends JpaRepository { - List findByPollOption(PollOption pollOption); - void deleteByPollOption(PollOption pollOption); -} - diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java deleted file mode 100644 index 535eec6c..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.swyp.picke.domain.poll.repository; - -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.enums.PollStatus; -import java.time.LocalDate; -import java.util.List; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface PollRepository extends JpaRepository { - Page findAllByOrderByCreatedAtDesc(Pageable pageable); - - @Query("SELECT p FROM Poll p WHERE p.status = :status AND p.targetDate = :targetDate ORDER BY p.createdAt ASC") - List findTodayPicks( - @Param("status") PollStatus status, - @Param("targetDate") LocalDate targetDate, - Pageable pageable - ); - - @Query(""" - SELECT p - FROM Poll p - WHERE p.status = :status - AND (p.targetDate IS NULL OR p.targetDate <> :targetDate) - ORDER BY CASE WHEN p.targetDate IS NULL THEN 0 ELSE 1 END, - p.targetDate ASC, - p.createdAt ASC - """) - List findAutoAssignableTodayPicks( - @Param("status") PollStatus status, - @Param("targetDate") LocalDate targetDate, - Pageable pageable - ); -} diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java deleted file mode 100644 index 77e8e9da..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.poll.repository; - -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollTagMap; -import com.swyp.picke.domain.poll.entity.PollTagMapId; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface PollTagMapRepository extends JpaRepository { - List findByPoll(Poll poll); - void deleteByPoll(Poll poll); -} - diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java deleted file mode 100644 index dd2039d9..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.poll.repository; - -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import com.swyp.picke.domain.poll.entity.PollUserVote; -import com.swyp.picke.domain.user.entity.User; -import java.util.List; -import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PollUserVoteRepository extends JpaRepository { - Optional findByPollAndUser(Poll poll, User user); - long countByPoll(Poll poll); - long countByPollAndSelectedOption(Poll poll, PollOption selectedOption); - List findAllByPoll(Poll poll); -} diff --git a/src/main/java/com/swyp/picke/domain/poll/service/PollService.java b/src/main/java/com/swyp/picke/domain/poll/service/PollService.java deleted file mode 100644 index 9b64a0f3..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/service/PollService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.swyp.picke.domain.poll.service; - -import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; -import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; -import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; -import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; -import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; -import com.swyp.picke.domain.poll.dto.response.PollListResponse; -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import java.util.List; - -public interface PollService { - Poll findById(Long pollId); - - PollListResponse getPolls(int page, int size); - - List getTodayPicks(int limit); - - List getOptions(Poll poll); - - long countVotes(Poll poll); - - PollDetailResponse getPollDetail(Long pollId); - - AdminPollDetailResponse getAdminPollDetail(Long pollId); - - AdminPollDetailResponse createPoll(AdminPollCreateRequest request); - - AdminPollDetailResponse updatePoll(Long pollId, AdminPollUpdateRequest request); - - AdminPollDeleteResponse deletePoll(Long pollId); -} - - diff --git a/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java b/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java deleted file mode 100644 index 4d3f9958..00000000 --- a/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.swyp.picke.domain.poll.service; - -import com.swyp.picke.domain.poll.converter.PollConverter; -import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; -import com.swyp.picke.domain.admin.dto.poll.request.AdminPollOptionRequest; -import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; -import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; -import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; -import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; -import com.swyp.picke.domain.poll.dto.response.PollListResponse; -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import com.swyp.picke.domain.poll.enums.PollOptionLabel; -import com.swyp.picke.domain.poll.enums.PollStatus; -import com.swyp.picke.domain.poll.repository.PollOptionRepository; -import com.swyp.picke.domain.poll.repository.PollRepository; -import com.swyp.picke.global.common.exception.CustomException; -import com.swyp.picke.global.common.exception.ErrorCode; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class PollServiceImpl implements PollService { - - private final PollRepository pollRepository; - private final PollOptionRepository pollOptionRepository; - private final PollConverter pollConverter; - - @Override - public Poll findById(Long pollId) { - return pollRepository.findById(pollId) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); - } - - @Override - public PollListResponse getPolls(int page, int size) { - int pageNumber = Math.max(0, page - 1); - Page pollPage = pollRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(pageNumber, size)); - return pollConverter.toListResponse(pollPage); - } - - @Override - @Transactional - public List getTodayPicks(int limit) { - int safeLimit = Math.max(1, limit); - LocalDate today = LocalDate.now(); - - ensureTodayPicks(today, safeLimit); - return pollRepository.findTodayPicks(PollStatus.PUBLISHED, today, PageRequest.of(0, safeLimit)); - } - - @Override - public List getOptions(Poll poll) { - return pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); - } - - @Override - public long countVotes(Poll poll) { - return poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); - } - - @Override - public PollDetailResponse getPollDetail(Long pollId) { - Poll poll = findById(pollId); - List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); - return pollConverter.toDetailResponse(poll, options); - } - - @Override - @PreAuthorize("hasRole('ADMIN')") - public AdminPollDetailResponse getAdminPollDetail(Long pollId) { - Poll poll = findById(pollId); - List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); - return pollConverter.toAdminDetailResponse(poll, options); - } - - @Override - @Transactional - @PreAuthorize("hasRole('ADMIN')") - public AdminPollDetailResponse createPoll(AdminPollCreateRequest request) { - Poll poll = pollConverter.toEntity(request); - poll = pollRepository.save(poll); - - List savedOptions = new ArrayList<>(); - if (request.options() != null) { - for (AdminPollOptionRequest optionRequest : request.options()) { - PollOption option = PollOption.builder() - .poll(poll) - .label(optionRequest.label()) - .title(optionRequest.title()) - .build(); - option = pollOptionRepository.save(option); - savedOptions.add(option); - } - } - - return pollConverter.toAdminDetailResponse(poll, savedOptions); - } - - @Override - @Transactional - @PreAuthorize("hasRole('ADMIN')") - public AdminPollDetailResponse updatePoll(Long pollId, AdminPollUpdateRequest request) { - Poll poll = findById(pollId); - poll.update( - request.titlePrefix(), - request.titleSuffix(), - request.targetDate(), - request.status() - ); - - if (request.options() != null) { - List existingOptions = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); - Map existingOptionMap = new HashMap<>(); - for (PollOption option : existingOptions) { - existingOptionMap.put(option.getLabel(), option); - } - - Set requestedLabels = new HashSet<>(); - for (AdminPollOptionRequest optionRequest : request.options()) { - requestedLabels.add(optionRequest.label()); - PollOption option = existingOptionMap.get(optionRequest.label()); - - if (option == null) { - option = PollOption.builder() - .poll(poll) - .label(optionRequest.label()) - .title(optionRequest.title()) - .build(); - option = pollOptionRepository.save(option); - } else { - option.update(optionRequest.title()); - } - } - - for (PollOption existingOption : existingOptions) { - if (requestedLabels.contains(existingOption.getLabel())) continue; - pollOptionRepository.delete(existingOption); - } - } - - return getAdminPollDetail(pollId); - } - - @Override - @Transactional - @PreAuthorize("hasRole('ADMIN')") - public AdminPollDeleteResponse deletePoll(Long pollId) { - Poll poll = findById(pollId); - List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); - pollOptionRepository.deleteAll(options); - pollRepository.delete(poll); - return new AdminPollDeleteResponse(true, LocalDateTime.now()); - } - - private void ensureTodayPicks(LocalDate today, int requiredCount) { - List todays = pollRepository.findTodayPicks(PollStatus.PUBLISHED, today, PageRequest.of(0, requiredCount)); - int missingCount = requiredCount - todays.size(); - if (missingCount <= 0) return; - - List candidates = pollRepository.findAutoAssignableTodayPicks( - PollStatus.PUBLISHED, - today, - PageRequest.of(0, missingCount) - ); - for (Poll candidate : candidates) { - candidate.update(null, null, today, null); - } - } -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java b/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java deleted file mode 100644 index f290b147..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.swyp.picke.domain.quiz.controller; - -import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; -import com.swyp.picke.domain.quiz.service.QuizService; -import com.swyp.picke.global.common.response.ApiResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@Tag(name = "퀴즈 API", description = "퀴즈 콘텐츠 조회") -@RestController -@RequestMapping("/api/v1/quizzes") -@RequiredArgsConstructor -public class QuizController { - - private final QuizService quizService; - - @Operation(summary = "퀴즈 목록 조회") - @GetMapping - public ApiResponse getQuizzes( - @RequestParam(value = "page", defaultValue = "1") int page, - @RequestParam(value = "size", defaultValue = "10") int size - ) { - return ApiResponse.onSuccess(quizService.getQuizzes(page, size)); - } - - @Operation(summary = "퀴즈 상세 조회") - @GetMapping("/{quizId}") - public ApiResponse getQuizDetail(@PathVariable Long quizId) { - return ApiResponse.onSuccess(quizService.getQuizDetail(quizId)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java b/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java deleted file mode 100644 index bdcb8bbd..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.swyp.picke.domain.quiz.converter; - -import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; -import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizOptionResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizSimpleResponse; -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; -import java.util.Comparator; -import java.util.List; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Component; - -@Component -public class QuizConverter { - - private static final Comparator OPTION_SORTER = - Comparator.comparing((QuizOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) - .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) - .thenComparing(QuizOption::getId); - - public Quiz toEntity(AdminQuizCreateRequest request) { - return Quiz.builder() - .title(request.title()) - .status(request.status()) - .build(); - } - - public QuizListResponse toListResponse(Page quizPage) { - List items = quizPage.getContent().stream() - .map(this::toSimpleResponse) - .toList(); - return new QuizListResponse(items, quizPage.getNumber() + 1, quizPage.getTotalPages(), quizPage.getTotalElements()); - } - - public QuizSimpleResponse toSimpleResponse(Quiz quiz) { - return new QuizSimpleResponse( - quiz.getId(), - quiz.getTitle(), - quiz.getStatus(), - quiz.getCreatedAt() - ); - } - - public AdminQuizDetailResponse toAdminDetailResponse(Quiz quiz, List options) { - return new AdminQuizDetailResponse( - quiz.getId(), - quiz.getTitle(), - quiz.getTargetDate(), - quiz.getStatus(), - toOptionResponses(options) - ); - } - - public QuizDetailResponse toDetailResponse(Quiz quiz, List options) { - return new QuizDetailResponse( - quiz.getId(), - quiz.getTitle(), - quiz.getTargetDate(), - quiz.getStatus(), - toOptionResponses(options), - quiz.getCreatedAt(), - quiz.getUpdatedAt() - ); - } - - private List toOptionResponses(List options) { - if (options == null) { - return List.of(); - } - return options.stream() - .sorted(OPTION_SORTER) - .map(option -> new QuizOptionResponse( - option.getId(), - option.getLabel(), - option.getText(), - option.getDetailText(), - option.getIsCorrect(), - option.getDisplayOrder() - )) - .toList(); - } -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java deleted file mode 100644 index c5409dec..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.swyp.picke.domain.quiz.dto.response; - -import com.swyp.picke.domain.quiz.enums.QuizStatus; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -public record QuizDetailResponse( - Long quizId, - String title, - LocalDate targetDate, - QuizStatus status, - List options, - LocalDateTime createdAt, - LocalDateTime updatedAt -) { -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java deleted file mode 100644 index ded527d5..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.quiz.dto.response; - -import java.util.List; - -public record QuizListResponse( - List items, - int page, - int totalPages, - long totalElements -) { -} - - diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java deleted file mode 100644 index 5f83007b..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.swyp.picke.domain.quiz.dto.response; - -import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; - -public record QuizOptionResponse( - Long optionId, - QuizOptionLabel label, - String text, - String detailText, - Boolean isCorrect, - Integer displayOrder -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java deleted file mode 100644 index 85556fc9..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.swyp.picke.domain.quiz.dto.response; - -import com.swyp.picke.domain.quiz.enums.QuizStatus; - -import java.time.LocalDateTime; - -public record QuizSimpleResponse( - Long quizId, - String title, - QuizStatus status, - LocalDateTime createdAt -) { -} - - diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java deleted file mode 100644 index b283ca95..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.swyp.picke.domain.quiz.dto.response; - -import com.swyp.picke.domain.tag.enums.TagType; - -public record QuizTagResponse( - Long tagId, - String name, - TagType type -) { -} - - diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java b/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java deleted file mode 100644 index aade8606..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.swyp.picke.domain.quiz.entity; - -import com.swyp.picke.domain.quiz.enums.QuizStatus; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; - -@Getter -@Entity -@Table(name = "quizzes") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Quiz extends BaseEntity { - - @Column(nullable = false, length = 200) - private String title; - - @Column(name = "target_date") - private LocalDate targetDate; - - @Column(name = "total_participants_count", nullable = false) - private Long totalParticipantsCount; - - @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 20) - private QuizStatus status; - - @OneToMany(mappedBy = "quiz", cascade = CascadeType.ALL, orphanRemoval = true) - private final List options = new ArrayList<>(); - - @Builder - public Quiz(String title, LocalDate targetDate, QuizStatus status) { - this.title = title; - this.targetDate = targetDate; - this.status = status; - this.totalParticipantsCount = 0L; - } - - public void update(String title, LocalDate targetDate, QuizStatus status) { - if (title != null) this.title = title; - if (targetDate != null) this.targetDate = targetDate; - if (status != null) this.status = status; - } - - public void increaseTotalParticipantsCount() { - this.totalParticipantsCount = (this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount) + 1L; - } - - public void decreaseTotalParticipantsCount() { - long current = this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount; - this.totalParticipantsCount = Math.max(0L, current - 1L); - } -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java deleted file mode 100644 index 85fd73e0..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.swyp.picke.domain.quiz.entity; - -import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "quiz_options") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class QuizOption extends BaseEntity { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "quiz_id", nullable = false) - private Quiz quiz; - - @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 10) - private QuizOptionLabel label; - - @Column(nullable = false, length = 300) - private String text; - - @Column(name = "detail_text", length = 1000) - private String detailText; - - @Column(name = "is_correct", nullable = false) - private Boolean isCorrect = false; - - @Column(name = "display_order", nullable = false) - private Integer displayOrder; - - @Builder - public QuizOption( - Quiz quiz, - QuizOptionLabel label, - String text, - String detailText, - Boolean isCorrect, - Integer displayOrder - ) { - this.quiz = quiz; - this.label = label; - this.text = text; - this.detailText = detailText; - this.isCorrect = (isCorrect != null) ? isCorrect : false; - this.displayOrder = displayOrder; - } - - void assignQuiz(Quiz quiz) { - this.quiz = quiz; - } - - public void update(String text, String detailText, Boolean isCorrect) { - if (text != null) this.text = text; - if (detailText != null) this.detailText = detailText; - if (isCorrect != null) this.isCorrect = isCorrect; - if (displayOrder != null) this.displayOrder = displayOrder; - } -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java deleted file mode 100644 index 43e94781..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.swyp.picke.domain.quiz.entity; - -import com.swyp.picke.domain.tag.entity.ValueTag; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "quiz_option_value_tags") -@IdClass(QuizOptionValueTagMapId.class) -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class QuizOptionValueTagMap { - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "quiz_option_id", nullable = false) - private QuizOption quizOption; - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "value_tag_id", nullable = false) - private ValueTag valueTag; - - @Builder - public QuizOptionValueTagMap(QuizOption quizOption, ValueTag valueTag) { - this.quizOption = quizOption; - this.valueTag = valueTag; - } -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java deleted file mode 100644 index ce65910d..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.quiz.entity; - -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Getter -@NoArgsConstructor -@EqualsAndHashCode -public class QuizOptionValueTagMapId implements Serializable { - private Long quizOption; - private Long valueTag; -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java deleted file mode 100644 index bb19afa4..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.swyp.picke.domain.quiz.entity; - -import com.swyp.picke.domain.tag.entity.CategoryTag; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "quiz_tags") -@IdClass(QuizTagMapId.class) -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class QuizTagMap { - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "quiz_id", nullable = false) - private Quiz quiz; - - @Id - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "category_tag_id", nullable = false) - private CategoryTag categoryTag; - - @Builder - public QuizTagMap(Quiz quiz, CategoryTag categoryTag) { - this.quiz = quiz; - this.categoryTag = categoryTag; - } -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java deleted file mode 100644 index e61597e7..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.quiz.entity; - -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Getter -@NoArgsConstructor -@EqualsAndHashCode -public class QuizTagMapId implements Serializable { - private Long quiz; - private Long categoryTag; -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java deleted file mode 100644 index f159720f..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.swyp.picke.domain.quiz.entity; - -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "quiz_user_votes") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class QuizUserVote extends BaseEntity { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) - private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "quiz_id", nullable = false) - private Quiz quiz; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "option_id", nullable = false) - private QuizOption selectedOption; - - @Builder - public QuizUserVote(User user, Quiz quiz, QuizOption selectedOption) { - this.user = user; - this.quiz = quiz; - this.selectedOption = selectedOption; - } - - public void updateOption(QuizOption option) { - this.selectedOption = option; - } -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java deleted file mode 100644 index 2eeb5355..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.swyp.picke.domain.quiz.enums; - -public enum QuizOptionLabel { - A, B, C, D -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java deleted file mode 100644 index a6063700..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.quiz.enums; - -public enum QuizStatus { - PENDING, - PUBLISHED, - ARCHIVED -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java deleted file mode 100644 index f4c3c9b7..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.quiz.repository; - -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; -import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.Optional; - -public interface QuizOptionRepository extends JpaRepository { - List findByQuizOrderByDisplayOrderAscLabelAscIdAsc(Quiz quiz); - Optional findByQuizAndLabel(Quiz quiz, QuizOptionLabel label); -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java deleted file mode 100644 index bacf283b..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.quiz.repository; - -import com.swyp.picke.domain.quiz.entity.QuizOption; -import com.swyp.picke.domain.quiz.entity.QuizOptionValueTagMap; -import com.swyp.picke.domain.quiz.entity.QuizOptionValueTagMapId; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface QuizOptionValueTagMapRepository extends JpaRepository { - List findByQuizOption(QuizOption quizOption); - void deleteByQuizOption(QuizOption quizOption); -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java deleted file mode 100644 index f84f5583..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.swyp.picke.domain.quiz.repository; - -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.enums.QuizStatus; -import java.time.LocalDate; -import java.util.List; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface QuizRepository extends JpaRepository { - Page findAllByOrderByCreatedAtDesc(Pageable pageable); - - @Query("SELECT q FROM Quiz q WHERE q.status = :status AND q.targetDate = :targetDate ORDER BY q.createdAt ASC") - List findTodayPicks( - @Param("status") QuizStatus status, - @Param("targetDate") LocalDate targetDate, - Pageable pageable - ); - - @Query(""" - SELECT q - FROM Quiz q - WHERE q.status = :status - AND (q.targetDate IS NULL OR q.targetDate <> :targetDate) - ORDER BY CASE WHEN q.targetDate IS NULL THEN 0 ELSE 1 END, - q.targetDate ASC, - q.createdAt ASC - """) - List findAutoAssignableTodayPicks( - @Param("status") QuizStatus status, - @Param("targetDate") LocalDate targetDate, - Pageable pageable - ); -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java deleted file mode 100644 index aeb7ebe9..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.quiz.repository; - -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizTagMap; -import com.swyp.picke.domain.quiz.entity.QuizTagMapId; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface QuizTagMapRepository extends JpaRepository { - List findByQuiz(Quiz quiz); - void deleteByQuiz(Quiz quiz); -} - diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java deleted file mode 100644 index 07f26949..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.quiz.repository; - -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; -import com.swyp.picke.domain.quiz.entity.QuizUserVote; -import com.swyp.picke.domain.user.entity.User; -import java.util.List; -import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface QuizUserVoteRepository extends JpaRepository { - Optional findByQuizAndUser(Quiz quiz, User user); - long countByQuiz(Quiz quiz); - long countByQuizAndSelectedOption(Quiz quiz, QuizOption selectedOption); - List findAllByQuiz(Quiz quiz); -} diff --git a/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java b/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java deleted file mode 100644 index c6d1678f..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.swyp.picke.domain.quiz.service; - -import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; -import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; -import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; -import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; -import java.util.List; - -public interface QuizService { - Quiz findById(Long quizId); - - QuizListResponse getQuizzes(int page, int size); - - List getTodayPicks(int limit); - - List getOptions(Quiz quiz); - - long countVotes(Quiz quiz); - - QuizDetailResponse getQuizDetail(Long quizId); - - AdminQuizDetailResponse getAdminQuizDetail(Long quizId); - - AdminQuizDetailResponse createQuiz(AdminQuizCreateRequest request); - - AdminQuizDetailResponse updateQuiz(Long quizId, AdminQuizUpdateRequest request); - - AdminQuizDeleteResponse deleteQuiz(Long quizId); -} - - diff --git a/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java b/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java deleted file mode 100644 index 3ee12e08..00000000 --- a/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.swyp.picke.domain.quiz.service; - -import com.swyp.picke.domain.quiz.converter.QuizConverter; -import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; -import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizOptionRequest; -import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; -import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; -import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; -import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; -import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; -import com.swyp.picke.domain.quiz.enums.QuizStatus; -import com.swyp.picke.domain.quiz.repository.QuizOptionRepository; -import com.swyp.picke.domain.quiz.repository.QuizRepository; -import com.swyp.picke.global.common.exception.CustomException; -import com.swyp.picke.global.common.exception.ErrorCode; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class QuizServiceImpl implements QuizService { - - private final QuizRepository quizRepository; - private final QuizOptionRepository quizOptionRepository; - private final QuizConverter quizConverter; - - @Override - public Quiz findById(Long quizId) { - return quizRepository.findById(quizId) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); - } - - @Override - public QuizListResponse getQuizzes(int page, int size) { - int pageNumber = Math.max(0, page - 1); - Page quizPage = quizRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(pageNumber, size)); - return quizConverter.toListResponse(quizPage); - } - - @Override - @Transactional - public List getTodayPicks(int limit) { - int safeLimit = Math.max(1, limit); - LocalDate today = LocalDate.now(); - - ensureTodayPicks(today, safeLimit); - return quizRepository.findTodayPicks(QuizStatus.PUBLISHED, today, PageRequest.of(0, safeLimit)); - } - - @Override - public List getOptions(Quiz quiz) { - return quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); - } - - @Override - public long countVotes(Quiz quiz) { - return quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); - } - - @Override - public QuizDetailResponse getQuizDetail(Long quizId) { - Quiz quiz = findById(quizId); - List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); - return quizConverter.toDetailResponse(quiz, options); - } - - @Override - @PreAuthorize("hasRole('ADMIN')") - public AdminQuizDetailResponse getAdminQuizDetail(Long quizId) { - Quiz quiz = findById(quizId); - List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); - return quizConverter.toAdminDetailResponse(quiz, options); - } - - @Override - @Transactional - @PreAuthorize("hasRole('ADMIN')") - public AdminQuizDetailResponse createQuiz(AdminQuizCreateRequest request) { - Quiz quiz = quizConverter.toEntity(request); - quiz = quizRepository.save(quiz); - - List savedOptions = new ArrayList<>(); - if (request.options() != null) { - for (AdminQuizOptionRequest optionRequest : request.options()) { - QuizOption option = QuizOption.builder() - .quiz(quiz) - .label(optionRequest.label()) - .text(optionRequest.text()) - .detailText(optionRequest.detailText()) - .isCorrect(optionRequest.isCorrect()) - .build(); - option = quizOptionRepository.save(option); - savedOptions.add(option); - } - } - - return quizConverter.toAdminDetailResponse(quiz, savedOptions); - } - - @Override - @Transactional - @PreAuthorize("hasRole('ADMIN')") - public AdminQuizDetailResponse updateQuiz(Long quizId, AdminQuizUpdateRequest request) { - Quiz quiz = findById(quizId); - quiz.update(request.title(), request.targetDate(), request.status()); - - if (request.options() != null) { - List existingOptions = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); - Map existingOptionMap = new HashMap<>(); - for (QuizOption option : existingOptions) { - existingOptionMap.put(option.getLabel(), option); - } - - Set requestedLabels = new HashSet<>(); - for (AdminQuizOptionRequest optionRequest : request.options()) { - requestedLabels.add(optionRequest.label()); - QuizOption option = existingOptionMap.get(optionRequest.label()); - - if (option == null) { - option = QuizOption.builder() - .quiz(quiz) - .label(optionRequest.label()) - .text(optionRequest.text()) - .detailText(optionRequest.detailText()) - .isCorrect(optionRequest.isCorrect()) - .build(); - option = quizOptionRepository.save(option); - } else { - option.update( - optionRequest.text(), - optionRequest.detailText(), - optionRequest.isCorrect() - ); - } - } - - for (QuizOption existingOption : existingOptions) { - if (requestedLabels.contains(existingOption.getLabel())) continue; - quizOptionRepository.delete(existingOption); - } - } - - return getAdminQuizDetail(quizId); - } - - @Override - @Transactional - @PreAuthorize("hasRole('ADMIN')") - public AdminQuizDeleteResponse deleteQuiz(Long quizId) { - Quiz quiz = findById(quizId); - List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); - quizOptionRepository.deleteAll(options); - quizRepository.delete(quiz); - return new AdminQuizDeleteResponse(true, LocalDateTime.now()); - } - - private void ensureTodayPicks(LocalDate today, int requiredCount) { - List todays = quizRepository.findTodayPicks(QuizStatus.PUBLISHED, today, PageRequest.of(0, requiredCount)); - int missingCount = requiredCount - todays.size(); - if (missingCount <= 0) return; - - List candidates = quizRepository.findAutoAssignableTodayPicks( - QuizStatus.PUBLISHED, - today, - PageRequest.of(0, missingCount) - ); - for (Quiz candidate : candidates) { - candidate.update(null, today, null); - } - } -} - diff --git a/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java b/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java index 45dad51d..c05a07c7 100644 --- a/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java +++ b/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "추천 API", description = "배틀 추천 조회") +@Tag(name = "추천 (Recommendation)", description = "배틀 추천 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -20,7 +20,7 @@ public class RecommendationController { private final RecommendationService recommendationService; - @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀을 기준으로 흥미로운 배틀 목록을 추천합니다.") + @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀 기반으로 흥미로운 배틀 목록을 추천합니다.") @GetMapping("/battles/{battleId}/recommendations/interesting") public ApiResponse getInterestingBattles( @PathVariable Long battleId, diff --git a/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java b/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java index 00d3bb86..1a37f32f 100644 --- a/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java +++ b/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java @@ -13,7 +13,7 @@ import com.swyp.picke.domain.user.service.UserService; import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; -import com.swyp.picke.domain.vote.repository.BattleVoteRepository; +import com.swyp.picke.domain.vote.repository.VoteRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; @@ -35,7 +35,7 @@ public class RecommendationService { private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; private final BattleOptionTagRepository battleOptionTagRepository; - private final BattleVoteRepository BattleVoteRepository; + private final VoteRepository voteRepository; private final UserService userService; private final ResourceUrlProvider urlProvider; @@ -47,7 +47,7 @@ public RecommendationListResponse getInterestingBattles(Long battleId, Long user PhilosopherType oppositeType = myType.getWorstMatch(); // 현재 유저가 이미 참여한 배틀 ID 목록 (제외 대상) - List excludeBattleIds = BattleVoteRepository.findParticipatedBattleIdsByUserId(userId); + List excludeBattleIds = voteRepository.findParticipatedBattleIdsByUserId(userId); if (excludeBattleIds.isEmpty()) excludeBattleIds = List.of(-1L); List sameTypeUserIds = findUserIdsByPhilosopherType(myType); @@ -56,12 +56,12 @@ public RecommendationListResponse getInterestingBattles(Long battleId, Long user // 같은 유형 유저들이 참여한 배틀 후보 ID List sameCandidateIds = sameTypeUserIds.isEmpty() ? List.of() - : BattleVoteRepository.findParticipatedBattleIdsByUserIds(sameTypeUserIds); + : voteRepository.findParticipatedBattleIdsByUserIds(sameTypeUserIds); // 반대 유형 유저들이 참여한 배틀 후보 ID List oppositeCandidateIds = oppositeTypeUserIds.isEmpty() ? List.of() - : BattleVoteRepository.findParticipatedBattleIdsByUserIds(oppositeTypeUserIds); + : voteRepository.findParticipatedBattleIdsByUserIds(oppositeTypeUserIds); // 인기 점수 기준 배틀 조회 (Score = V*1.0 + C*1.5 + Vw*0.2) // 철학자 유형 로직 미구현 시 인기 배틀로 폴백 @@ -130,4 +130,4 @@ private RecommendationListResponse.Item toItem(Battle battle) { private List findUserIdsByPhilosopherType(PhilosopherType type) { return List.of(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java b/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java index 71a4f239..723be0d9 100644 --- a/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java +++ b/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java @@ -8,12 +8,14 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Slf4j -@Tag(name = "보상 API", description = "AdMob 광고 보상 관련 API") +@Tag(name = "보상 (Reward)", description = "AdMob 광고 보상 관련 API") @RestController @RequestMapping("/api/v1/admob") @RequiredArgsConstructor diff --git a/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java b/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java index 9cec0289..d3fef5da 100644 --- a/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java +++ b/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java @@ -1,6 +1,7 @@ package com.swyp.picke.domain.search.dto.response; import com.swyp.picke.domain.battle.dto.response.BattleTagResponse; +import com.swyp.picke.domain.battle.enums.BattleType; import java.util.List; @@ -13,6 +14,7 @@ public record SearchBattleListResponse( public record SearchBattleItem( Long battleId, String thumbnailUrl, + BattleType type, String title, String summary, List tags, diff --git a/src/main/java/com/swyp/picke/domain/search/service/SearchService.java b/src/main/java/com/swyp/picke/domain/search/service/SearchService.java index b309fbe7..3d66a5b1 100644 --- a/src/main/java/com/swyp/picke/domain/search/service/SearchService.java +++ b/src/main/java/com/swyp/picke/domain/search/service/SearchService.java @@ -58,6 +58,7 @@ public SearchBattleListResponse searchBattles(String category, SearchSortType so .map(battle -> new SearchBattleListResponse.SearchBattleItem( battle.getId(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), + battle.getType(), battle.getTitle(), battle.getSummary(), tagMap.getOrDefault(battle.getId(), List.of()), diff --git a/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java b/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java index 12a96ce9..094f8982 100644 --- a/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java +++ b/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java @@ -1,19 +1,19 @@ package com.swyp.picke.domain.tag.controller; -import com.swyp.picke.domain.tag.dto.response.TagListResponse; +import com.swyp.picke.domain.tag.dto.request.TagRequest; +import com.swyp.picke.domain.tag.dto.response.*; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.service.TagService; import com.swyp.picke.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; -@Tag(name = "태그 API", description = "태그 조회") +@Tag(name = "태그 (Tag)", description = "태그 조회 및 관리 API") @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") @@ -21,13 +21,46 @@ public class TagController { private final TagService tagService; - @Operation(summary = "태그 목록 조회") + @Operation(summary = "태그 목록 조회", description = "전체 태그 목록을 조회합니다. 특정 타입(type)을 지정하여 필터링할 수 있습니다.") @GetMapping("/tags") public ApiResponse getTags( - @Parameter(description = "태그 타입 필터(선택)", required = false) + @Parameter(description = "필터링할 태그 타입 (예: BATTLE 등)", required = false) @RequestParam(name = "type", required = false) TagType type) { TagListResponse response = tagService.getTags(type); return ApiResponse.onSuccess(response); } + + @Operation(summary = "태그 생성 (관리자)", description = "관리자가 새로운 태그를 생성합니다.") + @PreAuthorize("hasRole('ADMIN')") + @PostMapping("/admin/tags") + public ApiResponse createTag( + @Valid @RequestBody TagRequest request) { + + TagResponse response = tagService.createTag(request); + return ApiResponse.onSuccess(response); + } + + @Operation(summary = "태그 수정 (관리자)", description = "관리자가 기존 태그의 이름이나 정보를 수정합니다.") + @PreAuthorize("hasRole('ADMIN')") + @PatchMapping("/admin/tags/{tag_id}") + public ApiResponse updateTag( + @Parameter(description = "수정할 태그의 ID", example = "1") + @PathVariable("tag_id") Long tagId, + @Valid @RequestBody TagRequest request) { + + TagResponse response = tagService.updateTag(tagId, request); + return ApiResponse.onSuccess(response); + } + + @Operation(summary = "태그 삭제 (관리자)", description = "관리자가 특정 태그를 삭제합니다. 단, 배틀에 사용 중인 태그는 삭제할 수 없습니다.") + @PreAuthorize("hasRole('ADMIN')") + @DeleteMapping("/admin/tags/{tag_id}") + public ApiResponse deleteTag( + @Parameter(description = "삭제할 태그의 ID", example = "1") + @PathVariable("tag_id") Long tagId) { + + TagDeleteResponse response = tagService.deleteTag(tagId); + return ApiResponse.onSuccess(response); + } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java b/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java index 26382626..b3860d45 100644 --- a/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java +++ b/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java @@ -1,9 +1,7 @@ package com.swyp.picke.domain.tag.converter; -import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; -import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; -import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; -import com.swyp.picke.domain.tag.dto.response.TagListResponse; +import com.swyp.picke.domain.tag.dto.request.TagRequest; +import com.swyp.picke.domain.tag.dto.response.*; import com.swyp.picke.domain.tag.entity.Tag; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java b/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java new file mode 100644 index 00000000..736bfda6 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.tag.dto.request; + +import com.swyp.picke.domain.tag.enums.TagType; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record TagRequest( + @NotBlank(message = "태그 이름을 입력해주세요.") + String name, + + @NotNull(message = "태그 타입을 선택해주세요.") + TagType type +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java new file mode 100644 index 00000000..71b350e8 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.dto.response; + +import java.time.LocalDateTime; + +public record TagDeleteResponse( + boolean success, + LocalDateTime deletedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java index 6bf53599..5e258e8d 100644 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java +++ b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java @@ -1,6 +1,5 @@ package com.swyp.picke.domain.tag.dto.response; -import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; import java.util.List; public record TagListResponse( diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java new file mode 100644 index 00000000..70554dde --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.tag.dto.response; + +import com.swyp.picke.domain.tag.enums.TagType; +import java.time.LocalDateTime; + +public record TagResponse( + Long tagId, + String name, + TagType type, + LocalDateTime createdAt, + LocalDateTime updatedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java deleted file mode 100644 index 41b4561a..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.swyp.picke.domain.tag.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.MapsId; -import jakarta.persistence.OneToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "category_tags") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class CategoryTag { - - @Id - @Column(name = "tag_id") - private Long tagId; - - @OneToOne(fetch = FetchType.LAZY, optional = false) - @MapsId - @JoinColumn(name = "tag_id", nullable = false) - private Tag tag; - - @Builder - public CategoryTag(Tag tag) { - this.tag = tag; - } -} diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java deleted file mode 100644 index ba54480b..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.swyp.picke.domain.tag.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.MapsId; -import jakarta.persistence.OneToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "philosopher_tags") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class PhilosopherTag { - - @Id - @Column(name = "tag_id") - private Long tagId; - - @OneToOne(fetch = FetchType.LAZY, optional = false) - @MapsId - @JoinColumn(name = "tag_id", nullable = false) - private Tag tag; - - @Builder - public PhilosopherTag(Tag tag) { - this.tag = tag; - } -} - diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java deleted file mode 100644 index 6c9c0303..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.swyp.picke.domain.tag.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.MapsId; -import jakarta.persistence.OneToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "value_tags") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ValueTag { - - @Id - @Column(name = "tag_id") - private Long tagId; - - @OneToOne(fetch = FetchType.LAZY, optional = false) - @MapsId - @JoinColumn(name = "tag_id", nullable = false) - private Tag tag; - - @Builder - public ValueTag(Tag tag) { - this.tag = tag; - } -} - diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java deleted file mode 100644 index 9d71ad27..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.tag.repository; - -import com.swyp.picke.domain.tag.entity.CategoryTag; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface CategoryTagRepository extends JpaRepository { -} - diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java deleted file mode 100644 index fdca62b4..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.tag.repository; - -import com.swyp.picke.domain.tag.entity.PhilosopherTag; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PhilosopherTagRepository extends JpaRepository { -} - diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java deleted file mode 100644 index f731d490..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.tag.repository; - -import com.swyp.picke.domain.tag.entity.ValueTag; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ValueTagRepository extends JpaRepository { -} - diff --git a/src/main/java/com/swyp/picke/domain/tag/service/TagService.java b/src/main/java/com/swyp/picke/domain/tag/service/TagService.java index 2074a1e8..97ceca46 100644 --- a/src/main/java/com/swyp/picke/domain/tag/service/TagService.java +++ b/src/main/java/com/swyp/picke/domain/tag/service/TagService.java @@ -1,9 +1,9 @@ package com.swyp.picke.domain.tag.service; -import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; -import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; +import com.swyp.picke.domain.tag.dto.request.TagRequest; +import com.swyp.picke.domain.tag.dto.response.TagDeleteResponse; import com.swyp.picke.domain.tag.dto.response.TagListResponse; -import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; +import com.swyp.picke.domain.tag.dto.response.TagResponse; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; @@ -11,6 +11,7 @@ public interface TagService { List findByBattleId(Long battleId); + TagListResponse getTags(TagType type); TagResponse createTag(TagRequest request); TagResponse updateTag(Long tagId, TagRequest request); diff --git a/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java b/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java index 8f7b0950..d1bf3b96 100644 --- a/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java @@ -1,14 +1,11 @@ package com.swyp.picke.domain.tag.service; import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.repository.BattleOptionTagRepository; import com.swyp.picke.domain.battle.repository.BattleRepository; import com.swyp.picke.domain.battle.repository.BattleTagRepository; import com.swyp.picke.domain.tag.converter.TagConverter; -import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; -import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; -import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; -import com.swyp.picke.domain.tag.dto.response.TagListResponse; +import com.swyp.picke.domain.tag.dto.request.TagRequest; +import com.swyp.picke.domain.tag.dto.response.*; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.repository.TagRepository; @@ -28,7 +25,6 @@ public class TagServiceImpl implements TagService { private final TagRepository tagRepository; private final BattleTagRepository battleTagRepository; - private final BattleOptionTagRepository battleOptionTagRepository; private final BattleRepository battleRepository; @Override @@ -66,16 +62,11 @@ public TagResponse createTag(TagRequest request) { @PreAuthorize("hasRole('ADMIN')") public TagResponse updateTag(Long tagId, TagRequest request) { Tag tag = findTagById(tagId); - boolean typeChanged = tag.getType() != request.type(); if (!tag.getName().equals(request.name()) || tag.getType() != request.type()) { validateDuplicateTag(request.name(), request.type()); } - if (typeChanged && isTagInUse(tag)) { - throw new CustomException(ErrorCode.TAG_TYPE_CHANGE_FORBIDDEN); - } - tag.updateTag(request.name(), request.type()); return TagConverter.toDetailResponse(tag); } @@ -86,7 +77,7 @@ public TagResponse updateTag(Long tagId, TagRequest request) { public TagDeleteResponse deleteTag(Long tagId) { Tag tag = findTagById(tagId); - if (isTagInUse(tag)) { + if (battleTagRepository.existsByTag(tag)) { throw new CustomException(ErrorCode.TAG_IN_USE); } @@ -104,8 +95,4 @@ private void validateDuplicateTag(String name, TagType type) { throw new CustomException(ErrorCode.TAG_DUPLICATED); } } - - private boolean isTagInUse(Tag tag) { - return battleTagRepository.existsByTag(tag) || battleOptionTagRepository.existsByTag(tag); - } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java new file mode 100644 index 00000000..c937631e --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java @@ -0,0 +1,34 @@ +package com.swyp.picke.domain.test.controller; + +import com.swyp.picke.domain.oauth.jwt.JwtProvider; +import com.swyp.picke.global.common.response.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/test") +@RequiredArgsConstructor +public class TestController { + + private final JwtProvider jwtProvider; + + @GetMapping("/response") + public ApiResponse> testResponse() { + List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); + return ApiResponse.onSuccess(teamMembers); + } + + @GetMapping("/token") + public ApiResponse> getTestToken( + @RequestParam(defaultValue = "1") Long userId + ) { + String token = jwtProvider.createAccessToken(userId, "USER"); + return ApiResponse.onSuccess(Map.of("accessToken", token)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/user/service/MypageService.java b/src/main/java/com/swyp/picke/domain/user/service/MypageService.java index f97ae6a8..2650044d 100644 --- a/src/main/java/com/swyp/picke/domain/user/service/MypageService.java +++ b/src/main/java/com/swyp/picke/domain/user/service/MypageService.java @@ -18,7 +18,7 @@ import com.swyp.picke.domain.user.entity.UserProfile; import com.swyp.picke.domain.user.entity.UserSettings; import com.swyp.picke.domain.user.enums.VoteSide; -import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.entity.Vote; import com.swyp.picke.domain.vote.service.VoteQueryService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; @@ -142,29 +142,29 @@ public BattleRecordListResponse getBattleRecords(Integer offset, Integer size, V BattleOptionLabel label = voteSide != null ? toOptionLabel(voteSide) : null; - List votes = voteQueryService.findUserVotes(user.getId(), pageOffset, pageSize, label); + List votes = voteQueryService.findUserVotes(user.getId(), pageOffset, pageSize, label); long totalCount = voteQueryService.countUserVotes(user.getId(), label); List battleIds = votes.stream().map(v -> v.getBattle().getId()).toList(); - Map categoryMap = battleQueryService.getCategoryNamesByBattleIds(battleIds); // 異붽? ?꾩슂 + Map categoryMap = battleQueryService.getCategoryNamesByBattleIds(battleIds); // 추가 필요 List items = votes.stream() - .map(BattleVote -> { - Battle battle = BattleVote.getBattle(); - BattleOption selectedOption = BattleVote.getPostVoteOption() != null - ? BattleVote.getPostVoteOption() : BattleVote.getPreVoteOption(); + .map(vote -> { + Battle battle = vote.getBattle(); + BattleOption selectedOption = vote.getPostVoteOption() != null + ? vote.getPostVoteOption() : vote.getPreVoteOption(); VoteSide side = selectedOption.getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; String category = categoryMap.get(battle.getId()); return new BattleRecordListResponse.BattleRecordItem( battle.getId().toString(), - BattleVote.getId().toString(), + vote.getId().toString(), side, category, battle.getTitle(), battle.getSummary(), - BattleVote.getCreatedAt() + vote.getCreatedAt() ); }) .toList(); @@ -360,5 +360,3 @@ private String resolveCharacterImageUrl(String characterType) { return s3PresignedUrlService.generatePresignedUrl(imageKey); } } - - diff --git a/src/main/java/com/swyp/picke/domain/user/service/UserService.java b/src/main/java/com/swyp/picke/domain/user/service/UserService.java index 0e735100..b87beb08 100644 --- a/src/main/java/com/swyp/picke/domain/user/service/UserService.java +++ b/src/main/java/com/swyp/picke/domain/user/service/UserService.java @@ -74,7 +74,7 @@ public PhilosopherType getPhilosopherType(Long userId) { return PhilosopherType.SOCRATES; } - List optionIds = voteQueryService.findFirstNVotedOptionIds(userId, PHILOSOPHER_CALC_THRESHOLD); + List optionIds = voteQueryService.findFirstNBattleIds(userId, PHILOSOPHER_CALC_THRESHOLD); return battleQueryService.getTopPhilosopherTagNameFromOptions(optionIds) .map(PhilosopherType::fromLabel) .map(type -> { @@ -124,4 +124,4 @@ public UserTendencyScore findUserTendencyScore(Long userId) { return userTendencyScoreRepository.findByUserId(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java b/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java index 0c864ca1..bf9ee7ae 100644 --- a/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java +++ b/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java @@ -1,47 +1,35 @@ package com.swyp.picke.domain.vote.controller; -import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; import com.swyp.picke.domain.vote.dto.request.VoteRequest; -import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; -import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; -import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; -import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; -import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.service.BattleVoteService; -import com.swyp.picke.domain.vote.service.PollVoteService; +import com.swyp.picke.domain.vote.dto.response.*; import com.swyp.picke.domain.vote.service.QuizVoteService; +import com.swyp.picke.domain.vote.service.VoteService; import com.swyp.picke.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -@Tag(name = "투표 API", description = "배틀/퀴즈/투표 투표 처리") +@Tag(name = "투표 (Vote)", description = "사전/사후 투표 실행 및 통계, 내 투표 내역 조회 API") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor public class VoteController { - private final BattleVoteService battleVoteService; + // 배틀(BATTLE) 전용 서비스 + private final VoteService voteService; + // 퀴즈(QUIZ) & 투표(POLL) 전용 서비스 private final QuizVoteService quizVoteService; - private final PollVoteService pollVoteService; - @Operation(summary = "[퀴즈] 답안 제출") + @Operation(summary = "[퀴즈] 선택 제출") @PostMapping("/battles/{battleId}/quiz-vote") public ApiResponse submitQuiz( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody QuizVoteRequest request - ) { + @RequestBody QuizVoteRequest request) { return ApiResponse.onSuccess(quizVoteService.submitQuiz(battleId, userId, request)); } @@ -50,17 +38,15 @@ public ApiResponse submitQuiz( public ApiResponse submitPoll( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody PollVoteRequest request - ) { - return ApiResponse.onSuccess(pollVoteService.submitPoll(battleId, userId, request)); + @RequestBody QuizVoteRequest request) { + return ApiResponse.onSuccess(quizVoteService.submitPoll(battleId, userId, request)); } @Operation(summary = "[퀴즈] 내 퀴즈 참여 내역 조회", description = "내가 선택한 퀴즈 옵션과 통계를 조회합니다.") @GetMapping("/battles/{battleId}/quiz-vote/me") public ApiResponse getMyQuizVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId - ) { + @AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(quizVoteService.getMyQuizVote(battleId, userId)); } @@ -68,19 +54,19 @@ public ApiResponse getMyQuizVote( @GetMapping("/battles/{battleId}/poll-vote/me") public ApiResponse getMyPollVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId - ) { - return ApiResponse.onSuccess(pollVoteService.getMyPollVote(battleId, userId)); + @AuthenticationPrincipal Long userId) { + return ApiResponse.onSuccess(quizVoteService.getMyPollVote(battleId, userId)); } + // 2. 배틀(BATTLE) 관련 API + @Operation(summary = "[배틀] 사전 투표 실행", description = "배틀 진입 시 첫 투표(사전 투표)를 진행합니다.") @PostMapping("/battles/{battleId}/votes/pre") public ApiResponse preVote( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody VoteRequest request - ) { - return ApiResponse.onSuccess(battleVoteService.preVote(battleId, userId, request)); + @RequestBody VoteRequest request) { + return ApiResponse.onSuccess(voteService.preVote(battleId, userId, request)); } @Operation(summary = "[배틀] 사후 투표 실행", description = "콘텐츠 소비 후 최종 투표(사후 투표)를 진행합니다.") @@ -88,57 +74,46 @@ public ApiResponse preVote( public ApiResponse postVote( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody VoteRequest request - ) { - return ApiResponse.onSuccess(battleVoteService.postVote(battleId, userId, request)); + @RequestBody VoteRequest request) { + return ApiResponse.onSuccess(voteService.postVote(battleId, userId, request)); } @Operation(summary = "[배틀] 투표 통계 조회", description = "특정 배틀의 옵션별 투표 수와 비율을 조회합니다.") @GetMapping("/battles/{battleId}/vote-stats") public ApiResponse getVoteStats(@PathVariable Long battleId) { - return ApiResponse.onSuccess(battleVoteService.getVoteStats(battleId)); + return ApiResponse.onSuccess(voteService.getVoteStats(battleId)); } @Operation(summary = "[배틀] 내 투표 내역 조회", description = "특정 배틀에 대한 내 사전/사후 투표 내역과 현재 상태를 조회합니다.") @GetMapping("/battles/{battleId}/votes/me") public ApiResponse getMyVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId - ) { - return ApiResponse.onSuccess(battleVoteService.getMyVote(battleId, userId)); + @AuthenticationPrincipal Long userId) { + return ApiResponse.onSuccess(voteService.getMyVote(battleId, userId)); } @Operation(summary = "[배틀] 오디오(TTS) 청취 완료 처리", description = "사전 투표 후, 오디오 재생이 완료되었을 때 호출하여 상태를 업데이트합니다.") @PostMapping("/battles/{battleId}/votes/tts-complete") public ApiResponse completeTts( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId - ) { - battleVoteService.completeTts(battleId, userId); + @AuthenticationPrincipal Long userId) { + voteService.completeTts(battleId, userId); return ApiResponse.onSuccess(null); } - @Operation(summary = "[관리자] 배틀 투표 기록 삭제") + @Operation(summary = "[관리자] 배틀 투표 삭제") @DeleteMapping("/admin/votes/battle/{battleId}") @PreAuthorize("hasRole('ADMIN')") public ApiResponse deleteBattleVote(@PathVariable Long battleId) { - battleVoteService.deleteVotesByBattleId(battleId); + voteService.deleteVotesByBattleId(battleId); return ApiResponse.onSuccess(null); } - @Operation(summary = "[관리자] 퀴즈 투표 기록 삭제") - @DeleteMapping("/admin/votes/quiz/{battleId}") + @Operation(summary = "[관리자] 퀴즈/일반투표 기록 삭제") + @DeleteMapping("/admin/votes/quiz-poll/{battleId}") @PreAuthorize("hasRole('ADMIN')") - public ApiResponse deleteQuizVote(@PathVariable Long battleId) { + public ApiResponse deleteQuizPollVote(@PathVariable Long battleId) { quizVoteService.deleteQuizVoteByBattleId(battleId); return ApiResponse.onSuccess(null); } - - @Operation(summary = "[관리자] 투표 콘텐츠 투표 기록 삭제") - @DeleteMapping("/admin/votes/poll/{battleId}") - @PreAuthorize("hasRole('ADMIN')") - public ApiResponse deletePollVote(@PathVariable Long battleId) { - pollVoteService.deletePollVoteByBattleId(battleId); - return ApiResponse.onSuccess(null); - } } diff --git a/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java b/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java index 23e0b340..4c4b741f 100644 --- a/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java +++ b/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java @@ -5,17 +5,20 @@ import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.entity.Vote; + import java.time.LocalDateTime; import java.util.List; public class VoteConverter { - public static VoteResultResponse toVoteResultResponse(BattleVote vote, UserBattleStep step) { + // [수정] UserBattleStep을 인자로 받도록 변경 + public static VoteResultResponse toVoteResultResponse(Vote vote, UserBattleStep step) { return new VoteResultResponse(vote.getId(), step); } - public static MyVoteResponse toMyVoteResponse(BattleVote vote, UserBattleStep step) { + // [수정] UserBattleStep을 인자로 받아 MyVoteResponse의 status 필드에 매핑 + public static MyVoteResponse toMyVoteResponse(Vote vote, UserBattleStep step) { boolean opinionChanged = vote.getPreVoteOption() != null && vote.getPostVoteOption() != null && !vote.getPreVoteOption().getId().equals(vote.getPostVoteOption().getId()); @@ -24,23 +27,19 @@ public static MyVoteResponse toMyVoteResponse(BattleVote vote, UserBattleStep st vote.getBattle().getTitle(), toOptionInfo(vote.getPreVoteOption()), toOptionInfo(vote.getPostVoteOption()), - step, + step, // 외부에서 넘겨받은 UserBattleStep 사용 opinionChanged ); } - public static VoteStatsResponse toVoteStatsResponse( - List stats, - long totalCount, - LocalDateTime updatedAt - ) { + // 투표 통계 변환 + public static VoteStatsResponse toVoteStatsResponse(List stats, long totalCount, LocalDateTime updatedAt) { return new VoteStatsResponse(stats, totalCount, updatedAt); } + // 옵션 정보를 응답용으로 변환 (null 안전 처리) private static MyVoteResponse.OptionInfo toOptionInfo(BattleOption option) { - if (option == null) { - return null; - } + if (option == null) return null; return new MyVoteResponse.OptionInfo(option.getId(), option.getLabel().name(), option.getTitle()); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java b/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java deleted file mode 100644 index 1a37a99a..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.swyp.picke.domain.vote.dto.request; - -public record PollVoteRequest( - Long optionId -) {} - - diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java b/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java index 212547fa..7ff37c42 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java @@ -2,4 +2,4 @@ public record QuizVoteRequest( Long optionId -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java b/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java index 0dd199d8..6a41eb6d 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java @@ -10,4 +10,4 @@ public record MyVoteResponse( boolean opinionChanged ) { public record OptionInfo(Long optionId, String label, String title) {} -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java b/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java index 4303b5dc..3c508760 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java @@ -9,4 +9,4 @@ public record PollVoteResponse( List stats ) { public record OptionStat(Long optionId, String label, String title, long voteCount, double ratio) {} -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java b/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java deleted file mode 100644 index 7f650b2e..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.swyp.picke.domain.vote.entity; - -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "poll_user_votes") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class PollVote extends BaseEntity { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) - private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "poll_id", nullable = false) - private Poll poll; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "option_id", nullable = false) - private PollOption selectedOption; - - @Builder - public PollVote(User user, Poll poll, PollOption selectedOption) { - this.user = user; - this.poll = poll; - this.selectedOption = selectedOption; - } - - public void updateOption(PollOption option) { - this.selectedOption = option; - } -} diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java b/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java index bb6c4a7a..7bc13514 100644 --- a/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java +++ b/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java @@ -1,14 +1,10 @@ package com.swyp.picke.domain.vote.entity; -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; +import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -16,7 +12,7 @@ @Getter @Entity -@Table(name = "quiz_user_votes") +@Table(name = "quiz_votes") @NoArgsConstructor(access = AccessLevel.PROTECTED) public class QuizVote extends BaseEntity { @@ -25,21 +21,21 @@ public class QuizVote extends BaseEntity { private User user; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "quiz_id", nullable = false) - private Quiz quiz; + @JoinColumn(name = "battle_id", nullable = false) + private Battle battle; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "option_id", nullable = false) - private QuizOption selectedOption; + private BattleOption selectedOption; @Builder - public QuizVote(User user, Quiz quiz, QuizOption selectedOption) { + public QuizVote(User user, Battle battle, BattleOption selectedOption) { this.user = user; - this.quiz = quiz; + this.battle = battle; this.selectedOption = selectedOption; } - public void updateOption(QuizOption option) { + public void updateOption(BattleOption option) { this.selectedOption = option; } } diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java b/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java similarity index 77% rename from src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java rename to src/main/java/com/swyp/picke/domain/vote/entity/Vote.java index 1551e80c..47054b65 100644 --- a/src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java +++ b/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java @@ -19,7 +19,7 @@ @Entity @Table(name = "votes") @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class BattleVote extends BaseEntity { +public class Vote extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id", nullable = false) @@ -41,7 +41,7 @@ public class BattleVote extends BaseEntity { private Boolean isTtsListened = false; @Builder - private BattleVote(User user, Battle battle, BattleOption preVoteOption, + private Vote(User user, Battle battle, BattleOption preVoteOption, BattleOption postVoteOption, Boolean isTtsListened) { this.user = user; this.battle = battle; @@ -50,26 +50,38 @@ private BattleVote(User user, Battle battle, BattleOption preVoteOption, this.isTtsListened = isTtsListened != null ? isTtsListened : false; } - public static BattleVote createPreVote(User user, Battle battle, BattleOption option) { - return BattleVote.builder() + /** + * 최초 투표(사전 투표) 시 사용하는 정적 팩토리 메서드 + */ + public static Vote createPreVote(User user, Battle battle, BattleOption option) { + return Vote.builder() .user(user) .battle(battle) .preVoteOption(option) .isTtsListened(false) - // status ?ㅼ젙 ??젣?? + // status 설정 삭제됨 .build(); } + /** + * 사전 투표 옵션 수정 메서드 + */ public void updatePreVote(BattleOption preVoteOption) { this.preVoteOption = preVoteOption; } + /** + * 사후 투표 업데이트 + */ public void doPostVote(BattleOption postOption) { this.postVoteOption = postOption; + // status 업데이트 삭제됨 } + /** + * TTS 청취 상태 업데이트 + */ public void completeTts() { this.isTtsListened = true; } -} - +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java deleted file mode 100644 index 814fc16f..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.swyp.picke.domain.vote.repository; - -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.vote.entity.PollVote; -import java.util.List; -import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PollVoteRepository extends JpaRepository { - Optional findByPollAndUser(Poll poll, User user); - long countByPoll(Poll poll); - List findAllByPoll(Poll poll); -} diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java index 5cfd4064..060f2938 100644 --- a/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java +++ b/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java @@ -1,15 +1,15 @@ package com.swyp.picke.domain.vote.repository; -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.vote.entity.QuizVote; +import org.springframework.data.jpa.repository.JpaRepository; + import java.util.List; import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; public interface QuizVoteRepository extends JpaRepository { - Optional findByQuizAndUser(Quiz quiz, User user); - List findAllByQuiz(Quiz quiz); - long countByQuizAndSelectedOption(Quiz quiz, QuizOption selectedOption); + Optional findByBattleAndUser(Battle battle, User user); + long countByBattle(Battle battle); + List findAllByBattle(Battle battle); } diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java similarity index 51% rename from src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java rename to src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java index 2e98f96c..4159beb1 100644 --- a/src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java +++ b/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java @@ -4,7 +4,7 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.entity.Vote; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -13,57 +13,57 @@ import java.util.List; import java.util.Optional; -public interface BattleVoteRepository extends JpaRepository { +public interface VoteRepository extends JpaRepository { - List findAllByBattle(Battle battle); + List findAllByBattle(Battle battle); - Optional findByBattleIdAndUserId(Long battleId, Long userId); + Optional findByBattleIdAndUserId(Long battleId, Long userId); - @Query("SELECT v FROM BattleVote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") - Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); + @Query("SELECT v FROM Vote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") + Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); - Optional findByBattleAndUser(Battle battle, User user); + Optional findByBattleAndUser(Battle battle, User user); long countByBattle(Battle battle); long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); - Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); + Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); - @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + "WHERE v.user.id = :userId ORDER BY v.createdAt DESC") - List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); + List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); - @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + "WHERE v.user.id = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") - List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( + List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); long countByUserId(Long userId); - @Query("SELECT COUNT(v) FROM BattleVote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") + @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); - @Query("SELECT COUNT(v) FROM BattleVote v WHERE v.user.id = :userId " + + @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId " + "AND v.postVoteOption IS NOT NULL " + "AND v.preVoteOption <> v.postVoteOption") long countOpinionChangesByUserId(@Param("userId") Long userId); - List findByUserId(Long userId); + List findByUserId(Long userId); // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) - @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") - List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); + @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") + List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); // 추천용: 유저가 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM BattleVote v WHERE v.user.id = :userId") + @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id = :userId") List findParticipatedBattleIdsByUserId(@Param("userId") Long userId); // 추천용: 특정 배틀에 참여한 유저 ID 조회 - @Query("SELECT DISTINCT v.user.id FROM BattleVote v WHERE v.battle.id IN :battleIds") + @Query("SELECT DISTINCT v.user.id FROM Vote v WHERE v.battle.id IN :battleIds") List findUserIdsByBattleIds(@Param("battleIds") List battleIds); // 추천용: 특정 유저들이 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM BattleVote v WHERE v.user.id IN :userIds") + @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id IN :userIds") List findParticipatedBattleIdsByUserIds(@Param("userIds") List userIds); -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java deleted file mode 100644 index 55fd9163..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.swyp.picke.domain.vote.service; - -import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; -import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; - -public interface PollVoteService { - PollVoteResponse submitPoll(Long battleId, Long userId, PollVoteRequest request); - PollVoteResponse getMyPollVote(Long battleId, Long userId); - void deletePollVoteByBattleId(Long battleId); -} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java deleted file mode 100644 index 49af6548..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.swyp.picke.domain.vote.service; - -import com.swyp.picke.domain.poll.entity.Poll; -import com.swyp.picke.domain.poll.entity.PollOption; -import com.swyp.picke.domain.poll.repository.PollOptionRepository; -import com.swyp.picke.domain.poll.service.PollService; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.user.repository.UserRepository; -import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; -import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; -import com.swyp.picke.domain.vote.entity.PollVote; -import com.swyp.picke.domain.vote.repository.PollVoteRepository; -import com.swyp.picke.global.common.exception.CustomException; -import com.swyp.picke.global.common.exception.ErrorCode; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class PollVoteServiceImpl implements PollVoteService { - - private final PollService pollService; - private final PollOptionRepository pollOptionRepository; - private final PollVoteRepository pollVoteRepository; - private final UserRepository userRepository; - - @Override - @Transactional - public PollVoteResponse submitPoll(Long battleId, Long userId, PollVoteRequest request) { - Long pollId = battleId; - Poll poll = pollService.findById(pollId); - - PollOption selectedOption = pollOptionRepository.findById(request.optionId()) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - - if (!selectedOption.getPoll().getId().equals(poll.getId())) { - throw new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND); - } - - PollVote pollVote = saveOrUpdate(poll, userId, selectedOption); - long totalCount = poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); - - return new PollVoteResponse( - pollId, - pollVote.getSelectedOption().getId(), - totalCount, - buildStats(poll, totalCount, true) - ); - } - - @Override - public PollVoteResponse getMyPollVote(Long battleId, Long userId) { - Long pollId = battleId; - Poll poll = pollService.findById(pollId); - - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - long totalCount = poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); - - return pollVoteRepository.findByPollAndUser(poll, user) - .map(pollVote -> new PollVoteResponse( - pollId, - pollVote.getSelectedOption().getId(), - totalCount, - buildStats(poll, totalCount, true) - )) - .orElseGet(() -> new PollVoteResponse( - pollId, - null, - totalCount, - buildStats(poll, totalCount, false) - )); - } - - @Override - @Transactional - public void deletePollVoteByBattleId(Long battleId) { - Long pollId = battleId; - Poll poll = pollService.findById(pollId); - - List votes = pollVoteRepository.findAllByPoll(poll); - for (PollVote pollVote : votes) { - poll.decreaseTotalParticipantsCount(); - if (pollVote.getSelectedOption() != null) { - pollVote.getSelectedOption().decreaseVoteCount(); - } - } - pollVoteRepository.deleteAllInBatch(votes); - } - - private PollVote saveOrUpdate(Poll poll, Long userId, PollOption selectedOption) { - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - return pollVoteRepository.findByPollAndUser(poll, user) - .map(pollVote -> { - if (!pollVote.getSelectedOption().equals(selectedOption)) { - pollVote.getSelectedOption().decreaseVoteCount(); - selectedOption.increaseVoteCount(); - pollVote.updateOption(selectedOption); - } - return pollVote; - }) - .orElseGet(() -> { - selectedOption.increaseVoteCount(); - poll.increaseTotalParticipantsCount(); - return pollVoteRepository.save( - PollVote.builder() - .user(user) - .poll(poll) - .selectedOption(selectedOption) - .build() - ); - }); - } - - private List buildStats(Poll poll, long totalCount, boolean revealCounts) { - return pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll).stream() - .map(option -> { - long count = revealCounts ? (option.getVoteCount() == null ? 0L : option.getVoteCount()) : 0L; - double ratio = (!revealCounts || totalCount == 0) - ? 0.0 - : Math.round((double) count / totalCount * 1000) / 10.0; - - return new PollVoteResponse.OptionStat( - option.getId(), - option.getLabel().name(), - option.getTitle(), - count, - ratio - ); - }) - .toList(); - } -} - diff --git a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java index 57963d10..52e34ba6 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java @@ -1,11 +1,13 @@ package com.swyp.picke.domain.vote.service; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; public interface QuizVoteService { QuizVoteResponse submitQuiz(Long battleId, Long userId, QuizVoteRequest request); + PollVoteResponse submitPoll(Long battleId, Long userId, QuizVoteRequest request); QuizVoteResponse getMyQuizVote(Long battleId, Long userId); + PollVoteResponse getMyPollVote(Long battleId, Long userId); void deleteQuizVoteByBattleId(Long battleId); } - diff --git a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java index 9eac2082..13ce33e7 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java @@ -1,143 +1,194 @@ package com.swyp.picke.domain.vote.service; -import com.swyp.picke.domain.quiz.entity.Quiz; -import com.swyp.picke.domain.quiz.entity.QuizOption; -import com.swyp.picke.domain.quiz.repository.QuizOptionRepository; -import com.swyp.picke.domain.quiz.service.QuizService; +import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.battle.entity.BattleOption; +import com.swyp.picke.domain.battle.repository.BattleOptionRepository; +import com.swyp.picke.domain.battle.service.BattleService; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; import com.swyp.picke.domain.vote.entity.QuizVote; import com.swyp.picke.domain.vote.repository.QuizVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class QuizVoteServiceImpl implements QuizVoteService { - private final QuizService quizService; - private final QuizOptionRepository quizOptionRepository; private final QuizVoteRepository quizVoteRepository; + private final BattleService battleService; + private final BattleOptionRepository battleOptionRepository; private final UserRepository userRepository; @Override @Transactional public QuizVoteResponse submitQuiz(Long battleId, Long userId, QuizVoteRequest request) { - Long quizId = battleId; - Quiz quiz = quizService.findById(quizId); + Battle battle = battleService.findById(battleId); + if (!"QUIZ".equals(battle.getType().name())) { + throw new CustomException(ErrorCode.BATTLE_NOT_QUIZ); + } - QuizOption selectedOption = quizOptionRepository.findById(request.optionId()) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); + QuizVote v = saveOrUpdate(battle, userId, request.optionId()); + long totalCount = quizVoteRepository.countByBattle(v.getBattle()); + + return new QuizVoteResponse( + battleId, + v.getSelectedOption().getId(), + totalCount, + calcStats(v.getBattle(), totalCount) + ); + } - if (!selectedOption.getQuiz().getId().equals(quiz.getId())) { - throw new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND); + @Override + @Transactional + public PollVoteResponse submitPoll(Long battleId, Long userId, QuizVoteRequest request) { + Battle battle = battleService.findById(battleId); + if (!"VOTE".equals(battle.getType().name())) { + throw new CustomException(ErrorCode.BATTLE_NOT_POLL); } - QuizVote quizVote = saveOrUpdate(quiz, userId, selectedOption); - long totalCount = quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); + QuizVote v = saveOrUpdate(battle, userId, request.optionId()); + long totalCount = quizVoteRepository.countByBattle(v.getBattle()); - return new QuizVoteResponse( - quizId, - quizVote.getSelectedOption().getId(), + return new PollVoteResponse( + battleId, + v.getSelectedOption().getId(), totalCount, - buildStats(quiz, totalCount, true, true) + calcStats(v.getBattle(), totalCount).stream() + .map(s -> new PollVoteResponse.OptionStat(s.optionId(), s.label(), s.title(), s.voteCount(), s.ratio())) + .toList() ); } @Override public QuizVoteResponse getMyQuizVote(Long battleId, Long userId) { - Long quizId = battleId; - Quiz quiz = quizService.findById(quizId); + Battle battle = battleService.findById(battleId); + if (!"QUIZ".equals(battle.getType().name())) { + throw new CustomException(ErrorCode.BATTLE_NOT_QUIZ); + } User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - long totalCount = quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); + long totalCount = quizVoteRepository.countByBattle(battle); - return quizVoteRepository.findByQuizAndUser(quiz, user) - .map(quizVote -> new QuizVoteResponse( - quizId, - quizVote.getSelectedOption().getId(), + return quizVoteRepository.findByBattleAndUser(battle, user) + .map(v -> new QuizVoteResponse( + battleId, + v.getSelectedOption().getId(), totalCount, - buildStats(quiz, totalCount, true, true) + calcStats(battle, totalCount) )) - .orElseGet(() -> new QuizVoteResponse( - quizId, - null, - totalCount, - buildStats(quiz, totalCount, false, false) - )); + .orElseGet(() -> { + // [투표 전] 전체 참여자 수(totalCount), 선택지 설명(stance)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 + List blindStats = battleOptionRepository.findByBattle(battle).stream() + .map(o -> new QuizVoteResponse.OptionStat( + o.getId(), o.getLabel().name(), o.getTitle(), + o.getIsCorrect(), 0L, 0.0, o.getStance() + )) + .toList(); + return new QuizVoteResponse(battleId, null, totalCount, blindStats); + }); } @Override + public PollVoteResponse getMyPollVote(Long battleId, Long userId) { + Battle battle = battleService.findById(battleId); + if (!"VOTE".equals(battle.getType().name())) { + throw new CustomException(ErrorCode.BATTLE_NOT_POLL); + } + + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + long totalCount = quizVoteRepository.countByBattle(battle); + + return quizVoteRepository.findByBattleAndUser(battle, user) + .map(v -> { + List stats = calcStats(battle, totalCount).stream() + .map(s -> new PollVoteResponse.OptionStat(s.optionId(), s.label(), s.title(), s.voteCount(), s.ratio())) + .toList(); + + return new PollVoteResponse( + battleId, + v.getSelectedOption().getId(), + totalCount, + stats + ); + }) + .orElseGet(() -> { + // [투표 전] 전체 참여자 수(totalCount)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 + List blindStats = battleOptionRepository.findByBattle(battle).stream() + .map(o -> new PollVoteResponse.OptionStat(o.getId(), o.getLabel().name(), o.getTitle(), 0L, 0.0)) + .toList(); + return new PollVoteResponse(battleId, null, totalCount, blindStats); + }); + } + @Transactional public void deleteQuizVoteByBattleId(Long battleId) { - Long quizId = battleId; - Quiz quiz = quizService.findById(quizId); + // 배틀 확인 + Battle battle = battleService.findById(battleId); + + // 해당 배틀의 모든 투표 조회 + List votes = quizVoteRepository.findAllByBattle(battle); - List votes = quizVoteRepository.findAllByQuiz(quiz); - for (QuizVote ignored : votes) { - quiz.decreaseTotalParticipantsCount(); + // 투표수 감소 (배틀 옵션에 반영) + for (QuizVote v : votes) { + if (v.getSelectedOption() != null) { + v.getSelectedOption().decreaseVoteCount(); + } } quizVoteRepository.deleteAllInBatch(votes); } - private QuizVote saveOrUpdate(Quiz quiz, Long userId, QuizOption selectedOption) { + private QuizVote saveOrUpdate(Battle battle, Long userId, Long optionId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + BattleOption newOption = battleOptionRepository.findById(optionId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - return quizVoteRepository.findByQuizAndUser(quiz, user) - .map(quizVote -> { - if (!quizVote.getSelectedOption().equals(selectedOption)) { - quizVote.updateOption(selectedOption); + return quizVoteRepository.findByBattleAndUser(battle, user) + .map(v -> { + // 옵션을 바꾼다면 기존 옵션 -1, 새 옵션 +1 + if (!v.getSelectedOption().equals(newOption)) { + v.getSelectedOption().decreaseVoteCount(); + newOption.increaseVoteCount(); + v.updateOption(newOption); } - return quizVote; + return v; }) .orElseGet(() -> { - quiz.increaseTotalParticipantsCount(); + // 처음 투표한다면 새 옵션 +1 + battle.addParticipant(); + newOption.increaseVoteCount(); return quizVoteRepository.save( - QuizVote.builder() - .user(user) - .quiz(quiz) - .selectedOption(selectedOption) - .build() - ); + QuizVote.builder().user(user).battle(battle).selectedOption(newOption).build()); }); - } + } - private List buildStats( - Quiz quiz, - long totalCount, - boolean revealCorrect, - boolean revealCounts - ) { - return quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz).stream() - .map(option -> { - long voteCount = revealCounts - ? quizVoteRepository.countByQuizAndSelectedOption(quiz, option) - : 0L; - - double ratio = (!revealCounts || totalCount == 0) - ? 0.0 - : Math.round((double) voteCount / totalCount * 1000) / 10.0; - - return new QuizVoteResponse.OptionStat( - option.getId(), - option.getLabel().name(), - option.getText(), - revealCorrect ? option.getIsCorrect() : null, - voteCount, - ratio, - null - ); - }) - .toList(); + private List calcStats(Battle battle, long totalCount) { + return battleOptionRepository.findByBattle(battle).stream().map(o -> { + long count = (o.getVoteCount() == null) ? 0L : o.getVoteCount(); + double ratio = totalCount == 0 ? 0.0 : Math.round((double) count / totalCount * 1000) / 10.0; + return new QuizVoteResponse.OptionStat( + o.getId(), + o.getLabel().name(), + o.getTitle(), + o.getIsCorrect(), + count, + ratio, + o.getStance() + ); + }).toList(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java index 5401ef8a..fab804f0 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java @@ -2,51 +2,49 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.vote.entity.BattleVote; -import com.swyp.picke.domain.vote.repository.BattleVoteRepository; -import java.util.List; -import java.util.Objects; +import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.repository.VoteRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class VoteQueryService { - private final BattleVoteRepository battleVoteRepository; + private final VoteRepository voteRepository; - public List findUserVotes(Long userId, int offset, int size, BattleOptionLabel label) { + public List findUserVotes(Long userId, int offset, int size, BattleOptionLabel label) { PageRequest pageable = PageRequest.of(offset / size, size); return label != null - ? battleVoteRepository.findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc(userId, label, pageable) - : battleVoteRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); + ? voteRepository.findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc(userId, label, pageable) + : voteRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); } public long countUserVotes(Long userId, BattleOptionLabel label) { return label != null - ? battleVoteRepository.countByUserIdAndPreVoteOptionLabel(userId, label) - : battleVoteRepository.countByUserId(userId); + ? voteRepository.countByUserIdAndPreVoteOptionLabel(userId, label) + : voteRepository.countByUserId(userId); } public long countTotalParticipation(Long userId) { - return battleVoteRepository.countByUserId(userId); + return voteRepository.countByUserId(userId); } public long countOpinionChanges(Long userId) { - return battleVoteRepository.countOpinionChangesByUserId(userId); + return voteRepository.countOpinionChangesByUserId(userId); } public int calculateBattleWinRate(Long userId) { - List postVotes = battleVoteRepository.findByUserId(userId).stream() + List postVotes = voteRepository.findByUserId(userId).stream() .filter(v -> v.getPostVoteOption() != null) .toList(); - if (postVotes.isEmpty()) { - return 0; - } + if (postVotes.isEmpty()) return 0; long wins = postVotes.stream() .filter(v -> { @@ -64,31 +62,27 @@ public int calculateBattleWinRate(Long userId) { } public List findParticipatedBattleIds(Long userId) { - return battleVoteRepository.findByUserId(userId).stream() + return voteRepository.findByUserId(userId).stream() .map(v -> v.getBattle().getId()) .distinct() .toList(); } public List findFirstNBattleIds(Long userId, int n) { - return battleVoteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() + return voteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() .map(v -> v.getBattle().getId()) .distinct() .toList(); } public List findFirstNVotedOptionIds(Long userId, int n) { - return battleVoteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() + return voteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() .map(v -> { - if (v.getPostVoteOption() != null) { - return v.getPostVoteOption().getId(); - } - if (v.getPreVoteOption() != null) { - return v.getPreVoteOption().getId(); - } + if (v.getPostVoteOption() != null) return v.getPostVoteOption().getId(); + if (v.getPreVoteOption() != null) return v.getPreVoteOption().getId(); return null; }) - .filter(Objects::nonNull) + .filter(java.util.Objects::nonNull) .distinct() .toList(); } diff --git a/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java similarity index 95% rename from src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java rename to src/main/java/com/swyp/picke/domain/vote/service/VoteService.java index 6fac6bbf..77d68fe6 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java @@ -6,7 +6,7 @@ import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -public interface BattleVoteService { +public interface VoteService { BattleOption findPreVoteOption(Long battleId, Long userId); Long findPostVoteOptionId(Long battleId, Long userId); VoteStatsResponse getVoteStats(Long battleId); diff --git a/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java similarity index 70% rename from src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java rename to src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java index 74342d90..32a2d956 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java @@ -14,23 +14,24 @@ import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.BattleVote; -import com.swyp.picke.domain.vote.repository.BattleVoteRepository; +import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.repository.VoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; -import java.time.LocalDateTime; -import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.List; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class BattleVoteServiceImpl implements BattleVoteService { +public class VoteServiceImpl implements VoteService { - private final BattleVoteRepository battleVoteRepository; + private final VoteRepository voteRepository; private final BattleService battleService; private final BattleOptionRepository battleOptionRepository; private final UserRepository userRepository; @@ -42,7 +43,7 @@ public BattleOption findPreVoteOption(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) + Vote vote = voteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); if (vote.getPreVoteOption() == null) { @@ -53,7 +54,7 @@ public BattleOption findPreVoteOption(Long battleId, Long userId) { @Override public Long findPostVoteOptionId(Long battleId, Long userId) { - return battleVoteRepository.findByBattleIdAndUserId(battleId, userId) + return voteRepository.findByBattleIdAndUserId(battleId, userId) .map(vote -> vote.getPostVoteOption() != null ? vote.getPostVoteOption().getId() : null) .orElse(null); } @@ -62,26 +63,21 @@ public Long findPostVoteOptionId(Long battleId, Long userId) { public VoteStatsResponse getVoteStats(Long battleId) { Battle battle = battleService.findById(battleId); List options = battleOptionRepository.findByBattle(battle); - long totalCount = battleVoteRepository.countByBattle(battle); + long totalCount = voteRepository.countByBattle(battle); List stats = options.stream() .map(option -> { - long count = battleVoteRepository.countByBattleAndPreVoteOption(battle, option); + long count = voteRepository.countByBattleAndPreVoteOption(battle, option); double ratio = totalCount > 0 ? Math.round((double) count / totalCount * 1000.0) / 10.0 : 0.0; return new VoteStatsResponse.OptionStat( - option.getId(), - option.getLabel().name(), - option.getTitle(), - count, - ratio - ); + option.getId(), option.getLabel().name(), option.getTitle(), count, ratio); }) .toList(); - LocalDateTime updatedAt = battleVoteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) - .map(BattleVote::getUpdatedAt) + LocalDateTime updatedAt = voteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) + .map(Vote::getUpdatedAt) .orElse(null); return VoteConverter.toVoteStatsResponse(stats, totalCount, updatedAt); @@ -93,7 +89,7 @@ public MyVoteResponse getMyVote(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) + Vote vote = voteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); @@ -103,32 +99,37 @@ public MyVoteResponse getMyVote(Long battleId, Long userId) { @Override @Transactional public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request) { + // 1. 기본 정보 조회 (배틀, 유저, 선택한 옵션) Battle battle = battleService.findById(battleId); User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - Optional existingVote = battleVoteRepository.findByBattleAndUser(battle, user); - BattleVote vote; + // 2. 기존 투표 여부 확인 (에러 대신 Optional로 받음) + Optional existingVote = voteRepository.findByBattleAndUser(battle, user); + Vote vote; if (existingVote.isPresent()) { vote = existingVote.get(); vote.updatePreVote(option); } else { - vote = BattleVote.createPreVote(user, battle, option); - battleVoteRepository.save(vote); + vote = Vote.createPreVote(user, battle, option); + voteRepository.save(vote); battle.addParticipant(); } + // 3. 현재 유저의 진행 단계 확인 UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); + + // 4. 단계 업데이트 (처음 참여하는 경우에만 단계를 PRE_VOTE로 변경) + // 이미 POST_VOTE나 COMPLETED라면 단계를 강제로 낮추지 않음 if (status.step() == UserBattleStep.NONE) { userBattleService.upsertStep(user, battle, UserBattleStep.PRE_VOTE); } - UserBattleStep currentStep = status.step() == UserBattleStep.NONE - ? UserBattleStep.PRE_VOTE - : status.step(); + // 5. 현재 유지 중인 단계를 반환 (수정 후에도 COMPLETED 유지 가능) + UserBattleStep currentStep = (status.step() == UserBattleStep.NONE) ? UserBattleStep.PRE_VOTE : status.step(); return new VoteResultResponse(vote.getId(), currentStep); } @@ -141,15 +142,19 @@ public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest reque BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) + Vote vote = voteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + // [검증] 사전 투표를 완료한 상태(혹은 오디오 청취 완료 상태)인지 확인 UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); if (status.step() == UserBattleStep.NONE) { throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); } + // 1. 사후 투표 업데이트 vote.doPostVote(option); + + // 2. 최종 완료 단계(COMPLETED)로 업데이트 userBattleService.upsertStep(user, battle, UserBattleStep.COMPLETED); return new VoteResultResponse(vote.getId(), UserBattleStep.COMPLETED); @@ -158,14 +163,23 @@ public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest reque @Override @Transactional public void deleteVotesByBattleId(Long battleId) { + // 1. 배틀 조회 Battle battle = battleService.findById(battleId); - List votes = battleVoteRepository.findAllByBattle(battle); - for (BattleVote vote : votes) { + // 2. 해당 배틀의 모든 투표 조회 + List votes = voteRepository.findAllByBattle(battle); + + for (Vote vote : votes) { + // 3. 유저의 진행 단계 초기화 (이건 유저별로 다 해줘야 함) userBattleService.upsertStep(vote.getUser(), battle, UserBattleStep.NONE); + + // 4. 옵션별 카운트 감소 (필요 시) + if (vote.getPreVoteOption() != null) { /* 감소 로직 */ } + if (vote.getPostVoteOption() != null) { /* 감소 로직 */ } } - battleVoteRepository.deleteAllInBatch(votes); + // 5. 투표 데이터 일괄 삭제 + voteRepository.deleteAllInBatch(votes); } @Override @@ -175,10 +189,12 @@ public void completeTts(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) + // 1. 엔티티 상태 변경 (isTtsListened = true) + Vote vote = voteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); vote.completeTts(); + // 2. 단계를 POST_VOTE(사후 투표 가능 단계)로 업데이트 userBattleService.upsertStep(user, battle, UserBattleStep.POST_VOTE); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java index 78c1fc2b..c61fd52d 100644 --- a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java @@ -43,13 +43,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { "/js/**", "/css/**", "/favicon.ico", "/api/v1/admin/login", "/api/v1/admin", "/result/**", - "/api/v1/resources/images/**", - "/api/v1/resources/audio/**", - "/api/v1/resources/local/**", - "/api/v1/admob/reward/**", "/report/**", "/battle/**", - "/.well-known/**" + "/.well-known/**", + "/api/v1/resources/images/**", + "/api/v1/resources/audio/**", + "/api/v1/admob/reward/**" ).permitAll() // 2. 관리자 HTML 화면 렌더링 요청 From afd2152d6b1512c065360939e0a73e52487e328a Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Sat, 11 Apr 2026 23:39:38 +0900 Subject: [PATCH 80/94] =?UTF-8?q?#140=20[Breaking=20Change]=20Battle/Quiz/?= =?UTF-8?q?Poll=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20Vote=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=9E=AC=ED=8E=B8=20(#164)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminBattleController.java | 75 ++++ .../AdminNotificationController.java | 54 +++ .../controller/AdminPickeController.java | 5 + .../admin/controller/AdminPollController.java | 69 ++++ .../admin/controller/AdminQuizController.java | 69 ++++ .../controller/AdminScenarioController.java | 73 ++++ .../admin/controller/AdminTagController.java | 55 +++ .../request/AdminBattleCreateRequest.java | 15 + .../request/AdminBattleOptionRequest.java | 8 +- .../request/AdminBattleUpdateRequest.java | 15 +- .../response/AdminBattleDeleteResponse.java | 11 + .../response/AdminBattleDetailResponse.java | 19 +- .../request/AdminNoticeCreateRequest.java | 11 + .../response/AdminNoticeDetailResponse.java | 15 + .../response/AdminNoticeListResponse.java | 8 + .../response/AdminNoticeSummaryResponse.java | 15 + .../poll/request/AdminPollCreateRequest.java | 14 + .../poll/request/AdminPollOptionRequest.java | 10 + .../poll/request/AdminPollUpdateRequest.java | 17 + .../response/AdminPollDeleteResponse.java | 11 + .../response/AdminPollDetailResponse.java | 16 + .../quiz/request/AdminQuizCreateRequest.java | 10 + .../quiz/request/AdminQuizOptionRequest.java | 10 + .../quiz/request/AdminQuizUpdateRequest.java | 16 + .../response/AdminQuizDeleteResponse.java | 8 + .../response/AdminQuizDetailResponse.java | 15 + .../request/AdminScenarioCreateRequest.java | 15 + .../request/AdminScenarioNodeRequest.java | 11 + .../request/AdminScenarioOptionRequest.java | 6 + .../request/AdminScenarioScriptRequest.java | 9 + .../AdminScenarioStatusUpdateRequest.java | 7 + .../response/AdminDeleteResponse.java | 9 + .../response/AdminScenarioCreateResponse.java | 8 + .../response/AdminScenarioDetailResponse.java | 18 + .../response/AdminScenarioNodeResponse.java | 15 + .../response/AdminScenarioOptionResponse.java | 9 + .../response/AdminScenarioResponse.java | 10 + .../response/AdminScenarioScriptResponse.java | 13 + .../dto/tag}/request/TagRequest.java | 6 +- .../dto/tag}/response/TagDeleteResponse.java | 2 +- .../dto/tag}/response/TagResponse.java | 2 +- .../admin/service/AdminBattleService.java | 36 ++ .../service/AdminNotificationService.java | 109 +++++ .../admin/service/AdminPollService.java | 36 ++ .../admin/service/AdminQuizService.java | 36 ++ .../admin/service/AdminScenarioService.java | 193 +++++++++ .../domain/admin/service/AdminTagService.java | 27 ++ .../controller/AdminBattleController.java | 51 --- .../battle/controller/BattleController.java | 26 +- .../battle/converter/BattleConverter.java | 72 ++-- .../dto/request/AdminBattleCreateRequest.java | 24 -- .../response/AdminBattleDeleteResponse.java | 13 - .../dto/response/BattleOptionResponse.java | 3 +- .../dto/response/BattleScenarioResponse.java | 3 +- .../dto/response/BattleSimpleResponse.java | 3 +- .../dto/response/BattleSummaryResponse.java | 28 +- .../response/BattleUserDetailResponse.java | 26 +- .../dto/response/BattleVoteResponse.java | 2 +- .../dto/response/TodayBattleListResponse.java | 2 +- .../dto/response/TodayBattleResponse.java | 32 +- .../dto/response/TodayOptionResponse.java | 18 +- .../picke/domain/battle/entity/Battle.java | 120 +++--- .../domain/battle/entity/BattleOption.java | 64 ++- .../picke/domain/battle/enums/BattleType.java | 5 - .../repository/BattleOptionRepository.java | 14 +- .../repository/BattleOptionTagRepository.java | 2 + .../battle/repository/BattleRepository.java | 77 ++-- .../domain/battle/service/BattleService.java | 53 +-- .../battle/service/BattleServiceImpl.java | 375 ++++++++++++++---- .../home/controller/HomeController.java | 4 +- .../domain/home/service/HomeService.java | 215 +++++----- .../repository/NotificationRepository.java | 10 + .../service/NotificationService.java | 10 +- .../oauth/controller/AuthController.java | 2 +- .../controller/CommentLikeController.java | 4 +- .../PerspectiveCommentController.java | 6 +- .../controller/PerspectiveController.java | 13 +- .../controller/PerspectiveLikeController.java | 4 +- .../controller/ReportController.java | 2 +- .../service/PerspectiveCommentService.java | 12 +- .../service/PerspectiveService.java | 8 +- .../poll/controller/PollController.java | 38 ++ .../domain/poll/converter/PollConverter.java | 85 ++++ .../poll/dto/response/PollDetailResponse.java | 14 + .../poll/dto/response/PollListResponse.java | 13 + .../poll/dto/response/PollOptionResponse.java | 14 + .../poll/dto/response/PollSimpleResponse.java | 15 + .../poll/dto/response/PollTagResponse.java | 12 + .../swyp/picke/domain/poll/entity/Poll.java | 70 ++++ .../picke/domain/poll/entity/PollOption.java | 65 +++ .../poll/entity/PollOptionValueTagMap.java | 39 ++ .../poll/entity/PollOptionValueTagMapId.java | 16 + .../picke/domain/poll/entity/PollTagMap.java | 39 ++ .../domain/poll/entity/PollTagMapId.java | 16 + .../domain/poll/entity/PollUserVote.java | 43 ++ .../domain/poll/enums/PollOptionLabel.java | 5 + .../picke/domain/poll/enums/PollStatus.java | 8 + .../poll/repository/PollOptionRepository.java | 14 + .../PollOptionValueTagMapRepository.java | 14 + .../poll/repository/PollRepository.java | 37 ++ .../poll/repository/PollTagMapRepository.java | 14 + .../repository/PollUserVoteRepository.java | 16 + .../domain/poll/service/PollService.java | 35 ++ .../domain/poll/service/PollServiceImpl.java | 186 +++++++++ .../quiz/controller/QuizController.java | 38 ++ .../domain/quiz/converter/QuizConverter.java | 85 ++++ .../quiz/dto/response/QuizDetailResponse.java | 17 + .../quiz/dto/response/QuizListResponse.java | 13 + .../quiz/dto/response/QuizOptionResponse.java | 12 + .../quiz/dto/response/QuizSimpleResponse.java | 15 + .../quiz/dto/response/QuizTagResponse.java | 12 + .../swyp/picke/domain/quiz/entity/Quiz.java | 65 +++ .../picke/domain/quiz/entity/QuizOption.java | 71 ++++ .../quiz/entity/QuizOptionValueTagMap.java | 39 ++ .../quiz/entity/QuizOptionValueTagMapId.java | 16 + .../picke/domain/quiz/entity/QuizTagMap.java | 39 ++ .../domain/quiz/entity/QuizTagMapId.java | 16 + .../domain/quiz/entity/QuizUserVote.java | 43 ++ .../domain/quiz/enums/QuizOptionLabel.java | 6 + .../picke/domain/quiz/enums/QuizStatus.java | 8 + .../quiz/repository/QuizOptionRepository.java | 14 + .../QuizOptionValueTagMapRepository.java | 14 + .../quiz/repository/QuizRepository.java | 37 ++ .../quiz/repository/QuizTagMapRepository.java | 14 + .../repository/QuizUserVoteRepository.java | 16 + .../domain/quiz/service/QuizService.java | 35 ++ .../domain/quiz/service/QuizServiceImpl.java | 189 +++++++++ .../controller/RecommendationController.java | 4 +- .../service/RecommendationService.java | 12 +- .../controller/AdMobRewardController.java | 4 +- .../scenario/service/ScenarioServiceImpl.java | 12 +- .../response/SearchBattleListResponse.java | 2 - .../domain/search/service/SearchService.java | 1 - .../domain/tag/controller/TagController.java | 49 +-- .../domain/tag/converter/TagConverter.java | 6 +- .../tag/dto/response/TagListResponse.java | 1 + .../picke/domain/tag/entity/CategoryTag.java | 35 ++ .../domain/tag/entity/PhilosopherTag.java | 36 ++ .../picke/domain/tag/entity/ValueTag.java | 36 ++ .../tag/repository/CategoryTagRepository.java | 8 + .../repository/PhilosopherTagRepository.java | 8 + .../tag/repository/ValueTagRepository.java | 8 + .../picke/domain/tag/service/TagService.java | 7 +- .../domain/tag/service/TagServiceImpl.java | 21 +- .../test/controller/TestController.java | 34 -- .../domain/user/service/MypageService.java | 21 +- .../domain/user/service/UserService.java | 4 +- .../vote/controller/VoteController.java | 85 ++-- .../domain/vote/converter/VoteConverter.java | 23 +- .../vote/dto/request/PollVoteRequest.java | 7 + .../vote/dto/request/QuizVoteRequest.java | 2 +- .../vote/dto/response/MyVoteResponse.java | 2 +- .../vote/dto/response/PollVoteResponse.java | 2 +- .../entity/{Vote.java => BattleVote.java} | 26 +- .../picke/domain/vote/entity/PollVote.java | 45 +++ .../picke/domain/vote/entity/QuizVote.java | 24 +- ...ository.java => BattleVoteRepository.java} | 42 +- .../vote/repository/PollVoteRepository.java | 14 + .../vote/repository/QuizVoteRepository.java | 12 +- ...oteService.java => BattleVoteService.java} | 2 +- ...ceImpl.java => BattleVoteServiceImpl.java} | 78 ++-- .../domain/vote/service/PollVoteService.java | 10 + .../vote/service/PollVoteServiceImpl.java | 140 +++++++ .../domain/vote/service/QuizVoteService.java | 4 +- .../vote/service/QuizVoteServiceImpl.java | 211 ++++------ .../domain/vote/service/VoteQueryService.java | 46 ++- .../picke/global/config/SecurityConfig.java | 9 +- .../service/LocalDraftFileStorageService.java | 189 +++++++++ 168 files changed, 4402 insertions(+), 1026 deletions(-) create mode 100644 src/main/java/com/swyp/picke/domain/admin/controller/AdminBattleController.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/controller/AdminNotificationController.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/controller/AdminPollController.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/controller/AdminQuizController.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/controller/AdminScenarioController.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/controller/AdminTagController.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleCreateRequest.java rename src/main/java/com/swyp/picke/domain/{battle/dto => admin/dto/battle}/request/AdminBattleOptionRequest.java (54%) rename src/main/java/com/swyp/picke/domain/{battle/dto => admin/dto/battle}/request/AdminBattleUpdateRequest.java (52%) create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/battle/response/AdminBattleDeleteResponse.java rename src/main/java/com/swyp/picke/domain/{battle/dto => admin/dto/battle}/response/AdminBattleDetailResponse.java (56%) create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/notification/request/AdminNoticeCreateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeListResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeSummaryResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollCreateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollOptionRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollUpdateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDeleteResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizCreateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizOptionRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizUpdateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDeleteResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioCreateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioNodeRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioOptionRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioScriptRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioStatusUpdateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminDeleteResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioCreateResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioNodeResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioOptionResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioScriptResponse.java rename src/main/java/com/swyp/picke/domain/{tag/dto => admin/dto/tag}/request/TagRequest.java (54%) rename src/main/java/com/swyp/picke/domain/{tag/dto => admin/dto/tag}/response/TagDeleteResponse.java (70%) rename src/main/java/com/swyp/picke/domain/{tag/dto => admin/dto/tag}/response/TagResponse.java (81%) create mode 100644 src/main/java/com/swyp/picke/domain/admin/service/AdminBattleService.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/service/AdminNotificationService.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/service/AdminPollService.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/service/AdminQuizService.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/service/AdminScenarioService.java create mode 100644 src/main/java/com/swyp/picke/domain/admin/service/AdminTagService.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/controller/PollController.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/Poll.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/service/PollService.java create mode 100644 src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java create mode 100644 src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/test/controller/TestController.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java rename src/main/java/com/swyp/picke/domain/vote/entity/{Vote.java => BattleVote.java} (77%) create mode 100644 src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java rename src/main/java/com/swyp/picke/domain/vote/repository/{VoteRepository.java => BattleVoteRepository.java} (51%) create mode 100644 src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java rename src/main/java/com/swyp/picke/domain/vote/service/{VoteService.java => BattleVoteService.java} (95%) rename src/main/java/com/swyp/picke/domain/vote/service/{VoteServiceImpl.java => BattleVoteServiceImpl.java} (70%) create mode 100644 src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java create mode 100644 src/main/java/com/swyp/picke/global/infra/local/service/LocalDraftFileStorageService.java diff --git a/src/main/java/com/swyp/picke/domain/admin/controller/AdminBattleController.java b/src/main/java/com/swyp/picke/domain/admin/controller/AdminBattleController.java new file mode 100644 index 00000000..49e5cf61 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/controller/AdminBattleController.java @@ -0,0 +1,75 @@ +package com.swyp.picke.domain.admin.controller; + +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.service.AdminBattleService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "관리자 배틀 API", description = "관리자 배틀 콘텐츠 생성, 조회, 수정, 삭제") +@RestController +@RequestMapping("/api/v1/admin/battles") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminBattleController { + + private final AdminBattleService adminBattleService; + + @Operation(summary = "배틀 생성") + @PostMapping + public ApiResponse createBattle( + @RequestBody @Valid AdminBattleCreateRequest request, + @AuthenticationPrincipal Long adminUserId + ) { + return ApiResponse.onSuccess(adminBattleService.createBattle(request, adminUserId)); + } + + @Operation(summary = "배틀 상세 조회") + @GetMapping("/{battleId}") + public ApiResponse getBattleDetail(@PathVariable Long battleId) { + return ApiResponse.onSuccess(adminBattleService.getBattleDetail(battleId)); + } + + @Operation(summary = "배틀 수정") + @PatchMapping("/{battleId}") + public ApiResponse updateBattle( + @PathVariable Long battleId, + @RequestBody @Valid AdminBattleUpdateRequest request + ) { + return ApiResponse.onSuccess(adminBattleService.updateBattle(battleId, request)); + } + + @Operation(summary = "배틀 삭제") + @DeleteMapping("/{battleId}") + public ApiResponse deleteBattle( + @PathVariable Long battleId + ) { + return ApiResponse.onSuccess(adminBattleService.deleteBattle(battleId)); + } + + @Operation(summary = "배틀 목록 조회") + @GetMapping + public ApiResponse getBattles( + @RequestParam(value = "page", defaultValue = "1") int page, + @RequestParam(value = "size", defaultValue = "10") int size, + @RequestParam(value = "status", required = false) String status + ) { + return ApiResponse.onSuccess(adminBattleService.getBattles(page, size, status)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/controller/AdminNotificationController.java b/src/main/java/com/swyp/picke/domain/admin/controller/AdminNotificationController.java new file mode 100644 index 00000000..bfb1cd16 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/controller/AdminNotificationController.java @@ -0,0 +1,54 @@ +package com.swyp.picke.domain.admin.controller; + +import com.swyp.picke.domain.admin.dto.notification.request.AdminNoticeCreateRequest; +import com.swyp.picke.domain.admin.dto.notification.response.AdminNoticeDetailResponse; +import com.swyp.picke.domain.admin.dto.notification.response.AdminNoticeListResponse; +import com.swyp.picke.domain.admin.service.AdminNotificationService; +import com.swyp.picke.domain.notification.enums.NotificationCategory; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "관리자 공지 API", description = "공지사항/이벤트 작성 및 조회") +@RestController +@RequestMapping("/api/v1/admin/notices") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminNotificationController { + + private final AdminNotificationService adminNotificationService; + + @Operation(summary = "공지사항 작성") + @PostMapping + public ApiResponse createNotice( + @RequestBody @Valid AdminNoticeCreateRequest request + ) { + return ApiResponse.onSuccess(adminNotificationService.createNotice(request)); + } + + @Operation(summary = "공지사항 목록 조회") + @GetMapping + public ApiResponse getNotices( + @RequestParam(required = false) NotificationCategory category, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size + ) { + return ApiResponse.onSuccess(adminNotificationService.getNotices(category, page, size)); + } + + @Operation(summary = "공지사항 상세 조회") + @GetMapping("/{noticeId}") + public ApiResponse getNoticeDetail(@PathVariable Long noticeId) { + return ApiResponse.onSuccess(adminNotificationService.getNoticeDetail(noticeId)); + } +} diff --git a/src/main/java/com/swyp/picke/domain/admin/controller/AdminPickeController.java b/src/main/java/com/swyp/picke/domain/admin/controller/AdminPickeController.java index ea89b32c..45a5031a 100644 --- a/src/main/java/com/swyp/picke/domain/admin/controller/AdminPickeController.java +++ b/src/main/java/com/swyp/picke/domain/admin/controller/AdminPickeController.java @@ -44,4 +44,9 @@ public String pickeListPage() { public String pickeCreatePage() { return "admin/picke-create"; } + + @GetMapping("/picke/notice") + public String noticePage() { + return "admin/admin-notice"; + } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/controller/AdminPollController.java b/src/main/java/com/swyp/picke/domain/admin/controller/AdminPollController.java new file mode 100644 index 00000000..ac40665e --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/controller/AdminPollController.java @@ -0,0 +1,69 @@ +package com.swyp.picke.domain.admin.controller; + +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.admin.service.AdminPollService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "관리자 투표 콘텐츠 API", description = "관리자 투표 콘텐츠 생성, 조회, 수정, 삭제") +@RestController +@RequestMapping("/api/v1/admin/polls") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminPollController { + + private final AdminPollService adminPollService; + + @Operation(summary = "투표 콘텐츠 생성") + @PostMapping + public ApiResponse createPoll(@RequestBody @Valid AdminPollCreateRequest request) { + return ApiResponse.onSuccess(adminPollService.createPoll(request)); + } + + @Operation(summary = "투표 콘텐츠 상세 조회") + @GetMapping("/{pollId}") + public ApiResponse getPollDetail(@PathVariable Long pollId) { + return ApiResponse.onSuccess(adminPollService.getPollDetail(pollId)); + } + + @Operation(summary = "투표 콘텐츠 수정") + @PatchMapping("/{pollId}") + public ApiResponse updatePoll( + @PathVariable Long pollId, + @RequestBody @Valid AdminPollUpdateRequest request + ) { + return ApiResponse.onSuccess(adminPollService.updatePoll(pollId, request)); + } + + @Operation(summary = "투표 콘텐츠 삭제") + @DeleteMapping("/{pollId}") + public ApiResponse deletePoll(@PathVariable Long pollId) { + return ApiResponse.onSuccess(adminPollService.deletePoll(pollId)); + } + + @Operation(summary = "투표 콘텐츠 목록 조회") + @GetMapping + public ApiResponse getPolls( + @RequestParam(value = "page", defaultValue = "1") int page, + @RequestParam(value = "size", defaultValue = "10") int size, + @RequestParam(value = "status", required = false) String status + ) { + return ApiResponse.onSuccess(adminPollService.getPolls(page, size, status)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/controller/AdminQuizController.java b/src/main/java/com/swyp/picke/domain/admin/controller/AdminQuizController.java new file mode 100644 index 00000000..bd127a54 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/controller/AdminQuizController.java @@ -0,0 +1,69 @@ +package com.swyp.picke.domain.admin.controller; + +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.admin.service.AdminQuizService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "관리자 퀴즈 API", description = "관리자 퀴즈 콘텐츠 생성, 조회, 수정, 삭제") +@RestController +@RequestMapping("/api/v1/admin/quizzes") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminQuizController { + + private final AdminQuizService adminQuizService; + + @Operation(summary = "퀴즈 생성") + @PostMapping + public ApiResponse createQuiz(@RequestBody @Valid AdminQuizCreateRequest request) { + return ApiResponse.onSuccess(adminQuizService.createQuiz(request)); + } + + @Operation(summary = "퀴즈 상세 조회") + @GetMapping("/{quizId}") + public ApiResponse getQuizDetail(@PathVariable Long quizId) { + return ApiResponse.onSuccess(adminQuizService.getQuizDetail(quizId)); + } + + @Operation(summary = "퀴즈 수정") + @PatchMapping("/{quizId}") + public ApiResponse updateQuiz( + @PathVariable Long quizId, + @RequestBody @Valid AdminQuizUpdateRequest request + ) { + return ApiResponse.onSuccess(adminQuizService.updateQuiz(quizId, request)); + } + + @Operation(summary = "퀴즈 삭제") + @DeleteMapping("/{quizId}") + public ApiResponse deleteQuiz(@PathVariable Long quizId) { + return ApiResponse.onSuccess(adminQuizService.deleteQuiz(quizId)); + } + + @Operation(summary = "퀴즈 목록 조회") + @GetMapping + public ApiResponse getQuizzes( + @RequestParam(value = "page", defaultValue = "1") int page, + @RequestParam(value = "size", defaultValue = "10") int size, + @RequestParam(value = "status", required = false) String status + ) { + return ApiResponse.onSuccess(adminQuizService.getQuizzes(page, size, status)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/controller/AdminScenarioController.java b/src/main/java/com/swyp/picke/domain/admin/controller/AdminScenarioController.java new file mode 100644 index 00000000..75f8ce8d --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/controller/AdminScenarioController.java @@ -0,0 +1,73 @@ +package com.swyp.picke.domain.admin.controller; + +import com.swyp.picke.domain.admin.dto.scenario.request.AdminScenarioCreateRequest; +import com.swyp.picke.domain.admin.dto.scenario.request.AdminScenarioStatusUpdateRequest; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminDeleteResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioCreateResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioDetailResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioResponse; +import com.swyp.picke.domain.admin.service.AdminScenarioService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "관리자 시나리오 API", description = "관리자 시나리오 생성, 조회, 수정, 삭제") +@RestController +@RequestMapping("/api/v1/admin") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminScenarioController { + + private final AdminScenarioService adminScenarioService; + + @Operation(summary = "배틀 시나리오 상세 조회") + @GetMapping("/battles/{battleId}/scenario") + public ApiResponse getAdminBattleScenario(@PathVariable Long battleId) { + return ApiResponse.onSuccess(adminScenarioService.getScenarioForAdmin(battleId)); + } + + @Operation(summary = "시나리오 생성") + @PostMapping("/scenarios") + @ResponseStatus(HttpStatus.CREATED) + public ApiResponse createScenario(@RequestBody AdminScenarioCreateRequest request) { + return ApiResponse.onSuccess(adminScenarioService.createScenario(request)); + } + + @Operation(summary = "시나리오 본문 수정") + @PutMapping("/scenarios/{scenarioId}") + public ApiResponse updateScenarioContent( + @PathVariable Long scenarioId, + @RequestBody AdminScenarioCreateRequest request + ) { + adminScenarioService.updateScenarioContent(scenarioId, request); + return ApiResponse.onSuccess(null); + } + + @Operation(summary = "시나리오 상태 수정") + @PatchMapping("/scenarios/{scenarioId}") + public ApiResponse updateScenarioStatus( + @PathVariable Long scenarioId, + @RequestBody AdminScenarioStatusUpdateRequest request + ) { + return ApiResponse.onSuccess(adminScenarioService.updateScenarioStatus(scenarioId, request.status())); + } + + @Operation(summary = "시나리오 삭제") + @DeleteMapping("/scenarios/{scenarioId}") + public ApiResponse deleteScenario(@PathVariable Long scenarioId) { + return ApiResponse.onSuccess(adminScenarioService.deleteScenario(scenarioId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/controller/AdminTagController.java b/src/main/java/com/swyp/picke/domain/admin/controller/AdminTagController.java new file mode 100644 index 00000000..fb79dd56 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/controller/AdminTagController.java @@ -0,0 +1,55 @@ +package com.swyp.picke.domain.admin.controller; + +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; +import com.swyp.picke.domain.admin.service.AdminTagService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "관리자 태그 API", description = "관리자 태그 생성, 수정, 삭제") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/admin/tags") +@PreAuthorize("hasRole('ADMIN')") +public class AdminTagController { + + private final AdminTagService adminTagService; + + @Operation(summary = "태그 생성") + @PostMapping + public ApiResponse createTag(@Valid @RequestBody TagRequest request) { + return ApiResponse.onSuccess(adminTagService.createTag(request)); + } + + @Operation(summary = "태그 수정") + @PatchMapping("/{tagId}") + public ApiResponse updateTag( + @Parameter(description = "태그 ID", example = "1") + @PathVariable Long tagId, + @Valid @RequestBody TagRequest request + ) { + return ApiResponse.onSuccess(adminTagService.updateTag(tagId, request)); + } + + @Operation(summary = "태그 삭제") + @DeleteMapping("/{tagId}") + public ApiResponse deleteTag( + @Parameter(description = "태그 ID", example = "1") + @PathVariable Long tagId + ) { + return ApiResponse.onSuccess(adminTagService.deleteTag(tagId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleCreateRequest.java new file mode 100644 index 00000000..8b165124 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleCreateRequest.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.admin.dto.battle.request; + +import com.swyp.picke.domain.battle.enums.BattleStatus; +import java.util.List; + +public record AdminBattleCreateRequest( + String title, + String summary, + String description, + String thumbnailUrl, + BattleStatus status, + List tagIds, + List options +) {} + diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleOptionRequest.java similarity index 54% rename from src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java rename to src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleOptionRequest.java index 36c1c212..b610aa24 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java +++ b/src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleOptionRequest.java @@ -1,4 +1,4 @@ -package com.swyp.picke.domain.battle.dto.request; +package com.swyp.picke.domain.admin.dto.battle.request; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; @@ -9,8 +9,6 @@ public record AdminBattleOptionRequest( String title, String stance, String representative, - String quote, String imageUrl, - Boolean isCorrect, - List tagIds // 옵션 전용 태그 (철학자, 가치관 - 추후 사용자 유형 분석에 사용) -) {} \ No newline at end of file + List tagIds +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleUpdateRequest.java similarity index 52% rename from src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java rename to src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleUpdateRequest.java index aa5e4477..576da5bd 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java +++ b/src/main/java/com/swyp/picke/domain/admin/dto/battle/request/AdminBattleUpdateRequest.java @@ -1,23 +1,16 @@ -package com.swyp.picke.domain.battle.dto.request; +package com.swyp.picke.domain.admin.dto.battle.request; import com.swyp.picke.domain.battle.enums.BattleStatus; -import java.time.LocalDate; import java.util.List; public record AdminBattleUpdateRequest( String title, - String titlePrefix, - String titleSuffix, String summary, String description, String thumbnailUrl, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - Integer audioDuration, BattleStatus status, List tagIds, List options -) {} \ No newline at end of file +) { +} + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/battle/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/battle/response/AdminBattleDeleteResponse.java new file mode 100644 index 00000000..ce57f319 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/battle/response/AdminBattleDeleteResponse.java @@ -0,0 +1,11 @@ +package com.swyp.picke.domain.admin.dto.battle.response; + +import java.time.LocalDateTime; + +/** + * 관리자 배틀 삭제 응답 + */ +public record AdminBattleDeleteResponse( + Boolean success, + LocalDateTime deletedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/battle/response/AdminBattleDetailResponse.java similarity index 56% rename from src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java rename to src/main/java/com/swyp/picke/domain/admin/dto/battle/response/AdminBattleDetailResponse.java index fd382332..f1873078 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java +++ b/src/main/java/com/swyp/picke/domain/admin/dto/battle/response/AdminBattleDetailResponse.java @@ -1,31 +1,24 @@ -package com.swyp.picke.domain.battle.dto.response; +package com.swyp.picke.domain.admin.dto.battle.response; +import com.swyp.picke.domain.battle.dto.response.BattleOptionResponse; +import com.swyp.picke.domain.battle.dto.response.BattleTagResponse; import com.swyp.picke.domain.battle.enums.BattleCreatorType; import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; /** - * 관리자 - 배틀 상세 상세 조회 응답 - * 역할: 관리자가 배틀의 모든 설정 값(상태, 생성자 타입, 수정일 등)을 확인하고 수정할 때 사용합니다. + * 관리자 배틀 상세 조회 응답 */ - public record AdminBattleDetailResponse( Long battleId, String title, - String titlePrefix, - String titleSuffix, String summary, String description, String thumbnailUrl, - BattleType type, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, + Integer audioDuration, LocalDate targetDate, BattleStatus status, BattleCreatorType creatorType, @@ -33,4 +26,4 @@ public record AdminBattleDetailResponse( List options, LocalDateTime createdAt, LocalDateTime updatedAt -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/notification/request/AdminNoticeCreateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/notification/request/AdminNoticeCreateRequest.java new file mode 100644 index 00000000..f71a7605 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/notification/request/AdminNoticeCreateRequest.java @@ -0,0 +1,11 @@ +package com.swyp.picke.domain.admin.dto.notification.request; + +import com.swyp.picke.domain.notification.enums.NotificationCategory; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record AdminNoticeCreateRequest( + @NotNull NotificationCategory category, + @NotBlank String title, + @NotBlank String body +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeDetailResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeDetailResponse.java new file mode 100644 index 00000000..f4777751 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeDetailResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.admin.dto.notification.response; + +import com.swyp.picke.domain.notification.enums.NotificationCategory; + +import java.time.LocalDateTime; + +public record AdminNoticeDetailResponse( + Long notificationId, + NotificationCategory category, + String detailCode, + String title, + String body, + Long referenceId, + LocalDateTime createdAt +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeListResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeListResponse.java new file mode 100644 index 00000000..fa53775a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeListResponse.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.admin.dto.notification.response; + +import java.util.List; + +public record AdminNoticeListResponse( + List items, + boolean hasNext +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeSummaryResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeSummaryResponse.java new file mode 100644 index 00000000..a2bcd6f4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/notification/response/AdminNoticeSummaryResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.admin.dto.notification.response; + +import com.swyp.picke.domain.notification.enums.NotificationCategory; + +import java.time.LocalDateTime; + +public record AdminNoticeSummaryResponse( + Long notificationId, + NotificationCategory category, + String detailCode, + String title, + String body, + Long referenceId, + LocalDateTime createdAt +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollCreateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollCreateRequest.java new file mode 100644 index 00000000..d7d305e5 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollCreateRequest.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.admin.dto.poll.request; + +import com.swyp.picke.domain.poll.enums.PollStatus; +import java.util.List; + +public record AdminPollCreateRequest( + String titlePrefix, + String titleSuffix, + PollStatus status, + List options +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollOptionRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollOptionRequest.java new file mode 100644 index 00000000..e0b9ddb5 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollOptionRequest.java @@ -0,0 +1,10 @@ +package com.swyp.picke.domain.admin.dto.poll.request; + +import com.swyp.picke.domain.poll.enums.PollOptionLabel; + +public record AdminPollOptionRequest( + PollOptionLabel label, + String title +) {} + + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollUpdateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollUpdateRequest.java new file mode 100644 index 00000000..88d7d007 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/poll/request/AdminPollUpdateRequest.java @@ -0,0 +1,17 @@ +package com.swyp.picke.domain.admin.dto.poll.request; + +import com.swyp.picke.domain.poll.enums.PollStatus; + +import java.time.LocalDate; +import java.util.List; + +public record AdminPollUpdateRequest( + String titlePrefix, + String titleSuffix, + LocalDate targetDate, + PollStatus status, + List options +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDeleteResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDeleteResponse.java new file mode 100644 index 00000000..a9021a68 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDeleteResponse.java @@ -0,0 +1,11 @@ +package com.swyp.picke.domain.admin.dto.poll.response; + +import java.time.LocalDateTime; + +public record AdminPollDeleteResponse( + boolean success, + LocalDateTime deletedAt +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDetailResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDetailResponse.java new file mode 100644 index 00000000..90515715 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/poll/response/AdminPollDetailResponse.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.admin.dto.poll.response; + +import com.swyp.picke.domain.poll.dto.response.PollOptionResponse; +import com.swyp.picke.domain.poll.enums.PollStatus; + +import java.time.LocalDate; +import java.util.List; + +public record AdminPollDetailResponse( + Long pollId, + String titlePrefix, + String titleSuffix, + LocalDate targetDate, + PollStatus status, + List options +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizCreateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizCreateRequest.java new file mode 100644 index 00000000..eb41491a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizCreateRequest.java @@ -0,0 +1,10 @@ +package com.swyp.picke.domain.admin.dto.quiz.request; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import java.util.List; + +public record AdminQuizCreateRequest( + String title, + QuizStatus status, + List options +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizOptionRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizOptionRequest.java new file mode 100644 index 00000000..4dd94c5a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizOptionRequest.java @@ -0,0 +1,10 @@ +package com.swyp.picke.domain.admin.dto.quiz.request; + +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; + +public record AdminQuizOptionRequest( + QuizOptionLabel label, + String text, + String detailText, + Boolean isCorrect +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizUpdateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizUpdateRequest.java new file mode 100644 index 00000000..3447892c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/request/AdminQuizUpdateRequest.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.admin.dto.quiz.request; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; + +import java.time.LocalDate; +import java.util.List; + +public record AdminQuizUpdateRequest( + String title, + LocalDate targetDate, + QuizStatus status, + List options +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDeleteResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDeleteResponse.java new file mode 100644 index 00000000..8ea47cde --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDeleteResponse.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.admin.dto.quiz.response; + +import java.time.LocalDateTime; + +public record AdminQuizDeleteResponse( + boolean success, + LocalDateTime deletedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDetailResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDetailResponse.java new file mode 100644 index 00000000..2e5a147d --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/quiz/response/AdminQuizDetailResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.admin.dto.quiz.response; + +import com.swyp.picke.domain.quiz.dto.response.QuizOptionResponse; +import com.swyp.picke.domain.quiz.enums.QuizStatus; + +import java.time.LocalDate; +import java.util.List; + +public record AdminQuizDetailResponse( + Long quizId, + String title, + LocalDate targetDate, + QuizStatus status, + List options +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioCreateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioCreateRequest.java new file mode 100644 index 00000000..21fc02e6 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioCreateRequest.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.admin.dto.scenario.request; + +import com.swyp.picke.domain.scenario.enums.ScenarioStatus; +import com.swyp.picke.domain.scenario.enums.SpeakerType; + +import java.util.List; +import java.util.Map; + +public record AdminScenarioCreateRequest( + Long battleId, + Boolean isInteractive, + ScenarioStatus status, + List nodes, + Map voiceSettings +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioNodeRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioNodeRequest.java new file mode 100644 index 00000000..ac447f07 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioNodeRequest.java @@ -0,0 +1,11 @@ +package com.swyp.picke.domain.admin.dto.scenario.request; + +import java.util.List; + +public record AdminScenarioNodeRequest( + String nodeName, + Boolean isStartNode, + String autoNextNode, + List scripts, + List interactiveOptions +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioOptionRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioOptionRequest.java new file mode 100644 index 00000000..4bf2988b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioOptionRequest.java @@ -0,0 +1,6 @@ +package com.swyp.picke.domain.admin.dto.scenario.request; + +public record AdminScenarioOptionRequest( + String label, + String nextNodeName +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioScriptRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioScriptRequest.java new file mode 100644 index 00000000..60563860 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioScriptRequest.java @@ -0,0 +1,9 @@ +package com.swyp.picke.domain.admin.dto.scenario.request; + +import com.swyp.picke.domain.scenario.enums.SpeakerType; + +public record AdminScenarioScriptRequest( + String speakerName, + SpeakerType speakerType, + String text +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioStatusUpdateRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioStatusUpdateRequest.java new file mode 100644 index 00000000..23da7fb6 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/request/AdminScenarioStatusUpdateRequest.java @@ -0,0 +1,7 @@ +package com.swyp.picke.domain.admin.dto.scenario.request; + +import com.swyp.picke.domain.scenario.enums.ScenarioStatus; + +public record AdminScenarioStatusUpdateRequest( + ScenarioStatus status +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminDeleteResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminDeleteResponse.java new file mode 100644 index 00000000..744b5d4a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminDeleteResponse.java @@ -0,0 +1,9 @@ +package com.swyp.picke.domain.admin.dto.scenario.response; + +import java.time.LocalDateTime; + +public record AdminDeleteResponse( + boolean success, + LocalDateTime deletedAt +) {} + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioCreateResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioCreateResponse.java new file mode 100644 index 00000000..cd102bd4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioCreateResponse.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.admin.dto.scenario.response; + +import com.swyp.picke.domain.scenario.enums.ScenarioStatus; + +public record AdminScenarioCreateResponse( + Long scenarioId, + ScenarioStatus status +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioDetailResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioDetailResponse.java new file mode 100644 index 00000000..c6981a8d --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioDetailResponse.java @@ -0,0 +1,18 @@ +package com.swyp.picke.domain.admin.dto.scenario.response; + +import com.swyp.picke.domain.scenario.enums.SpeakerType; +import lombok.Builder; + +import java.util.List; +import java.util.Map; + +@Builder +public record AdminScenarioDetailResponse( + Long scenarioId, + Long battleId, + String title, + Boolean isInteractive, + List nodes, + Map voiceSettings +) {} + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioNodeResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioNodeResponse.java new file mode 100644 index 00000000..77dbf44e --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioNodeResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.admin.dto.scenario.response; + +import lombok.Builder; + +import java.util.List; + +@Builder +public record AdminScenarioNodeResponse( + Long nodeId, + String nodeName, + Integer audioDuration, + Long autoNextNodeId, + List scripts, + List interactiveOptions +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioOptionResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioOptionResponse.java new file mode 100644 index 00000000..50bfc1c7 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioOptionResponse.java @@ -0,0 +1,9 @@ +package com.swyp.picke.domain.admin.dto.scenario.response; + +import lombok.Builder; + +@Builder +public record AdminScenarioOptionResponse( + String label, + Long nextNodeId +) {} diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioResponse.java new file mode 100644 index 00000000..10679249 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioResponse.java @@ -0,0 +1,10 @@ +package com.swyp.picke.domain.admin.dto.scenario.response; + +import com.swyp.picke.domain.scenario.enums.ScenarioStatus; + +public record AdminScenarioResponse( + Long scenarioId, + ScenarioStatus status, + String message +) {} + diff --git a/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioScriptResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioScriptResponse.java new file mode 100644 index 00000000..2fd0f253 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/dto/scenario/response/AdminScenarioScriptResponse.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.admin.dto.scenario.response; + +import com.swyp.picke.domain.scenario.enums.SpeakerType; +import lombok.Builder; + +@Builder +public record AdminScenarioScriptResponse( + Long scriptId, + Integer startTimeMs, + SpeakerType speakerType, + String speakerName, + String text +) {} diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java b/src/main/java/com/swyp/picke/domain/admin/dto/tag/request/TagRequest.java similarity index 54% rename from src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java rename to src/main/java/com/swyp/picke/domain/admin/dto/tag/request/TagRequest.java index 736bfda6..577afa0d 100644 --- a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java +++ b/src/main/java/com/swyp/picke/domain/admin/dto/tag/request/TagRequest.java @@ -1,13 +1,13 @@ -package com.swyp.picke.domain.tag.dto.request; +package com.swyp.picke.domain.admin.dto.tag.request; import com.swyp.picke.domain.tag.enums.TagType; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; public record TagRequest( - @NotBlank(message = "태그 이름을 입력해주세요.") + @NotBlank(message = "태그 이름을 입력해 주세요.") String name, - @NotNull(message = "태그 타입을 선택해주세요.") + @NotNull(message = "태그 타입을 선택해 주세요.") TagType type ) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/tag/response/TagDeleteResponse.java similarity index 70% rename from src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java rename to src/main/java/com/swyp/picke/domain/admin/dto/tag/response/TagDeleteResponse.java index 71b350e8..c17ca85a 100644 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java +++ b/src/main/java/com/swyp/picke/domain/admin/dto/tag/response/TagDeleteResponse.java @@ -1,4 +1,4 @@ -package com.swyp.picke.domain.tag.dto.response; +package com.swyp.picke.domain.admin.dto.tag.response; import java.time.LocalDateTime; diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java b/src/main/java/com/swyp/picke/domain/admin/dto/tag/response/TagResponse.java similarity index 81% rename from src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java rename to src/main/java/com/swyp/picke/domain/admin/dto/tag/response/TagResponse.java index 70554dde..ab79ac01 100644 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java +++ b/src/main/java/com/swyp/picke/domain/admin/dto/tag/response/TagResponse.java @@ -1,4 +1,4 @@ -package com.swyp.picke.domain.tag.dto.response; +package com.swyp.picke.domain.admin.dto.tag.response; import com.swyp.picke.domain.tag.enums.TagType; import java.time.LocalDateTime; diff --git a/src/main/java/com/swyp/picke/domain/admin/service/AdminBattleService.java b/src/main/java/com/swyp/picke/domain/admin/service/AdminBattleService.java new file mode 100644 index 00000000..fee5af06 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/service/AdminBattleService.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.admin.service; + +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.battle.service.BattleService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminBattleService { + + private final BattleService battleService; + + public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, Long adminUserId) { + return battleService.createBattle(request, adminUserId); + } + + public AdminBattleDetailResponse getBattleDetail(Long battleId) { + return battleService.getAdminBattleDetail(battleId); + } + + public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request) { + return battleService.updateBattle(battleId, request); + } + + public AdminBattleDeleteResponse deleteBattle(Long battleId) { + return battleService.deleteBattle(battleId); + } + + public Object getBattles(int page, int size, String status) { + return battleService.getBattles(page, size, status); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/service/AdminNotificationService.java b/src/main/java/com/swyp/picke/domain/admin/service/AdminNotificationService.java new file mode 100644 index 00000000..d131e75b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/service/AdminNotificationService.java @@ -0,0 +1,109 @@ +package com.swyp.picke.domain.admin.service; + +import com.swyp.picke.domain.admin.dto.notification.request.AdminNoticeCreateRequest; +import com.swyp.picke.domain.admin.dto.notification.response.AdminNoticeDetailResponse; +import com.swyp.picke.domain.admin.dto.notification.response.AdminNoticeListResponse; +import com.swyp.picke.domain.admin.dto.notification.response.AdminNoticeSummaryResponse; +import com.swyp.picke.domain.notification.entity.Notification; +import com.swyp.picke.domain.notification.enums.NotificationCategory; +import com.swyp.picke.domain.notification.enums.NotificationDetailCode; +import com.swyp.picke.domain.notification.repository.NotificationRepository; +import com.swyp.picke.domain.notification.service.NotificationService; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class AdminNotificationService { + + private static final int DEFAULT_PAGE_SIZE = 20; + + private final NotificationService notificationService; + private final NotificationRepository notificationRepository; + + @Transactional + public AdminNoticeDetailResponse createNotice(AdminNoticeCreateRequest request) { + NotificationDetailCode detailCode = toDetailCode(request.category()); + Notification notification = notificationService.createBroadcastNotification( + detailCode, + request.title(), + request.body(), + null + ); + return toDetailResponse(notification); + } + + public AdminNoticeListResponse getNotices(NotificationCategory category, int page, int size) { + int pageNumber = Math.max(0, page); + int pageSize = size <= 0 ? DEFAULT_PAGE_SIZE : size; + NotificationCategory filterCategory = normalizeCategory(category); + + Slice slice = notificationRepository.findNotificationsForAdmin( + filterCategory, + PageRequest.of(pageNumber, pageSize) + ); + + return new AdminNoticeListResponse( + slice.getContent().stream() + .map(this::toSummaryResponse) + .toList(), + slice.hasNext() + ); + } + + public AdminNoticeDetailResponse getNoticeDetail(Long notificationId) { + Notification notification = notificationRepository.findById(notificationId) + .orElseThrow(() -> new CustomException(ErrorCode.NOTIFICATION_NOT_FOUND)); + return toDetailResponse(notification); + } + + private NotificationCategory normalizeCategory(NotificationCategory category) { + if (category == null || category == NotificationCategory.ALL) { + return null; + } + return category; + } + + private NotificationDetailCode toDetailCode(NotificationCategory category) { + if (category == NotificationCategory.CONTENT) { + return NotificationDetailCode.NEW_BATTLE; + } + if (category == NotificationCategory.NOTICE) { + return NotificationDetailCode.POLICY_CHANGE; + } + if (category == NotificationCategory.EVENT) { + return NotificationDetailCode.PROMOTION; + } + throw new CustomException(ErrorCode.BAD_REQUEST); + } + + private AdminNoticeSummaryResponse toSummaryResponse(Notification notification) { + return new AdminNoticeSummaryResponse( + notification.getId(), + notification.getCategory(), + notification.getDetailCode().name(), + notification.getTitle(), + notification.getBody(), + notification.getReferenceId(), + notification.getCreatedAt() + ); + } + + private AdminNoticeDetailResponse toDetailResponse(Notification notification) { + return new AdminNoticeDetailResponse( + notification.getId(), + notification.getCategory(), + notification.getDetailCode().name(), + notification.getTitle(), + notification.getBody(), + notification.getReferenceId(), + notification.getCreatedAt() + ); + } +} diff --git a/src/main/java/com/swyp/picke/domain/admin/service/AdminPollService.java b/src/main/java/com/swyp/picke/domain/admin/service/AdminPollService.java new file mode 100644 index 00000000..6ff9a02f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/service/AdminPollService.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.admin.service; + +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.poll.service.PollService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminPollService { + + private final PollService pollService; + + public AdminPollDetailResponse createPoll(AdminPollCreateRequest request) { + return pollService.createPoll(request); + } + + public AdminPollDetailResponse getPollDetail(Long pollId) { + return pollService.getAdminPollDetail(pollId); + } + + public AdminPollDetailResponse updatePoll(Long pollId, AdminPollUpdateRequest request) { + return pollService.updatePoll(pollId, request); + } + + public AdminPollDeleteResponse deletePoll(Long pollId) { + return pollService.deletePoll(pollId); + } + + public Object getPolls(int page, int size, String status) { + return pollService.getPolls(page, size); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/service/AdminQuizService.java b/src/main/java/com/swyp/picke/domain/admin/service/AdminQuizService.java new file mode 100644 index 00000000..c7d7983b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/service/AdminQuizService.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.admin.service; + +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.quiz.service.QuizService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminQuizService { + + private final QuizService quizService; + + public AdminQuizDetailResponse createQuiz(AdminQuizCreateRequest request) { + return quizService.createQuiz(request); + } + + public AdminQuizDetailResponse getQuizDetail(Long quizId) { + return quizService.getAdminQuizDetail(quizId); + } + + public AdminQuizDetailResponse updateQuiz(Long quizId, AdminQuizUpdateRequest request) { + return quizService.updateQuiz(quizId, request); + } + + public AdminQuizDeleteResponse deleteQuiz(Long quizId) { + return quizService.deleteQuiz(quizId); + } + + public Object getQuizzes(int page, int size, String status) { + return quizService.getQuizzes(page, size); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/admin/service/AdminScenarioService.java b/src/main/java/com/swyp/picke/domain/admin/service/AdminScenarioService.java new file mode 100644 index 00000000..02ac3825 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/service/AdminScenarioService.java @@ -0,0 +1,193 @@ +package com.swyp.picke.domain.admin.service; + +import com.swyp.picke.domain.admin.dto.scenario.request.AdminScenarioCreateRequest; +import com.swyp.picke.domain.admin.dto.scenario.request.AdminScenarioNodeRequest; +import com.swyp.picke.domain.admin.dto.scenario.request.AdminScenarioOptionRequest; +import com.swyp.picke.domain.admin.dto.scenario.request.AdminScenarioScriptRequest; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminDeleteResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioCreateResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioDetailResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioResponse; +import com.swyp.picke.domain.scenario.dto.request.NodeRequest; +import com.swyp.picke.domain.scenario.dto.request.OptionRequest; +import com.swyp.picke.domain.scenario.dto.request.ScenarioCreateRequest; +import com.swyp.picke.domain.scenario.dto.request.ScriptRequest; +import com.swyp.picke.domain.scenario.enums.ScenarioStatus; +import com.swyp.picke.domain.scenario.service.ScenarioService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +@RequiredArgsConstructor +public class AdminScenarioService { + + private final ScenarioService scenarioService; + + public AdminScenarioDetailResponse getScenarioForAdmin(Long battleId) { + return toAdminScenarioDetailResponse(scenarioService.getScenarioForAdmin(battleId)); + } + + public AdminScenarioCreateResponse createScenario(AdminScenarioCreateRequest request) { + Long scenarioId = scenarioService.createScenario(toScenarioCreateRequest(request)); + return new AdminScenarioCreateResponse(scenarioId, request.status()); + } + + public void updateScenarioContent(Long scenarioId, AdminScenarioCreateRequest request) { + scenarioService.updateScenarioContent(scenarioId, toScenarioCreateRequest(request)); + } + + public AdminScenarioResponse updateScenarioStatus(Long scenarioId, ScenarioStatus status) { + return toAdminScenarioResponse(scenarioService.updateScenarioStatus(scenarioId, status)); + } + + public AdminDeleteResponse deleteScenario(Long scenarioId) { + return toAdminDeleteResponse(scenarioService.deleteScenario(scenarioId)); + } + + private ScenarioCreateRequest toScenarioCreateRequest(AdminScenarioCreateRequest request) { + return new ScenarioCreateRequest( + request.battleId(), + request.isInteractive(), + request.status(), + toNodeRequests(request.nodes()) + ); + } + + private List toNodeRequests(List nodeRequests) { + if (nodeRequests == null) { + return List.of(); + } + return nodeRequests.stream() + .map(this::toNodeRequest) + .toList(); + } + + private NodeRequest toNodeRequest(AdminScenarioNodeRequest nodeRequest) { + return new NodeRequest( + nodeRequest.nodeName(), + nodeRequest.isStartNode(), + nodeRequest.autoNextNode(), + toScriptRequests(nodeRequest.scripts()), + toOptionRequests(nodeRequest.interactiveOptions()) + ); + } + + private List toScriptRequests(List scriptRequests) { + if (scriptRequests == null) { + return null; + } + return scriptRequests.stream() + .map(scriptRequest -> new ScriptRequest( + scriptRequest.speakerName(), + scriptRequest.speakerType(), + scriptRequest.text() + )) + .toList(); + } + + private List toOptionRequests(List optionRequests) { + if (optionRequests == null) { + return null; + } + return optionRequests.stream() + .map(optionRequest -> new OptionRequest( + optionRequest.label(), + optionRequest.nextNodeName() + )) + .toList(); + } + + private AdminScenarioDetailResponse toAdminScenarioDetailResponse( + com.swyp.picke.domain.scenario.dto.response.AdminScenarioDetailResponse legacy + ) { + if (legacy == null) { + return null; + } + + return AdminScenarioDetailResponse.builder() + .scenarioId(legacy.scenarioId()) + .battleId(legacy.battleId()) + .title(legacy.title()) + .isInteractive(legacy.isInteractive()) + .nodes(toAdminNodeResponses(legacy.nodes())) + .voiceSettings(Map.of()) + .build(); + } + + private List toAdminNodeResponses( + List nodes + ) { + if (nodes == null) { + return List.of(); + } + return nodes.stream() + .map(node -> com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioNodeResponse.builder() + .nodeId(node.nodeId()) + .nodeName(node.nodeName()) + .audioDuration(node.audioDuration()) + .autoNextNodeId(node.autoNextNodeId()) + .scripts(toAdminScriptResponses(node.scripts())) + .interactiveOptions(toAdminOptionResponses(node.interactiveOptions())) + .build()) + .toList(); + } + + private List toAdminScriptResponses( + List scripts + ) { + if (scripts == null) { + return List.of(); + } + return scripts.stream() + .map(script -> com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioScriptResponse.builder() + .scriptId(script.scriptId()) + .startTimeMs(script.startTimeMs()) + .speakerType(script.speakerType()) + .speakerName(script.speakerName()) + .text(script.text()) + .build()) + .toList(); + } + + private List toAdminOptionResponses( + List options + ) { + if (options == null) { + return List.of(); + } + return options.stream() + .map(option -> com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioOptionResponse.builder() + .label(option.label()) + .nextNodeId(option.nextNodeId()) + .build()) + .toList(); + } + + private AdminScenarioResponse toAdminScenarioResponse( + com.swyp.picke.domain.scenario.dto.response.AdminScenarioResponse legacy + ) { + if (legacy == null) { + return null; + } + return new AdminScenarioResponse( + legacy.scenarioId(), + legacy.status(), + legacy.message() + ); + } + + private AdminDeleteResponse toAdminDeleteResponse( + com.swyp.picke.domain.scenario.dto.response.AdminDeleteResponse legacy + ) { + if (legacy == null) { + return null; + } + return new AdminDeleteResponse( + legacy.success(), + legacy.deletedAt() + ); + } +} diff --git a/src/main/java/com/swyp/picke/domain/admin/service/AdminTagService.java b/src/main/java/com/swyp/picke/domain/admin/service/AdminTagService.java new file mode 100644 index 00000000..cfe96725 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/admin/service/AdminTagService.java @@ -0,0 +1,27 @@ +package com.swyp.picke.domain.admin.service; + +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; +import com.swyp.picke.domain.tag.service.TagService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminTagService { + + private final TagService tagService; + + public TagResponse createTag(TagRequest request) { + return tagService.createTag(request); + } + + public TagResponse updateTag(Long tagId, TagRequest request) { + return tagService.updateTag(tagId, request); + } + + public TagDeleteResponse deleteTag(Long tagId) { + return tagService.deleteTag(tagId); + } +} diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java deleted file mode 100644 index b115abc3..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.swyp.picke.domain.battle.controller; - -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDeleteResponse; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDetailResponse; -import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.global.common.response.ApiResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.*; - -@Tag(name = "배틀 API (관리자)", description = "배틀 생성/수정/삭제 (관리자 전용)") -@RestController -@RequestMapping("/api/v1/admin/battles") -@RequiredArgsConstructor -@PreAuthorize("hasRole('ADMIN')") -public class AdminBattleController { - - private final BattleService battleService; - - @Operation(summary = "배틀 생성") - @PostMapping - public ApiResponse createBattle( - @RequestBody @Valid AdminBattleCreateRequest request, - @AuthenticationPrincipal Long adminUserId - ) { - return ApiResponse.onSuccess(battleService.createBattle(request, adminUserId)); - } - - @Operation(summary = "배틀 수정 (변경 필드만 포함)") - @PatchMapping("/{battleId}") - public ApiResponse updateBattle( - @PathVariable Long battleId, - @RequestBody @Valid AdminBattleUpdateRequest request - ) { - return ApiResponse.onSuccess(battleService.updateBattle(battleId, request)); - } - - @Operation(summary = "배틀 삭제") - @DeleteMapping("/{battleId}") - public ApiResponse deleteBattle( - @PathVariable Long battleId - ) { - return ApiResponse.onSuccess(battleService.deleteBattle(battleId)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java index 9450a078..eafacd8b 100644 --- a/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java +++ b/src/main/java/com/swyp/picke/domain/battle/controller/BattleController.java @@ -10,9 +10,13 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -@Tag(name = "배틀 API (사용자)", description = "배틀 조회") +@Tag(name = "배틀 API", description = "배틀 조회") @RestController @RequestMapping("/api/v1/battles") @RequiredArgsConstructor @@ -20,36 +24,34 @@ public class BattleController { private final BattleService battleService; - @Operation(summary = "오늘의 배틀 목록 조회 (스와이프 UI용, 최대 5개)") + @Operation(summary = "오늘의 배틀 목록 조회 (최대 5개)") @GetMapping("/today") public ApiResponse getTodayBattles() { return ApiResponse.onSuccess(battleService.getTodayBattles()); } - @Operation(summary = "배틀 전체 목록 조회", description = "페이징 및 타입별(ALL, BATTLE, QUIZ, VOTE) 필터링된 배틀 목록을 조회합니다.") + @Operation(summary = "배틀 목록 조회") @GetMapping public ApiResponse getBattles( @Parameter(description = "페이지 번호 (1부터 시작)", example = "1") @RequestParam(value = "page", defaultValue = "1") int page, @Parameter(description = "페이지 크기", example = "10") @RequestParam(value = "size", defaultValue = "10") int size, - @Parameter(description = "콘텐츠 타입 (ALL, BATTLE, QUIZ, VOTE)", example = "ALL") - @RequestParam(value = "type", required = false, defaultValue = "ALL") String type + @Parameter(description = "콘텐츠 상태 (ALL, PENDING, PUBLISHED, REJECTED, ARCHIVED)", example = "ALL") + @RequestParam(value = "status", required = false, defaultValue = "ALL") String status ) { - return ApiResponse.onSuccess(battleService.getBattles(page, size, type)); + return ApiResponse.onSuccess(battleService.getBattles(page, size, status)); } @Operation(summary = "배틀 상세 조회") @GetMapping("/{battleId}") - public ApiResponse getBattleDetail( - @PathVariable Long battleId - ) { + public ApiResponse getBattleDetail(@PathVariable Long battleId) { return ApiResponse.onSuccess(battleService.getBattleDetail(battleId)); } - @Operation(summary = "사용자 배틀 진행 상태 조회 (사전투표/TTS/사후투표)") + @Operation(summary = "사용자 배틀 진행 상태 조회") @GetMapping("/{battleId}/status") public ApiResponse getUserBattleStatus(@PathVariable Long battleId) { return ApiResponse.onSuccess(battleService.getUserBattleStatus(battleId)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java b/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java index 3511d521..71d5c27a 100644 --- a/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java +++ b/src/main/java/com/swyp/picke/domain/battle/converter/BattleConverter.java @@ -1,21 +1,22 @@ package com.swyp.picke.domain.battle.converter; -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; import com.swyp.picke.domain.battle.dto.response.*; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleCreatorType; -import com.swyp.picke.domain.user.enums.PhilosopherType; -import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.user.enums.VoteSide; import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import java.util.Comparator; import java.util.List; import java.util.Map; @@ -25,21 +26,17 @@ public class BattleConverter { private final ResourceUrlProvider urlProvider; private static final String BASE_SHARE_URL = "https://pique.app/battles/"; + private static final Comparator OPTION_SORTER = + Comparator.comparing((BattleOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(BattleOption::getId); public Battle toEntity(AdminBattleCreateRequest request, User admin) { return Battle.builder() .title(request.title()) - .titlePrefix(request.titlePrefix()) - .titleSuffix(request.titleSuffix()) - .itemA(request.itemA()) - .itemADesc(request.itemADesc()) - .itemB(request.itemB()) - .itemBDesc(request.itemBDesc()) .summary(request.summary()) .description(request.description()) .thumbnailUrl(request.thumbnailUrl()) - .type(request.type()) - .targetDate(request.targetDate()) .status(request.status()) .creatorType(BattleCreatorType.ADMIN) .creator(admin) @@ -52,18 +49,11 @@ public TodayBattleResponse toTodayResponse(Battle battle, List tags, List return new AdminBattleDetailResponse( battle.getId(), battle.getTitle(), - battle.getTitlePrefix(), - battle.getTitleSuffix(), battle.getSummary(), battle.getDescription(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), - battle.getType(), - battle.getItemA(), - battle.getItemADesc(), - battle.getItemB(), - battle.getItemBDesc(), + battle.getAudioDuration(), battle.getTargetDate(), battle.getStatus(), battle.getCreatorType(), @@ -111,7 +94,6 @@ public BattleUserDetailResponse toUserDetailResponse( battle.getTitle(), battle.getSummary(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), - battle.getType(), battle.getViewCount() == null ? 0 : battle.getViewCount(), participantsCount == null ? 0L : participantsCount, battle.getAudioDuration() == null ? 0 : battle.getAudioDuration(), @@ -121,12 +103,6 @@ public BattleUserDetailResponse toUserDetailResponse( return new BattleUserDetailResponse( summary, - battle.getTitlePrefix(), - battle.getTitleSuffix(), - battle.getItemA(), - battle.getItemADesc(), - battle.getItemB(), - battle.getItemBDesc(), battle.getDescription(), BASE_SHARE_URL + battle.getId(), userVoteStatus, @@ -143,8 +119,7 @@ public BattleScenarioResponse toScenarioResponse(Battle battle, List toOptionResponses(List options, Map> optionTagsMap) { if (options == null) return List.of(); return options.stream() + .sorted(OPTION_SORTER) .map(option -> { List optionTags = optionTagsMap.getOrDefault(option.getId(), List.of()); return new BattleOptionResponse( @@ -161,8 +137,7 @@ private List toOptionResponses(List options, option.getTitle(), option.getStance(), option.getRepresentative(), - option.getQuote(), - urlProvider.getImageUrl(FileCategory.PHILOSOPHER, PhilosopherType.resolveImageKey(option.getRepresentative())), + urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()), toTagResponses(optionTags, null) ); }).toList(); @@ -170,15 +145,16 @@ private List toOptionResponses(List options, private List toTodayOptionResponses(List options) { if (options == null) return List.of(); - return options.stream().map(option -> new TodayOptionResponse( - option.getId(), - option.getLabel(), - option.getTitle(), - option.getRepresentative(), - option.getStance(), - urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()), - option.getIsCorrect() - )).toList(); + return options.stream() + .sorted(OPTION_SORTER) + .map(option -> new TodayOptionResponse( + option.getId(), + option.getLabel(), + option.getTitle(), + option.getRepresentative(), + option.getStance(), + urlProvider.getImageUrl(FileCategory.PHILOSOPHER, option.getImageUrl()) + )).toList(); } private List toTagResponses(List tags, TagType targetType) { @@ -188,4 +164,4 @@ private List toTagResponses(List tags, TagType targetTyp .map(tag -> new BattleTagResponse(tag.getId(), tag.getName(), tag.getType())) .toList(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java deleted file mode 100644 index 48aa5b4a..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; -import java.time.LocalDate; -import java.util.List; - -public record AdminBattleCreateRequest( - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - BattleType type, - BattleStatus status, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - List tagIds, - List options -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java deleted file mode 100644 index 43c64d66..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.battle.dto.response; - -import java.time.LocalDateTime; - -/** - * 관리자 - 배틀 삭제 응답 - * 역할: 배틀이 성공적으로 소프트 딜리트 되었는지 확인하고 삭제 시점을 반환합니다. - */ - -public record AdminBattleDeleteResponse( - Boolean success, // 삭제 성공 여부 - LocalDateTime deletedAt // 삭제 처리된 일시 (Soft Delete) -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java index 51ca1760..ce34930d 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleOptionResponse.java @@ -10,7 +10,6 @@ public record BattleOptionResponse( String title, String stance, String representative, - String quote, String imageUrl, List tags -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java index de611ff9..1208010c 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleScenarioResponse.java @@ -10,7 +10,6 @@ public record PhilosopherProfileResponse( String label, String name, String stance, - String quote, String imageUrl ) {} -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java index feef39fa..6ce79150 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSimpleResponse.java @@ -6,7 +6,6 @@ public record BattleSimpleResponse( Long battleId, String title, String thumbnailUrl, - String type, String status, LocalDateTime createdAt -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java index cd39f4d5..60cd7f24 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleSummaryResponse.java @@ -1,23 +1,15 @@ package com.swyp.picke.domain.battle.dto.response; -import com.swyp.picke.domain.battle.enums.BattleType; - import java.util.List; -/** - * 유저 - 배틀 요약 정보 응답 - * 역할: 홈 화면의 각 섹션 카드나 리스트에서 '미리보기' 형태로 보여줄 데이터입니다. - */ - public record BattleSummaryResponse( - Long battleId, // 배틀 고유 ID - String title, // 배틀 제목 - String summary, // 배틀 요약 (누군가는 이것을...) - String thumbnailUrl, // 카드 배경 이미지 URL - BattleType type, // 배틀 타입 태그 (#BATTLE, #VOTE 등) - Integer viewCount, // 조회수 - Long participantsCount, // 누적 참여자 수 - Integer audioDuration, // 오디오 소요 시간 - List tags, // 카테고리/인물 태그 리스트 - List options // 선택지 요약 (A vs B) -) {} \ No newline at end of file + Long battleId, + String title, + String summary, + String thumbnailUrl, + Integer viewCount, + Long participantsCount, + Integer audioDuration, + List tags, + List options +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java index b08b9455..9b50d068 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleUserDetailResponse.java @@ -5,23 +5,13 @@ import java.util.List; -/** - * 유저 - 배틀 상세 페이지 응답 (시안 4, 5번) - * 역할: 배틀 클릭 시 진입하는 상세 화면의 모든 정보를 담습니다. 투표 여부에 따라 UI가 변합니다. - */ public record BattleUserDetailResponse( - BattleSummaryResponse battleInfo, // 기본적인 배틀 정보 (요약 DTO 재사용) - String titlePrefix, - String titleSuffix, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - String description, // 상세 본문 설명 - String shareUrl, // 공유하기 버튼용 링크 - VoteSide userVoteStatus, // 현재 유저의 투표 상태 + BattleSummaryResponse battleInfo, + String description, + String shareUrl, + VoteSide userVoteStatus, UserBattleStep currentStep, - List categoryTags, // UI 상단용 카테고리 태그 - List philosopherTags, // UI 하단용 철학자 태그 - List valueTags // 성향 분석용 가치관 태그 -) {} \ No newline at end of file + List categoryTags, + List philosopherTags, + List valueTags +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java index 64720c5b..fe2cdac5 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/BattleVoteResponse.java @@ -12,4 +12,4 @@ public record BattleVoteResponse( Long selectedOptionId, // 유저가 방금 선택한 옵션 ID Long totalParticipants, // 실시간 전체 참여자 수 List results // 옵션별 득표 현황 리스트 -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java index 26e9567f..235a7f26 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleListResponse.java @@ -10,4 +10,4 @@ public record TodayBattleListResponse( List items, // 오늘의 배틀 리스트 Integer totalCount // 목록 총 개수 -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java index 8b14041d..097a0061 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayBattleResponse.java @@ -1,29 +1,15 @@ package com.swyp.picke.domain.battle.dto.response; -import com.swyp.picke.domain.battle.enums.BattleType; - import java.util.List; -/** - * 유저 - 오늘의 배틀 상세 응답 (시안 6번) - * 역할: 어두운 배경의 풀스크린 UI에 필요한 배경 이미지, 시간 등을 담습니다. - */ public record TodayBattleResponse( - Long battleId, // 배틀 고유 ID - String title, // 배틀 제목 - String summary, // 중간 요약 문구 - String thumbnailUrl, // 풀스크린 배경 이미지 URL - BattleType type, // 타입 태그 - Integer viewCount, // 조회수 - Long participantsCount, // 누적 참여자 수 - Integer audioDuration, // 소요 시간 (분:초 변환용 데이터) - List tags, // 상단 태그 리스트 - List options, // 중앙 세로형 대결 카드 데이터 - // 퀴즈·투표 전용 필드 - String titlePrefix, // 투표 접두사 (예: "도덕의 기준은") - String titleSuffix, // 투표 접미사 (예: "이다") - String itemA, // 퀴즈 O 선택지 - String itemADesc, // 퀴즈 O 설명 - String itemB, // 퀴즈 X 선택지 - String itemBDesc // 퀴즈 X 설명 + Long battleId, + String title, + String summary, + String thumbnailUrl, + Integer viewCount, + Long participantsCount, + Integer audioDuration, + List tags, + List options ) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java index 2fd15871..2da90246 100644 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/TodayOptionResponse.java @@ -2,17 +2,11 @@ import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -/** - * 유저 - 오늘의 배틀 전용 옵션 응답 - * 역할: 오늘의 배틀 시안의 세로형 카드에 들어가는 인물, 입장, 아바타 정보를 담습니다. - */ - public record TodayOptionResponse( - Long optionId, // 옵션 ID - BattleOptionLabel label,// 라벨 (A, B) - String title, // 제목 (예: 찬성한다) - String representative, // 인물 (예: 피터 싱어) - String stance, // 한 줄 입장 (예: 고통을 끝낼 권리는..) - String imageUrl, // 아바타 이미지 URL - Boolean isCorrect // 퀴즈 정답 여부 + Long optionId, + BattleOptionLabel label, + String title, + String representative, + String stance, + String imageUrl ) {} diff --git a/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java b/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java index 7a3ac8d5..e9905040 100644 --- a/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java +++ b/src/main/java/com/swyp/picke/domain/battle/entity/Battle.java @@ -2,18 +2,27 @@ import com.swyp.picke.domain.battle.enums.BattleCreatorType; import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.*; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import java.time.LocalDate; -import java.time.LocalDateTime; - @Getter @Entity @Table(name = "battles") @@ -31,28 +40,6 @@ public class Battle extends BaseEntity { @Column(name = "thumbnail_url", length = 500) private String thumbnailUrl; - @Enumerated(EnumType.STRING) - @Column(nullable = false, length = 20) - private BattleType type; - - @Column(name = "title_prefix") - private String titlePrefix; - - @Column(name = "title_suffix") - private String titleSuffix; - - @Column(name = "item_a") - private String itemA; - - @Column(name = "item_a_desc") - private String itemADesc; - - @Column(name = "item_b") - private String itemB; - - @Column(name = "item_b_desc") - private String itemBDesc; - @Column(name = "view_count") private Integer viewCount = 0; @@ -77,7 +64,8 @@ public class Battle extends BaseEntity { @JoinColumn(name = "creator_id") private User creator; - // 홈 화면 5단 기획을 위한 필드들 + @OneToMany(mappedBy = "battle", cascade = CascadeType.ALL, orphanRemoval = true) + private final List options = new ArrayList<>(); @Column(name = "is_editor_pick") private Boolean isEditorPick = false; @@ -89,22 +77,21 @@ public class Battle extends BaseEntity { private LocalDateTime deletedAt; @Builder - public Battle(String title, String summary, String description, String thumbnailUrl, - BattleType type, String titlePrefix, String titleSuffix, - String itemA, String itemADesc, String itemB, String itemBDesc, - LocalDate targetDate, Integer audioDuration, BattleStatus status, - BattleCreatorType creatorType, User creator) { + public Battle( + String title, + String summary, + String description, + String thumbnailUrl, + LocalDate targetDate, + Integer audioDuration, + BattleStatus status, + BattleCreatorType creatorType, + User creator + ) { this.title = title; this.summary = summary; this.description = description; this.thumbnailUrl = thumbnailUrl; - this.type = type; - this.titlePrefix = titlePrefix; - this.titleSuffix = titleSuffix; - this.itemA = itemA; - this.itemADesc = itemADesc; - this.itemB = itemB; - this.itemBDesc = itemBDesc; this.targetDate = targetDate; this.audioDuration = audioDuration; this.status = status; @@ -117,26 +104,34 @@ public Battle(String title, String summary, String description, String thumbnail this.deletedAt = null; } - public void update(String title, String titlePrefix, String titleSuffix, - String itemA, String itemADesc, String itemB, String itemBDesc, - String summary, String description, - String thumbnailUrl, LocalDate targetDate, - Integer audioDuration, BattleStatus status) { - if (title != null) this.title = title; - if (titlePrefix != null) this.titlePrefix = titlePrefix; - if (titleSuffix != null) this.titleSuffix = titleSuffix; - - if (itemA != null) this.itemA = itemA; - if (itemADesc != null) this.itemADesc = itemADesc; - if (itemB != null) this.itemB = itemB; - if (itemBDesc != null) this.itemBDesc = itemBDesc; - - if (summary != null) this.summary = summary; - if (description != null) this.description = description; - if (thumbnailUrl != null) this.thumbnailUrl = thumbnailUrl; - if (targetDate != null) this.targetDate = targetDate; - if (audioDuration != null) this.audioDuration = audioDuration; - if (status != null) this.status = status; + public void update( + String title, + String summary, + String description, + String thumbnailUrl, + BattleStatus status + ) { + if (title != null) { + this.title = title; + } + if (summary != null) { + this.summary = summary; + } + if (description != null) { + this.description = description; + } + if (thumbnailUrl != null) { + this.thumbnailUrl = thumbnailUrl; + } + if (targetDate != null) { + this.targetDate = targetDate; + } + if (audioDuration != null) { + this.audioDuration = audioDuration; + } + if (status != null) { + this.status = status; + } } public void delete() { @@ -155,4 +150,9 @@ public void addParticipant() { public void updateAudioDuration(Integer audioDuration) { this.audioDuration = audioDuration; } + + public void updateTargetDate(LocalDate targetDate) { + this.targetDate = targetDate; + } + } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java b/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java index 8be17ceb..ab5ee23a 100644 --- a/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java +++ b/src/main/java/com/swyp/picke/domain/battle/entity/BattleOption.java @@ -2,7 +2,18 @@ import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.*; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.util.ArrayList; +import java.util.List; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -31,29 +42,35 @@ public class BattleOption extends BaseEntity { @Column(length = 100) private String representative; - @Column(columnDefinition = "TEXT") - private String quote; - @Column(name = "vote_count") private Long voteCount = 0L; - @Column(name = "is_correct") - private Boolean isCorrect = false; - @Column(name = "image_url", length = 500) private String imageUrl; + @Column(name = "display_order") + private Integer displayOrder; + + @OneToMany(mappedBy = "battleOption", cascade = CascadeType.ALL, orphanRemoval = true) + private final List tags = new ArrayList<>(); + @Builder - public BattleOption(Battle battle, BattleOptionLabel label, String title, String stance, - String representative, String quote, String imageUrl, Boolean isCorrect) { + public BattleOption( + Battle battle, + BattleOptionLabel label, + String title, + String stance, + String representative, + String imageUrl, + Integer displayOrder + ) { this.battle = battle; this.label = label; this.title = title; this.stance = stance; this.representative = representative; - this.quote = quote; this.imageUrl = imageUrl; - this.isCorrect = (isCorrect != null) && isCorrect; + this.displayOrder = displayOrder; this.voteCount = 0L; } @@ -67,12 +84,21 @@ public void decreaseVoteCount() { } } - public void update(String title, String stance, String representative, String quote, String imageUrl, Boolean isCorrect) { - if (title != null) this.title = title; - if (stance != null) this.stance = stance; - if (representative != null) this.representative = representative; - if (quote != null) this.quote = quote; - if (imageUrl != null) this.imageUrl = imageUrl; - if (isCorrect != null) this.isCorrect = isCorrect; + public void update(String title, String stance, String representative, String imageUrl) { + if (title != null) { + this.title = title; + } + if (stance != null) { + this.stance = stance; + } + if (representative != null) { + this.representative = representative; + } + if (imageUrl != null) { + this.imageUrl = imageUrl; + } + if (displayOrder != null) { + this.displayOrder = displayOrder; + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java deleted file mode 100644 index 648e1eff..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.swyp.picke.domain.battle.enums; - -public enum BattleType { - BATTLE, QUIZ, VOTE -} diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java index d30f2a8e..2260ed8e 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java @@ -4,13 +4,23 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; import java.util.Optional; public interface BattleOptionRepository extends JpaRepository { - List findByBattle(Battle battle); + @Query("SELECT bo FROM BattleOption bo " + + "WHERE bo.battle = :battle " + + "ORDER BY COALESCE(bo.displayOrder, 9999), bo.label, bo.id") + List findByBattle(@Param("battle") Battle battle); + Optional findByBattleAndLabel(Battle battle, BattleOptionLabel label); - List findByBattleIn(List battles); + + @Query("SELECT bo FROM BattleOption bo " + + "WHERE bo.battle IN :battles " + + "ORDER BY bo.battle.id, COALESCE(bo.displayOrder, 9999), bo.label, bo.id") + List findByBattleIn(@Param("battles") List battles); } diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java index fb2ffce2..23f0d3dd 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionTagRepository.java @@ -3,6 +3,7 @@ import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.entity.BattleOptionTag; +import com.swyp.picke.domain.tag.entity.Tag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -11,6 +12,7 @@ public interface BattleOptionTagRepository extends JpaRepository { List findByBattleOption(BattleOption battleOption); + boolean existsByTag(Tag tag); @Query("SELECT bot FROM BattleOptionTag bot JOIN FETCH bot.tag WHERE bot.battleOption.battle = :battle") List findByBattleWithTags(@Param("battle") Battle battle); diff --git a/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java b/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java index c4aa3d8d..d4d5dd31 100644 --- a/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java +++ b/src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java @@ -2,100 +2,103 @@ import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.data.domain.Page; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; public interface BattleRepository extends JpaRepository { - // 1. EDITOR PICK - type 파라미터 추가 + // 1. EDITOR PICK @Query("SELECT battle FROM Battle battle " + "WHERE battle.isEditorPick = true AND battle.status = :status " + - "AND battle.type = :type AND battle.deletedAt IS NULL " + + "AND battle.deletedAt IS NULL " + "ORDER BY battle.createdAt DESC") - List findEditorPicks(@Param("status") BattleStatus status, @Param("type") BattleType type, Pageable pageable); + List findEditorPicks(@Param("status") BattleStatus status, Pageable pageable); - // 2. 지금 뜨는 배틀 - type 파라미터 추가 - @Query("SELECT battle FROM Battle battle JOIN Vote vote ON vote.battle = battle " + - "WHERE vote.createdAt >= :yesterday AND battle.type = :type " + + // 2. 지금 뜨는 배틀 + @Query("SELECT battle FROM Battle battle JOIN BattleVote vote ON vote.battle = battle " + + "WHERE vote.createdAt >= :yesterday " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "GROUP BY battle ORDER BY COUNT(vote) DESC") - List findTrendingBattles(@Param("yesterday") LocalDateTime yesterday, @Param("type") BattleType type, Pageable pageable); + List findTrendingBattles(@Param("yesterday") LocalDateTime yesterday, Pageable pageable); - // 3. Best 배틀 - type 파라미터 추가 + // 3. Best 배틀 @Query("SELECT battle FROM Battle battle " + - "WHERE battle.status = 'PUBLISHED' AND battle.type = :type AND battle.deletedAt IS NULL " + + "WHERE battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "ORDER BY (battle.totalParticipantsCount + (battle.commentCount * 5)) DESC") - List findBestBattles(@Param("type") BattleType type, Pageable pageable); + List findBestBattles(Pageable pageable); // 4. 오늘의 Pické @Query("SELECT battle FROM Battle battle " + - "WHERE battle.type = :type AND battle.targetDate = :today " + + "WHERE battle.targetDate = :today " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL") - List findTodayPicks(@Param("type") BattleType type, @Param("today") LocalDate today, Pageable pageable); + List findTodayPicks(@Param("today") LocalDate today, Pageable pageable); - // 5. 새로운 배틀 - type 파라미터 추가 + // 5. 새로운 배틀 @Query("SELECT battle FROM Battle battle " + - "WHERE battle.id NOT IN :excludeIds AND battle.type = :type " + + "WHERE battle.status = 'PUBLISHED' " + + "AND battle.deletedAt IS NULL " + + "AND (battle.targetDate IS NULL OR battle.targetDate < :today) " + + "ORDER BY CASE WHEN battle.targetDate IS NULL THEN 0 ELSE 1 END, battle.targetDate ASC, battle.createdAt ASC") + List findAutoAssignableTodayPicks(@Param("today") LocalDate today, Pageable pageable); + + @Query("SELECT battle FROM Battle battle " + + "WHERE battle.id NOT IN :excludeIds " + "AND battle.status = 'PUBLISHED' AND battle.deletedAt IS NULL " + "ORDER BY battle.createdAt DESC") - List findNewBattlesExcluding(@Param("excludeIds") List excludeIds, @Param("type") BattleType type, Pageable pageable); + List findNewBattlesExcluding(@Param("excludeIds") List excludeIds, Pageable pageable); - // 6. 전체 배틀 목록 조회 (페이징, 삭제된 항목 제외, 최신순) + // 6. 전체 배틀 목록 조회 Page findByDeletedAtIsNullOrderByCreatedAtDesc(Pageable pageable); - Page findByTypeAndDeletedAtIsNullOrderByCreatedAtDesc(BattleType type, Pageable pageable); + Page findByStatusAndDeletedAtIsNullOrderByCreatedAtDesc(BattleStatus status, Pageable pageable); // 기본 조회용 List findByTargetDateAndStatusAndDeletedAtIsNull(LocalDate date, BattleStatus status); - List findByTargetDateAndStatusAndTypeAndDeletedAtIsNull(LocalDate targetDate, BattleStatus status, BattleType type); - - // 탐색 탭: 전체 배틀 검색 (정렬은 Pageable Sort로 처리) - @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + // 탐색 탭: 전체 배틀 검색 + @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") List searchAll(Pageable pageable); - @Query("SELECT COUNT(b) FROM Battle b WHERE b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + @Query("SELECT COUNT(b) FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL") long countSearchAll(); // 탐색 탭: 카테고리 태그 필터 배틀 검색 @Query("SELECT DISTINCT b FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + - "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + - "AND b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") List searchByCategory(@Param("categoryName") String categoryName, Pageable pageable); @Query("SELECT COUNT(DISTINCT b) FROM Battle b JOIN BattleTag bt ON bt.battle = b JOIN bt.tag t " + - "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + - "AND b.status = 'PUBLISHED' AND b.type = 'BATTLE' AND b.deletedAt IS NULL") + "WHERE t.type = 'CATEGORY' AND t.name = :categoryName " + + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL") long countSearchByCategory(@Param("categoryName") String categoryName); // 추천 폴백용: 전체 배틀 대상 인기 점수순 조회 (철학자 유형 로직 미구현 시 사용) // Score = V*1.0 + C*1.5 + Vw*0.2 @Query("SELECT b FROM Battle b " + "WHERE b.id NOT IN :excludeBattleIds " + - "AND b.type = 'BATTLE' " + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") List findPopularBattlesExcluding( @Param("excludeBattleIds") List excludeBattleIds, - Pageable pageable); + Pageable pageable + ); // 추천용: 특정 유저들이 참여한 배틀 중 이미 참여한 배틀 제외하고 인기 점수순 조회 // Score = V*1.0 + C*1.5 + Vw*0.2 (R은 추후 반영 예정) @Query("SELECT b FROM Battle b " + "WHERE b.id IN :candidateBattleIds " + "AND b.id NOT IN :excludeBattleIds " + - "AND b.type = 'BATTLE' " + "AND b.status = 'PUBLISHED' AND b.deletedAt IS NULL " + "ORDER BY (b.totalParticipantsCount * 1.0 + b.commentCount * 1.5 + b.viewCount * 0.2) DESC") List findRecommendedBattles( @Param("candidateBattleIds") List candidateBattleIds, @Param("excludeBattleIds") List excludeBattleIds, - Pageable pageable); -} \ No newline at end of file + Pageable pageable + ); +} diff --git a/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java b/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java index baf96eb4..a5d1df46 100644 --- a/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java +++ b/src/main/java/com/swyp/picke/domain/battle/service/BattleService.java @@ -1,67 +1,56 @@ package com.swyp.picke.domain.battle.service; -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.battle.dto.response.*; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.battle.dto.response.BattleListResponse; +import com.swyp.picke.domain.battle.dto.response.BattleScenarioResponse; +import com.swyp.picke.domain.battle.dto.response.BattleUserDetailResponse; +import com.swyp.picke.domain.battle.dto.response.BattleVoteResponse; +import com.swyp.picke.domain.battle.dto.response.TodayBattleListResponse; +import com.swyp.picke.domain.battle.dto.response.TodayBattleResponse; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; - import java.util.List; public interface BattleService { - // === [내부 공통/조회 메서드] === Battle findById(Long battleId); - BattleOption findOptionById(Long optionId); - BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabel label); - - // === [사용자용 - 홈 화면 5단 로직 지원 API] === - // 1. 에디터 픽 조회 (isEditorPick = true) - List getEditorPicks(int limit); + BattleOption findOptionById(Long optionId); - // 2. 지금 뜨는 배틀 조회 (최근 24시간 투표 급증순) - List getTrendingBattles(int limit); + BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabel label); - // 3. Best 배틀 조회 (누적 지표 랭킹) - List getBestBattles(int limit); + List getEditorPicks(); - // 4. 오늘의 Pické 조회 (단일 타입 매칭) - List getTodayPicks(BattleType type, int limit); + List getTrendingBattles(); - // 5. 새로운 배틀 조회 (중복 제외 리스트) - List getNewBattles(List excludeIds, int limit); + List getBestBattles(); + List getTodayPicks(); - // === [사용자용 - 기본 API] === + List getNewBattles(List excludeIds); - // 전체 배틀 목록 페이징 조회 - BattleListResponse getBattles(int page, int size, String type); + BattleListResponse getBattles(int page, int size, String status); - // 오늘의 배틀 (기존 로직 유지용) TodayBattleListResponse getTodayBattles(); - // 배틀 상세 정보 BattleUserDetailResponse getBattleDetail(Long battleId); - // 투표 실행 및 실시간 통계 결과 반환 - BattleVoteResponse vote(Long battleId, Long optionId); + BattleVoteResponse BattleVote(Long battleId, Long optionId); BattleScenarioResponse getBattleScenario(Long battleId); UserBattleStatusResponse getUserBattleStatus(Long battleId); - // === [관리자용 API] === - - // 배틀 생성 AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, Long adminUserId); - // 배틀 수정 + AdminBattleDetailResponse getAdminBattleDetail(Long battleId); + AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request); - // 배틀 삭제 (DB에서 지우지 않고 소프트 딜리트/상태변경을 수행합니다) AdminBattleDeleteResponse deleteBattle(Long battleId); } diff --git a/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java b/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java index 5956d719..e8b59d6c 100644 --- a/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java @@ -1,8 +1,11 @@ package com.swyp.picke.domain.battle.service; import com.swyp.picke.domain.battle.converter.BattleConverter; -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleOptionRequest; +import com.swyp.picke.domain.admin.dto.battle.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.admin.dto.battle.response.AdminBattleDetailResponse; import com.swyp.picke.domain.battle.dto.response.*; import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; @@ -10,7 +13,6 @@ import com.swyp.picke.domain.battle.entity.BattleTag; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; import com.swyp.picke.domain.user.enums.UserBattleStep; import com.swyp.picke.domain.battle.repository.BattleOptionRepository; @@ -18,15 +20,18 @@ import com.swyp.picke.domain.battle.repository.BattleRepository; import com.swyp.picke.domain.battle.repository.BattleTagRepository; import com.swyp.picke.domain.tag.entity.Tag; +import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.repository.TagRepository; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.enums.VoteSide; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.user.service.UserBattleService; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; +import com.swyp.picke.global.infra.local.service.LocalDraftFileStorageService; +import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.service.S3UploadService; import com.swyp.picke.global.util.SecurityUtil; import lombok.RequiredArgsConstructor; @@ -38,6 +43,9 @@ import java.time.LocalDate; import java.time.LocalDateTime; +import java.net.URI; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.*; import java.util.stream.Collectors; @@ -46,15 +54,23 @@ @Transactional(readOnly = true) public class BattleServiceImpl implements BattleService { + private static final int HOME_EDITOR_PICK_LIMIT = 10; + private static final int HOME_TRENDING_LIMIT = 4; + private static final int HOME_BEST_LIMIT = 3; + private static final int HOME_TODAY_PICK_LIMIT = 1; + private static final int HOME_NEW_LIMIT = 3; + private static final Pattern RESOURCE_IMAGE_PATH_PATTERN = Pattern.compile("/api/v1/resources/images/([A-Z_]+)/(.+)"); + private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; private final BattleTagRepository battleTagRepository; private final BattleOptionTagRepository battleOptionTagRepository; private final TagRepository tagRepository; private final UserRepository userRepository; - private final VoteRepository voteRepository; + private final BattleVoteRepository battleVoteRepository; private final BattleConverter battleConverter; private final S3UploadService s3UploadService; + private final LocalDraftFileStorageService localDraftFileStorageService; private final UserBattleService userBattleService; @Override @@ -68,49 +84,81 @@ public Battle findById(Long battleId) { } @Override - public List getEditorPicks(int limit) { - List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, BattleType.BATTLE, PageRequest.of(0, limit)); - return convertToTodayResponses(battles); + public List getEditorPicks() { + return loadEditorPicks(HOME_EDITOR_PICK_LIMIT); + } + + @Override + public List getTrendingBattles() { + return loadTrendingBattles(HOME_TRENDING_LIMIT); + } + + @Override + public List getBestBattles() { + return loadBestBattles(HOME_BEST_LIMIT); + } + + @Override + @Transactional + public List getTodayPicks() { + return loadTodayPicks(HOME_TODAY_PICK_LIMIT); } @Override - public List getTrendingBattles(int limit) { + public List getNewBattles(List excludeIds) { + return loadNewBattles(excludeIds, HOME_NEW_LIMIT); + } + + private List loadEditorPicks(int limit) { + int safeLimit = Math.max(1, limit); + List battles = battleRepository.findEditorPicks(BattleStatus.PUBLISHED, PageRequest.of(0, safeLimit)); + return convertToTodayResponses(battles); + } + + private List loadTrendingBattles(int limit) { + int safeLimit = Math.max(1, limit); LocalDateTime yesterday = LocalDateTime.now().minusDays(1); - List battles = battleRepository.findTrendingBattles(yesterday, BattleType.BATTLE, PageRequest.of(0, limit)); + List battles = battleRepository.findTrendingBattles(yesterday, PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } - @Override - public List getBestBattles(int limit) { - List battles = battleRepository.findBestBattles(BattleType.BATTLE, PageRequest.of(0, limit)); + private List loadBestBattles(int limit) { + int safeLimit = Math.max(1, limit); + List battles = battleRepository.findBestBattles(PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } - @Override - public List getTodayPicks(BattleType type, int limit) { - List battles = battleRepository.findTodayPicks(type, LocalDate.now(), PageRequest.of(0, limit)); + private List loadTodayPicks(int limit) { + int safeLimit = Math.max(1, limit); + LocalDate today = LocalDate.now(); + ensureTodayPicks(today, safeLimit); + + List battles = battleRepository.findTodayPicks(today, PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } - @Override - public List getNewBattles(List excludeIds, int limit) { + private List loadNewBattles(List excludeIds, int limit) { + int safeLimit = Math.max(1, limit); List finalExcludeIds = (excludeIds == null || excludeIds.isEmpty()) ? List.of(-1L) : excludeIds; - List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, BattleType.BATTLE, PageRequest.of(0, limit)); + List battles = battleRepository.findNewBattlesExcluding(finalExcludeIds, PageRequest.of(0, safeLimit)); return convertToTodayResponses(battles); } @Override - public BattleListResponse getBattles(int page, int size, String type) { + public BattleListResponse getBattles(int page, int size, String status) { int pageNumber = Math.max(0, page - 1); PageRequest pageRequest = PageRequest.of(pageNumber, size); - Page battlePage; + BattleStatus battleStatusFilter = parseBattleStatus(status); - if (type == null || type.equals("ALL")) { + Page battlePage; + if (battleStatusFilter == null) { battlePage = battleRepository.findByDeletedAtIsNullOrderByCreatedAtDesc(pageRequest); } else { - battlePage = battleRepository.findByTypeAndDeletedAtIsNullOrderByCreatedAtDesc( - BattleType.valueOf(type), pageRequest); + battlePage = battleRepository.findByStatusAndDeletedAtIsNullOrderByCreatedAtDesc( + battleStatusFilter, + pageRequest + ); } List items = battlePage.getContent().stream() @@ -126,9 +174,11 @@ public BattleListResponse getBattles(int page, int size, String type) { } @Override + @Transactional public TodayBattleListResponse getTodayBattles() { - List battles = battleRepository.findByTargetDateAndStatusAndTypeAndDeletedAtIsNull( - LocalDate.now(), BattleStatus.PUBLISHED, BattleType.BATTLE); + LocalDate today = LocalDate.now(); + ensureTodayPicks(today, 5); + List battles = battleRepository.findByTargetDateAndStatusAndDeletedAtIsNull(today, BattleStatus.PUBLISHED); List limitedBattles = battles.stream() .limit(5) @@ -139,6 +189,17 @@ public TodayBattleListResponse getTodayBattles() { return new TodayBattleListResponse(items, items.size()); } + private void ensureTodayPicks(LocalDate today, int requiredCount) { + List todays = battleRepository.findTodayPicks(today, PageRequest.of(0, requiredCount)); + int missingCount = requiredCount - todays.size(); + if (missingCount <= 0) return; + + List candidates = battleRepository.findAutoAssignableTodayPicks(today, PageRequest.of(0, missingCount)); + for (Battle candidate : candidates) { + candidate.updateTargetDate(today); + } + } + @Override @Transactional(readOnly = true) public BattleUserDetailResponse getBattleDetail(Long battleId) { @@ -158,11 +219,11 @@ public BattleUserDetailResponse getBattleDetail(Long battleId) { UserBattleStatusResponse statusResponse = userBattleService.getUserBattleStatus(user, battle); UserBattleStep currentStep = statusResponse.step(); - Optional optionalVote = voteRepository.findByBattleIdAndUserIdWithOption(battleId, currentUserId); + Optional optionalVote = battleVoteRepository.findByBattleIdAndUserIdWithOption(battleId, currentUserId); VoteSide voteStatus = optionalVote - .map(vote -> { - if (vote.getPostVoteOption() != null) { - return vote.getPostVoteOption().getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; + .map(BattleVote -> { + if (BattleVote.getPostVoteOption() != null) { + return BattleVote.getPostVoteOption().getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; } return null; }) @@ -195,7 +256,7 @@ public UserBattleStatusResponse getUserBattleStatus(Long battleId) { @Override @Transactional - public BattleVoteResponse vote(Long battleId, Long optionId) { + public BattleVoteResponse BattleVote(Long battleId, Long optionId) { Battle battle = findById(battleId); BattleOption newOption = battleOptionRepository.findById(optionId) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); @@ -204,7 +265,7 @@ public BattleVoteResponse vote(Long battleId, Long optionId) { User user = userRepository.findById(currentUserId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - voteRepository.save(Vote.builder() + battleVoteRepository.save(BattleVote.builder() .user(user) .battle(battle) .preVoteOption(newOption) @@ -232,29 +293,46 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, User admin = userRepository.findById(adminUserId == null ? 1L : adminUserId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Battle battle = battleRepository.save(battleConverter.toEntity(request, admin)); + validateBattleOptionCount(request.options()); + + String resolvedThumbnailKey = resolveStoredImageKey(request.thumbnailUrl(), request.status(), FileCategory.BATTLE); + Battle battle = battleConverter.toEntity(request, admin); + battle.update( + request.title(), + request.summary(), + request.description(), + resolvedThumbnailKey, + request.status() + ); + battle = battleRepository.save(battle); if (request.tagIds() != null) { saveBattleTags(battle, request.tagIds().stream().distinct().toList()); } List savedOptions = new ArrayList<>(); - for (var optionRequest : request.options()) { - BattleOption option = battleOptionRepository.save(BattleOption.builder() - .battle(battle) - .label(optionRequest.label()) - .title(optionRequest.title()) - .stance(optionRequest.stance()) - .representative(optionRequest.representative()) - .quote(optionRequest.quote()) - .imageUrl(optionRequest.imageUrl()) - .isCorrect(optionRequest.isCorrect()) - .build()); - - if (optionRequest.tagIds() != null) { - saveBattleOptionTags(option, optionRequest.tagIds().stream().distinct().toList()); + if (request.options() != null) { + for (AdminBattleOptionRequest optionRequest : request.options()) { + String resolvedImageKey = resolveStoredImageKey( + optionRequest.imageUrl(), + request.status(), + FileCategory.PHILOSOPHER + ); + BattleOption option = BattleOption.builder() + .battle(battle) + .label(optionRequest.label()) + .title(optionRequest.title()) + .stance(optionRequest.stance()) + .representative(optionRequest.representative()) + .imageUrl(resolvedImageKey) + .build(); + option = battleOptionRepository.save(option); + + if (optionRequest.tagIds() != null) { + saveBattleOptionTags(option, optionRequest.tagIds().stream().distinct().toList()); + } + savedOptions.add(option); } - savedOptions.add(option); } Map> optionTagsMap = battleOptionTagRepository.findByBattleWithTags(battle) @@ -267,21 +345,41 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request, return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), savedOptions, optionTagsMap); } + @Override + @Transactional(readOnly = true) + @PreAuthorize("hasRole('ADMIN')") + public AdminBattleDetailResponse getAdminBattleDetail(Long battleId) { + Battle battle = findById(battleId); + List options = battleOptionRepository.findByBattle(battle); + Map> optionTagsMap = battleOptionTagRepository.findByBattleWithTags(battle) + .stream() + .collect(Collectors.groupingBy( + bot -> bot.getBattleOption().getId(), + Collectors.mapping(BattleOptionTag::getTag, Collectors.toList()) + )); + + return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), options, optionTagsMap); + } + @Override @Transactional @PreAuthorize("hasRole('ADMIN')") public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRequest request) { Battle battle = findById(battleId); + validateBattleOptionCount(request.options()); - if (battle.getThumbnailUrl() != null && !battle.getThumbnailUrl().equals(request.thumbnailUrl())) { - s3UploadService.deleteFile(battle.getThumbnailUrl()); + String existingThumbnailKey = normalizeStoredImageReference(battle.getThumbnailUrl(), FileCategory.BATTLE); + String resolvedThumbnailKey = resolveStoredImageKey(request.thumbnailUrl(), request.status(), FileCategory.BATTLE); + if (existingThumbnailKey != null && !existingThumbnailKey.equals(resolvedThumbnailKey)) { + deleteStoredAsset(existingThumbnailKey); } battle.update( - request.title(), request.titlePrefix(), request.titleSuffix(), - request.itemA(), request.itemADesc(), request.itemB(), request.itemBDesc(), - request.summary(), request.description(), request.thumbnailUrl(), - request.targetDate(), request.audioDuration(), request.status() + request.title(), + request.summary(), + request.description(), + resolvedThumbnailKey, + request.status() ); if (request.tagIds() != null) { @@ -292,17 +390,56 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe if (request.options() != null) { List existingOptions = battleOptionRepository.findByBattle(battle); - for (var optionRequest : request.options()) { - existingOptions.stream() - .filter(option -> option.getLabel() == optionRequest.label()) - .findFirst() - .ifPresent(option -> { - if (option.getImageUrl() != null && !option.getImageUrl().equals(optionRequest.imageUrl())) { - s3UploadService.deleteFile(option.getImageUrl()); - } - option.update(optionRequest.title(), optionRequest.stance(), - optionRequest.representative(), optionRequest.quote(), optionRequest.imageUrl(), optionRequest.isCorrect()); - }); + Map existingOptionMap = existingOptions.stream() + .collect(Collectors.toMap(BattleOption::getLabel, option -> option)); + + Set requestedLabels = new HashSet<>(); + + for (AdminBattleOptionRequest optionRequest : request.options()) { + requestedLabels.add(optionRequest.label()); + + BattleOption option = existingOptionMap.get(optionRequest.label()); + String resolvedOptionImageKey = resolveStoredImageKey( + optionRequest.imageUrl(), + request.status(), + FileCategory.PHILOSOPHER + ); + if (option == null) { + option = BattleOption.builder() + .battle(battle) + .label(optionRequest.label()) + .title(optionRequest.title()) + .stance(optionRequest.stance()) + .representative(optionRequest.representative()) + .imageUrl(resolvedOptionImageKey) + .build(); + option = battleOptionRepository.save(option); + } else { + String existingOptionImageKey = normalizeStoredImageReference(option.getImageUrl(), FileCategory.PHILOSOPHER); + if (existingOptionImageKey != null && !existingOptionImageKey.equals(resolvedOptionImageKey)) { + deleteStoredAsset(existingOptionImageKey); + } + option.update(optionRequest.title(), optionRequest.stance(), + optionRequest.representative(), resolvedOptionImageKey); + } + + replaceBattleOptionTags(option, optionRequest.tagIds()); + } + + List removedOptions = existingOptions.stream() + .filter(existing -> !requestedLabels.contains(existing.getLabel())) + .toList(); + + for (BattleOption removedOption : removedOptions) { + deleteStoredAsset(removedOption.getImageUrl()); + List optionTags = battleOptionTagRepository.findByBattleOption(removedOption); + if (!optionTags.isEmpty()) { + battleOptionTagRepository.deleteAll(optionTags); + } + } + + if (!removedOptions.isEmpty()) { + battleOptionRepository.deleteAll(removedOptions); } } @@ -355,6 +492,7 @@ private List getTagsByBattle(Battle battle) { private void saveBattleTags(Battle battle, List ids) { tagRepository.findAllById(ids).stream() .filter(tag -> tag.getDeletedAt() == null) + .filter(tag -> tag.getType() == TagType.CATEGORY) .forEach(tag -> battleTagRepository.save( BattleTag.builder().battle(battle).tag(tag).build())); } @@ -362,10 +500,22 @@ private void saveBattleTags(Battle battle, List ids) { private void saveBattleOptionTags(BattleOption option, List tagIds) { tagRepository.findAllById(tagIds).stream() .filter(tag -> tag.getDeletedAt() == null) + .filter(tag -> tag.getType() == TagType.PHILOSOPHER || tag.getType() == TagType.VALUE) .forEach(tag -> battleOptionTagRepository.save( BattleOptionTag.builder().battleOption(option).tag(tag).build())); } + private void replaceBattleOptionTags(BattleOption option, List tagIds) { + if (tagIds == null) return; + + List existingTags = battleOptionTagRepository.findByBattleOption(option); + if (!existingTags.isEmpty()) { + battleOptionTagRepository.deleteAll(existingTags); + } + + saveBattleOptionTags(option, tagIds.stream().distinct().toList()); + } + @Override public BattleOption findOptionById(Long optionId) { return battleOptionRepository.findById(optionId) @@ -378,4 +528,95 @@ public BattleOption findOptionByBattleIdAndLabel(Long battleId, BattleOptionLabe return battleOptionRepository.findByBattleAndLabel(battle, label) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); } -} \ No newline at end of file + + private String resolveStoredImageKey(String rawReference, BattleStatus targetStatus, FileCategory fallbackCategory) { + String normalized = normalizeStoredImageReference(rawReference, fallbackCategory); + if (normalized == null) { + return null; + } + if (targetStatus == BattleStatus.PUBLISHED && localDraftFileStorageService.isLocalDraftReference(normalized)) { + return localDraftFileStorageService.promoteLocalDraftToS3(normalized, fallbackCategory, s3UploadService); + } + return normalized; + } + + private String normalizeStoredImageReference(String rawReference, FileCategory fallbackCategory) { + if (rawReference == null || rawReference.isBlank()) { + return null; + } + + String trimmed = rawReference.trim(); + String localNormalized = localDraftFileStorageService.normalizeLocalDraftKey(trimmed); + if (localDraftFileStorageService.isLocalDraftReference(localNormalized)) { + return localNormalized; + } + + String path = extractPath(trimmed); + Matcher matcher = RESOURCE_IMAGE_PATH_PATTERN.matcher(path); + if (matcher.find()) { + String categoryName = matcher.group(1); + String fileName = matcher.group(2); + try { + FileCategory category = FileCategory.valueOf(categoryName); + return category.getPath() + "/" + fileName; + } catch (IllegalArgumentException ignored) { + if (fallbackCategory != null) { + return fallbackCategory.getPath() + "/" + fileName; + } + } + } + + return trimmed; + } + + private String extractPath(String value) { + if (value.startsWith("http://") || value.startsWith("https://")) { + try { + URI uri = URI.create(value); + return uri.getPath(); + } catch (IllegalArgumentException ignored) { + return value; + } + } + return value; + } + + private void deleteStoredAsset(String rawReference) { + String normalized = normalizeStoredImageReference(rawReference, null); + if (normalized == null) { + return; + } + + if (localDraftFileStorageService.isLocalDraftReference(normalized)) { + localDraftFileStorageService.deleteIfLocalReference(normalized); + return; + } + + s3UploadService.deleteFile(normalized); + } + + private BattleStatus parseBattleStatus(String status) { + if (status == null || status.isBlank() || "ALL".equalsIgnoreCase(status)) { + return null; + } + + try { + return BattleStatus.valueOf(status.trim().toUpperCase()); + } catch (IllegalArgumentException e) { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + private void validateBattleOptionCount(List options) { + if (options == null) { + throw new CustomException(ErrorCode.BATTLE_INVALID_OPTION_COUNT); + } + int count = options.size(); + if (count < 2 || count > 4) { + throw new CustomException(ErrorCode.BATTLE_INVALID_OPTION_COUNT); + } + } +} + + + diff --git a/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java b/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java index 2cfddac7..e466fb6a 100644 --- a/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java +++ b/src/main/java/com/swyp/picke/domain/home/controller/HomeController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "홈 API", description = "홈 화면 집계 조회") +@Tag(name = "홈 API", description = "홈 화면 데이터 조회") @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") @@ -19,7 +19,7 @@ public class HomeController { private final HomeService homeService; - @Operation(summary = "홈 화면 집계 조회") + @Operation(summary = "홈 화면 데이터 조회") @GetMapping("/home") public ApiResponse getHome(@AuthenticationPrincipal Long userId) { return ApiResponse.onSuccess(homeService.getHome(userId)); diff --git a/src/main/java/com/swyp/picke/domain/home/service/HomeService.java b/src/main/java/com/swyp/picke/domain/home/service/HomeService.java index 6aa4f55b..4d3082cd 100644 --- a/src/main/java/com/swyp/picke/domain/home/service/HomeService.java +++ b/src/main/java/com/swyp/picke/domain/home/service/HomeService.java @@ -1,30 +1,47 @@ package com.swyp.picke.domain.home.service; -import com.swyp.picke.domain.battle.dto.response.BattleTagResponse; import com.swyp.picke.domain.battle.dto.response.TodayBattleResponse; import com.swyp.picke.domain.battle.dto.response.TodayOptionResponse; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.battle.enums.BattleType; -import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.domain.home.dto.response.*; +import com.swyp.picke.domain.home.dto.response.HomeBestBattleResponse; +import com.swyp.picke.domain.home.dto.response.HomeEditorPickResponse; +import com.swyp.picke.domain.home.dto.response.HomeNewBattleResponse; +import com.swyp.picke.domain.home.dto.response.HomeResponse; +import com.swyp.picke.domain.home.dto.response.HomeTodayQuizResponse; +import com.swyp.picke.domain.home.dto.response.HomeTodayVoteOptionResponse; +import com.swyp.picke.domain.home.dto.response.HomeTodayVoteResponse; +import com.swyp.picke.domain.home.dto.response.HomeTrendingResponse; import com.swyp.picke.domain.notification.enums.NotificationCategory; import com.swyp.picke.domain.notification.service.NotificationService; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.service.PollService; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import com.swyp.picke.domain.quiz.service.QuizService; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - +import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.Optional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class HomeService { + private static final int HOME_TODAY_PICK_LIMIT = 1; + private static final String QUIZ_SUMMARY = "왼쪽과 오른쪽 중 정답을 선택하세요"; + private static final String POLL_SUMMARY = "빈칸에 들어갈 가장 적절한 답을 골라주세요"; + private final BattleService battleService; + private final QuizService quizService; + private final PollService pollService; private final NotificationService notificationService; private final S3PresignedUrlService s3PresignedUrlService; @@ -33,15 +50,15 @@ public HomeResponse getHome(Long userId) { if (userId != null) { newNotice = notificationService.hasNewBroadcast(userId, NotificationCategory.NOTICE); } - // DB 쿼리 단계에서 LIMIT을 걸어 필요한 개수만 깔끔하게 조회! - List editorPickRaw = battleService.getEditorPicks(10); - List trendingRaw = battleService.getTrendingBattles(4); - List bestRaw = battleService.getBestBattles(3); - List voteRaw = battleService.getTodayPicks(BattleType.VOTE, 1); - List quizRaw = battleService.getTodayPicks(BattleType.QUIZ, 1); - List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw, voteRaw, quizRaw); - List newRaw = battleService.getNewBattles(excludeIds, 3); + List editorPickRaw = battleService.getEditorPicks(); + List trendingRaw = battleService.getTrendingBattles(); + List bestRaw = battleService.getBestBattles(); + List quizRaw = quizService.getTodayPicks(HOME_TODAY_PICK_LIMIT); + List pollRaw = pollService.getTodayPicks(HOME_TODAY_PICK_LIMIT); + + List excludeIds = collectBattleIds(editorPickRaw, trendingRaw, bestRaw); + List newRaw = battleService.getNewBattles(excludeIds); return new HomeResponse( newNotice, @@ -49,131 +66,145 @@ public HomeResponse getHome(Long userId) { trendingRaw.stream().map(this::toTrending).toList(), bestRaw.stream().map(this::toBestBattle).toList(), quizRaw.stream().map(this::toTodayQuiz).toList(), - voteRaw.stream().map(this::toTodayVote).toList(), + pollRaw.stream().map(this::toTodayVote).toList(), newRaw.stream().map(this::toNewBattle).toList() ); } - // 에디터픽 썸네일 Presigned URL 적용 - private HomeEditorPickResponse toEditorPick(TodayBattleResponse b) { - String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); - String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); - - String secureThumb = b.thumbnailUrl(); - + private HomeEditorPickResponse toEditorPick(TodayBattleResponse battle) { return new HomeEditorPickResponse( - b.battleId(), secureThumb, - optionA, optionB, - b.title(), b.summary(), - b.tags(), b.viewCount() + battle.battleId(), + battle.thumbnailUrl(), + findOptionTitle(battle.options(), BattleOptionLabel.A), + findOptionTitle(battle.options(), BattleOptionLabel.B), + battle.title(), + battle.summary(), + battle.tags(), + battle.viewCount() ); } - private HomeTrendingResponse toTrending(TodayBattleResponse b) { + private HomeTrendingResponse toTrending(TodayBattleResponse battle) { return new HomeTrendingResponse( - b.battleId(), b.thumbnailUrl(), - b.title(), b.tags(), - b.audioDuration(), b.viewCount() + battle.battleId(), + battle.thumbnailUrl(), + battle.title(), + battle.tags(), + battle.audioDuration(), + battle.viewCount() ); } - private HomeBestBattleResponse toBestBattle(TodayBattleResponse b) { - String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); - String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); - + private HomeBestBattleResponse toBestBattle(TodayBattleResponse battle) { return new HomeBestBattleResponse( - b.battleId(), - philoA, philoB, - b.title(), b.tags(), - b.audioDuration(), b.viewCount() + battle.battleId(), + findOptionRepresentative(battle.options(), BattleOptionLabel.A), + findOptionRepresentative(battle.options(), BattleOptionLabel.B), + battle.title(), + battle.tags(), + battle.audioDuration(), + battle.viewCount() ); } - private HomeTodayQuizResponse toTodayQuiz(TodayBattleResponse b) { + private HomeTodayQuizResponse toTodayQuiz(Quiz quiz) { + List options = quizService.getOptions(quiz); + long participantsCount = quizService.countVotes(quiz); + + QuizOption optionA = findQuizOption(options, QuizOptionLabel.A); + QuizOption optionB = findQuizOption(options, QuizOptionLabel.B); + return new HomeTodayQuizResponse( - b.battleId(), b.title(), b.summary(), - b.participantsCount(), - b.itemA(), b.itemADesc(), - findOptionIsCorrect(b.options(), BattleOptionLabel.A), - b.itemB(), b.itemBDesc(), - findOptionIsCorrect(b.options(), BattleOptionLabel.B) + quiz.getId(), + quiz.getTitle(), + QUIZ_SUMMARY, + participantsCount, + optionA != null ? optionA.getText() : null, + optionA != null ? optionA.getDetailText() : null, + false, + optionB != null ? optionB.getText() : null, + optionB != null ? optionB.getDetailText() : null, + false ); } - private HomeTodayVoteResponse toTodayVote(TodayBattleResponse b) { - List options = Optional.ofNullable(b.options()).orElse(List.of()).stream() - .map(o -> new HomeTodayVoteOptionResponse(o.label(), o.title())) + private HomeTodayVoteResponse toTodayVote(Poll poll) { + List options = pollService.getOptions(poll); + long participantsCount = pollService.countVotes(poll); + + List homeOptions = options.stream() + .sorted(Comparator + .comparing((PollOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(option -> option.getId() == null ? Long.MAX_VALUE : option.getId())) + .map(option -> new HomeTodayVoteOptionResponse( + BattleOptionLabel.valueOf(option.getLabel().name()), + option.getTitle() + )) .toList(); + return new HomeTodayVoteResponse( - b.battleId(), - b.titlePrefix(), b.titleSuffix(), - b.summary(), b.participantsCount(), - options + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + POLL_SUMMARY, + participantsCount, + homeOptions ); } - // newBattle 썸네일 Presigned URL 적용 - private HomeNewBattleResponse toNewBattle(TodayBattleResponse b) { - String philoA = findOptionRepresentative(b.options(), BattleOptionLabel.A); - String philoB = findOptionRepresentative(b.options(), BattleOptionLabel.B); - - String optionA = findOptionTitle(b.options(), BattleOptionLabel.A); - String optionB = findOptionTitle(b.options(), BattleOptionLabel.B); - - String imageA = findRepresentativeImageUrl(b.options(), BattleOptionLabel.A); - String imageB = findRepresentativeImageUrl(b.options(), BattleOptionLabel.B); - + private HomeNewBattleResponse toNewBattle(TodayBattleResponse battle) { return new HomeNewBattleResponse( - b.battleId(), b.thumbnailUrl(), - b.title(), b.summary(), - philoA, optionA, imageA, - philoB, optionB, imageB, - b.tags(), b.audioDuration(), b.viewCount() + battle.battleId(), + battle.thumbnailUrl(), + battle.title(), + battle.summary(), + findOptionRepresentative(battle.options(), BattleOptionLabel.A), + findOptionTitle(battle.options(), BattleOptionLabel.A), + findRepresentativeImageUrl(battle.options(), BattleOptionLabel.A), + findOptionRepresentative(battle.options(), BattleOptionLabel.B), + findOptionTitle(battle.options(), BattleOptionLabel.B), + findRepresentativeImageUrl(battle.options(), BattleOptionLabel.B), + battle.tags(), + battle.audioDuration(), + battle.viewCount() ); } - private Boolean findOptionIsCorrect(List options, BattleOptionLabel label) { - return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) - .map(TodayOptionResponse::isCorrect) - .findFirst() - .map(Boolean.TRUE::equals) - .orElse(false); - } - private String findOptionTitle(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) + .filter(option -> option.label() == label) .map(TodayOptionResponse::title) .filter(Objects::nonNull) - .findFirst().orElse(null); + .findFirst() + .orElse(null); } - // 옵션에서 철학자 이름(Representative)을 추출하는 메서드 private String findOptionRepresentative(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) + .filter(option -> option.label() == label) .map(TodayOptionResponse::representative) .filter(Objects::nonNull) - .findFirst().orElse(null); - } - - private List findPhilosopherNames(List tags) { - return Optional.ofNullable(tags).orElse(List.of()).stream() - .filter(t -> t.type() == TagType.PHILOSOPHER) - .map(BattleTagResponse::name) - .toList(); + .findFirst() + .orElse(null); } private String findRepresentativeImageUrl(List options, BattleOptionLabel label) { return Optional.ofNullable(options).orElse(List.of()).stream() - .filter(o -> o.label() == label) + .filter(option -> option.label() == label) .map(TodayOptionResponse::imageUrl) .filter(Objects::nonNull) .findFirst() .orElse(null); } + private QuizOption findQuizOption(List options, QuizOptionLabel label) { + return options.stream() + .filter(option -> option.getLabel() == label) + .findFirst() + .orElse(null); + } + @SafeVarargs private List collectBattleIds(List... groups) { return List.of(groups).stream() diff --git a/src/main/java/com/swyp/picke/domain/notification/repository/NotificationRepository.java b/src/main/java/com/swyp/picke/domain/notification/repository/NotificationRepository.java index 9165eb58..973a589b 100644 --- a/src/main/java/com/swyp/picke/domain/notification/repository/NotificationRepository.java +++ b/src/main/java/com/swyp/picke/domain/notification/repository/NotificationRepository.java @@ -45,4 +45,14 @@ AND NOT EXISTS ( WHERE n.user.id = :userId AND n.read = false """) int markAllAsReadByUserId(@Param("userId") Long userId); + + @Query(""" + SELECT n FROM Notification n + WHERE (:category IS NULL OR n.category = :category) + ORDER BY n.createdAt DESC + """) + Slice findNotificationsForAdmin( + @Param("category") NotificationCategory category, + Pageable pageable + ); } diff --git a/src/main/java/com/swyp/picke/domain/notification/service/NotificationService.java b/src/main/java/com/swyp/picke/domain/notification/service/NotificationService.java index 93b730f6..80539904 100644 --- a/src/main/java/com/swyp/picke/domain/notification/service/NotificationService.java +++ b/src/main/java/com/swyp/picke/domain/notification/service/NotificationService.java @@ -53,11 +53,19 @@ public Notification createNotification(Long userId, NotificationDetailCode detai @Transactional public Notification createBroadcastNotification(NotificationDetailCode detailCode, String body, Long referenceId) { + return createBroadcastNotification(detailCode, null, body, referenceId); + } + + @Transactional + public Notification createBroadcastNotification(NotificationDetailCode detailCode, String customTitle, String body, Long referenceId) { + String resolvedTitle = (customTitle == null || customTitle.isBlank()) + ? detailCode.getDefaultTitle() + : customTitle; Notification notification = Notification.builder() .user(null) .category(detailCode.getCategory()) .detailCode(detailCode) - .title(detailCode.getDefaultTitle()) + .title(resolvedTitle) .body(body) .referenceId(referenceId) .build(); diff --git a/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java b/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java index b7150503..0ac93e0a 100644 --- a/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java +++ b/src/main/java/com/swyp/picke/domain/oauth/controller/AuthController.java @@ -17,7 +17,7 @@ @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor -@Tag(name = "인증 (Auth)", description = "인증 API") +@Tag(name = "인증 API", description = "소셜 로그인, 토큰 재발급, 로그아웃, 회원 탈퇴") public class AuthController { private final AuthService authService; diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java index 76541533..c17eba4c 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/CommentLikeController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "댓글 좋아요 (Comment Like)", description = "댓글 좋아요 등록, 취소 API") +@Tag(name = "댓글 좋아요 API", description = "댓글 좋아요 등록 및 취소") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -28,7 +28,7 @@ public ApiResponse addLike(@PathVariable Long commentId, return ApiResponse.onSuccess(commentLikeService.addLike(commentId, userId)); } - @Operation(summary = "댓글 좋아요 취소", description = "특정 댓글에 등록한 좋아요를 취소합니다.") + @Operation(summary = "댓글 좋아요 취소", description = "특정 댓글의 좋아요를 취소합니다.") @DeleteMapping("/comments/{commentId}/likes") public ApiResponse removeLike(@PathVariable Long commentId, @AuthenticationPrincipal Long userId) { diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java index d702d8aa..728a7fea 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveCommentController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 댓글 (Comment)", description = "관점 댓글 생성, 조회, 수정, 삭제 API") +@Tag(name = "관점 댓글 API", description = "관점 댓글 생성, 조회, 수정, 삭제") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -51,7 +51,7 @@ public ApiResponse getComments( return ApiResponse.onSuccess(commentService.getComments(perspectiveId, userId, cursor, size)); } - @Operation(summary = "댓글 목록 조회 (옵션 라벨)", description = "특정 관점의 댓글 목록을 커서 기반 페이지네이션으로 조회합니다. stance는 투표한 옵션의 라벨(A/B)로 반환됩니다.") + @Operation(summary = "댓글 목록 조회 (옵션 라벨)", description = "특정 관점의 댓글 목록을 커서 기반 페이지네이션으로 조회하며, stance를 투표한 옵션 라벨(A/B)로 반환합니다.") @GetMapping("/perspectives/{perspectiveId}/comments/labeled") public ApiResponse getCommentsWithLabel( @PathVariable Long perspectiveId, @@ -73,7 +73,7 @@ public ApiResponse deleteComment( return ApiResponse.onSuccess(null); } - @Operation(summary = "댓글 수정", description = "본인이 작성한 댓글의 내용을 수정합니다.") + @Operation(summary = "댓글 수정", description = "본인이 작성한 댓글 내용을 수정합니다.") @PatchMapping("/perspectives/{perspectiveId}/comments/{commentId}") public ApiResponse updateComment( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java index 545f8146..03c9aa3f 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 (Perspective)", description = "관점 생성, 조회, 수정, 삭제 API") +@Tag(name = "관점 API", description = "관점 생성, 조회, 수정, 삭제") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -32,7 +32,7 @@ public class PerspectiveController { private final PerspectiveService perspectiveService; - @Operation(summary = "관점 단건 조회", description = "특정 관점의 상세 정보를 조회합니다.") + @Operation(summary = "관점 상세 조회", description = "특정 관점의 상세 정보를 조회합니다.") @GetMapping("/perspectives/{perspectiveId}") public ApiResponse getPerspectiveDetail( @PathVariable Long perspectiveId, @@ -40,8 +40,7 @@ public ApiResponse getPerspectiveDetail( return ApiResponse.onSuccess(perspectiveService.getPerspectiveDetail(perspectiveId, userId)); } - // TODO: Prevote 의 여부를 Vote 도메인 개발 이후 교체 - @Operation(summary = "관점 생성", description = "특정 배틀에 대한 관점을 생성합니다. 사전 투표가 완료된 경우에만 가능합니다.") + @Operation(summary = "관점 생성", description = "특정 배틀에 대한 사용자 관점을 생성합니다.") @PostMapping("/battles/{battleId}/perspectives") public ApiResponse createPerspective( @PathVariable Long battleId, @@ -51,7 +50,7 @@ public ApiResponse createPerspective( return ApiResponse.onSuccess(perspectiveService.createPerspective(battleId, userId, request)); } - @Operation(summary = "관점 리스트 조회", description = "특정 배틀의 관점 목록을 커서 기반 페이지네이션으로 조회합니다. optionLabel(A/B)로 필터링, sort(latest/popular)로 정렬 가능합니다.") + @Operation(summary = "관점 목록 조회", description = "특정 배틀의 관점 목록을 커서 기반으로 조회합니다.") @GetMapping("/battles/{battleId}/perspectives") public ApiResponse getPerspectives( @PathVariable Long battleId, @@ -64,7 +63,7 @@ public ApiResponse getPerspectives( return ApiResponse.onSuccess(perspectiveService.getPerspectives(battleId, userId, cursor, size, optionLabel, sort)); } - @Operation(summary = "내 관점 조회", description = "특정 배틀에서 내가 작성한 관점을 조회합니다. 상태(PENDING/PUBLISHED/REJECTED 등)와 무관하게 반환하며, 작성한 관점이 없으면 404를 반환합니다.") + @Operation(summary = "내 관점 조회", description = "해당 배틀에서 본인이 작성한 관점을 조회합니다.") @GetMapping("/battles/{battleId}/perspectives/me") public ApiResponse getMyPerspective( @PathVariable Long battleId, @@ -81,7 +80,7 @@ public ApiResponse deletePerspective( return ApiResponse.onSuccess(null); } - @Operation(summary = "관점 검수 재시도", description = "검수 실패(MODERATION_FAILED) 상태의 관점에 대해 GPT 검수를 다시 요청합니다.") + @Operation(summary = "관점 검수 재요청", description = "검수 실패 상태의 관점에 대해 검수를 다시 요청합니다.") @PostMapping("/perspectives/{perspectiveId}/moderation/retry") public ApiResponse retryModeration( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java index 75a6a1b4..7e090575 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/PerspectiveLikeController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "관점 좋아요 (Like)", description = "관점 좋아요 조회, 등록, 취소 API") +@Tag(name = "관점 좋아요 API", description = "관점 좋아요 조회, 등록, 취소") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -37,7 +37,7 @@ public ApiResponse addLike( return ApiResponse.onSuccess(likeService.addLike(perspectiveId, userId)); } - @Operation(summary = "좋아요 취소", description = "특정 관점에 등록한 좋아요를 취소합니다.") + @Operation(summary = "좋아요 취소", description = "특정 관점의 좋아요를 취소합니다.") @DeleteMapping("/perspectives/{perspectiveId}/likes") public ApiResponse removeLike( @PathVariable Long perspectiveId, diff --git a/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java b/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java index 438cc00f..eb227348 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java +++ b/src/main/java/com/swyp/picke/domain/perspective/controller/ReportController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "신고 (Report)", description = "관점/댓글 신고 API") +@Tag(name = "신고 API", description = "관점/댓글 신고") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor diff --git a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java index ac225705..c7808893 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java +++ b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java @@ -17,7 +17,7 @@ import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.service.UserService; -import com.swyp.picke.domain.vote.service.VoteService; +import com.swyp.picke.domain.vote.service.BattleVoteService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; @@ -41,7 +41,7 @@ public class PerspectiveCommentService { private final UserRepository userRepository; private final CommentLikeRepository commentLikeRepository; private final UserService userQueryService; - private final VoteService voteService; + private final BattleVoteService BattleVoteService; private final BattleService battleService; private final S3PresignedUrlService s3PresignedUrlService; @@ -62,7 +62,7 @@ public CreateCommentResponse createComment(Long perspectiveId, Long userId, Crea UserSummary userSummary = userQueryService.findSummaryById(userId); String characterImageUrl = resolveCharacterImageUrl(userSummary.characterType()); - Long postVoteOptionId = voteService.findPostVoteOptionId(perspective.getBattle().getId(), userId); + Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(perspective.getBattle().getId(), userId); String stance = null; if (postVoteOptionId != null) { stance = battleService.findOptionById(postVoteOptionId).getStance(); @@ -96,7 +96,7 @@ public CommentListResponse getComments(Long perspectiveId, Long userId, String c .map(c -> { UserSummary user = userQueryService.findSummaryById(c.getUser().getId()); String characterImageUrl = resolveCharacterImageUrl(user.characterType()); - Long postVoteOptionId = voteService.findPostVoteOptionId(battleId, c.getUser().getId()); + Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(battleId, c.getUser().getId()); String stance = null; if (postVoteOptionId != null) { BattleOption option = battleService.findOptionById(postVoteOptionId); @@ -140,7 +140,7 @@ public CommentListResponse getCommentsWithLabel(Long perspectiveId, Long userId, .map(c -> { UserSummary user = userQueryService.findSummaryById(c.getUser().getId()); String characterImageUrl = resolveCharacterImageUrl(user.characterType()); - Long postVoteOptionId = voteService.findPostVoteOptionId(battleId, c.getUser().getId()); + Long postVoteOptionId = BattleVoteService.findPostVoteOptionId(battleId, c.getUser().getId()); String stance = null; if (postVoteOptionId != null) { BattleOption option = battleService.findOptionById(postVoteOptionId); @@ -209,4 +209,4 @@ private String resolveCharacterImageUrl(String characterType) { } return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java index e366aa63..ed8d596c 100644 --- a/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java +++ b/src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java @@ -21,7 +21,7 @@ import com.swyp.picke.domain.user.dto.response.UserSummary; import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.service.UserService; -import com.swyp.picke.domain.vote.service.VoteService; +import com.swyp.picke.domain.vote.service.BattleVoteService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; @@ -44,7 +44,7 @@ public class PerspectiveService { private final PerspectiveCommentRepository perspectiveCommentRepository; private final PerspectiveLikeRepository perspectiveLikeRepository; private final BattleService battleService; - private final VoteService voteService; + private final BattleVoteService BattleVoteService; private final UserService userQueryService; private final UserRepository userRepository; private final GptModerationService gptModerationService; @@ -82,7 +82,7 @@ public CreatePerspectiveResponse createPerspective(Long battleId, Long userId, C throw new CustomException(ErrorCode.PERSPECTIVE_ALREADY_EXISTS); } - BattleOption option = voteService.findPreVoteOption(battleId, userId); + BattleOption option = BattleVoteService.findPreVoteOption(battleId, userId); Perspective perspective = Perspective.builder() .battle(battle) @@ -217,4 +217,4 @@ private String resolveCharacterImageUrl(String characterType) { } return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java b/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java new file mode 100644 index 00000000..97344834 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/controller/PollController.java @@ -0,0 +1,38 @@ +package com.swyp.picke.domain.poll.controller; + +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.service.PollService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "투표 콘텐츠 API", description = "투표 콘텐츠 조회") +@RestController +@RequestMapping("/api/v1/polls") +@RequiredArgsConstructor +public class PollController { + + private final PollService pollService; + + @Operation(summary = "투표 콘텐츠 목록 조회") + @GetMapping + public ApiResponse getPolls( + @RequestParam(value = "page", defaultValue = "1") int page, + @RequestParam(value = "size", defaultValue = "10") int size + ) { + return ApiResponse.onSuccess(pollService.getPolls(page, size)); + } + + @Operation(summary = "투표 콘텐츠 상세 조회") + @GetMapping("/{pollId}") + public ApiResponse getPollDetail(@PathVariable Long pollId) { + return ApiResponse.onSuccess(pollService.getPollDetail(pollId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java b/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java new file mode 100644 index 00000000..03d74fec --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/converter/PollConverter.java @@ -0,0 +1,85 @@ +package com.swyp.picke.domain.poll.converter; + +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.dto.response.PollOptionResponse; +import com.swyp.picke.domain.poll.dto.response.PollSimpleResponse; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import java.util.Comparator; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Component; + +@Component +public class PollConverter { + + private static final Comparator OPTION_SORTER = + Comparator.comparing((PollOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(PollOption::getId); + + public Poll toEntity(AdminPollCreateRequest request) { + return Poll.builder() + .titlePrefix(request.titlePrefix()) + .titleSuffix(request.titleSuffix()) + .status(request.status()) + .build(); + } + + public PollListResponse toListResponse(Page pollPage) { + List items = pollPage.getContent().stream() + .map(this::toSimpleResponse) + .toList(); + return new PollListResponse(items, pollPage.getNumber() + 1, pollPage.getTotalPages(), pollPage.getTotalElements()); + } + + public PollSimpleResponse toSimpleResponse(Poll poll) { + return new PollSimpleResponse( + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + poll.getStatus() + ); + } + + public AdminPollDetailResponse toAdminDetailResponse(Poll poll, List options) { + return new AdminPollDetailResponse( + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + poll.getTargetDate(), + poll.getStatus(), + toOptionResponses(options) + ); + } + + public PollDetailResponse toDetailResponse(Poll poll, List options) { + return new PollDetailResponse( + poll.getId(), + poll.getTitlePrefix(), + poll.getTitleSuffix(), + poll.getTargetDate(), + poll.getStatus(), + toOptionResponses(options) + ); + } + + private List toOptionResponses(List options) { + if (options == null) { + return List.of(); + } + return options.stream() + .sorted(OPTION_SORTER) + .map(option -> new PollOptionResponse( + option.getId(), + option.getLabel(), + option.getTitle(), + option.getDisplayOrder(), + option.getVoteCount() + )) + .toList(); + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java new file mode 100644 index 00000000..04f4db50 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollDetailResponse.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.poll.enums.PollStatus; +import java.time.LocalDate; +import java.util.List; + +public record PollDetailResponse( + Long pollId, + String titlePrefix, + String titleSuffix, + LocalDate targetDate, + PollStatus status, + List options +) {} diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java new file mode 100644 index 00000000..76f89133 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollListResponse.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.poll.dto.response; + +import java.util.List; + +public record PollListResponse( + List items, + int page, + int totalPages, + long totalElements +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java new file mode 100644 index 00000000..b619a55f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollOptionResponse.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.poll.enums.PollOptionLabel; + +public record PollOptionResponse( + Long optionId, + PollOptionLabel label, + String title, + Integer displayOrder, + Long voteCount +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java new file mode 100644 index 00000000..de4a34e2 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollSimpleResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.poll.enums.PollStatus; + +import java.time.LocalDateTime; + +public record PollSimpleResponse( + Long pollId, + String titlePrefix, + String titleSuffix, + PollStatus status +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java new file mode 100644 index 00000000..4c334ae8 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/dto/response/PollTagResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.poll.dto.response; + +import com.swyp.picke.domain.tag.enums.TagType; + +public record PollTagResponse( + Long tagId, + String name, + TagType type +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java b/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java new file mode 100644 index 00000000..447a9081 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/Poll.java @@ -0,0 +1,70 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.poll.enums.PollStatus; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Getter +@Entity +@Table(name = "poll_contents") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Poll extends BaseEntity { + + @Column(name = "title_prefix", nullable = false, length = 200) + private String titlePrefix; + + @Column(name = "title_suffix", length = 200) + private String titleSuffix; + + @Column(name = "target_date") + private LocalDate targetDate; + + @Column(name = "total_participants_count", nullable = false) + private Long totalParticipantsCount; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private PollStatus status; + + @OneToMany(mappedBy = "poll", cascade = CascadeType.ALL, orphanRemoval = true) + private final List options = new ArrayList<>(); + + @Builder + public Poll(String titlePrefix, String titleSuffix, LocalDate targetDate, PollStatus status) { + this.titlePrefix = titlePrefix; + this.titleSuffix = titleSuffix; + this.targetDate = targetDate; + this.status = status; + this.totalParticipantsCount = 0L; + } + + public void update(String titlePrefix, String titleSuffix, LocalDate targetDate, PollStatus status) { + if (titlePrefix != null) this.titlePrefix = titlePrefix; + if (titleSuffix != null) this.titleSuffix = titleSuffix; + if (targetDate != null) this.targetDate = targetDate; + if (status != null) this.status = status; + } + + public void increaseTotalParticipantsCount() { + this.totalParticipantsCount = (this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount) + 1L; + } + + public void decreaseTotalParticipantsCount() { + long current = this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount; + this.totalParticipantsCount = Math.max(0L, current - 1L); + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java new file mode 100644 index 00000000..c0f86e9b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollOption.java @@ -0,0 +1,65 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.poll.enums.PollOptionLabel; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_options") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollOption extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 10) + private PollOptionLabel label; + + @Column(nullable = false, length = 200) + private String title; + + @Column(name = "display_order", nullable = false) + private Integer displayOrder; + + @Column(name = "vote_count", nullable = false) + private Long voteCount; + + @Builder + public PollOption(Poll poll, PollOptionLabel label, String title, Integer displayOrder, Long voteCount) { + this.poll = poll; + this.label = label; + this.title = title; + this.displayOrder = displayOrder; + this.voteCount = voteCount == null ? 0L : voteCount; + } + + + public void update(String title) { + if (title != null) this.title = title; + if (displayOrder != null) this.displayOrder = displayOrder; + } + + public void increaseVoteCount() { + this.voteCount = (this.voteCount == null ? 0L : this.voteCount) + 1; + } + + public void decreaseVoteCount() { + if (this.voteCount != null && this.voteCount > 0) { + this.voteCount--; + } + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java new file mode 100644 index 00000000..e148a80c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.tag.entity.ValueTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_option_value_tags") +@IdClass(PollOptionValueTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollOptionValueTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_option_id", nullable = false) + private PollOption pollOption; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "value_tag_id", nullable = false) + private ValueTag valueTag; + + @Builder + public PollOptionValueTagMap(PollOption pollOption, ValueTag valueTag) { + this.pollOption = pollOption; + this.valueTag = valueTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java new file mode 100644 index 00000000..627f6ab4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollOptionValueTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.poll.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class PollOptionValueTagMapId implements Serializable { + private Long pollOption; + private Long valueTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java new file mode 100644 index 00000000..1220879c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.tag.entity.CategoryTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_tags") +@IdClass(PollTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "category_tag_id", nullable = false) + private CategoryTag categoryTag; + + @Builder + public PollTagMap(Poll poll, CategoryTag categoryTag) { + this.poll = poll; + this.categoryTag = categoryTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java new file mode 100644 index 00000000..29263b1f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.poll.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class PollTagMapId implements Serializable { + private Long poll; + private Long categoryTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java b/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java new file mode 100644 index 00000000..15502d92 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/entity/PollUserVote.java @@ -0,0 +1,43 @@ +package com.swyp.picke.domain.poll.entity; + +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_user_votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollUserVote extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "option_id", nullable = false) + private PollOption selectedOption; + + @Builder + public PollUserVote(User user, Poll poll, PollOption selectedOption) { + this.user = user; + this.poll = poll; + this.selectedOption = selectedOption; + } + + public void updateOption(PollOption option) { + this.selectedOption = option; + } +} diff --git a/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java b/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java new file mode 100644 index 00000000..5dc3dc74 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/enums/PollOptionLabel.java @@ -0,0 +1,5 @@ +package com.swyp.picke.domain.poll.enums; + +public enum PollOptionLabel { + A, B, C, D +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java b/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java new file mode 100644 index 00000000..49757284 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/enums/PollStatus.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.poll.enums; + +public enum PollStatus { + PENDING, + PUBLISHED, + ARCHIVED +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java new file mode 100644 index 00000000..47e2e727 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.enums.PollOptionLabel; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface PollOptionRepository extends JpaRepository { + List findByPollOrderByDisplayOrderAscLabelAscIdAsc(Poll poll); + Optional findByPollAndLabel(Poll poll, PollOptionLabel label); +} diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java new file mode 100644 index 00000000..1d9fcf9c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollOptionValueTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.entity.PollOptionValueTagMap; +import com.swyp.picke.domain.poll.entity.PollOptionValueTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface PollOptionValueTagMapRepository extends JpaRepository { + List findByPollOption(PollOption pollOption); + void deleteByPollOption(PollOption pollOption); +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java new file mode 100644 index 00000000..535eec6c --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollRepository.java @@ -0,0 +1,37 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.enums.PollStatus; +import java.time.LocalDate; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface PollRepository extends JpaRepository { + Page findAllByOrderByCreatedAtDesc(Pageable pageable); + + @Query("SELECT p FROM Poll p WHERE p.status = :status AND p.targetDate = :targetDate ORDER BY p.createdAt ASC") + List findTodayPicks( + @Param("status") PollStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); + + @Query(""" + SELECT p + FROM Poll p + WHERE p.status = :status + AND (p.targetDate IS NULL OR p.targetDate <> :targetDate) + ORDER BY CASE WHEN p.targetDate IS NULL THEN 0 ELSE 1 END, + p.targetDate ASC, + p.createdAt ASC + """) + List findAutoAssignableTodayPicks( + @Param("status") PollStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); +} diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java new file mode 100644 index 00000000..77e8e9da --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollTagMap; +import com.swyp.picke.domain.poll.entity.PollTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface PollTagMapRepository extends JpaRepository { + List findByPoll(Poll poll); + void deleteByPoll(Poll poll); +} + diff --git a/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java b/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java new file mode 100644 index 00000000..dd2039d9 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/repository/PollUserVoteRepository.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.poll.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.entity.PollUserVote; +import com.swyp.picke.domain.user.entity.User; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PollUserVoteRepository extends JpaRepository { + Optional findByPollAndUser(Poll poll, User user); + long countByPoll(Poll poll); + long countByPollAndSelectedOption(Poll poll, PollOption selectedOption); + List findAllByPoll(Poll poll); +} diff --git a/src/main/java/com/swyp/picke/domain/poll/service/PollService.java b/src/main/java/com/swyp/picke/domain/poll/service/PollService.java new file mode 100644 index 00000000..9b64a0f3 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/service/PollService.java @@ -0,0 +1,35 @@ +package com.swyp.picke.domain.poll.service; + +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import java.util.List; + +public interface PollService { + Poll findById(Long pollId); + + PollListResponse getPolls(int page, int size); + + List getTodayPicks(int limit); + + List getOptions(Poll poll); + + long countVotes(Poll poll); + + PollDetailResponse getPollDetail(Long pollId); + + AdminPollDetailResponse getAdminPollDetail(Long pollId); + + AdminPollDetailResponse createPoll(AdminPollCreateRequest request); + + AdminPollDetailResponse updatePoll(Long pollId, AdminPollUpdateRequest request); + + AdminPollDeleteResponse deletePoll(Long pollId); +} + + diff --git a/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java b/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java new file mode 100644 index 00000000..4d3f9958 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/poll/service/PollServiceImpl.java @@ -0,0 +1,186 @@ +package com.swyp.picke.domain.poll.service; + +import com.swyp.picke.domain.poll.converter.PollConverter; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollCreateRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollOptionRequest; +import com.swyp.picke.domain.admin.dto.poll.request.AdminPollUpdateRequest; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDeleteResponse; +import com.swyp.picke.domain.admin.dto.poll.response.AdminPollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollDetailResponse; +import com.swyp.picke.domain.poll.dto.response.PollListResponse; +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.enums.PollOptionLabel; +import com.swyp.picke.domain.poll.enums.PollStatus; +import com.swyp.picke.domain.poll.repository.PollOptionRepository; +import com.swyp.picke.domain.poll.repository.PollRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PollServiceImpl implements PollService { + + private final PollRepository pollRepository; + private final PollOptionRepository pollOptionRepository; + private final PollConverter pollConverter; + + @Override + public Poll findById(Long pollId) { + return pollRepository.findById(pollId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + } + + @Override + public PollListResponse getPolls(int page, int size) { + int pageNumber = Math.max(0, page - 1); + Page pollPage = pollRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(pageNumber, size)); + return pollConverter.toListResponse(pollPage); + } + + @Override + @Transactional + public List getTodayPicks(int limit) { + int safeLimit = Math.max(1, limit); + LocalDate today = LocalDate.now(); + + ensureTodayPicks(today, safeLimit); + return pollRepository.findTodayPicks(PollStatus.PUBLISHED, today, PageRequest.of(0, safeLimit)); + } + + @Override + public List getOptions(Poll poll) { + return pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + } + + @Override + public long countVotes(Poll poll) { + return poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); + } + + @Override + public PollDetailResponse getPollDetail(Long pollId) { + Poll poll = findById(pollId); + List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + return pollConverter.toDetailResponse(poll, options); + } + + @Override + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDetailResponse getAdminPollDetail(Long pollId) { + Poll poll = findById(pollId); + List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + return pollConverter.toAdminDetailResponse(poll, options); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDetailResponse createPoll(AdminPollCreateRequest request) { + Poll poll = pollConverter.toEntity(request); + poll = pollRepository.save(poll); + + List savedOptions = new ArrayList<>(); + if (request.options() != null) { + for (AdminPollOptionRequest optionRequest : request.options()) { + PollOption option = PollOption.builder() + .poll(poll) + .label(optionRequest.label()) + .title(optionRequest.title()) + .build(); + option = pollOptionRepository.save(option); + savedOptions.add(option); + } + } + + return pollConverter.toAdminDetailResponse(poll, savedOptions); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDetailResponse updatePoll(Long pollId, AdminPollUpdateRequest request) { + Poll poll = findById(pollId); + poll.update( + request.titlePrefix(), + request.titleSuffix(), + request.targetDate(), + request.status() + ); + + if (request.options() != null) { + List existingOptions = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + Map existingOptionMap = new HashMap<>(); + for (PollOption option : existingOptions) { + existingOptionMap.put(option.getLabel(), option); + } + + Set requestedLabels = new HashSet<>(); + for (AdminPollOptionRequest optionRequest : request.options()) { + requestedLabels.add(optionRequest.label()); + PollOption option = existingOptionMap.get(optionRequest.label()); + + if (option == null) { + option = PollOption.builder() + .poll(poll) + .label(optionRequest.label()) + .title(optionRequest.title()) + .build(); + option = pollOptionRepository.save(option); + } else { + option.update(optionRequest.title()); + } + } + + for (PollOption existingOption : existingOptions) { + if (requestedLabels.contains(existingOption.getLabel())) continue; + pollOptionRepository.delete(existingOption); + } + } + + return getAdminPollDetail(pollId); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminPollDeleteResponse deletePoll(Long pollId) { + Poll poll = findById(pollId); + List options = pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll); + pollOptionRepository.deleteAll(options); + pollRepository.delete(poll); + return new AdminPollDeleteResponse(true, LocalDateTime.now()); + } + + private void ensureTodayPicks(LocalDate today, int requiredCount) { + List todays = pollRepository.findTodayPicks(PollStatus.PUBLISHED, today, PageRequest.of(0, requiredCount)); + int missingCount = requiredCount - todays.size(); + if (missingCount <= 0) return; + + List candidates = pollRepository.findAutoAssignableTodayPicks( + PollStatus.PUBLISHED, + today, + PageRequest.of(0, missingCount) + ); + for (Poll candidate : candidates) { + candidate.update(null, null, today, null); + } + } +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java b/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java new file mode 100644 index 00000000..f290b147 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/controller/QuizController.java @@ -0,0 +1,38 @@ +package com.swyp.picke.domain.quiz.controller; + +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.service.QuizService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "퀴즈 API", description = "퀴즈 콘텐츠 조회") +@RestController +@RequestMapping("/api/v1/quizzes") +@RequiredArgsConstructor +public class QuizController { + + private final QuizService quizService; + + @Operation(summary = "퀴즈 목록 조회") + @GetMapping + public ApiResponse getQuizzes( + @RequestParam(value = "page", defaultValue = "1") int page, + @RequestParam(value = "size", defaultValue = "10") int size + ) { + return ApiResponse.onSuccess(quizService.getQuizzes(page, size)); + } + + @Operation(summary = "퀴즈 상세 조회") + @GetMapping("/{quizId}") + public ApiResponse getQuizDetail(@PathVariable Long quizId) { + return ApiResponse.onSuccess(quizService.getQuizDetail(quizId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java b/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java new file mode 100644 index 00000000..bdcb8bbd --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/converter/QuizConverter.java @@ -0,0 +1,85 @@ +package com.swyp.picke.domain.quiz.converter; + +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizOptionResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizSimpleResponse; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import java.util.Comparator; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Component; + +@Component +public class QuizConverter { + + private static final Comparator OPTION_SORTER = + Comparator.comparing((QuizOption option) -> option.getDisplayOrder() == null ? Integer.MAX_VALUE : option.getDisplayOrder()) + .thenComparing(option -> option.getLabel() == null ? "" : option.getLabel().name()) + .thenComparing(QuizOption::getId); + + public Quiz toEntity(AdminQuizCreateRequest request) { + return Quiz.builder() + .title(request.title()) + .status(request.status()) + .build(); + } + + public QuizListResponse toListResponse(Page quizPage) { + List items = quizPage.getContent().stream() + .map(this::toSimpleResponse) + .toList(); + return new QuizListResponse(items, quizPage.getNumber() + 1, quizPage.getTotalPages(), quizPage.getTotalElements()); + } + + public QuizSimpleResponse toSimpleResponse(Quiz quiz) { + return new QuizSimpleResponse( + quiz.getId(), + quiz.getTitle(), + quiz.getStatus(), + quiz.getCreatedAt() + ); + } + + public AdminQuizDetailResponse toAdminDetailResponse(Quiz quiz, List options) { + return new AdminQuizDetailResponse( + quiz.getId(), + quiz.getTitle(), + quiz.getTargetDate(), + quiz.getStatus(), + toOptionResponses(options) + ); + } + + public QuizDetailResponse toDetailResponse(Quiz quiz, List options) { + return new QuizDetailResponse( + quiz.getId(), + quiz.getTitle(), + quiz.getTargetDate(), + quiz.getStatus(), + toOptionResponses(options), + quiz.getCreatedAt(), + quiz.getUpdatedAt() + ); + } + + private List toOptionResponses(List options) { + if (options == null) { + return List.of(); + } + return options.stream() + .sorted(OPTION_SORTER) + .map(option -> new QuizOptionResponse( + option.getId(), + option.getLabel(), + option.getText(), + option.getDetailText(), + option.getIsCorrect(), + option.getDisplayOrder() + )) + .toList(); + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java new file mode 100644 index 00000000..c5409dec --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizDetailResponse.java @@ -0,0 +1,17 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +public record QuizDetailResponse( + Long quizId, + String title, + LocalDate targetDate, + QuizStatus status, + List options, + LocalDateTime createdAt, + LocalDateTime updatedAt +) { +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java new file mode 100644 index 00000000..ded527d5 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizListResponse.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import java.util.List; + +public record QuizListResponse( + List items, + int page, + int totalPages, + long totalElements +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java new file mode 100644 index 00000000..5f83007b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizOptionResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; + +public record QuizOptionResponse( + Long optionId, + QuizOptionLabel label, + String text, + String detailText, + Boolean isCorrect, + Integer displayOrder +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java new file mode 100644 index 00000000..85556fc9 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizSimpleResponse.java @@ -0,0 +1,15 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; + +import java.time.LocalDateTime; + +public record QuizSimpleResponse( + Long quizId, + String title, + QuizStatus status, + LocalDateTime createdAt +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java new file mode 100644 index 00000000..b283ca95 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/dto/response/QuizTagResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.quiz.dto.response; + +import com.swyp.picke.domain.tag.enums.TagType; + +public record QuizTagResponse( + Long tagId, + String name, + TagType type +) { +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java b/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java new file mode 100644 index 00000000..aade8606 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/Quiz.java @@ -0,0 +1,65 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Getter +@Entity +@Table(name = "quizzes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Quiz extends BaseEntity { + + @Column(nullable = false, length = 200) + private String title; + + @Column(name = "target_date") + private LocalDate targetDate; + + @Column(name = "total_participants_count", nullable = false) + private Long totalParticipantsCount; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private QuizStatus status; + + @OneToMany(mappedBy = "quiz", cascade = CascadeType.ALL, orphanRemoval = true) + private final List options = new ArrayList<>(); + + @Builder + public Quiz(String title, LocalDate targetDate, QuizStatus status) { + this.title = title; + this.targetDate = targetDate; + this.status = status; + this.totalParticipantsCount = 0L; + } + + public void update(String title, LocalDate targetDate, QuizStatus status) { + if (title != null) this.title = title; + if (targetDate != null) this.targetDate = targetDate; + if (status != null) this.status = status; + } + + public void increaseTotalParticipantsCount() { + this.totalParticipantsCount = (this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount) + 1L; + } + + public void decreaseTotalParticipantsCount() { + long current = this.totalParticipantsCount == null ? 0L : this.totalParticipantsCount; + this.totalParticipantsCount = Math.max(0L, current - 1L); + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java new file mode 100644 index 00000000..85fd73e0 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOption.java @@ -0,0 +1,71 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_options") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizOption extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 10) + private QuizOptionLabel label; + + @Column(nullable = false, length = 300) + private String text; + + @Column(name = "detail_text", length = 1000) + private String detailText; + + @Column(name = "is_correct", nullable = false) + private Boolean isCorrect = false; + + @Column(name = "display_order", nullable = false) + private Integer displayOrder; + + @Builder + public QuizOption( + Quiz quiz, + QuizOptionLabel label, + String text, + String detailText, + Boolean isCorrect, + Integer displayOrder + ) { + this.quiz = quiz; + this.label = label; + this.text = text; + this.detailText = detailText; + this.isCorrect = (isCorrect != null) ? isCorrect : false; + this.displayOrder = displayOrder; + } + + void assignQuiz(Quiz quiz) { + this.quiz = quiz; + } + + public void update(String text, String detailText, Boolean isCorrect) { + if (text != null) this.text = text; + if (detailText != null) this.detailText = detailText; + if (isCorrect != null) this.isCorrect = isCorrect; + if (displayOrder != null) this.displayOrder = displayOrder; + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java new file mode 100644 index 00000000..43e94781 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.tag.entity.ValueTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_option_value_tags") +@IdClass(QuizOptionValueTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizOptionValueTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_option_id", nullable = false) + private QuizOption quizOption; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "value_tag_id", nullable = false) + private ValueTag valueTag; + + @Builder + public QuizOptionValueTagMap(QuizOption quizOption, ValueTag valueTag) { + this.quizOption = quizOption; + this.valueTag = valueTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java new file mode 100644 index 00000000..ce65910d --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizOptionValueTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.quiz.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class QuizOptionValueTagMapId implements Serializable { + private Long quizOption; + private Long valueTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java new file mode 100644 index 00000000..bb19afa4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMap.java @@ -0,0 +1,39 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.tag.entity.CategoryTag; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_tags") +@IdClass(QuizTagMapId.class) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizTagMap { + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "category_tag_id", nullable = false) + private CategoryTag categoryTag; + + @Builder + public QuizTagMap(Quiz quiz, CategoryTag categoryTag) { + this.quiz = quiz; + this.categoryTag = categoryTag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java new file mode 100644 index 00000000..e61597e7 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizTagMapId.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.quiz.entity; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Getter +@NoArgsConstructor +@EqualsAndHashCode +public class QuizTagMapId implements Serializable { + private Long quiz; + private Long categoryTag; +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java new file mode 100644 index 00000000..f159720f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/entity/QuizUserVote.java @@ -0,0 +1,43 @@ +package com.swyp.picke.domain.quiz.entity; + +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "quiz_user_votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class QuizUserVote extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "option_id", nullable = false) + private QuizOption selectedOption; + + @Builder + public QuizUserVote(User user, Quiz quiz, QuizOption selectedOption) { + this.user = user; + this.quiz = quiz; + this.selectedOption = selectedOption; + } + + public void updateOption(QuizOption option) { + this.selectedOption = option; + } +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java new file mode 100644 index 00000000..2eeb5355 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizOptionLabel.java @@ -0,0 +1,6 @@ +package com.swyp.picke.domain.quiz.enums; + +public enum QuizOptionLabel { + A, B, C, D +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java new file mode 100644 index 00000000..a6063700 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/enums/QuizStatus.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.quiz.enums; + +public enum QuizStatus { + PENDING, + PUBLISHED, + ARCHIVED +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java new file mode 100644 index 00000000..f4c3c9b7 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface QuizOptionRepository extends JpaRepository { + List findByQuizOrderByDisplayOrderAscLabelAscIdAsc(Quiz quiz); + Optional findByQuizAndLabel(Quiz quiz, QuizOptionLabel label); +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java new file mode 100644 index 00000000..bacf283b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizOptionValueTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.entity.QuizOptionValueTagMap; +import com.swyp.picke.domain.quiz.entity.QuizOptionValueTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface QuizOptionValueTagMapRepository extends JpaRepository { + List findByQuizOption(QuizOption quizOption); + void deleteByQuizOption(QuizOption quizOption); +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java new file mode 100644 index 00000000..f84f5583 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizRepository.java @@ -0,0 +1,37 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import java.time.LocalDate; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface QuizRepository extends JpaRepository { + Page findAllByOrderByCreatedAtDesc(Pageable pageable); + + @Query("SELECT q FROM Quiz q WHERE q.status = :status AND q.targetDate = :targetDate ORDER BY q.createdAt ASC") + List findTodayPicks( + @Param("status") QuizStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); + + @Query(""" + SELECT q + FROM Quiz q + WHERE q.status = :status + AND (q.targetDate IS NULL OR q.targetDate <> :targetDate) + ORDER BY CASE WHEN q.targetDate IS NULL THEN 0 ELSE 1 END, + q.targetDate ASC, + q.createdAt ASC + """) + List findAutoAssignableTodayPicks( + @Param("status") QuizStatus status, + @Param("targetDate") LocalDate targetDate, + Pageable pageable + ); +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java new file mode 100644 index 00000000..aeb7ebe9 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizTagMapRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizTagMap; +import com.swyp.picke.domain.quiz.entity.QuizTagMapId; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface QuizTagMapRepository extends JpaRepository { + List findByQuiz(Quiz quiz); + void deleteByQuiz(Quiz quiz); +} + diff --git a/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java new file mode 100644 index 00000000..07f26949 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/repository/QuizUserVoteRepository.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.quiz.repository; + +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.entity.QuizUserVote; +import com.swyp.picke.domain.user.entity.User; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface QuizUserVoteRepository extends JpaRepository { + Optional findByQuizAndUser(Quiz quiz, User user); + long countByQuiz(Quiz quiz); + long countByQuizAndSelectedOption(Quiz quiz, QuizOption selectedOption); + List findAllByQuiz(Quiz quiz); +} diff --git a/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java b/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java new file mode 100644 index 00000000..c6d1678f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/service/QuizService.java @@ -0,0 +1,35 @@ +package com.swyp.picke.domain.quiz.service; + +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import java.util.List; + +public interface QuizService { + Quiz findById(Long quizId); + + QuizListResponse getQuizzes(int page, int size); + + List getTodayPicks(int limit); + + List getOptions(Quiz quiz); + + long countVotes(Quiz quiz); + + QuizDetailResponse getQuizDetail(Long quizId); + + AdminQuizDetailResponse getAdminQuizDetail(Long quizId); + + AdminQuizDetailResponse createQuiz(AdminQuizCreateRequest request); + + AdminQuizDetailResponse updateQuiz(Long quizId, AdminQuizUpdateRequest request); + + AdminQuizDeleteResponse deleteQuiz(Long quizId); +} + + diff --git a/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java b/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java new file mode 100644 index 00000000..3ee12e08 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/quiz/service/QuizServiceImpl.java @@ -0,0 +1,189 @@ +package com.swyp.picke.domain.quiz.service; + +import com.swyp.picke.domain.quiz.converter.QuizConverter; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizCreateRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizOptionRequest; +import com.swyp.picke.domain.admin.dto.quiz.request.AdminQuizUpdateRequest; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDeleteResponse; +import com.swyp.picke.domain.admin.dto.quiz.response.AdminQuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizDetailResponse; +import com.swyp.picke.domain.quiz.dto.response.QuizListResponse; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.enums.QuizOptionLabel; +import com.swyp.picke.domain.quiz.enums.QuizStatus; +import com.swyp.picke.domain.quiz.repository.QuizOptionRepository; +import com.swyp.picke.domain.quiz.repository.QuizRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class QuizServiceImpl implements QuizService { + + private final QuizRepository quizRepository; + private final QuizOptionRepository quizOptionRepository; + private final QuizConverter quizConverter; + + @Override + public Quiz findById(Long quizId) { + return quizRepository.findById(quizId) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_NOT_FOUND)); + } + + @Override + public QuizListResponse getQuizzes(int page, int size) { + int pageNumber = Math.max(0, page - 1); + Page quizPage = quizRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(pageNumber, size)); + return quizConverter.toListResponse(quizPage); + } + + @Override + @Transactional + public List getTodayPicks(int limit) { + int safeLimit = Math.max(1, limit); + LocalDate today = LocalDate.now(); + + ensureTodayPicks(today, safeLimit); + return quizRepository.findTodayPicks(QuizStatus.PUBLISHED, today, PageRequest.of(0, safeLimit)); + } + + @Override + public List getOptions(Quiz quiz) { + return quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + } + + @Override + public long countVotes(Quiz quiz) { + return quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); + } + + @Override + public QuizDetailResponse getQuizDetail(Long quizId) { + Quiz quiz = findById(quizId); + List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + return quizConverter.toDetailResponse(quiz, options); + } + + @Override + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDetailResponse getAdminQuizDetail(Long quizId) { + Quiz quiz = findById(quizId); + List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + return quizConverter.toAdminDetailResponse(quiz, options); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDetailResponse createQuiz(AdminQuizCreateRequest request) { + Quiz quiz = quizConverter.toEntity(request); + quiz = quizRepository.save(quiz); + + List savedOptions = new ArrayList<>(); + if (request.options() != null) { + for (AdminQuizOptionRequest optionRequest : request.options()) { + QuizOption option = QuizOption.builder() + .quiz(quiz) + .label(optionRequest.label()) + .text(optionRequest.text()) + .detailText(optionRequest.detailText()) + .isCorrect(optionRequest.isCorrect()) + .build(); + option = quizOptionRepository.save(option); + savedOptions.add(option); + } + } + + return quizConverter.toAdminDetailResponse(quiz, savedOptions); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDetailResponse updateQuiz(Long quizId, AdminQuizUpdateRequest request) { + Quiz quiz = findById(quizId); + quiz.update(request.title(), request.targetDate(), request.status()); + + if (request.options() != null) { + List existingOptions = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + Map existingOptionMap = new HashMap<>(); + for (QuizOption option : existingOptions) { + existingOptionMap.put(option.getLabel(), option); + } + + Set requestedLabels = new HashSet<>(); + for (AdminQuizOptionRequest optionRequest : request.options()) { + requestedLabels.add(optionRequest.label()); + QuizOption option = existingOptionMap.get(optionRequest.label()); + + if (option == null) { + option = QuizOption.builder() + .quiz(quiz) + .label(optionRequest.label()) + .text(optionRequest.text()) + .detailText(optionRequest.detailText()) + .isCorrect(optionRequest.isCorrect()) + .build(); + option = quizOptionRepository.save(option); + } else { + option.update( + optionRequest.text(), + optionRequest.detailText(), + optionRequest.isCorrect() + ); + } + } + + for (QuizOption existingOption : existingOptions) { + if (requestedLabels.contains(existingOption.getLabel())) continue; + quizOptionRepository.delete(existingOption); + } + } + + return getAdminQuizDetail(quizId); + } + + @Override + @Transactional + @PreAuthorize("hasRole('ADMIN')") + public AdminQuizDeleteResponse deleteQuiz(Long quizId) { + Quiz quiz = findById(quizId); + List options = quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz); + quizOptionRepository.deleteAll(options); + quizRepository.delete(quiz); + return new AdminQuizDeleteResponse(true, LocalDateTime.now()); + } + + private void ensureTodayPicks(LocalDate today, int requiredCount) { + List todays = quizRepository.findTodayPicks(QuizStatus.PUBLISHED, today, PageRequest.of(0, requiredCount)); + int missingCount = requiredCount - todays.size(); + if (missingCount <= 0) return; + + List candidates = quizRepository.findAutoAssignableTodayPicks( + QuizStatus.PUBLISHED, + today, + PageRequest.of(0, missingCount) + ); + for (Quiz candidate : candidates) { + candidate.update(null, today, null); + } + } +} + diff --git a/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java b/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java index c05a07c7..45dad51d 100644 --- a/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java +++ b/src/main/java/com/swyp/picke/domain/recommendation/controller/RecommendationController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "추천 (Recommendation)", description = "배틀 추천 API") +@Tag(name = "추천 API", description = "배틀 추천 조회") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -20,7 +20,7 @@ public class RecommendationController { private final RecommendationService recommendationService; - @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀 기반으로 흥미로운 배틀 목록을 추천합니다.") + @Operation(summary = "흥미 기반 배틀 추천 조회", description = "특정 배틀을 기준으로 흥미로운 배틀 목록을 추천합니다.") @GetMapping("/battles/{battleId}/recommendations/interesting") public ApiResponse getInterestingBattles( @PathVariable Long battleId, diff --git a/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java b/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java index 1a37f32f..00d3bb86 100644 --- a/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java +++ b/src/main/java/com/swyp/picke/domain/recommendation/service/RecommendationService.java @@ -13,7 +13,7 @@ import com.swyp.picke.domain.user.service.UserService; import com.swyp.picke.global.infra.s3.enums.FileCategory; import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; @@ -35,7 +35,7 @@ public class RecommendationService { private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; private final BattleOptionTagRepository battleOptionTagRepository; - private final VoteRepository voteRepository; + private final BattleVoteRepository BattleVoteRepository; private final UserService userService; private final ResourceUrlProvider urlProvider; @@ -47,7 +47,7 @@ public RecommendationListResponse getInterestingBattles(Long battleId, Long user PhilosopherType oppositeType = myType.getWorstMatch(); // 현재 유저가 이미 참여한 배틀 ID 목록 (제외 대상) - List excludeBattleIds = voteRepository.findParticipatedBattleIdsByUserId(userId); + List excludeBattleIds = BattleVoteRepository.findParticipatedBattleIdsByUserId(userId); if (excludeBattleIds.isEmpty()) excludeBattleIds = List.of(-1L); List sameTypeUserIds = findUserIdsByPhilosopherType(myType); @@ -56,12 +56,12 @@ public RecommendationListResponse getInterestingBattles(Long battleId, Long user // 같은 유형 유저들이 참여한 배틀 후보 ID List sameCandidateIds = sameTypeUserIds.isEmpty() ? List.of() - : voteRepository.findParticipatedBattleIdsByUserIds(sameTypeUserIds); + : BattleVoteRepository.findParticipatedBattleIdsByUserIds(sameTypeUserIds); // 반대 유형 유저들이 참여한 배틀 후보 ID List oppositeCandidateIds = oppositeTypeUserIds.isEmpty() ? List.of() - : voteRepository.findParticipatedBattleIdsByUserIds(oppositeTypeUserIds); + : BattleVoteRepository.findParticipatedBattleIdsByUserIds(oppositeTypeUserIds); // 인기 점수 기준 배틀 조회 (Score = V*1.0 + C*1.5 + Vw*0.2) // 철학자 유형 로직 미구현 시 인기 배틀로 폴백 @@ -130,4 +130,4 @@ private RecommendationListResponse.Item toItem(Battle battle) { private List findUserIdsByPhilosopherType(PhilosopherType type) { return List.of(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java b/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java index 723be0d9..71a4f239 100644 --- a/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java +++ b/src/main/java/com/swyp/picke/domain/reward/controller/AdMobRewardController.java @@ -8,14 +8,12 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springdoc.core.annotations.ParameterObject; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Slf4j -@Tag(name = "보상 (Reward)", description = "AdMob 광고 보상 관련 API") +@Tag(name = "보상 API", description = "AdMob 광고 보상 관련 API") @RestController @RequestMapping("/api/v1/admob") @RequiredArgsConstructor diff --git a/src/main/java/com/swyp/picke/domain/scenario/service/ScenarioServiceImpl.java b/src/main/java/com/swyp/picke/domain/scenario/service/ScenarioServiceImpl.java index 0b5b9efa..9cba63e6 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/service/ScenarioServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/scenario/service/ScenarioServiceImpl.java @@ -21,8 +21,8 @@ import com.swyp.picke.domain.scenario.enums.CreatorType; import com.swyp.picke.domain.scenario.enums.ScenarioStatus; import com.swyp.picke.domain.scenario.repository.ScenarioRepository; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; import com.swyp.picke.global.infra.s3.service.S3UploadService; @@ -46,7 +46,7 @@ public class ScenarioServiceImpl implements ScenarioService { private final ScenarioRepository scenarioRepository; private final BattleRepository battleRepository; - private final VoteRepository voteRepository; + private final BattleVoteRepository battleVoteRepository; private final ScenarioConverter scenarioConverter; private final ScenarioAudioPipelineService audioPipelineService; private final S3UploadService s3Service; @@ -58,11 +58,11 @@ public UserScenarioResponse getScenarioForUser(Long battleId, Long userId) { Scenario scenario = scenarioRepository.findByBattleIdAndStatus(battleId, ScenarioStatus.PUBLISHED) .orElseThrow(() -> new CustomException(ErrorCode.SCENARIO_NOT_FOUND)); - Optional optionalVote = voteRepository.findByBattleIdAndUserId(battleId, userId); + Optional optionalVote = battleVoteRepository.findByBattleIdAndUserId(battleId, userId); AudioPathType recommendedKey = AudioPathType.COMMON; if (optionalVote.isPresent()) { - Vote vote = optionalVote.get(); + BattleVote vote = optionalVote.get(); if (scenario.getIsInteractive()) { if (vote.getPreVoteOption().getLabel().name().equalsIgnoreCase("A")) { recommendedKey = AudioPathType.PATH_A; @@ -333,4 +333,4 @@ private Map createSpeakerMap(Battle battle) { return map; } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java b/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java index d3fef5da..9cec0289 100644 --- a/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java +++ b/src/main/java/com/swyp/picke/domain/search/dto/response/SearchBattleListResponse.java @@ -1,7 +1,6 @@ package com.swyp.picke.domain.search.dto.response; import com.swyp.picke.domain.battle.dto.response.BattleTagResponse; -import com.swyp.picke.domain.battle.enums.BattleType; import java.util.List; @@ -14,7 +13,6 @@ public record SearchBattleListResponse( public record SearchBattleItem( Long battleId, String thumbnailUrl, - BattleType type, String title, String summary, List tags, diff --git a/src/main/java/com/swyp/picke/domain/search/service/SearchService.java b/src/main/java/com/swyp/picke/domain/search/service/SearchService.java index 3d66a5b1..b309fbe7 100644 --- a/src/main/java/com/swyp/picke/domain/search/service/SearchService.java +++ b/src/main/java/com/swyp/picke/domain/search/service/SearchService.java @@ -58,7 +58,6 @@ public SearchBattleListResponse searchBattles(String category, SearchSortType so .map(battle -> new SearchBattleListResponse.SearchBattleItem( battle.getId(), urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()), - battle.getType(), battle.getTitle(), battle.getSummary(), tagMap.getOrDefault(battle.getId(), List.of()), diff --git a/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java b/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java index 094f8982..12a96ce9 100644 --- a/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java +++ b/src/main/java/com/swyp/picke/domain/tag/controller/TagController.java @@ -1,19 +1,19 @@ package com.swyp.picke.domain.tag.controller; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.*; +import com.swyp.picke.domain.tag.dto.response.TagListResponse; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.service.TagService; import com.swyp.picke.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -@Tag(name = "태그 (Tag)", description = "태그 조회 및 관리 API") +@Tag(name = "태그 API", description = "태그 조회") @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") @@ -21,46 +21,13 @@ public class TagController { private final TagService tagService; - @Operation(summary = "태그 목록 조회", description = "전체 태그 목록을 조회합니다. 특정 타입(type)을 지정하여 필터링할 수 있습니다.") + @Operation(summary = "태그 목록 조회") @GetMapping("/tags") public ApiResponse getTags( - @Parameter(description = "필터링할 태그 타입 (예: BATTLE 등)", required = false) + @Parameter(description = "태그 타입 필터(선택)", required = false) @RequestParam(name = "type", required = false) TagType type) { TagListResponse response = tagService.getTags(type); return ApiResponse.onSuccess(response); } - - @Operation(summary = "태그 생성 (관리자)", description = "관리자가 새로운 태그를 생성합니다.") - @PreAuthorize("hasRole('ADMIN')") - @PostMapping("/admin/tags") - public ApiResponse createTag( - @Valid @RequestBody TagRequest request) { - - TagResponse response = tagService.createTag(request); - return ApiResponse.onSuccess(response); - } - - @Operation(summary = "태그 수정 (관리자)", description = "관리자가 기존 태그의 이름이나 정보를 수정합니다.") - @PreAuthorize("hasRole('ADMIN')") - @PatchMapping("/admin/tags/{tag_id}") - public ApiResponse updateTag( - @Parameter(description = "수정할 태그의 ID", example = "1") - @PathVariable("tag_id") Long tagId, - @Valid @RequestBody TagRequest request) { - - TagResponse response = tagService.updateTag(tagId, request); - return ApiResponse.onSuccess(response); - } - - @Operation(summary = "태그 삭제 (관리자)", description = "관리자가 특정 태그를 삭제합니다. 단, 배틀에 사용 중인 태그는 삭제할 수 없습니다.") - @PreAuthorize("hasRole('ADMIN')") - @DeleteMapping("/admin/tags/{tag_id}") - public ApiResponse deleteTag( - @Parameter(description = "삭제할 태그의 ID", example = "1") - @PathVariable("tag_id") Long tagId) { - - TagDeleteResponse response = tagService.deleteTag(tagId); - return ApiResponse.onSuccess(response); - } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java b/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java index b3860d45..26382626 100644 --- a/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java +++ b/src/main/java/com/swyp/picke/domain/tag/converter/TagConverter.java @@ -1,7 +1,9 @@ package com.swyp.picke.domain.tag.converter; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.*; +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; +import com.swyp.picke.domain.tag.dto.response.TagListResponse; import com.swyp.picke.domain.tag.entity.Tag; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java index 5e258e8d..6bf53599 100644 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java +++ b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagListResponse.java @@ -1,5 +1,6 @@ package com.swyp.picke.domain.tag.dto.response; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; import java.util.List; public record TagListResponse( diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java new file mode 100644 index 00000000..41b4561a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/entity/CategoryTag.java @@ -0,0 +1,35 @@ +package com.swyp.picke.domain.tag.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "category_tags") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class CategoryTag { + + @Id + @Column(name = "tag_id") + private Long tagId; + + @OneToOne(fetch = FetchType.LAZY, optional = false) + @MapsId + @JoinColumn(name = "tag_id", nullable = false) + private Tag tag; + + @Builder + public CategoryTag(Tag tag) { + this.tag = tag; + } +} diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java new file mode 100644 index 00000000..ba54480b --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/entity/PhilosopherTag.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.tag.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "philosopher_tags") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PhilosopherTag { + + @Id + @Column(name = "tag_id") + private Long tagId; + + @OneToOne(fetch = FetchType.LAZY, optional = false) + @MapsId + @JoinColumn(name = "tag_id", nullable = false) + private Tag tag; + + @Builder + public PhilosopherTag(Tag tag) { + this.tag = tag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java b/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java new file mode 100644 index 00000000..6c9c0303 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/entity/ValueTag.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.tag.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "value_tags") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ValueTag { + + @Id + @Column(name = "tag_id") + private Long tagId; + + @OneToOne(fetch = FetchType.LAZY, optional = false) + @MapsId + @JoinColumn(name = "tag_id", nullable = false) + private Tag tag; + + @Builder + public ValueTag(Tag tag) { + this.tag = tag; + } +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java new file mode 100644 index 00000000..9d71ad27 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/repository/CategoryTagRepository.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.repository; + +import com.swyp.picke.domain.tag.entity.CategoryTag; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CategoryTagRepository extends JpaRepository { +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java new file mode 100644 index 00000000..fdca62b4 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/repository/PhilosopherTagRepository.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.repository; + +import com.swyp.picke.domain.tag.entity.PhilosopherTag; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PhilosopherTagRepository extends JpaRepository { +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java new file mode 100644 index 00000000..f731d490 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/repository/ValueTagRepository.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.repository; + +import com.swyp.picke.domain.tag.entity.ValueTag; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ValueTagRepository extends JpaRepository { +} + diff --git a/src/main/java/com/swyp/picke/domain/tag/service/TagService.java b/src/main/java/com/swyp/picke/domain/tag/service/TagService.java index 97ceca46..2074a1e8 100644 --- a/src/main/java/com/swyp/picke/domain/tag/service/TagService.java +++ b/src/main/java/com/swyp/picke/domain/tag/service/TagService.java @@ -1,9 +1,9 @@ package com.swyp.picke.domain.tag.service; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; import com.swyp.picke.domain.tag.dto.response.TagListResponse; -import com.swyp.picke.domain.tag.dto.response.TagResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; @@ -11,7 +11,6 @@ public interface TagService { List findByBattleId(Long battleId); - TagListResponse getTags(TagType type); TagResponse createTag(TagRequest request); TagResponse updateTag(Long tagId, TagRequest request); diff --git a/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java b/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java index d1bf3b96..a9df9a47 100644 --- a/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/tag/service/TagServiceImpl.java @@ -1,11 +1,14 @@ package com.swyp.picke.domain.tag.service; import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.battle.repository.BattleOptionTagRepository; import com.swyp.picke.domain.battle.repository.BattleRepository; import com.swyp.picke.domain.battle.repository.BattleTagRepository; import com.swyp.picke.domain.tag.converter.TagConverter; -import com.swyp.picke.domain.tag.dto.request.TagRequest; -import com.swyp.picke.domain.tag.dto.response.*; +import com.swyp.picke.domain.admin.dto.tag.request.TagRequest; +import com.swyp.picke.domain.admin.dto.tag.response.TagDeleteResponse; +import com.swyp.picke.domain.admin.dto.tag.response.TagResponse; +import com.swyp.picke.domain.tag.dto.response.TagListResponse; import com.swyp.picke.domain.tag.entity.Tag; import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.tag.repository.TagRepository; @@ -25,6 +28,7 @@ public class TagServiceImpl implements TagService { private final TagRepository tagRepository; private final BattleTagRepository battleTagRepository; + private final BattleOptionTagRepository battleOptionTagRepository; private final BattleRepository battleRepository; @Override @@ -62,11 +66,16 @@ public TagResponse createTag(TagRequest request) { @PreAuthorize("hasRole('ADMIN')") public TagResponse updateTag(Long tagId, TagRequest request) { Tag tag = findTagById(tagId); + boolean typeChanged = tag.getType() != request.type(); if (!tag.getName().equals(request.name()) || tag.getType() != request.type()) { validateDuplicateTag(request.name(), request.type()); } + if (typeChanged && isTagInUse(tag)) { + throw new CustomException(ErrorCode.TAG_IN_USE); + } + tag.updateTag(request.name(), request.type()); return TagConverter.toDetailResponse(tag); } @@ -77,7 +86,7 @@ public TagResponse updateTag(Long tagId, TagRequest request) { public TagDeleteResponse deleteTag(Long tagId) { Tag tag = findTagById(tagId); - if (battleTagRepository.existsByTag(tag)) { + if (isTagInUse(tag)) { throw new CustomException(ErrorCode.TAG_IN_USE); } @@ -95,4 +104,8 @@ private void validateDuplicateTag(String name, TagType type) { throw new CustomException(ErrorCode.TAG_DUPLICATED); } } -} \ No newline at end of file + + private boolean isTagInUse(Tag tag) { + return battleTagRepository.existsByTag(tag) || battleOptionTagRepository.existsByTag(tag); + } +} diff --git a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java deleted file mode 100644 index c937631e..00000000 --- a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.swyp.picke.domain.test.controller; - -import com.swyp.picke.domain.oauth.jwt.JwtProvider; -import com.swyp.picke.global.common.response.ApiResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/api/test") -@RequiredArgsConstructor -public class TestController { - - private final JwtProvider jwtProvider; - - @GetMapping("/response") - public ApiResponse> testResponse() { - List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); - return ApiResponse.onSuccess(teamMembers); - } - - @GetMapping("/token") - public ApiResponse> getTestToken( - @RequestParam(defaultValue = "1") Long userId - ) { - String token = jwtProvider.createAccessToken(userId, "USER"); - return ApiResponse.onSuccess(Map.of("accessToken", token)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/user/service/MypageService.java b/src/main/java/com/swyp/picke/domain/user/service/MypageService.java index 2650044d..6f24521c 100644 --- a/src/main/java/com/swyp/picke/domain/user/service/MypageService.java +++ b/src/main/java/com/swyp/picke/domain/user/service/MypageService.java @@ -18,7 +18,7 @@ import com.swyp.picke.domain.user.entity.UserProfile; import com.swyp.picke.domain.user.entity.UserSettings; import com.swyp.picke.domain.user.enums.VoteSide; -import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.entity.BattleVote; import com.swyp.picke.domain.vote.service.VoteQueryService; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; @@ -142,29 +142,29 @@ public BattleRecordListResponse getBattleRecords(Integer offset, Integer size, V BattleOptionLabel label = voteSide != null ? toOptionLabel(voteSide) : null; - List votes = voteQueryService.findUserVotes(user.getId(), pageOffset, pageSize, label); + List votes = voteQueryService.findUserVotes(user.getId(), pageOffset, pageSize, label); long totalCount = voteQueryService.countUserVotes(user.getId(), label); List battleIds = votes.stream().map(v -> v.getBattle().getId()).toList(); - Map categoryMap = battleQueryService.getCategoryNamesByBattleIds(battleIds); // 추가 필요 + Map categoryMap = battleQueryService.getCategoryNamesByBattleIds(battleIds); // 배틀별 카테고리명 조회 List items = votes.stream() - .map(vote -> { - Battle battle = vote.getBattle(); - BattleOption selectedOption = vote.getPostVoteOption() != null - ? vote.getPostVoteOption() : vote.getPreVoteOption(); + .map(BattleVote -> { + Battle battle = BattleVote.getBattle(); + BattleOption selectedOption = BattleVote.getPostVoteOption() != null + ? BattleVote.getPostVoteOption() : BattleVote.getPreVoteOption(); VoteSide side = selectedOption.getLabel() == BattleOptionLabel.A ? VoteSide.PRO : VoteSide.CON; String category = categoryMap.get(battle.getId()); return new BattleRecordListResponse.BattleRecordItem( battle.getId().toString(), - vote.getId().toString(), + BattleVote.getId().toString(), side, category, battle.getTitle(), battle.getSummary(), - vote.getCreatedAt() + BattleVote.getCreatedAt() ); }) .toList(); @@ -360,3 +360,6 @@ private String resolveCharacterImageUrl(String characterType) { return s3PresignedUrlService.generatePresignedUrl(imageKey); } } + + + diff --git a/src/main/java/com/swyp/picke/domain/user/service/UserService.java b/src/main/java/com/swyp/picke/domain/user/service/UserService.java index b87beb08..0e735100 100644 --- a/src/main/java/com/swyp/picke/domain/user/service/UserService.java +++ b/src/main/java/com/swyp/picke/domain/user/service/UserService.java @@ -74,7 +74,7 @@ public PhilosopherType getPhilosopherType(Long userId) { return PhilosopherType.SOCRATES; } - List optionIds = voteQueryService.findFirstNBattleIds(userId, PHILOSOPHER_CALC_THRESHOLD); + List optionIds = voteQueryService.findFirstNVotedOptionIds(userId, PHILOSOPHER_CALC_THRESHOLD); return battleQueryService.getTopPhilosopherTagNameFromOptions(optionIds) .map(PhilosopherType::fromLabel) .map(type -> { @@ -124,4 +124,4 @@ public UserTendencyScore findUserTendencyScore(Long userId) { return userTendencyScoreRepository.findByUserId(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java b/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java index bf9ee7ae..0c864ca1 100644 --- a/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java +++ b/src/main/java/com/swyp/picke/domain/vote/controller/VoteController.java @@ -1,35 +1,47 @@ package com.swyp.picke.domain.vote.controller; +import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; import com.swyp.picke.domain.vote.dto.request.VoteRequest; -import com.swyp.picke.domain.vote.dto.response.*; +import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; +import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; +import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; +import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; +import com.swyp.picke.domain.vote.service.BattleVoteService; +import com.swyp.picke.domain.vote.service.PollVoteService; import com.swyp.picke.domain.vote.service.QuizVoteService; -import com.swyp.picke.domain.vote.service.VoteService; import com.swyp.picke.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -@Tag(name = "투표 (Vote)", description = "사전/사후 투표 실행 및 통계, 내 투표 내역 조회 API") +@Tag(name = "투표 API", description = "배틀/퀴즈/투표 투표 처리") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor public class VoteController { - // 배틀(BATTLE) 전용 서비스 - private final VoteService voteService; - // 퀴즈(QUIZ) & 투표(POLL) 전용 서비스 + private final BattleVoteService battleVoteService; private final QuizVoteService quizVoteService; + private final PollVoteService pollVoteService; - @Operation(summary = "[퀴즈] 선택 제출") + @Operation(summary = "[퀴즈] 답안 제출") @PostMapping("/battles/{battleId}/quiz-vote") public ApiResponse submitQuiz( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody QuizVoteRequest request) { + @RequestBody QuizVoteRequest request + ) { return ApiResponse.onSuccess(quizVoteService.submitQuiz(battleId, userId, request)); } @@ -38,15 +50,17 @@ public ApiResponse submitQuiz( public ApiResponse submitPoll( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody QuizVoteRequest request) { - return ApiResponse.onSuccess(quizVoteService.submitPoll(battleId, userId, request)); + @RequestBody PollVoteRequest request + ) { + return ApiResponse.onSuccess(pollVoteService.submitPoll(battleId, userId, request)); } @Operation(summary = "[퀴즈] 내 퀴즈 참여 내역 조회", description = "내가 선택한 퀴즈 옵션과 통계를 조회합니다.") @GetMapping("/battles/{battleId}/quiz-vote/me") public ApiResponse getMyQuizVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { + @AuthenticationPrincipal Long userId + ) { return ApiResponse.onSuccess(quizVoteService.getMyQuizVote(battleId, userId)); } @@ -54,19 +68,19 @@ public ApiResponse getMyQuizVote( @GetMapping("/battles/{battleId}/poll-vote/me") public ApiResponse getMyPollVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { - return ApiResponse.onSuccess(quizVoteService.getMyPollVote(battleId, userId)); + @AuthenticationPrincipal Long userId + ) { + return ApiResponse.onSuccess(pollVoteService.getMyPollVote(battleId, userId)); } - // 2. 배틀(BATTLE) 관련 API - @Operation(summary = "[배틀] 사전 투표 실행", description = "배틀 진입 시 첫 투표(사전 투표)를 진행합니다.") @PostMapping("/battles/{battleId}/votes/pre") public ApiResponse preVote( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody VoteRequest request) { - return ApiResponse.onSuccess(voteService.preVote(battleId, userId, request)); + @RequestBody VoteRequest request + ) { + return ApiResponse.onSuccess(battleVoteService.preVote(battleId, userId, request)); } @Operation(summary = "[배틀] 사후 투표 실행", description = "콘텐츠 소비 후 최종 투표(사후 투표)를 진행합니다.") @@ -74,46 +88,57 @@ public ApiResponse preVote( public ApiResponse postVote( @PathVariable Long battleId, @AuthenticationPrincipal Long userId, - @RequestBody VoteRequest request) { - return ApiResponse.onSuccess(voteService.postVote(battleId, userId, request)); + @RequestBody VoteRequest request + ) { + return ApiResponse.onSuccess(battleVoteService.postVote(battleId, userId, request)); } @Operation(summary = "[배틀] 투표 통계 조회", description = "특정 배틀의 옵션별 투표 수와 비율을 조회합니다.") @GetMapping("/battles/{battleId}/vote-stats") public ApiResponse getVoteStats(@PathVariable Long battleId) { - return ApiResponse.onSuccess(voteService.getVoteStats(battleId)); + return ApiResponse.onSuccess(battleVoteService.getVoteStats(battleId)); } @Operation(summary = "[배틀] 내 투표 내역 조회", description = "특정 배틀에 대한 내 사전/사후 투표 내역과 현재 상태를 조회합니다.") @GetMapping("/battles/{battleId}/votes/me") public ApiResponse getMyVote( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { - return ApiResponse.onSuccess(voteService.getMyVote(battleId, userId)); + @AuthenticationPrincipal Long userId + ) { + return ApiResponse.onSuccess(battleVoteService.getMyVote(battleId, userId)); } @Operation(summary = "[배틀] 오디오(TTS) 청취 완료 처리", description = "사전 투표 후, 오디오 재생이 완료되었을 때 호출하여 상태를 업데이트합니다.") @PostMapping("/battles/{battleId}/votes/tts-complete") public ApiResponse completeTts( @PathVariable Long battleId, - @AuthenticationPrincipal Long userId) { - voteService.completeTts(battleId, userId); + @AuthenticationPrincipal Long userId + ) { + battleVoteService.completeTts(battleId, userId); return ApiResponse.onSuccess(null); } - @Operation(summary = "[관리자] 배틀 투표 삭제") + @Operation(summary = "[관리자] 배틀 투표 기록 삭제") @DeleteMapping("/admin/votes/battle/{battleId}") @PreAuthorize("hasRole('ADMIN')") public ApiResponse deleteBattleVote(@PathVariable Long battleId) { - voteService.deleteVotesByBattleId(battleId); + battleVoteService.deleteVotesByBattleId(battleId); return ApiResponse.onSuccess(null); } - @Operation(summary = "[관리자] 퀴즈/일반투표 기록 삭제") - @DeleteMapping("/admin/votes/quiz-poll/{battleId}") + @Operation(summary = "[관리자] 퀴즈 투표 기록 삭제") + @DeleteMapping("/admin/votes/quiz/{battleId}") @PreAuthorize("hasRole('ADMIN')") - public ApiResponse deleteQuizPollVote(@PathVariable Long battleId) { + public ApiResponse deleteQuizVote(@PathVariable Long battleId) { quizVoteService.deleteQuizVoteByBattleId(battleId); return ApiResponse.onSuccess(null); } + + @Operation(summary = "[관리자] 투표 콘텐츠 투표 기록 삭제") + @DeleteMapping("/admin/votes/poll/{battleId}") + @PreAuthorize("hasRole('ADMIN')") + public ApiResponse deletePollVote(@PathVariable Long battleId) { + pollVoteService.deletePollVoteByBattleId(battleId); + return ApiResponse.onSuccess(null); + } } diff --git a/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java b/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java index 4c4b741f..23e0b340 100644 --- a/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java +++ b/src/main/java/com/swyp/picke/domain/vote/converter/VoteConverter.java @@ -5,20 +5,17 @@ import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.Vote; - +import com.swyp.picke.domain.vote.entity.BattleVote; import java.time.LocalDateTime; import java.util.List; public class VoteConverter { - // [수정] UserBattleStep을 인자로 받도록 변경 - public static VoteResultResponse toVoteResultResponse(Vote vote, UserBattleStep step) { + public static VoteResultResponse toVoteResultResponse(BattleVote vote, UserBattleStep step) { return new VoteResultResponse(vote.getId(), step); } - // [수정] UserBattleStep을 인자로 받아 MyVoteResponse의 status 필드에 매핑 - public static MyVoteResponse toMyVoteResponse(Vote vote, UserBattleStep step) { + public static MyVoteResponse toMyVoteResponse(BattleVote vote, UserBattleStep step) { boolean opinionChanged = vote.getPreVoteOption() != null && vote.getPostVoteOption() != null && !vote.getPreVoteOption().getId().equals(vote.getPostVoteOption().getId()); @@ -27,19 +24,23 @@ public static MyVoteResponse toMyVoteResponse(Vote vote, UserBattleStep step) { vote.getBattle().getTitle(), toOptionInfo(vote.getPreVoteOption()), toOptionInfo(vote.getPostVoteOption()), - step, // 외부에서 넘겨받은 UserBattleStep 사용 + step, opinionChanged ); } - // 투표 통계 변환 - public static VoteStatsResponse toVoteStatsResponse(List stats, long totalCount, LocalDateTime updatedAt) { + public static VoteStatsResponse toVoteStatsResponse( + List stats, + long totalCount, + LocalDateTime updatedAt + ) { return new VoteStatsResponse(stats, totalCount, updatedAt); } - // 옵션 정보를 응답용으로 변환 (null 안전 처리) private static MyVoteResponse.OptionInfo toOptionInfo(BattleOption option) { - if (option == null) return null; + if (option == null) { + return null; + } return new MyVoteResponse.OptionInfo(option.getId(), option.getLabel().name(), option.getTitle()); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java b/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java new file mode 100644 index 00000000..1a37a99a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/dto/request/PollVoteRequest.java @@ -0,0 +1,7 @@ +package com.swyp.picke.domain.vote.dto.request; + +public record PollVoteRequest( + Long optionId +) {} + + diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java b/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java index 7ff37c42..212547fa 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/request/QuizVoteRequest.java @@ -2,4 +2,4 @@ public record QuizVoteRequest( Long optionId -) {} +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java b/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java index 6a41eb6d..0dd199d8 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/response/MyVoteResponse.java @@ -10,4 +10,4 @@ public record MyVoteResponse( boolean opinionChanged ) { public record OptionInfo(Long optionId, String label, String title) {} -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java b/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java index 3c508760..4303b5dc 100644 --- a/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java +++ b/src/main/java/com/swyp/picke/domain/vote/dto/response/PollVoteResponse.java @@ -9,4 +9,4 @@ public record PollVoteResponse( List stats ) { public record OptionStat(Long optionId, String label, String title, long voteCount, double ratio) {} -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java b/src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java similarity index 77% rename from src/main/java/com/swyp/picke/domain/vote/entity/Vote.java rename to src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java index 47054b65..60d040f3 100644 --- a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java +++ b/src/main/java/com/swyp/picke/domain/vote/entity/BattleVote.java @@ -19,7 +19,7 @@ @Entity @Table(name = "votes") @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Vote extends BaseEntity { +public class BattleVote extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id", nullable = false) @@ -41,7 +41,7 @@ public class Vote extends BaseEntity { private Boolean isTtsListened = false; @Builder - private Vote(User user, Battle battle, BattleOption preVoteOption, + private BattleVote(User user, Battle battle, BattleOption preVoteOption, BattleOption postVoteOption, Boolean isTtsListened) { this.user = user; this.battle = battle; @@ -50,38 +50,26 @@ private Vote(User user, Battle battle, BattleOption preVoteOption, this.isTtsListened = isTtsListened != null ? isTtsListened : false; } - /** - * 최초 투표(사전 투표) 시 사용하는 정적 팩토리 메서드 - */ - public static Vote createPreVote(User user, Battle battle, BattleOption option) { - return Vote.builder() + public static BattleVote createPreVote(User user, Battle battle, BattleOption option) { + return BattleVote.builder() .user(user) .battle(battle) .preVoteOption(option) .isTtsListened(false) - // status 설정 삭제됨 .build(); } - /** - * 사전 투표 옵션 수정 메서드 - */ public void updatePreVote(BattleOption preVoteOption) { this.preVoteOption = preVoteOption; } - /** - * 사후 투표 업데이트 - */ public void doPostVote(BattleOption postOption) { this.postVoteOption = postOption; - // status 업데이트 삭제됨 } - /** - * TTS 청취 상태 업데이트 - */ public void completeTts() { this.isTtsListened = true; } -} \ No newline at end of file +} + + diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java b/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java new file mode 100644 index 00000000..7f650b2e --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/entity/PollVote.java @@ -0,0 +1,45 @@ +package com.swyp.picke.domain.vote.entity; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "poll_user_votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PollVote extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "poll_id", nullable = false) + private Poll poll; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "option_id", nullable = false) + private PollOption selectedOption; + + @Builder + public PollVote(User user, Poll poll, PollOption selectedOption) { + this.user = user; + this.poll = poll; + this.selectedOption = selectedOption; + } + + public void updateOption(PollOption option) { + this.selectedOption = option; + } +} diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java b/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java index 7bc13514..bb6c4a7a 100644 --- a/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java +++ b/src/main/java/com/swyp/picke/domain/vote/entity/QuizVote.java @@ -1,10 +1,14 @@ package com.swyp.picke.domain.vote.entity; -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -12,7 +16,7 @@ @Getter @Entity -@Table(name = "quiz_votes") +@Table(name = "quiz_user_votes") @NoArgsConstructor(access = AccessLevel.PROTECTED) public class QuizVote extends BaseEntity { @@ -21,21 +25,21 @@ public class QuizVote extends BaseEntity { private User user; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "battle_id", nullable = false) - private Battle battle; + @JoinColumn(name = "quiz_id", nullable = false) + private Quiz quiz; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "option_id", nullable = false) - private BattleOption selectedOption; + private QuizOption selectedOption; @Builder - public QuizVote(User user, Battle battle, BattleOption selectedOption) { + public QuizVote(User user, Quiz quiz, QuizOption selectedOption) { this.user = user; - this.battle = battle; + this.quiz = quiz; this.selectedOption = selectedOption; } - public void updateOption(BattleOption option) { + public void updateOption(QuizOption option) { this.selectedOption = option; } } diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java similarity index 51% rename from src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java rename to src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java index 4159beb1..2e98f96c 100644 --- a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java +++ b/src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java @@ -4,7 +4,7 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.entity.BattleVote; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -13,57 +13,57 @@ import java.util.List; import java.util.Optional; -public interface VoteRepository extends JpaRepository { +public interface BattleVoteRepository extends JpaRepository { - List findAllByBattle(Battle battle); + List findAllByBattle(Battle battle); - Optional findByBattleIdAndUserId(Long battleId, Long userId); + Optional findByBattleIdAndUserId(Long battleId, Long userId); - @Query("SELECT v FROM Vote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") - Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); + @Query("SELECT v FROM BattleVote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") + Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); - Optional findByBattleAndUser(Battle battle, User user); + Optional findByBattleAndUser(Battle battle, User user); long countByBattle(Battle battle); long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); - Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); + Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + "WHERE v.user.id = :userId ORDER BY v.createdAt DESC") - List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); + List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + "WHERE v.user.id = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") - List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( + List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); long countByUserId(Long userId); - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") + @Query("SELECT COUNT(v) FROM BattleVote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId " + + @Query("SELECT COUNT(v) FROM BattleVote v WHERE v.user.id = :userId " + "AND v.postVoteOption IS NOT NULL " + "AND v.preVoteOption <> v.postVoteOption") long countOpinionChangesByUserId(@Param("userId") Long userId); - List findByUserId(Long userId); + List findByUserId(Long userId); // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) - @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") - List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); + @Query("SELECT v FROM BattleVote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") + List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); // 추천용: 유저가 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id = :userId") + @Query("SELECT v.battle.id FROM BattleVote v WHERE v.user.id = :userId") List findParticipatedBattleIdsByUserId(@Param("userId") Long userId); // 추천용: 특정 배틀에 참여한 유저 ID 조회 - @Query("SELECT DISTINCT v.user.id FROM Vote v WHERE v.battle.id IN :battleIds") + @Query("SELECT DISTINCT v.user.id FROM BattleVote v WHERE v.battle.id IN :battleIds") List findUserIdsByBattleIds(@Param("battleIds") List battleIds); // 추천용: 특정 유저들이 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id IN :userIds") + @Query("SELECT v.battle.id FROM BattleVote v WHERE v.user.id IN :userIds") List findParticipatedBattleIdsByUserIds(@Param("userIds") List userIds); -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java new file mode 100644 index 00000000..814fc16f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/repository/PollVoteRepository.java @@ -0,0 +1,14 @@ +package com.swyp.picke.domain.vote.repository; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.vote.entity.PollVote; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PollVoteRepository extends JpaRepository { + Optional findByPollAndUser(Poll poll, User user); + long countByPoll(Poll poll); + List findAllByPoll(Poll poll); +} diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java index 060f2938..5cfd4064 100644 --- a/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java +++ b/src/main/java/com/swyp/picke/domain/vote/repository/QuizVoteRepository.java @@ -1,15 +1,15 @@ package com.swyp.picke.domain.vote.repository; -import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.vote.entity.QuizVote; -import org.springframework.data.jpa.repository.JpaRepository; - import java.util.List; import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; public interface QuizVoteRepository extends JpaRepository { - Optional findByBattleAndUser(Battle battle, User user); - long countByBattle(Battle battle); - List findAllByBattle(Battle battle); + Optional findByQuizAndUser(Quiz quiz, User user); + List findAllByQuiz(Quiz quiz); + long countByQuizAndSelectedOption(Quiz quiz, QuizOption selectedOption); } diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java similarity index 95% rename from src/main/java/com/swyp/picke/domain/vote/service/VoteService.java rename to src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java index 77d68fe6..6fac6bbf 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteService.java @@ -6,7 +6,7 @@ import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -public interface VoteService { +public interface BattleVoteService { BattleOption findPreVoteOption(Long battleId, Long userId); Long findPostVoteOptionId(Long battleId, Long userId); VoteStatsResponse getVoteStats(Long battleId); diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java similarity index 70% rename from src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java rename to src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java index 32a2d956..74342d90 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/BattleVoteServiceImpl.java @@ -14,24 +14,23 @@ import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; +import java.time.LocalDateTime; +import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class VoteServiceImpl implements VoteService { +public class BattleVoteServiceImpl implements BattleVoteService { - private final VoteRepository voteRepository; + private final BattleVoteRepository battleVoteRepository; private final BattleService battleService; private final BattleOptionRepository battleOptionRepository; private final UserRepository userRepository; @@ -43,7 +42,7 @@ public BattleOption findPreVoteOption(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); if (vote.getPreVoteOption() == null) { @@ -54,7 +53,7 @@ public BattleOption findPreVoteOption(Long battleId, Long userId) { @Override public Long findPostVoteOptionId(Long battleId, Long userId) { - return voteRepository.findByBattleIdAndUserId(battleId, userId) + return battleVoteRepository.findByBattleIdAndUserId(battleId, userId) .map(vote -> vote.getPostVoteOption() != null ? vote.getPostVoteOption().getId() : null) .orElse(null); } @@ -63,21 +62,26 @@ public Long findPostVoteOptionId(Long battleId, Long userId) { public VoteStatsResponse getVoteStats(Long battleId) { Battle battle = battleService.findById(battleId); List options = battleOptionRepository.findByBattle(battle); - long totalCount = voteRepository.countByBattle(battle); + long totalCount = battleVoteRepository.countByBattle(battle); List stats = options.stream() .map(option -> { - long count = voteRepository.countByBattleAndPreVoteOption(battle, option); + long count = battleVoteRepository.countByBattleAndPreVoteOption(battle, option); double ratio = totalCount > 0 ? Math.round((double) count / totalCount * 1000.0) / 10.0 : 0.0; return new VoteStatsResponse.OptionStat( - option.getId(), option.getLabel().name(), option.getTitle(), count, ratio); + option.getId(), + option.getLabel().name(), + option.getTitle(), + count, + ratio + ); }) .toList(); - LocalDateTime updatedAt = voteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) - .map(Vote::getUpdatedAt) + LocalDateTime updatedAt = battleVoteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) + .map(BattleVote::getUpdatedAt) .orElse(null); return VoteConverter.toVoteStatsResponse(stats, totalCount, updatedAt); @@ -89,7 +93,7 @@ public MyVoteResponse getMyVote(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); @@ -99,37 +103,32 @@ public MyVoteResponse getMyVote(Long battleId, Long userId) { @Override @Transactional public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request) { - // 1. 기본 정보 조회 (배틀, 유저, 선택한 옵션) Battle battle = battleService.findById(battleId); User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - // 2. 기존 투표 여부 확인 (에러 대신 Optional로 받음) - Optional existingVote = voteRepository.findByBattleAndUser(battle, user); - Vote vote; + Optional existingVote = battleVoteRepository.findByBattleAndUser(battle, user); + BattleVote vote; if (existingVote.isPresent()) { vote = existingVote.get(); vote.updatePreVote(option); } else { - vote = Vote.createPreVote(user, battle, option); - voteRepository.save(vote); + vote = BattleVote.createPreVote(user, battle, option); + battleVoteRepository.save(vote); battle.addParticipant(); } - // 3. 현재 유저의 진행 단계 확인 UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - - // 4. 단계 업데이트 (처음 참여하는 경우에만 단계를 PRE_VOTE로 변경) - // 이미 POST_VOTE나 COMPLETED라면 단계를 강제로 낮추지 않음 if (status.step() == UserBattleStep.NONE) { userBattleService.upsertStep(user, battle, UserBattleStep.PRE_VOTE); } - // 5. 현재 유지 중인 단계를 반환 (수정 후에도 COMPLETED 유지 가능) - UserBattleStep currentStep = (status.step() == UserBattleStep.NONE) ? UserBattleStep.PRE_VOTE : status.step(); + UserBattleStep currentStep = status.step() == UserBattleStep.NONE + ? UserBattleStep.PRE_VOTE + : status.step(); return new VoteResultResponse(vote.getId(), currentStep); } @@ -142,19 +141,15 @@ public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest reque BattleOption option = battleOptionRepository.findById(request.optionId()) .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - // [검증] 사전 투표를 완료한 상태(혹은 오디오 청취 완료 상태)인지 확인 UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); if (status.step() == UserBattleStep.NONE) { throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); } - // 1. 사후 투표 업데이트 vote.doPostVote(option); - - // 2. 최종 완료 단계(COMPLETED)로 업데이트 userBattleService.upsertStep(user, battle, UserBattleStep.COMPLETED); return new VoteResultResponse(vote.getId(), UserBattleStep.COMPLETED); @@ -163,23 +158,14 @@ public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest reque @Override @Transactional public void deleteVotesByBattleId(Long battleId) { - // 1. 배틀 조회 Battle battle = battleService.findById(battleId); + List votes = battleVoteRepository.findAllByBattle(battle); - // 2. 해당 배틀의 모든 투표 조회 - List votes = voteRepository.findAllByBattle(battle); - - for (Vote vote : votes) { - // 3. 유저의 진행 단계 초기화 (이건 유저별로 다 해줘야 함) + for (BattleVote vote : votes) { userBattleService.upsertStep(vote.getUser(), battle, UserBattleStep.NONE); - - // 4. 옵션별 카운트 감소 (필요 시) - if (vote.getPreVoteOption() != null) { /* 감소 로직 */ } - if (vote.getPostVoteOption() != null) { /* 감소 로직 */ } } - // 5. 투표 데이터 일괄 삭제 - voteRepository.deleteAllInBatch(votes); + battleVoteRepository.deleteAllInBatch(votes); } @Override @@ -189,12 +175,10 @@ public void completeTts(Long battleId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - // 1. 엔티티 상태 변경 (isTtsListened = true) - Vote vote = voteRepository.findByBattleAndUser(battle, user) + BattleVote vote = battleVoteRepository.findByBattleAndUser(battle, user) .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); vote.completeTts(); - // 2. 단계를 POST_VOTE(사후 투표 가능 단계)로 업데이트 userBattleService.upsertStep(user, battle, UserBattleStep.POST_VOTE); } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java new file mode 100644 index 00000000..55fd9163 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteService.java @@ -0,0 +1,10 @@ +package com.swyp.picke.domain.vote.service; + +import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; + +public interface PollVoteService { + PollVoteResponse submitPoll(Long battleId, Long userId, PollVoteRequest request); + PollVoteResponse getMyPollVote(Long battleId, Long userId); + void deletePollVoteByBattleId(Long battleId); +} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java new file mode 100644 index 00000000..49af6548 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/service/PollVoteServiceImpl.java @@ -0,0 +1,140 @@ +package com.swyp.picke.domain.vote.service; + +import com.swyp.picke.domain.poll.entity.Poll; +import com.swyp.picke.domain.poll.entity.PollOption; +import com.swyp.picke.domain.poll.repository.PollOptionRepository; +import com.swyp.picke.domain.poll.service.PollService; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.repository.UserRepository; +import com.swyp.picke.domain.vote.dto.request.PollVoteRequest; +import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; +import com.swyp.picke.domain.vote.entity.PollVote; +import com.swyp.picke.domain.vote.repository.PollVoteRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class PollVoteServiceImpl implements PollVoteService { + + private final PollService pollService; + private final PollOptionRepository pollOptionRepository; + private final PollVoteRepository pollVoteRepository; + private final UserRepository userRepository; + + @Override + @Transactional + public PollVoteResponse submitPoll(Long battleId, Long userId, PollVoteRequest request) { + Long pollId = battleId; + Poll poll = pollService.findById(pollId); + + PollOption selectedOption = pollOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); + + if (!selectedOption.getPoll().getId().equals(poll.getId())) { + throw new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND); + } + + PollVote pollVote = saveOrUpdate(poll, userId, selectedOption); + long totalCount = poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); + + return new PollVoteResponse( + pollId, + pollVote.getSelectedOption().getId(), + totalCount, + buildStats(poll, totalCount, true) + ); + } + + @Override + public PollVoteResponse getMyPollVote(Long battleId, Long userId) { + Long pollId = battleId; + Poll poll = pollService.findById(pollId); + + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + long totalCount = poll.getTotalParticipantsCount() == null ? 0L : poll.getTotalParticipantsCount(); + + return pollVoteRepository.findByPollAndUser(poll, user) + .map(pollVote -> new PollVoteResponse( + pollId, + pollVote.getSelectedOption().getId(), + totalCount, + buildStats(poll, totalCount, true) + )) + .orElseGet(() -> new PollVoteResponse( + pollId, + null, + totalCount, + buildStats(poll, totalCount, false) + )); + } + + @Override + @Transactional + public void deletePollVoteByBattleId(Long battleId) { + Long pollId = battleId; + Poll poll = pollService.findById(pollId); + + List votes = pollVoteRepository.findAllByPoll(poll); + for (PollVote pollVote : votes) { + poll.decreaseTotalParticipantsCount(); + if (pollVote.getSelectedOption() != null) { + pollVote.getSelectedOption().decreaseVoteCount(); + } + } + pollVoteRepository.deleteAllInBatch(votes); + } + + private PollVote saveOrUpdate(Poll poll, Long userId, PollOption selectedOption) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + return pollVoteRepository.findByPollAndUser(poll, user) + .map(pollVote -> { + if (!pollVote.getSelectedOption().equals(selectedOption)) { + pollVote.getSelectedOption().decreaseVoteCount(); + selectedOption.increaseVoteCount(); + pollVote.updateOption(selectedOption); + } + return pollVote; + }) + .orElseGet(() -> { + selectedOption.increaseVoteCount(); + poll.increaseTotalParticipantsCount(); + return pollVoteRepository.save( + PollVote.builder() + .user(user) + .poll(poll) + .selectedOption(selectedOption) + .build() + ); + }); + } + + private List buildStats(Poll poll, long totalCount, boolean revealCounts) { + return pollOptionRepository.findByPollOrderByDisplayOrderAscLabelAscIdAsc(poll).stream() + .map(option -> { + long count = revealCounts ? (option.getVoteCount() == null ? 0L : option.getVoteCount()) : 0L; + double ratio = (!revealCounts || totalCount == 0) + ? 0.0 + : Math.round((double) count / totalCount * 1000) / 10.0; + + return new PollVoteResponse.OptionStat( + option.getId(), + option.getLabel().name(), + option.getTitle(), + count, + ratio + ); + }) + .toList(); + } +} + diff --git a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java index 52e34ba6..57963d10 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteService.java @@ -1,13 +1,11 @@ package com.swyp.picke.domain.vote.service; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; -import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; public interface QuizVoteService { QuizVoteResponse submitQuiz(Long battleId, Long userId, QuizVoteRequest request); - PollVoteResponse submitPoll(Long battleId, Long userId, QuizVoteRequest request); QuizVoteResponse getMyQuizVote(Long battleId, Long userId); - PollVoteResponse getMyPollVote(Long battleId, Long userId); void deleteQuizVoteByBattleId(Long battleId); } + diff --git a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java index 13ce33e7..0960705d 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/QuizVoteServiceImpl.java @@ -1,194 +1,143 @@ package com.swyp.picke.domain.vote.service; -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.battle.repository.BattleOptionRepository; -import com.swyp.picke.domain.battle.service.BattleService; +import com.swyp.picke.domain.quiz.entity.Quiz; +import com.swyp.picke.domain.quiz.entity.QuizOption; +import com.swyp.picke.domain.quiz.repository.QuizOptionRepository; +import com.swyp.picke.domain.quiz.service.QuizService; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.vote.dto.request.QuizVoteRequest; -import com.swyp.picke.domain.vote.dto.response.PollVoteResponse; import com.swyp.picke.domain.vote.dto.response.QuizVoteResponse; import com.swyp.picke.domain.vote.entity.QuizVote; import com.swyp.picke.domain.vote.repository.QuizVoteRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class QuizVoteServiceImpl implements QuizVoteService { + private final QuizService quizService; + private final QuizOptionRepository quizOptionRepository; private final QuizVoteRepository quizVoteRepository; - private final BattleService battleService; - private final BattleOptionRepository battleOptionRepository; private final UserRepository userRepository; @Override @Transactional public QuizVoteResponse submitQuiz(Long battleId, Long userId, QuizVoteRequest request) { - Battle battle = battleService.findById(battleId); - if (!"QUIZ".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_QUIZ); - } - - QuizVote v = saveOrUpdate(battle, userId, request.optionId()); - long totalCount = quizVoteRepository.countByBattle(v.getBattle()); + Long quizId = battleId; + Quiz quiz = quizService.findById(quizId); - return new QuizVoteResponse( - battleId, - v.getSelectedOption().getId(), - totalCount, - calcStats(v.getBattle(), totalCount) - ); - } + QuizOption selectedOption = quizOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - @Override - @Transactional - public PollVoteResponse submitPoll(Long battleId, Long userId, QuizVoteRequest request) { - Battle battle = battleService.findById(battleId); - if (!"VOTE".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_POLL); + if (!selectedOption.getQuiz().getId().equals(quiz.getId())) { + throw new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND); } - QuizVote v = saveOrUpdate(battle, userId, request.optionId()); - long totalCount = quizVoteRepository.countByBattle(v.getBattle()); + QuizVote quizVote = saveOrUpdate(quiz, userId, selectedOption); + long totalCount = quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); - return new PollVoteResponse( - battleId, - v.getSelectedOption().getId(), + return new QuizVoteResponse( + quizId, + quizVote.getSelectedOption().getId(), totalCount, - calcStats(v.getBattle(), totalCount).stream() - .map(s -> new PollVoteResponse.OptionStat(s.optionId(), s.label(), s.title(), s.voteCount(), s.ratio())) - .toList() + buildStats(quiz, totalCount, true, true) ); } @Override public QuizVoteResponse getMyQuizVote(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - if (!"QUIZ".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_QUIZ); - } + Long quizId = battleId; + Quiz quiz = quizService.findById(quizId); User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - long totalCount = quizVoteRepository.countByBattle(battle); + long totalCount = quiz.getTotalParticipantsCount() == null ? 0L : quiz.getTotalParticipantsCount(); - return quizVoteRepository.findByBattleAndUser(battle, user) - .map(v -> new QuizVoteResponse( - battleId, - v.getSelectedOption().getId(), + return quizVoteRepository.findByQuizAndUser(quiz, user) + .map(quizVote -> new QuizVoteResponse( + quizId, + quizVote.getSelectedOption().getId(), totalCount, - calcStats(battle, totalCount) + buildStats(quiz, totalCount, true, true) )) - .orElseGet(() -> { - // [투표 전] 전체 참여자 수(totalCount), 선택지 설명(stance)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 - List blindStats = battleOptionRepository.findByBattle(battle).stream() - .map(o -> new QuizVoteResponse.OptionStat( - o.getId(), o.getLabel().name(), o.getTitle(), - o.getIsCorrect(), 0L, 0.0, o.getStance() - )) - .toList(); - return new QuizVoteResponse(battleId, null, totalCount, blindStats); - }); + .orElseGet(() -> new QuizVoteResponse( + quizId, + null, + totalCount, + buildStats(quiz, totalCount, false, false) + )); } @Override - public PollVoteResponse getMyPollVote(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - if (!"VOTE".equals(battle.getType().name())) { - throw new CustomException(ErrorCode.BATTLE_NOT_POLL); - } - - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - long totalCount = quizVoteRepository.countByBattle(battle); - - return quizVoteRepository.findByBattleAndUser(battle, user) - .map(v -> { - List stats = calcStats(battle, totalCount).stream() - .map(s -> new PollVoteResponse.OptionStat(s.optionId(), s.label(), s.title(), s.voteCount(), s.ratio())) - .toList(); - - return new PollVoteResponse( - battleId, - v.getSelectedOption().getId(), - totalCount, - stats - ); - }) - .orElseGet(() -> { - // [투표 전] 전체 참여자 수(totalCount)는 보여주되, 개별 통계(voteCount, ratio)는 0으로 숨김 - List blindStats = battleOptionRepository.findByBattle(battle).stream() - .map(o -> new PollVoteResponse.OptionStat(o.getId(), o.getLabel().name(), o.getTitle(), 0L, 0.0)) - .toList(); - return new PollVoteResponse(battleId, null, totalCount, blindStats); - }); - } - @Transactional public void deleteQuizVoteByBattleId(Long battleId) { - // 배틀 확인 - Battle battle = battleService.findById(battleId); - - // 해당 배틀의 모든 투표 조회 - List votes = quizVoteRepository.findAllByBattle(battle); + Long quizId = battleId; + Quiz quiz = quizService.findById(quizId); - // 투표수 감소 (배틀 옵션에 반영) - for (QuizVote v : votes) { - if (v.getSelectedOption() != null) { - v.getSelectedOption().decreaseVoteCount(); - } + List votes = quizVoteRepository.findAllByQuiz(quiz); + for (QuizVote ignored : votes) { + quiz.decreaseTotalParticipantsCount(); } quizVoteRepository.deleteAllInBatch(votes); } - private QuizVote saveOrUpdate(Battle battle, Long userId, Long optionId) { + private QuizVote saveOrUpdate(Quiz quiz, Long userId, QuizOption selectedOption) { User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleOption newOption = battleOptionRepository.findById(optionId) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - return quizVoteRepository.findByBattleAndUser(battle, user) - .map(v -> { - // 옵션을 바꾼다면 기존 옵션 -1, 새 옵션 +1 - if (!v.getSelectedOption().equals(newOption)) { - v.getSelectedOption().decreaseVoteCount(); - newOption.increaseVoteCount(); - v.updateOption(newOption); + return quizVoteRepository.findByQuizAndUser(quiz, user) + .map(quizVote -> { + if (!quizVote.getSelectedOption().equals(selectedOption)) { + quizVote.updateOption(selectedOption); } - return v; + return quizVote; }) .orElseGet(() -> { - // 처음 투표한다면 새 옵션 +1 - battle.addParticipant(); - newOption.increaseVoteCount(); + quiz.increaseTotalParticipantsCount(); return quizVoteRepository.save( - QuizVote.builder().user(user).battle(battle).selectedOption(newOption).build()); + QuizVote.builder() + .user(user) + .quiz(quiz) + .selectedOption(selectedOption) + .build() + ); }); - } + } - private List calcStats(Battle battle, long totalCount) { - return battleOptionRepository.findByBattle(battle).stream().map(o -> { - long count = (o.getVoteCount() == null) ? 0L : o.getVoteCount(); - double ratio = totalCount == 0 ? 0.0 : Math.round((double) count / totalCount * 1000) / 10.0; - return new QuizVoteResponse.OptionStat( - o.getId(), - o.getLabel().name(), - o.getTitle(), - o.getIsCorrect(), - count, - ratio, - o.getStance() - ); - }).toList(); + private List buildStats( + Quiz quiz, + long totalCount, + boolean revealCorrect, + boolean revealCounts + ) { + return quizOptionRepository.findByQuizOrderByDisplayOrderAscLabelAscIdAsc(quiz).stream() + .map(option -> { + long voteCount = revealCounts + ? quizVoteRepository.countByQuizAndSelectedOption(quiz, option) + : 0L; + + double ratio = (!revealCounts || totalCount == 0) + ? 0.0 + : Math.round((double) voteCount / totalCount * 1000) / 10.0; + + return new QuizVoteResponse.OptionStat( + option.getId(), + option.getLabel().name(), + option.getText(), + revealCorrect ? option.getIsCorrect() : null, + voteCount, + ratio, + option.getDetailText() + ); + }) + .toList(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java index fab804f0..5401ef8a 100644 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java +++ b/src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java @@ -2,49 +2,51 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.domain.vote.entity.BattleVote; +import com.swyp.picke.domain.vote.repository.BattleVoteRepository; +import java.util.List; +import java.util.Objects; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) public class VoteQueryService { - private final VoteRepository voteRepository; + private final BattleVoteRepository battleVoteRepository; - public List findUserVotes(Long userId, int offset, int size, BattleOptionLabel label) { + public List findUserVotes(Long userId, int offset, int size, BattleOptionLabel label) { PageRequest pageable = PageRequest.of(offset / size, size); return label != null - ? voteRepository.findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc(userId, label, pageable) - : voteRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); + ? battleVoteRepository.findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc(userId, label, pageable) + : battleVoteRepository.findByUserIdOrderByCreatedAtDesc(userId, pageable); } public long countUserVotes(Long userId, BattleOptionLabel label) { return label != null - ? voteRepository.countByUserIdAndPreVoteOptionLabel(userId, label) - : voteRepository.countByUserId(userId); + ? battleVoteRepository.countByUserIdAndPreVoteOptionLabel(userId, label) + : battleVoteRepository.countByUserId(userId); } public long countTotalParticipation(Long userId) { - return voteRepository.countByUserId(userId); + return battleVoteRepository.countByUserId(userId); } public long countOpinionChanges(Long userId) { - return voteRepository.countOpinionChangesByUserId(userId); + return battleVoteRepository.countOpinionChangesByUserId(userId); } public int calculateBattleWinRate(Long userId) { - List postVotes = voteRepository.findByUserId(userId).stream() + List postVotes = battleVoteRepository.findByUserId(userId).stream() .filter(v -> v.getPostVoteOption() != null) .toList(); - if (postVotes.isEmpty()) return 0; + if (postVotes.isEmpty()) { + return 0; + } long wins = postVotes.stream() .filter(v -> { @@ -62,27 +64,31 @@ public int calculateBattleWinRate(Long userId) { } public List findParticipatedBattleIds(Long userId) { - return voteRepository.findByUserId(userId).stream() + return battleVoteRepository.findByUserId(userId).stream() .map(v -> v.getBattle().getId()) .distinct() .toList(); } public List findFirstNBattleIds(Long userId, int n) { - return voteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() + return battleVoteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() .map(v -> v.getBattle().getId()) .distinct() .toList(); } public List findFirstNVotedOptionIds(Long userId, int n) { - return voteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() + return battleVoteRepository.findByUserIdOrderByCreatedAtAsc(userId, PageRequest.of(0, n)).stream() .map(v -> { - if (v.getPostVoteOption() != null) return v.getPostVoteOption().getId(); - if (v.getPreVoteOption() != null) return v.getPreVoteOption().getId(); + if (v.getPostVoteOption() != null) { + return v.getPostVoteOption().getId(); + } + if (v.getPreVoteOption() != null) { + return v.getPreVoteOption().getId(); + } return null; }) - .filter(java.util.Objects::nonNull) + .filter(Objects::nonNull) .distinct() .toList(); } diff --git a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java index c61fd52d..78c1fc2b 100644 --- a/src/main/java/com/swyp/picke/global/config/SecurityConfig.java +++ b/src/main/java/com/swyp/picke/global/config/SecurityConfig.java @@ -43,12 +43,13 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { "/js/**", "/css/**", "/favicon.ico", "/api/v1/admin/login", "/api/v1/admin", "/result/**", - "/report/**", - "/battle/**", - "/.well-known/**", "/api/v1/resources/images/**", "/api/v1/resources/audio/**", - "/api/v1/admob/reward/**" + "/api/v1/resources/local/**", + "/api/v1/admob/reward/**", + "/report/**", + "/battle/**", + "/.well-known/**" ).permitAll() // 2. 관리자 HTML 화면 렌더링 요청 diff --git a/src/main/java/com/swyp/picke/global/infra/local/service/LocalDraftFileStorageService.java b/src/main/java/com/swyp/picke/global/infra/local/service/LocalDraftFileStorageService.java new file mode 100644 index 00000000..a36790f5 --- /dev/null +++ b/src/main/java/com/swyp/picke/global/infra/local/service/LocalDraftFileStorageService.java @@ -0,0 +1,189 @@ +package com.swyp.picke.global.infra.local.service; + +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import com.swyp.picke.global.infra.s3.enums.FileCategory; +import com.swyp.picke.global.infra.s3.service.S3UploadService; +import java.io.IOException; +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.util.Optional; +import java.util.UUID; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.PathResource; +import org.springframework.core.io.Resource; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +public class LocalDraftFileStorageService { + + private static final String LOCAL_DRAFT_PREFIX = "local/drafts/"; + private static final String LOCAL_RESOURCE_PREFIX = "/api/v1/resources/local/"; + + @Value("${picke.local-storage.root:${java.io.tmpdir}/picke-local-storage}") + private String localStorageRoot; + + @Value("${picke.baseUrl}") + private String baseUrl; + + public String saveDraftFile(MultipartFile multipartFile) throws IOException { + if (multipartFile == null || multipartFile.isEmpty()) { + throw new CustomException(ErrorCode.FILE_NOT_FOUND); + } + + String originalName = Optional.ofNullable(multipartFile.getOriginalFilename()).orElse("draft.bin"); + String sanitizedName = sanitizeFileName(originalName); + String fileName = UUID.randomUUID() + "_" + sanitizedName; + String localKey = LOCAL_DRAFT_PREFIX + fileName; + + Path targetPath = resolvePath(localKey); + Files.createDirectories(targetPath.getParent()); + Files.copy(multipartFile.getInputStream(), targetPath, StandardCopyOption.REPLACE_EXISTING); + + return localKey; + } + + public String normalizeLocalDraftKey(String rawReference) { + if (rawReference == null || rawReference.isBlank()) { + return null; + } + + String trimmed = rawReference.trim(); + if (trimmed.startsWith(LOCAL_DRAFT_PREFIX)) { + return trimmed; + } + + if (trimmed.startsWith("http://") || trimmed.startsWith("https://")) { + try { + URI uri = URI.create(trimmed); + String path = uri.getPath(); + return extractLocalKeyFromPath(path); + } catch (IllegalArgumentException ignored) { + return trimmed; + } + } + + if (trimmed.startsWith("/")) { + String localKey = extractLocalKeyFromPath(trimmed); + return localKey != null ? localKey : trimmed; + } + + return trimmed; + } + + public boolean isLocalDraftReference(String rawReference) { + String normalized = normalizeLocalDraftKey(rawReference); + return normalized != null && normalized.startsWith(LOCAL_DRAFT_PREFIX); + } + + public String toPublicUrl(String localKey) { + if (!isLocalDraftReference(localKey)) { + return localKey; + } + + String safeBaseUrl = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl; + return safeBaseUrl + LOCAL_RESOURCE_PREFIX + extractFileName(normalizeLocalDraftKey(localKey)); + } + + public String promoteLocalDraftToS3(String rawReference, FileCategory category, S3UploadService s3UploadService) { + String normalized = normalizeLocalDraftKey(rawReference); + if (!isLocalDraftReference(normalized)) { + return normalized; + } + + Path localPath = resolvePath(normalized); + if (!Files.exists(localPath)) { + throw new CustomException(ErrorCode.FILE_NOT_FOUND); + } + + String fileName = extractFileName(normalized); + String s3Key = category.getPath() + "/" + fileName; + s3UploadService.uploadFile(s3Key, localPath.toFile()); + deleteIfLocalReference(normalized); + return s3Key; + } + + public void deleteIfLocalReference(String rawReference) { + String normalized = normalizeLocalDraftKey(rawReference); + if (!isLocalDraftReference(normalized)) { + return; + } + + Path localPath = resolvePath(normalized); + try { + Files.deleteIfExists(localPath); + } catch (IOException ignored) { + // Draft cleanup failures should not break content flows. + } + } + + public Resource loadDraftResource(String fileName) { + String sanitized = sanitizeFileName(fileName); + Path path = resolvePath(LOCAL_DRAFT_PREFIX + sanitized); + if (!Files.exists(path)) { + throw new CustomException(ErrorCode.FILE_NOT_FOUND); + } + return new PathResource(path); + } + + public MediaType resolveMediaType(String fileName) { + String sanitized = sanitizeFileName(fileName); + Path path = resolvePath(LOCAL_DRAFT_PREFIX + sanitized); + try { + String contentType = Files.probeContentType(path); + if (contentType != null && !contentType.isBlank()) { + return MediaType.parseMediaType(contentType); + } + } catch (IOException ignored) { + // fall through + } + return MediaType.APPLICATION_OCTET_STREAM; + } + + private String extractLocalKeyFromPath(String path) { + if (path == null) { + return null; + } + int markerIndex = path.indexOf(LOCAL_RESOURCE_PREFIX); + if (markerIndex < 0) { + return null; + } + + String fileName = path.substring(markerIndex + LOCAL_RESOURCE_PREFIX.length()); + if (fileName.isBlank()) { + return null; + } + + return LOCAL_DRAFT_PREFIX + sanitizeFileName(fileName); + } + + private Path resolvePath(String localKey) { + Path root = Paths.get(localStorageRoot).toAbsolutePath().normalize(); + Path resolved = root.resolve(localKey).normalize(); + if (!resolved.startsWith(root)) { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + return resolved; + } + + private String extractFileName(String localKey) { + String normalized = normalizeLocalDraftKey(localKey); + if (normalized == null || !normalized.startsWith(LOCAL_DRAFT_PREFIX)) { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + return normalized.substring(LOCAL_DRAFT_PREFIX.length()); + } + + private String sanitizeFileName(String fileName) { + return fileName + .replace("\\", "_") + .replace("/", "_") + .replace("..", "_") + .replaceAll("[^a-zA-Z0-9._-]", "_"); + } +} From e522658b584acb28f5946bf2947d083ee0398fc9 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Sun, 12 Apr 2026 00:00:24 +0900 Subject: [PATCH 81/94] =?UTF-8?q?#151=20[Breaking=20Change]=20Admin=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=9D=B4=EA=B4=80=20=EB=B0=8F=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20UI=20=EB=8F=99=EA=B8=B0=ED=99=94?= =?UTF-8?q?=20(#155)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/admin/api/api-common.js | 102 +++- .../resources/static/js/admin/api/api-load.js | 419 +++++++++-------- .../resources/static/js/admin/api/api-save.js | 434 +++++++++++------- .../static/js/admin/chat/chat-editor.js | 154 ++++--- src/main/resources/static/js/admin/core.js | 55 ++- .../static/js/admin/notice/notice.js | 161 +++++++ .../static/js/admin/tag/tags-controller.js | 81 ++-- .../resources/static/js/admin/tag/tags-ui.js | 171 ++++--- .../static/js/admin/ui/ui-interaction.js | 42 +- .../resources/static/js/admin/ui/ui-sync.js | 66 ++- .../templates/admin/admin-notice.html | 83 ++++ .../admin/components/form-battle.html | 199 ++++---- .../templates/admin/components/form-quiz.html | 87 ++-- .../templates/admin/components/form-vote.html | 57 ++- .../templates/admin/fragments/header.html | 18 +- .../templates/admin/fragments/preview.html | 4 +- .../resources/templates/admin/picke-list.html | 327 +++++++++---- 17 files changed, 1601 insertions(+), 859 deletions(-) create mode 100644 src/main/resources/static/js/admin/notice/notice.js create mode 100644 src/main/resources/templates/admin/admin-notice.html diff --git a/src/main/resources/static/js/admin/api/api-common.js b/src/main/resources/static/js/admin/api/api-common.js index b6d36609..5596d2db 100644 --- a/src/main/resources/static/js/admin/api/api-common.js +++ b/src/main/resources/static/js/admin/api/api-common.js @@ -1,7 +1,43 @@ PickeData.existingUrls = { thumbnail: null, charA: null, charB: null }; PickeData.scenarioId = null; -// [공통] 이미지 서버 업로드 함수 +window.applyThumbnailPreview = function(url) { + if (!url) return; + + const bgIds = ['thumbnail-preview-bg']; + const placeholderIds = ['thumbnail-placeholder']; + const previewIds = ['intro-bg-img']; + + bgIds.forEach((id) => { + const bg = document.getElementById(id); + if (!bg) return; + bg.style.backgroundImage = `url('${url}')`; + bg.style.setProperty('opacity', '1', 'important'); + bg.classList.remove('opacity-0'); + }); + + placeholderIds.forEach((id) => { + const placeholder = document.getElementById(id); + if (placeholder) { + placeholder.style.display = 'none'; + placeholder.classList.add('hidden'); + } + }); + + previewIds.forEach((id) => { + const target = document.getElementById(id); + if (target) target.style.backgroundImage = `url('${url}')`; + }); +}; + +window.setTargetDateInputs = function(dateValue) { + if (!dateValue) return; + ['battle-target-date', 'quiz-target-date', 'poll-target-date'].forEach((id) => { + const input = document.getElementById(id); + if (input) input.value = dateValue; + }); +}; + window.uploadImageToServer = async function(file, category) { if (!file) return null; const formData = new FormData(); @@ -18,10 +54,33 @@ window.uploadImageToServer = async function(file, category) { const text = await res.text(); try { return JSON.parse(text).result ?? JSON.parse(text).data ?? text; } catch { return text; } - } catch (e) { console.error("이미지 업로드 실패:", e); return null; } + } catch (e) { + console.error("이미지 업로드 실패:", e); + return null; + } +}; + +window.uploadImageToLocalDraft = async function(file) { + if (!file) return null; + const formData = new FormData(); + formData.append('file', file); + + try { + const res = await fetch(PickeData.API.FILE_UPLOAD_LOCAL, { + method: 'POST', + headers: { 'Authorization': `Bearer ${PickeData.token}` }, + body: formData + }); + if (!res.ok) throw new Error(res.status); + const text = await res.text(); + try { return JSON.parse(text).result ?? JSON.parse(text).data ?? text; } + catch { return text; } + } catch (e) { + console.error("로컬 임시 이미지 업로드 실패:", e); + return null; + } }; -// [공통] 페이지 로드 시 초기화 세팅 document.addEventListener("DOMContentLoaded", async () => { function setupImageUpload(inputId, bgId, placeholderId, targetImgId, fileKey) { const input = document.getElementById(inputId); @@ -32,14 +91,45 @@ document.addEventListener("DOMContentLoaded", async () => { PickeData.uploadedFiles[fileKey] = file; const url = URL.createObjectURL(file); PickeData.setPreviewImage(bgId, placeholderId, targetImgId, url); - if(window.updateChatPreview) window.updateChatPreview(); + if (window.updateChatPreview) window.updateChatPreview(); }); } - setupImageUpload('thumbnail-upload', 'thumbnail-preview-bg', 'thumbnail-placeholder', 'intro-bg-img', 'thumbnail'); + function setupThumbnailUpload(inputId) { + const input = document.getElementById(inputId); + if (!input) return; + input.addEventListener('change', (e) => { + const file = e.target.files[0]; + if (!file) return; + PickeData.uploadedFiles.thumbnail = file; + const url = URL.createObjectURL(file); + window.applyThumbnailPreview(url); + }); + } + + function bindTargetDateInput(inputId) { + const input = document.getElementById(inputId); + if (!input) return; + input.addEventListener('change', (e) => { + const value = e.target.value; + if (!value) return; + PickeData.currentTargetDate = value; + window.setTargetDateInputs(value); + }); + } + + setupThumbnailUpload('thumbnail-upload'); setupImageUpload('char-a-img-upload', 'char-a-img-bg', 'char-a-img-placeholder', 'intro-char-a-img', 'charA'); setupImageUpload('char-b-img-upload', 'char-b-img-bg', 'char-b-img-placeholder', 'intro-char-b-img', 'charB'); + bindTargetDateInput('battle-target-date'); + bindTargetDateInput('quiz-target-date'); + bindTargetDateInput('poll-target-date'); + + const today = new Date().toISOString().split('T')[0]; + if (!PickeData.currentTargetDate) PickeData.currentTargetDate = today; + window.setTargetDateInputs(PickeData.currentTargetDate); + if (typeof window.fetchAllTags === 'function') await window.fetchAllTags(); if (typeof window.loadContent === 'function') await window.loadContent(); -}); \ No newline at end of file +}); diff --git a/src/main/resources/static/js/admin/api/api-load.js b/src/main/resources/static/js/admin/api/api-load.js index 61ac43c6..5a8435df 100644 --- a/src/main/resources/static/js/admin/api/api-load.js +++ b/src/main/resources/static/js/admin/api/api-load.js @@ -1,257 +1,296 @@ -window.loadContent = async function() { +window.loadContent = async function () { if (!PickeData.isEditMode) return; - try { - const res = await fetch(PickeData.API.BATTLE_GET(PickeData.currentContentId), { headers: PickeData.getAuthHeaders() }); - if (!res.ok) return; - const json = await res.json(); - const data = json.result ?? json.data ?? json; + const type = PickeData.currentTypeParam === 'VOTE' ? 'POLL' : PickeData.currentTypeParam; + const endpointByType = { + BATTLE: PickeData.API.BATTLE_GET, + QUIZ: PickeData.API.QUIZ_GET, + POLL: PickeData.API.POLL_GET + }; + + const formTargetByType = { + BATTLE: 'form-battle', + QUIZ: 'form-quiz', + POLL: 'form-vote' + }; + + const createEmptyScript = (speakerType = 'NARRATOR') => ({ speakerType, text: '' }); + + const renderScenarioScripts = (containerId, scripts, defaultSpeaker = 'NARRATOR') => { + const container = document.getElementById(containerId); + if (!container) return; + + container.innerHTML = ''; + const safeScripts = Array.isArray(scripts) && scripts.length > 0 + ? scripts + : [createEmptyScript(defaultSpeaker)]; + + safeScripts.forEach((script) => { + if (typeof window.addScriptBlock === 'function') { + window.addScriptBlock(containerId, script.speakerType || defaultSpeaker); + } else { + return; + } - console.log("[STEP 3] 서버에서 받아온 상세 데이터:", data); - const actualType = data.type || PickeData.currentTypeParam; - document.querySelector(`[data-target="form-${actualType.toLowerCase()}"]`)?.click(); - PickeData.currentContentType = actualType; + const blocks = container.querySelectorAll('.script-block'); + const block = blocks[blocks.length - 1]; + if (!block) return; - const info = data.battleInfo || {}; + const speakerSelect = block.querySelector('.speaker-select'); + if (speakerSelect) { + speakerSelect.value = script.speakerType || defaultSpeaker; + } - console.log("[DEBUG] 이미지 경로 확인:", info.thumbnailUrl); + const scriptText = block.querySelector('.script-text'); + if (scriptText) { + scriptText.value = script.text || ''; + scriptText.dispatchEvent(new Event('input', { bubbles: true })); + } + }); + }; - // 배경 이미지 세팅 함수 (업로드 칸 + 모바일 미리보기 동시 적용) - const setBgImage = (uploadBgId, placeholderId, previewId, url) => { - if (!url) return; - const uploadBg = document.getElementById(uploadBgId); - const placeholder = document.getElementById(placeholderId); + const applyScenarioToForm = (scenario) => { + if (!scenario) return; - if (uploadBg) { - uploadBg.style.backgroundImage = `url('${url}')`; - uploadBg.style.setProperty('opacity', '1', 'important'); - uploadBg.style.setProperty('display', 'block', 'important'); - uploadBg.classList.remove('opacity-0'); + const nodes = Array.isArray(scenario.nodes) ? scenario.nodes : []; + const nodeByName = {}; + const nodeNameById = {}; - if (placeholder) { - placeholder.style.display = 'none'; - placeholder.classList.add('hidden'); - } + nodes.forEach((node) => { + if (!node) return; + nodeByName[node.nodeName] = node; + if (node.nodeId != null) { + nodeNameById[node.nodeId] = node.nodeName; } - // 우측 모바일 미리보기 적용 - const previewBg = document.getElementById(previewId); - if (previewBg) previewBg.style.backgroundImage = `url('${url}')`; - }; - - const renderBadges = (type, containerId) => { - const container = document.getElementById(containerId); - if (!container) return; - container.querySelectorAll('.tag-badge').forEach(el => el.remove()); - PickeData.selections[type].forEach(id => { - const t = PickeData.allTags.find(x => (x.tagId || x.id) === id); - if (!t) return; - const b = document.createElement('div'); - b.className = "tag-badge group relative inline-flex items-center px-3 py-1.5 bg-gray-100 text-gray-600 border border-gray-200 rounded-full text-[10px] font-bold mr-2 mb-2 transition-all hover:bg-gray-200"; - b.innerHTML = `#${t.name} ×`; - container.insertBefore(b, container.lastElementChild); - }); - }; + }); - if (actualType === 'BATTLE') { - PickeData.setValue('content-title', info.title || data.title || ''); - const summaryText = typeof info.summary === 'string' ? info.summary : (typeof data.summary === 'string' ? data.summary : ''); - PickeData.setValue('content-summary', summaryText); - PickeData.setValue('content-desc', data.description || ''); + const startNode = nodeByName.START || null; + const branchANode = nodeByName.BRANCH_A || null; + const branchBNode = nodeByName.BRANCH_B || null; + const closingNode = nodeByName.CLOSING || null; + const isInteractive = !!scenario.isInteractive; + + const branchContainer = document.getElementById('branch-container'); + const addBranchButton = document.getElementById('btn-add-branch'); + if (branchContainer) { + if (isInteractive) branchContainer.classList.remove('hidden'); + else branchContainer.classList.add('hidden'); + } + if (addBranchButton) { + if (isInteractive) addBranchButton.classList.add('hidden'); + else addBranchButton.classList.remove('hidden'); + } - const categoryTags = data.categoryTags || info.tags || []; - if (categoryTags.length) { - PickeData.selections.BASIC = categoryTags.map(t => t.tagId || t.id); - renderBadges('BASIC', 'basic-tags-container'); - } + renderScenarioScripts('start-node-container', startNode?.scripts || [], 'NARRATOR'); + renderScenarioScripts('closing-node-container', closingNode?.scripts || [], 'NARRATOR'); + renderScenarioScripts('branch-a-node-container', branchANode?.scripts || [], 'A'); + renderScenarioScripts('branch-b-node-container', branchBNode?.scripts || [], 'B'); - // 썸네일 이미지 불러오기 & 미리보기 적용 - if (info.thumbnailUrl || data.thumbnailUrl) { - PickeData.existingUrls.thumbnail = info.thumbnailUrl || data.thumbnailUrl; - setBgImage('thumbnail-preview-bg', 'thumbnail-placeholder', 'intro-bg-img', PickeData.existingUrls.thumbnail); + const branchAInput = document.getElementById('branch-a-label'); + const branchBInput = document.getElementById('branch-b-label'); + + const startOptions = Array.isArray(startNode?.interactiveOptions) ? startNode.interactiveOptions : []; + let branchALabel = ''; + let branchBLabel = ''; + + startOptions.forEach((option) => { + const targetNodeName = option?.nextNodeId != null ? nodeNameById[option.nextNodeId] : null; + if (targetNodeName === 'BRANCH_A') branchALabel = option.label || ''; + if (targetNodeName === 'BRANCH_B') branchBLabel = option.label || ''; + }); + + if (branchAInput) branchAInput.value = branchALabel; + if (branchBInput) branchBInput.value = branchBLabel; + + if (window.updateChatPreview) window.updateChatPreview(); + }; + + try { + const getter = endpointByType[type] || PickeData.API.BATTLE_GET; + const res = await fetch(getter(PickeData.currentContentId), { headers: PickeData.getAuthHeaders() }); + if (!res.ok) return; + + const json = await res.json(); + const data = json.result || json.data || json; + + document.querySelector(`[data-target="${formTargetByType[type]}"]`)?.click(); + PickeData.currentContentType = type; + + Object.keys(PickeData.selections).forEach((key) => { + PickeData.selections[key] = []; + }); + + PickeData.currentTargetDate = data.targetDate || PickeData.currentTargetDate; + PickeData.currentStatus = data.status || 'PENDING'; + if (window.setTargetDateInputs) window.setTargetDateInputs(PickeData.currentTargetDate); + + if (type === 'BATTLE') { + PickeData.setValue('content-title', data.title || ''); + PickeData.setValue('content-summary', data.summary || ''); + PickeData.setValue('content-desc', data.description || ''); + PickeData.setValue('battle-audio-duration', data.audioDuration ?? ''); + PickeData.setValue('battle-status', data.status || 'PENDING'); + PickeData.setValue('battle-thumbnail-url', data.thumbnailUrl || ''); + + if (data.thumbnailUrl) { + PickeData.existingUrls.thumbnail = data.thumbnailUrl; + if (window.applyThumbnailPreview) window.applyThumbnailPreview(data.thumbnailUrl); } - const options = info.options || data.options || []; - const a = options.find(o => o.label === 'A'); - const b = options.find(o => o.label === 'B'); - if (a) { - PickeData.setValue('char-a-title', a.title); - PickeData.setValue('char-a-rep', a.representative); - PickeData.setValue('char-a-stance', a.stance); - /*PickeData.setValue('char-a-quote', a.quote);*/ - - // 인물 A 이미지 불러오기 & 미리보기 적용 - if (a.imageUrl) { - PickeData.existingUrls.charA = a.imageUrl; - setBgImage('char-a-img-bg', 'char-a-img-placeholder', 'intro-char-a-img', a.imageUrl); - } - if (a.tags) { - PickeData.selections.A = a.tags.map(t => t.tagId || t.id); - renderBadges('A', 'char-a-tags-container'); + PickeData.selections.CATEGORY = (data.tags || []).map((tag) => tag.tagId || tag.id); + + const options = data.options || []; + const optionA = options.find((option) => option.label === 'A'); + const optionB = options.find((option) => option.label === 'B'); + + if (optionA) { + PickeData.setValue('char-a-title', optionA.title || ''); + PickeData.setValue('char-a-stance', optionA.stance || ''); + PickeData.setValue('char-a-rep', optionA.representative || ''); + PickeData.setValue('char-a-display-order', optionA.displayOrder ?? 1); + PickeData.setValue('char-a-image-url', optionA.imageUrl || ''); + if (optionA.imageUrl) { + PickeData.existingUrls.charA = optionA.imageUrl; + PickeData.setPreviewImage('char-a-img-bg', 'char-a-img-placeholder', 'intro-char-a-img', optionA.imageUrl); } + PickeData.selections.BATTLE_A_PHILOSOPHER = (optionA.tags || []) + .filter((tag) => tag.type === 'PHILOSOPHER') + .map((tag) => tag.tagId || tag.id); + PickeData.selections.BATTLE_A_VALUE = (optionA.tags || []) + .filter((tag) => tag.type === 'VALUE') + .map((tag) => tag.tagId || tag.id); } - if (b) { - PickeData.setValue('char-b-title', b.title); - PickeData.setValue('char-b-rep', b.representative); - PickeData.setValue('char-b-stance', b.stance); - PickeData.setValue('char-b-quote', b.quote); // 복구 완료! - - // 인물 B 이미지 불러오기 & 미리보기 적용 - if (b.imageUrl) { - PickeData.existingUrls.charB = b.imageUrl; - setBgImage('char-b-img-bg', 'char-b-img-placeholder', 'intro-char-b-img', b.imageUrl); - } - if (b.tags) { - PickeData.selections.B = b.tags.map(t => t.tagId || t.id); - renderBadges('B', 'char-b-tags-container'); + + if (optionB) { + PickeData.setValue('char-b-title', optionB.title || ''); + PickeData.setValue('char-b-stance', optionB.stance || ''); + PickeData.setValue('char-b-rep', optionB.representative || ''); + PickeData.setValue('char-b-display-order', optionB.displayOrder ?? 2); + PickeData.setValue('char-b-image-url', optionB.imageUrl || ''); + if (optionB.imageUrl) { + PickeData.existingUrls.charB = optionB.imageUrl; + PickeData.setPreviewImage('char-b-img-bg', 'char-b-img-placeholder', 'intro-char-b-img', optionB.imageUrl); } + PickeData.selections.BATTLE_B_PHILOSOPHER = (optionB.tags || []) + .filter((tag) => tag.type === 'PHILOSOPHER') + .map((tag) => tag.tagId || tag.id); + PickeData.selections.BATTLE_B_VALUE = (optionB.tags || []) + .filter((tag) => tag.type === 'VALUE') + .map((tag) => tag.tagId || tag.id); } - const titleEl = document.getElementById('preview-title-intro'); - if (titleEl) titleEl.innerHTML = ((info.title || data.title) || '').replace(/\n/g, '
'); - try { const scenRes = await fetch(`/api/v1/admin/battles/${PickeData.currentContentId}/scenario`, { headers: PickeData.getAuthHeaders() }); if (scenRes.ok) { const scenJson = await scenRes.json(); const scenario = scenJson.result || scenJson.data; - - if (scenario && scenario.nodes && scenario.nodes.length > 0) { + if (scenario) { + const voiceSettings = scenario.voiceSettings || {}; + PickeData.setValue('tts-voice-narrator', voiceSettings.NARRATOR || ''); + PickeData.setValue('tts-voice-a', voiceSettings.A || ''); + PickeData.setValue('tts-voice-b', voiceSettings.B || ''); + PickeData.setValue('tts-voice-user', voiceSettings.USER || ''); PickeData.scenarioId = scenario.scenarioId || scenario.id || null; - - const renderScripts = (containerId, scripts) => { - const container = document.getElementById(containerId); - if (!container) return; - container.innerHTML = ''; - scripts.forEach(script => { - window.addScriptBlock(containerId, script.speakerType); - const block = container.lastElementChild; - block.querySelector('.script-text').value = script.text || ''; - }); - }; - - scenario.nodes.forEach(node => { - if (node.nodeName === 'START') { - renderScripts('start-node-container', node.scripts || []); - if (scenario.isInteractive && node.interactiveOptions) { - window.addBranchBlock(); - PickeData.setValue('branch-a-label', node.interactiveOptions[0]?.label || ''); - PickeData.setValue('branch-b-label', node.interactiveOptions[1]?.label || ''); - } - } - if (node.nodeName === 'BRANCH_A') renderScripts('branch-a-node-container', node.scripts || []); - if (node.nodeName === 'BRANCH_B') renderScripts('branch-b-node-container', node.scripts || []); - if (node.nodeName === 'CLOSING') renderScripts('closing-node-container', node.scripts || []); - }); + applyScenarioToForm(scenario); } } - } catch (e) { console.error("시나리오 로드 실패:", e); } + } catch (e) { + console.error('시나리오를 불러오지 못했습니다:', e); + } + } - if (window.updateChatPreview) window.updateChatPreview(); + if (type === 'QUIZ') { + PickeData.setValue('quiz-title', data.title || ''); + PickeData.setValue('quiz-status', data.status || 'PENDING'); - } - // [QUIZ] 질문과 선택지 구성 로직 - else if (actualType === 'QUIZ') { - const question = info.title || data.title || ''; - PickeData.setValue('quiz-question', question); - PickeData.setValue('quiz-desc', data.description || info.description || ''); - PickeData.setValue('quiz-perf-a', data.itemA || info.itemA || ''); - PickeData.setValue('quiz-detail-a', data.itemADesc || info.itemADesc || ''); - PickeData.setValue('quiz-perf-b', data.itemB || info.itemB || ''); - PickeData.setValue('quiz-detail-b', data.itemBDesc || info.itemBDesc || ''); - - const opts = info.options || data.options || []; - const optA = opts.find(o => o.label === 'A'); - const optB = opts.find(o => o.label === 'B'); - - if (optA) { - PickeData.setValue('quiz-o-text', optA.title || ''); - PickeData.setValue('quiz-o-desc', optA.stance || ''); - if (optA.isCorrect) document.getElementById('quiz-answer-a').checked = true; + const options = data.options || []; + const optionA = options.find((option) => option.label === 'A'); + const optionB = options.find((option) => option.label === 'B'); + + if (optionA) { + PickeData.setValue('quiz-option-a-title', optionA.text || ''); + PickeData.setValue('quiz-option-a-detail', optionA.detailText || ''); + PickeData.setValue('quiz-option-a-display-order', optionA.displayOrder ?? 1); + if (optionA.isCorrect) document.getElementById('quiz-answer-a').checked = true; } - if (optB) { - PickeData.setValue('quiz-x-text', optB.title || ''); - PickeData.setValue('quiz-x-desc', optB.stance || ''); - if (optB.isCorrect) document.getElementById('quiz-answer-b').checked = true; + + if (optionB) { + PickeData.setValue('quiz-option-b-title', optionB.text || ''); + PickeData.setValue('quiz-option-b-detail', optionB.detailText || ''); + PickeData.setValue('quiz-option-b-display-order', optionB.displayOrder ?? 2); + if (optionB.isCorrect) document.getElementById('quiz-answer-b').checked = true; } } - // [VOTE] (복구 완료!) - else if (actualType === 'VOTE') { - PickeData.setValue('vote-q-prefix', data.titlePrefix || ''); - PickeData.setValue('vote-q-suffix', data.titleSuffix || ''); - PickeData.setValue('vote-desc', data.description || ''); - - const opts = data.options || info.options || []; - opts.forEach((opt, idx) => { - PickeData.setValue(`vote-opt-${idx + 1}`, opt.title || ''); + + if (type === 'POLL') { + PickeData.setValue('poll-title-prefix', data.titlePrefix || ''); + PickeData.setValue('poll-title-suffix', data.titleSuffix || ''); + PickeData.setValue('poll-status', data.status || 'PENDING'); + + const optionTargetByLabel = { + A: { titleId: 'poll-option-1-title', orderId: 'poll-option-1-display-order' }, + B: { titleId: 'poll-option-2-title', orderId: 'poll-option-2-display-order' }, + C: { titleId: 'poll-option-3-title', orderId: 'poll-option-3-display-order' }, + D: { titleId: 'poll-option-4-title', orderId: 'poll-option-4-display-order' } + }; + + (data.options || []).forEach((option) => { + const mapping = optionTargetByLabel[option.label]; + if (!mapping) return; + PickeData.setValue(mapping.titleId, option.title || ''); + PickeData.setValue(mapping.orderId, option.displayOrder ?? null); }); } - // UI 강제 업데이트 및 미리보기 동기화 - document.querySelectorAll('textarea, input').forEach(el => { + if (window.refreshFormBadges) window.refreshFormBadges(); + if (window.updatePreviewTags) window.updatePreviewTags(); + + document.querySelectorAll('textarea, input').forEach((el) => { el.dispatchEvent(new Event('input', { bubbles: true })); }); - // 태그 및 채팅 미리보기 함수 호출 - if (window.updatePreviewTags) window.updatePreviewTags(); if (window.updateChatPreview) window.updateChatPreview(); - if (window.refreshFormBadges) window.refreshFormBadges(); - - // 버튼 상태 업데이트 - window.updateButtonStates(data.status || info.status); - console.log(`${actualType} 로드 완료`); - + if (window.updateButtonStates) window.updateButtonStates(data.status); } catch (e) { - console.error("loadContent 오류:", e); + console.error('콘텐츠를 불러오는 중 오류가 발생했습니다:', e); } }; -// 버튼 상태 제어 함수 (PENDING 및 오디오 재발행 버튼 제어 포함) -window.updateButtonStates = function(currentStatus) { +window.updateButtonStates = function (currentStatus) { const btnPending = document.getElementById('btn-save-pending'); const btnPublish = document.getElementById('btn-save-publish'); const btnRepublish = document.getElementById('btn-republish-audio'); - // 수정 모드 진입 시 (PENDING이든 PUBLISHED든 기본적으로 텍스트 수정 모드로 세팅) if (PickeData.isEditMode && btnPublish) { - btnPublish.innerText = '수정하기 (텍스트)'; - btnPublish.onclick = () => window.saveContent('EDIT'); + if (currentStatus === 'PUBLISHED') { + btnPublish.innerText = '수정 저장 (텍스트만)'; + btnPublish.onclick = () => window.saveContent('EDIT'); + } else { + btnPublish.innerText = '발행'; + btnPublish.onclick = () => window.saveContent('PUBLISHED'); + } } if (currentStatus === 'PUBLISHED') { - // 1. 이미 발행된 상태면 PENDING(임시저장) 버튼 비활성화 if (btnPending) { btnPending.disabled = true; btnPending.classList.add('opacity-50', 'cursor-not-allowed', 'bg-gray-200', 'text-gray-400'); - btnPending.title = "이미 발행된 콘텐츠는 임시저장할 수 없습니다."; } - // 2. 오디오 재발행 버튼 노출 - if (btnRepublish) { + if (btnRepublish && PickeData.currentContentType === 'BATTLE') { btnRepublish.classList.remove('hidden'); } - } else if (currentStatus === 'PENDING') { - // 1. PENDING 상태면 오디오 재발행 버튼 숨김 처리 - if (btnRepublish) { - btnRepublish.classList.add('hidden'); - } - // 2. 혹시 비활성화되어 있을 수 있는 임시저장 버튼 활성화 + } else { + if (btnRepublish) btnRepublish.classList.add('hidden'); if (btnPending) { btnPending.disabled = false; btnPending.classList.remove('opacity-50', 'cursor-not-allowed', 'bg-gray-200', 'text-gray-400'); - btnPending.title = ""; } } }; -// 오디오 재발행 확인 창 (모달) -window.confirmRepublish = function() { - const isConfirmed = confirm( - "정말 오디오를 다시 생성하시겠습니까?\n\n" + - "대본이 수정되었다면 새로운 내용으로 오디오가 덮어씌워지며, " + - "TTS API 생성 비용과 시간이 소요될 수 있습니다." - ); - - // 관리자가 '확인'을 눌렀을 때만 PUBLISH(오디오 생성) 실행 +window.confirmRepublish = function () { + const isConfirmed = confirm('시나리오 오디오를 다시 생성할까요? TTS 사용량이 증가할 수 있습니다.'); if (isConfirmed) { window.saveContent('PUBLISH'); } -}; \ No newline at end of file +}; diff --git a/src/main/resources/static/js/admin/api/api-save.js b/src/main/resources/static/js/admin/api/api-save.js index 5ff5b526..d22ddeca 100644 --- a/src/main/resources/static/js/admin/api/api-save.js +++ b/src/main/resources/static/js/admin/api/api-save.js @@ -1,219 +1,335 @@ -// action 파라미터: 'PENDING'(임시저장), 'EDIT'(단순수정), 'PUBLISH'(발행 및 오디오생성) -window.saveContent = async (action) => { - const targetStatus = action === 'PENDING' ? 'PENDING' : 'PUBLISHED'; - +window.saveContent = async (action) => { const loader = document.getElementById('global-loader'); const loaderText = document.getElementById('loader-text'); + + const statusFromAction = action === 'PENDING' ? 'PENDING' : 'PUBLISHED'; + if (loader) { if (loaderText) { - if (action === 'PUBLISH') loaderText.innerText = "발행 및 오디오 생성 중..."; - else if (action === 'EDIT') loaderText.innerText = "수정된 내용 저장 중..."; - else loaderText.innerText = "임시저장 중..."; + if (action === 'PUBLISHED' || action === 'PUBLISH') loaderText.innerText = '콘텐츠를 발행하는 중입니다...'; + else if (action === 'EDIT') loaderText.innerText = '콘텐츠를 수정하는 중입니다...'; + else loaderText.innerText = '임시 저장 중입니다...'; } loader.classList.remove('hidden'); loader.classList.add('flex'); } + const toUrlString = (urlObj) => { + if (!urlObj) return null; + if (typeof urlObj === 'string') return urlObj; + return urlObj.s3Key || urlObj.presignedUrl || String(urlObj); + }; + + const asIntOrNull = (value) => { + if (value == null || value === '') return null; + const parsed = Number(value); + return Number.isNaN(parsed) ? null : parsed; + }; + + const getTargetDate = (type) => { + const inputIdByType = { + BATTLE: 'battle-target-date', + QUIZ: 'quiz-target-date', + POLL: 'poll-target-date' + }; + return document.getElementById(inputIdByType[type])?.value || PickeData.currentTargetDate || new Date().toISOString().split('T')[0]; + }; + + const getStatus = (type) => { + if (action === 'PENDING') return 'PENDING'; + if (action === 'PUBLISHED' || action === 'PUBLISH') return 'PUBLISHED'; + + const statusInputByType = { + BATTLE: 'battle-status', + QUIZ: 'quiz-status', + POLL: 'poll-status' + }; + return document.getElementById(statusInputByType[type])?.value || statusFromAction; + }; + try { + const currentType = PickeData.currentContentType; + const previousStatus = PickeData.currentStatus; + const targetDate = getTargetDate(currentType); + const resolvedStatus = getStatus(currentType); + const shouldUploadAssets = action === 'PUBLISHED' || action === 'PUBLISH'; + const shouldUploadLocalDraft = action === 'PENDING'; + + PickeData.currentTargetDate = targetDate; + let thumbnailUrl = PickeData.existingUrls.thumbnail; let charAUrl = PickeData.existingUrls.charA; let charBUrl = PickeData.existingUrls.charB; - try { - if (PickeData.uploadedFiles.thumbnail) thumbnailUrl = await window.uploadImageToServer(PickeData.uploadedFiles.thumbnail, 'BATTLE'); - if (PickeData.uploadedFiles.charA) charAUrl = await window.uploadImageToServer(PickeData.uploadedFiles.charA, 'PHILOSOPHER'); - if (PickeData.uploadedFiles.charB) charBUrl = await window.uploadImageToServer(PickeData.uploadedFiles.charB, 'PHILOSOPHER'); - } catch (e) { throw new Error("이미지 업로드에 실패했습니다."); } - - if (thumbnailUrl && typeof thumbnailUrl === 'object') { - thumbnailUrl = thumbnailUrl.s3Key || thumbnailUrl.presignedUrl || String(thumbnailUrl); - } - if (charAUrl && typeof charAUrl === 'object') { - charAUrl = charAUrl.s3Key || charAUrl.presignedUrl || String(charAUrl); - } - if (charBUrl && typeof charBUrl === 'object') { - charBUrl = charBUrl.s3Key || charBUrl.presignedUrl || String(charBUrl); - } - - // 1. 페이로드 구조 - let payload = { - status: targetStatus, - type: PickeData.currentContentType, - tagIds: PickeData.selections.BASIC, - thumbnailUrl: thumbnailUrl, - targetDate: new Date().toISOString().split('T')[0], - title: '', - titlePrefix: null, - titleSuffix: null, - itemA: null, - itemADesc: null, - itemB: null, - itemBDesc: null, - summary: '', - description: '', - options: [] - }; + if (currentType === 'BATTLE') { + const uploadByAction = async (file, category) => { + if (!file) return null; + if (shouldUploadAssets) return window.uploadImageToServer(file, category); + if (shouldUploadLocalDraft) return window.uploadImageToLocalDraft(file); + return null; + }; - // 2. 타입별 데이터 매핑 - // [BATTLE] - if (PickeData.currentContentType === 'BATTLE') { - payload.title = document.getElementById('content-title')?.value || ''; - payload.summary = document.getElementById('content-summary')?.value || ''; - payload.description = document.getElementById('content-desc')?.value || ''; - payload.options = [ - { label: 'A', title: document.getElementById('char-a-title')?.value || '', stance: document.getElementById('char-a-stance')?.value || '', representative: document.getElementById('char-a-rep')?.value || '', /*quote: document.getElementById('char-a-quote')?.value || '',*/ imageUrl: charAUrl, tagIds: PickeData.selections.A }, - { label: 'B', title: document.getElementById('char-b-title')?.value || '', stance: document.getElementById('char-b-stance')?.value || '', representative: document.getElementById('char-b-rep')?.value || '', quote: document.getElementById('char-b-quote')?.value || '', imageUrl: charBUrl, tagIds: PickeData.selections.B } - ]; - } - // [QUIZ] - else if (PickeData.currentContentType === 'QUIZ') { - payload.title = document.getElementById('quiz-question')?.value || ''; - payload.description = document.getElementById('quiz-desc')?.value || ''; - payload.itemA = document.getElementById('quiz-perf-a')?.value || ''; - payload.itemADesc = document.getElementById('quiz-detail-a')?.value || ''; - payload.itemB = document.getElementById('quiz-perf-b')?.value || ''; - payload.itemBDesc = document.getElementById('quiz-detail-b')?.value || ''; - payload.options = [ - { - label: 'A', - title: document.getElementById('quiz-o-text')?.value || '', - stance: document.getElementById('quiz-o-desc')?.value || '', - isCorrect: document.getElementById('quiz-answer-a')?.checked || false, - imageUrl: null, - tagIds: [] - }, - { - label: 'B', - title: document.getElementById('quiz-x-text')?.value || '', - stance: document.getElementById('quiz-x-desc')?.value || '', - isCorrect: document.getElementById('quiz-answer-b')?.checked || false, - imageUrl: null, - tagIds: [] - } - ]; - } - // [VOTE] - else if (PickeData.currentContentType === 'VOTE') { - payload.titlePrefix = document.getElementById('vote-q-prefix')?.value || ''; - payload.titleSuffix = document.getElementById('vote-q-suffix')?.value || ''; - payload.title = payload.titlePrefix; - - payload.description = document.getElementById('vote-desc')?.value || ''; - const voteOpts = []; - for (let i = 1; i <= 4; i++) { - const val = document.getElementById(`vote-opt-${i}`)?.value.trim(); - if (val) { - voteOpts.push({ label: String.fromCharCode(64 + i), title: val, stance: '', imageUrl: null, tagIds: [] }); - } + if (PickeData.uploadedFiles.thumbnail) { + thumbnailUrl = await uploadByAction(PickeData.uploadedFiles.thumbnail, 'BATTLE'); + } + if (PickeData.uploadedFiles.charA) { + charAUrl = await uploadByAction(PickeData.uploadedFiles.charA, 'PHILOSOPHER'); + } + if (PickeData.uploadedFiles.charB) { + charBUrl = await uploadByAction(PickeData.uploadedFiles.charB, 'PHILOSOPHER'); } - payload.options = voteOpts; } - // 백엔드 DTO(String)에 맞게 모든 이미지 URL 객체를 문자열로 변환 - const extractUrlString = (urlObj) => { - if (!urlObj) return null; - if (typeof urlObj === 'string') return urlObj; - return urlObj.s3Key || urlObj.presignedUrl || String(urlObj); - }; + thumbnailUrl = toUrlString(thumbnailUrl); + charAUrl = toUrlString(charAUrl); + charBUrl = toUrlString(charBUrl); - // 1. 썸네일 변환 - payload.thumbnailUrl = extractUrlString(payload.thumbnailUrl); + let payload = null; + let requestUrl = ''; - // 2. 선택지(options) 안의 모든 이미지 변환 - if (payload.options && payload.options.length > 0) { - payload.options.forEach(opt => { - opt.imageUrl = extractUrlString(opt.imageUrl); - }); + if (currentType === 'BATTLE') { + payload = { + status: resolvedStatus, + title: document.getElementById('content-title')?.value || '', + summary: document.getElementById('content-summary')?.value || '', + description: document.getElementById('content-desc')?.value || '', + thumbnailUrl: thumbnailUrl || document.getElementById('battle-thumbnail-url')?.value || null, + targetDate, + audioDuration: asIntOrNull(document.getElementById('battle-audio-duration')?.value), + tagIds: PickeData.selections.CATEGORY || [], + options: [ + { + label: 'A', + title: document.getElementById('char-a-title')?.value || '', + stance: document.getElementById('char-a-stance')?.value || '', + representative: document.getElementById('char-a-rep')?.value || '', + imageUrl: charAUrl || document.getElementById('char-a-image-url')?.value || null, + displayOrder: asIntOrNull(document.getElementById('char-a-display-order')?.value) || 1, + tagIds: [ + ...(PickeData.selections.BATTLE_A_PHILOSOPHER || []), + ...(PickeData.selections.BATTLE_A_VALUE || []) + ] + }, + { + label: 'B', + title: document.getElementById('char-b-title')?.value || '', + stance: document.getElementById('char-b-stance')?.value || '', + representative: document.getElementById('char-b-rep')?.value || '', + imageUrl: charBUrl || document.getElementById('char-b-image-url')?.value || null, + displayOrder: asIntOrNull(document.getElementById('char-b-display-order')?.value) || 2, + tagIds: [ + ...(PickeData.selections.BATTLE_B_PHILOSOPHER || []), + ...(PickeData.selections.BATTLE_B_VALUE || []) + ] + } + ] + }; + requestUrl = PickeData.isEditMode ? PickeData.API.BATTLE_UPDATE(PickeData.currentContentId) : PickeData.API.BATTLE_CREATE; + } else if (currentType === 'QUIZ') { + payload = { + title: document.getElementById('quiz-title')?.value || '', + targetDate, + status: resolvedStatus, + options: [ + { + label: 'A', + text: document.getElementById('quiz-option-a-title')?.value || '', + detailText: document.getElementById('quiz-option-a-detail')?.value || '', + isCorrect: document.getElementById('quiz-answer-a')?.checked || false, + displayOrder: asIntOrNull(document.getElementById('quiz-option-a-display-order')?.value) || 1 + }, + { + label: 'B', + text: document.getElementById('quiz-option-b-title')?.value || '', + detailText: document.getElementById('quiz-option-b-detail')?.value || '', + isCorrect: document.getElementById('quiz-answer-b')?.checked || false, + displayOrder: asIntOrNull(document.getElementById('quiz-option-b-display-order')?.value) || 2 + } + ] + }; + requestUrl = PickeData.isEditMode ? PickeData.API.QUIZ_UPDATE(PickeData.currentContentId) : PickeData.API.QUIZ_CREATE; + } else { + const pollOptions = [ + { label: 'A', titleId: 'poll-option-1-title', orderId: 'poll-option-1-display-order' }, + { label: 'B', titleId: 'poll-option-2-title', orderId: 'poll-option-2-display-order' }, + { label: 'C', titleId: 'poll-option-3-title', orderId: 'poll-option-3-display-order' }, + { label: 'D', titleId: 'poll-option-4-title', orderId: 'poll-option-4-display-order' } + ] + .map((option, index) => ({ + label: option.label, + title: document.getElementById(option.titleId)?.value || '', + displayOrder: asIntOrNull(document.getElementById(option.orderId)?.value) || (index + 1) + })) + .filter((option) => option.title.trim().length > 0); + + payload = { + titlePrefix: document.getElementById('poll-title-prefix')?.value || '', + titleSuffix: document.getElementById('poll-title-suffix')?.value || '', + targetDate, + status: resolvedStatus, + options: pollOptions + }; + requestUrl = PickeData.isEditMode ? PickeData.API.POLL_UPDATE(PickeData.currentContentId) : PickeData.API.POLL_CREATE; } - // 3. 요청 및 시나리오 로직 - const battleUrl = PickeData.isEditMode ? PickeData.API.BATTLE_UPDATE(PickeData.currentContentId) : PickeData.API.BATTLE_CREATE; - console.log("[STEP 1] 서버로 보내는 데이터(Payload):", payload); - const battleRes = await fetch(battleUrl, { + const saveRes = await fetch(requestUrl, { method: PickeData.isEditMode ? 'PATCH' : 'POST', headers: PickeData.getAuthHeaders(), body: JSON.stringify(payload) }); - if (!battleRes.ok) throw new Error("컨텐츠 정보 저장 실패"); + if (!saveRes.ok) throw new Error('콘텐츠 저장에 실패했습니다.'); - const battleData = await battleRes.json(); - const savedBattleId = PickeData.isEditMode ? PickeData.currentContentId : ( - battleData.result?.battleId || battleData.result?.id || battleData.data?.battleId || battleData.id - ); + const saved = await saveRes.json(); + const result = saved.result || saved.data || {}; + const savedId = result.battleId || result.quizId || result.pollId || result.id || PickeData.currentContentId; if (!PickeData.isEditMode) { - PickeData.currentContentId = savedBattleId; + PickeData.currentContentId = savedId; PickeData.isEditMode = true; } - // [SCENARIO] - if (PickeData.currentContentType === 'BATTLE') { - if (!savedBattleId) throw new Error("배틀 생성 후 ID를 가져오지 못했습니다."); + if (currentType === 'BATTLE') { const isInteractive = !document.getElementById('branch-container')?.classList.contains('hidden'); - const nodes = []; + const extractScripts = (containerId) => { const scripts = []; - document.querySelectorAll(`#${containerId} .script-block`).forEach(block => { + document.querySelectorAll(`#${containerId} .script-block`).forEach((block) => { const speakerSelect = block.querySelector('.speaker-select'); const scriptTextArea = block.querySelector('.script-text'); - if (speakerSelect && scriptTextArea) { - const speakerType = speakerSelect.value; - let speakerName = '나레이터'; - if (speakerType === 'A') speakerName = document.getElementById('char-a-rep')?.value || '인물 A'; - if (speakerType === 'B') speakerName = document.getElementById('char-b-rep')?.value || '인물 B'; - scripts.push({ speakerType, speakerName, text: scriptTextArea.value }); - } + if (!speakerSelect || !scriptTextArea) return; + + const speakerType = speakerSelect.value; + let speakerName = 'NARRATOR'; + if (speakerType === 'A') speakerName = document.getElementById('char-a-rep')?.value || 'A'; + if (speakerType === 'B') speakerName = document.getElementById('char-b-rep')?.value || 'B'; + scripts.push({ speakerType, speakerName, text: scriptTextArea.value }); }); return scripts; }; + const startOptions = []; if (isInteractive) { startOptions.push({ label: document.getElementById('branch-a-label')?.value || 'A', nextNodeName: 'BRANCH_A' }); startOptions.push({ label: document.getElementById('branch-b-label')?.value || 'B', nextNodeName: 'BRANCH_B' }); } - nodes.push({ nodeName: 'START', isStartNode: true, autoNextNode: isInteractive ? null : 'CLOSING', scripts: extractScripts('start-node-container'), interactiveOptions: startOptions }); + + const nodes = [ + { + nodeName: 'START', + isStartNode: true, + autoNextNode: isInteractive ? null : 'CLOSING', + scripts: extractScripts('start-node-container'), + interactiveOptions: startOptions + } + ]; + if (isInteractive) { nodes.push({ nodeName: 'BRANCH_A', isStartNode: false, autoNextNode: 'CLOSING', scripts: extractScripts('branch-a-node-container'), interactiveOptions: [] }); nodes.push({ nodeName: 'BRANCH_B', isStartNode: false, autoNextNode: 'CLOSING', scripts: extractScripts('branch-b-node-container'), interactiveOptions: [] }); } + nodes.push({ nodeName: 'CLOSING', isStartNode: false, autoNextNode: null, scripts: extractScripts('closing-node-container'), interactiveOptions: [] }); - const scenarioPayload = { battleId: savedBattleId, isInteractive, nodes, status: targetStatus }; - const scenMethod = PickeData.scenarioId ? 'PUT' : 'POST'; - const scenUrl = PickeData.scenarioId ? `/api/v1/admin/scenarios/${PickeData.scenarioId}` : `/api/v1/admin/scenarios`; - const scenRes = await fetch(scenUrl, { method: scenMethod, headers: PickeData.getAuthHeaders(), body: JSON.stringify(scenarioPayload) }); - if (!scenRes.ok) throw new Error("시나리오 데이터 저장 실패"); - const scenData = await scenRes.json(); - if (!PickeData.scenarioId) PickeData.scenarioId = scenData.result?.scenarioId || scenData.result?.id || scenData.data?.scenarioId || scenData.data?.id || scenData.result || scenData.data || null; - - // 발행(PUBLISH) 버튼을 눌렀을 때만 오디오 생성 - if (action === 'PUBLISH' && PickeData.scenarioId) { - await fetch(`/api/v1/admin/scenarios/${PickeData.scenarioId}`, { - method: 'PATCH', headers: PickeData.getAuthHeaders(), body: JSON.stringify({ status: 'PUBLISHED' }) + + const voiceSettings = {}; + const voiceInputMap = { + NARRATOR: 'tts-voice-narrator', + A: 'tts-voice-a', + B: 'tts-voice-b', + USER: 'tts-voice-user' + }; + + Object.entries(voiceInputMap).forEach(([speakerType, inputId]) => { + const value = document.getElementById(inputId)?.value?.trim(); + if (value) voiceSettings[speakerType] = value; + }); + + if (action === 'PUBLISHED' || action === 'PUBLISH') { + const requiredSpeakers = new Set(); + nodes.forEach((node) => { + (node.scripts || []).forEach((script) => { + if (script.speakerType) requiredSpeakers.add(script.speakerType); + }); }); + + const missingVoiceSpeakers = Array.from(requiredSpeakers).filter((speakerType) => !voiceSettings[speakerType]); + if (missingVoiceSpeakers.length > 0) { + throw new Error(`다음 화자의 Fish Audio reference_id가 없습니다: ${missingVoiceSpeakers.join(', ')}`); + } + } + + const scenarioPayload = { + battleId: savedId, + isInteractive, + nodes, + status: resolvedStatus, + voiceSettings + }; + + const scenarioExisted = !!PickeData.scenarioId; + const scenarioMethod = scenarioExisted ? 'PUT' : 'POST'; + const scenarioUrl = scenarioExisted ? `/api/v1/admin/scenarios/${PickeData.scenarioId}` : '/api/v1/admin/scenarios'; + + const scenarioRes = await fetch(scenarioUrl, { + method: scenarioMethod, + headers: PickeData.getAuthHeaders(), + body: JSON.stringify(scenarioPayload) + }); + if (!scenarioRes.ok) throw new Error('시나리오 저장에 실패했습니다.'); + + const scenarioData = await scenarioRes.json(); + if (!scenarioExisted) { + const scenarioResult = scenarioData.result || scenarioData.data || {}; + PickeData.scenarioId = scenarioResult.scenarioId || scenarioResult.id || null; + } + + if (scenarioExisted && PickeData.scenarioId) { + const shouldPatchScenarioStatus = action === 'PUBLISH' || previousStatus !== resolvedStatus; + if (shouldPatchScenarioStatus) { + const statusRes = await fetch(`/api/v1/admin/scenarios/${PickeData.scenarioId}`, { + method: 'PATCH', + headers: PickeData.getAuthHeaders(), + body: JSON.stringify({ status: resolvedStatus }) + }); + if (!statusRes.ok) throw new Error('시나리오 상태 업데이트에 실패했습니다.'); + } } } - if (loader) { loader.classList.add('hidden'); loader.classList.remove('flex'); } + PickeData.currentStatus = resolvedStatus; + + if (loader) { + loader.classList.add('hidden'); + loader.classList.remove('flex'); + } + const modal = document.getElementById('custom-modal'); - if (modal) { - document.getElementById('custom-modal-title').innerText = "저장 완료"; + if (!modal) { + window.location.href = '/api/v1/admin/picke/list'; + return; + } - let resultMsg = ""; - if (action === 'PENDING') resultMsg = "임시저장 되었습니다."; - else if (action === 'EDIT') resultMsg = "수정 내용이 저장되었습니다.\n(오디오 갱신 안 됨)"; - else resultMsg = "발행 되었습니다!\n(새 오디오 생성 처리됨)"; + document.getElementById('custom-modal-title').innerText = '완료'; + document.getElementById('custom-modal-message').innerText = action === 'PENDING' + ? '임시 저장되었습니다.' + : action === 'EDIT' + ? '수정이 완료되었습니다.' + : '발행이 완료되었습니다.'; - document.getElementById('custom-modal-message').innerText = resultMsg; + modal.classList.remove('hidden'); + setTimeout(() => { + modal.classList.add('opacity-100'); + modal.classList.remove('opacity-0'); + }, 10); - modal.classList.remove('hidden'); - setTimeout(() => { modal.classList.add('opacity-100'); modal.classList.remove('opacity-0'); }, 10); - document.getElementById('custom-modal-confirm').onclick = () => { window.location.href = "/api/v1/admin/picke/list"; }; - } else { - window.location.href = "/api/v1/admin/picke/list"; - } + document.getElementById('custom-modal-confirm').onclick = () => { + window.location.href = '/api/v1/admin/picke/list'; + }; } catch (e) { - if (loader) { loader.classList.add('hidden'); loader.classList.remove('flex'); } - console.error(e); - alert(`저장 중 오류: ${e.message}`); + if (loader) { + loader.classList.add('hidden'); + loader.classList.remove('flex'); + } + console.error('저장 중 오류:', e); + alert(`저장에 실패했습니다: ${e.message}`); } -}; \ No newline at end of file +}; diff --git a/src/main/resources/static/js/admin/chat/chat-editor.js b/src/main/resources/static/js/admin/chat/chat-editor.js index 0a461a88..1cb56fdb 100644 --- a/src/main/resources/static/js/admin/chat/chat-editor.js +++ b/src/main/resources/static/js/admin/chat/chat-editor.js @@ -1,23 +1,44 @@ -// 대본 블록 추가 +// 대본 입력창 자동 높이 +const resizeScriptTextarea = (textarea) => { + if (!textarea) return; + textarea.style.height = 'auto'; + textarea.style.overflowY = 'hidden'; + textarea.style.height = `${textarea.scrollHeight}px`; +}; + +const bindScriptTextareaAutosize = (textarea) => { + if (!textarea) return; + textarea.addEventListener('input', () => { + resizeScriptTextarea(textarea); + if (window.updateChatPreview) window.updateChatPreview(); + }); + resizeScriptTextarea(textarea); +}; + +const initScriptTextareaAutosize = () => { + document.querySelectorAll('.script-text').forEach(bindScriptTextareaAutosize); +}; + window.addScriptBlock = (containerId, speaker) => { const block = document.createElement('div'); block.className = 'flex items-start gap-4 script-block bg-white border border-gray-100 p-4 rounded-2xl shadow-sm mb-3 group'; block.innerHTML = ` +
- + `; document.getElementById(containerId)?.appendChild(block); const ta = block.querySelector('textarea'); - ta.addEventListener('input', function () { - this.style.height = 'auto'; - this.style.height = this.scrollHeight + 'px'; - if(window.updateChatPreview) window.updateChatPreview(); - }); + bindScriptTextareaAutosize(ta); }; // 감정 태그 삽입 @@ -59,7 +76,7 @@ document.addEventListener('change', (e) => { if (!e.target.classList.contains('emotion-insert-btn')) return; const textarea = e.target.closest('.script-block')?.querySelector('.script-text'); if (e.target.value && textarea) { - const tag = `[${e.target.value}]`; + const tag = `[${e.target.value}]`; const start = textarea.selectionStart; textarea.value = textarea.value.substring(0, start) + tag + textarea.value.substring(textarea.selectionEnd); e.target.value = ''; @@ -69,7 +86,7 @@ document.addEventListener('change', (e) => { } }); -// 분기점 토글 +// 분기 열기/닫기 window.addBranchBlock = () => { document.getElementById('branch-container')?.classList.remove('hidden'); document.getElementById('btn-add-branch')?.classList.add('hidden'); @@ -87,12 +104,12 @@ window.updateChatPreview = function () { if (!chatContainer) return; chatContainer.innerHTML = ''; - const nameA = document.getElementById('char-a-rep')?.value || '인물 A'; - const nameB = document.getElementById('char-b-rep')?.value || '인물 B'; + const nameA = document.getElementById('char-a-rep')?.value || '화자 A'; + const nameB = document.getElementById('char-b-rep')?.value || '화자 B'; const charAImg = document.getElementById('char-a-img-bg')?.style.backgroundImage || ''; const charBImg = document.getElementById('char-b-img-bg')?.style.backgroundImage || ''; - // 섹션별 대사 렌더링 헬퍼 + // 섹션별 대본 렌더링 const renderBlocks = (containerSelector, sectionTitle = null) => { const blocks = document.querySelectorAll(`${containerSelector} .script-block`); if (blocks.length > 0 && sectionTitle) { @@ -104,9 +121,8 @@ window.updateChatPreview = function () { const ta = block.querySelector('.script-text'); if (!ta) return; - // [태그] 숨김 처리 + // [태그]와 html 태그 제거 let text = ta.value.replace(/\[.*?\]/g, '').replace(/<[^>]+>/g, '').trim(); - if (!text) return; text = text.replace(/\n/g, '
'); @@ -120,7 +136,7 @@ window.updateChatPreview = function () { } else if (type === 'A') { chatContainer.innerHTML += `
-
+

${nameA}

@@ -131,7 +147,7 @@ window.updateChatPreview = function () { } else if (type === 'B') { chatContainer.innerHTML += `
-
+

${nameB}

@@ -143,49 +159,45 @@ window.updateChatPreview = function () { }); }; - // 1. 시작 노드 + // 1. 시작 대본 renderBlocks('#start-node-container'); - // 2. 분기점 버튼 동기화 + // 2. 분기 버튼 업데이트 const branchContainer = document.getElementById('branch-container'); const branchChoiceUI = document.getElementById('preview-branch-choice'); if (branchContainer && !branchContainer.classList.contains('hidden')) { - // 분기점이 열려있으면 미리보기에서도 선택지 UI를 보여줌 if (branchChoiceUI) branchChoiceUI.classList.remove('hidden'); - // 폼에 입력된 버튼 텍스트 가져와서 동기화 const labelA = document.getElementById('branch-a-label')?.value || 'A 선택지를 입력하세요'; const labelB = document.getElementById('branch-b-label')?.value || 'B 선택지를 입력하세요'; const btnA = document.getElementById('branch-btn-a'); const btnB = document.getElementById('branch-btn-b'); - // 버튼 텍스트에도 줄바꿈 허용 처리를 위해 innerText 대신 innerHTML과 정규식 사용 if (btnA) btnA.innerHTML = labelA.replace(/\n/g, '
'); if (btnB) btnB.innerHTML = labelB.replace(/\n/g, '
'); renderBlocks('#branch-a-node-container', 'OPTION A PATH'); renderBlocks('#branch-b-node-container', 'OPTION B PATH'); } else { - // 분기점이 닫혀있으면 숨김 if (branchChoiceUI) branchChoiceUI.classList.add('hidden'); } - // 3. 클로징 노드 + // 3. 클로징 대본 renderBlocks('#closing-node-container'); chatContainer.scrollTop = chatContainer.scrollHeight; }; -// 분기점 버튼 텍스트(branch-a-label, branch-b-label) 입력 시 즉시 미리보기 동기화 +// 분기 버튼 텍스트 입력 시 즉시 미리보기 반영 document.addEventListener('input', (e) => { if (e.target.id === 'branch-a-label' || e.target.id === 'branch-b-label') { if (window.updateChatPreview) window.updateChatPreview(); } }); -// 분기 선택 (사용자가 분기 버튼 클릭 시) +// 분기 선택 (사용자 미리보기용) window.selectBranch = function (branch) { const branchChoice = document.getElementById('preview-branch-choice'); if (branchChoice) branchChoice.classList.add('hidden'); @@ -193,8 +205,8 @@ window.selectBranch = function (branch) { const chatContainer = document.getElementById('preview-chat-container'); if (!chatContainer) return; - const nameA = document.getElementById('char-a-title')?.value || '인물 A'; - const nameB = document.getElementById('char-b-title')?.value || '인물 B'; + const nameA = document.getElementById('char-a-rep')?.value || '화자 A'; + const nameB = document.getElementById('char-b-rep')?.value || '화자 B'; const charAImg = document.getElementById('char-a-img-bg')?.style.backgroundImage || ''; const charBImg = document.getElementById('char-b-img-bg')?.style.backgroundImage || ''; @@ -204,33 +216,33 @@ window.selectBranch = function (branch) { : (document.getElementById('branch-b-label')?.value || 'B 선택'); chatContainer.innerHTML += `
"${choiceLabel}" 선택
`; - // 해당 분기 대사 + // 선택된 분기 대본 const nodeId = branch === 'A' ? 'branch-a-node-container' : 'branch-b-node-container'; document.querySelectorAll(`#${nodeId} .script-block`).forEach(block => { const type = block.querySelector('.speaker-select')?.value || block.dataset.speaker; - const ta = block.querySelector('.script-text'); + const ta = block.querySelector('.script-text'); if (!ta) return; - let text = ta.value.replace(/<[^>]+>/g, '').trim(); + let text = ta.value.replace(/<[^>]+>/g, '').trim(); if (!text) return; - text = text.replace(/\n/g, '
'); + text = text.replace(/\n/g, '
'); chatContainer.innerHTML += _buildBubble(type, text, nameA, nameB, charAImg, charBImg); }); - // 클로징 대사 + // 클로징 대본 document.querySelectorAll('#closing-node-container .script-block').forEach(block => { const type = block.querySelector('.speaker-select')?.value || block.dataset.speaker; - const ta = block.querySelector('.script-text'); + const ta = block.querySelector('.script-text'); if (!ta) return; - let text = ta.value.replace(/<[^>]+>/g, '').trim(); + let text = ta.value.replace(/<[^>]+>/g, '').trim(); if (!text) return; - text = text.replace(/\n/g, '
'); + text = text.replace(/\n/g, '
'); chatContainer.innerHTML += _buildBubble(type, text, nameA, nameB, charAImg, charBImg); }); chatContainer.scrollTop = chatContainer.scrollHeight; }; -// 말풍선 HTML 생성 헬퍼 +// 말풍선 HTML 생성 function _buildBubble(type, text, nameA, nameB, charAImg, charBImg) { if (type === 'NARRATOR') { return `

${text}

`; @@ -259,7 +271,9 @@ function _buildBubble(type, text, nameA, nameB, charAImg, charBImg) { } // 오디오 플레이어 -function _getAudio() { return document.getElementById('preview-audio'); } +function _getAudio() { + return document.getElementById('preview-audio'); +} function _formatTime(secs) { if (isNaN(secs) || !isFinite(secs)) return '0:00'; @@ -269,7 +283,7 @@ function _formatTime(secs) { } function _updatePlayIcon() { - const a = _getAudio(); + const a = _getAudio(); const icon = document.getElementById('audio-play-icon'); if (!icon) return; icon.setAttribute('d', (a && !a.paused) ? 'M6 19h4V5H6v14zm8-14v14h4V5h-4z' : 'M8 5v14l11-7z'); @@ -279,7 +293,8 @@ window.toggleAudio = function () { const a = _getAudio(); if (!a) return; if (!a.src || a.src === window.location.href) { - _openAudioPicker(); return; + _openAudioPicker(); + return; } a.paused ? a.play() : a.pause(); }; @@ -291,7 +306,7 @@ window.seekRelative = function (seconds) { }; window.seekAudio = function (event) { - const a = _getAudio(); + const a = _getAudio(); const bar = document.getElementById('audio-progress-bar'); if (!a || !a.duration || !bar) return; const rect = bar.getBoundingClientRect(); @@ -301,10 +316,10 @@ window.seekAudio = function (event) { function _openAudioPicker() { let picker = document.getElementById('audio-file-picker'); if (!picker) { - picker = document.createElement('input'); - picker.type = 'file'; + picker = document.createElement('input'); + picker.type = 'file'; picker.accept = 'audio/*'; - picker.id = 'audio-file-picker'; + picker.id = 'audio-file-picker'; picker.style.display = 'none'; document.body.appendChild(picker); picker.addEventListener('change', (e) => { @@ -321,17 +336,19 @@ function _openAudioPicker() { } document.addEventListener('DOMContentLoaded', () => { + initScriptTextareaAutosize(); + const a = _getAudio(); if (!a) return; a.addEventListener('timeupdate', () => { - const pct = a.duration ? (a.currentTime / a.duration * 100) : 0; - const fill = document.getElementById('audio-progress-fill'); + const pct = a.duration ? (a.currentTime / a.duration * 100) : 0; + const fill = document.getElementById('audio-progress-fill'); const thumb = document.getElementById('audio-progress-thumb'); - const cur = document.getElementById('audio-current-time'); - if (fill) fill.style.width = pct + '%'; - if (thumb) thumb.style.left = pct + '%'; - if (cur) cur.textContent = _formatTime(a.currentTime); + const cur = document.getElementById('audio-current-time'); + if (fill) fill.style.width = pct + '%'; + if (thumb) thumb.style.left = pct + '%'; + if (cur) cur.textContent = _formatTime(a.currentTime); }); a.addEventListener('durationchange', () => { @@ -339,7 +356,7 @@ document.addEventListener('DOMContentLoaded', () => { if (total) total.textContent = _formatTime(a.duration); }); - a.addEventListener('play', _updatePlayIcon); + a.addEventListener('play', _updatePlayIcon); a.addEventListener('pause', _updatePlayIcon); a.addEventListener('ended', _updatePlayIcon); @@ -352,12 +369,13 @@ document.addEventListener('DOMContentLoaded', () => { const file = e.dataTransfer.files[0]; if (!file || !file.type.startsWith('audio/')) return; a.src = URL.createObjectURL(file); - a.load(); a.play(); + a.load(); + a.play(); }); } }); -// 채팅 화면 ↔ 인트로 화면 전환 (미리보기 내 버튼 핸들러) +// 미리보기 화면 전환 window.switchToChatView = function () { document.getElementById('preview-battle-intro')?.classList.add('hidden'); document.getElementById('preview-battle-chat')?.classList.remove('hidden'); @@ -368,11 +386,19 @@ window.switchToIntroView = function () { document.getElementById('preview-battle-chat')?.classList.add('hidden'); document.getElementById('preview-battle-intro')?.classList.remove('hidden'); const a = _getAudio(); - if (a) { a.pause(); a.currentTime = 0; _updatePlayIcon(); } + if (a) { + a.pause(); + a.currentTime = 0; + _updatePlayIcon(); + } }; window.resetChatPreview = function () { if (window.updateChatPreview) window.updateChatPreview(); const a = _getAudio(); - if (a) { a.pause(); a.currentTime = 0; _updatePlayIcon(); } -}; \ No newline at end of file + if (a) { + a.pause(); + a.currentTime = 0; + _updatePlayIcon(); + } +}; diff --git a/src/main/resources/static/js/admin/core.js b/src/main/resources/static/js/admin/core.js index 6dfa7498..8b04a42e 100644 --- a/src/main/resources/static/js/admin/core.js +++ b/src/main/resources/static/js/admin/core.js @@ -1,4 +1,4 @@ -const token = localStorage.getItem("adminToken"); +const token = localStorage.getItem("adminToken"); if (!token) { alert("로그인이 필요합니다."); window.location.replace("/api/v1/admin/login"); @@ -8,31 +8,49 @@ const urlParams = new URLSearchParams(window.location.search); window.PickeData = { currentContentId: urlParams.get('id'), - currentTypeParam: (urlParams.get('type') || 'BATTLE').toUpperCase(), + currentTypeParam: (() => { + const type = (urlParams.get('type') || 'BATTLE').toUpperCase(); + return type === 'VOTE' ? 'POLL' : type; + })(), isEditMode: !!urlParams.get('id'), - token: token, + token, currentContentType: 'BATTLE', + currentTargetDate: null, + currentStatus: null, allTags: [], - selections: { BASIC: [], A: [], B: [] }, - currentTagTarget: 'BASIC', + selections: { + CATEGORY: [], + BATTLE_A_PHILOSOPHER: [], + BATTLE_A_VALUE: [], + BATTLE_B_PHILOSOPHER: [], + BATTLE_B_VALUE: [] + }, + currentTagTarget: 'CATEGORY', tempSelections: [], uploadedFiles: { thumbnail: null, charA: null, charB: null }, editingTagId: null, API: { - TAGS: `/api/v1/tags`, - TAG_CREATE: `/api/v1/admin/tags`, - TAG_UPDATE: (id) => `/api/v1/admin/tags/${id}`, - TAG_DELETE: (id) => `/api/v1/admin/tags/${id}`, - BATTLE_CREATE: `/api/v1/admin/battles`, + TAGS: '/api/v1/tags', + TAG_CREATE: '/api/v1/admin/tags', + TAG_UPDATE: (id) => `/api/v1/admin/tags/${id}`, + TAG_DELETE: (id) => `/api/v1/admin/tags/${id}`, + BATTLE_CREATE: '/api/v1/admin/battles', BATTLE_UPDATE: (id) => `/api/v1/admin/battles/${id}`, - BATTLE_GET: (id) => `/api/v1/battles/${id}`, - FILE_UPLOAD: `/api/v1/files/upload`, + BATTLE_GET: (id) => `/api/v1/admin/battles/${id}`, + QUIZ_CREATE: '/api/v1/admin/quizzes', + QUIZ_UPDATE: (id) => `/api/v1/admin/quizzes/${id}`, + QUIZ_GET: (id) => `/api/v1/admin/quizzes/${id}`, + POLL_CREATE: '/api/v1/admin/polls', + POLL_UPDATE: (id) => `/api/v1/admin/polls/${id}`, + POLL_GET: (id) => `/api/v1/admin/polls/${id}`, + FILE_UPLOAD: '/api/v1/files/upload', + FILE_UPLOAD_LOCAL: '/api/v1/files/upload/local' }, getAuthHeaders: () => ({ 'Content-Type': 'application/json', - 'Authorization': `Bearer ${window.PickeData.token}` + Authorization: `Bearer ${window.PickeData.token}` }), setValue: (id, value) => { @@ -42,9 +60,12 @@ window.PickeData = { setPreviewImage: (bgId, placeholderId, targetImgId, url) => { const bg = document.getElementById(bgId); - if (bg) { bg.style.backgroundImage = `url(${url})`; bg.style.opacity = '1'; } + if (bg) { + bg.style.backgroundImage = `url(${url})`; + bg.style.opacity = '1'; + } document.getElementById(placeholderId)?.classList.add('hidden'); - const t = document.getElementById(targetImgId); - if (t) t.style.backgroundImage = `url(${url})`; + const target = document.getElementById(targetImgId); + if (target) target.style.backgroundImage = `url(${url})`; } -}; \ No newline at end of file +}; diff --git a/src/main/resources/static/js/admin/notice/notice.js b/src/main/resources/static/js/admin/notice/notice.js new file mode 100644 index 00000000..821eb370 --- /dev/null +++ b/src/main/resources/static/js/admin/notice/notice.js @@ -0,0 +1,161 @@ +document.addEventListener("DOMContentLoaded", () => { + const token = localStorage.getItem("adminToken"); + if (!token) { + alert("로그인이 필요합니다."); + window.location.replace("/api/v1/admin/login"); + return; + } + + const api = { + list: (page = 0, size = 20, category = "ALL") => { + const params = new URLSearchParams({ page: String(page), size: String(size) }); + if (category && category !== "ALL") { + params.set("category", category); + } + return `/api/v1/admin/notices?${params.toString()}`; + }, + create: "/api/v1/admin/notices" + }; + + const categoryLabelMap = { + ALL: "전체", + CONTENT: "콘텐츠", + NOTICE: "공지사항", + EVENT: "이벤트" + }; + + const tbody = document.getElementById("notice-list-tbody"); + const form = document.getElementById("notice-form"); + const refreshButton = document.getElementById("refresh-notice-list"); + const createCategoryButtons = Array.from(document.querySelectorAll(".create-category-btn")); + const filterCategoryButtons = Array.from(document.querySelectorAll(".filter-category-btn")); + + let currentCreateCategory = "NOTICE"; + let currentFilterCategory = "ALL"; + + const authHeaders = () => ({ + "Content-Type": "application/json", + Authorization: `Bearer ${token}` + }); + + const renderDate = (dateTime) => { + if (!dateTime) return "-"; + return new Date(dateTime).toLocaleString("ko-KR", { + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit" + }); + }; + + const renderCategory = (category) => categoryLabelMap[category] || category; + + const applyButtonState = (buttons, activeValue, dataKey) => { + buttons.forEach((button) => { + const value = button.dataset[dataKey]; + const isActive = value === activeValue; + button.classList.toggle("border-black", isActive); + button.classList.toggle("bg-black", isActive); + button.classList.toggle("text-white", isActive); + button.classList.toggle("border-gray-200", !isActive); + button.classList.toggle("bg-gray-50", !isActive); + button.classList.toggle("text-gray-600", !isActive); + }); + }; + + const renderRows = (items) => { + tbody.innerHTML = ""; + if (!items || items.length === 0) { + tbody.innerHTML = `등록된 공지가 없습니다.`; + return; + } + + items.forEach((item) => { + const tr = document.createElement("tr"); + tr.className = "hover:bg-gray-50"; + tr.innerHTML = ` + ${item.notificationId} + + + ${renderCategory(item.category)} + + + ${item.title || "-"} + ${renderDate(item.createdAt)} + `; + tbody.appendChild(tr); + }); + }; + + const loadNotices = async () => { + tbody.innerHTML = `불러오는 중...`; + try { + const res = await fetch(api.list(0, 20, currentFilterCategory), { headers: authHeaders() }); + if (res.status === 401 || res.status === 403) { + alert("세션이 만료되었습니다. 다시 로그인해 주세요."); + window.location.replace("/api/v1/admin/login"); + return; + } + if (!res.ok) throw new Error(`공지 목록 조회 실패 (HTTP ${res.status})`); + const json = await res.json(); + const data = json.result || json.data || {}; + renderRows(data.items || []); + } catch (e) { + console.error("공지 목록 조회 오류:", e); + tbody.innerHTML = `공지 목록 로드에 실패했습니다.`; + } + }; + + createCategoryButtons.forEach((button) => { + button.addEventListener("click", () => { + currentCreateCategory = button.dataset.createCategory || "NOTICE"; + applyButtonState(createCategoryButtons, currentCreateCategory, "createCategory"); + }); + }); + + filterCategoryButtons.forEach((button) => { + button.addEventListener("click", async () => { + currentFilterCategory = button.dataset.filterCategory || "ALL"; + applyButtonState(filterCategoryButtons, currentFilterCategory, "filterCategory"); + await loadNotices(); + }); + }); + + form?.addEventListener("submit", async (event) => { + event.preventDefault(); + + const title = document.getElementById("notice-title")?.value?.trim() || ""; + const body = document.getElementById("notice-body")?.value?.trim() || ""; + + if (!title || !body) { + alert("제목과 내용을 입력해 주세요."); + return; + } + + const payload = { category: currentCreateCategory, title, body }; + + try { + const res = await fetch(api.create, { + method: "POST", + headers: authHeaders(), + body: JSON.stringify(payload) + }); + if (!res.ok) throw new Error(`공지 저장 실패 (HTTP ${res.status})`); + + document.getElementById("notice-title").value = ""; + document.getElementById("notice-body").value = ""; + alert("공지사항이 등록되었습니다."); + await loadNotices(); + } catch (e) { + console.error("공지 저장 오류:", e); + alert("공지 저장에 실패했습니다."); + } + }); + + refreshButton?.addEventListener("click", loadNotices); + + applyButtonState(createCategoryButtons, currentCreateCategory, "createCategory"); + applyButtonState(filterCategoryButtons, currentFilterCategory, "filterCategory"); + loadNotices(); +}); \ No newline at end of file diff --git a/src/main/resources/static/js/admin/tag/tags-controller.js b/src/main/resources/static/js/admin/tag/tags-controller.js index 12f9c132..2a6259c3 100644 --- a/src/main/resources/static/js/admin/tag/tags-controller.js +++ b/src/main/resources/static/js/admin/tag/tags-controller.js @@ -1,22 +1,29 @@ -window.fetchAllTags = async function () { +window.fetchAllTags = async function () { try { - const res = await fetch(PickeData.API.TAGS, { headers: PickeData.getAuthHeaders() }); + const res = await fetch(PickeData.API.TAGS, { headers: PickeData.getAuthHeaders() }); if (!res.ok) throw new Error(res.status); + const json = await res.json(); PickeData.allTags = json.result?.items ?? json.data?.items ?? []; window.renderTagModalList(); } catch (e) { - console.error("태그 로드 실패:", e); + console.error('태그 목록 조회 실패:', e); } }; window.submitNewTag = async () => { - const nameInput = document.getElementById('tag-name-input'); + const nameInput = document.getElementById('tag-name-input'); const typeSelect = document.getElementById('tag-type-select'); if (!nameInput || !typeSelect) return; + const name = nameInput.value.trim(); const type = typeSelect.value; - if (!name) { alert("태그 이름을 입력하세요."); nameInput.focus(); return; } + + if (!name) { + alert('태그 이름을 입력해 주세요.'); + nameInput.focus(); + return; + } if (PickeData.editingTagId) { try { @@ -25,47 +32,61 @@ window.submitNewTag = async () => { headers: PickeData.getAuthHeaders(), body: JSON.stringify({ name, type }) }); + if (res.ok) { await window.fetchAllTags(); window.refreshFormBadges(); - if(window.updatePreviewTags) window.updatePreviewTags(); + if (window.updatePreviewTags) window.updatePreviewTags(); document.getElementById('tag-modal')?.classList.add('hidden'); document.getElementById('tag-select-modal')?.classList.remove('hidden'); } - } catch (e) { alert("수정 중 서버 오류 발생"); } - } else { - try { - const res = await fetch(PickeData.API.TAG_CREATE, { - method: 'POST', - headers: PickeData.getAuthHeaders(), - body: JSON.stringify({ name, type }) - }); - if (res.ok) { - await window.fetchAllTags(); - document.getElementById('tag-modal')?.classList.add('hidden'); - document.getElementById('tag-select-modal')?.classList.remove('hidden'); - nameInput.value = ''; - } - } catch (e) { alert("생성 중 서버 오류 발생"); } + } catch (e) { + alert('태그 수정 중 오류가 발생했습니다.'); + } + return; + } + + try { + const res = await fetch(PickeData.API.TAG_CREATE, { + method: 'POST', + headers: PickeData.getAuthHeaders(), + body: JSON.stringify({ name, type }) + }); + + if (res.ok) { + await window.fetchAllTags(); + document.getElementById('tag-modal')?.classList.add('hidden'); + document.getElementById('tag-select-modal')?.classList.remove('hidden'); + nameInput.value = ''; + } + } catch (e) { + alert('태그 생성 중 오류가 발생했습니다.'); } }; window.deleteTag = async function (tagId) { - if (!confirm("태그를 삭제하시겠습니까? (사용 중인 경우 삭제되지 않습니다.)")) return; + if (!confirm('태그를 삭제하시겠습니까? 사용 중인 태그는 삭제되지 않을 수 있습니다.')) return; + try { const res = await fetch(PickeData.API.TAG_DELETE(tagId), { method: 'DELETE', headers: PickeData.getAuthHeaders() }); + if (res.ok) { - ['BASIC', 'A', 'B'].forEach(type => { - if (PickeData.selections[type].includes(tagId)) window.removeTag(type, tagId); + Object.keys(PickeData.selections).forEach((target) => { + if (PickeData.selections[target].includes(tagId)) { + window.removeTag(target, tagId); + } }); - PickeData.tempSelections = PickeData.tempSelections.filter(id => id !== tagId); + PickeData.tempSelections = PickeData.tempSelections.filter((id) => id !== tagId); await window.fetchAllTags(); - } else { - const err = await res.json(); - alert(err.message || "삭제할 수 없는 태그입니다."); + return; } - } catch (e) { console.error("태그 삭제 오류:", e); } -}; \ No newline at end of file + + const err = await res.json(); + alert(err.message || '삭제할 수 없는 태그입니다.'); + } catch (e) { + console.error('태그 삭제 실패:', e); + } +}; diff --git a/src/main/resources/static/js/admin/tag/tags-ui.js b/src/main/resources/static/js/admin/tag/tags-ui.js index ed7fe24a..53be1b52 100644 --- a/src/main/resources/static/js/admin/tag/tags-ui.js +++ b/src/main/resources/static/js/admin/tag/tags-ui.js @@ -1,101 +1,155 @@ +window.TagTargetConfig = { + CATEGORY: { + containerIds: ['basic-tags-container'], + allowedTypes: ['CATEGORY'], + preview: true + }, + BATTLE_A_PHILOSOPHER: { + containerIds: ['battle-a-philosopher-tags-container'], + allowedTypes: ['PHILOSOPHER'] + }, + BATTLE_A_VALUE: { + containerIds: ['battle-a-value-tags-container'], + allowedTypes: ['VALUE'] + }, + BATTLE_B_PHILOSOPHER: { + containerIds: ['battle-b-philosopher-tags-container'], + allowedTypes: ['PHILOSOPHER'] + }, + BATTLE_B_VALUE: { + containerIds: ['battle-b-value-tags-container'], + allowedTypes: ['VALUE'] + } +}; - -// 태그 선택 모달 열기 window.openTagSelectModal = (target) => { + if (!PickeData.selections[target]) return; PickeData.currentTagTarget = target; PickeData.tempSelections = [...PickeData.selections[target]]; - if (document.getElementById('tag-search-input')) document.getElementById('tag-search-input').value = ''; + const searchInput = document.getElementById('tag-search-input'); + if (searchInput) searchInput.value = ''; window.renderTagModalList(); document.getElementById('tag-select-modal')?.classList.remove('hidden'); }; -// 모달 닫기 window.closeTagSelectModal = () => { document.getElementById('tag-select-modal')?.classList.add('hidden'); }; -// 태그 선택 토글 window.toggleTagSelection = (tagId) => { PickeData.tempSelections = PickeData.tempSelections.includes(tagId) - ? PickeData.tempSelections.filter(id => id !== tagId) + ? PickeData.tempSelections.filter((id) => id !== tagId) : [...PickeData.tempSelections, tagId]; - window.renderTagModalList(document.getElementById('tag-search-input')?.value || ""); + window.renderTagModalList(document.getElementById('tag-search-input')?.value || ''); }; -window.renderTagModalList = function (searchQuery = "") { +window.renderTagModalList = function (searchQuery = '') { const container = document.getElementById('tag-list-container'); if (!container) return; + + const currentConfig = window.TagTargetConfig[PickeData.currentTagTarget] || window.TagTargetConfig.CATEGORY; + const allowedTypes = currentConfig.allowedTypes || []; + container.innerHTML = ''; - const filtered = PickeData.allTags.filter(t => t.name.includes(searchQuery)); - const groups = [{ t: "카테고리", v: "CATEGORY" }, { t: "철학자", v: "PHILOSOPHER" }, { t: "가치관", v: "VALUE" }]; - - groups.forEach(group => { - const tags = filtered.filter(t => t.type === group.v); - if (!tags.length) return; - let html = `

${group.t}

`; - tags.forEach(tag => { - const tid = tag.tagId || tag.id; - const selected = PickeData.tempSelections.includes(tid); - html += `
- -
`; - }); - container.innerHTML += html + `
`; + const filtered = PickeData.allTags.filter((tag) => { + const name = String(tag.name || ''); + const matchedName = name.includes(searchQuery); + const matchedType = allowedTypes.length === 0 || allowedTypes.includes(tag.type); + return matchedName && matchedType; }); + + const groups = [ + { title: 'CATEGORY', type: 'CATEGORY' }, + { title: 'PHILOSOPHER', type: 'PHILOSOPHER' }, + { title: 'VALUE', type: 'VALUE' } + ]; + + groups + .filter((group) => allowedTypes.length === 0 || allowedTypes.includes(group.type)) + .forEach((group) => { + const tags = filtered.filter((tag) => tag.type === group.type); + if (!tags.length) return; + + let html = `

${group.title}

`; + tags.forEach((tag) => { + const tagId = tag.tagId || tag.id; + const selected = PickeData.tempSelections.includes(tagId); + html += `
+ + +
`; + }); + container.innerHTML += `${html}
`; + }); }; window.confirmTagSelection = () => { const target = PickeData.currentTagTarget; PickeData.selections[target] = [...PickeData.tempSelections]; window.refreshFormBadges(target); - if (target === 'BASIC' && window.updatePreviewTags) window.updatePreviewTags(); + + if (window.TagTargetConfig[target]?.preview && window.updatePreviewTags) { + window.updatePreviewTags(); + } + window.closeTagSelectModal(); }; window.refreshFormBadges = (specificTarget = null) => { - const targets = specificTarget ? [specificTarget] : ['BASIC', 'A', 'B']; - targets.forEach(target => { - const cid = target === 'BASIC' ? 'basic-tags-container' : `char-${target.toLowerCase()}-tags-container`; - const container = document.getElementById(cid); - if (!container) return; - container.querySelectorAll('.tag-badge').forEach(el => el.remove()); - PickeData.selections[target].forEach(tagId => { - const tag = PickeData.allTags.find(t => (t.tagId || t.id) === tagId); - if (!tag) return; - const b = document.createElement('div'); - b.className = "tag-badge group relative inline-flex items-center px-3 py-1.5 bg-gray-100 text-gray-600 border border-gray-200 rounded-full text-[10px] font-bold mr-2 mb-2 transition-all hover:bg-gray-200"; - b.innerHTML = `#${tag.name}×`; - container.insertBefore(b, container.lastElementChild); + const targets = specificTarget ? [specificTarget] : Object.keys(window.TagTargetConfig); + + targets.forEach((target) => { + const config = window.TagTargetConfig[target]; + if (!config) return; + + config.containerIds.forEach((containerId) => { + const container = document.getElementById(containerId); + if (!container) return; + + container.querySelectorAll('.tag-badge').forEach((el) => el.remove()); + + (PickeData.selections[target] || []).forEach((tagId) => { + const tag = PickeData.allTags.find((item) => (item.tagId || item.id) === tagId); + if (!tag) return; + + const badge = document.createElement('div'); + badge.className = 'tag-badge group relative inline-flex items-center px-3 py-1.5 bg-gray-100 text-gray-600 border border-gray-200 rounded-full text-[10px] font-bold mr-2 mb-2 transition-all hover:bg-gray-200'; + badge.innerHTML = `#${tag.name}×`; + container.insertBefore(badge, container.lastElementChild); + }); }); }); }; -// 배지에서 X 눌렀을 때 삭제 로직 -window.removeTag = function (type, tagId) { - PickeData.selections[type] = PickeData.selections[type].filter(id => id !== tagId); - window.refreshFormBadges(type); - if (type === 'BASIC' && window.updatePreviewTags) window.updatePreviewTags(); +window.removeTag = function (target, tagId) { + if (!PickeData.selections[target]) return; + + PickeData.selections[target] = PickeData.selections[target].filter((id) => id !== tagId); + window.refreshFormBadges(target); + + if (window.TagTargetConfig[target]?.preview && window.updatePreviewTags) { + window.updatePreviewTags(); + } }; -// 태그 생성 모달 열기 window.openTagCreateModal = () => { PickeData.editingTagId = null; - document.querySelector('#tag-modal h2').innerText = "새 태그 추가"; + document.querySelector('#tag-modal h2').innerText = '새 태그 생성'; document.getElementById('tag-name-input').value = ''; document.getElementById('tag-type-select').value = 'CATEGORY'; document.getElementById('tag-select-modal')?.classList.add('hidden'); document.getElementById('tag-modal')?.classList.remove('hidden'); }; -// 태그 수정 모달 열기 window.updateTagName = function (tagId) { - const tag = PickeData.allTags.find(t => t.tagId === tagId || t.id === tagId); + const tag = PickeData.allTags.find((item) => item.tagId === tagId || item.id === tagId); if (!tag) return; + PickeData.editingTagId = tagId; - document.querySelector('#tag-modal h2').innerText = "태그 수정"; + document.querySelector('#tag-modal h2').innerText = '태그 수정'; document.getElementById('tag-name-input').value = tag.name; document.getElementById('tag-type-select').value = tag.type; document.getElementById('tag-select-modal')?.classList.add('hidden'); @@ -106,17 +160,18 @@ window.updatePreviewTags = function () { const box = document.getElementById('preview-tags'); if (!box) return; - // BASIC(배틀 전체 태그) 그룹의 태그들을 미리보기 하단에 렌더링 - box.innerHTML = PickeData.selections.BASIC.map(tagId => { - const tag = PickeData.allTags.find(t => (t.tagId || t.id) === tagId); - return tag - ? `#${tag.name}` - : ''; - }).join(''); + box.innerHTML = (PickeData.selections.CATEGORY || []) + .map((tagId) => { + const tag = PickeData.allTags.find((item) => (item.tagId || item.id) === tagId); + return tag + ? `#${tag.name}` + : ''; + }) + .join(''); }; document.addEventListener('DOMContentLoaded', () => { document.getElementById('tag-search-input')?.addEventListener('input', (e) => { window.renderTagModalList(e.target.value.trim()); }); -}); \ No newline at end of file +}); diff --git a/src/main/resources/static/js/admin/ui/ui-interaction.js b/src/main/resources/static/js/admin/ui/ui-interaction.js index 323c9bf5..9846ee9e 100644 --- a/src/main/resources/static/js/admin/ui/ui-interaction.js +++ b/src/main/resources/static/js/admin/ui/ui-interaction.js @@ -56,7 +56,20 @@ document.addEventListener("DOMContentLoaded", () => { const typeKey = targetId.replace('form-', ''); document.getElementById(`preview-wrapper-${typeKey}`)?.classList.remove('hidden'); - PickeData.currentContentType = typeKey.toUpperCase(); + const contentTypeByForm = { battle: 'BATTLE', quiz: 'QUIZ', vote: 'POLL' }; + PickeData.currentContentType = contentTypeByForm[typeKey] || typeKey.toUpperCase(); + + // Update status bar type indicator + const statusType = document.getElementById('status-type'); + if (statusType) { + statusType.textContent = PickeData.currentContentType; + } + + // Show BRANCH MODE only for battle + const branchMode = document.getElementById('branch-mode-indicator'); + if (branchMode) { + branchMode.classList.toggle('hidden', typeKey !== 'battle'); + } }); }); @@ -94,6 +107,33 @@ document.addEventListener("DOMContentLoaded", () => { }; _updateClock(); setInterval(_updateClock, 30000); + + // Initialize status type + const statusType = document.getElementById('status-type'); + if (statusType) { + statusType.textContent = PickeData.currentContentType || 'BATTLE'; + } + + // Initialize BRANCH MODE visibility (show for battle) + const branchMode = document.getElementById('branch-mode-indicator'); + if (branchMode) { + branchMode.classList.toggle('hidden', (PickeData.currentContentType || 'BATTLE') !== 'BATTLE'); + } + + // Dirty Flag: 스크립트 블록 수정 추적 (이벤트 위임) + document.getElementById('section-script')?.addEventListener('input', (e) => { + if (e.target.classList.contains('script-text')) { + const scriptBlock = e.target.closest('.script-block'); + if (scriptBlock) { + const modFlag = scriptBlock.querySelector('.mod-flag'); + if (modFlag) { + modFlag.value = 'true'; + } + // 시각적 피드백: 테두리 색상 변경 + scriptBlock.classList.add('border-blue-300'); + } + } + }); }); // 전역 투표 옵션 선택 함수 diff --git a/src/main/resources/static/js/admin/ui/ui-sync.js b/src/main/resources/static/js/admin/ui/ui-sync.js index 29567545..f2bd2509 100644 --- a/src/main/resources/static/js/admin/ui/ui-sync.js +++ b/src/main/resources/static/js/admin/ui/ui-sync.js @@ -1,54 +1,48 @@ document.addEventListener('input', (e) => { - const id = e.target.id; + const id = e.target.id; const val = e.target.value; - const fv = val.replace(/\n/g, '
'); + const fv = val.replace(/\n/g, '
'); - // Textarea 자동 높이 조절 if (e.target.tagName.toLowerCase() === 'textarea') { e.target.style.height = 'auto'; - e.target.style.height = (e.target.scrollHeight) + 'px'; + e.target.style.height = `${e.target.scrollHeight}px`; } const set = (elId, content, html = false) => { const el = document.getElementById(elId); - if (el) html ? el.innerHTML = content : el.innerText = content; + if (!el) return; + if (html) el.innerHTML = content; + else el.innerText = content; }; - // 배틀 실시간 동기화 if (id === 'content-title') { - set('preview-title-intro', fv || '제목을 입력해주세요', true); - set('preview-title-chat', val || '제목 없음'); + set('preview-title-intro', fv || '제목', true); + set('preview-title-chat', val || '설명'); } - if (id === 'content-desc') set('preview-desc', fv || '설명이 여기에 표시됩니다.', true); - - // A 인물 동기화 - if (id === 'char-a-title') set('preview-char-a-title', val || '주장'); - if (id === 'char-a-rep') set('preview-char-a-rep', val || '철학자'); - if (id === 'char-a-stance') set('preview-char-a-stance', fv, true); - - // B 인물 동기화 - if (id === 'char-b-title') set('preview-char-b-title', val || '주장'); - if (id === 'char-b-rep') set('preview-char-b-rep', val || '철학자'); - if (id === 'char-b-stance') set('preview-char-b-stance', fv, true); - - // 퀴즈 실시간 동기화 - if (id === 'quiz-question') set('pv-quiz-q', fv || '퀴즈 질문을 입력하세요.', true); - if (id === 'quiz-o-text') set('pv-quiz-o-text', val || '텍스트'); - if (id === 'quiz-o-desc') set('pv-quiz-o-desc', val || '설명'); - if (id === 'quiz-x-text') set('pv-quiz-x-text', val || '텍스트'); - if (id === 'quiz-x-desc') set('pv-quiz-x-desc', val || '설명'); - if (id === 'quiz-desc') set('pv-quiz-desc', fv, true); - - // 투표 실시간 동기화 - if (id === 'vote-q-prefix') set('pv-vote-prefix', val || '앞 내용'); - if (id === 'vote-q-suffix') set('pv-vote-suffix', val || '뒷 내용'); - if (id === 'vote-desc') set('pv-vote-desc', fv, true); - if (id.startsWith('vote-opt-')) { - const num = id.split('-').pop(); - set(`pv-vote-opt${num}`, val || `보기${num}`); + if (id === 'content-desc') set('preview-desc', fv || '설명', true); + + if (id === 'char-a-title') set('preview-char-a-title', val || '주장'); + if (id === 'char-a-rep') set('preview-char-a-rep', val || '철학자'); + if (id === 'char-a-stance') set('preview-char-a-stance', fv, true); + + if (id === 'char-b-title') set('preview-char-b-title', val || '주장'); + if (id === 'char-b-rep') set('preview-char-b-rep', val || '철학자'); + if (id === 'char-b-stance') set('preview-char-b-stance', fv, true); + + if (id === 'quiz-title') set('pv-quiz-q', fv || '퀴즈 제목', true); + if (id === 'quiz-option-a-title') set('pv-quiz-o-text', val || '참여문학'); + if (id === 'quiz-option-a-detail') set('pv-quiz-o-desc', val || '참여문학은 좋습니다.'); + if (id === 'quiz-option-b-title') set('pv-quiz-x-text', val || '순수문학'); + if (id === 'quiz-option-b-detail') set('pv-quiz-x-desc', val || '순수문학은 좋습니다.'); + + if (id === 'poll-title-prefix') set('pv-vote-prefix', val || '나에게 예술이란'); + if (id === 'poll-title-suffix') set('pv-vote-suffix', val || ' 하는 행위이다.'); + if (id.startsWith('poll-option-') && id.endsWith('-title')) { + const num = id.split('-')[2]; + set(`pv-vote-opt${num}`, val || `Option ${num}`); + set(`pv-bar-label-${num}`, val || `Option ${num}`); } - // 채팅 미리보기 렌더링 즉시 업데이트 if (id === 'branch-a-label' || id === 'branch-b-label' || id === 'char-a-rep' || id === 'char-b-rep') { if (window.updateChatPreview) window.updateChatPreview(); } diff --git a/src/main/resources/templates/admin/admin-notice.html b/src/main/resources/templates/admin/admin-notice.html new file mode 100644 index 00000000..3399da0a --- /dev/null +++ b/src/main/resources/templates/admin/admin-notice.html @@ -0,0 +1,83 @@ + + + + + + Picke Admin - 공지사항 + + + + + + +
+ +
+
+

공지사항 작성

+

저장하면 사용자 알림으로 노출됩니다.

+ +
+
+ +
+ + + +
+
+ +
+ + +
+ +
+ + +
+ + +
+
+ +
+
+

최근 공지

+ +
+ +
+
+ + + + +
+
+ +
+ + + + + + + + + + + + +
ID카테고리제목작성일
불러오는 중...
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/components/form-battle.html b/src/main/resources/templates/admin/components/form-battle.html index b98e850b..a35d2826 100644 --- a/src/main/resources/templates/admin/components/form-battle.html +++ b/src/main/resources/templates/admin/components/form-battle.html @@ -1,41 +1,41 @@
-
+

1 기본 정보

- BASIC INFO + BATTLE
- +
- +
- +
- - + +
- - + +
- -
\ No newline at end of file +
diff --git a/src/main/resources/templates/admin/components/form-quiz.html b/src/main/resources/templates/admin/components/form-quiz.html index 36f1f079..1274c881 100644 --- a/src/main/resources/templates/admin/components/form-quiz.html +++ b/src/main/resources/templates/admin/components/form-quiz.html @@ -7,83 +7,48 @@

- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - + +
- +
-
-
+
+ +
- +
-
-
- - -
-
- - -
+
+ + +
+
+ +
-
-
+
+ +
- + +
+
+ +
-
-
- - -
-
- - -
+
+ +

-
\ No newline at end of file +
diff --git a/src/main/resources/templates/admin/components/form-vote.html b/src/main/resources/templates/admin/components/form-vote.html index 0a074c7f..19acdcab 100644 --- a/src/main/resources/templates/admin/components/form-vote.html +++ b/src/main/resources/templates/admin/components/form-vote.html @@ -2,53 +2,50 @@

1 투표 등록

- VOTE + POLL
- - + +
- - + +
- -
- - -
- - -
-
- 1 - + +
+
+ + +
-
- 2 - + +
+ + +
-
- 3 - + +
+ + +
-
- 4 - + +
+ + +
-
\ No newline at end of file +
diff --git a/src/main/resources/templates/admin/fragments/header.html b/src/main/resources/templates/admin/fragments/header.html index ec99dbe3..1a59f4c5 100644 --- a/src/main/resources/templates/admin/fragments/header.html +++ b/src/main/resources/templates/admin/fragments/header.html @@ -1,8 +1,16 @@
-
- Pické - Admin +
+
+ Picke + Admin +
+
-
ADMIN
-
\ No newline at end of file +
+ ADMIN +
+ diff --git a/src/main/resources/templates/admin/fragments/preview.html b/src/main/resources/templates/admin/fragments/preview.html index 0cac253e..58c99276 100644 --- a/src/main/resources/templates/admin/fragments/preview.html +++ b/src/main/resources/templates/admin/fragments/preview.html @@ -2,7 +2,7 @@
실시간 미리보기 - BRANCH MODE +
@@ -110,7 +110,7 @@

-
diff --git a/src/main/resources/templates/admin/picke-list.html b/src/main/resources/templates/admin/picke-list.html index 012960e7..52756a9e 100644 --- a/src/main/resources/templates/admin/picke-list.html +++ b/src/main/resources/templates/admin/picke-list.html @@ -3,15 +3,30 @@ - Pické Admin - 콘텐츠 관리 + Picke Admin - 콘텐츠 관리 @@ -22,19 +37,27 @@

콘텐츠 관리

-

배틀, 퀴즈, 투표 콘텐츠를 조회하고 관리합니다.

+

배틀, 퀴즈, 투표 콘텐츠를 확인하고 수정할 수 있습니다.

+
+ + + + +
+
- - - - + + + + +
@@ -43,44 +66,57 @@

콘텐츠 관리

ID 유형 - 콘텐츠 제목 + 제목 상태 - 등록일 + 생성일 관리 - -
-
- 데이터를 불러오는 중... -
- + + +
+
+ 데이터를 불러오는 중입니다... +
+ +
+
- \ No newline at end of file + From 53582bc8f2867b775495f41f4026b9e98976f3d5 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Sun, 12 Apr 2026 00:12:28 +0900 Subject: [PATCH 82/94] =?UTF-8?q?#152=20[Fix]=20=EC=8B=9C=EB=82=98?= =?UTF-8?q?=EB=A6=AC=EC=98=A4=20=EB=B0=9C=ED=96=89=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EB=B0=8F=20TTS/S3=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EA=B0=9C=EC=84=A0=20(#156)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ScenarioController.java | 82 ++------------ .../scenario/converter/ScenarioConverter.java | 40 +++---- .../scenario/dto/request/NodeRequest.java | 2 +- .../dto/request/ScenarioCreateRequest.java | 5 +- .../scenario/dto/response/NodeResponse.java | 2 +- .../scenario/dto/response/OptionResponse.java | 2 +- .../domain/scenario/entity/Scenario.java | 22 +++- .../domain/scenario/entity/ScenarioNode.java | 4 +- .../picke/domain/scenario/entity/Script.java | 1 + .../service/ScenarioAudioPipelineService.java | 6 +- .../scenario/service/ScenarioService.java | 8 +- .../scenario/service/ScenarioServiceImpl.java | 102 +++++++++++++----- .../global/common/exception/ErrorCode.java | 65 +++++------ .../service/LocalDraftFileStorageService.java | 14 +-- .../s3/controller/FileUploadController.java | 58 ++++++---- .../ResourceRedirectController.java | 46 ++++---- .../infra/s3/util/ResourceUrlProvider.java | 38 ++++--- .../tts/service/ElevenLabsTtsServiceImpl.java | 54 ++++++---- .../tts/service/FishAudioTtsServiceImpl.java | 65 ++++------- .../service/GoogleCloudTtsServiceImpl.java | 71 ------------ .../tts/service/OpenAiTtsServiceImpl.java | 97 ----------------- .../global/infra/tts/service/TtsService.java | 5 +- src/main/resources/application.yml | 9 +- 23 files changed, 330 insertions(+), 468 deletions(-) delete mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java delete mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java diff --git a/src/main/java/com/swyp/picke/domain/scenario/controller/ScenarioController.java b/src/main/java/com/swyp/picke/domain/scenario/controller/ScenarioController.java index 6ac63f37..b03bca91 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/controller/ScenarioController.java +++ b/src/main/java/com/swyp/picke/domain/scenario/controller/ScenarioController.java @@ -1,24 +1,19 @@ package com.swyp.picke.domain.scenario.controller; import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.domain.scenario.dto.request.ScenarioCreateRequest; -import com.swyp.picke.domain.scenario.dto.request.ScenarioStatusUpdateRequest; -import com.swyp.picke.domain.scenario.dto.response.AdminDeleteResponse; -import com.swyp.picke.domain.scenario.dto.response.AdminScenarioDetailResponse; -import com.swyp.picke.domain.scenario.dto.response.AdminScenarioResponse; import com.swyp.picke.domain.scenario.dto.response.UserScenarioResponse; import com.swyp.picke.domain.scenario.service.ScenarioService; import com.swyp.picke.global.common.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.Map; - -@Tag(name = "시나리오 (Scenario)", description = "시나리오 API") +@Tag(name = "시나리오 API", description = "사용자 시나리오 조회") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -27,19 +22,15 @@ public class ScenarioController { private final ScenarioService scenarioService; private final BattleService battleService; - @Operation(summary = "시나리오 통합 조회") + @Operation(summary = "배틀 시나리오 조회") @GetMapping("/battles/{battleId}/scenario") public ApiResponse getBattleScenario( @PathVariable Long battleId, @RequestAttribute(value = "userId", required = false) Long userId ) { - // 1. 배틀 데이터 조회 (제목, 철학자 리스트) var battleInfo = battleService.getBattleScenario(battleId); - - // 2. 시나리오 데이터 조회 (노드, 대사, 오디오 등) var scenarioInfo = scenarioService.getScenarioForUser(battleId, userId); - // 3. UserScenarioResponse 최상단에 바로 값 세팅 UserScenarioResponse response = scenarioInfo.toBuilder() .title(battleInfo.title()) .philosophers(battleInfo.philosophers()) @@ -47,61 +38,4 @@ public ApiResponse getBattleScenario( return ApiResponse.onSuccess(response); } - - @Operation(summary = "관리자용 배틀 시나리오 조회 (수정용)") - @PreAuthorize("hasRole('ADMIN')") - @GetMapping("/admin/battles/{battleId}/scenario") - public ApiResponse getAdminBattleScenario( - @PathVariable Long battleId) { - return ApiResponse.onSuccess(scenarioService.getScenarioForAdmin(battleId)); - } - - @Operation(summary = "시나리오 생성") - @PreAuthorize("hasRole('ADMIN')") - @PostMapping("/admin/scenarios") - @ResponseStatus(HttpStatus.CREATED) - public ApiResponse> createScenario( - @RequestBody ScenarioCreateRequest request) { - - Long scenarioId = scenarioService.createScenario(request); - - // Map.of 대신 null에도 안전한 HashMap 사용 - Map response = new java.util.HashMap<>(); - response.put("scenarioId", scenarioId); - - // 고정값 대신 프론트에서 보낸 상태값(PENDING 등)을 그대로 반환! - response.put("status", request.status()); - - return ApiResponse.onSuccess(response); - } - - @Operation(summary = "시나리오 내용 수정") - @PreAuthorize("hasRole('ADMIN')") - @PutMapping("/admin/scenarios/{scenarioId}") - public ApiResponse updateScenarioContent( - @PathVariable Long scenarioId, - @RequestBody ScenarioCreateRequest request) { - - scenarioService.updateScenarioContent(scenarioId, request); - return ApiResponse.onSuccess(null); - } - - @Operation(summary = "시나리오 상태 수정 (PUBLISHED 변경 시 자동 오디오 처리)") - @PreAuthorize("hasRole('ADMIN')") - @PatchMapping("/admin/scenarios/{scenarioId}") - public ApiResponse updateScenarioStatus( - @PathVariable Long scenarioId, - @RequestBody ScenarioStatusUpdateRequest request) { - - return ApiResponse.onSuccess(scenarioService.updateScenarioStatus(scenarioId, request.status())); - } - - @Operation(summary = "시나리오 삭제 (Soft Delete)") - @PreAuthorize("hasRole('ADMIN')") - @DeleteMapping("/admin/scenarios/{scenarioId}") - public ApiResponse deleteScenario( - @PathVariable Long scenarioId) { - - return ApiResponse.onSuccess(scenarioService.deleteScenario(scenarioId)); - } -} \ No newline at end of file +} diff --git a/src/main/java/com/swyp/picke/domain/scenario/converter/ScenarioConverter.java b/src/main/java/com/swyp/picke/domain/scenario/converter/ScenarioConverter.java index 53213bda..a5b73b06 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/converter/ScenarioConverter.java +++ b/src/main/java/com/swyp/picke/domain/scenario/converter/ScenarioConverter.java @@ -1,5 +1,9 @@ package com.swyp.picke.domain.scenario.converter; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioDetailResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioNodeResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioOptionResponse; +import com.swyp.picke.domain.admin.dto.scenario.response.AdminScenarioScriptResponse; import com.swyp.picke.domain.scenario.dto.response.*; import com.swyp.picke.domain.scenario.entity.InteractiveOption; import com.swyp.picke.domain.scenario.entity.Scenario; @@ -8,7 +12,6 @@ import com.swyp.picke.domain.scenario.enums.AudioPathType; import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.HashMap; @@ -21,12 +24,8 @@ public class ScenarioConverter { private final ResourceUrlProvider resourceUrlProvider; - private static final String BASE_SHARE_URL = "https://pique.app/battles/"; - /** - * [유저용] Scenario 엔티티를 프론트엔드 전달용 DTO로 변환합니다. - */ - public UserScenarioResponse toUserResponse(Scenario scenario, AudioPathType recommendedPathKey) { + public UserScenarioResponse toUserResponse(Scenario scenario, AudioPathType recommendedPathKey) { Long startNodeId = scenario.getNodes().stream() .filter(node -> Boolean.TRUE.equals(node.getIsStartNode())) .map(ScenarioNode::getId) @@ -56,22 +55,19 @@ public UserScenarioResponse toUserResponse(Scenario scenario, AudioPathType reco .build(); } - /** - * [관리자용] 시나리오 상세 변환 메서드 - */ - public AdminScenarioDetailResponse toAdminDetailResponse(Scenario scenario) { + public AdminScenarioDetailResponse toAdminDetailResponse(Scenario scenario) { return AdminScenarioDetailResponse.builder() .scenarioId(scenario.getId()) .battleId(scenario.getBattle().getId()) .title(scenario.getBattle().getTitle()) .isInteractive(scenario.getIsInteractive()) + .voiceSettings(new HashMap<>(scenario.getVoiceSettings())) .nodes(scenario.getNodes().stream() .map(this::toAdminNodeResponse) .collect(Collectors.toList())) .build(); } - // 유저용 변환 로직 private NodeResponse toUserNodeResponse(ScenarioNode node) { return NodeResponse.builder() .nodeId(node.getId()) @@ -82,7 +78,7 @@ private NodeResponse toUserNodeResponse(ScenarioNode node) { .map(this::toUserScriptResponse) .collect(Collectors.toList())) .interactiveOptions(node.getOptions().stream() - .map(this::toOptionResponse) + .map(this::toUserOptionResponse) .collect(Collectors.toList())) .build(); } @@ -102,9 +98,8 @@ private ScriptResponse toUserScriptResponse(Script script) { .build(); } - // 관리자용 변환 로직 - private NodeResponse toAdminNodeResponse(ScenarioNode node) { - return NodeResponse.builder() + private AdminScenarioNodeResponse toAdminNodeResponse(ScenarioNode node) { + return AdminScenarioNodeResponse.builder() .nodeId(node.getId()) .nodeName(node.getNodeName()) .audioDuration(node.getAudioDuration()) @@ -113,13 +108,13 @@ private NodeResponse toAdminNodeResponse(ScenarioNode node) { .map(this::toAdminScriptResponse) .collect(Collectors.toList())) .interactiveOptions(node.getOptions().stream() - .map(this::toOptionResponse) + .map(this::toAdminOptionResponse) .collect(Collectors.toList())) .build(); } - private ScriptResponse toAdminScriptResponse(Script script) { - return ScriptResponse.builder() + private AdminScenarioScriptResponse toAdminScriptResponse(Script script) { + return AdminScenarioScriptResponse.builder() .scriptId(script.getId()) .startTimeMs(script.getStartTimeMs()) .speakerType(script.getSpeakerType()) @@ -128,10 +123,17 @@ private ScriptResponse toAdminScriptResponse(Script script) { .build(); } - private OptionResponse toOptionResponse(InteractiveOption option) { + private OptionResponse toUserOptionResponse(InteractiveOption option) { return OptionResponse.builder() .label(option.getLabel()) .nextNodeId(option.getNextNodeId()) .build(); } + + private AdminScenarioOptionResponse toAdminOptionResponse(InteractiveOption option) { + return AdminScenarioOptionResponse.builder() + .label(option.getLabel()) + .nextNodeId(option.getNextNodeId()) + .build(); + } } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/scenario/dto/request/NodeRequest.java b/src/main/java/com/swyp/picke/domain/scenario/dto/request/NodeRequest.java index 0029cb55..53ddb56c 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/dto/request/NodeRequest.java +++ b/src/main/java/com/swyp/picke/domain/scenario/dto/request/NodeRequest.java @@ -5,7 +5,7 @@ public record NodeRequest( String nodeName, Boolean isStartNode, - String autoNextNode, // 자동 넘김 노드 이름 추가 + String autoNextNode, List scripts, List interactiveOptions ) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/scenario/dto/request/ScenarioCreateRequest.java b/src/main/java/com/swyp/picke/domain/scenario/dto/request/ScenarioCreateRequest.java index ff1d74db..cd1e38e8 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/dto/request/ScenarioCreateRequest.java +++ b/src/main/java/com/swyp/picke/domain/scenario/dto/request/ScenarioCreateRequest.java @@ -1,11 +1,14 @@ package com.swyp.picke.domain.scenario.dto.request; import com.swyp.picke.domain.scenario.enums.ScenarioStatus; +import com.swyp.picke.domain.scenario.enums.SpeakerType; import java.util.List; +import java.util.Map; public record ScenarioCreateRequest( Long battleId, Boolean isInteractive, ScenarioStatus status, - List nodes + List nodes, + Map voiceSettings ) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/scenario/dto/response/NodeResponse.java b/src/main/java/com/swyp/picke/domain/scenario/dto/response/NodeResponse.java index 7a26bb35..89e63d7c 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/dto/response/NodeResponse.java +++ b/src/main/java/com/swyp/picke/domain/scenario/dto/response/NodeResponse.java @@ -7,7 +7,7 @@ public record NodeResponse( Long nodeId, String nodeName, - Integer audioDuration, // 프론트엔드 재생 시간 표시에 활용 + Integer audioDuration, Long autoNextNodeId, List scripts, List interactiveOptions diff --git a/src/main/java/com/swyp/picke/domain/scenario/dto/response/OptionResponse.java b/src/main/java/com/swyp/picke/domain/scenario/dto/response/OptionResponse.java index e5e8c4b5..189d16c3 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/dto/response/OptionResponse.java +++ b/src/main/java/com/swyp/picke/domain/scenario/dto/response/OptionResponse.java @@ -6,4 +6,4 @@ public record OptionResponse( String label, Long nextNodeId -) {} \ No newline at end of file +) {} diff --git a/src/main/java/com/swyp/picke/domain/scenario/entity/Scenario.java b/src/main/java/com/swyp/picke/domain/scenario/entity/Scenario.java index a30d9abe..4f68b794 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/entity/Scenario.java +++ b/src/main/java/com/swyp/picke/domain/scenario/entity/Scenario.java @@ -4,6 +4,7 @@ import com.swyp.picke.domain.scenario.enums.AudioPathType; import com.swyp.picke.domain.scenario.enums.CreatorType; import com.swyp.picke.domain.scenario.enums.ScenarioStatus; +import com.swyp.picke.domain.scenario.enums.SpeakerType; import com.swyp.picke.global.common.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; @@ -41,6 +42,14 @@ public class Scenario extends BaseEntity { @Column(name = "audio_url") private Map audios = new EnumMap<>(AudioPathType.class); + @ElementCollection + @CollectionTable(name = "scenario_voice_settings", joinColumns = @JoinColumn(name = "scenario_id")) + @MapKeyEnumerated(EnumType.STRING) + @MapKeyColumn(name = "speaker_type") + @Column(name = "voice_code") + private Map voiceSettings = new EnumMap<>(SpeakerType.class); + + @OrderColumn(name = "node_order") @OneToMany(mappedBy = "scenario", cascade = CascadeType.ALL, orphanRemoval = true) private List nodes = new ArrayList<>(); @@ -68,4 +77,15 @@ public void addNode(ScenarioNode node) { public void clearAudios() { this.audios.clear(); } -} \ No newline at end of file + + public void replaceVoiceSettings(Map voiceSettings) { + this.voiceSettings.clear(); + if (voiceSettings != null) { + this.voiceSettings.putAll(voiceSettings); + } + } + + public String getVoiceCode(SpeakerType speakerType) { + return this.voiceSettings.get(speakerType); + } +} diff --git a/src/main/java/com/swyp/picke/domain/scenario/entity/ScenarioNode.java b/src/main/java/com/swyp/picke/domain/scenario/entity/ScenarioNode.java index 997e8765..1f060c45 100644 --- a/src/main/java/com/swyp/picke/domain/scenario/entity/ScenarioNode.java +++ b/src/main/java/com/swyp/picke/domain/scenario/entity/ScenarioNode.java @@ -32,9 +32,11 @@ public class ScenarioNode extends BaseEntity { @Column(name = "auto_next_node_id") private Long autoNextNodeId; + @OrderColumn(name = "script_order") @OneToMany(mappedBy = "node", cascade = CascadeType.ALL, orphanRemoval = true) private List + + + + + +
+ + + + + + + +
+ + + + + From 39b4cd20faa46794279d42cf4ca49f1dcdd786e5 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Thu, 16 Apr 2026 00:07:22 +0900 Subject: [PATCH 92/94] =?UTF-8?q?#184=20[Hotfix]=20dev=20=EB=B8=8C?= =?UTF-8?q?=EB=9E=9C=EC=B9=98=20#182=20=EB=A8=B8=EC=A7=80=20=EB=A1=A4?= =?UTF-8?q?=EB=B0=B1=20(#185)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 53 ----- .../controller/AdminBattleController.java | 51 ----- .../dto/request/AdminBattleCreateRequest.java | 24 --- .../dto/request/AdminBattleOptionRequest.java | 16 -- .../dto/request/AdminBattleUpdateRequest.java | 23 -- .../response/AdminBattleDeleteResponse.java | 13 -- .../response/AdminBattleDetailResponse.java | 36 ---- .../picke/domain/battle/enums/BattleType.java | 5 - .../domain/tag/dto/request/TagRequest.java | 13 -- .../tag/dto/response/TagDeleteResponse.java | 8 - .../domain/tag/dto/response/TagResponse.java | 12 -- .../test/controller/TestController.java | 34 --- .../swyp/picke/domain/vote/entity/Vote.java | 87 -------- .../vote/repository/VoteRepository.java | 69 ------ .../domain/vote/service/VoteService.java | 18 -- .../domain/vote/service/VoteServiceImpl.java | 200 ------------------ .../service/GoogleCloudTtsServiceImpl.java | 71 ------- .../tts/service/OpenAiTtsServiceImpl.java | 97 --------- .../resources/templates/share/result.html | 92 -------- 19 files changed, 922 deletions(-) delete mode 100644 .github/workflows/deploy.yml delete mode 100644 src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/test/controller/TestController.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/entity/Vote.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/service/VoteService.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java delete mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java delete mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java delete mode 100644 src/main/resources/templates/share/result.html diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 0f809702..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Java CI/CD with Gradle - -on: - push: - branches: [ "dev" ] # dev 브랜치에 푸시할 때 작동 - workflow_dispatch: # - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - cache: 'gradle' # 캐싱 추가: 빌드 속도가 훨씬 빨라집니다. - - - name: Build with Gradle - run: | - chmod +x ./gradlew - ./gradlew build -x test - - - name: Create .env file from Secret - run: | - cat <<'EOF' > .env - ${{ secrets.ENV_VARIABLES }} - EOF - - - name: Copy JAR and .env to EC2 - uses: appleboy/scp-action@v0.1.7 - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USERNAME }} - key: ${{ secrets.EC2_SSH_KEY }} - # -plain.jar는 배포에 필요 없으므로 제외합니다. - source: "build/libs/*-SNAPSHOT.jar, .env" - target: "~/" - strip_components: 2 - - - name: Deploy to EC2 - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USERNAME }} - key: ${{ secrets.EC2_SSH_KEY }} - script: | - fuser -k 8080/tcp || true - - chmod +x ~/start.sh - ~/start.sh \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java deleted file mode 100644 index b115abc3..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.swyp.picke.domain.battle.controller; - -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDeleteResponse; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDetailResponse; -import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.global.common.response.ApiResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.*; - -@Tag(name = "배틀 API (관리자)", description = "배틀 생성/수정/삭제 (관리자 전용)") -@RestController -@RequestMapping("/api/v1/admin/battles") -@RequiredArgsConstructor -@PreAuthorize("hasRole('ADMIN')") -public class AdminBattleController { - - private final BattleService battleService; - - @Operation(summary = "배틀 생성") - @PostMapping - public ApiResponse createBattle( - @RequestBody @Valid AdminBattleCreateRequest request, - @AuthenticationPrincipal Long adminUserId - ) { - return ApiResponse.onSuccess(battleService.createBattle(request, adminUserId)); - } - - @Operation(summary = "배틀 수정 (변경 필드만 포함)") - @PatchMapping("/{battleId}") - public ApiResponse updateBattle( - @PathVariable Long battleId, - @RequestBody @Valid AdminBattleUpdateRequest request - ) { - return ApiResponse.onSuccess(battleService.updateBattle(battleId, request)); - } - - @Operation(summary = "배틀 삭제") - @DeleteMapping("/{battleId}") - public ApiResponse deleteBattle( - @PathVariable Long battleId - ) { - return ApiResponse.onSuccess(battleService.deleteBattle(battleId)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java deleted file mode 100644 index 48aa5b4a..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; -import java.time.LocalDate; -import java.util.List; - -public record AdminBattleCreateRequest( - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - BattleType type, - BattleStatus status, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - List tagIds, - List options -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java deleted file mode 100644 index 36c1c212..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleOptionLabel; - -import java.util.List; - -public record AdminBattleOptionRequest( - BattleOptionLabel label, - String title, - String stance, - String representative, - String quote, - String imageUrl, - Boolean isCorrect, - List tagIds // 옵션 전용 태그 (철학자, 가치관 - 추후 사용자 유형 분석에 사용) -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java deleted file mode 100644 index aa5e4477..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleStatus; -import java.time.LocalDate; -import java.util.List; - -public record AdminBattleUpdateRequest( - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - Integer audioDuration, - BattleStatus status, - List tagIds, - List options -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java deleted file mode 100644 index 43c64d66..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.battle.dto.response; - -import java.time.LocalDateTime; - -/** - * 관리자 - 배틀 삭제 응답 - * 역할: 배틀이 성공적으로 소프트 딜리트 되었는지 확인하고 삭제 시점을 반환합니다. - */ - -public record AdminBattleDeleteResponse( - Boolean success, // 삭제 성공 여부 - LocalDateTime deletedAt // 삭제 처리된 일시 (Soft Delete) -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java deleted file mode 100644 index fd382332..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.swyp.picke.domain.battle.dto.response; - -import com.swyp.picke.domain.battle.enums.BattleCreatorType; -import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -/** - * 관리자 - 배틀 상세 상세 조회 응답 - * 역할: 관리자가 배틀의 모든 설정 값(상태, 생성자 타입, 수정일 등)을 확인하고 수정할 때 사용합니다. - */ - -public record AdminBattleDetailResponse( - Long battleId, - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - BattleType type, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - BattleStatus status, - BattleCreatorType creatorType, - List tags, - List options, - LocalDateTime createdAt, - LocalDateTime updatedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java deleted file mode 100644 index 648e1eff..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.swyp.picke.domain.battle.enums; - -public enum BattleType { - BATTLE, QUIZ, VOTE -} diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java b/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java deleted file mode 100644 index 736bfda6..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.tag.dto.request; - -import com.swyp.picke.domain.tag.enums.TagType; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -public record TagRequest( - @NotBlank(message = "태그 이름을 입력해주세요.") - String name, - - @NotNull(message = "태그 타입을 선택해주세요.") - TagType type -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java deleted file mode 100644 index 71b350e8..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.tag.dto.response; - -import java.time.LocalDateTime; - -public record TagDeleteResponse( - boolean success, - LocalDateTime deletedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java deleted file mode 100644 index 70554dde..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.swyp.picke.domain.tag.dto.response; - -import com.swyp.picke.domain.tag.enums.TagType; -import java.time.LocalDateTime; - -public record TagResponse( - Long tagId, - String name, - TagType type, - LocalDateTime createdAt, - LocalDateTime updatedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java deleted file mode 100644 index c937631e..00000000 --- a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.swyp.picke.domain.test.controller; - -import com.swyp.picke.domain.oauth.jwt.JwtProvider; -import com.swyp.picke.global.common.response.ApiResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/api/test") -@RequiredArgsConstructor -public class TestController { - - private final JwtProvider jwtProvider; - - @GetMapping("/response") - public ApiResponse> testResponse() { - List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); - return ApiResponse.onSuccess(teamMembers); - } - - @GetMapping("/token") - public ApiResponse> getTestToken( - @RequestParam(defaultValue = "1") Long userId - ) { - String token = jwtProvider.createAccessToken(userId, "USER"); - return ApiResponse.onSuccess(Map.of("accessToken", token)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java b/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java deleted file mode 100644 index 47054b65..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.swyp.picke.domain.vote.entity; - -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "votes") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Vote extends BaseEntity { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) - private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "battle_id", nullable = false) - private Battle battle; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "pre_vote_option_id") - private BattleOption preVoteOption; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "post_vote_option_id") - private BattleOption postVoteOption; - - @Column(name = "is_tts_listened", nullable = false) - private Boolean isTtsListened = false; - - @Builder - private Vote(User user, Battle battle, BattleOption preVoteOption, - BattleOption postVoteOption, Boolean isTtsListened) { - this.user = user; - this.battle = battle; - this.preVoteOption = preVoteOption; - this.postVoteOption = postVoteOption; - this.isTtsListened = isTtsListened != null ? isTtsListened : false; - } - - /** - * 최초 투표(사전 투표) 시 사용하는 정적 팩토리 메서드 - */ - public static Vote createPreVote(User user, Battle battle, BattleOption option) { - return Vote.builder() - .user(user) - .battle(battle) - .preVoteOption(option) - .isTtsListened(false) - // status 설정 삭제됨 - .build(); - } - - /** - * 사전 투표 옵션 수정 메서드 - */ - public void updatePreVote(BattleOption preVoteOption) { - this.preVoteOption = preVoteOption; - } - - /** - * 사후 투표 업데이트 - */ - public void doPostVote(BattleOption postOption) { - this.postVoteOption = postOption; - // status 업데이트 삭제됨 - } - - /** - * TTS 청취 상태 업데이트 - */ - public void completeTts() { - this.isTtsListened = true; - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java deleted file mode 100644 index 4159beb1..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.swyp.picke.domain.vote.repository; - -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.vote.entity.Vote; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; -import java.util.Optional; - -public interface VoteRepository extends JpaRepository { - - List findAllByBattle(Battle battle); - - Optional findByBattleIdAndUserId(Long battleId, Long userId); - - @Query("SELECT v FROM Vote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") - Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); - - Optional findByBattleAndUser(Battle battle, User user); - - long countByBattle(Battle battle); - - long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); - - Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); - - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + - "WHERE v.user.id = :userId ORDER BY v.createdAt DESC") - List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); - - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + - "WHERE v.user.id = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") - List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( - @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); - - long countByUserId(Long userId); - - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") - long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); - - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId " + - "AND v.postVoteOption IS NOT NULL " + - "AND v.preVoteOption <> v.postVoteOption") - long countOpinionChangesByUserId(@Param("userId") Long userId); - - List findByUserId(Long userId); - - // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) - @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") - List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); - - // 추천용: 유저가 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id = :userId") - List findParticipatedBattleIdsByUserId(@Param("userId") Long userId); - - // 추천용: 특정 배틀에 참여한 유저 ID 조회 - @Query("SELECT DISTINCT v.user.id FROM Vote v WHERE v.battle.id IN :battleIds") - List findUserIdsByBattleIds(@Param("battleIds") List battleIds); - - // 추천용: 특정 유저들이 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id IN :userIds") - List findParticipatedBattleIdsByUserIds(@Param("userIds") List userIds); -} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java deleted file mode 100644 index 77d68fe6..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.swyp.picke.domain.vote.service; - -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.vote.dto.request.VoteRequest; -import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; -import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; -import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; - -public interface VoteService { - BattleOption findPreVoteOption(Long battleId, Long userId); - Long findPostVoteOptionId(Long battleId, Long userId); - VoteStatsResponse getVoteStats(Long battleId); - MyVoteResponse getMyVote(Long battleId, Long userId); - VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request); - VoteResultResponse postVote(Long battleId, Long userId, VoteRequest request); - void deleteVotesByBattleId(Long battleId); - void completeTts(Long battleId, Long userId); -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java deleted file mode 100644 index 32a2d956..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.swyp.picke.domain.vote.service; - -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.battle.repository.BattleOptionRepository; -import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.user.enums.UserBattleStep; -import com.swyp.picke.domain.user.repository.UserRepository; -import com.swyp.picke.domain.user.service.UserBattleService; -import com.swyp.picke.domain.vote.converter.VoteConverter; -import com.swyp.picke.domain.vote.dto.request.VoteRequest; -import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; -import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; -import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; -import com.swyp.picke.global.common.exception.CustomException; -import com.swyp.picke.global.common.exception.ErrorCode; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.List; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class VoteServiceImpl implements VoteService { - - private final VoteRepository voteRepository; - private final BattleService battleService; - private final BattleOptionRepository battleOptionRepository; - private final UserRepository userRepository; - private final UserBattleService userBattleService; - - @Override - public BattleOption findPreVoteOption(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - - if (vote.getPreVoteOption() == null) { - throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); - } - return vote.getPreVoteOption(); - } - - @Override - public Long findPostVoteOptionId(Long battleId, Long userId) { - return voteRepository.findByBattleIdAndUserId(battleId, userId) - .map(vote -> vote.getPostVoteOption() != null ? vote.getPostVoteOption().getId() : null) - .orElse(null); - } - - @Override - public VoteStatsResponse getVoteStats(Long battleId) { - Battle battle = battleService.findById(battleId); - List options = battleOptionRepository.findByBattle(battle); - long totalCount = voteRepository.countByBattle(battle); - - List stats = options.stream() - .map(option -> { - long count = voteRepository.countByBattleAndPreVoteOption(battle, option); - double ratio = totalCount > 0 - ? Math.round((double) count / totalCount * 1000.0) / 10.0 - : 0.0; - return new VoteStatsResponse.OptionStat( - option.getId(), option.getLabel().name(), option.getTitle(), count, ratio); - }) - .toList(); - - LocalDateTime updatedAt = voteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) - .map(Vote::getUpdatedAt) - .orElse(null); - - return VoteConverter.toVoteStatsResponse(stats, totalCount, updatedAt); - } - - @Override - public MyVoteResponse getMyVote(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - - UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - return VoteConverter.toMyVoteResponse(vote, status.step()); - } - - @Override - @Transactional - public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request) { - // 1. 기본 정보 조회 (배틀, 유저, 선택한 옵션) - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleOption option = battleOptionRepository.findById(request.optionId()) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - - // 2. 기존 투표 여부 확인 (에러 대신 Optional로 받음) - Optional existingVote = voteRepository.findByBattleAndUser(battle, user); - Vote vote; - - if (existingVote.isPresent()) { - vote = existingVote.get(); - vote.updatePreVote(option); - } else { - vote = Vote.createPreVote(user, battle, option); - voteRepository.save(vote); - battle.addParticipant(); - } - - // 3. 현재 유저의 진행 단계 확인 - UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - - // 4. 단계 업데이트 (처음 참여하는 경우에만 단계를 PRE_VOTE로 변경) - // 이미 POST_VOTE나 COMPLETED라면 단계를 강제로 낮추지 않음 - if (status.step() == UserBattleStep.NONE) { - userBattleService.upsertStep(user, battle, UserBattleStep.PRE_VOTE); - } - - // 5. 현재 유지 중인 단계를 반환 (수정 후에도 COMPLETED 유지 가능) - UserBattleStep currentStep = (status.step() == UserBattleStep.NONE) ? UserBattleStep.PRE_VOTE : status.step(); - return new VoteResultResponse(vote.getId(), currentStep); - } - - @Override - @Transactional - public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest request) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleOption option = battleOptionRepository.findById(request.optionId()) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - - // [검증] 사전 투표를 완료한 상태(혹은 오디오 청취 완료 상태)인지 확인 - UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - if (status.step() == UserBattleStep.NONE) { - throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); - } - - // 1. 사후 투표 업데이트 - vote.doPostVote(option); - - // 2. 최종 완료 단계(COMPLETED)로 업데이트 - userBattleService.upsertStep(user, battle, UserBattleStep.COMPLETED); - - return new VoteResultResponse(vote.getId(), UserBattleStep.COMPLETED); - } - - @Override - @Transactional - public void deleteVotesByBattleId(Long battleId) { - // 1. 배틀 조회 - Battle battle = battleService.findById(battleId); - - // 2. 해당 배틀의 모든 투표 조회 - List votes = voteRepository.findAllByBattle(battle); - - for (Vote vote : votes) { - // 3. 유저의 진행 단계 초기화 (이건 유저별로 다 해줘야 함) - userBattleService.upsertStep(vote.getUser(), battle, UserBattleStep.NONE); - - // 4. 옵션별 카운트 감소 (필요 시) - if (vote.getPreVoteOption() != null) { /* 감소 로직 */ } - if (vote.getPostVoteOption() != null) { /* 감소 로직 */ } - } - - // 5. 투표 데이터 일괄 삭제 - voteRepository.deleteAllInBatch(votes); - } - - @Override - @Transactional - public void completeTts(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - // 1. 엔티티 상태 변경 (isTtsListened = true) - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - vote.completeTts(); - - // 2. 단계를 POST_VOTE(사후 투표 가능 단계)로 업데이트 - userBattleService.upsertStep(user, battle, UserBattleStep.POST_VOTE); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java b/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java deleted file mode 100644 index f61d22ec..00000000 --- a/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.swyp.picke.global.infra.tts.service; - -import com.google.auth.oauth2.GoogleCredentials; -import com.google.cloud.texttospeech.v1.*; -import com.google.protobuf.ByteString; -import com.swyp.picke.domain.scenario.enums.SpeakerType; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.util.UUID; - -@Slf4j -// @Primary - 사용할 때 주석 삭제 -@Service -public class GoogleCloudTtsServiceImpl implements TtsService { - - @Value("${spring.cloud.gcp.credentials.location}") - private String credentialsLocation; - - @Override - public File generateTtsWithSsml(String rawText, SpeakerType speakerType) throws Exception { - // SSML 태그가 없으면 자동으로 씌워줍니다. - String ssmlInput = rawText.trim().startsWith("") ? rawText : "" + rawText + ""; - - try (FileInputStream credentialsStream = new FileInputStream(credentialsLocation)) { - GoogleCredentials credentials = GoogleCredentials.fromStream(credentialsStream); - TextToSpeechSettings settings = TextToSpeechSettings.newBuilder() - .setCredentialsProvider(() -> credentials) - .build(); - - try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create(settings)) { - SynthesisInput input = SynthesisInput.newBuilder().setSsml(ssmlInput).build(); - VoiceSelectionParams voice = buildVoiceSelection(speakerType); - AudioConfig audioConfig = AudioConfig.newBuilder().setAudioEncoding(AudioEncoding.MP3).build(); - - // 실제 구글 API가 호출될 때만 찍히는 로그 - String logText = rawText.length() > 15 ? rawText.substring(0, 15) + "..." : rawText; - log.info("[TTS 호출] 💳 구글 API 실제 요청 발생! (화자: {}, 대사: '{}')", speakerType.name(), logText); - - SynthesizeSpeechResponse response = textToSpeechClient.synthesizeSpeech(input, voice, audioConfig); - ByteString audioContents = response.getAudioContent(); - - File tempFile = File.createTempFile("tts_" + UUID.randomUUID(), ".mp3"); - try (FileOutputStream out = new FileOutputStream(tempFile)) { - out.write(audioContents.toByteArray()); - } - return tempFile; - } - } catch (Exception e) { - log.error("[TTS 호출 실패] GCP 키 파일 확인 필요: {}", credentialsLocation, e); - throw e; - } - } - - private VoiceSelectionParams buildVoiceSelection(SpeakerType type) { - String voiceName = switch (type) { - case A -> "ko-KR-Wavenet-C"; - case B -> "ko-KR-Wavenet-D"; - case USER -> "ko-KR-Wavenet-B"; - case NARRATOR -> "ko-KR-Wavenet-A"; - }; - return VoiceSelectionParams.newBuilder() - .setLanguageCode("ko-KR") - .setName(voiceName) - .build(); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java b/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java deleted file mode 100644 index c5168e42..00000000 --- a/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.swyp.picke.global.infra.tts.service; - -import com.swyp.picke.domain.scenario.enums.SpeakerType; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.*; -import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; - -import java.io.File; -import java.io.FileOutputStream; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@Slf4j -// @Primary - 사용할 때 주석 삭제 -@Service -public class OpenAiTtsServiceImpl implements TtsService { - - @Value("${openai.api-key}") - private String openAiApiKey; - - @Value("${openai.tts.model:gpt-4o-mini-tts}") - private String ttsModel; - - @Value("${openai.tts.url:https://api.openai.com/v1/audio/speech}") - private String ttsUrl; - - @Override - public File generateTtsWithSsml(String rawText, SpeakerType speakerType) throws Exception { - // 1. 억지스러운 전처리 제거 (자연스러운 문장 부호 유지) - String actingText = cleanTextForNaturalFlow(rawText); - - String voice = getOpenAiVoice(speakerType); - double speed = getVoiceSpeed(speakerType); - - log.info("[TTS 호출] OpenAI 호출 (화자: {}, 속도: {}, 대사: '{}')", voice, speed, actingText); - - RestTemplate restTemplate = new RestTemplate(); - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - headers.setBearerAuth(openAiApiKey); - - Map requestBody = new HashMap<>(); - requestBody.put("model", ttsModel); - requestBody.put("input", actingText); - requestBody.put("voice", voice); - requestBody.put("response_format", "mp3"); - requestBody.put("speed", speed); - - HttpEntity> entity = new HttpEntity<>(requestBody, headers); - - try { - ResponseEntity response = restTemplate.exchange(ttsUrl, HttpMethod.POST, entity, byte[].class); - File tempFile = File.createTempFile("tts_pro_" + UUID.randomUUID(), ".mp3"); - try (FileOutputStream out = new FileOutputStream(tempFile)) { - out.write(response.getBody()); - } - return tempFile; - } catch (Exception e) { - log.error("[TTS 호출 실패]", e); - throw e; - } - } - - /** - * 인위적인 쉼표 조작을 없애고, AI가 마침표(.)와 느낌표(!)를 보고 - * 스스로 억양을 잡게 합니다. - */ - private String cleanTextForNaturalFlow(String rawText) { - // SSML만 제거하고, 원래 문장의 쉼표와 마침표를 그대로 살립니다. - // OpenAI는 마침표에서 톤을 낮추고, 느낌표에서 톤을 높이는 연기를 알아서 합니다. - return rawText.replaceAll("<[^>]*>", "").replaceAll("\\s+", " ").trim(); - } - - private String getOpenAiVoice(SpeakerType type) { - return switch (type) { - case A -> "shimmer"; // 날카롭고 빠른 반응에 최적 - case B -> "fable"; // 단호한 반박 - case USER -> "alloy"; - case NARRATOR -> "onyx"; - }; - } - - /** - * 박진감을 위해 속도를 1.15~1.2 수준으로 올립니다. - * 1.2가 넘어가면 말이 뭉개질 수 있으니 여기가 마지노선입니다. - */ - private double getVoiceSpeed(SpeakerType type) { - return switch (type) { - case NARRATOR -> 1.05; // 해설도 지루하지 않게 - case A, B -> 1.18; // 🔥 대결 톤! 1.18~1.2 정도면 아주 긴박합니다. - case USER -> 1.12; - }; - } -} \ No newline at end of file diff --git a/src/main/resources/templates/share/result.html b/src/main/resources/templates/share/result.html deleted file mode 100644 index b75c451f..00000000 --- a/src/main/resources/templates/share/result.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - Pické - 철학자 유형 결과 - - - - - - - -
- - - - - - - -
- - - - - From 80cd9bb9a6037d10dc6028e68b4d1507eb32d97e Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Thu, 16 Apr 2026 00:18:31 +0900 Subject: [PATCH 93/94] =?UTF-8?q?#183=20[Merge]=20main=20=EB=B3=91?= =?UTF-8?q?=ED=95=A9=20=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0=20(dev=20?= =?UTF-8?q?=EA=B8=B0=EC=A4=80)=20(#186)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 53 +++++ .../controller/AdminBattleController.java | 51 +++++ .../dto/request/AdminBattleCreateRequest.java | 24 +++ .../dto/request/AdminBattleOptionRequest.java | 16 ++ .../dto/request/AdminBattleUpdateRequest.java | 23 ++ .../response/AdminBattleDeleteResponse.java | 13 ++ .../response/AdminBattleDetailResponse.java | 36 ++++ .../picke/domain/battle/enums/BattleType.java | 5 + .../domain/tag/dto/request/TagRequest.java | 13 ++ .../tag/dto/response/TagDeleteResponse.java | 8 + .../domain/tag/dto/response/TagResponse.java | 12 ++ .../test/controller/TestController.java | 34 +++ .../swyp/picke/domain/vote/entity/Vote.java | 87 ++++++++ .../vote/repository/VoteRepository.java | 69 ++++++ .../domain/vote/service/VoteService.java | 18 ++ .../domain/vote/service/VoteServiceImpl.java | 200 ++++++++++++++++++ .../service/GoogleCloudTtsServiceImpl.java | 71 +++++++ .../tts/service/OpenAiTtsServiceImpl.java | 97 +++++++++ .../resources/templates/share/result.html | 92 ++++++++ 19 files changed, 922 insertions(+) create mode 100644 .github/workflows/deploy.yml create mode 100644 src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java create mode 100644 src/main/java/com/swyp/picke/domain/test/controller/TestController.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/entity/Vote.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/service/VoteService.java create mode 100644 src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java create mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java create mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java create mode 100644 src/main/resources/templates/share/result.html diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..0f809702 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,53 @@ +name: Java CI/CD with Gradle + +on: + push: + branches: [ "dev" ] # dev 브랜치에 푸시할 때 작동 + workflow_dispatch: # + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + cache: 'gradle' # 캐싱 추가: 빌드 속도가 훨씬 빨라집니다. + + - name: Build with Gradle + run: | + chmod +x ./gradlew + ./gradlew build -x test + + - name: Create .env file from Secret + run: | + cat <<'EOF' > .env + ${{ secrets.ENV_VARIABLES }} + EOF + + - name: Copy JAR and .env to EC2 + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + # -plain.jar는 배포에 필요 없으므로 제외합니다. + source: "build/libs/*-SNAPSHOT.jar, .env" + target: "~/" + strip_components: 2 + + - name: Deploy to EC2 + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + script: | + fuser -k 8080/tcp || true + + chmod +x ~/start.sh + ~/start.sh \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java new file mode 100644 index 00000000..b115abc3 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java @@ -0,0 +1,51 @@ +package com.swyp.picke.domain.battle.controller; + +import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; +import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; +import com.swyp.picke.domain.battle.dto.response.AdminBattleDeleteResponse; +import com.swyp.picke.domain.battle.dto.response.AdminBattleDetailResponse; +import com.swyp.picke.domain.battle.service.BattleService; +import com.swyp.picke.global.common.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "배틀 API (관리자)", description = "배틀 생성/수정/삭제 (관리자 전용)") +@RestController +@RequestMapping("/api/v1/admin/battles") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminBattleController { + + private final BattleService battleService; + + @Operation(summary = "배틀 생성") + @PostMapping + public ApiResponse createBattle( + @RequestBody @Valid AdminBattleCreateRequest request, + @AuthenticationPrincipal Long adminUserId + ) { + return ApiResponse.onSuccess(battleService.createBattle(request, adminUserId)); + } + + @Operation(summary = "배틀 수정 (변경 필드만 포함)") + @PatchMapping("/{battleId}") + public ApiResponse updateBattle( + @PathVariable Long battleId, + @RequestBody @Valid AdminBattleUpdateRequest request + ) { + return ApiResponse.onSuccess(battleService.updateBattle(battleId, request)); + } + + @Operation(summary = "배틀 삭제") + @DeleteMapping("/{battleId}") + public ApiResponse deleteBattle( + @PathVariable Long battleId + ) { + return ApiResponse.onSuccess(battleService.deleteBattle(battleId)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java new file mode 100644 index 00000000..48aa5b4a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java @@ -0,0 +1,24 @@ +package com.swyp.picke.domain.battle.dto.request; + +import com.swyp.picke.domain.battle.enums.BattleStatus; +import com.swyp.picke.domain.battle.enums.BattleType; +import java.time.LocalDate; +import java.util.List; + +public record AdminBattleCreateRequest( + String title, + String titlePrefix, + String titleSuffix, + String summary, + String description, + String thumbnailUrl, + BattleType type, + BattleStatus status, + String itemA, + String itemADesc, + String itemB, + String itemBDesc, + LocalDate targetDate, + List tagIds, + List options +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java new file mode 100644 index 00000000..36c1c212 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java @@ -0,0 +1,16 @@ +package com.swyp.picke.domain.battle.dto.request; + +import com.swyp.picke.domain.battle.enums.BattleOptionLabel; + +import java.util.List; + +public record AdminBattleOptionRequest( + BattleOptionLabel label, + String title, + String stance, + String representative, + String quote, + String imageUrl, + Boolean isCorrect, + List tagIds // 옵션 전용 태그 (철학자, 가치관 - 추후 사용자 유형 분석에 사용) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java new file mode 100644 index 00000000..aa5e4477 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java @@ -0,0 +1,23 @@ +package com.swyp.picke.domain.battle.dto.request; + +import com.swyp.picke.domain.battle.enums.BattleStatus; +import java.time.LocalDate; +import java.util.List; + +public record AdminBattleUpdateRequest( + String title, + String titlePrefix, + String titleSuffix, + String summary, + String description, + String thumbnailUrl, + String itemA, + String itemADesc, + String itemB, + String itemBDesc, + LocalDate targetDate, + Integer audioDuration, + BattleStatus status, + List tagIds, + List options +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java new file mode 100644 index 00000000..43c64d66 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.battle.dto.response; + +import java.time.LocalDateTime; + +/** + * 관리자 - 배틀 삭제 응답 + * 역할: 배틀이 성공적으로 소프트 딜리트 되었는지 확인하고 삭제 시점을 반환합니다. + */ + +public record AdminBattleDeleteResponse( + Boolean success, // 삭제 성공 여부 + LocalDateTime deletedAt // 삭제 처리된 일시 (Soft Delete) +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java new file mode 100644 index 00000000..fd382332 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java @@ -0,0 +1,36 @@ +package com.swyp.picke.domain.battle.dto.response; + +import com.swyp.picke.domain.battle.enums.BattleCreatorType; +import com.swyp.picke.domain.battle.enums.BattleStatus; +import com.swyp.picke.domain.battle.enums.BattleType; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 관리자 - 배틀 상세 상세 조회 응답 + * 역할: 관리자가 배틀의 모든 설정 값(상태, 생성자 타입, 수정일 등)을 확인하고 수정할 때 사용합니다. + */ + +public record AdminBattleDetailResponse( + Long battleId, + String title, + String titlePrefix, + String titleSuffix, + String summary, + String description, + String thumbnailUrl, + BattleType type, + String itemA, + String itemADesc, + String itemB, + String itemBDesc, + LocalDate targetDate, + BattleStatus status, + BattleCreatorType creatorType, + List tags, + List options, + LocalDateTime createdAt, + LocalDateTime updatedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java new file mode 100644 index 00000000..648e1eff --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java @@ -0,0 +1,5 @@ +package com.swyp.picke.domain.battle.enums; + +public enum BattleType { + BATTLE, QUIZ, VOTE +} diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java b/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java new file mode 100644 index 00000000..736bfda6 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java @@ -0,0 +1,13 @@ +package com.swyp.picke.domain.tag.dto.request; + +import com.swyp.picke.domain.tag.enums.TagType; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record TagRequest( + @NotBlank(message = "태그 이름을 입력해주세요.") + String name, + + @NotNull(message = "태그 타입을 선택해주세요.") + TagType type +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java new file mode 100644 index 00000000..71b350e8 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java @@ -0,0 +1,8 @@ +package com.swyp.picke.domain.tag.dto.response; + +import java.time.LocalDateTime; + +public record TagDeleteResponse( + boolean success, + LocalDateTime deletedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java new file mode 100644 index 00000000..70554dde --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.tag.dto.response; + +import com.swyp.picke.domain.tag.enums.TagType; +import java.time.LocalDateTime; + +public record TagResponse( + Long tagId, + String name, + TagType type, + LocalDateTime createdAt, + LocalDateTime updatedAt +) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java new file mode 100644 index 00000000..c937631e --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java @@ -0,0 +1,34 @@ +package com.swyp.picke.domain.test.controller; + +import com.swyp.picke.domain.oauth.jwt.JwtProvider; +import com.swyp.picke.global.common.response.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/test") +@RequiredArgsConstructor +public class TestController { + + private final JwtProvider jwtProvider; + + @GetMapping("/response") + public ApiResponse> testResponse() { + List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); + return ApiResponse.onSuccess(teamMembers); + } + + @GetMapping("/token") + public ApiResponse> getTestToken( + @RequestParam(defaultValue = "1") Long userId + ) { + String token = jwtProvider.createAccessToken(userId, "USER"); + return ApiResponse.onSuccess(Map.of("accessToken", token)); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java b/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java new file mode 100644 index 00000000..47054b65 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java @@ -0,0 +1,87 @@ +package com.swyp.picke.domain.vote.entity; + +import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.battle.entity.BattleOption; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.global.common.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "votes") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Vote extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "battle_id", nullable = false) + private Battle battle; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "pre_vote_option_id") + private BattleOption preVoteOption; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "post_vote_option_id") + private BattleOption postVoteOption; + + @Column(name = "is_tts_listened", nullable = false) + private Boolean isTtsListened = false; + + @Builder + private Vote(User user, Battle battle, BattleOption preVoteOption, + BattleOption postVoteOption, Boolean isTtsListened) { + this.user = user; + this.battle = battle; + this.preVoteOption = preVoteOption; + this.postVoteOption = postVoteOption; + this.isTtsListened = isTtsListened != null ? isTtsListened : false; + } + + /** + * 최초 투표(사전 투표) 시 사용하는 정적 팩토리 메서드 + */ + public static Vote createPreVote(User user, Battle battle, BattleOption option) { + return Vote.builder() + .user(user) + .battle(battle) + .preVoteOption(option) + .isTtsListened(false) + // status 설정 삭제됨 + .build(); + } + + /** + * 사전 투표 옵션 수정 메서드 + */ + public void updatePreVote(BattleOption preVoteOption) { + this.preVoteOption = preVoteOption; + } + + /** + * 사후 투표 업데이트 + */ + public void doPostVote(BattleOption postOption) { + this.postVoteOption = postOption; + // status 업데이트 삭제됨 + } + + /** + * TTS 청취 상태 업데이트 + */ + public void completeTts() { + this.isTtsListened = true; + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java new file mode 100644 index 00000000..4159beb1 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java @@ -0,0 +1,69 @@ +package com.swyp.picke.domain.vote.repository; + +import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.battle.entity.BattleOption; +import com.swyp.picke.domain.battle.enums.BattleOptionLabel; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.vote.entity.Vote; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; +import java.util.Optional; + +public interface VoteRepository extends JpaRepository { + + List findAllByBattle(Battle battle); + + Optional findByBattleIdAndUserId(Long battleId, Long userId); + + @Query("SELECT v FROM Vote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") + Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); + + Optional findByBattleAndUser(Battle battle, User user); + + long countByBattle(Battle battle); + + long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); + + Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); + + @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + "WHERE v.user.id = :userId ORDER BY v.createdAt DESC") + List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); + + @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + + "WHERE v.user.id = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") + List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( + @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); + + long countByUserId(Long userId); + + @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") + long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); + + @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId " + + "AND v.postVoteOption IS NOT NULL " + + "AND v.preVoteOption <> v.postVoteOption") + long countOpinionChangesByUserId(@Param("userId") Long userId); + + List findByUserId(Long userId); + + // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) + @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") + List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); + + // 추천용: 유저가 참여한 배틀 ID 조회 + @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id = :userId") + List findParticipatedBattleIdsByUserId(@Param("userId") Long userId); + + // 추천용: 특정 배틀에 참여한 유저 ID 조회 + @Query("SELECT DISTINCT v.user.id FROM Vote v WHERE v.battle.id IN :battleIds") + List findUserIdsByBattleIds(@Param("battleIds") List battleIds); + + // 추천용: 특정 유저들이 참여한 배틀 ID 조회 + @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id IN :userIds") + List findParticipatedBattleIdsByUserIds(@Param("userIds") List userIds); +} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java new file mode 100644 index 00000000..77d68fe6 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java @@ -0,0 +1,18 @@ +package com.swyp.picke.domain.vote.service; + +import com.swyp.picke.domain.battle.entity.BattleOption; +import com.swyp.picke.domain.vote.dto.request.VoteRequest; +import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; +import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; +import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; + +public interface VoteService { + BattleOption findPreVoteOption(Long battleId, Long userId); + Long findPostVoteOptionId(Long battleId, Long userId); + VoteStatsResponse getVoteStats(Long battleId); + MyVoteResponse getMyVote(Long battleId, Long userId); + VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request); + VoteResultResponse postVote(Long battleId, Long userId, VoteRequest request); + void deleteVotesByBattleId(Long battleId); + void completeTts(Long battleId, Long userId); +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java new file mode 100644 index 00000000..32a2d956 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java @@ -0,0 +1,200 @@ +package com.swyp.picke.domain.vote.service; + +import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.battle.entity.BattleOption; +import com.swyp.picke.domain.battle.repository.BattleOptionRepository; +import com.swyp.picke.domain.battle.service.BattleService; +import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; +import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.enums.UserBattleStep; +import com.swyp.picke.domain.user.repository.UserRepository; +import com.swyp.picke.domain.user.service.UserBattleService; +import com.swyp.picke.domain.vote.converter.VoteConverter; +import com.swyp.picke.domain.vote.dto.request.VoteRequest; +import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; +import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; +import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; +import com.swyp.picke.domain.vote.entity.Vote; +import com.swyp.picke.domain.vote.repository.VoteRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import java.util.Optional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class VoteServiceImpl implements VoteService { + + private final VoteRepository voteRepository; + private final BattleService battleService; + private final BattleOptionRepository battleOptionRepository; + private final UserRepository userRepository; + private final UserBattleService userBattleService; + + @Override + public BattleOption findPreVoteOption(Long battleId, Long userId) { + Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + Vote vote = voteRepository.findByBattleAndUser(battle, user) + .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + + if (vote.getPreVoteOption() == null) { + throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); + } + return vote.getPreVoteOption(); + } + + @Override + public Long findPostVoteOptionId(Long battleId, Long userId) { + return voteRepository.findByBattleIdAndUserId(battleId, userId) + .map(vote -> vote.getPostVoteOption() != null ? vote.getPostVoteOption().getId() : null) + .orElse(null); + } + + @Override + public VoteStatsResponse getVoteStats(Long battleId) { + Battle battle = battleService.findById(battleId); + List options = battleOptionRepository.findByBattle(battle); + long totalCount = voteRepository.countByBattle(battle); + + List stats = options.stream() + .map(option -> { + long count = voteRepository.countByBattleAndPreVoteOption(battle, option); + double ratio = totalCount > 0 + ? Math.round((double) count / totalCount * 1000.0) / 10.0 + : 0.0; + return new VoteStatsResponse.OptionStat( + option.getId(), option.getLabel().name(), option.getTitle(), count, ratio); + }) + .toList(); + + LocalDateTime updatedAt = voteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) + .map(Vote::getUpdatedAt) + .orElse(null); + + return VoteConverter.toVoteStatsResponse(stats, totalCount, updatedAt); + } + + @Override + public MyVoteResponse getMyVote(Long battleId, Long userId) { + Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + Vote vote = voteRepository.findByBattleAndUser(battle, user) + .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + + UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); + return VoteConverter.toMyVoteResponse(vote, status.step()); + } + + @Override + @Transactional + public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request) { + // 1. 기본 정보 조회 (배틀, 유저, 선택한 옵션) + Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + BattleOption option = battleOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); + + // 2. 기존 투표 여부 확인 (에러 대신 Optional로 받음) + Optional existingVote = voteRepository.findByBattleAndUser(battle, user); + Vote vote; + + if (existingVote.isPresent()) { + vote = existingVote.get(); + vote.updatePreVote(option); + } else { + vote = Vote.createPreVote(user, battle, option); + voteRepository.save(vote); + battle.addParticipant(); + } + + // 3. 현재 유저의 진행 단계 확인 + UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); + + // 4. 단계 업데이트 (처음 참여하는 경우에만 단계를 PRE_VOTE로 변경) + // 이미 POST_VOTE나 COMPLETED라면 단계를 강제로 낮추지 않음 + if (status.step() == UserBattleStep.NONE) { + userBattleService.upsertStep(user, battle, UserBattleStep.PRE_VOTE); + } + + // 5. 현재 유지 중인 단계를 반환 (수정 후에도 COMPLETED 유지 가능) + UserBattleStep currentStep = (status.step() == UserBattleStep.NONE) ? UserBattleStep.PRE_VOTE : status.step(); + return new VoteResultResponse(vote.getId(), currentStep); + } + + @Override + @Transactional + public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest request) { + Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + BattleOption option = battleOptionRepository.findById(request.optionId()) + .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); + + Vote vote = voteRepository.findByBattleAndUser(battle, user) + .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + + // [검증] 사전 투표를 완료한 상태(혹은 오디오 청취 완료 상태)인지 확인 + UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); + if (status.step() == UserBattleStep.NONE) { + throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); + } + + // 1. 사후 투표 업데이트 + vote.doPostVote(option); + + // 2. 최종 완료 단계(COMPLETED)로 업데이트 + userBattleService.upsertStep(user, battle, UserBattleStep.COMPLETED); + + return new VoteResultResponse(vote.getId(), UserBattleStep.COMPLETED); + } + + @Override + @Transactional + public void deleteVotesByBattleId(Long battleId) { + // 1. 배틀 조회 + Battle battle = battleService.findById(battleId); + + // 2. 해당 배틀의 모든 투표 조회 + List votes = voteRepository.findAllByBattle(battle); + + for (Vote vote : votes) { + // 3. 유저의 진행 단계 초기화 (이건 유저별로 다 해줘야 함) + userBattleService.upsertStep(vote.getUser(), battle, UserBattleStep.NONE); + + // 4. 옵션별 카운트 감소 (필요 시) + if (vote.getPreVoteOption() != null) { /* 감소 로직 */ } + if (vote.getPostVoteOption() != null) { /* 감소 로직 */ } + } + + // 5. 투표 데이터 일괄 삭제 + voteRepository.deleteAllInBatch(votes); + } + + @Override + @Transactional + public void completeTts(Long battleId, Long userId) { + Battle battle = battleService.findById(battleId); + User user = userRepository.findById(userId) + .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + + // 1. 엔티티 상태 변경 (isTtsListened = true) + Vote vote = voteRepository.findByBattleAndUser(battle, user) + .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); + vote.completeTts(); + + // 2. 단계를 POST_VOTE(사후 투표 가능 단계)로 업데이트 + userBattleService.upsertStep(user, battle, UserBattleStep.POST_VOTE); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java b/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java new file mode 100644 index 00000000..f61d22ec --- /dev/null +++ b/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java @@ -0,0 +1,71 @@ +package com.swyp.picke.global.infra.tts.service; + +import com.google.auth.oauth2.GoogleCredentials; +import com.google.cloud.texttospeech.v1.*; +import com.google.protobuf.ByteString; +import com.swyp.picke.domain.scenario.enums.SpeakerType; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.UUID; + +@Slf4j +// @Primary - 사용할 때 주석 삭제 +@Service +public class GoogleCloudTtsServiceImpl implements TtsService { + + @Value("${spring.cloud.gcp.credentials.location}") + private String credentialsLocation; + + @Override + public File generateTtsWithSsml(String rawText, SpeakerType speakerType) throws Exception { + // SSML 태그가 없으면 자동으로 씌워줍니다. + String ssmlInput = rawText.trim().startsWith("") ? rawText : "" + rawText + ""; + + try (FileInputStream credentialsStream = new FileInputStream(credentialsLocation)) { + GoogleCredentials credentials = GoogleCredentials.fromStream(credentialsStream); + TextToSpeechSettings settings = TextToSpeechSettings.newBuilder() + .setCredentialsProvider(() -> credentials) + .build(); + + try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create(settings)) { + SynthesisInput input = SynthesisInput.newBuilder().setSsml(ssmlInput).build(); + VoiceSelectionParams voice = buildVoiceSelection(speakerType); + AudioConfig audioConfig = AudioConfig.newBuilder().setAudioEncoding(AudioEncoding.MP3).build(); + + // 실제 구글 API가 호출될 때만 찍히는 로그 + String logText = rawText.length() > 15 ? rawText.substring(0, 15) + "..." : rawText; + log.info("[TTS 호출] 💳 구글 API 실제 요청 발생! (화자: {}, 대사: '{}')", speakerType.name(), logText); + + SynthesizeSpeechResponse response = textToSpeechClient.synthesizeSpeech(input, voice, audioConfig); + ByteString audioContents = response.getAudioContent(); + + File tempFile = File.createTempFile("tts_" + UUID.randomUUID(), ".mp3"); + try (FileOutputStream out = new FileOutputStream(tempFile)) { + out.write(audioContents.toByteArray()); + } + return tempFile; + } + } catch (Exception e) { + log.error("[TTS 호출 실패] GCP 키 파일 확인 필요: {}", credentialsLocation, e); + throw e; + } + } + + private VoiceSelectionParams buildVoiceSelection(SpeakerType type) { + String voiceName = switch (type) { + case A -> "ko-KR-Wavenet-C"; + case B -> "ko-KR-Wavenet-D"; + case USER -> "ko-KR-Wavenet-B"; + case NARRATOR -> "ko-KR-Wavenet-A"; + }; + return VoiceSelectionParams.newBuilder() + .setLanguageCode("ko-KR") + .setName(voiceName) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java b/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java new file mode 100644 index 00000000..c5168e42 --- /dev/null +++ b/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java @@ -0,0 +1,97 @@ +package com.swyp.picke.global.infra.tts.service; + +import com.swyp.picke.domain.scenario.enums.SpeakerType; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.*; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Slf4j +// @Primary - 사용할 때 주석 삭제 +@Service +public class OpenAiTtsServiceImpl implements TtsService { + + @Value("${openai.api-key}") + private String openAiApiKey; + + @Value("${openai.tts.model:gpt-4o-mini-tts}") + private String ttsModel; + + @Value("${openai.tts.url:https://api.openai.com/v1/audio/speech}") + private String ttsUrl; + + @Override + public File generateTtsWithSsml(String rawText, SpeakerType speakerType) throws Exception { + // 1. 억지스러운 전처리 제거 (자연스러운 문장 부호 유지) + String actingText = cleanTextForNaturalFlow(rawText); + + String voice = getOpenAiVoice(speakerType); + double speed = getVoiceSpeed(speakerType); + + log.info("[TTS 호출] OpenAI 호출 (화자: {}, 속도: {}, 대사: '{}')", voice, speed, actingText); + + RestTemplate restTemplate = new RestTemplate(); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.setBearerAuth(openAiApiKey); + + Map requestBody = new HashMap<>(); + requestBody.put("model", ttsModel); + requestBody.put("input", actingText); + requestBody.put("voice", voice); + requestBody.put("response_format", "mp3"); + requestBody.put("speed", speed); + + HttpEntity> entity = new HttpEntity<>(requestBody, headers); + + try { + ResponseEntity response = restTemplate.exchange(ttsUrl, HttpMethod.POST, entity, byte[].class); + File tempFile = File.createTempFile("tts_pro_" + UUID.randomUUID(), ".mp3"); + try (FileOutputStream out = new FileOutputStream(tempFile)) { + out.write(response.getBody()); + } + return tempFile; + } catch (Exception e) { + log.error("[TTS 호출 실패]", e); + throw e; + } + } + + /** + * 인위적인 쉼표 조작을 없애고, AI가 마침표(.)와 느낌표(!)를 보고 + * 스스로 억양을 잡게 합니다. + */ + private String cleanTextForNaturalFlow(String rawText) { + // SSML만 제거하고, 원래 문장의 쉼표와 마침표를 그대로 살립니다. + // OpenAI는 마침표에서 톤을 낮추고, 느낌표에서 톤을 높이는 연기를 알아서 합니다. + return rawText.replaceAll("<[^>]*>", "").replaceAll("\\s+", " ").trim(); + } + + private String getOpenAiVoice(SpeakerType type) { + return switch (type) { + case A -> "shimmer"; // 날카롭고 빠른 반응에 최적 + case B -> "fable"; // 단호한 반박 + case USER -> "alloy"; + case NARRATOR -> "onyx"; + }; + } + + /** + * 박진감을 위해 속도를 1.15~1.2 수준으로 올립니다. + * 1.2가 넘어가면 말이 뭉개질 수 있으니 여기가 마지노선입니다. + */ + private double getVoiceSpeed(SpeakerType type) { + return switch (type) { + case NARRATOR -> 1.05; // 해설도 지루하지 않게 + case A, B -> 1.18; // 🔥 대결 톤! 1.18~1.2 정도면 아주 긴박합니다. + case USER -> 1.12; + }; + } +} \ No newline at end of file diff --git a/src/main/resources/templates/share/result.html b/src/main/resources/templates/share/result.html new file mode 100644 index 00000000..b75c451f --- /dev/null +++ b/src/main/resources/templates/share/result.html @@ -0,0 +1,92 @@ + + + + + + Pické - 철학자 유형 결과 + + + + + + + +
+ + + + + + + +
+ + + + + From 8265d6f646d1e7c57be3e834d02077d7770f0d00 Mon Sep 17 00:00:00 2001 From: JOO <107450745+jucheonsu@users.noreply.github.com> Date: Thu, 16 Apr 2026 00:32:33 +0900 Subject: [PATCH 94/94] =?UTF-8?q?#186=20[Hotfix]=20=EC=9E=AC=EC=9C=A0?= =?UTF-8?q?=EC=9E=85=20=ED=8C=8C=EC=9D=BC=20=EB=A1=A4=EB=B0=B1=20=EB=B0=8F?= =?UTF-8?q?=20dev=20=EC=95=88=EC=A0=95=ED=99=94=20(#187)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 53 ----- .../controller/AdminBattleController.java | 51 ----- .../dto/request/AdminBattleCreateRequest.java | 24 --- .../dto/request/AdminBattleOptionRequest.java | 16 -- .../dto/request/AdminBattleUpdateRequest.java | 23 -- .../response/AdminBattleDeleteResponse.java | 13 -- .../response/AdminBattleDetailResponse.java | 36 ---- .../picke/domain/battle/enums/BattleType.java | 5 - .../domain/tag/dto/request/TagRequest.java | 13 -- .../tag/dto/response/TagDeleteResponse.java | 8 - .../domain/tag/dto/response/TagResponse.java | 12 -- .../test/controller/TestController.java | 34 --- .../swyp/picke/domain/vote/entity/Vote.java | 87 -------- .../vote/repository/VoteRepository.java | 69 ------ .../domain/vote/service/VoteService.java | 18 -- .../domain/vote/service/VoteServiceImpl.java | 200 ------------------ .../service/GoogleCloudTtsServiceImpl.java | 71 ------- .../tts/service/OpenAiTtsServiceImpl.java | 97 --------- .../resources/templates/share/result.html | 92 -------- 19 files changed, 922 deletions(-) delete mode 100644 .github/workflows/deploy.yml delete mode 100644 src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java delete mode 100644 src/main/java/com/swyp/picke/domain/test/controller/TestController.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/entity/Vote.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/service/VoteService.java delete mode 100644 src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java delete mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java delete mode 100644 src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java delete mode 100644 src/main/resources/templates/share/result.html diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 0f809702..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Java CI/CD with Gradle - -on: - push: - branches: [ "dev" ] # dev 브랜치에 푸시할 때 작동 - workflow_dispatch: # - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - cache: 'gradle' # 캐싱 추가: 빌드 속도가 훨씬 빨라집니다. - - - name: Build with Gradle - run: | - chmod +x ./gradlew - ./gradlew build -x test - - - name: Create .env file from Secret - run: | - cat <<'EOF' > .env - ${{ secrets.ENV_VARIABLES }} - EOF - - - name: Copy JAR and .env to EC2 - uses: appleboy/scp-action@v0.1.7 - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USERNAME }} - key: ${{ secrets.EC2_SSH_KEY }} - # -plain.jar는 배포에 필요 없으므로 제외합니다. - source: "build/libs/*-SNAPSHOT.jar, .env" - target: "~/" - strip_components: 2 - - - name: Deploy to EC2 - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USERNAME }} - key: ${{ secrets.EC2_SSH_KEY }} - script: | - fuser -k 8080/tcp || true - - chmod +x ~/start.sh - ~/start.sh \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java b/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java deleted file mode 100644 index b115abc3..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/controller/AdminBattleController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.swyp.picke.domain.battle.controller; - -import com.swyp.picke.domain.battle.dto.request.AdminBattleCreateRequest; -import com.swyp.picke.domain.battle.dto.request.AdminBattleUpdateRequest; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDeleteResponse; -import com.swyp.picke.domain.battle.dto.response.AdminBattleDetailResponse; -import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.global.common.response.ApiResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.*; - -@Tag(name = "배틀 API (관리자)", description = "배틀 생성/수정/삭제 (관리자 전용)") -@RestController -@RequestMapping("/api/v1/admin/battles") -@RequiredArgsConstructor -@PreAuthorize("hasRole('ADMIN')") -public class AdminBattleController { - - private final BattleService battleService; - - @Operation(summary = "배틀 생성") - @PostMapping - public ApiResponse createBattle( - @RequestBody @Valid AdminBattleCreateRequest request, - @AuthenticationPrincipal Long adminUserId - ) { - return ApiResponse.onSuccess(battleService.createBattle(request, adminUserId)); - } - - @Operation(summary = "배틀 수정 (변경 필드만 포함)") - @PatchMapping("/{battleId}") - public ApiResponse updateBattle( - @PathVariable Long battleId, - @RequestBody @Valid AdminBattleUpdateRequest request - ) { - return ApiResponse.onSuccess(battleService.updateBattle(battleId, request)); - } - - @Operation(summary = "배틀 삭제") - @DeleteMapping("/{battleId}") - public ApiResponse deleteBattle( - @PathVariable Long battleId - ) { - return ApiResponse.onSuccess(battleService.deleteBattle(battleId)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java deleted file mode 100644 index 48aa5b4a..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleCreateRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; -import java.time.LocalDate; -import java.util.List; - -public record AdminBattleCreateRequest( - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - BattleType type, - BattleStatus status, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - List tagIds, - List options -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java deleted file mode 100644 index 36c1c212..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleOptionRequest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleOptionLabel; - -import java.util.List; - -public record AdminBattleOptionRequest( - BattleOptionLabel label, - String title, - String stance, - String representative, - String quote, - String imageUrl, - Boolean isCorrect, - List tagIds // 옵션 전용 태그 (철학자, 가치관 - 추후 사용자 유형 분석에 사용) -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java b/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java deleted file mode 100644 index aa5e4477..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/request/AdminBattleUpdateRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.swyp.picke.domain.battle.dto.request; - -import com.swyp.picke.domain.battle.enums.BattleStatus; -import java.time.LocalDate; -import java.util.List; - -public record AdminBattleUpdateRequest( - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - Integer audioDuration, - BattleStatus status, - List tagIds, - List options -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java deleted file mode 100644 index 43c64d66..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDeleteResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.battle.dto.response; - -import java.time.LocalDateTime; - -/** - * 관리자 - 배틀 삭제 응답 - * 역할: 배틀이 성공적으로 소프트 딜리트 되었는지 확인하고 삭제 시점을 반환합니다. - */ - -public record AdminBattleDeleteResponse( - Boolean success, // 삭제 성공 여부 - LocalDateTime deletedAt // 삭제 처리된 일시 (Soft Delete) -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java b/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java deleted file mode 100644 index fd382332..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/dto/response/AdminBattleDetailResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.swyp.picke.domain.battle.dto.response; - -import com.swyp.picke.domain.battle.enums.BattleCreatorType; -import com.swyp.picke.domain.battle.enums.BattleStatus; -import com.swyp.picke.domain.battle.enums.BattleType; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -/** - * 관리자 - 배틀 상세 상세 조회 응답 - * 역할: 관리자가 배틀의 모든 설정 값(상태, 생성자 타입, 수정일 등)을 확인하고 수정할 때 사용합니다. - */ - -public record AdminBattleDetailResponse( - Long battleId, - String title, - String titlePrefix, - String titleSuffix, - String summary, - String description, - String thumbnailUrl, - BattleType type, - String itemA, - String itemADesc, - String itemB, - String itemBDesc, - LocalDate targetDate, - BattleStatus status, - BattleCreatorType creatorType, - List tags, - List options, - LocalDateTime createdAt, - LocalDateTime updatedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java b/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java deleted file mode 100644 index 648e1eff..00000000 --- a/src/main/java/com/swyp/picke/domain/battle/enums/BattleType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.swyp.picke.domain.battle.enums; - -public enum BattleType { - BATTLE, QUIZ, VOTE -} diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java b/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java deleted file mode 100644 index 736bfda6..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/request/TagRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.swyp.picke.domain.tag.dto.request; - -import com.swyp.picke.domain.tag.enums.TagType; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -public record TagRequest( - @NotBlank(message = "태그 이름을 입력해주세요.") - String name, - - @NotNull(message = "태그 타입을 선택해주세요.") - TagType type -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java deleted file mode 100644 index 71b350e8..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagDeleteResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.swyp.picke.domain.tag.dto.response; - -import java.time.LocalDateTime; - -public record TagDeleteResponse( - boolean success, - LocalDateTime deletedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java b/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java deleted file mode 100644 index 70554dde..00000000 --- a/src/main/java/com/swyp/picke/domain/tag/dto/response/TagResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.swyp.picke.domain.tag.dto.response; - -import com.swyp.picke.domain.tag.enums.TagType; -import java.time.LocalDateTime; - -public record TagResponse( - Long tagId, - String name, - TagType type, - LocalDateTime createdAt, - LocalDateTime updatedAt -) {} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java b/src/main/java/com/swyp/picke/domain/test/controller/TestController.java deleted file mode 100644 index c937631e..00000000 --- a/src/main/java/com/swyp/picke/domain/test/controller/TestController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.swyp.picke.domain.test.controller; - -import com.swyp.picke.domain.oauth.jwt.JwtProvider; -import com.swyp.picke.global.common.response.ApiResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/api/test") -@RequiredArgsConstructor -public class TestController { - - private final JwtProvider jwtProvider; - - @GetMapping("/response") - public ApiResponse> testResponse() { - List teamMembers = List.of("주천수", "팀원2", "팀원3", "팀원4"); - return ApiResponse.onSuccess(teamMembers); - } - - @GetMapping("/token") - public ApiResponse> getTestToken( - @RequestParam(defaultValue = "1") Long userId - ) { - String token = jwtProvider.createAccessToken(userId, "USER"); - return ApiResponse.onSuccess(Map.of("accessToken", token)); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java b/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java deleted file mode 100644 index 47054b65..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/entity/Vote.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.swyp.picke.domain.vote.entity; - -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.global.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "votes") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Vote extends BaseEntity { - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) - private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "battle_id", nullable = false) - private Battle battle; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "pre_vote_option_id") - private BattleOption preVoteOption; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "post_vote_option_id") - private BattleOption postVoteOption; - - @Column(name = "is_tts_listened", nullable = false) - private Boolean isTtsListened = false; - - @Builder - private Vote(User user, Battle battle, BattleOption preVoteOption, - BattleOption postVoteOption, Boolean isTtsListened) { - this.user = user; - this.battle = battle; - this.preVoteOption = preVoteOption; - this.postVoteOption = postVoteOption; - this.isTtsListened = isTtsListened != null ? isTtsListened : false; - } - - /** - * 최초 투표(사전 투표) 시 사용하는 정적 팩토리 메서드 - */ - public static Vote createPreVote(User user, Battle battle, BattleOption option) { - return Vote.builder() - .user(user) - .battle(battle) - .preVoteOption(option) - .isTtsListened(false) - // status 설정 삭제됨 - .build(); - } - - /** - * 사전 투표 옵션 수정 메서드 - */ - public void updatePreVote(BattleOption preVoteOption) { - this.preVoteOption = preVoteOption; - } - - /** - * 사후 투표 업데이트 - */ - public void doPostVote(BattleOption postOption) { - this.postVoteOption = postOption; - // status 업데이트 삭제됨 - } - - /** - * TTS 청취 상태 업데이트 - */ - public void completeTts() { - this.isTtsListened = true; - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java b/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java deleted file mode 100644 index 4159beb1..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/repository/VoteRepository.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.swyp.picke.domain.vote.repository; - -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.battle.enums.BattleOptionLabel; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.vote.entity.Vote; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; -import java.util.Optional; - -public interface VoteRepository extends JpaRepository { - - List findAllByBattle(Battle battle); - - Optional findByBattleIdAndUserId(Long battleId, Long userId); - - @Query("SELECT v FROM Vote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId") - Optional findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId); - - Optional findByBattleAndUser(Battle battle, User user); - - long countByBattle(Battle battle); - - long countByBattleAndPreVoteOption(Battle battle, BattleOption preVoteOption); - - Optional findTopByBattleOrderByUpdatedAtDesc(Battle battle); - - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + - "WHERE v.user.id = :userId ORDER BY v.createdAt DESC") - List findByUserIdOrderByCreatedAtDesc(@Param("userId") Long userId, Pageable pageable); - - @Query("SELECT v FROM Vote v JOIN FETCH v.battle JOIN FETCH v.preVoteOption " + - "WHERE v.user.id = :userId AND v.preVoteOption.label = :label ORDER BY v.createdAt DESC") - List findByUserIdAndPreVoteOptionLabelOrderByCreatedAtDesc( - @Param("userId") Long userId, @Param("label") BattleOptionLabel label, Pageable pageable); - - long countByUserId(Long userId); - - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId AND v.preVoteOption.label = :label") - long countByUserIdAndPreVoteOptionLabel(@Param("userId") Long userId, @Param("label") BattleOptionLabel label); - - @Query("SELECT COUNT(v) FROM Vote v WHERE v.user.id = :userId " + - "AND v.postVoteOption IS NOT NULL " + - "AND v.preVoteOption <> v.postVoteOption") - long countOpinionChangesByUserId(@Param("userId") Long userId); - - List findByUserId(Long userId); - - // MypageService: 철학자 유형 산출용 - 최초 N개 투표 조회 (생성순) - @Query("SELECT v FROM Vote v JOIN FETCH v.battle WHERE v.user.id = :userId ORDER BY v.createdAt ASC") - List findByUserIdOrderByCreatedAtAsc(@Param("userId") Long userId, Pageable pageable); - - // 추천용: 유저가 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id = :userId") - List findParticipatedBattleIdsByUserId(@Param("userId") Long userId); - - // 추천용: 특정 배틀에 참여한 유저 ID 조회 - @Query("SELECT DISTINCT v.user.id FROM Vote v WHERE v.battle.id IN :battleIds") - List findUserIdsByBattleIds(@Param("battleIds") List battleIds); - - // 추천용: 특정 유저들이 참여한 배틀 ID 조회 - @Query("SELECT v.battle.id FROM Vote v WHERE v.user.id IN :userIds") - List findParticipatedBattleIdsByUserIds(@Param("userIds") List userIds); -} diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java deleted file mode 100644 index 77d68fe6..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.swyp.picke.domain.vote.service; - -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.vote.dto.request.VoteRequest; -import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; -import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; -import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; - -public interface VoteService { - BattleOption findPreVoteOption(Long battleId, Long userId); - Long findPostVoteOptionId(Long battleId, Long userId); - VoteStatsResponse getVoteStats(Long battleId); - MyVoteResponse getMyVote(Long battleId, Long userId); - VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request); - VoteResultResponse postVote(Long battleId, Long userId, VoteRequest request); - void deleteVotesByBattleId(Long battleId); - void completeTts(Long battleId, Long userId); -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java b/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java deleted file mode 100644 index 32a2d956..00000000 --- a/src/main/java/com/swyp/picke/domain/vote/service/VoteServiceImpl.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.swyp.picke.domain.vote.service; - -import com.swyp.picke.domain.battle.entity.Battle; -import com.swyp.picke.domain.battle.entity.BattleOption; -import com.swyp.picke.domain.battle.repository.BattleOptionRepository; -import com.swyp.picke.domain.battle.service.BattleService; -import com.swyp.picke.domain.user.dto.response.UserBattleStatusResponse; -import com.swyp.picke.domain.user.entity.User; -import com.swyp.picke.domain.user.enums.UserBattleStep; -import com.swyp.picke.domain.user.repository.UserRepository; -import com.swyp.picke.domain.user.service.UserBattleService; -import com.swyp.picke.domain.vote.converter.VoteConverter; -import com.swyp.picke.domain.vote.dto.request.VoteRequest; -import com.swyp.picke.domain.vote.dto.response.MyVoteResponse; -import com.swyp.picke.domain.vote.dto.response.VoteResultResponse; -import com.swyp.picke.domain.vote.dto.response.VoteStatsResponse; -import com.swyp.picke.domain.vote.entity.Vote; -import com.swyp.picke.domain.vote.repository.VoteRepository; -import com.swyp.picke.global.common.exception.CustomException; -import com.swyp.picke.global.common.exception.ErrorCode; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.List; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class VoteServiceImpl implements VoteService { - - private final VoteRepository voteRepository; - private final BattleService battleService; - private final BattleOptionRepository battleOptionRepository; - private final UserRepository userRepository; - private final UserBattleService userBattleService; - - @Override - public BattleOption findPreVoteOption(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - - if (vote.getPreVoteOption() == null) { - throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); - } - return vote.getPreVoteOption(); - } - - @Override - public Long findPostVoteOptionId(Long battleId, Long userId) { - return voteRepository.findByBattleIdAndUserId(battleId, userId) - .map(vote -> vote.getPostVoteOption() != null ? vote.getPostVoteOption().getId() : null) - .orElse(null); - } - - @Override - public VoteStatsResponse getVoteStats(Long battleId) { - Battle battle = battleService.findById(battleId); - List options = battleOptionRepository.findByBattle(battle); - long totalCount = voteRepository.countByBattle(battle); - - List stats = options.stream() - .map(option -> { - long count = voteRepository.countByBattleAndPreVoteOption(battle, option); - double ratio = totalCount > 0 - ? Math.round((double) count / totalCount * 1000.0) / 10.0 - : 0.0; - return new VoteStatsResponse.OptionStat( - option.getId(), option.getLabel().name(), option.getTitle(), count, ratio); - }) - .toList(); - - LocalDateTime updatedAt = voteRepository.findTopByBattleOrderByUpdatedAtDesc(battle) - .map(Vote::getUpdatedAt) - .orElse(null); - - return VoteConverter.toVoteStatsResponse(stats, totalCount, updatedAt); - } - - @Override - public MyVoteResponse getMyVote(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - - UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - return VoteConverter.toMyVoteResponse(vote, status.step()); - } - - @Override - @Transactional - public VoteResultResponse preVote(Long battleId, Long userId, VoteRequest request) { - // 1. 기본 정보 조회 (배틀, 유저, 선택한 옵션) - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleOption option = battleOptionRepository.findById(request.optionId()) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - - // 2. 기존 투표 여부 확인 (에러 대신 Optional로 받음) - Optional existingVote = voteRepository.findByBattleAndUser(battle, user); - Vote vote; - - if (existingVote.isPresent()) { - vote = existingVote.get(); - vote.updatePreVote(option); - } else { - vote = Vote.createPreVote(user, battle, option); - voteRepository.save(vote); - battle.addParticipant(); - } - - // 3. 현재 유저의 진행 단계 확인 - UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - - // 4. 단계 업데이트 (처음 참여하는 경우에만 단계를 PRE_VOTE로 변경) - // 이미 POST_VOTE나 COMPLETED라면 단계를 강제로 낮추지 않음 - if (status.step() == UserBattleStep.NONE) { - userBattleService.upsertStep(user, battle, UserBattleStep.PRE_VOTE); - } - - // 5. 현재 유지 중인 단계를 반환 (수정 후에도 COMPLETED 유지 가능) - UserBattleStep currentStep = (status.step() == UserBattleStep.NONE) ? UserBattleStep.PRE_VOTE : status.step(); - return new VoteResultResponse(vote.getId(), currentStep); - } - - @Override - @Transactional - public VoteResultResponse postVote(Long battleId, Long userId, VoteRequest request) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - BattleOption option = battleOptionRepository.findById(request.optionId()) - .orElseThrow(() -> new CustomException(ErrorCode.BATTLE_OPTION_NOT_FOUND)); - - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - - // [검증] 사전 투표를 완료한 상태(혹은 오디오 청취 완료 상태)인지 확인 - UserBattleStatusResponse status = userBattleService.getUserBattleStatus(user, battle); - if (status.step() == UserBattleStep.NONE) { - throw new CustomException(ErrorCode.PRE_VOTE_REQUIRED); - } - - // 1. 사후 투표 업데이트 - vote.doPostVote(option); - - // 2. 최종 완료 단계(COMPLETED)로 업데이트 - userBattleService.upsertStep(user, battle, UserBattleStep.COMPLETED); - - return new VoteResultResponse(vote.getId(), UserBattleStep.COMPLETED); - } - - @Override - @Transactional - public void deleteVotesByBattleId(Long battleId) { - // 1. 배틀 조회 - Battle battle = battleService.findById(battleId); - - // 2. 해당 배틀의 모든 투표 조회 - List votes = voteRepository.findAllByBattle(battle); - - for (Vote vote : votes) { - // 3. 유저의 진행 단계 초기화 (이건 유저별로 다 해줘야 함) - userBattleService.upsertStep(vote.getUser(), battle, UserBattleStep.NONE); - - // 4. 옵션별 카운트 감소 (필요 시) - if (vote.getPreVoteOption() != null) { /* 감소 로직 */ } - if (vote.getPostVoteOption() != null) { /* 감소 로직 */ } - } - - // 5. 투표 데이터 일괄 삭제 - voteRepository.deleteAllInBatch(votes); - } - - @Override - @Transactional - public void completeTts(Long battleId, Long userId) { - Battle battle = battleService.findById(battleId); - User user = userRepository.findById(userId) - .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); - - // 1. 엔티티 상태 변경 (isTtsListened = true) - Vote vote = voteRepository.findByBattleAndUser(battle, user) - .orElseThrow(() -> new CustomException(ErrorCode.VOTE_NOT_FOUND)); - vote.completeTts(); - - // 2. 단계를 POST_VOTE(사후 투표 가능 단계)로 업데이트 - userBattleService.upsertStep(user, battle, UserBattleStep.POST_VOTE); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java b/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java deleted file mode 100644 index f61d22ec..00000000 --- a/src/main/java/com/swyp/picke/global/infra/tts/service/GoogleCloudTtsServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.swyp.picke.global.infra.tts.service; - -import com.google.auth.oauth2.GoogleCredentials; -import com.google.cloud.texttospeech.v1.*; -import com.google.protobuf.ByteString; -import com.swyp.picke.domain.scenario.enums.SpeakerType; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.util.UUID; - -@Slf4j -// @Primary - 사용할 때 주석 삭제 -@Service -public class GoogleCloudTtsServiceImpl implements TtsService { - - @Value("${spring.cloud.gcp.credentials.location}") - private String credentialsLocation; - - @Override - public File generateTtsWithSsml(String rawText, SpeakerType speakerType) throws Exception { - // SSML 태그가 없으면 자동으로 씌워줍니다. - String ssmlInput = rawText.trim().startsWith("") ? rawText : "" + rawText + ""; - - try (FileInputStream credentialsStream = new FileInputStream(credentialsLocation)) { - GoogleCredentials credentials = GoogleCredentials.fromStream(credentialsStream); - TextToSpeechSettings settings = TextToSpeechSettings.newBuilder() - .setCredentialsProvider(() -> credentials) - .build(); - - try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create(settings)) { - SynthesisInput input = SynthesisInput.newBuilder().setSsml(ssmlInput).build(); - VoiceSelectionParams voice = buildVoiceSelection(speakerType); - AudioConfig audioConfig = AudioConfig.newBuilder().setAudioEncoding(AudioEncoding.MP3).build(); - - // 실제 구글 API가 호출될 때만 찍히는 로그 - String logText = rawText.length() > 15 ? rawText.substring(0, 15) + "..." : rawText; - log.info("[TTS 호출] 💳 구글 API 실제 요청 발생! (화자: {}, 대사: '{}')", speakerType.name(), logText); - - SynthesizeSpeechResponse response = textToSpeechClient.synthesizeSpeech(input, voice, audioConfig); - ByteString audioContents = response.getAudioContent(); - - File tempFile = File.createTempFile("tts_" + UUID.randomUUID(), ".mp3"); - try (FileOutputStream out = new FileOutputStream(tempFile)) { - out.write(audioContents.toByteArray()); - } - return tempFile; - } - } catch (Exception e) { - log.error("[TTS 호출 실패] GCP 키 파일 확인 필요: {}", credentialsLocation, e); - throw e; - } - } - - private VoiceSelectionParams buildVoiceSelection(SpeakerType type) { - String voiceName = switch (type) { - case A -> "ko-KR-Wavenet-C"; - case B -> "ko-KR-Wavenet-D"; - case USER -> "ko-KR-Wavenet-B"; - case NARRATOR -> "ko-KR-Wavenet-A"; - }; - return VoiceSelectionParams.newBuilder() - .setLanguageCode("ko-KR") - .setName(voiceName) - .build(); - } -} \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java b/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java deleted file mode 100644 index c5168e42..00000000 --- a/src/main/java/com/swyp/picke/global/infra/tts/service/OpenAiTtsServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.swyp.picke.global.infra.tts.service; - -import com.swyp.picke.domain.scenario.enums.SpeakerType; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.*; -import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; - -import java.io.File; -import java.io.FileOutputStream; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@Slf4j -// @Primary - 사용할 때 주석 삭제 -@Service -public class OpenAiTtsServiceImpl implements TtsService { - - @Value("${openai.api-key}") - private String openAiApiKey; - - @Value("${openai.tts.model:gpt-4o-mini-tts}") - private String ttsModel; - - @Value("${openai.tts.url:https://api.openai.com/v1/audio/speech}") - private String ttsUrl; - - @Override - public File generateTtsWithSsml(String rawText, SpeakerType speakerType) throws Exception { - // 1. 억지스러운 전처리 제거 (자연스러운 문장 부호 유지) - String actingText = cleanTextForNaturalFlow(rawText); - - String voice = getOpenAiVoice(speakerType); - double speed = getVoiceSpeed(speakerType); - - log.info("[TTS 호출] OpenAI 호출 (화자: {}, 속도: {}, 대사: '{}')", voice, speed, actingText); - - RestTemplate restTemplate = new RestTemplate(); - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - headers.setBearerAuth(openAiApiKey); - - Map requestBody = new HashMap<>(); - requestBody.put("model", ttsModel); - requestBody.put("input", actingText); - requestBody.put("voice", voice); - requestBody.put("response_format", "mp3"); - requestBody.put("speed", speed); - - HttpEntity> entity = new HttpEntity<>(requestBody, headers); - - try { - ResponseEntity response = restTemplate.exchange(ttsUrl, HttpMethod.POST, entity, byte[].class); - File tempFile = File.createTempFile("tts_pro_" + UUID.randomUUID(), ".mp3"); - try (FileOutputStream out = new FileOutputStream(tempFile)) { - out.write(response.getBody()); - } - return tempFile; - } catch (Exception e) { - log.error("[TTS 호출 실패]", e); - throw e; - } - } - - /** - * 인위적인 쉼표 조작을 없애고, AI가 마침표(.)와 느낌표(!)를 보고 - * 스스로 억양을 잡게 합니다. - */ - private String cleanTextForNaturalFlow(String rawText) { - // SSML만 제거하고, 원래 문장의 쉼표와 마침표를 그대로 살립니다. - // OpenAI는 마침표에서 톤을 낮추고, 느낌표에서 톤을 높이는 연기를 알아서 합니다. - return rawText.replaceAll("<[^>]*>", "").replaceAll("\\s+", " ").trim(); - } - - private String getOpenAiVoice(SpeakerType type) { - return switch (type) { - case A -> "shimmer"; // 날카롭고 빠른 반응에 최적 - case B -> "fable"; // 단호한 반박 - case USER -> "alloy"; - case NARRATOR -> "onyx"; - }; - } - - /** - * 박진감을 위해 속도를 1.15~1.2 수준으로 올립니다. - * 1.2가 넘어가면 말이 뭉개질 수 있으니 여기가 마지노선입니다. - */ - private double getVoiceSpeed(SpeakerType type) { - return switch (type) { - case NARRATOR -> 1.05; // 해설도 지루하지 않게 - case A, B -> 1.18; // 🔥 대결 톤! 1.18~1.2 정도면 아주 긴박합니다. - case USER -> 1.12; - }; - } -} \ No newline at end of file diff --git a/src/main/resources/templates/share/result.html b/src/main/resources/templates/share/result.html deleted file mode 100644 index b75c451f..00000000 --- a/src/main/resources/templates/share/result.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - Pické - 철학자 유형 결과 - - - - - - - -
- - - - - - - -
- - - - -