Skip to content

Commit

Permalink
add lint ci + lint to black 24
Browse files Browse the repository at this point in the history
  • Loading branch information
jacquesfize committed Jan 26, 2024
1 parent 131c620 commit ffebd8f
Show file tree
Hide file tree
Showing 16 changed files with 223 additions and 185 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Lint

on: [push, pull_request]

jobs:
backend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Backend code formatting check (Black)
uses: psf/black@stable
1 change: 1 addition & 0 deletions app/api/route_register.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Route permettant de manipuler les données de UsersHub via une API
"""

from datetime import datetime, timedelta

import hashlib
Expand Down
40 changes: 26 additions & 14 deletions app/bib_organismes/forms.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,37 @@
from flask_wtf import FlaskForm
from wtforms import (StringField, PasswordField, BooleanField,
SubmitField, HiddenField, SelectField, validators
from wtforms import (
StringField,
PasswordField,
BooleanField,
SubmitField,
HiddenField,
SelectField,
validators,
)
from wtforms.validators import DataRequired, Email
# from wtforms_components import IntergerField


# from wtforms_components import IntergerField


class Organisme(FlaskForm):
"""
Classe du formulaire des Organismes
"""
nom_organisme = StringField("Nom de l'organisme", validators=[DataRequired(message="Le nom de l'organisme est obligatoire")])
adresse_organisme = StringField('Adresse')
cp_organisme = StringField('Code Postal')
ville_organisme = StringField ('Ville')
tel_organisme = StringField('Téléphone')
fax_organisme = StringField('Fax')
email_organisme = StringField('E-mail', validators=[validators.Optional(), Email(message="L'email est incorect")])

nom_organisme = StringField(
"Nom de l'organisme",
validators=[DataRequired(message="Le nom de l'organisme est obligatoire")],
)
adresse_organisme = StringField("Adresse")
cp_organisme = StringField("Code Postal")
ville_organisme = StringField("Ville")
tel_organisme = StringField("Téléphone")
fax_organisme = StringField("Fax")
email_organisme = StringField(
"E-mail",
validators=[validators.Optional(), Email(message="L'email est incorect")],
)
url_organisme = StringField("URL du site web de l'organisme")
url_logo = StringField('Logo (URL)')
id_organisme = HiddenField('id')
submit = SubmitField('Enregistrer')
url_logo = StringField("Logo (URL)")
id_organisme = HiddenField("id")
submit = SubmitField("Enregistrer")
2 changes: 1 addition & 1 deletion app/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
Création de la base avec sqlalchemy
"""

os.environ['FLASK_SQLALCHEMY_DB'] = 'app.env.db'
os.environ["FLASK_SQLALCHEMY_DB"] = "app.env.db"
db = SQLAlchemy()
6 changes: 0 additions & 6 deletions app/genericRepository.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ def get_all(
order_by=None,
order="asc",
):

"""
Methode qui retourne un dictionnaire de tout les éléments d'un Model
Avec pour paramètres:
Expand Down Expand Up @@ -65,7 +64,6 @@ def get_all(

@classmethod
def post(cls, entity_dict):

"""
Methode qui ajoute un élément à une table
Avec pour paramètres un dictionnaire de cet élément
Expand All @@ -83,7 +81,6 @@ def post(cls, entity_dict):

@classmethod
def update(cls, entity_dict):

"""
Methode qui met à jour un élément
Avec pour paramètre un dictionnaire de cet élément
Expand All @@ -101,7 +98,6 @@ def update(cls, entity_dict):

@classmethod
def delete(cls, id):

"""
Methode qui supprime un élement d'une table à partir d'un id donné
Avec pour paramètre un id (clé primaire)
Expand All @@ -115,7 +111,6 @@ def delete(cls, id):

@classmethod
def choixSelect(cls, id, nom, aucun=None, order_by=None):

"""
Methode qui retourne un tableau de tuples d'id et de nom
Avec pour paramètres un id et un nom
Expand All @@ -135,4 +130,3 @@ def choixSelect(cls, id, nom, aucun=None, order_by=None):
# for col in cls.__table__.columns.keys()

# return cls.__table__.columns.keys()

17 changes: 11 additions & 6 deletions app/groupe/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@


class Group(FlaskForm):

"""
Classe du formulaire des Groupes
"""
nom_role = StringField("Nom", validators=[DataRequired(message='Le nom du group est obligatoire')])
desc_role = TextAreaField('Description')
groupe = BooleanField('groupe', validators=[DataRequired(message="L'information 'groupe' est obligatoire")])
id_role = HiddenField('id')
submit = SubmitField('Enregistrer')

nom_role = StringField(
"Nom", validators=[DataRequired(message="Le nom du group est obligatoire")]
)
desc_role = TextAreaField("Description")
groupe = BooleanField(
"groupe",
validators=[DataRequired(message="L'information 'groupe' est obligatoire")],
)
id_role = HiddenField("id")
submit = SubmitField("Enregistrer")
14 changes: 9 additions & 5 deletions app/liste/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ class List(FlaskForm):
Classe du formulaire des listes
"""

