Merge pull request #145 from ilyarolf/develop

Develop

Author: ilyarolf

enums/statistics_timedelta.py

@@ -1,5 +1,5 @@
 import calendar
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from enum import IntEnum
 
 
@@ -9,7 +9,7 @@ class StatisticsTimeDelta(IntEnum):
     MONTH = 30
 
     def get_time_range(self) -> tuple[datetime, datetime]:
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
 
         match self:
             case StatisticsTimeDelta.DAY:

handlers/admin/statistics.py

@@ -37,7 +37,8 @@ async def entity_statistics(**kwargs):
     callback_data: StatisticsCallback = kwargs.get("callback_data")
     session: AsyncSession = kwargs.get("session")
     language: Language = kwargs.get("language")
-    media, kb_builder = await StatisticsService.get_statistics(callback_data, session, language)
+    state: FSMContext = kwargs.get("state")
+    media, kb_builder = await StatisticsService.get_statistics(callback_data, session, state, language)
     await callback.message.delete()
     await callback.message.answer_photo(photo=media.media, caption=media.caption, reply_markup=kb_builder.as_markup())
 

repositories/buy.py

@@ -53,7 +53,7 @@ async def create(buy_dto: BuyDTO, session: Session | AsyncSession) -> BuyDTO:
     @staticmethod
     async def get_max_refund_page(filters: list[str], session: AsyncSession):
         conditions = [
-            Buy.status == BuyStatus.REFUNDED
+            Buy.status != BuyStatus.REFUNDED
         ]
         if filters:
             filters = [username.replace("@", "") for username in filters]
@@ -78,7 +78,7 @@ async def get_refund_data(sort_pairs: dict[str, int],
                 sort_column = sort_property.get_column(Buy)
                 sort_method = (getattr(sort_column, sort_order.name.lower()))
                 sort_methods.append(sort_method())
-        conditions = [Buy.status == BuyStatus.REFUNDED]
+        conditions = [Buy.status != BuyStatus.REFUNDED]
         if filters:
             filters = [username.replace("@", "") for username in filters]
             filter_conditions = [User.telegram_username.icontains(name) for name in filters]
@@ -119,7 +119,7 @@ async def get_refund_data_single(buy_id: int, session: Session | AsyncSession) -
                 .join(User, User.id == Buy.buyer_id)
                 .join(Item, Item.id.in_(BuyItem.item_ids))
                 .join(Subcategory, Subcategory.id == Item.subcategory_id)
-                .where(Buy.status == BuyStatus.REFUNDED, Buy.id == buy_id)
+                .where(Buy.status != BuyStatus.REFUNDED, Buy.id == buy_id)
                 .limit(1))
         refund_data = await session_execute(stmt, session)
         return RefundDTO.model_validate(refund_data.mappings().one(), from_attributes=True)
@@ -144,7 +144,7 @@ async def get_by_timedelta(timedelta: StatisticsTimeDelta, session: Session | As
         start, end = timedelta.get_time_range()
         stmt = select(Buy).where(Buy.buy_datetime >= start,
                                  Buy.buy_datetime <= end,
-                                 Buy.status == BuyStatus.REFUNDED)
+                                 Buy.status != BuyStatus.REFUNDED)
         buys = await session_execute(stmt, session)
         return [BuyDTO.model_validate(buy, from_attributes=True) for buy in buys.scalars().all()]
 
@@ -162,14 +162,14 @@ async def get_max_page_purchase_history(buyer_id: int | None, session: AsyncSess
     async def get_qty_by_buyer_id(buyer_id: int, session: AsyncSession | Session) -> int:
         stmt = (select(func.count(Buy.id))
                 .where(Buy.buyer_id == buyer_id,
-                       Buy.status == BuyStatus.REFUNDED))
+                       Buy.status != BuyStatus.REFUNDED))
         qty = await session_execute(stmt, session)
         return qty.scalar_one()
 
     @staticmethod
     async def get_spent_amount(buyer_id: int, session: AsyncSession) -> float:
         stmt = func.coalesce((select(func.sum(Buy.total_price))
                               .where(Buy.buyer_id == buyer_id,
-                                     Buy.status == BuyStatus.REFUNDED)), 0)
+                                     Buy.status != BuyStatus.REFUNDED)), 0)
         qty = await session_execute(stmt, session)
         return qty.scalar_one()

repositories/user.py

@@ -74,7 +74,16 @@ async def get_user_entity(user_entity: int | str, session: Session | AsyncSessio
             return UserDTO.model_validate(user, from_attributes=True)
 
     @staticmethod
-    async def get_by_timedelta(timedelta: StatisticsTimeDelta,
+    async def get_by_timedelta(timedelta: StatisticsTimeDelta, session: Session | AsyncSession) -> list[UserDTO]:
+        start, end = timedelta.get_time_range()
+        users_stmt = (select(User)
+                      .where(User.registered_at >= start,
+                             User.registered_at <= end))
+        users = await session_execute(users_stmt, session)
+        return [UserDTO.model_validate(user, from_attributes=True) for user in users.scalars().all()]
+
+    @staticmethod
+    async def get_by_timedelta_paginated(timedelta: StatisticsTimeDelta,
                                page: int, session: Session | AsyncSession) -> list[UserDTO]:
         start, end = timedelta.get_time_range()
         users_stmt = (select(User)
@@ -107,3 +116,12 @@ async def get_referrals_qty_by_referrer_id(referrer_id: int, session: AsyncSessi
                 .where(User.referred_by_user_id == referrer_id))
         referrals_qty = await session_execute(stmt, session)
         return referrals_qty.scalar_one()
+
+    @staticmethod
+    async def get_qty_by_timedelta(timedelta: StatisticsTimeDelta, session: AsyncSession) -> int:
+        start, end = timedelta.get_time_range()
+        users_stmt = (select(func.count(User.id))
+                      .where(User.registered_at >= start,
+                             User.registered_at <= end))
+        users_qty = await session_execute(users_stmt, session)
+        return users_qty.scalar_one()

services/statistics.py

@@ -1,5 +1,6 @@
 from collections import defaultdict
 from datetime import datetime, timedelta
+from aiogram.fsm.context import FSMContext
 from aiogram.types import InputMediaPhoto, BufferedInputFile
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -134,17 +135,27 @@ def build_statistics_chart(objects: list[UserDTO | BuyDTO | DepositDTO],
     @staticmethod
     async def get_statistics(callback_data: StatisticsCallback,
                              session: AsyncSession,
+                             state: FSMContext,
                              language: Language) -> tuple[InputMediaPhoto, InlineKeyboardBuilder]:
         kb_builder = InlineKeyboardBuilder()
         timedelta_localized = get_text(language, BotEntity.ADMIN, f"{callback_data.timedelta}_day")
         match callback_data.statistics_entity:
             case StatisticsEntity.USERS:
-                users = await UserRepository.get_by_timedelta(callback_data.timedelta, callback_data.page,
-                                                              session)
+                users = await UserRepository.get_by_timedelta(callback_data.timedelta, session)
+                users_paginated = await UserRepository.get_by_timedelta_paginated(callback_data.timedelta,
+                                                                                  callback_data.page,
+                                                                                  session)
+                users_qty = await UserRepository.get_qty_by_timedelta(callback_data.timedelta, session)
                 [kb_builder.button(text=user.telegram_username, url=f'tg://user?id={user.telegram_id}') for user in
-                 users
+                 users_paginated
                  if user.telegram_username]
-                chart = StatisticsService.build_statistics_chart(users, callback_data.timedelta, language)
+                state_data = await state.get_data()
+                chart = state_data.get(f"chart_{callback_data.timedelta.name.lower()}")
+                if chart is None:
+                    chart = StatisticsService.build_statistics_chart(users, callback_data.timedelta, language)
+                    await state.update_data(chart=chart.hex())
+                else:
+                    chart = bytes.fromhex(chart)
                 kb_builder.adjust(1)
                 kb_builder = await add_pagination_buttons(
                     kb_builder,
@@ -154,7 +165,7 @@ async def get_statistics(callback_data: StatisticsCallback,
                     language)
                 kb_builder.row(AdminConstants.back_to_main_button(language), callback_data.get_back_button(language))
                 caption = get_text(language, BotEntity.ADMIN, "new_users_msg").format(
-                    users_count=len(users),
+                    users_count=users_qty,
                     timedelta=timedelta_localized
                 )
                 media = InputMediaPhoto(