bug fixes: silent_mode/ cash register indempotence/ antispam for key_country/ ban improvements

api/routes/misc.py

@@ -163,7 +163,9 @@ async def get_tracking_source_with_stats(
         type=source.type,
         created_by=source.created_by,
         created_at=source.created_at,
-        registrations=stats.get("registrations", 0),
-        trials=stats.get("trials", 0),
-        payments=stats.get("payments", 0),
+        registrations=(stats["registrations"] if stats else 0),
+        trials=(stats["trials"] if stats else 0),
+        payments=(stats["payments"] if stats else 0),
+        total_amount=(float(stats["total_amount"]) if stats else 0.0),
+        monthly=(stats["monthly"] if stats and "monthly" in stats else []),
     )

api/schemas/misc.py

@@ -94,6 +94,16 @@ class BlockedUserResponse(BaseModel):
         from_attributes = True
 
 
+class MonthlyStats(BaseModel):
+    month: str
+    registrations: int
+    trials: int
+    new_purchases_count: int
+    new_purchases_amount: float
+    repeat_purchases_count: int
+    repeat_purchases_amount: float
+
+
 class TrackingSourceResponse(BaseModel):
     id: int
     name: str
@@ -105,6 +115,9 @@ class TrackingSourceResponse(BaseModel):
     registrations: int = 0
     trials: int = 0
     payments: int = 0
+    total_amount: float = 0.0
+
+    monthly: list[MonthlyStats] = []
 
     class Config:
         from_attributes = True

api/schemas/tariffs.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-
 from pydantic import BaseModel
 
 
@@ -12,6 +11,7 @@ class TariffBase(BaseModel):
     device_limit: int | None = None
     is_active: bool = True
     subgroup_title: str | None = None
+    sort_order: int | None = None
 
 
 class TariffResponse(TariffBase):
@@ -32,6 +32,7 @@ class TariffUpdate(BaseModel):
     device_limit: int | None = None
     is_active: bool | None = None
     subgroup_title: str | None = None
+    sort_order: int | None = None
 
     class Config:
         from_attributes = True