Merge pull request #140 from ilyarolf/feature/deployment-scripts

Feature/deployment scripts

Author: ilyarolf

.env .env.template.env renamed to .env.template

@@ -9,7 +9,6 @@ POSTGRES_PASSWORD = ""
 DB_PORT = "5432"
 DB_HOST = "postgres"
 POSTGRES_DB = "aiogram-shop-bot"
-DB_PASS = ""
 NGROK_TOKEN = ""
 PAGE_ENTRIES = "8"
 MULTIBOT = "false"

Caddyfile.template

@@ -0,0 +1,15 @@
+{SERVER_IP_ADDRESS}.sslip.io {
+
+    log {
+        output stdout
+        level INFO
+    }
+
+    encode gzip zstd
+
+    request_body {
+        max_size 2MB
+    }
+
+    reverse_proxy /* AiogramShopBot:5000
+}

docker-compose.yml

@@ -1,19 +1,16 @@
 services:
   caddy:
-    image: lucaslorentz/caddy-docker-proxy:2.9.1-alpine
+    image: caddy
     ports:
       - "80:80"
       - "443:443"
-    environment:
-      - CADDY_INGRESS_NETWORKS=caddy
     networks:
       - caddy
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./caddy/caddy_data:/data
+      - ./Caddyfile:/etc/caddy/Caddyfile
+      - ./caddy_data:/data
+      - ./caddy_config:/config
     restart: always
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
 
   bot:
     build:

enums/cryptocurrency.py

@@ -6,7 +6,7 @@
 from utils.utils import get_text
 
 
-class Cryptocurrency(Enum):
+class Cryptocurrency(str, Enum):
     BNB = "BNB"
     BTC = "BTC"
     LTC = "LTC"

handlers/admin/statistics.py

@@ -42,14 +42,6 @@ async def entity_statistics(**kwargs):
     await callback.message.answer_photo(photo=media.media, caption=media.caption, reply_markup=kb_builder.as_markup())
 
 
-async def get_db_file(**kwargs):
-    callback: CallbackQuery = kwargs.get("callback")
-    await callback.answer()
-    with open(f"./data/{config.DB_NAME}", "rb") as f:
-        await callback.message.bot.send_document(callback.from_user.id,
-                                                 types.BufferedInputFile(file=f.read(), filename="database.db"))
-
-
 @statistics.callback_query(AdminIdFilter(), StatisticsCallback.filter())
 async def statistics_navigation(callback: CallbackQuery, state: FSMContext, callback_data: StatisticsCallback,
                                 session: AsyncSession, language: Language):
@@ -59,7 +51,6 @@ async def statistics_navigation(callback: CallbackQuery, state: FSMContext, call
         0: statistics_menu,
         1: timedelta_picker,
         2: entity_statistics,
-        3: get_db_file
     }
     current_level_function = levels[current_level]
 

handlers/user/all_categories.py

@@ -45,9 +45,9 @@ async def all_categories(**kwargs):
     language: Language = kwargs.get("language")
     state_data = await state.get_data()
     if callback_data.is_filter_enabled and state_data.get('filter') is not None:
-        media, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
+        msg, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
     elif callback_data.is_filter_enabled:
-        media, kb_builder = await enable_search(callback_data,
+        msg, kb_builder = await enable_search(callback_data,
                                                 EntityType.CATEGORY,
                                                 {"item_type": callback_data.item_type.value},
                                                 state,
@@ -56,8 +56,8 @@ async def all_categories(**kwargs):
     else:
         await state.update_data(filter=None)
         await state.set_state()
-        media, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
-    await callback.message.edit_media(media=media, reply_markup=kb_builder.as_markup())
+        msg, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
+    await callback.message.edit_caption(caption=msg, reply_markup=kb_builder.as_markup())
 
 
 async def show_subcategories_in_category(**kwargs):

models/buyItem.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 from sqladmin import ModelView
-from sqlalchemy import Column, Integer, ForeignKey, JSON
+from sqlalchemy import Column, Integer, ForeignKey, JSON, ARRAY
 from sqlalchemy.orm import relationship
 
 from models.base import Base
@@ -15,9 +15,7 @@ class BuyItem(Base):
         "Buy",
         back_populates="buy_items"
     )
-    # ARRAY CRUTCH FOR SQLALCHEMY+SQLITE 🩼
-    # item_ids = Column(ARRAY, nullable=False)
-    item_ids = Column(JSON, nullable=False)
+    item_ids = Column(ARRAY(Integer), nullable=False)
     review = relationship(
         "Review",
         back_populates="buy_item",

models/withdrawal.py

@@ -14,3 +14,4 @@ class WithdrawalDTO(BaseModel):
     serviceFeeAmount: float | None = None
     onlyCalculate: bool
     totalWithdrawalAmount: float | None = None
+    paymentId: int | None = None

readme.md

@@ -1,6 +1,6 @@
 import math
 
-from sqlalchemy import select, func, update, or_, literal_column
+from sqlalchemy import select, func, update, or_, literal_column, any_
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
@@ -83,8 +83,6 @@ async def get_refund_data(sort_pairs: dict[str, int],
             filters = [username.replace("@", "") for username in filters]
             filter_conditions = [User.telegram_username.icontains(name) for name in filters]
             conditions.append(or_(*filter_conditions))
-        # SQLITE CRUTCH 🩼
-        je = func.json_each(BuyItem.item_ids).table_valued("value").alias("je")
         stmt = (select(Buy.total_price,
                        BuyItem.item_ids,
                        Buy.id.label("buy_id"),
@@ -95,11 +93,7 @@ async def get_refund_data(sort_pairs: dict[str, int],
                        User.language)
                 .join(BuyItem, BuyItem.buy_id == Buy.id)
                 .join(User, User.id == Buy.buyer_id)
-                # START SQLITE CRUTCH 🩼
-                .join(je, literal_column("1") == literal_column("1"))
-                .join(Item, Item.id == je.c.value)
-                # END SQLITE CRUTCH 🩼
-                # .join(Item, Item.id.in_(BuyItem.item_ids))
+                .join(Item, Item.id == any_(BuyItem.item_ids))
                 .join(Subcategory, Subcategory.id == Item.subcategory_id)
                 .where(*conditions)
                 .distinct()
@@ -112,7 +106,6 @@ async def get_refund_data(sort_pairs: dict[str, int],
 
     @staticmethod
     async def get_refund_data_single(buy_id: int, session: Session | AsyncSession) -> RefundDTO:
-        je = func.json_each(BuyItem.item_ids).table_valued("value").alias("je")
         stmt = (select(Buy.total_price,
                        BuyItem.item_ids,
                        Buy.id.label("buy_id"),
@@ -124,13 +117,9 @@ async def get_refund_data_single(buy_id: int, session: Session | AsyncSession) -
                        User.language)
                 .join(BuyItem, BuyItem.buy_id == Buy.id)
                 .join(User, User.id == Buy.buyer_id)
-                # START SQLITE CRUTCH 🩼
-                .join(je, literal_column("1") == literal_column("1"))
-                .join(Item, Item.id == je.c.value)
-                # END SQLITE CRUTCH 🩼
-                # .join(Item, Item.id.in_(BuyItem.item_ids))
+                .join(Item, Item.id.in_(BuyItem.item_ids))
                 .join(Subcategory, Subcategory.id == Item.subcategory_id)
-                .where(Buy.is_refunded == False, 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)
@@ -155,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.is_refunded == False)
+                                 Buy.status == BuyStatus.REFUNDED)
         buys = await session_execute(stmt, session)
         return [BuyDTO.model_validate(buy, from_attributes=True) for buy in buys.scalars().all()]
 
@@ -173,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.is_refunded == False))
+                       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.is_refunded == False)), 0)
+                                     Buy.status == BuyStatus.REFUNDED)), 0)
         qty = await session_execute(stmt, session)
         return qty.scalar_one()