fix: Исправление использования моделей

Signed-off-by: Roman Chursanov <[email protected]>

Author: AuthFailed

pyproject.toml

@@ -5,7 +5,7 @@ description = "Бот-помощник СТП"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
-    "stp-database @ git+https://[email protected]/ERTG-BOTS/stp-database.git",
+    "stp-database @ git+https://[email protected]/ERTG-BOTS/stp-database.git@35ea48b",
     "aiogram>=3.21.0",
     "aiomysql>=0.2.0",
     "alembic==1.16.5",

tgbot/handlers/head/group/members.py

@@ -434,7 +434,7 @@ async def view_member_kpi(
 🎯 <b>Цель - {SalaryFormatter.format_percentage(premium.target_premium)}</b>
 <blockquote>Тип: {premium.target_type or "—"}
 Факт: {SalaryFormatter.format_value(premium.target)}
-План: {SalaryFormatter.format_value(round(premium.target_goal_first)) if premium.target_goal_first else "—"} / {SalaryFormatter.format_value(round(premium.target_goal_second)) if premium.target_goal_second else "—"}</blockquote>
+План: {SalaryFormatter.format_value(round(premium.target_normative_first)) if premium.target_normative_first else "—"} / {SalaryFormatter.format_value(round(premium.target_normative_second)) if premium.target_normative_second else "—"}</blockquote>
 
 💼 <b>Дополнительно</b>
 <blockquote>Дисциплина: {SalaryFormatter.format_percentage(premium.discipline_premium)}
@@ -463,8 +463,8 @@ async def view_member_kpi(
                 )
                 target_calculation = KPICalculator.calculate_target_needed(
                     premium.target,
-                    premium.target_goal_first,
-                    premium.target_goal_second,
+                    premium.target_normative_first,
+                    premium.target_normative_second,
                     premium.target_type,
                 )
 
@@ -495,8 +495,8 @@ async def view_member_kpi(
 {gok_calculation}</blockquote>
 
 🎯 <b>Цель</b>
-<blockquote>Факт: {SalaryFormatter.format_value(premium.target)} ({SalaryFormatter.format_percentage(round((premium.target_goal_first / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_goal_first else (premium.target / premium.target_goal_first * 100) if premium.target_goal_first and premium.target_goal_first > 0 else 0))} / {SalaryFormatter.format_percentage(round((premium.target_goal_second / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_goal_second else (premium.target / premium.target_goal_second * 100) if premium.target_goal_second and premium.target_goal_second > 0 else 0))})
-План: {SalaryFormatter.format_value(round(premium.target_goal_first))} / {SalaryFormatter.format_value(round(premium.target_goal_second))}
+<blockquote>Факт: {SalaryFormatter.format_value(premium.target)} ({SalaryFormatter.format_percentage(round((premium.target_normative_first / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_normative_first else (premium.target / premium.target_normative_first * 100) if premium.target_normative_first and premium.target_normative_first > 0 else 0))} / {SalaryFormatter.format_percentage(round((premium.target_normative_second / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_normative_second else (premium.target / premium.target_normative_second * 100) if premium.target_normative_second and premium.target_normative_second > 0 else 0))})
+План: {SalaryFormatter.format_value(round(premium.target_normative_first))} / {SalaryFormatter.format_value(round(premium.target_normative_second))}
 
 Требуется минимум 100 {"чатов" if member.division == "НЦК" else "звонков"} для получения премии за цель
 

tgbot/handlers/head/kpi.py

@@ -43,7 +43,7 @@ async def head_start_cb(
 🎯 <b>Цель - {SalaryFormatter.format_percentage(premium.target_premium)}</b>
 <blockquote>Тип: {premium.target_type or "—"}
 Факт: {SalaryFormatter.format_value(premium.target)}
-План: {SalaryFormatter.format_value(round(premium.target_goal_first))} / {SalaryFormatter.format_value(round(premium.target_goal_second))}</blockquote>
+План: {SalaryFormatter.format_value(round(premium.target_normative_first))} / {SalaryFormatter.format_value(round(premium.target_normative_second))}</blockquote>
 
 💰 <b>Итого:</b>
 <b>Общая премия: {SalaryFormatter.format_percentage(premium.total_premium)}</b>
@@ -82,8 +82,8 @@ async def head_kpi_calculator_cb(
     )
     target_calculation = KPICalculator.calculate_target_needed(
         user_premium.target,
-        user_premium.target_goal_first,
-        user_premium.target_goal_second,
+        user_premium.target_normative_first,
+        user_premium.target_normative_second,
         user_premium.target_type,
         is_head=True,
     )
@@ -106,7 +106,7 @@ async def head_kpi_calculator_cb(
 
 🎯 <b>Цель</b>
 <blockquote>Факт: {SalaryFormatter.format_value(user_premium.target)} ({SalaryFormatter.format_percentage(user_premium.target_result_first)} / {SalaryFormatter.format_percentage(user_premium.target_result_second)})
-План: {SalaryFormatter.format_value(round(user_premium.target_goal_first))} / {SalaryFormatter.format_value(round(user_premium.target_goal_second))}
+План: {SalaryFormatter.format_value(round(user_premium.target_normative_first))} / {SalaryFormatter.format_value(round(user_premium.target_normative_second))}
 
 <b>Для премии:</b>
 {target_calculation}</blockquote>

tgbot/handlers/search/main.py

@@ -673,8 +673,8 @@ async def view_user_kpi_calculator(
                 )
                 target_calculation = KPICalculator.calculate_target_needed(
                     user_premium.target,
-                    user_premium.target_goal_first,
-                    user_premium.target_goal_second,
+                    user_premium.target_normative_first,
+                    user_premium.target_normative_second,
                     user_premium.target_type,
                     is_head=True,
                 )
@@ -700,7 +700,7 @@ async def view_user_kpi_calculator(
 
 🎯 <b>Цель</b>
 <blockquote>Факт: {SalaryFormatter.format_value(user_premium.target)} ({SalaryFormatter.format_percentage(user_premium.target_result_first)} / {SalaryFormatter.format_percentage(user_premium.target_result_second)})
-План: {SalaryFormatter.format_value(round(user_premium.target_goal_first))} / {SalaryFormatter.format_value(round(user_premium.target_goal_second))}
+План: {SalaryFormatter.format_value(round(user_premium.target_normative_first))} / {SalaryFormatter.format_value(round(user_premium.target_normative_second))}
 
 <b>Для премии:</b>
 {target_calculation}</blockquote>
@@ -719,8 +719,8 @@ async def view_user_kpi_calculator(
                 )
                 target_calculation = KPICalculator.calculate_target_needed(
                     user_premium.target,
-                    user_premium.target_goal_first,
-                    user_premium.target_goal_second,
+                    user_premium.target_normative_first,
+                    user_premium.target_normative_second,
                     user_premium.target_type,
                 )
 
@@ -751,8 +751,8 @@ async def view_user_kpi_calculator(
 {gok_calculation}</blockquote>
 
 🎯 <b>Цель</b>
-<blockquote>Факт: {SalaryFormatter.format_value(user_premium.target)} ({SalaryFormatter.format_percentage(round((user_premium.target_goal_first / user_premium.target * 100) if user_premium.target_type and "AHT" in user_premium.target_type and user_premium.target and user_premium.target > 0 and user_premium.target_goal_first else (user_premium.target / user_premium.target_goal_first * 100) if user_premium.target_goal_first and user_premium.target_goal_first > 0 else 0))} / {SalaryFormatter.format_percentage(round((user_premium.target_goal_second / user_premium.target * 100) if user_premium.target_type and "AHT" in user_premium.target_type and user_premium.target and user_premium.target > 0 and user_premium.target_goal_second else (user_premium.target / user_premium.target_goal_second * 100) if user_premium.target_goal_second and user_premium.target_goal_second > 0 else 0))})
-План: {SalaryFormatter.format_value(round(user_premium.target_goal_first))} / {SalaryFormatter.format_value(round(user_premium.target_goal_second))}
+<blockquote>Факт: {SalaryFormatter.format_value(user_premium.target)} ({SalaryFormatter.format_percentage(round((user_premium.target_normative_first / user_premium.target * 100) if user_premium.target_type and "AHT" in user_premium.target_type and user_premium.target and user_premium.target > 0 and user_premium.target_normative_first else (user_premium.target / user_premium.target_normative_first * 100) if user_premium.target_normative_first and user_premium.target_normative_first > 0 else 0))} / {SalaryFormatter.format_percentage(round((user_premium.target_normative_second / user_premium.target * 100) if user_premium.target_type and "AHT" in user_premium.target_type and user_premium.target and user_premium.target > 0 and user_premium.target_normative_second else (user_premium.target / user_premium.target_normative_second * 100) if user_premium.target_normative_second and user_premium.target_normative_second > 0 else 0))})
+План: {SalaryFormatter.format_value(round(user_premium.target_normative_first))} / {SalaryFormatter.format_value(round(user_premium.target_normative_second))}
 
 Требуется минимум 100 {"чатов" if user.division == "НЦК" else "звонков"} для получения премии за цель
 
@@ -923,7 +923,7 @@ async def view_user_kpi(
 🎯 <b>Цель - {SalaryFormatter.format_percentage(premium.target_premium)}</b>
 <blockquote>Тип: {premium.target_type or "—"}
 Факт: {SalaryFormatter.format_value(premium.target)}
-План: {SalaryFormatter.format_value(round(premium.target_goal_first))} / {SalaryFormatter.format_value(round(premium.target_goal_second))}</blockquote>
+План: {SalaryFormatter.format_value(round(premium.target_normative_first))} / {SalaryFormatter.format_value(round(premium.target_normative_second))}</blockquote>
 
 💰 <b>Итого:</b>
 <b>Общая премия: {SalaryFormatter.format_percentage(premium.total_premium)}</b>
@@ -956,7 +956,7 @@ async def view_user_kpi(
 🎯 <b>Цель - {SalaryFormatter.format_percentage(premium.target_premium)}</b>
 <blockquote>Тип: {premium.target_type or "—"}
 Факт: {SalaryFormatter.format_value(premium.target)}
-План: {SalaryFormatter.format_value(round(premium.target_goal_first)) if premium.target_goal_first else "—"} / {SalaryFormatter.format_value(round(premium.target_goal_second)) if premium.target_goal_second else "—"}</blockquote>
+План: {SalaryFormatter.format_value(round(premium.target_normative_first)) if premium.target_normative_first else "—"} / {SalaryFormatter.format_value(round(premium.target_normative_second)) if premium.target_normative_second else "—"}</blockquote>
 
 💼 <b>Дополнительно</b>
 <blockquote>Дисциплина: {SalaryFormatter.format_percentage(premium.discipline_premium)}

tgbot/handlers/user/kpi.py

@@ -60,7 +60,7 @@ async def user_kpi_cb(
 🎯 <b>Цель - {SalaryFormatter.format_percentage(premium.target_premium)}</b>
 <blockquote>Тип: {premium.target_type or "—"}
 Факт: {SalaryFormatter.format_value(premium.target)}
-План: {SalaryFormatter.format_value(round(premium.target_goal_first))} / {SalaryFormatter.format_value(round(premium.target_goal_second))}</blockquote>
+План: {SalaryFormatter.format_value(round(premium.target_normative_first))} / {SalaryFormatter.format_value(round(premium.target_normative_second))}</blockquote>
 
 💼 <b>Дополнительно</b>
 <blockquote>Дисциплина: {SalaryFormatter.format_percentage(premium.discipline_premium)}
@@ -118,8 +118,8 @@ async def user_kpi_calculator_cb(
     )
     target_calculation = KPICalculator.calculate_target_needed(
         premium.target,
-        premium.target_goal_first,
-        premium.target_goal_second,
+        premium.target_normative_first,
+        premium.target_normative_second,
         premium.target_type,
     )
 
@@ -147,8 +147,8 @@ async def user_kpi_calculator_cb(
 {gok_calculation}</blockquote>
 
 🎯 <b>Цель</b>
-<blockquote>Факт: {SalaryFormatter.format_value(premium.target)} ({SalaryFormatter.format_percentage(round((premium.target_goal_first / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_goal_first else (premium.target / premium.target_goal_first * 100) if premium.target_goal_first and premium.target_goal_first > 0 else 0))} / {SalaryFormatter.format_percentage(round((premium.target_goal_second / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_goal_second else (premium.target / premium.target_goal_second * 100) if premium.target_goal_second and premium.target_goal_second > 0 else 0))})
-План: {SalaryFormatter.format_value(round(premium.target_goal_first))} / {SalaryFormatter.format_value(round(premium.target_goal_second))}
+<blockquote>Факт: {SalaryFormatter.format_value(premium.target)} ({SalaryFormatter.format_percentage(round((premium.target_normative_first / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_normative_first else (premium.target / premium.target_normative_first * 100) if premium.target_normative_first and premium.target_normative_first > 0 else 0))} / {SalaryFormatter.format_percentage(round((premium.target_normative_second / premium.target * 100) if premium.target_type and "AHT" in premium.target_type and premium.target and premium.target > 0 and premium.target_normative_second else (premium.target / premium.target_normative_second * 100) if premium.target_normative_second and premium.target_normative_second > 0 else 0))})
+План: {SalaryFormatter.format_value(round(premium.target_normative_first))} / {SalaryFormatter.format_value(round(premium.target_normative_second))}
 
 Требуется минимум 100 {"чатов" if user.division == "НЦК" else "звонков"} для получения премии за цель
 

tgbot/services/salary/kpi_calculator.py

@@ -209,13 +209,13 @@ def calculate_gok_needed(
     @staticmethod
     def calculate_target_needed(
         current_target,
-        target_goal_first,
-        target_goal_second,
+        target_normative_first,
+        target_normative_second,
         target_type: Optional[str] = None,
         is_head: bool = False,
     ):
         """Расчет цели, необходимой для достижения уровней премии"""
-        if target_goal_first is None and target_goal_second is None:
+        if target_normative_first is None and target_normative_second is None:
             return "—"
 
         current_target = current_target or 0
@@ -228,11 +228,11 @@ def calculate_target_needed(
 
         # Для руководителей используем упрощенную систему премий
         if is_head:
-            # Определяем основной норматив (приоритет - target_goal_second, если есть)
+            # Определяем основной норматив (приоритет - target_normative_second, если есть)
             normative = (
-                target_goal_second
-                if target_goal_second and target_goal_second > 0
-                else target_goal_first
+                target_normative_second
+                if target_normative_second and target_normative_second > 0
+                else target_normative_first
             )
 
             if not normative:
@@ -291,9 +291,9 @@ def calculate_target_needed(
             return "\n".join(results)
 
         # Для специалистов
-        if target_goal_second and target_goal_second > 0:
+        if target_normative_second and target_normative_second > 0:
             # Когда есть вторая цель, используем ее как основной план
-            normative = target_goal_second
+            normative = target_normative_second
 
             if is_aht_target:
                 # Для AHT, чем ниже, тем лучше — процент рассчитывается как (план / текущий * 100)
@@ -346,9 +346,9 @@ def calculate_target_needed(
             else:
                 results.append("0%: ✅ (< 99,99% - менее плана 1)")
 
-        elif target_goal_first and target_goal_first > 0:
+        elif target_normative_first and target_normative_first > 0:
             # Когда есть только первая цель, используем ее как план
-            normative = target_goal_first
+            normative = target_normative_first
 
             if is_aht_target:
                 target_rate = (