feat(rdvi): add RDV-Solidarités ID to company

gip-inclusion · Sep 12, 2024 · 764a4e7 · 764a4e7
1 parent adaf51e
commit 764a4e7
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 9 deletions.
diff --git a/itou/companies/admin.py b/itou/companies/admin.py
@@ -160,7 +160,7 @@ def export(self, request, queryset):
                     "block_job_applications",
                     "job_applications_blocked_at",
                     "approvals_list",
-                    "rdv_insertion_id",
+                    "rdv_solidarites_id",
                 )
             },
         ),

diff --git a/itou/companies/migrations/0007_company_rdv_solidarites_id.py b/itou/companies/migrations/0007_company_rdv_solidarites_id.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.0.9 on 2024-09-12 08:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("companies", "0006_alter_company_created_by_alter_company_insee_city_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="company",
+            name="rdv_solidarites_id",
+            field=models.IntegerField(
+                blank=True,
+                error_messages={"unique": "Une entreprise avec cet ID d'organisation RDV-S existe déjà."},
+                help_text="Permet d'initier la prise de RDV via RDV-I lorsque renseigné.",
+                null=True,
+                unique=True,
+                verbose_name="identifiant d'organisation RDV-S",
+            ),
+        ),
+    ]
diff --git a/itou/companies/models.py b/itou/companies/models.py
@@ -276,6 +276,14 @@ class Company(AddressMixin, OrganizationAbstract):
         help_text="Permet d'initier la prise de RDV via RDV-I lorsque renseigné.",
         error_messages={"unique": "Une entreprise avec cet ID d'organisation RDV-I existe déjà."},
     )
+    rdv_solidarites_id = models.IntegerField(
+        verbose_name="identifiant d'organisation RDV-S",
+        blank=True,
+        null=True,
+        unique=True,
+        help_text="Permet d'initier la prise de RDV via RDV-I lorsque renseigné.",
+        error_messages={"unique": "Une entreprise avec cet ID d'organisation RDV-S existe déjà."},
+    )
 
     # Use the generic relation to let NotificationSettings being collected on deletion
     notification_settings = GenericRelation(

diff --git a/tests/www/apply/__snapshots__/test_process.ambr b/tests/www/apply/__snapshots__/test_process.ambr
@@ -118,6 +118,7 @@
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
                  "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id",
                  EXISTS
             (SELECT %s AS "a"
              FROM "companies_siaeconvention" U0
@@ -435,6 +436,7 @@
                  T12."convention_id",
                  T12."job_app_score",
                  T12."rdv_insertion_id",
+                 T12."rdv_solidarites_id",
                  "eligibility_geiqeligibilitydiagnosis"."id",
                  "eligibility_geiqeligibilitydiagnosis"."author_id",
                  "eligibility_geiqeligibilitydiagnosis"."author_kind",
@@ -509,6 +511,7 @@
                  T15."convention_id",
                  T15."job_app_score",
                  T15."rdv_insertion_id",
+                 T15."rdv_solidarites_id",
                  T16."id",
                  T16."address_line_1",
                  T16."address_line_2",
@@ -572,6 +575,7 @@
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
                  "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id",
                  T17."id",
                  T17."password",
                  T17."last_login",

diff --git a/tests/www/employees_views/__snapshots__/test_detail.ambr b/tests/www/employees_views/__snapshots__/test_detail.ambr
@@ -118,6 +118,7 @@
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
                  "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id",
                  EXISTS
             (SELECT %s AS "a"
              FROM "companies_siaeconvention" U0
@@ -355,6 +356,7 @@
                  T8."convention_id",
                  T8."job_app_score",
                  T8."rdv_insertion_id",
+                 T8."rdv_solidarites_id",
                  T9."id",
                  T9."address_line_1",
                  T9."address_line_2",
@@ -823,7 +825,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "companies_company"
           WHERE "companies_company"."id" = %s
           LIMIT 21
@@ -1167,7 +1170,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "job_applications_jobapplication"
           INNER JOIN "companies_company" ON ("job_applications_jobapplication"."to_company_id" = "companies_company"."id")
           LEFT OUTER JOIN "users_user" T4 ON ("job_applications_jobapplication"."sender_id" = T4."id")
@@ -1651,6 +1655,7 @@
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
                  "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id",
                  EXISTS
             (SELECT %s AS "a"
              FROM "companies_siaeconvention" U0
@@ -1888,6 +1893,7 @@
                  T8."convention_id",
                  T8."job_app_score",
                  T8."rdv_insertion_id",
+                 T8."rdv_solidarites_id",
                  T9."id",
                  T9."address_line_1",
                  T9."address_line_2",
@@ -2269,7 +2275,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "companies_company"
           WHERE "companies_company"."id" = %s
           LIMIT 21
@@ -2626,7 +2633,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "job_applications_jobapplication"
           INNER JOIN "companies_company" ON ("job_applications_jobapplication"."to_company_id" = "companies_company"."id")
           LEFT OUTER JOIN "users_user" T4 ON ("job_applications_jobapplication"."sender_id" = T4."id")
@@ -3299,6 +3307,7 @@
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
                  "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id",
                  EXISTS
             (SELECT %s AS "a"
              FROM "companies_siaeconvention" U0
@@ -3536,6 +3545,7 @@
                  T8."convention_id",
                  T8."job_app_score",
                  T8."rdv_insertion_id",
+                 T8."rdv_solidarites_id",
                  T9."id",
                  T9."address_line_1",
                  T9."address_line_2",
@@ -4089,7 +4099,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "job_applications_jobapplication"
           INNER JOIN "companies_company" ON ("job_applications_jobapplication"."to_company_id" = "companies_company"."id")
           LEFT OUTER JOIN "users_user" T4 ON ("job_applications_jobapplication"."sender_id" = T4."id")

diff --git a/tests/www/job_seekers_views/__snapshots__/test_details.ambr b/tests/www/job_seekers_views/__snapshots__/test_details.ambr
@@ -1251,7 +1251,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "eligibility_geiqeligibilitydiagnosis"
           LEFT OUTER JOIN "companies_company" ON ("eligibility_geiqeligibilitydiagnosis"."author_geiq_id" = "companies_company"."id")
           LEFT OUTER JOIN "prescribers_prescriberorganization" ON ("eligibility_geiqeligibilitydiagnosis"."author_prescriber_organization_id" = "prescribers_prescriberorganization"."id")
@@ -1479,7 +1480,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "eligibility_eligibilitydiagnosis"
           INNER JOIN "users_user" T3 ON ("eligibility_eligibilitydiagnosis"."author_id" = T3."id")
           LEFT OUTER JOIN "prescribers_prescriberorganization" ON ("eligibility_eligibilitydiagnosis"."author_prescriber_organization_id" = "prescribers_prescriberorganization"."id")
@@ -1661,7 +1663,8 @@
                  "companies_company"."job_applications_blocked_at",
                  "companies_company"."convention_id",
                  "companies_company"."job_app_score",
-                 "companies_company"."rdv_insertion_id"
+                 "companies_company"."rdv_insertion_id",
+                 "companies_company"."rdv_solidarites_id"
           FROM "job_applications_jobapplication"
           LEFT OUTER JOIN "users_user" T3 ON ("job_applications_jobapplication"."sender_id" = T3."id")
           INNER JOIN "companies_company" ON ("job_applications_jobapplication"."to_company_id" = "companies_company"."id")