nom_liste = StringField("Nom", validators = [DataRequired(message = 'Le nom de la liste est obligatoire')])
code_liste = StringField("Code", validators = [DataRequired(message = 'Le code de la liste est obligatoire')])
desc_liste = TextAreaField('Description')
id_liste = HiddenField('Id')
submit = SubmitField('Enregistrer')
nom_liste = StringField(
"Nom", validators=[DataRequired(message="Le nom de la liste est obligatoire")]
)
code_liste = StringField(
"Code", validators=[DataRequired(message="Le code de la liste est obligatoire")]
)
desc_liste = TextAreaField("Description")
id_liste = HiddenField("Id")
submit = SubmitField("Enregistrer")
22 changes: 11 additions & 11 deletions app/migrations/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
# Interpret the config file for Python logging.
# This line sets up loggers basically.
fileConfig(config.config_file_name)
logger = logging.getLogger('alembic.env')
logger = logging.getLogger("alembic.env")

# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
from flask import current_app

config.set_main_option(
'sqlalchemy.url',
str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
target_metadata = current_app.extensions['migrate'].db.metadata
"sqlalchemy.url",
str(current_app.extensions["migrate"].db.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:
Expand All @@ -46,9 +48,7 @@ def run_migrations_offline():
"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url, target_metadata=target_metadata, literal_binds=True
)
context.configure(url=url, target_metadata=target_metadata, literal_binds=True)

with context.begin_transaction():
context.run_migrations()
Expand All @@ -66,15 +66,15 @@ def run_migrations_online():
# 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):
if getattr(config.cmd_opts, "autogenerate", False):
script = directives[0]
if script.upgrade_ops.is_empty():
directives[:] = []
logger.info('No changes in schema detected.')
logger.info("No changes in schema detected.")

connectable = engine_from_config(
config.get_section(config.config_ini_section),
prefix='sqlalchemy.',
prefix="sqlalchemy.",
poolclass=pool.NullPool,
)

Expand All @@ -83,7 +83,7 @@ def process_revision_directives(context, revision, directives):
connection=connection,
target_metadata=target_metadata,
process_revision_directives=process_revision_directives,
**current_app.extensions['migrate'].configure_args
**current_app.extensions["migrate"].configure_args
)

with context.begin_transaction():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
Create Date: 2021-09-30 16:29:25.531376
"""

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '6ec215fe023e'
down_revision = '9445a69f2bed'
revision = "6ec215fe023e"
down_revision = "9445a69f2bed"
branch_labels = None
depends_on = (
'951b8270a1cf', # utilisateurs
)
depends_on = ("951b8270a1cf",) # utilisateurs


def upgrade():
Expand Down
27 changes: 16 additions & 11 deletions app/migrations/versions/9445a69f2bed_usershub.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
Create Date: 2021-08-30 16:33:42.410504
"""

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '9445a69f2bed'
revision = "9445a69f2bed"
down_revision = None
branch_labels = ('usershub',)
depends_on = (
'fa35dfe5ff27', # schema utilisateurs
)
branch_labels = ("usershub",)
depends_on = ("fa35dfe5ff27",) # schema utilisateurs


def upgrade():
op.execute("""
op.execute(
"""
INSERT INTO utilisateurs.t_applications (
code_application,
nom_application,
Expand All @@ -29,8 +29,10 @@ def upgrade():
'UsersHub',
'Application permettant d''administrer la présente base de données.',
NULL)
""")
op.execute("""
"""
)
op.execute(
"""
INSERT INTO utilisateurs.cor_profil_for_app
(id_profil, id_application)
VALUES
Expand All @@ -41,14 +43,17 @@ def upgrade():
(SELECT id_profil FROM utilisateurs.t_profils WHERE code_profil = '3'),
(SELECT id_application FROM utilisateurs.t_applications WHERE code_application = 'UH')
)
""")
"""
)


def downgrade():
op.execute("""
op.execute(
"""
DELETE FROM utilisateurs.cor_profil_for_app cor
USING utilisateurs.t_applications app
WHERE cor.id_application = app.id_application
AND app.code_application = 'UH'
""")
"""
)
op.execute("DELETE FROM utilisateurs.t_applications WHERE code_application = 'UH'")
21 changes: 13 additions & 8 deletions app/migrations/versions/f63a8f44c969_usershub_samples.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,37 @@
Create Date: 2021-09-06 18:17:06.392398
"""

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'f63a8f44c969'
revision = "f63a8f44c969"
down_revision = None
branch_labels = ('usershub-samples',)
branch_labels = ("usershub-samples",)
depends_on = (
'9445a69f2bed', # usershub
'72f227e37bdf', # utilisateurs schema samples data
"9445a69f2bed", # usershub
"72f227e37bdf", # utilisateurs schema samples data
)


def upgrade():
op.execute("""
op.execute(
"""
INSERT INTO utilisateurs.cor_role_app_profil (id_role, id_application, id_profil) VALUES
(
(SELECT id_role FROM utilisateurs.t_roles WHERE nom_role = 'Grp_admin'),
(SELECT id_application FROM utilisateurs.t_applications WHERE code_application = 'UH'),
(SELECT id_profil FROM utilisateurs.t_profils WHERE code_profil = '6')
)
""")
"""
)


def downgrade():
op.execute("""
op.execute(
"""
DELETE FROM utilisateurs.cor_role_app_profil cor
USING
utilisateurs.t_roles r,
Expand All @@ -44,4 +48,5 @@ def downgrade():
AND r.nom_role = 'Grp_admin'
AND a.code_application = 'UH'
AND p.code_profil = '6'
""")
"""
)
Loading

0 comments on commit ffebd8f

Please sign in to comment.