alembic.ini

@@ -1,102 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = migrations
-
-# template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
-
-# sys.path path, will be prepended to sys.path if present.
-# defaults to the current working directory.
-prepend_sys_path = .
-
-# timezone to use when rendering the date within the migration file
-# as well as the filename.
-# If specified, requires the python-dateutil library that can be
-# installed by adding `alembic[tz]` to the pip requirements
-# string value is passed to dateutil.tz.gettz()
-# 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 migrations/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 "version_path_separator" below.
-# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
-
-# version path separator; As mentioned above, this is the character used to split
-# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
-# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
-# Valid values for version_path_separator are:
-#
-# version_path_separator = :
-# version_path_separator = ;
-# version_path_separator = space
-version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
-
-# the output encoding used when revision files
-# are written from script.py.mako
-# output_encoding = utf-8
-
-# 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
-
-# Logging configuration
-[loggers]
-keys = root,sqlalchemy,alembic
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-qualname =
-
-[logger_sqlalchemy]
-level = WARN
-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

back/base.py

@@ -1,2 +0,0 @@
-from .db import Base
-from .models import UserDatabase, Announcement, Trashbox

back/db.py

@@ -1,6 +1,6 @@
 from typing import AsyncGenerator
 
-from sqlalchemy import create_engine, select
+from sqlalchemy import Column, Integer, String, create_engine, select
 # from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 from sqlalchemy.orm import sessionmaker, Session
 from sqlalchemy.ext.declarative import declarative_base
@@ -15,7 +15,7 @@ engine = create_engine(
     SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
 )
 
-SessionLocal = sessionmaker(bind=engine, autoflush=True, autocommit=False)
+SessionLocal = sessionmaker(bind=engine, autoflush=True, autocommit=False, expire_on_commit=False)
 
 database = SessionLocal()
 Base = declarative_base()

back/main.py

@@ -36,22 +36,8 @@ if not os.path.exists("./uploads"):
 app.mount("/uploads", StaticFiles(directory = "./uploads"))
 
 
-# Функция, создающая сессию БД при каждом запросе к нашему API.
-# Срабатывает до запуска остальных функций.
-# Всегда закрывает сессию при окончании работы с ней
-@app.middleware("http")
-async def db_session_middleware(request: Request, call_next):
-    response = Response("Internal server error", status_code=500)
-    try:
-        request.state.db = SessionLocal()
-        response = await call_next(request)
-    finally:
-        request.state.db.close()
-    return response
-
-
 @app.get("/api/announcements")#адрес объявлений 
-def annoncements_list(user_id: int = None, metro: str = None, category: str = None, booked_by: int = 0):
+def annoncements_list(user_id: int = None, metro: str = None, category: str = None, booked_by: int = -1):
     # Считываем данные из Body и отображаем их на странице.
     # В последствии будем вставлять данные в html-форму
 

back/models.py

@@ -1,18 +1,12 @@
 from sqlalchemy import Column, Integer, String
-from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase
+
 from fastapi import Depends
 from .db import Base
 
-
-class User(SQLAlchemyBaseUserTableUUID, Base):
-    pass
-
-
-
 class UserDatabase(Base):#класс пользователя
     __tablename__ = "users"
 
-    id = Column(Integer, primary_key=True, index=True, unique=True)#айди пользователя
+    id = Column(Integer, primary_key=True, index=True)#айди пользователя
     phone = Column(Integer, nullable=True)#номер телефона пользователя
     email = Column(String)#электронная почта пользователя
     password = Column(String) # пароль
@@ -50,12 +44,6 @@ class Trashbox(Base):#класс мусорных баков
     category = Column(String)#категория продукта из объявления
     
 
-class Poems(Base):#класс поэзии
-    __tablename__ = "poems"
-
-    id = Column(Integer, primary_key=True, index=True)  #айди 
-    poem_text = Column(String) # текст стихотворения
-
 # from typing import AsyncGenerator
 # from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 # from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase

back/service.py

@@ -1,2 +0,0 @@
-from sqlalchemy.orm import Session
-

back/utils.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 from typing import Annotated, Union
 
-from fastapi import Depends, FastAPI, HTTPException, status, Response, Request
+from fastapi import Depends, FastAPI, HTTPException, status, Response
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from jose import JWTError, jwt
 from passlib.context import CryptContext
