Merge pull request #5 from telling-me/fix/answer

[🐛 fix: answer count 로직 12/16일 기준으로 재편성]

Author: taewoo-dev

src/app/v2/answers/models/answer.py

@@ -9,6 +9,7 @@
     SELECT_ANSWER_BY_USER_UUID_QUERY,
     SELECT_ANSWER_COUNT_BY_USER_UUID_QUERY,
     SELECT_MOST_RECENT_ANSWER_BY_USER_UUID_QUERY,
+    SELECT_ANSWER_COUNT_BY_USER_UUID_QUERY_V2,
 )
 from app.v2.users.models.user import User
 from common.utils.query_executor import QueryExecutor
@@ -45,6 +46,12 @@ async def get_answer_count_by_user_id(cls, user_id: str) -> Any:
         value = user_id
         return await QueryExecutor.execute_query(query, values=value, fetch_type="single")
 
+    @classmethod
+    async def get_answer_count_by_user_id_v2(cls, user_id: str) -> Any:
+        query = SELECT_ANSWER_COUNT_BY_USER_UUID_QUERY_V2
+        value = user_id
+        return await QueryExecutor.execute_query(query, values=value, fetch_type="single")
+
     @classmethod
     async def find_all_by_user(cls, user_id: str, start_date: datetime, end_date: datetime) -> Any:
         query = SELECT_ANSWER_BY_USER_UUID_QUERY

src/app/v2/answers/querys/answer_query.py

@@ -2,6 +2,13 @@
 
 SELECT_ANSWER_COUNT_BY_USER_UUID_QUERY = f"SELECT COUNT(*) as answer_count FROM answer WHERE {USER_ID_QUERY}"
 
+SELECT_ANSWER_COUNT_BY_USER_UUID_QUERY_V2 = f"""
+    SELECT COUNT(*) as answer_count 
+    FROM answer 
+    WHERE {USER_ID_QUERY} AND created_time >= '2024-12-16 00:00:00'
+"""
+
+
 SELECT_ANSWER_BY_USER_UUID_QUERY = f"""
     SELECT * FROM answer
     WHERE {USER_ID_QUERY}

src/app/v2/answers/services/answer_service.py

@@ -7,11 +7,24 @@
 class AnswerService:
     @classmethod
     async def get_answer_count(cls, user_id: str) -> int:
+        """
+        과거부터 현재까지 총 답변 수
+        """
         answer_count_raw = await Answer.get_answer_count_by_user_id(user_id=user_id)
         if answer_count_raw is None:
             return 0
         return int(answer_count_raw.get("answer_count", 0))
 
+    @classmethod
+    async def get_answer_count_v2(cls, user_id: str) -> int:
+        """
+        v2 이후 총 답변 수
+        """
+        answer_count_raw = await Answer.get_answer_count_by_user_id_v2(user_id=user_id)
+        if answer_count_raw is None:
+            return 0
+        return int(answer_count_raw.get("answer_count", 0))
+
     @classmethod
     async def get_answer_record(cls, user_id: str) -> int:
         end_date = datetime.now()

src/app/v2/levels/services/level_service.py

@@ -63,7 +63,7 @@ async def calculate_days_to_level_up(cls, user_id: str, current_exp: int, requir
         remaining_exp = required_exp - current_exp
         days_needed = 0
 
-        answer_count = await AnswerService.get_answer_count(user_id=user_id)
+        answer_count = await AnswerService.get_answer_count_v2(user_id=user_id) + 1
         bonus_points = await AnswerService.calculate_consecutive_answer_points(user_id=user_id)
 
         while remaining_exp > 0:

src/app/v2/missions/services/mission_service.py

@@ -1,12 +1,11 @@
 import asyncio
 from datetime import date, datetime, timedelta, timezone
-from typing import Any, Optional
+from typing import Optional
 
 from fastapi import HTTPException
 from tortoise.exceptions import DoesNotExist
 from tortoise.transactions import atomic
 
-from app.v2.answers.models.answer import Answer
 from app.v2.answers.services.answer_service import AnswerService
 from app.v2.badges.services.badge_service import BadgeService
 from app.v2.cheese_managers.services.cheese_service import CheeseService
@@ -148,11 +147,11 @@ async def evaluate_mission_condition(self, user_id: str, mission_code: str) -> i
 
     @staticmethod
     async def check_first_post(user_id: str) -> bool:
-        return await AnswerService.get_answer_count(user_id=user_id) > 0
+        return await AnswerService.get_answer_count_v2(user_id=user_id) > 0
 
     @staticmethod
     async def get_answer_count(user_id: str) -> int:
-        return await AnswerService.get_answer_count(user_id=user_id)
+        return await AnswerService.get_answer_count_v2(user_id=user_id)
 
     @staticmethod
     async def check_post_count_range(answer_count: int, min_count: int, max_count: int) -> bool: