main update

Author: petrCher

Makefile

@@ -1,10 +1,10 @@
 SHELL := /bin/bash
 
 configure: venv
-	source ./venv/bin/activate && pip install -r requirements.txt
+	source ./venv/bin/activate && pip install --force-reinstall -r requirements.txt
 
 venv:
-	python3.11 -m venv venv
+	python3.12 -m venv venv
 
 format:
 	#black isort

requirements.txt

@@ -0,0 +1,5 @@
+pydantic
+pydantic-settings
+sqlalchemy
+psycopg2-binary
+aiogram

src/__main__.py

@@ -0,0 +1,20 @@
+import logging
+from aiogram import Bot, Dispatcher
+from aiogram.client.default import DefaultBotProperties
+from aiogram.enums import ParseMode
+
+from src.settings import Settings
+from src.handlers import start, help, text
+
+settings = Settings()
+bot = Bot(token=settings.BOT_TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
+dp = Dispatcher()
+
+dp.include_router(start.router)
+dp.include_router(help.router)
+dp.include_router(text.router)
+
+logging.basicConfig(level=logging.INFO)
+
+if __name__ == '__main__':
+    dp.run_polling(bot)

src/handlers/__init__.py

@@ -0,0 +1,9 @@
+from aiogram import Router
+from aiogram.filters import Command
+from aiogram.types import Message
+
+router = Router()
+
+@router.message(Command("help"))
+async def cmd_help(message: Message):
+    await message.answer("Это справочное сообщение. Чем могу помочь?")

src/handlers/help.py

@@ -0,0 +1,10 @@
+from aiogram import types
+from aiogram.filters import Command
+from aiogram.types import Message
+from aiogram import Router
+
+router = Router()
+
+@router.message(Command("start"))
+async def cmd_start(message: Message):
+    await message.answer(f"Я бот. Приятно познакомиться, {message.from_user.first_name}!")

src/handlers/start.py

@@ -0,0 +1,11 @@
+from aiogram import Router, F
+from aiogram.types import Message
+
+router = Router()
+
+@router.message(F.text)
+async def handle_text(message: Message):
+    if message.text.lower() == 'привет':
+        await message.answer('Привет!')
+    else:
+        await message.answer('Не понимаю, что это значит.')

src/handlers/text.py

@@ -0,0 +1 @@
+"""There will be connection with marketing api for statistics"""

src/marketing.py

@@ -4,7 +4,7 @@
 
 class Users(BaseDBModel):
     __tablename__ = "user_info"
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
     tg_id: Mapped[int] = mapped_column(Integer, nullable=False, unique=True)
     name: Mapped[str] = mapped_column(String, nullable=False)
     birthday: Mapped[str] = mapped_column(String, default=None)
@@ -14,4 +14,11 @@ class Holidays(BaseDBModel):
     __tablename__ = "holidays_status"
     id: Mapped[int] = mapped_column(Integer, ForeignKey("user_info.id"), primary_key=True)
     status: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
-    till_date: Mapped[str] = mapped_column(String, nullable=False, default="null")
+    till_date: Mapped[str] = mapped_column(String, nullable=False, default="null")
+
+class MetInfo(BaseDBModel):
+    __tablename__ = "met_info"
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    first_user_id: Mapped[int] = mapped_column(ForeignKey("user_info.id"))
+    second_user_id: Mapped[int] = mapped_column(ForeignKey("user_info.id"))
+    date: Mapped[str]

src/models/db.py

@@ -0,0 +1,11 @@
+from pydantic import ConfigDict, PostgresDsn
+from pydantic_settings import BaseSettings
+
+class Settings(BaseSettings):
+    """Application settings"""
+
+    BOT_TOKEN: str
+    DB_DSN: PostgresDsn
+    #MARKETING_URL: str //future tasks
+
+    model_config = ConfigDict(case_sensitive=True, env_file=".env", extra="allow")