@@ -19,6 +19,16 @@ ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = 30
 
 
+# fake_users_db = {
+#     "johndoe": {
+#         "email": "johndoe",
+#         "full_name": "John Doe",
+#         "email": "johndoe@example.com",
+#         "hashed_password": "$2b$12$EixZaYVK1fsbw1ZfbX3OXePaWxn96p36WQoeG6Lruj3vjPGga31lW",
+#         "disabled": False,
+#     }
+# }
+
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
@@ -86,7 +96,3 @@ async def get_current_active_user(
     if current_user.disabled:
         raise HTTPException(status_code=400, detail="Inactive user")
     return current_user
-
-
-def get_db(request: Request):
-    return request.state.db

migrations/README

@@ -1 +0,0 @@
-Generic single-database configuration.

migrations/env.py

@@ -1,85 +0,0 @@
-from logging.config import fileConfig
-
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-
-from alembic import context
-
-
-from back import db, base
-
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
-config = context.config
-
-# 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.Base.metadata
-# target_metadata = None
-
-# 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():
-    """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")
-    url = config.get_main_option(db.SQLALCHEMY_DATABASE_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():
-    """Run migrations in 'online' mode.
-
-    In this scenario we need to create an Engine
-    and associate a connection with the context.
-
-    """
-    configuration = config.get_section(config.config_ini_section)
-    configuration['sqlalchemy.url'] = db.SQLALCHEMY_DATABASE_URL
-    connectable = engine_from_config(
-        configuration,
-        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()

migrations/script.py.mako

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

migrations/versions/0006eca30e2c_first.py

@@ -1,28 +0,0 @@
-"""first
-
-Revision ID: 0006eca30e2c
-Revises: 
-Create Date: 2023-07-23 22:32:43.496939
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '0006eca30e2c'
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###

migrations/versions/18001c2231e3_poems_table_added.py

@@ -1,34 +0,0 @@
-"""Poems table added
-
-Revision ID: 18001c2231e3
-Revises: 33c5716276b5
-Create Date: 2023-07-23 22:50:16.055961
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '18001c2231e3'
-down_revision = '33c5716276b5'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('poems',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('poem_text', sa.String(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_poems_id'), 'poems', ['id'], unique=False)
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_poems_id'), table_name='poems')
-    op.drop_table('poems')
-    # ### end Alembic commands ###

migrations/versions/33c5716276b5_try_to_make_alembic_see_models.py

@@ -1,70 +0,0 @@
-"""Try to make alembic see models
-
-Revision ID: 33c5716276b5
-Revises: 0006eca30e2c
-Create Date: 2023-07-23 22:42:07.532395
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '33c5716276b5'
-down_revision = '0006eca30e2c'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('announcements',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('name', sa.String(), nullable=True),
-    sa.Column('category', sa.String(), nullable=True),
-    sa.Column('best_by', sa.Integer(), nullable=True),
-    sa.Column('address', sa.String(), nullable=True),
-    sa.Column('longtitude', sa.Integer(), nullable=True),
-    sa.Column('latitude', sa.Integer(), nullable=True),
-    sa.Column('description', sa.String(), nullable=True),
-    sa.Column('src', sa.String(), nullable=True),
-    sa.Column('metro', sa.String(), nullable=True),
-    sa.Column('trashId', sa.Integer(), nullable=True),
-    sa.Column('booked_by', sa.Integer(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_announcements_id'), 'announcements', ['id'], unique=False)
-    op.create_table('trashboxes',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', sa.String(), nullable=True),
-    sa.Column('address', sa.String(), nullable=True),
-    sa.Column('latitude', sa.Integer(), nullable=True),
-    sa.Column('longtitude', sa.Integer(), nullable=True),
-    sa.Column('category', sa.String(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_trashboxes_id'), 'trashboxes', ['id'], unique=False)
-    op.create_table('users',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('phone', sa.Integer(), nullable=True),
-    sa.Column('email', sa.String(), nullable=True),
-    sa.Column('password', sa.String(), nullable=True),
-    sa.Column('hashed_password', sa.String(), nullable=True),
-    sa.Column('name', sa.String(), nullable=True),
-    sa.Column('surname', sa.String(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
-    )
-    op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=True)
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_users_id'), table_name='users')
-    op.drop_table('users')
-    op.drop_index(op.f('ix_trashboxes_id'), table_name='trashboxes')
-    op.drop_table('trashboxes')
-    op.drop_index(op.f('ix_announcements_id'), table_name='announcements')
-    op.drop_table('announcements')
-    # ### end Alembic commands ###