Visam

admin/files/nginx/https.conf.template

@@ -81,12 +81,6 @@ server {
         add_header "Pragma" "no-cache";
     }
 
-    location /repondeur/static/ {
-        alias /srv/repondeur/src/repondeur/zam_repondeur/static/;
-        expires 30d;
-        add_header "Cache-Control" "public";
-    }
-
     location /_stats/ {
         alias /var/cache/munin/www/;
         add_header "Cache-Control" "no-store";

admin/tasks/system.py

@@ -181,7 +181,7 @@ def setup_self_signed_cert(ctx):
         " -days 365"
         " -sha256"
         " -nodes"
-        f" -subj '/C=FR/OU=Zam/CN={hostname}'"
+        f" -subj '/C=FR/OU=Visam/CN={hostname}'"
     )
 
 

repondeur/db_migrations/env.py

@@ -3,6 +3,9 @@
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 
+# Make sure all models are loaded
+import zam_repondeur.models  # noqa
+import zam_repondeur.visam.models  # noqa
 from zam_repondeur.models import Base
 
 # this is the Alembic Config object, which provides

repondeur/db_migrations/versions/08e2b571d519_add_conseils_team.py

@@ -0,0 +1,27 @@
+"""Add conseils team
+
+Revision ID: 08e2b571d519
+Revises: fe0f5eb2cc56
+Create Date: 2020-03-13 11:51:03.175180
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "08e2b571d519"
+down_revision = "fe0f5eb2cc56"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("conseils", sa.Column("team_pk", sa.Integer(), nullable=False))
+    op.create_foreign_key(
+        op.f("conseils_team_pk_fkey"), "conseils", "teams", ["team_pk"], ["pk"]
+    )
+
+
+def downgrade():
+    op.drop_constraint(op.f("conseils_team_pk_fkey"), "conseils", type_="foreignkey")
+    op.drop_column("conseils", "team_pk")

repondeur/db_migrations/versions/243d9fa3359c_user_organisation.py

@@ -0,0 +1,77 @@
+"""User organisation
+
+Revision ID: 243d9fa3359c
+Revises: b09413ecb1a1
+Create Date: 2020-04-20 11:03:06.851174
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "243d9fa3359c"
+down_revision = "b09413ecb1a1"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_column("users_chambres", "organisation")
+
+    organisation_table = op.create_table(
+        "organisations",
+        sa.Column("pk", sa.Integer(), nullable=False),
+        sa.Column("name", sa.Text(), nullable=False),
+        sa.PrimaryKeyConstraint("pk"),
+        sa.UniqueConstraint("name", name=op.f("organisations_name_key")),
+    )
+
+    # Fill up the table.
+    op.bulk_insert(
+        organisation_table,
+        [
+            {"name": "Gouvernement"},
+            {"name": "Employeurs territoriaux"},
+            {"name": "CFE-CGC"},
+            {"name": "CFTC"},
+            {"name": "CGT"},
+            {"name": "FA-FP"},
+            {"name": "FSU"},
+            {"name": "UNSA"},
+        ],
+    )
+
+    # Set default organisation to `Gouvernement` for existing users memberships.
+    op.add_column(
+        "users_chambres", sa.Column("organisation_pk", sa.Integer(), nullable=True),
+    )
+    op.execute(
+        """
+        UPDATE users_chambres SET organisation_pk=(
+            SELECT pk FROM organisations WHERE name='Gouvernement'
+        )
+        """
+    )
+    op.alter_column("users_chambres", "organisation_pk", nullable=False)
+
+    op.create_foreign_key(
+        op.f("users_chambres_organisation_pk_fkey"),
+        "users_chambres",
+        "organisations",
+        ["organisation_pk"],
+        ["pk"],
+    )
+
+
+def downgrade():
+    op.drop_constraint(
+        op.f("users_chambres_organisation_pk_fkey"),
+        "users_chambres",
+        type_="foreignkey",
+    )
+    op.drop_column("users_chambres", "organisation_pk")
+    op.drop_table("organisations")
+    op.add_column(
+        "users_chambres",
+        sa.Column("organisation", sa.INTEGER(), autoincrement=False, nullable=True),
+    )

repondeur/db_migrations/versions/245e371cbf82_add_chambre_constraint.py

@@ -0,0 +1,24 @@
+"""Add chambre constraint
+
+Revision ID: 245e371cbf82
+Revises: 95dfdcde1955
+Create Date: 2020-03-11 17:52:02.715512
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "245e371cbf82"
+down_revision = "95dfdcde1955"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_check_constraint(
+        op.f("ck_conseils_chambre"), "conseils", "chambre NOT IN ('AN', 'SENAT')",
+    )
+
+
+def downgrade():
+    op.drop_constraint(op.f("ck_conseils_chambre"), "conseils")

repondeur/db_migrations/versions/3fe97532ba21_add_ccfp_chambre.py

@@ -0,0 +1,27 @@
+"""Add CCFP chambre
+
+Revision ID: 3fe97532ba21
+Revises: f2882be74177
+Create Date: 2020-02-27 14:25:49.524626
+
+"""
+from alembic import op
+
+from zam_repondeur.models._helpers import alter_pg_enum
+
+# revision identifiers, used by Alembic.
+revision = "3fe97532ba21"
+down_revision = "f2882be74177"
+branch_labels = None
+depends_on = None
+
+
+COLUMNS_TO_CONVERT = [("lectures", "chambre"), ("textes", "chambre")]
+
+
+def upgrade():
+    alter_pg_enum(op, "chambre", ["AN", "SENAT", "CCFP"], COLUMNS_TO_CONVERT)
+
+
+def downgrade():
+    alter_pg_enum(op, "chambre", ["AN", "SENAT"], COLUMNS_TO_CONVERT)

repondeur/db_migrations/versions/95dfdcde1955_add_conseils.py

@@ -0,0 +1,43 @@
+"""Add conseils
+
+Revision ID: 95dfdcde1955
+Revises: 3fe97532ba21
+Create Date: 2020-03-11 15:56:00.842219
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects.postgresql import ENUM
+
+# revision identifiers, used by Alembic.
+revision = "95dfdcde1955"
+down_revision = "3fe97532ba21"
+branch_labels = None
+depends_on = None
+
+
+formation_type = ENUM(
+    "ASSEMBLEE_PLENIERE", "FORMATION_SPECIALISEE", name="formation", create_type=False
+)
+
+
+def upgrade():
+    formation_type.create(op.get_bind(), checkfirst=False)
+    op.create_table(
+        "conseils",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column(
+            "chambre",
+            ENUM("AN", "SENAT", "CCFP", name="chambre", create_type=False),
+            nullable=False,
+        ),
+        sa.Column("date", sa.Date(), nullable=False),
+        sa.Column("formation", formation_type, nullable=False,),
+        sa.Column("urgence_declaree", sa.Boolean(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+
+def downgrade():
+    op.drop_table("conseils")
+    formation_type.drop(op.get_bind(), checkfirst=False)

repondeur/db_migrations/versions/b09413ecb1a1_rename_conseils_to_seances.py

@@ -0,0 +1,54 @@
+"""Rename conseils to seances
+
+Revision ID: b09413ecb1a1
+Revises: e39d4c9a9459
+Create Date: 2020-04-14 10:02:40.581873
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "b09413ecb1a1"
+down_revision = "e39d4c9a9459"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_constraint(
+        "conseils_lectures_conseil_pk_fkey", "conseils_lectures", type_="foreignkey"
+    )
+    op.rename_table(old_table_name="conseils", new_table_name="seances")
+    op.rename_table(
+        old_table_name="conseils_lectures", new_table_name="seances_lectures"
+    )
+    op.alter_column("seances_lectures", "conseil_pk", new_column_name="seance_pk")
+    op.create_foreign_key(
+        op.f("seances_lectures_seance_pk_fkey"),
+        "seances_lectures",
+        "seances",
+        ["seance_pk"],
+        ["pk"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )
+
+
+def downgrade():
+    op.drop_constraint(
+        "seances_lectures_seance_pk_fkey", "seances_lectures", type_="foreignkey"
+    )
+    op.rename_table(old_table_name="seances", new_table_name="conseils")
+    op.rename_table(
+        old_table_name="seances_lectures", new_table_name="conseils_lectures"
+    )
+    op.alter_column("conseils_lectures", "seance_pk", new_column_name="conseil_pk")
+    op.create_foreign_key(
+        op.f("conseils_lectures_conseil_pk_fkey"),
+        "conseils_lectures",
+        "conseils",
+        ["conseil_pk"],
+        ["pk"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )

repondeur/db_migrations/versions/caaa6d0c7254_add_csfpe_chambre.py

@@ -0,0 +1,46 @@
+"""Add CSFPE chambre
+
+Revision ID: caaa6d0c7254
+Revises: 245e371cbf82
+Create Date: 2020-03-11 17:19:11.567332
+
+"""
+from contextlib import contextmanager
+
+from alembic import op
+
+from zam_repondeur.models._helpers import alter_pg_enum
+
+# revision identifiers, used by Alembic.
+revision = "caaa6d0c7254"
+down_revision = "245e371cbf82"
+branch_labels = None
+depends_on = None
+
+
+COLUMNS_TO_CONVERT = [
+    ("lectures", "chambre"),
+    ("textes", "chambre"),
+    ("conseils", "chambre"),
+]
+
+
+def upgrade():
+    with release_check_constraint():
+        alter_pg_enum(
+            op, "chambre", ["AN", "SENAT", "CCFP", "CSFPE"], COLUMNS_TO_CONVERT
+        )
+
+
+def downgrade():
+    with release_check_constraint():
+        alter_pg_enum(op, "chambre", ["AN", "SENAT", "CCFP"], COLUMNS_TO_CONVERT)
+
+
+@contextmanager
+def release_check_constraint():
+    op.drop_constraint(op.f("ck_conseils_chambre"), "conseils")
+    yield
+    op.create_check_constraint(
+        op.f("ck_conseils_chambre"), "conseils", "chambre NOT IN ('AN', 'SENAT')",
+    )

repondeur/db_migrations/versions/e39d4c9a9459_rename_id_to_pk.py

@@ -0,0 +1,54 @@
+"""Rename id to pk
+
+Revision ID: e39d4c9a9459
+Revises: fb1d734cc205
+Create Date: 2020-04-14 08:44:22.021370
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "e39d4c9a9459"
+down_revision = "fb1d734cc205"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Rename conseils.id
+    op.alter_column("conseils", "id", new_column_name="pk")
+
+    # Rename conseils_lectures.conseil_id
+    op.drop_constraint(
+        "conseils_lectures_conseil_id_fkey", "conseils_lectures", type_="foreignkey"
+    )
+    op.alter_column("conseils_lectures", "conseil_id", new_column_name="conseil_pk")
+    op.create_foreign_key(
+        op.f("conseils_lectures_conseil_pk_fkey"),
+        "conseils_lectures",
+        "conseils",
+        ["conseil_pk"],
+        ["pk"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )
+
+
+def downgrade():
+    # Rename conseils_lectures.conseil_ipk
+    op.drop_constraint(
+        "conseils_lectures_conseil_pk_fkey", "conseils_lectures", type_="foreignkey"
+    )
+    op.alter_column("conseils_lectures", "conseil_pk", new_column_name="conseil_id")
+    op.create_foreign_key(
+        op.f("conseils_lectures_conseil_id_fkey"),
+        "conseils_lectures",
+        "conseils",
+        ["conseil_id"],
+        ["pk"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )
+
+    # Rename conseils.pk
+    op.alter_column("conseils", "pk", new_column_name="id")