Merge branch 'drone-conf'

add new filter

app/filters/Filters.py

@@ -8,10 +8,11 @@ from keyboards.menu_commands import commands
 
 class IsAdmin(BaseFilter):
     def __init__(self):
-        self.admins_ids = os.getenv("BOT_ADMINS").split(",")
+        self.admins_ids = list(map(int, os.getenv("BOT_ADMINS").split(",")))
+
 
     async def __call__(self, message: Message | CallbackQuery) -> bool:
-        return str(message.from_user.id) in self.admins_ids
+        return message.from_user.id in self.admins_ids
 
 
 class CommandFilter(BaseFilter):

app/handlers/orders.py

@@ -14,6 +14,7 @@ from loguru import logger
 from filters import IsAdmin
 from keyboards import create_inline_kb, commands, button_create
 from database import async_session_, Order, Worker
+from FSM import SearchForm, OrderForm
 
 orders_router = Router()
 

drone.yaml

@@ -17,26 +17,39 @@ steps:
       - name: dockersock
         path: /var/run/docker.sock
     commands:
-      - docker build -t myapp:${DRONE_COMMIT_SHA} .
+      - docker build -t myapp:${DRONE_COMMIT_BRANCH} .
 
   - name: deploy
     image: docker
     volumes:
       - name: dockersock
         path: /var/run/docker.sock
+      - name: env
+        path: /srv/prod/telegram_bot/
     environment:
-      ENV_CONTENT:
+      TOKEN:
-        from_secret: DOT_ENV_CONTENT
+        from_secret: TOKEN
+      BOT_ADMINS:
+        from_secret: BOT_ADMINS
+      DATABASE:
+        from_secret: DATABASE
+      DB_HOST:
+        from_secret: DB_HOST
+      DB_USER:
+        from_secret: DB_USER
+      DB_PASSWORD:
+        from_secret: DB_PASSWORD
     commands:
       - echo "$ENV_CONTENT" > .env
-      - ls -la | echo
-      - cat .env
       - docker stop myapp || true
       - docker rm myapp || true
-      - docker run -d --name=myapp --network=prod_net -v /srv/prod/telegram_bot/photos:/app/photos/ myapp:${DRONE_COMMIT_SHA}
+      - 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:
   - name: dockersock
     host:
       path: /var/run/docker.sock
+  - name: env
+    host:
+      path: /srv/prod/telegram_bot/