Merge pull request #135 from ilyarolf/feature/physical-items

Feature/physical items

Author: ilyarolf

callbacks.py

@@ -3,18 +3,23 @@
 from enums.add_type import AddType
 from enums.announcement_type import AnnouncementType
 from enums.bot_entity import BotEntity
+from enums.buy_status import BuyStatus
 from enums.cart_action import CartAction
 from enums.coupon_type import CouponType
 from enums.cryptocurrency import Cryptocurrency
 from enums.entity_type import EntityType
+from enums.item_type import ItemType
 from enums.keyboard_button import KeyboardButton
 from enums.language import Language
+from enums.shipping_management_action import ShippingManagementAction
+from enums.shipping_type_property import ShippingOptionProperty
 from enums.sort_order import SortOrder
 from enums.sort_property import SortProperty
 from enums.statistics_entity import StatisticsEntity
 from enums.statistics_timedelta import StatisticsTimeDelta
 from enums.user_management_operation import UserManagementOperation
 from enums.coupon_number_of_uses import CouponNumberOfUses
+from enums.user_role import UserRole
 from utils.utils import get_text
 
 
@@ -39,6 +44,7 @@ class SortingCallback(CallbackData, prefix="sorting"):
 
 
 class AllCategoriesCallback(BaseCallback, SortingCallback, prefix="all_categories"):
+    item_type: ItemType | None
     category_id: int | None
     subcategory_id: int | None
     quantity: int | None
