Merge pull request #52 from pirogramming/feat-jh

chanwoongYoon · web-flow · commit 6274dd231ed6 · 2026-02-12T23:26:22.000+09:00
Feat jh
diff --git a/backend-chat/app/services/chat_service.py b/backend-chat/app/services/chat_service.py
@@ -65,17 +65,15 @@ async def _redis_sub_listener(self, room_id):
                             "content": "미션이 완료되었습니다."
                         }, room_id)
                     else:
-                        message = payload
-                        if msg_type == "SYSTEM" and "content" not in payload:
+                        if msg_type == "SYSTEM":
                             content = ""
                             if isinstance(data, dict):
                                 content = data.get("content", "")
                             else:
                                 content = str(data)
-                            message = {
-                                "type": "SYSTEM",
-                                "content": content
-                            }
+                            message = {"type": "SYSTEM", "content": content, **data}
+                        else:
+                            message = payload
                         await self._local_broadcast(message, room_id)
         except Exception as e:
             print(f"FastAPI Redis 리스너 에러: {e}")
diff --git a/backend-core/missions/views.py b/backend-core/missions/views.py
@@ -282,7 +282,11 @@ def mission_accept(request, mission_id):
         publish_chat_event(
             room_id=rid,
             event_type="SYSTEM",
-            data={"content": f"{requester_name}님이 미션 수락을 요청했습니다. 등록자가 확정하면 매칭이 완료됩니다."}
+            data={
+                "content": f"{requester_name}님이 미션 수락을 요청했습니다. 등록자가 확정하면 매칭이 완료됩니다.",
+                "mission_status": "PENDING_APPROVAL",
+                "action": "mission_accepted",
+            },
         )
 
         return JsonResponse({
@@ -483,6 +487,8 @@ def chat_room(request: HttpRequest, mission_id: int, room_id: int) -> HttpRespon
     mission = room.mission
     is_author = request.user == mission.author
     can_accept = not is_author and mission.status == "WAITING"
+    can_confirm_performer = is_author and mission.status == "PENDING_APPROVAL"
+    show_complete_btn = is_author and mission.status == "MATCHED"
     blockable_user = {"id": other_user.id, "username": other_user.username} if other_user else None
 
     return render(
@@ -495,6 +501,8 @@ def chat_room(request: HttpRequest, mission_id: int, room_id: int) -> HttpRespon
             "mission_id": mission.id,
             "is_author": is_author,
             "can_accept": can_accept,
+            "can_confirm_performer": can_confirm_performer,
+            "show_complete_btn": show_complete_btn,
             "blockable_user": blockable_user,
             "other_user": other_user,
         },
diff --git a/backend-core/static/chat/js/room.js b/backend-core/static/chat/js/room.js
@@ -55,6 +55,23 @@ class ChatClient {
             });
         }
 
+        // 미션 완료 버튼 (등록자)
+        const completeMissionBtn = document.getElementById('completeMissionBtn');
+        if (completeMissionBtn) {
+            completeMissionBtn.addEventListener('click', () => this.completeMission());
+        }
+
+        // 수행자 확정 버튼 (등록자)
+        const confirmPerformerBtn = document.getElementById('confirmPerformerBtn');
+        if (confirmPerformerBtn) {
+            confirmPerformerBtn.addEventListener('click', () => this.confirmPerformer());
+        }
+        // 수행자 거부 버튼 (등록자)
+        const rejectPerformerBtn = document.getElementById('rejectPerformerBtn');
+        if (rejectPerformerBtn) {
+            rejectPerformerBtn.addEventListener('click', () => this.rejectPerformer());
+        }
+
         const moreMenuBtn = document.getElementById('moreMenuBtn');
         const moreDropdown = document.getElementById('moreDropdown');
         if (moreMenuBtn && moreDropdown) {
@@ -134,6 +151,106 @@ class ChatClient {
         }
     }
 
