Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions django/bin/post_deploy
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
#!/bin/sh

if ./manage.py showmigrations core | grep -q "\[X\] 0001_initial"; then
./manage.py migrate
if [ "${DISABLE_MIGRATIONS}" == "True" ]; then
echo "Les migrations ont été désactivées."
exit 0
else
echo "Migration core.0001_initial pas encore appliquée."
echo "Cela indique que nous sommes en train de créer une recette jetable."
echo "Exécution des migrations ignorée, en attente de la restauration de la sauvegarde."
if ./manage.py showmigrations core | grep --quiet "\[X\] 0001_initial"; then
django-admin migrate
else
echo "Migration core.0001_initial pas encore appliquée."
echo "Cela indique que nous sommes en train de créer une recette jetable."
echo "Exécution des migrations ignorée, en attente de la restauration de la sauvegarde."
fi
fi
7 changes: 7 additions & 0 deletions django/docurba/core/enums.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from django.db import models


class CommuneType(models.TextChoices):
COM = "COM", "Commune"
COMD = "COMD", "Commune déléguée"
UNKWN = "UNKWN", "Inconnu"
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def handle(self, *, wet_run: bool, limit: int, **options: dict[str, Any]) -> Non
"from_sudocuh",
"collectivite_porteuse", # Mandatory because of procedureManager.get_queryset
)
.order_by("from_sudocuh")
)
if limit:
procedures_qs = procedures_qs[:limit]
Expand Down
16 changes: 16 additions & 0 deletions django/docurba/core/migrations/0019_communeprocedure_is_managed.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Generated by Django 6.0.4 on 2026-04-10 09:15

from django.db import migrations


class Migration(migrations.Migration):
dependencies = [
("core", "0018_add_last_updated_by_id_to_procedures"),
]

operations = [
migrations.AlterModelOptions(
name="communeprocedure",
options={"verbose_name": "Périmètre"},
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# Generated by Django 6.0.4 on 2026-04-10 09:37

import django.contrib.postgres.functions
import django.db.models.deletion
import django.db.models.functions.text
from django.db import migrations, models


class Migration(migrations.Migration):
initial = True

dependencies = [
("core", "0019_communeprocedure_is_managed"),
]

operations = [
migrations.AddField(
model_name="communeprocedure",
name="collectivite_code",
field=models.CharField(verbose_name="Code collectivité"),
),
migrations.AddField(
model_name="communeprocedure",
name="collectivite_type",
field=models.CharField(
choices=[
("COM", "Commune"),
("COMD", "Commune déléguée"),
("UNKWN", "Inconnu"),
],
default="COM",
verbose_name="Type de collectivité",
),
),
migrations.AddField(
model_name="communeprocedure",
name="commune",
field=models.ForeignObject(
from_fields=["commune_id"],
on_delete=django.db.models.deletion.DO_NOTHING,
to="core.commune",
to_fields=["collectivite_ptr_id"],
),
),
migrations.AddField(
model_name="communeprocedure",
name="procedure",
field=models.ForeignKey(
on_delete=django.db.models.deletion.DO_NOTHING,
to="core.procedure",
),
),
migrations.AddField(
model_name="communeprocedure",
name="departement",
field=models.CharField(blank=True, null=True),
),
migrations.AddField(
model_name="communeprocedure",
name="opposable",
field=models.BooleanField(default=False, verbose_name="Est opposable"),
),
migrations.AlterField(
model_name="communeprocedure",
name="id",
field=models.UUIDField(
db_default=django.contrib.postgres.functions.RandomUUID(),
primary_key=True,
serialize=False,
),
),
migrations.AddField(
model_name="communeprocedure",
name="commune_id",
field=models.GeneratedField(
db_persist=True,
expression=django.db.models.functions.text.Concat(
"collectivite_code", models.Value("_"), "collectivite_type"
),
output_field=models.CharField(),
),
),
]
34 changes: 30 additions & 4 deletions django/docurba/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@
from django.urls import reverse
from django.utils import timezone

from docurba.core.enums import CommuneType

logger = logging.getLogger(__name__)


# NOTE(cms): These TextChoices should be moved to enums.py
class TypeCollectivite(models.TextChoices):
COM = "COM", "Commune"
COMD = "COMD", "Commune déléguée"
Expand Down Expand Up @@ -966,11 +969,36 @@ def libelle_code_etat_complet(self) -> str:


class CommuneProcedure(models.Model): # noqa: DJ008
commune = models.ForeignKey(Commune, models.DO_NOTHING, db_constraint=False)
id = models.UUIDField(primary_key=True, db_default=RandomUUID())

# Created for Nuxt before Django models were here.
# It should be refactored when working on the COG.
commune_id = models.GeneratedField(
expression=models.functions.Concat(
"collectivite_code",
models.Value("_"),
"collectivite_type",
),
output_field=models.CharField(),
db_persist=True,
) # TextField in DB.
# To display the commune in Django admin.
commune = models.ForeignObject(
Commune,
from_fields=["commune_id"],
to_fields=["collectivite_ptr_id"],
on_delete=models.DO_NOTHING,
)
procedure = models.ForeignKey(Procedure, models.DO_NOTHING)
collectivite_code = models.CharField(
verbose_name="Code collectivité"
verbose_name="Code collectivité",
) # TextField in DB.
collectivite_type = models.CharField(
verbose_name="Type de collectivité",
choices=CommuneType,
default=CommuneType.COM,
) # TextField in DB.
opposable = models.BooleanField(verbose_name="Est opposable", default=False)
# Denormalized version of commune.departement.code_insee already existing in production.
# Real type is TextField but I used a Charfiel here for performance reasons.
# This column is used in Nuxt side to retrieve procedures by departement.
Expand All @@ -982,8 +1010,6 @@ class CommuneProcedure(models.Model): # noqa: DJ008
departement = models.CharField(null=True, blank=True) # noqa: DJ001

class Meta:
# Table created by a pre_migrate signal in apps.py.
managed = False
db_table = "procedures_perimetres"
verbose_name = "Périmètre"

Expand Down
Loading
Loading