Merge pull request 'dev_d' (#1) from dev_d into master

Reviewed-on: #1

app/database/__init__.py

@@ -1,5 +1,4 @@
 from .database_engine import async_session_
-from .models import Worker,Component, Order
+from .models import Worker, Component, Order, job_title
 
-
+__all__ = ["Worker", "Component", "Order", "async_session_", "job_title"]
-__all__ = ["Worker", "Component", "Order", "async_session_"]

app/database/database_engine.py

@@ -8,7 +8,7 @@ import dotenv
 
 dotenv.load_dotenv(".env")
 DATABASE_URL = (f"postgresql+asyncpg://{os.getenv('DB_USER')}:{os.getenv('DB_PASSWORD')}@"
-                f"{os.getenv('DB_HOST')}:9432/{os.getenv('DATABASE')}")
+                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/database/models.py

@@ -1,8 +1,9 @@
-from sqlalchemy import Column, Integer, String, Date, ForeignKey, func, Null
+from sqlalchemy import Column, Integer, String, Date, ForeignKey, func, Null, BIGINT
 from sqlalchemy.dialects.postgresql import ENUM
 from sqlalchemy.orm import relationship, DeclarativeBase
 
 status_enum = ENUM('Выполнено', 'В процессе', 'Создано', 'Ожидание комплектующих', name='status')
+job_title = ENUM('Начальник цеха', 'Мастер', 'Сборщик', name='job_title')
 
 
 class Base(DeclarativeBase):
@@ -22,10 +23,11 @@ class Worker(Base):
     __tablename__ = "workers"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    telegram_id = Column(Integer, unique=True, nullable=False)
+    telegram_id = Column(BIGINT, unique=True, nullable=False)
     name = Column(String, nullable=False)
     email = Column(String, nullable=True)
-    phone_number = Column(String, nullable=False)
+    phone_number = Column(String, default=None)
+    job_title = Column(job_title, default='Сборщик'),
     created_at = Column(Date, server_default=func.now())
     updated_at = Column(Date, onupdate=func.now())
 
@@ -47,7 +49,7 @@ class Order(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     name = Column(String)
-    worker_id = Column(Integer, ForeignKey('workers.telegram_id'), nullable=False)
+    worker_id = Column(BIGINT, ForeignKey('workers.telegram_id'), nullable=False)
     status_id = Column(status_enum)
     counterparty = Column(String)
     customer = Column(String, nullable=False)

app/handlers/orders.py

@@ -62,8 +62,7 @@ async def orders_menu(message: Message):
 async def get_order_worker_id(callback: CallbackQuery, state: FSMContext):
     await state.set_state(OrderForm.worker_id)
     async with async_session_() as session:
-        async with session.begin():
+        result = await session.execute(select(Worker.name, Worker.telegram_id).where(Worker.job_title == "Сборщик"))
-            result = await session.execute(select(Worker.name, Worker.telegram_id))
         workers = result.all()
     await callback.message.answer("Введите сборщика ответственного за заказ:",
                                   reply_markup=create_inline_kb(

drone.yaml

@@ -1,7 +1,14 @@
 kind: pipeline
 type: docker
 name: default
+clone:
+  git:
 
+    url: https://gitea.ronis0505.tech/ronis_0505/telegram-bot-for-manipulate-orders.git
+    user:
+      from_secret: GITEA_USER
+    password:
+      from_secret: GITEA_TOKEN
 steps:
   - name: install-dependencies
     image: python:3.12
@@ -18,8 +25,13 @@ steps:
 
   - name: deploy
     image: appleboy/ssh
+    environment:
+      ENV_CONTENT:
+        from_secret: DOT_ENV_CONTENT
+    commands:
+      - echo "$ENV_CONTENT" > .env
     settings:
-      host: your.server.ip
+      host: https://gitea.ronis-0505.ru/ronis_0505/telegram-bot-for-manipulate-orders.git
       username: ronis_0505
       password: 667766
       script:

init_schemes.sql

@@ -1,15 +1,21 @@
+
+CREATE TYPE job_title AS ENUM ('Начальник цеха','Мастер','Сборщик');
+CREATE TYPE status AS ENUM ('Выполнено','В процессе','Создано','Ожидание комплектующих');
+
+
 CREATE TABLE workers
 (
     id           SERIAL PRIMARY KEY,
     telegram_id  BIGINT UNIQUE NOT NULL,
     name         VARCHAR       NOT NULL,
     email        VARCHAR(50),
-    phone_number VARCHAR(20)   NOT NULL,
+    phone_number VARCHAR(20),
+    job_title    job_title default 'Сборщик',
     created_at   TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at   TIMESTAMP
 );
 
-CREATE TYPE status AS ENUM ('Выполнено','В процессе','Создано','Ожидание комплектующих');
+
 
 CREATE TABLE orders
 (