+    async confirmPerformer() {
+        const btn = document.getElementById('confirmPerformerBtn');
+        if (!btn) return;
+        btn.disabled = true;
+        try {
+            const res = await fetch(`/api/missions/api/${this.missionId}/confirm/`, {
+                method: 'POST',
+                credentials: 'include',
+                headers: this.getAuthHeaders(),
+                body: JSON.stringify({ room_id: this.roomId }),
+            });
+            const data = await res.json().catch(() => ({}));
+            if (res.ok && data.success) {
+                alert(data.message || '수행자가 확정되었습니다.');
+
+                // 수행자 확정/거부 버튼 제거
+                if (btn) btn.remove();
+                const rejectBtn = document.getElementById('rejectPerformerBtn');
+                if (rejectBtn) rejectBtn.remove();
+
+                const chatActions = document.getElementById('chatActions');
+                if (chatActions && !document.getElementById('completeMissionBtn')) {
+                    const completeBtn = document.createElement('button');
+                    completeBtn.type = 'button';
+                    completeBtn.className = 'btn-action-gray';
+                    completeBtn.id = 'completeMissionBtn';
+                    completeBtn.textContent = '미션 완료';
+                    // 클릭 이벤트 연결
+                    completeBtn.addEventListener('click', () => this.completeMission());
+                    chatActions.appendChild(completeBtn);
+                }
+            } else {
+                alert(data.error || '확정에 실패했습니다.');
+                btn.disabled = false;
+            }
+        } catch (err) {
+            console.error(err);
+            alert('요청 중 오류가 발생했습니다.');
+            btn.disabled = false;
+        }
+    }
+
+    async rejectPerformer() {
+        const btn = document.getElementById('rejectPerformerBtn');
+        if (!btn) return;
+        if (!confirm('수행자 수락을 거절하시겠습니까?')) return;
+        btn.disabled = true;
+        try {
+            const res = await fetch(`/api/missions/api/${this.missionId}/reject/`, {
+                method: 'POST',
+                credentials: 'include',
+                headers: this.getAuthHeaders(),
+                body: JSON.stringify({ room_id: this.roomId }),
+            });
+            const data = await res.json().catch(() => ({}));
+            if (res.ok && data.success) {
+                alert(data.message || '수락을 거절했습니다.');
+                if (btn) btn.remove();
+                const confirmBtn = document.getElementById('confirmPerformerBtn');
+                if (confirmBtn) confirmBtn.remove();
+            } else {
+                alert(data.error || '거절에 실패했습니다.');
+                btn.disabled = false;
+            }
+        } catch (err) {
+            console.error(err);
+            alert('요청 중 오류가 발생했습니다.');
+            btn.disabled = false;
+        }
+    }
+
+    async completeMission() {
+        const btn = document.getElementById('completeMissionBtn');
+        if (!btn) return;
+        if (!confirm('미션을 완료 처리하시겠습니까?')) return;
+        btn.disabled = true;
+        try {
+            const res = await fetch(`/api/missions/api/${this.missionId}/complete/`, {
+                method: 'POST',
+                credentials: 'include',
+                headers: this.getAuthHeaders(),
+                body: JSON.stringify({ room_id: this.roomId }),
+            });
+            const data = await res.json().catch(() => ({}));
+            if (res.ok && data.success) {
+                alert(data.message || '미션이 완료되었습니다.');
+                if (btn) btn.remove();
+                // 원하면 여기서 채팅 목록 등 다른 페이지로 이동
+                // window.location.href = '/api/missions/chat/';
+            } else {
+                alert(data.error || '미션 완료에 실패했습니다.');
+                btn.disabled = false;
+            }
+        } catch (err) {
+            console.error(err);
+            alert('요청 중 오류가 발생했습니다.');
+            btn.disabled = false;
+        }
+    }
+
     async blockUser(targetId, username, btnEl) {
         if (!btnEl) return;
         if (!confirm(`${username || '해당 유저'}를 차단하시겠습니까?`)) return;
@@ -285,6 +402,28 @@ class ChatClient {
         };
     }
 
+    showConfirmButtons() {
+        const chatActions = document.getElementById('chatActions');
+        if (!chatActions) return;
+        if (document.getElementById('confirmPerformerBtn')) return;
+
+        const confirmBtn = document.createElement('button');
+        confirmBtn.type = 'button';
+        confirmBtn.className = 'btn-action-outline';
+        confirmBtn.id = 'confirmPerformerBtn';
+        confirmBtn.innerHTML = '<i class="fa-regular fa-circle-check"></i> 수행자 확정';
+        confirmBtn.addEventListener('click', () => this.confirmPerformer());
+        chatActions.appendChild(confirmBtn);
+
+        const rejectBtn = document.createElement('button');
+        rejectBtn.type = 'button';
+        rejectBtn.className = 'btn-action-gray';
+        rejectBtn.id = 'rejectPerformerBtn';
+        rejectBtn.textContent = '수행자 거부';
+        rejectBtn.addEventListener('click', () => this.rejectPerformer());
+        chatActions.appendChild(rejectBtn);
+    }
+
     handleMessage(msg) {
         switch (msg.type) {
             case 'AUTH_SUCCESS':
@@ -305,6 +444,9 @@ class ChatClient {
 
             case 'SYSTEM':
                 this.displaySystemMessage(msg.content);
+                if (msg.action === 'mission_accepted' && this.isAuthor) {
+                    this.showConfirmButtons();
+                }
                 break;
 
             case 'KICK':
diff --git a/backend-core/staticfiles/chat/js/room.js b/backend-core/staticfiles/chat/js/room.js
@@ -55,6 +55,23 @@ class ChatClient {
             });
         }
 
+        // 미션 완료 버튼 (등록자)
+        const completeMissionBtn = document.getElementById('completeMissionBtn');
+        if (completeMissionBtn) {
+            completeMissionBtn.addEventListener('click', () => this.completeMission());
+        }
+
+        // 수행자 확정 버튼 (등록자)
+        const confirmPerformerBtn = document.getElementById('confirmPerformerBtn');
+        if (confirmPerformerBtn) {
+            confirmPerformerBtn.addEventListener('click', () => this.confirmPerformer());
+        }
+        // 수행자 거부 버튼 (등록자)
+        const rejectPerformerBtn = document.getElementById('rejectPerformerBtn');
+        if (rejectPerformerBtn) {
+            rejectPerformerBtn.addEventListener('click', () => this.rejectPerformer());
+        }
+
         const moreMenuBtn = document.getElementById('moreMenuBtn');
         const moreDropdown = document.getElementById('moreDropdown');
         if (moreMenuBtn && moreDropdown) {
@@ -134,6 +151,106 @@ class ChatClient {
         }
     }
 
+    async confirmPerformer() {
+        const btn = document.getElementById('confirmPerformerBtn');
+        if (!btn) return;
+        btn.disabled = true;
+        try {
+            const res = await fetch(`/api/missions/api/${this.missionId}/confirm/`, {
+                method: 'POST',
+                credentials: 'include',
+                headers: this.getAuthHeaders(),
+                body: JSON.stringify({ room_id: this.roomId }),
+            });
+            const data = await res.json().catch(() => ({}));
+            if (res.ok && data.success) {
+                alert(data.message || '수행자가 확정되었습니다.');
+
+                // 수행자 확정/거부 버튼 제거
+                if (btn) btn.remove();
+                const rejectBtn = document.getElementById('rejectPerformerBtn');
+                if (rejectBtn) rejectBtn.remove();
+
+                const chatActions = document.getElementById('chatActions');
+                if (chatActions && !document.getElementById('completeMissionBtn')) {
+                    const completeBtn = document.createElement('button');
+                    completeBtn.type = 'button';
+                    completeBtn.className = 'btn-action-gray';
+                    completeBtn.id = 'completeMissionBtn';
+                    completeBtn.textContent = '미션 완료';
+                    // 클릭 이벤트 연결
+                    completeBtn.addEventListener('click', () => this.completeMission());
+                    chatActions.appendChild(completeBtn);
+                }
+            } else {
+                alert(data.error || '확정에 실패했습니다.');
+                btn.disabled = false;
+            }
+        } catch (err) {
+            console.error(err);
+            alert('요청 중 오류가 발생했습니다.');
+            btn.disabled = false;
+        }
+    }
+
+    async rejectPerformer() {
+        const btn = document.getElementById('rejectPerformerBtn');
+        if (!btn) return;
+        if (!confirm('수행자 수락을 거절하시겠습니까?')) return;
+        btn.disabled = true;
+        try {
+            const res = await fetch(`/api/missions/api/${this.missionId}/reject/`, {
+                method: 'POST',
+                credentials: 'include',
+                headers: this.getAuthHeaders(),
+                body: JSON.stringify({ room_id: this.roomId }),
+            });
+            const data = await res.json().catch(() => ({}));
+            if (res.ok && data.success) {
+                alert(data.message || '수락을 거절했습니다.');
+                if (btn) btn.remove();
+                const confirmBtn = document.getElementById('confirmPerformerBtn');
+                if (confirmBtn) confirmBtn.remove();
+            } else {
+                alert(data.error || '거절에 실패했습니다.');
+                btn.disabled = false;
+            }
+        } catch (err) {
+            console.error(err);
+            alert('요청 중 오류가 발생했습니다.');
+            btn.disabled = false;
+        }
+    }
+
+    async completeMission() {
+        const btn = document.getElementById('completeMissionBtn');
+        if (!btn) return;
+        if (!confirm('미션을 완료 처리하시겠습니까?')) return;
+        btn.disabled = true;
+        try {
+            const res = await fetch(`/api/missions/api/${this.missionId}/complete/`, {
+                method: 'POST',
+                credentials: 'include',
+                headers: this.getAuthHeaders(),
+                body: JSON.stringify({ room_id: this.roomId }),
+            });
+            const data = await res.json().catch(() => ({}));
+            if (res.ok && data.success) {
+                alert(data.message || '미션이 완료되었습니다.');
+                if (btn) btn.remove();
+                // 원하면 여기서 채팅 목록 등 다른 페이지로 이동
+                // window.location.href = '/api/missions/chat/';
+            } else {
+                alert(data.error || '미션 완료에 실패했습니다.');
+                btn.disabled = false;
+            }
+        } catch (err) {
+            console.error(err);
+            alert('요청 중 오류가 발생했습니다.');
+            btn.disabled = false;
+        }
+    }
+
     async blockUser(targetId, username, btnEl) {
         if (!btnEl) return;
         if (!confirm(`${username || '해당 유저'}를 차단하시겠습니까?`)) return;
@@ -285,6 +402,28 @@ class ChatClient {
         };
     }
 
+    showConfirmButtons() {
+        const chatActions = document.getElementById('chatActions');
+        if (!chatActions) return;
+        if (document.getElementById('confirmPerformerBtn')) return;
+
+        const confirmBtn = document.createElement('button');
+        confirmBtn.type = 'button';
+        confirmBtn.className = 'btn-action-outline';
+        confirmBtn.id = 'confirmPerformerBtn';
+        confirmBtn.innerHTML = '<i class="fa-regular fa-circle-check"></i> 수행자 확정';
+        confirmBtn.addEventListener('click', () => this.confirmPerformer());
+        chatActions.appendChild(confirmBtn);
+
+        const rejectBtn = document.createElement('button');
+        rejectBtn.type = 'button';
+        rejectBtn.className = 'btn-action-gray';
+        rejectBtn.id = 'rejectPerformerBtn';
+        rejectBtn.textContent = '수행자 거부';
+        rejectBtn.addEventListener('click', () => this.rejectPerformer());
+        chatActions.appendChild(rejectBtn);
+    }
+
     handleMessage(msg) {
         switch (msg.type) {
             case 'AUTH_SUCCESS':
@@ -305,6 +444,9 @@ class ChatClient {
 
             case 'SYSTEM':
                 this.displaySystemMessage(msg.content);
+                if (msg.action === 'mission_accepted' && this.isAuthor) {
+                    this.showConfirmButtons();
+                }
                 break;
 
             case 'KICK':
diff --git a/backend-core/templates/chat/room.html b/backend-core/templates/chat/room.html