@@ -47,6 +53,7 @@ class AllCategoriesCallback(BaseCallback, SortingCallback, prefix="all_categorie
 
     @staticmethod
     def create(level: int,
+               item_type: ItemType | None = None,
                category_id: int | None = None,
                subcategory_id: int | None = None,
                quantity: int | None = None,
@@ -56,6 +63,7 @@ def create(level: int,
                confirmation: bool = False,
                page: int = 0) -> 'AllCategoriesCallback':
         return AllCategoriesCallback(level=level,
+                                     item_type=item_type,
                                      category_id=category_id, subcategory_id=subcategory_id,
                                      sort_order=sort_order, sort_property=sort_property,
                                      quantity=quantity, is_filter_enabled=is_filter_enabled,
@@ -67,6 +75,7 @@ class MyProfileCallback(BaseCallback, SortingCallback, prefix="my_profile"):
     buyItem_id: int | None = None
     cryptocurrency: Cryptocurrency | None = None
     language: Language | None = None
+    user_role: UserRole = UserRole.USER
     confirmation: bool = False
     page: int
 
@@ -79,13 +88,15 @@ def create(level: int,
                is_filter_enabled: bool = False,
                cryptocurrency: Cryptocurrency | None = None,
                language: Language | None = None,
+               user_role: UserRole = UserRole.USER,
                confirmation: bool = False,
                page=0) -> 'MyProfileCallback':
         return MyProfileCallback(level=level, buy_id=buy_id, buyItem_id=buyItem_id,
                                  sort_order=sort_order, sort_property=sort_property,
                                  is_filter_enabled=is_filter_enabled,
                                  cryptocurrency=cryptocurrency,
                                  language=language,
+                                 user_role=user_role,
                                  confirmation=confirmation,
                                  page=page)
 
@@ -95,21 +106,24 @@ class CartCallback(BaseCallback, prefix="cart"):
     cart_id: int
     cart_item_id: int
     cart_action: CartAction | None
+    shipping_option_id: int | None
     confirmation: bool
 
     @staticmethod
     def create(level: int = 0,
                cart_id: int = -1,
                cart_item_id: int = -1,
                cart_action: CartAction | None = None,
+               shipping_option_id: int | None = None,
                confirmation=False,
                page: int = 0):
         return CartCallback(level=level,
                             cart_id=cart_id,
                             cart_item_id=cart_item_id,
                             cart_action=cart_action,
-                            page=page,
-                            confirmation=confirmation)
+                            shipping_option_id=shipping_option_id,
+                            confirmation=confirmation,
+                            page=page)
 
 
 class AdminMenuCallback(BaseCallback, prefix="admin_menu"):
@@ -241,3 +255,42 @@ def create(level: int, coupon_id: int | None = None, coupon_type: CouponType | N
                                         number_of_uses=number_of_uses,
                                         confirmation=confirmation,
                                         page=page)
+
+
+class ShippingManagementCallback(BaseCallback, prefix="shipping_management"):
+    shipping_management_action: ShippingManagementAction | None = None
+    shipping_type_property: ShippingOptionProperty | None = None
+    shipping_id: int | None = None
+    page: int
+    confirmation: bool
+
+    @staticmethod
+    def create(level: int, shipping_management_action: ShippingManagementAction | None = None,
+               shipping_type_property: ShippingOptionProperty | None = None,
+               shipping_id: int | None = None, confirmation: bool = False, page: int = 0):
+        return ShippingManagementCallback(level=level,
+                                          shipping_management_action=shipping_management_action,
+                                          shipping_type_property=shipping_type_property,
+                                          shipping_id=shipping_id,
+                                          confirmation=confirmation,
+                                          page=page)
+
+
+class BuysManagementCallback(BaseCallback, prefix="buys"):
+    buy_id: int | None = None
+    item_type: ItemType | None = None
+    buy_status: BuyStatus | None = None
+    page: int
+    confirmation: bool = False
+
+    @staticmethod
+    def create(level: int,
+               buy_id: int | None = None,
+               item_type: ItemType | None = None,
+               buy_status: BuyStatus | None = None,
+               confirmation: bool = False,
+               page: int = 0):
+        return BuysManagementCallback(level=level, buy_id=buy_id,
+                                      item_type=item_type,
+                                      buy_status=buy_status, confirmation=confirmation,
+                                      page=page)

enums/buy_status.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class BuyStatus(Enum):
+    PAID = "PAID"
+    SHIPPED = "SHIPPED"
+    DELIVERED = "DELIVERED"
+    COMPLETED = "COMPLETED"
+    REFUNDED = "REFUNDED"

enums/item_type.py

@@ -0,0 +1,13 @@
+from enum import Enum
+
+from enums.bot_entity import BotEntity
+from enums.language import Language
+from utils.utils import get_text
+
+
+class ItemType(Enum):
+    DIGITAL = "DIGITAL"
+    PHYSICAL = "PHYSICAL"
+
+    def get_localized(self, language: Language):
+        return get_text(language, BotEntity.COMMON, self.value.lower())

enums/shipping_management_action.py

@@ -0,0 +1,7 @@
+from enum import IntEnum
+
+
+class ShippingManagementAction(IntEnum):
+    CREATE = 1
+    DISABLE = 2
+    EDIT = 3

enums/shipping_type_property.py

@@ -0,0 +1,6 @@
+from enum import IntEnum
+
+
+class ShippingOptionProperty(IntEnum):
+    NAME = 1
+    PRICE = 2

enums/user_role.py

@@ -0,0 +1,6 @@
+from enum import IntEnum
+
+
+class UserRole(IntEnum):
+    USER = 1
+    ADMIN = 2

handlers/admin/admin.py

@@ -3,14 +3,18 @@
 from aiogram.types import Message, CallbackQuery
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from callbacks import AdminMenuCallback, AnnouncementCallback, InventoryManagementCallback, \
-    UserManagementCallback, StatisticsCallback, WalletCallback, MediaManagementCallback, CouponManagementCallback
+    UserManagementCallback, StatisticsCallback, WalletCallback, MediaManagementCallback, CouponManagementCallback, \
+    ShippingManagementCallback, MyProfileCallback
 from enums.bot_entity import BotEntity
 from enums.keyboard_button import KeyboardButton as KB
 from enums.language import Language
+from enums.user_role import UserRole
 from handlers.admin.announcement import announcement_router
+from handlers.admin.buys_management import buys_management_router
 from handlers.admin.coupon_management import coupons_management
 from handlers.admin.inventory_management import inventory_management
 from handlers.admin.media_management import media_management
+from handlers.admin.shipping_management import shipping_management
 from handlers.admin.statistics import statistics
 from handlers.admin.user_management import user_management
 from handlers.admin.wallet import wallet
@@ -24,7 +28,9 @@
                              statistics,
                              wallet,
                              media_management,
-                             coupons_management)
+                             coupons_management,
+                             shipping_management,
+                             buys_management_router)
 
 
 @admin_router.message(F.text.in_(KB.get_localized_set(KB.ADMIN_MENU)), AdminIdFilter())
