fix env

app/database/database_engine.py

@@ -1,14 +1,8 @@
 import os
-import asyncpg
 from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine, session
-import dotenv
 
-# connection = psycopg2.connect(*(os.getenv(key) for key in ["DATABASE", "DB_HOST", "DB_USER", "DB_PASSWORD"]))
-# connection.autocommit = True
 
-dotenv.load_dotenv(".env")
 DATABASE_URL = (f"postgresql+asyncpg://{os.getenv('DB_USER')}:{os.getenv('DB_PASSWORD')}@"
                 f"{os.getenv('DB_HOST')}/{os.getenv('DATABASE')}")
-print(DATABASE_URL)
 engine = create_async_engine(DATABASE_URL, echo=True)
 async_session_ = async_sessionmaker(bind=engine, expire_on_commit=False)

app/handlers/orders.py

@@ -146,7 +146,7 @@ async def show_order(callback: CallbackQuery, state: FSMContext, bot: Bot):
                                           (f"{clbk}_{order.id}", text) for clbk, text in order_operation_base.items()))
                                       )
 
-        for message in SearchForm.sent_messages:
+        for message in await state.get_value("sent_messages"):
             await bot.delete_message(chat_id=callback.message.chat.id, message_id=message.message_id)
     await state.clear()
 

app/main.py

@@ -1,12 +1,14 @@
 import os
 import asyncio
 from dotenv import load_dotenv
+
+load_dotenv(".env")
+
 from aiogram import Dispatcher, Bot
 from handlers import *
 from keyboards import set_main_menu
 from middlewares import SessionMiddleware
 
-load_dotenv(".env")
 bot = Bot(token=os.getenv("TOKEN"))
 
 

drone.yaml

@@ -40,10 +40,9 @@ steps:
       DB_PASSWORD:
         from_secret: DB_PASSWORD
     commands:
-      - echo "$ENV_CONTENT" > .env
       - docker stop myapp || true
       - docker rm myapp || true
-      - docker run  --name=myapp --network=prod_net -v /srv/prod/telegram_bot/photos:/app/photos/   -v /srv/prod/telegram_bot/.env:/app/.env:ro myapp:${DRONE_COMMIT_BRANCH}
+      - docker run  --name=myapp --network=prod_net -v /srv/prod/telegram_bot/photos:/app/photos/ -v /srv/prod/telegram_bot/.env:/app/.env:ro myapp:${DRONE_COMMIT_BRANCH}
 
 
 volumes: