create base models(users,tasks)

This commit is contained in:
IluaAir
2025-05-31 13:29:23 +03:00
parent b33a04f8fc
commit 1951260788
21 changed files with 1589 additions and 2 deletions

141
alembic.ini Normal file
View File

@@ -0,0 +1,141 @@
# A generic, single database configuration.
[alembic]
# path to migration scripts.
# this is typically a path given in POSIX (e.g. forward slashes)
# format, relative to the token %(here)s which refers to the location of this
# ini file
script_location = src/migrations
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
# Uncomment the line below if you want the files to be prepended with date and time
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
# for all available tokens
file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
# sys.path path, will be prepended to sys.path if present.
# defaults to the current working directory. for multiple paths, the path separator
# is defined by "path_separator" below.
prepend_sys_path = . src
# timezone to use when rendering the date within the migration file
# as well as the filename.
# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
# Any required deps can installed by adding `alembic[tz]` to the pip requirements
# string value is passed to ZoneInfo()
# leave blank for localtime
# timezone =
# max length of characters to apply to the "slug" field
# truncate_slug_length = 40
# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false
# set to 'true' to allow .pyc and .pyo files without
# a source .py file to be detected as revisions in the
# versions/ directory
# sourceless = false
# version location specification; This defaults
# to <script_location>/versions. When using multiple version
# directories, initial revisions must be specified with --version-path.
# The path separator used here should be the separator specified by "path_separator"
# below.
# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
# path_separator; This indicates what character is used to split lists of file
# paths, including version_locations and prepend_sys_path within configparser
# files such as alembic.ini.
# The default rendered in new alembic.ini files is "os", which uses os.pathsep
# to provide os-dependent path splitting.
#
# Note that in order to support legacy alembic.ini files, this default does NOT
# take place if path_separator is not present in alembic.ini. If this
# option is omitted entirely, fallback logic is as follows:
#
# 1. Parsing of the version_locations option falls back to using the legacy
# "version_path_separator" key, which if absent then falls back to the legacy
# behavior of splitting on spaces and/or commas.
# 2. Parsing of the prepend_sys_path option falls back to the legacy
# behavior of splitting on spaces, commas, or colons.
#
# Valid values for path_separator are:
#
# path_separator = :
# path_separator = ;
# path_separator = space
# path_separator = newline
#
# Use os.pathsep. Default configuration used for new projects.
version_path_separator = os
# set to 'true' to search source files recursively
# in each "version_locations" directory
# new in Alembic version 1.10
# recursive_version_locations = false
# the output encoding used when revision files
# are written from script.py.mako
# output_encoding = utf-8
# database URL. This is consumed by the user-maintained env.py script only.
# other means of configuring database URLs may be customized within the env.py
# file.
sqlalchemy.url = driver://user:pass@localhost/dbname
[post_write_hooks]
# post_write_hooks defines scripts or Python functions that are run
# on newly generated revision scripts. See the documentation for further
# detail and examples
# format using "black" - use the console_scripts runner, against the "black" entrypoint
# hooks = black
# black.type = console_scripts
# black.entrypoint = black
# black.options = -l 79 REVISION_SCRIPT_FILENAME
# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
hooks = ruff
ruff.type = exec
ruff.executable = %(here)s/.venv/bin/ruff
ruff.options = check --fix REVISION_SCRIPT_FILENAME
# Logging configuration. This is also consumed by the user-maintained
# env.py script only.
[loggers]
keys = root,sqlalchemy,alembic
[handlers]
keys = console
[formatters]
keys = generic
[logger_root]
level = WARNING
handlers = console
qualname =
[logger_sqlalchemy]
level = WARNING
handlers =
qualname = sqlalchemy.engine
[logger_alembic]
level = INFO
handlers =
qualname = alembic
[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic
[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S

View File

@@ -29,7 +29,8 @@ ___
### 📎 Вложения (Attachments)
- `GET /tasks/{task_id}/attachments` — Получить все вложения к задаче
- `GET /tasks/{task_id}/attachments` — Получить все вложения к задаче
- `GET /attachments/{attach_id}` - Скачать вложение
- `POST /tasks/{task_id}/attachments` — Добавить вложение к задаче
- `DELETE /attachments/{attach_id}` — Удалить вложение
@@ -44,7 +45,7 @@ ___
---
### 🔗 Назначение тегов к задачам (Task_Assignees)
### 🔗 Назначение тегов к задачам (TaskTags)
- `GET /tasks/{task_id}/tags` — Получить все теги задачи
- `POST /tasks/{task_id}/tags/{tag_id}` — Добавить тег к задаче

1109
poetry.lock generated Normal file

File diff suppressed because it is too large Load Diff

26
pyproject.toml Normal file
View File

@@ -0,0 +1,26 @@
[project]
name = "taskncoffee"
version = "0.1.0"
description = "simple task-manager"
authors = [
{name = "IluaAir",email = "ilya@air.ru"}
]
license = {text = "MIT"}
readme = "README.md"
requires-python = ">=3.12"
dependencies = [
"fastapi (>=0.115.12,<0.116.0)",
"sqlalchemy (>=2.0.41,<3.0.0)",
"fastapi-users[sqlalchemy] (>=14.0.1,<15.0.0)",
"uvicorn (>=0.34.2,<0.35.0)",
"aiosqlite (>=0.21.0,<0.22.0)",
"pydantic-settings (>=2.9.1,<3.0.0)",
"alembic (>=1.16.1,<2.0.0)",
"ruff (>=0.11.12,<0.12.0)",
"greenlet (>=3.2.2,<4.0.0)"
]
[build-system]
requires = ["poetry-core>=2.0.0,<3.0.0"]
build-backend = "poetry.core.masonry.api"

8
src/api/__init__.py Normal file
View File

@@ -0,0 +1,8 @@
from fastapi import APIRouter
from src.api.users import router as users_router
from src.api.tasks import router as tasks_router
router = APIRouter()
router.include_router(router=users_router)
router.include_router(router=tasks_router)

0
src/api/auth.py Normal file
View File

14
src/api/dependancies.py Normal file
View File

@@ -0,0 +1,14 @@
from typing import Annotated
from fastapi import Depends
from sqlalchemy.ext.asyncio import AsyncSession
from src.db.database import async_session_maker
async def get_db():
async with async_session_maker as db:
yield db
DBDep = Annotated[AsyncSession, Depends(get_db)]

27
src/api/tasks.py Normal file
View File

@@ -0,0 +1,27 @@
from fastapi import APIRouter
router = APIRouter(prefix="/tasks", tags=["Tasks"])
@router.get("/")
async def get_tasks(): ...
@router.get("/{task_id}")
async def get_task_id(task_id: int): ...
@router.post("/")
async def post_task(): ...
@router.put("/{task_id}")
async def put_task(task_id: int): ...
@router.patch("/{task_id}")
async def patch_task(task_id: int): ...
@router.delete("/{task_id}")
async def delete_task(task_id: int): ...

3
src/api/users.py Normal file
View File

@@ -0,0 +1,3 @@
from fastapi import APIRouter
router = APIRouter(prefix="/users", tags=["Users"])

15
src/db/database.py Normal file
View File

@@ -0,0 +1,15 @@
from datetime import datetime
from sqlalchemy import TIMESTAMP, func
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
engine = create_async_engine("sqlite+aiosqlite:///src/db/taskncoffee.db", echo=True)
async_session_maker = async_sessionmaker(bind=engine, expire_on_commit=False)
class Base(DeclarativeBase):
created_at: Mapped[datetime] = mapped_column(
TIMESTAMP(timezone=True), server_default=func.now()
)

View File

@@ -0,0 +1,10 @@
import uvicorn
from fastapi import FastAPI
from src.api import router
app = FastAPI()
app.include_router(router=router)
if __name__ == "__main__":
uvicorn.run("src.main:app", port=5000, log_level="info", reload=True)

82
src/migrations/env.py Normal file
View File

@@ -0,0 +1,82 @@
from logging.config import fileConfig
from sqlalchemy import engine_from_config
from sqlalchemy import pool
from alembic import context
from src.db.database import Base
from src.models import * # noqa
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config
config.set_main_option("sqlalchemy.url", "sqlite:///src/db/taskncoffee.db")
# Interpret the config file for Python logging.
# This line sets up loggers basically.
if config.config_file_name is not None:
fileConfig(config.config_file_name)
# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
target_metadata = Base.metadata
# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.
def run_migrations_offline() -> None:
"""Run migrations in 'offline' mode.
This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.
Calls to context.execute() here emit the given string to the
script output.
"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url,
target_metadata=target_metadata,
literal_binds=True,
dialect_opts={"paramstyle": "named"},
)
with context.begin_transaction():
context.run_migrations()
def run_migrations_online() -> None:
"""Run migrations in 'online' mode.
In this scenario we need to create an Engine
and associate a connection with the context.
"""
connectable = engine_from_config(
config.get_section(config.config_ini_section, {}),
prefix="sqlalchemy.",
poolclass=pool.NullPool,
)
with connectable.connect() as connection:
context.configure(
connection=connection, target_metadata=target_metadata
)
with context.begin_transaction():
context.run_migrations()
if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()

View File

@@ -0,0 +1,28 @@
"""${message}
Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
${imports if imports else ""}
# revision identifiers, used by Alembic.
revision: str = ${repr(up_revision)}
down_revision: Union[str, None] = ${repr(down_revision)}
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
def upgrade() -> None:
"""Upgrade schema."""
${upgrades if upgrades else "pass"}
def downgrade() -> None:
"""Downgrade schema."""
${downgrades if downgrades else "pass"}

View File

@@ -0,0 +1,59 @@
"""init
Revision ID: 932121e6b220
Revises:
Create Date: 2025-06-22 11:52:49.691545
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
revision: str = '932121e6b220'
down_revision: Union[str, None] = None
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
op.create_table('users',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('username', sa.String(length=30), nullable=False),
sa.Column('telegram_id', sa.BigInteger(), nullable=True),
sa.Column('avatar_path', sa.String(length=255), nullable=True),
sa.Column('email', sa.String(length=320), nullable=False),
sa.Column('hashed_password', sa.String(length=1024), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.Column('is_superuser', sa.Boolean(), nullable=False),
sa.Column('is_verified', sa.Boolean(), nullable=False),
sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
sa.PrimaryKeyConstraint('id')
)
op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
op.create_table('tasks',
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=100), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('due_date', sa.Date(), nullable=True),
sa.Column('status', sa.Enum('open', 'closed', 'in_progress', 'todo', name='status_enum'), nullable=False),
sa.CheckConstraint("status IN ('open', 'closed', 'in_progress', 'todo')", name="ck_status_enum"),
sa.Column('priority', sa.Enum('low', 'medium', 'high', 'critical', name='priority_enum'), nullable=False),
sa.CheckConstraint("priority in ('low', 'medium', 'high', 'critical')", name='ck_priority_enum'),
sa.Column('time_spent', sa.Integer(), nullable=False),
sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
sa.PrimaryKeyConstraint('id')
)
def downgrade() -> None:
"""Downgrade schema."""
op.drop_table('tasks')
op.drop_index(op.f('ix_users_username'), table_name='users')
op.drop_index(op.f('ix_users_email'), table_name='users')
op.drop_table('users')

7
src/models/__init__.py Normal file
View File

@@ -0,0 +1,7 @@
from src.models.users import UsersORM
from src.models.tasks import TasksORM
__all__ = [
"UsersORM",
"TasksORM",
]

28
src/models/tasks.py Normal file
View File

@@ -0,0 +1,28 @@
from datetime import date
from typing import Optional, TYPE_CHECKING
from sqlalchemy import ForeignKey, Text, Date, Enum, String
from sqlalchemy.orm import Mapped, mapped_column, relationship
from src.db.database import Base
status_enum = Enum("open", "closed", "in_progress", "todo", name="status_enum")
priority_enum = Enum("low", "medium", "high", "critical", name="priority_enum")
class TasksORM(Base):
if TYPE_CHECKING:
from src.models.users import UsersORM
__tablename__ = "tasks"
id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
title: Mapped[str] = mapped_column(String(100))
description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
due_date: Mapped[Optional[date]] = mapped_column(Date, nullable=True)
status: Mapped[str] = mapped_column(status_enum, default="open")
priority: Mapped[str] = mapped_column(priority_enum, default="medium")
time_spent: Mapped[int] = mapped_column(default=0)
user: Mapped["Users"] = relationship(back_populates="tasks")

22
src/models/users.py Normal file
View File

@@ -0,0 +1,22 @@
from typing import Optional, TYPE_CHECKING
from fastapi_users_db_sqlalchemy import SQLAlchemyBaseUserTable
from sqlalchemy import String, BigInteger, Integer
from sqlalchemy.orm import Mapped, mapped_column, relationship
from src.db.database import Base
if TYPE_CHECKING:
from src.models.tasks import TasksORM
class UsersORM(SQLAlchemyBaseUserTable[int], Base):
__tablename__ = "users"
id: Mapped[int] = mapped_column(Integer, primary_key=True)
username: Mapped[Optional[str]] = mapped_column(
String(30), nullable=False, unique=True, index=True
)
telegram_id: Mapped[Optional[int]] = mapped_column(BigInteger, nullable=True)
avatar_path: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
tasks: Mapped[list["TasksORM"]] = relationship(back_populates="user")

0
src/schemas/tasks.py Normal file
View File

0
src/schemas/users.py Normal file
View File

5
src/settings.py Normal file
View File

@@ -0,0 +1,5 @@
from pydantic_settings import BaseSettings
class Settings(BaseSettings):
...

View File

@@ -0,0 +1,2 @@