organizations: fix member_required behavior

itou/common_apps/organizations/models.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.db import models
-from django.db.models import Prefetch, Q
+from django.db.models import Exists, OuterRef, Prefetch, Q
 from django.forms import ValidationError
 from django.utils import timezone
 
@@ -16,7 +16,16 @@ class OrganizationQuerySet(models.QuerySet):
     """
 
     def member_required(self, user):
-        return self.filter(members=user, members__is_active=True)
+        membership_model = self.model.members.through
+        # through_fields contains a tuple like ("company", "user")
+        structure_field, _user_field = self.model.members.rel.through_fields
+        return self.filter(
+            Exists(
+                membership_model.objects.filter(
+                    user=user, is_active=True, user__is_active=True, **{structure_field: OuterRef("pk")}
+                )
+            )
+        )
 
     def prefetch_active_memberships(self):
         membership_model = self.model.members.through

tests/companies/test_models.py

@@ -271,6 +271,20 @@ def test_add_or_activate_member(self):
 
 
 class TestCompanyQuerySet:
+    def test_member_required(self):
+        company = CompanyFactory()
+        user = EmployerFactory()
+        assert Company.objects.member_required(user).count() == 0
+
+        company.add_or_activate_member(user)
+        assert Company.objects.member_required(user).get() == company
+
+        membership = company.memberships.get()
+        membership.is_active = False
+        membership.save(update_fields=("is_active",))
+
+        assert Company.objects.member_required(user).count() == 0
+
     def test_with_count_recent_received_job_applications(self):
         company = CompanyFactory()
         model = JobApplicationFactory._meta.model

tests/institutions/tests.py

@@ -71,6 +71,22 @@ def test_add_or_activate_member(self):
             institution.add_or_activate_member(wrong_kind_user)
 
 
+class TestInstitutionQuerySet:
+    def test_member_required(self):
+        institution = InstitutionFactory()
+        user = LaborInspectorFactory()
+        assert Institution.objects.member_required(user).count() == 0
+
+        institution.add_or_activate_member(user)
+        assert Institution.objects.member_required(user).get() == institution
+
+        membership = institution.memberships.get()
+        membership.is_active = False
+        membership.save(update_fields=("is_active",))
+
+        assert Institution.objects.member_required(user).count() == 0
+
+
 def test_deactivate_last_admin(admin_client, mailoutbox):
     institution = InstitutionWithMembershipFactory(department="")
     membership = institution.memberships.first()

tests/prescribers/tests.py

@@ -246,6 +246,22 @@ def test_update_prescriber_with_api_entreprise(self, settings):
         assert organization.is_head_office is True
 
 
+class TestPrescriberOrganizationQuerySet:
+    def test_member_required(self):
+        organization = PrescriberOrganizationFactory()
+        user = PrescriberFactory()
+        assert PrescriberOrganization.objects.member_required(user).count() == 0
+
+        organization.add_or_activate_member(user)
+        assert PrescriberOrganization.objects.member_required(user).get() == organization
+
+        membership = organization.memberships.get()
+        membership.is_active = False
+        membership.save(update_fields=("is_active",))
+
+        assert PrescriberOrganization.objects.member_required(user).count() == 0
+
+
 class TestPrescriberOrganizationAdmin:
     ACCEPT_BUTTON_LABEL = "Valider l'habilitation"
     REFUSE_BUTTON_LABEL = "Refuser l'habilitation"

tests/www/apply/__snapshots__/test_submit.ambr

@@ -210,11 +210,16 @@
                  "companies_company"."is_searchable",
                  "companies_company"."rdv_solidarites_id"
           FROM "companies_company"
-          INNER JOIN "companies_companymembership" ON ("companies_company"."id" = "companies_companymembership"."company_id")
-          INNER JOIN "users_user" ON ("companies_companymembership"."user_id" = "users_user"."id")
           WHERE (NOT ("companies_company"."siret" = %s)
-                 AND "companies_companymembership"."user_id" = %s
-                 AND "users_user"."is_active"
+                 AND EXISTS
+                   (SELECT %s AS "a"
+                    FROM "companies_companymembership" U0
+                    INNER JOIN "users_user" U2 ON (U0."user_id" = U2."id")
+                    WHERE (U0."company_id" = ("companies_company"."id")
+                           AND U0."is_active"
+                           AND U0."user_id" = %s
+                           AND U2."is_active")
+                    LIMIT 1)
                  AND "companies_company"."id" = %s)
           LIMIT 21
         ''',