change events to candies

.gitignore

@@ -1,2 +1,6 @@
 /.pytest_cache
-/venv
+/venv
+__pycache__
+.env*
+*.txt
+.vscode

alembic.ini

@@ -0,0 +1,110 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = src/alembic
+
+# 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.
+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 alembic/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:alembic/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.
+
+# 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
+
+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

delete.py

@@ -0,0 +1,23 @@
+
+
+# Создаем список
+my_list = [1, 2, 3, 4, 5]
+
+# Получаем итератор для списка
+my_iterator = iter(my_list)
+
+# Перебираем элементы списка с помощью итератора
+print(next(my_iterator))  # Выводит: 1
+print(next(my_iterator))  # Выводит: 2
+print(next(my_iterator))  # Выводит: 3
+
+# Использование итератора в цикле for
+for item in my_iterator:
+    print(item)  # Выводит: 4, 5
+
+# Обработка исключения StopIteration при достижении конца итерации
+try:
+    print(next(my_iterator))  # Вызовет исключение StopIteration
+except StopIteration:
+    print("Итерация завершена")
+

pytest.ini

@@ -0,0 +1,6 @@
+[pytest]
+# env_override_existing_values = 1
+env_files =
+    .env-test
+
+pythonpath = . src

requirements.txt

@@ -1,11 +1,17 @@
+alembic==1.11.1
 colorama==0.4.6
 exceptiongroup==1.1.1
 greenlet==2.0.2
 iniconfig==2.0.0
+Mako==1.2.4
+MarkupSafe==2.1.2
 packaging==23.1
 pluggy==1.0.0
 psycopg2==2.9.6
+pydantic==1.10.7
 pytest==7.3.1
+pytest-dotenv==0.5.2
+python-dotenv==1.0.0
 SQLAlchemy==2.0.13
 tomli==2.0.1
 typing_extensions==4.5.0

src/alembic/README

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

src/alembic/env.py

@@ -0,0 +1,88 @@
+from logging.config import fileConfig
+import sys
+from os.path import abspath, dirname
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+sys.path.insert(0, dirname(dirname(dirname(abspath(__file__)))))
+
+from src.config import settings
+from src.db import Base
+from src.candies.models import Candies  # 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", f"{settings.DB_URL}")
+
+# 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()

src/alembic/script.py.mako

@@ -0,0 +1,24 @@
+"""${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() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}

src/alembic/versions/9b6ff45d5de5_initial_revision.py

@@ -0,0 +1,30 @@
+"""Initial revision
+
+Revision ID: 9b6ff45d5de5
+Revises: 
+Create Date: 2023-05-23 00:09:16.476677
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = '9b6ff45d5de5'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table('candies',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('title', sa.String(length=200), nullable=True),
+        sa.Column('price', sa.Integer(), nullable=True),
+        sa.Column('state', sa.String(length=20), server_default='full', nullable=True),
+        sa.Column('kid', sa.String(length=100), nullable=False),
+        sa.PrimaryKeyConstraint('id')
+    )
+
+
+def downgrade() -> None:
+    op.drop_table('candies')

src/candies/api.py

@@ -0,0 +1,38 @@
+from dataclasses import asdict
+from dataclasses import dataclass
+from dataclasses import field
+from datetime import datetime
+from typing import Optional
+from pydantic import parse_obj_as
+from sqlalchemy import insert
+from db import Session
+from candies.models import Candies
+from candies.schemas import SCandy
+
+
+@dataclass
+class Candy:
+    id: Optional[int] = field(default=None, compare=False)
+    title: str = field(default="Событие")
+    date: Optional[datetime] = None
+    location: Optional[str] = None
+    price: int = 0
+    currency: str = field(default="RUB")
+    tickets: int = 0
+    is_passed: bool = False
+
+    @classmethod
+    def from_dict(cls, d):
+        return Candy(**d)
+
+    @classmethod
+    def from_orm(cls, candy: Candies):
+        return parse_obj_as(SCandy, candy).dict()
+
+    def to_dict(self):
+        return asdict(self)
+
+    def to_dict_wo_id(self) -> dict:
+        candy_dict = asdict(self)
+        candy_dict.pop("id")
+        return candy_dict

src/candies/models.py

@@ -0,0 +1,14 @@
+from datetime import datetime
+from src.db import Base
+from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy import Boolean, Computed, ForeignKey, Integer, Text, String, TIMESTAMP
+
+
+class Candies(Base):
+    __tablename__ = "candies"
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+    title: Mapped[str] = mapped_column(String(200), nullable=True)
+    price: Mapped[int] = mapped_column(Integer, nullable=True)
+    state: Mapped[str] = mapped_column(String(20), nullable=True, server_default="full")
+    kid: Mapped[str] = mapped_column(String(100), nullable=False)