-
Notifications
You must be signed in to change notification settings - Fork 0
Feature/all/base implementation #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
derOtto
wants to merge
20
commits into
main
Choose a base branch
from
feature/all/base_implementation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
3897cc4
updated dependencies
derOtto aa86944
added pycln pre-commit hook
derOtto f2ede8b
ignore .db files
derOtto 4f85300
removed quotation marks, updated versions
derOtto 9454bdf
Makefile for syncing to requirements.txt with pipreqs
derOtto ad63aff
added Dockerfile
derOtto d00c389
basic fastapi and association implementation
derOtto e0f8c55
added missing punctuation mark
derOtto 967e1d2
deleted some files
derOtto 4815fee
added alembic requirement
derOtto 3a40670
removed some files
derOtto 1071122
implemented alembic
derOtto 772c072
new config
derOtto 5ba439e
new config
derOtto a90109f
new crud files
derOtto 0afe966
missing __init__.py
derOtto fd05250
edited db crud.py
derOtto f3bd8c4
edited libs
derOtto ca1c33d
edited schemas
derOtto 7eb4ac3
edited main.py
derOtto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8 | ||
|
|
||
| ENV MODULE_NAME="bvrnapi.main" | ||
|
|
||
| # Install Poetry | ||
| RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \ | ||
| cd /usr/local/bin && \ | ||
| ln -s /opt/poetry/bin/poetry && \ | ||
| poetry config virtualenvs.create false | ||
|
|
||
| # Copy using poetry.lock* in case it doesn't exist yet | ||
| COPY pyproject.toml poetry.lock* /app/ | ||
|
|
||
| RUN poetry install --no-root --no-dev | ||
|
|
||
| COPY ./bvrnapi /app/bvrnapi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| # A generic, single database configuration. | ||
|
|
||
| [alembic] | ||
| # path to migration scripts | ||
| script_location = alembic | ||
|
|
||
| # 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 | ||
|
|
||
| [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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Generic single-database configuration. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| from logging.config import fileConfig | ||
|
|
||
| from sqlalchemy import engine_from_config | ||
| from sqlalchemy import pool | ||
|
|
||
| from alembic import context | ||
|
|
||
| from bvrnapi.db.base import Base | ||
| from bvrnapi.config import settings | ||
|
|
||
| # 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", settings.SQLALCHEMY_DATABASE_URI) | ||
|
|
||
| # Interpret the config file for Python logging. | ||
| # This line sets up loggers basically. | ||
| 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 = None | ||
|
|
||
| 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(): | ||
| """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(): | ||
| """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() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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(): | ||
| ${upgrades if upgrades else "pass"} | ||
|
|
||
|
|
||
| def downgrade(): | ||
| ${downgrades if downgrades else "pass"} |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| """initial revision | ||
|
|
||
| Revision ID: 7325cd96f9b7 | ||
| Revises: | ||
| Create Date: 2022-03-15 11:17:23.266003 | ||
|
|
||
| """ | ||
| from alembic import op | ||
| import sqlalchemy as sa | ||
|
|
||
|
|
||
| # revision identifiers, used by Alembic. | ||
| revision = '7325cd96f9b7' | ||
| down_revision = None | ||
| branch_labels = None | ||
| depends_on = None | ||
|
|
||
|
|
||
| def upgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.create_table('association', | ||
| sa.Column('id', sa.Integer(), nullable=False), | ||
| sa.Column('number', sa.String(), nullable=True), | ||
| sa.Column('shortname', sa.String(), nullable=True), | ||
| sa.Column('association_name', sa.String(), nullable=True), | ||
| sa.Column('city', sa.String(), nullable=True), | ||
| sa.Column('representative_address', sa.String(), nullable=True), | ||
| sa.Column('representative_plz', sa.Integer(), nullable=True), | ||
| sa.Column('representative_city', sa.String(), nullable=True), | ||
| sa.Column('representative_email', sa.String(), nullable=True), | ||
| sa.Column('it_representative', sa.String(), nullable=True), | ||
| sa.Column('mtime', sa.DateTime(), nullable=True), | ||
| sa.Column('homepage', sa.String(), nullable=True), | ||
| sa.Column('impressum', sa.String(), nullable=True), | ||
| sa.PrimaryKeyConstraint('id') | ||
| ) | ||
| op.create_index(op.f('ix_association_association_name'), 'association', ['association_name'], unique=True) | ||
| op.create_index(op.f('ix_association_homepage'), 'association', ['homepage'], unique=False) | ||
| op.create_index(op.f('ix_association_id'), 'association', ['id'], unique=False) | ||
| op.create_index(op.f('ix_association_number'), 'association', ['number'], unique=True) | ||
| op.create_table('problem', | ||
| sa.Column('id', sa.Integer(), nullable=False), | ||
| sa.Column('type', sa.String(), nullable=True), | ||
| sa.Column('data', sa.JSON(), nullable=True), | ||
| sa.Column('mtime', sa.DateTime(), nullable=True), | ||
| sa.Column('association_id', sa.Integer(), nullable=True), | ||
| sa.ForeignKeyConstraint(['association_id'], ['association.id'], ), | ||
| sa.PrimaryKeyConstraint('id') | ||
| ) | ||
| op.create_index(op.f('ix_problem_id'), 'problem', ['id'], unique=False) | ||
| op.create_index(op.f('ix_problem_type'), 'problem', ['type'], unique=False) | ||
| # ### end Alembic commands ### | ||
|
|
||
|
|
||
| def downgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.drop_index(op.f('ix_problem_type'), table_name='problem') | ||
| op.drop_index(op.f('ix_problem_id'), table_name='problem') | ||
| op.drop_table('problem') | ||
| op.drop_index(op.f('ix_association_number'), table_name='association') | ||
| op.drop_index(op.f('ix_association_id'), table_name='association') | ||
| op.drop_index(op.f('ix_association_homepage'), table_name='association') | ||
| op.drop_index(op.f('ix_association_association_name'), table_name='association') | ||
| op.drop_table('association') | ||
| # ### end Alembic commands ### |
Empty file.
Empty file.
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| from fastapi import APIRouter | ||
|
|
||
| from bvrnapi.api.api_v1.endpoints import associations | ||
|
|
||
| api_router = APIRouter() | ||
| # api_router.include_router(login.router, tags=["login"]) | ||
| api_router.include_router(associations.router, prefix="/associations", tags=["associations"]) |
Empty file.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick, aber ich nutze bei so etwas gerne die Langform