Merge pull request #604 from Junanjunan/fix/error

[fix] 파일 업로드 에러 / 쪽지 전송 에러 및 UX 개선 / QA 메일 템플릿 적용

Author: KimTom89

api/v1/routers/memo.py

@@ -95,12 +95,14 @@ async def send_memo(
     - **me_memo**: 쪽지 내용
     """
     # 발송 대상 회원에게 쪽지 발송
+    send_point = point_service.get_config_point("cf_memo_send_point")
+
     for target in data.members:
         memo = service.send_memo(member, target, data.me_memo)
         service.update_memo_call(member, target)
         # 포인트 소진
         point_service.save_point(
-            member.mb_id, data.point * (-1),
+            member.mb_id, send_point * (-1),
             f"{target.mb_nick}({target.mb_id})님에게 쪽지 발송", "@memo",
             target.mb_id, memo.me_id)
 

bbs/memo.py

@@ -93,16 +93,19 @@ async def memo_form(
     request: Request,
     member_service: Annotated[MemberService, Depends()],
     memo_service: Annotated[MemoService, Depends()],
-    me_id: int = Query(default=None)
+    me_id: int = Query(default=None),
+    me_recv_mb_id: str = Query(default=None),
 ):
     """
     쪽지 작성 페이지
     """
     # 답장할 쪽지 & 회원 정보 조회
     target = None
     memo = memo_service.fetch_memo(me_id)
-    if memo:
+    if me_id and memo:
         target = member_service.read_member(memo.me_send_mb_id)
+    elif me_recv_mb_id:
+        target = member_service.fetch_member_by_id(me_recv_mb_id)
 
     context = {
         "request": request,
@@ -128,7 +131,7 @@ async def memo_form_update(
     # me_recv_mb_id 공백 제거
     mb_id_list = me_recv_mb_id.replace(" ", "").split(',')
     send_members = memo_service.get_receive_members(mb_id_list)
-    send_point = memo_service.calculate_send_point(member, len(send_members))
+    send_point = point_service.get_config_point("cf_memo_send_point")
 
     # 쪽지 전송 처리
     for target in send_members:

lib/mail.py

@@ -214,8 +214,6 @@ async def send_qa_mail(request: Request, qa: QaContent) -> None:
     Args:
         request (Request): Request 객체
         poll_etc (PollEtc): 기타의견 객체
-
-    TODO : 메일 발송 템플릿 적용이 필요하다.
     """
     with DBConnect().sessionLocal() as db:
         request.state.config = config = db.query(Config).first()
@@ -225,11 +223,22 @@ async def send_qa_mail(request: Request, qa: QaContent) -> None:
     from_name = get_admin_email_name(request)
     subject = f"[{config.cf_title}] {qa_config.qa_title} 질문 알림 메일"
     content = qa.qa_subject + "<br><br>" + qa.qa_content
+    templates = Jinja2Templates(
+                directory=TemplateService.get_templates_dir())
 
     if qa.qa_parent:
         question = db.get(QaContent, qa.qa_parent)
         if question.qa_email_recv and question.qa_email:
             subject = f"{subject} 에 대한 답변이 등록되었습니다."
+            content = templates.TemplateResponse(
+                "bbs/mail_form/qa_answered_mail.html", {
+                    "request": request,
+                    "qa_subject": qa.qa_subject,
+                    "qa_name": qa.qa_name,
+                    "qa_content": qa.qa_content,
+                    "link_url": request.url_for("qa_view", qa_id=qa.qa_parent),
+                }
+            ).body.decode("utf-8")
             mailer(from_email, question.qa_email, subject, content, from_name)
     else:
         if qa_config.qa_admin_email:

service/board/board.py

@@ -281,7 +281,7 @@ def upload_files(
         for file in file_list:
             index = file_list.index(file)
 
-            if file.filename:
+            if file and file.filename:
                 # 관리자가 아니면서 설정한 업로드 사이즈보다 크거나 업로드 가능 확장자가 아니면 업로드하지 않음
                 if not self.member.admin_type:
                     if not file_service.is_upload_size(self.board, file):

service/memo_service.py

@@ -172,10 +172,13 @@ def calculate_send_point(self, member: Member, count: int) -> int:
         """쪽지 전송에 필요한 포인트를 계산합니다."""
         send_point = getattr(self.config, "cf_memo_send_point", "0")
         total_use_point = int(send_point) * count
+        mb_point = int(member.mb_point)
         if total_use_point > 0:
-            if int(member.mb_point) < total_use_point:
+            if mb_point < total_use_point:
                 self.raise_exception(
-                    status_code=403, detail=f"보유하신 포인트({member.mb_point})가 부족합니다.")
+                    status_code=403,
+                    detail=f"{total_use_point-mb_point} 포인트가 부족합니다. (보유 포인트: {member.mb_point}, 필요 포인트: {total_use_point})"
+                )
 
         return total_use_point
 

service/point_service.py

@@ -117,6 +117,12 @@ def save_point(self, mb_id: str, point: int, content: str = "",
         # 회원 포인트 갱신
         self.member_service.update_member_point(mb_id, po_mb_point)
 
+    def get_config_point(self, cf_name: str) -> int:
+        """
+        설정된 포인트 값을 가져옵니다.
+        """
+        return getattr(self.config, cf_name, 0)
+
     def get_total_point(self, mb_id: str) -> int:
         """
         회원의 포인트 총합
@@ -387,4 +393,4 @@ def _update_expired_points(self, mb_id: str) -> None:
         )
         self.db.commit()
 
-        return None
+        return None

templates/basic/bbs/mail_form/qa_answered_mail.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<html lang="ko">
+    <head>
+        <meta charset="utf-8">
+        <title>{{ qa_subject }}  알림 메일</title>
+    </head>
+    <body>
+        <div style="margin:30px auto;width:600px;border:10px solid #f7f7f7">
+            <div style="border:1px solid #dedede">
+                {% if qa_subject %}
+                    <h1 style="padding:30px 30px 0;background:#f7f7f7;color:#555;font-size:1.4em">
+                        {{ qa_subject }}
+                    </h1>
+                {% endif %}
+                <span style="display:block;padding:10px 30px 30px;background:#f7f7f7;text-align:right">
+                    작성자 : {{ qa_name }}
+                </span>
+                <div style="margin:20px 0 0;padding:30px 30px 50px;min-height:200px;height:auto !important;height:200px;border-bottom:1px solid #eee">
+                    {{ qa_content }}
+                </div>
+                <a href="{{ link_url }}" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">사이트에서 확인하기</a>
+            </div>
+        </div>
+    </body>
+</html>