+ + + {% trans "Validate content for all entities" %} + + +
+ +- - {% trans "Manage consent" %} - -
-{% endblock content %} + {% include "consent/includes/_resume_awaiting_consents.html" %} + {% include "consent/includes/_resume_validated_consents.html" %} + +{% endblock content %} \ No newline at end of file diff --git a/src/dashboard/apps/consent/templates/consent/manage.html b/src/dashboard/apps/consent/templates/consent/manage.html new file mode 100644 index 00000000..411362c2 --- /dev/null +++ b/src/dashboard/apps/consent/templates/consent/manage.html @@ -0,0 +1,67 @@ +{% extends "home/base.html" %} + +{% load i18n static %} + +{% block content %} +{% trans "No consents to validate" %}
+ {% endif %} +{% endblock content %} + +{% block extra_dashboard_js %} + {% if consents %} + + {% endif %} +{% endblock extra_dashboard_js %} diff --git a/src/dashboard/apps/consent/tests/test_models.py b/src/dashboard/apps/consent/tests/test_models.py index fe34a29f..7fed4c08 100644 --- a/src/dashboard/apps/consent/tests/test_models.py +++ b/src/dashboard/apps/consent/tests/test_models.py @@ -3,12 +3,16 @@ from datetime import timedelta import pytest -from django.utils import formats +from django.core.exceptions import PermissionDenied +from django.db.models import TextField +from django.db.models.functions import Cast +from django.utils import formats, timezone from apps.auth.factories import UserFactory from apps.consent.factories import ConsentFactory from apps.consent.models import Consent -from apps.core.factories import DeliveryPointFactory +from apps.core.factories import DeliveryPointFactory, EntityFactory +from apps.core.models import DeliveryPoint @pytest.mark.django_db @@ -67,3 +71,472 @@ def test_update_consent_status(): assert consent.status == Consent.REVOKED assert consent.updated_at > new_updated_at assert consent.revoked_at is not None + + +@pytest.mark.django_db +def test_consent_queryset_user_without_entity(): + """User without an associated entity. + + Test user without an associated entity doesn't have any consents awaiting approval + and can't access directly to an entity. + """ + user = UserFactory() + user2 = UserFactory() + entity2 = EntityFactory(users=(user2,)) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory(delivery_point=delivery_point, created_by=user2) + + assert Consent.get_awaiting(user).exists() is False + + # test by accessing a specific entity + assert Consent.get_awaiting(user2, entity2).exists() is True + with pytest.raises(PermissionDenied): + Consent.get_awaiting(user, entity2) + + +@pytest.mark.django_db +def test_consent_queryset_standard_user(): + """Test user with one entity and delivery points. + + Test that user with an associated entity and delivery points have correct + number of consents awaiting approval. + """ + user1 = UserFactory() + user2 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,)) + + # Create AWAITING consent + for i in range(1, 4): + dp1 = DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + ConsentFactory(delivery_point=dp1, created_by=user1) + dp2 = DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + ConsentFactory(delivery_point=dp2, created_by=user1) + + # Create VALIDATED consent + delivery_point = DeliveryPointFactory( + provider_assigned_id="entity2_4", entity=entity2 + ) + ConsentFactory( + delivery_point=delivery_point, created_by=user1, status=Consent.VALIDATED + ) + + awaiting_consents = Consent.get_awaiting(user1) + assert awaiting_consents.count() == 3 # noqa: PLR2004 + for consent in awaiting_consents: + assert consent.status == Consent.AWAITING + assert consent.delivery_point.entity.name == "entity1" + + # test by accessing a specific entity + awaiting_consents = Consent.get_awaiting(user1, entity1) + assert awaiting_consents.count() == 3 # noqa: PLR2004 + awaiting_consents = Consent.get_awaiting(user2, entity2) + assert awaiting_consents.count() == 3 # noqa: PLR2004 + + with pytest.raises(PermissionDenied): + Consent.get_awaiting(user1, entity2) + + +@pytest.mark.django_db +def test_consent_queryset_standard_user_without_consent(): + """User with one entity and delivery points, but without consents to validated. + + Test if a user with an associated entity and delivery points but no consent + to validate has no consent pending approval. + """ + user1 = UserFactory() + user2 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,)) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory( + delivery_point=delivery_point, created_by=user1, status=Consent.VALIDATED + ) + + awaiting_consents = Consent.get_awaiting(user1) + assert awaiting_consents.exists() is False + + # test by accessing a specific entity + awaiting_consents = Consent.get_awaiting(user1, entity1) + assert awaiting_consents.exists() is False + + with pytest.raises(PermissionDenied): + Consent.get_awaiting(user1, entity2) + + +@pytest.mark.django_db +def test_consent_queryset_multi_standard_user_by_entity(): + """Multy User with one entity and delivery points. + + Test that multi-user associated on the same entity and delivery points have correct + number of consents awaiting approval. + """ + user1 = UserFactory() + user2 = UserFactory() + entity1 = EntityFactory(users=(user1, user2), name="entity1") + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory(delivery_point=delivery_point, created_by=user1) + + awaiting_consents = Consent.get_awaiting(user1) + assert awaiting_consents.count() == 3 # noqa: PLR2004 + for consent in awaiting_consents: + assert consent.status == Consent.AWAITING + assert consent.delivery_point.entity.name == "entity1" + + awaiting_consents = Consent.get_awaiting(user2) + assert awaiting_consents.count() == 3 # noqa: PLR2004 + for consent in awaiting_consents: + assert consent.status == Consent.AWAITING + assert consent.delivery_point.entity.name == "entity1" + + # test by accessing a specific entity + awaiting_consents = Consent.get_awaiting(user1, entity1) + assert awaiting_consents.count() == 3 # noqa: PLR2004 + awaiting_consents = Consent.get_awaiting(user2, entity1) + assert awaiting_consents.count() == 3 # noqa: PLR2004 + + +@pytest.mark.django_db +def test_consent_queryset_multy_standard_user_without_consent(): + """Multy User with one entity and delivery points but without consents to validated. + + Test if multi-user associated on the same entity and delivery points but with + no consent to validate has no consent pending approval. + """ + user1 = UserFactory() + user2 = UserFactory() + entity1 = EntityFactory(users=(user1, user2), name="entity1") + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory( + delivery_point=delivery_point, created_by=user1, status=Consent.VALIDATED + ) + awaiting_consents = Consent.get_awaiting(user1) + assert awaiting_consents.exists() is False + + awaiting_consents = Consent.get_awaiting(user2) + assert awaiting_consents.exists() is False + + # test by accessing a specific entity + awaiting_consents = Consent.get_awaiting(user1, entity1) + assert awaiting_consents.exists() is False + awaiting_consents = Consent.get_awaiting(user2, entity1) + assert awaiting_consents.exists() is False + + +@pytest.mark.django_db +def test_consent_queryset_user_proxy_for(): + """Ensure a proxy user with consents retrieve the correct 'awaiting consents'. + + This test ensures that the consents awaiting for a user who is a proxy for multiple + entities are correctly identified. + It creates multiple users, entities, and delivery points, associating them + accordingly. + It then verifies that the consents created for these delivery points are fetched + correctly for a proxy user. + + 1. Create users and entities, with one entity being a proxy for others. + 2. Generate delivery points for each entity and associate consents with them. + 3. Assert the total count of delivery points and consents. + 4. Fetch awaiting consents for a proxy user and verify their count and entities. + """ + user1 = UserFactory() + user2 = UserFactory() + user3 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,), name="entity2") + entity3 = EntityFactory( + users=(user3,), proxy_for=(entity1, entity2), name="entity3" + ) + entity4 = EntityFactory(users=(user1,), name="entity4") + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + DeliveryPointFactory(provider_assigned_id=f"entity3_{i}", entity=entity3) + DeliveryPointFactory(provider_assigned_id=f"entity4_{i}", entity=entity4) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory(delivery_point=delivery_point, created_by=user1) + + assert ( + DeliveryPoint.objects.filter(entity__in=[entity1, entity2, entity3]).count() + == 9 # noqa: PLR2004 + ) + + # Proxy user can access to all delivery points + awaiting_consents = Consent.get_awaiting(user3) + assert awaiting_consents.count() == 9 # noqa: PLR2004 + + entities_name = [] + for consent in awaiting_consents: + assert consent.status == Consent.AWAITING + entities_name.append(consent.delivery_point.entity.name) + + assert len(set(entities_name)) == 3 # noqa: PLR2004 + assert set(entities_name) == {"entity1", "entity2", "entity3"} + + # test by accessing a specific entity + assert Consent.get_awaiting(user3, entity1).exists() is True + assert Consent.get_awaiting(user3, entity2).exists() is True + assert Consent.get_awaiting(user3, entity3).exists() is True + + with pytest.raises(PermissionDenied): + Consent.get_awaiting(user3, entity4) + + +@pytest.mark.django_db +def test_consent_queryset_user_proxy_for_without_consent(): + """Ensure a proxy user without consents does not retrieve any 'awaiting consents'. + + Consents are generated for each delivery point with 'user1' as the creator. + The main assertion verifies that there are no 'awaiting consents' for 'user3', + the user associated with the proxy entity. + """ + user1 = UserFactory() + user2 = UserFactory() + user3 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,), name="entity2") + entity3 = EntityFactory( + users=(user3,), proxy_for=(entity1, entity2), name="entity3" + ) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + DeliveryPointFactory(provider_assigned_id=f"entity3_{i}", entity=entity3) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory( + delivery_point=delivery_point, created_by=user1, status=Consent.VALIDATED + ) + + assert DeliveryPoint.objects.all().count() == 9 # noqa: PLR2004 + assert Consent.get_awaiting(user3).count() == 0 + + # test by accessing a specific entity + assert Consent.get_awaiting(user1, entity1).count() == 0 + assert Consent.get_awaiting(user3, entity1).count() == 0 + + +@pytest.mark.django_db +def test_consent_queryset_user_with_proxy(): + """Verify that a user with proxy can access anly his own entity. + + This test ensures that the consents awaiting for a user who has a proxy can + only access to his entity. + """ + user1 = UserFactory() + user2 = UserFactory() + user3 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,), name="entity2") + entity3 = EntityFactory( + users=(user3,), proxy_for=(entity1, entity2), name="entity3" + ) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + DeliveryPointFactory(provider_assigned_id=f"entity3_{i}", entity=entity3) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory(delivery_point=delivery_point, created_by=user1) + + assert DeliveryPoint.objects.all().count() == 9 # noqa: PLR2004 + + awaiting_consents = Consent.get_awaiting(user1) + + assert awaiting_consents.count() == 3 # noqa: PLR2004 + entities_name = [] + for consent in awaiting_consents: + assert consent.status == Consent.AWAITING + entities_name.append(consent.delivery_point.entity.name) + + assert len(set(entities_name)) == 1 + assert set(entities_name) != {"entity2", "entity3"} + assert set(entities_name) == {"entity1"} + + # test by accessing a specific entity + assert Consent.get_awaiting(user1, entity1).count() == 3 # noqa: PLR2004 + assert Consent.get_awaiting(user3, entity1).count() == 3 # noqa: PLR2004 + with pytest.raises(PermissionDenied): + Consent.get_awaiting(user2, entity1) + + +@pytest.mark.django_db +def test_count_validated_by_user(): + """Count VALIDATED consents by entities for a given user.""" + user1 = UserFactory() + user2 = UserFactory() + user3 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,), name="entity2") + entity3 = EntityFactory( + users=(user3,), proxy_for=(entity1, entity2), name="entity3" + ) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + DeliveryPointFactory(provider_assigned_id=f"entity3_{i}", entity=entity3) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory(delivery_point=delivery_point, created_by=user1) + + for entity in Consent.count_awaiting_by_entity(user1): + assert entity.dcount == 3 # noqa: PLR2004 + for entity in Consent.count_awaiting_by_entity(user2): + assert entity.dcount == 3 # noqa: PLR2004 + + assert Consent.count_awaiting_by_entity(user3).count() == 3 # noqa: PLR2004 + for entity in Consent.count_awaiting_by_entity(user3): + assert entity.dcount == 3 # noqa: PLR2004 + + +@pytest.mark.django_db +def test_count_awaiting_by_user(): + """Count AWAITING consents by entities for a given user.""" + user1 = UserFactory() + user2 = UserFactory() + user3 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,), name="entity2") + entity3 = EntityFactory( + users=(user3,), proxy_for=(entity1, entity2), name="entity3" + ) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + DeliveryPointFactory(provider_assigned_id=f"entity3_{i}", entity=entity3) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory( + delivery_point=delivery_point, created_by=user1, status=Consent.VALIDATED + ) + + for entity in Consent.count_validated_by_entity(user1): + assert entity.dcount == 3 # noqa: PLR2004 + for entity in Consent.count_validated_by_entity(user2): + assert entity.dcount == 3 # noqa: PLR2004 + + assert Consent.count_validated_by_entity(user3).count() == 3 # noqa: PLR2004 + for entity in Consent.count_validated_by_entity(user3): + assert entity.dcount == 3 # noqa: PLR2004 + + for entity in Consent.count_awaiting_by_entity(user1): + assert entity.dcount == 0 + for entity in Consent.count_awaiting_by_entity(user2): + assert entity.dcount == 0 + for entity in Consent.count_awaiting_by_entity(user3): + assert entity.dcount == 0 + + +@pytest.mark.django_db +def test_update_validated(): + """Verifies that consents are updated to VALIDATED.""" + user1 = UserFactory() + user2 = UserFactory() + user3 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,), name="entity2") + entity3 = EntityFactory( + users=(user3,), proxy_for=(entity1, entity2), name="entity3" + ) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + DeliveryPointFactory(provider_assigned_id=f"entity3_{i}", entity=entity3) + + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory( + delivery_point=delivery_point, created_by=user1, status=Consent.AWAITING + ) + + # retrieves the consents to be validated for a given user + consents = Consent.get_awaiting(user1) + nb_consents_awaiting = consents.count() + first_consent = consents.first() + ids = list( + consents.annotate(str_id=Cast("id", output_field=TextField())).values_list( + "str_id", flat=True + ) + ) + # remove last item from list, to test awaiting update + ids.pop() + nb_consents_awaiting -= 1 + + # validates all previous consents + result = Consent.set_consents_status_by_ids( + selected_ids=ids, user=user1, consents_qs=consents + ) + assert result[0] == nb_consents_awaiting + assert result[1] == 1 + + # checks that validated consents have been correctly updated + validated_consents = Consent.objects.filter(id__in=ids) + assert validated_consents.count() == nb_consents_awaiting + for consent in validated_consents: + assert consent.status == Consent.VALIDATED + assert consent.created_by == user1 + + # check that the update date has been updated correctly + first_validated_consent = Consent.objects.get(id=first_consent.id) + assert first_validated_consent.updated_at > first_consent.updated_at + + +@pytest.mark.django_db +def test_date(): + """Only consents from the current period are retrieved.""" + user1 = UserFactory() + user2 = UserFactory() + user3 = UserFactory() + entity1 = EntityFactory(users=(user1,), name="entity1") + entity2 = EntityFactory(users=(user2,), name="entity2") + entity3 = EntityFactory( + users=(user3,), proxy_for=(entity1, entity2), name="entity3" + ) + + for i in range(1, 4): + DeliveryPointFactory(provider_assigned_id=f"entity1_{i}", entity=entity1) + DeliveryPointFactory(provider_assigned_id=f"entity2_{i}", entity=entity2) + DeliveryPointFactory(provider_assigned_id=f"entity3_{i}", entity=entity3) + + # create past consents + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory( + delivery_point=delivery_point, + status=Consent.AWAITING, + start=timezone.now() - timedelta(days=120), + end=timezone.now() - timedelta(days=90), + ) + + # create actual consents + for delivery_point in DeliveryPoint.objects.all(): + ConsentFactory( + delivery_point=delivery_point, created_by=user1, status=Consent.AWAITING + ) + + assert Consent.objects.all().count() == 18 # noqa: PLR2004 + assert Consent.count_awaiting_by_entity(user3).count() == 3 # noqa: PLR2004 + for entity in Consent.count_awaiting_by_entity(user3): + assert entity.dcount == 3 # noqa: PLR2004 diff --git a/src/dashboard/apps/consent/urls.py b/src/dashboard/apps/consent/urls.py index d12e65f8..6f6a0616 100644 --- a/src/dashboard/apps/consent/urls.py +++ b/src/dashboard/apps/consent/urls.py @@ -2,11 +2,12 @@ from django.urls import path -from .views import IndexView, ManageView +from .views import IndexView, consent_form_view app_name = "consent" urlpatterns = [ path("", IndexView.as_view(), name="index"), - path("manage/", ManageView.as_view(), name="manage"), + path("manage/", consent_form_view, name="manage"), + path("manage/