@@ -52,6 +58,11 @@ async def admin(**kwargs):
                       callback_data=MediaManagementCallback.create(level=0))
     kb_builder.button(text=get_text(language, BotEntity.ADMIN, "coupons_management"),
                       callback_data=CouponManagementCallback.create(level=0))
+    kb_builder.button(text=get_text(language, BotEntity.ADMIN, "shipping_management"),
+                      callback_data=ShippingManagementCallback.create(level=0))
+    kb_builder.button(text=get_text(language, BotEntity.ADMIN, "buys_management"),
+                      callback_data=MyProfileCallback.create(level=3,
+                                                             user_role=UserRole.ADMIN))
     kb_builder.adjust(2)
     msg_text = get_text(language, BotEntity.ADMIN, "menu")
     if isinstance(message, Message):

handlers/admin/buys_management.py

@@ -0,0 +1,60 @@
+from aiogram import Router, F
+from aiogram.filters import StateFilter
+from aiogram.fsm.context import FSMContext
+from aiogram.types import CallbackQuery, Message
+from sqlalchemy.ext.asyncio import AsyncSession
+from callbacks import BuysManagementCallback
+from enums.language import Language
+from handlers.admin.constants import BuysManagementStates
+from services.buys_management import BuysManagementService
+from utils.custom_filters import AdminIdFilter
+
+buys_management_router = Router()
+
+
+async def set_track_number(**kwargs):
+    callback: CallbackQuery = kwargs.get("callback")
+    callback_data: BuysManagementCallback = kwargs.get("callback_data")
+    state: FSMContext = kwargs.get("state")
+    session: AsyncSession = kwargs.get("session")
+    language: Language = kwargs.get("language")
+    if callback_data.confirmation:
+        msg, kb_builder = await BuysManagementService.update_track_number(session, state, language)
+    else:
+        msg, kb_builder = await BuysManagementService.set_update_track_number_state(callback_data, state, language)
+    message = await callback.message.edit_text(text=msg, reply_markup=kb_builder.as_markup())
+    await state.update_data(chat_id=message.chat.id, msg_id=message.message_id)
+
+
+@buys_management_router.message(AdminIdFilter(), F.text, StateFilter(BuysManagementStates.update_track_number))
+async def receive_track_number(message: Message,
+                               state: FSMContext,
+                               session: AsyncSession,
+                               language: Language):
+    msg, kb_builder = await BuysManagementService.update_track_number_confirmation(message, state, session, language)
+    await message.answer(text=msg, reply_markup=kb_builder.as_markup())
+
+
+@buys_management_router.callback_query(AdminIdFilter(), BuysManagementCallback.filter())
+async def announcement_navigation(callback: CallbackQuery,
+                                  state: FSMContext,
+                                  callback_data: BuysManagementCallback,
+                                  session: AsyncSession,
+                                  language: Language):
+    current_level = callback_data.level
+
+    levels = {
+        1: set_track_number
+    }
+
+    current_level_function = levels[current_level]
+
+    kwargs = {
+        "callback": callback,
+        "callback_data": callback_data,
+        "state": state,
+        "session": session,
+        "language": language
+    }
+
+    await current_level_function(**kwargs)

handlers/admin/constants.py

@@ -28,6 +28,7 @@ def get_confirmation_builder(announcement_type: AnnouncementType, language: Lang
 
 
 class InventoryManagementStates(StatesGroup):
+    item_type = State()
     document = State()
     category = State()
     subcategory = State()
@@ -59,3 +60,13 @@ class MediaManagementStates(StatesGroup):
 class CouponsManagementStates(StatesGroup):
     coupon_name = State()
     coupon_value = State()
+
+
+class ShippingManagementStates(StatesGroup):
+    shipping_name = State()
+    shipping_price = State()
+    edit_property = State()
+
+
+class BuysManagementStates(StatesGroup):
+    update_track_number = State()

handlers/admin/inventory_management.py

@@ -87,7 +87,8 @@ async def add_items_document(message: Message, state: FSMContext, session: Async
     await state.clear()
 
 
-@inventory_management.message(AdminIdFilter(), F.text, StateFilter(InventoryManagementStates.category,
+@inventory_management.message(AdminIdFilter(), F.text, StateFilter(InventoryManagementStates.item_type,
+                                                                   InventoryManagementStates.category,
                                                                    InventoryManagementStates.subcategory,
                                                                    InventoryManagementStates.price,
                                                                    InventoryManagementStates.description,