Cleaned up branch to no longer be a full merge of #7 and #18

alembic.ini

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

db_revisions/README

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

db_revisions/env.py

@@ -0,0 +1,111 @@
+import os
+from urllib import parse
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+from dotenv import load_dotenv
+
+from entities.models import 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, disable_existing_loggers=False)
+
+# this specific to SBL configuration
+
+ENV = os.getenv("ENV", "LOCAL")
+
+if ENV == "LOCAL":
+    file_dir = os.path.dirname(os.path.realpath(__file__))
+    load_dotenv(f"{file_dir}/../src/.env.local")
+else:
+    load_dotenv()
+
+INST_DB_USER = os.environ.get("INST_DB_USER")
+INST_DB_PWD = os.environ.get("INST_DB_PWD")
+INST_DB_HOST = os.environ.get("INST_DB_HOST")
+INST_DB_NAME = os.environ.get("INST_DB_NAME")
+INST_DB_SCHEMA = os.environ.get("INST_DB_SCHEMA")
+INST_CONN = f"postgresql://{INST_DB_USER}:{parse.quote(INST_DB_PWD, safe='')}@{INST_DB_HOST}/{INST_DB_NAME}"
+config.set_main_option("sqlalchemy.url", INST_CONN)
+
+# end specific SBL configuration
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+
+target_metadata = Base.metadata
+target_metadata.schema = INST_DB_SCHEMA
+
+# 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 = context.config.attributes.get("connection", None)
+
+    if connectable is None:
+        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,
+            version_table_schema=target_metadata.schema,
+            render_as_batch=True,
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

db_revisions/script.py.mako

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

db_revisions/utils.py

@@ -0,0 +1,13 @@
+from alembic import op
+from sqlalchemy import engine_from_config
+import sqlalchemy
+
+
+def table_exists(table_name):
+    config = op.get_context().config
+    engine = config.attributes.get("connection", None)
+    if engine is None:
+        engine = engine_from_config(config.get_section(config.config_ini_section), prefix="sqlalchemy.")
+    inspector = sqlalchemy.inspect(engine)
+    tables = inspector.get_table_names()
+    return table_name in tables

db_revisions/versions/4659352bd865_create_filing_table.py

@@ -0,0 +1,41 @@
+"""create filing table
+
+Revision ID: 4659352bd865
+Revises: 5a775dd75356
+Create Date: 2024-01-08 14:42:44.052389
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+from db_revisions.utils import table_exists
+
+from entities.models import FilingState
+
+# revision identifiers, used by Alembic.
+revision: str = "4659352bd865"
+down_revision: Union[str, None] = "5a775dd75356"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    if not table_exists("filing"):
+        op.create_table(
+            "filing",
+            sa.Column("id", sa.INTEGER, primary_key=True, autoincrement=True),
+            sa.Column("lei", sa.String, nullable=False),
+            sa.Column("state", sa.Enum(FilingState, name="filingstate")),
+            sa.Column("institution_snapshot_id", sa.String, nullable=False),
+            sa.Column("filing_period", sa.Integer),
+            sa.ForeignKeyConstraint(
+                ["filing_period"],
+                ["filing_period.id"],
+            ),
+        )
+
+
+def downgrade() -> None:
+    op.drop_table("filing")

db_revisions/versions/5a775dd75356_create_filing_period_table.py

@@ -0,0 +1,38 @@
+"""create filing period table
+
+Revision ID: 5a775dd75356
+Revises:
+Create Date: 2024-01-08 13:49:42.475381
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+from db_revisions.utils import table_exists
+from entities.models import FilingType
+
+
+# revision identifiers, used by Alembic.
+revision: str = "5a775dd75356"
+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:
+    if not table_exists("filing_period"):
+        op.create_table(
+            "filing_period",
+            sa.Column("id", sa.INTEGER, primary_key=True, autoincrement=True),
+            sa.Column("name", sa.String, nullable=False),
+            sa.Column("start_period", sa.DateTime, server_default=sa.func.now(), nullable=False),
+            sa.Column("end_period", sa.DateTime, server_default=sa.func.now(), nullable=False),
+            sa.Column("due", sa.DateTime, server_default=sa.func.now(), nullable=False),
+            sa.Column("filing_type", sa.Enum(FilingType, name="filingtype"), server_default="MANUAL"),
+        )
+
+
+def downgrade() -> None:
+    op.drop_table("filing_period")

db_revisions/versions/f30c5c3c7a42_create_submission_table.py

@@ -0,0 +1,43 @@
+"""create submission tables
+
+Revision ID: f30c5c3c7a42
+Revises: 4659352bd865
+Create Date: 2023-12-12 12:40:14.501180
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+from db_revisions.utils import table_exists
+
+from entities.models import SubmissionState
+
+
+# revision identifiers, used by Alembic.
+revision: str = "f30c5c3c7a42"
+down_revision: Union[str, None] = "4659352bd865"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    if not table_exists("submission"):
+        op.create_table(
+            "submission",
+            sa.Column("id", sa.INTEGER, primary_key=True, autoincrement=True),
+            sa.Column("submitter", sa.String, nullable=False),
+            sa.Column("state", sa.Enum(SubmissionState, name="submissionstate")),
+            sa.Column("validation_ruleset_version", sa.String, nullable=False),
+            sa.Column("validation_json", sa.JSON),
+            sa.Column("filing", sa.Integer),
+            sa.ForeignKeyConstraint(
+                ["filing"],
+                ["filing.id"],
+            ),
+        )
+
+
+def downgrade() -> None:
+    op.drop_table("submission")