Merge pull request #29 from AndrewSergienko/develop

Version 1.1: Migrations, Statistic, browser tests

.github/workflows/python-app.yml

@@ -50,4 +50,4 @@ jobs:
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Test with pytest
       run: |
-        pytest
+        pytest tests

alembic.ini

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

migration/README

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

migration/env.py

@@ -0,0 +1,77 @@
+from logging.config import fileConfig
+
+from alembic import context
+from sqlalchemy import engine_from_config, pool
+
+from src.database import DatabaseFactory
+
+# 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
+database_factory = DatabaseFactory()
+target_metadata = database_factory.mapper_registry.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()

migration/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"}

migration/versions/86f9d6304908_initial.py

@@ -0,0 +1,77 @@
+"""initial
+
+Revision ID: 86f9d6304908
+Revises:
+Create Date: 2023-04-19 13:59:59.584998
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "86f9d6304908"
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "users",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("email", sa.String(), nullable=False),
+        sa.Column("hashed_password", sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index(op.f("ix_users_email"), "users", ["email"], unique=True)
+    op.create_table(
+        "banks_info",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("bank_name", sa.String(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["users.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "operations",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("amount", sa.Integer(), nullable=False),
+        sa.Column("description", sa.String(), nullable=True),
+        sa.Column("time", sa.Integer(), nullable=False),
+        sa.Column("mcc", sa.Integer(), nullable=True),
+        sa.Column("source_type", sa.String(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["users.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "banks_info_properties",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("value", sa.String(), nullable=False),
+        sa.Column("type", sa.String(), nullable=False),
+        sa.Column("manager_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["manager_id"],
+            ["banks_info.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("banks_info_properties")
+    op.drop_table("operations")
+    op.drop_table("banks_info")
+    op.drop_index(op.f("ix_users_email"), table_name="users")
+    op.drop_table("users")
+    # ### end Alembic commands ###

src/app/domain/statistic.py

@@ -4,5 +4,5 @@
 @dataclass
 class Statistic:
     costs_sum: int
-    most_popular_category: int
     categories_costs: dict[int, int]
+    costs_num_by_days: dict[str, int]

src/app/repositories/bank_api/bank_info.py

@@ -50,7 +50,7 @@ async def set_update_time_to_managers(self, ids: list[int]):
         await self.session.execute(
             update(BankInfoProperty)
             .filter(
-                BankInfoProperty.manager.in_(ids),
+                BankInfoProperty.manager_id.in_(ids),
                 BankInfoProperty.name == "updated_time",
             )
             .values(updated_time=datetime.now().timestamp())

src/app/repositories/operations.py

@@ -1,5 +1,3 @@
-from datetime import datetime, timedelta
-
 from sqlalchemy import select
 
 from src.app.domain.operations import Operation
@@ -12,17 +10,8 @@ async def get(self, field, value) -> Operation:
         return await self._get(Operation, field, value)
 
     async def get_all_by_user(
-        self,
-        user_id,
-        from_time: int = None,
-        to_time: int = None,
+        self, user_id, from_time: int, to_time: int
     ) -> list[Operation]:
-        from_time = (
-            from_time
-            if from_time
-            else int((datetime.now() - timedelta(days=1)).timestamp())
-        )
-        to_time = to_time if to_time else int(datetime.now().timestamp())
         return list(
             await self.session.scalars(
                 select(Operation)

src/app/services/bank_api.py

@@ -52,6 +52,8 @@ async def get_bank_managers_by_user(
 async def update_banks_costs(
     uow: AbstractUnitOfWork, managers: list[ABankManagerRepository]
 ):
+    if len(managers) == 0:
+        return
     async with uow:
         costs = []
         updated_managers = []

src/app/services/operations.py

@@ -16,21 +16,23 @@ async def create_operation(
     :return: Operation якщо user_id існує в базі. None, якщо ні
     """
     async with uow:
-        operation = Operation(
-            **schema.dict(), time=int(datetime.now().timestamp()), user_id=user_id
-        )
+        schema.time = schema.time if schema.time else int(datetime.now().timestamp())
+        operation = Operation(**schema.dict(), user_id=user_id)
         await uow.operations.add(operation)
         await uow.commit()
         return operation
 
 
-async def get_operations(uow: AbstractUnitOfWork, user_id: int) -> list[Operation]:
+async def get_operations(
+    uow: AbstractUnitOfWork, user_id: int, from_time=None, to_time=None
+) -> list[Operation]:
     """
-    Повертає всі операції які містять переданий user_id в полі user_id
+    Повертнення всих операцій, які містять переданий user_id в полі user_id
     :param uow: Unit of Work
     :param user_id: ID користувача, операції якого потрібно отримати
+    :param from_time: початковий момент часу
+    :param to_time: кінцевий момент часу
     :return: список об'єктів моделі Opetation. Якщо операцій немає, то пустий список
     """
     async with uow:
-        operations = await uow.operations.get_all_by_user(user_id)
-        return list(operations)
+        return await uow.operations.get_all_by_user(user_id, from_time, to_time)