Merge pull request #6 from Angel-Dijoux/angel/do_buss_logic

[Model] Refactor model, add created_at, use MYSQL in dev mode

.github/workflows/deployment.yml

@@ -15,11 +15,11 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v3
-    - name: Stop running Docker container
-      run: docker stop api
-    - name: remove container
-      run: docker rm api
-    - name: Remove previous Docker image
-      run: docker rmi onisep_api-api:latest
+    # - name: Stop running Docker container
+    #   run: docker stop api
+    # - name: remove container
+    #   run: docker rm api
+    # - name: Remove previous Docker image
+    #   run: docker rmi onisep_api-api:latest
     - name: Build and Run Docker container
       run: docker-compose up -d

.gitignore

@@ -4,8 +4,6 @@ __pycache__/
 *.Spy.class
 *.pyc
 
-#migration ignore
-migrations/*
 
 #Ignore variable env
 .flaskenv

config.py

@@ -29,7 +29,7 @@ class Config(object):
 
 class DevelopmentConfig(Config):
     DEBUG = True
-    SQLALCHEMY_DATABASE_URI = get_dev_db_uri()
+    SQLALCHEMY_DATABASE_URI = get_prod_db_uri()
 
 
 class ProductionConfig(Config):

migrations/README

@@ -0,0 +1 @@
+Single-database configuration for Flask.

migrations/alembic.ini

@@ -0,0 +1,50 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic,flask_migrate
+
+[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
+
+[logger_flask_migrate]
+level = INFO
+handlers =
+qualname = flask_migrate
+
+[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

migrations/env.py

@@ -0,0 +1,91 @@
+from __future__ import with_statement
+
+import logging
+from logging.config import fileConfig
+
+from flask import current_app
+
+from alembic import context
+
+# 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.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.get_engine().url).replace(
+        '%', '%%'))
+target_metadata = current_app.extensions['migrate'].db.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
+    )
+
+    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.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    connectable = current_app.extensions['migrate'].db.get_engine()
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

migrations/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():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}

migrations/versions/47c4e50f11de_.py

@@ -0,0 +1,62 @@
+"""empty message
+
+Revision ID: 47c4e50f11de
+Revises:
+Create Date: 2023-04-30 19:49:07.901489
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "47c4e50f11de"
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "user",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("username", sa.String(length=80), nullable=False),
+        sa.Column("name", sa.String(length=200), nullable=False),
+        sa.Column("email", sa.String(length=200), nullable=False),
+        sa.Column("password", sa.Text(), nullable=False),
+        sa.Column("pdp_url", sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("email"),
+        sa.UniqueConstraint("username"),
+    )
+    op.create_table(
+        "favori",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("code_nsf", sa.Text(), nullable=True),
+        sa.Column("sigle_type_formation", sa.Text(), nullable=True),
+        sa.Column("libelle_type_formation", sa.Text(), nullable=True),
+        sa.Column("libelle_formation_principal", sa.Text(), nullable=True),
+        sa.Column("sigle_formation", sa.Text(), nullable=True),
+        sa.Column("duree", sa.Text(), nullable=True),
+        sa.Column("niveau_de_sortie_indicatif", sa.Text(), nullable=True),
+        sa.Column("code_rncp", sa.Text(), nullable=True),
+        sa.Column("niveau_de_certification", sa.Text(), nullable=True),
+        sa.Column("libelle_niveau_de_certification", sa.Text(), nullable=True),
+        sa.Column("tutelle", sa.Text(), nullable=True),
+        sa.Column("url_et_id_onisep", sa.Text(), nullable=False),
+        sa.Column("request_user_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["request_user_id"],
+            ["user.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("favori")
+    op.drop_table("user")
+    # ### end Alembic commands ###

migrations/versions/8ce7337ffbf4_.py

@@ -0,0 +1,45 @@
+"""empty message
+
+Revision ID: 8ce7337ffbf4
+Revises: 47c4e50f11de
+Create Date: 2023-06-30 11:47:16.940598
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = "8ce7337ffbf4"
+down_revision = "47c4e50f11de"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("user", sa.Column("profile_pic_url", sa.Text(), nullable=True))
+    op.drop_column("user", "pdp_url")
+    op.drop_column("user", "name")
+    op.add_column("user", sa.Column("created_at", sa.DateTime(), nullable=True))
+    op.add_column("user", sa.Column("updated_at", sa.DateTime(), nullable=True))
+    op.execute("UPDATE user SET created_at = now()")
+    op.execute("UPDATE user SET updated_at = now()")
+    op.alter_column("user", "created_at", existing_type=sa.DateTime(), nullable=False)
+    op.alter_column("user", "updated_at", existing_type=sa.DateTime(), nullable=False)
+
+    op.add_column("favori", sa.Column("created_at", sa.DateTime(), nullable=True))
+    op.add_column("favori", sa.Column("updated_at", sa.DateTime(), nullable=True))
+    op.execute("UPDATE favori SET created_at = now()")
+    op.execute("UPDATE favori SET updated_at = now()")
+    op.alter_column("favori", "created_at", existing_type=sa.DateTime(), nullable=False)
+    op.alter_column("favori", "updated_at", existing_type=sa.DateTime(), nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("user", sa.Column("name", mysql.VARCHAR(length=200), nullable=False))
+    op.add_column("user", sa.Column("pdp_url", mysql.TEXT(), nullable=True))
+    op.drop_column("user", "profile_pic_url")
+    # ### end Alembic commands ###