add tests

club/migrations/0018_clubrole_linked_groups.py

@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
                     "Groups that are automatically given or removed "
                     "to user receiving or losing this club role"
                 ),
-                related_name="linked_roles",
+                related_name="club_roles",
                 to="core.group",
                 verbose_name="Linked groups",
             ),

core/auth/backends.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.models import Permission
+from django.db.models import Exists, OuterRef, Q, QuerySet
 
-from core.models import Group
+from core.models import Group, User
 
-if TYPE_CHECKING:
-    from core.models import User
+if typing.TYPE_CHECKING:
+    from django.db.models.base import Model
 
 
 class SithModelBackend(ModelBackend):
@@ -40,3 +41,53 @@ class SithModelBackend(ModelBackend):
         return Permission.objects.filter(
             group__group__in=groups.values_list("pk", flat=True)
         )
+
+    @typing.override
+    def with_perm(
+        self,
+        perm: str | Permission,
+        is_active: bool | None = True,
+        include_superusers: bool = False,
+        obj: Model | None = None,
+    ) -> QuerySet[User]:
+        """Return users that have permission "perm".
+
+        Contrary to the base django method, superusers aren't included in the
+        result.
+        This is because the OR operation to include superusers in the query result
+        utterly destroy the query performances on postgres
+        (it makes it like 1000x slower, and I'm not even kidding).
+        To overcome that, we could use a UNION instead, but then we wouldn't
+        be able to perform further filter operations on the queryset.
+        Thus, the `include_superusers` argument is not used at all.
+
+        Because of that, it is useless to set `include_superusers`,
+        as it will be silently ignored.
+        The only reason it's still there is not to break the interface
+        of the base class.
+        """
+        if isinstance(perm, str):
+            try:
+                app_label, codename = perm.split(".")
+            except ValueError as e:
+                raise ValueError(
+                    "Permission name should be in the form "
+                    "app_label.permission_codename."
+                ) from e
+            permission_q = Q(codename=codename, content_type__app_label=app_label)
+        elif isinstance(perm, Permission):
+            permission_q = Q(pk=perm.pk)
+        else:
+            raise TypeError(
+                "The `perm` argument must be a string or a permission instance."
+            )
+
+        user_q = Exists(
+            Permission.objects.filter(
+                Q(group__group__users=OuterRef("pk")) | Q(user=OuterRef("pk")),
+                permission_q,
+            )
+        )
+        if is_active is not None:
+            user_q &= Q(is_active=is_active)
+        return User.objects.filter(user_q)

core/management/commands/populate.py

@@ -28,7 +28,6 @@ from typing import ClassVar, NamedTuple
 from django.conf import settings
 from django.contrib.auth.models import Permission
 from django.contrib.sites.models import Site
-from django.core.files.base import ContentFile
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
 from django.db import connection
@@ -121,21 +120,15 @@ class Command(BaseCommand):
         )
         self.profiles_root = SithFile.objects.create(name="profiles", owner=root)
         home_root = SithFile.objects.create(name="users", owner=root)
+
+        # Page needed for club creation
+        p = Page(name=settings.SITH_CLUB_ROOT_PAGE)
+        p.save(force_lock=True)
+
         club_root = SithFile.objects.create(name="clubs", owner=root)
         sas = SithFile.objects.create(
             name="SAS", owner=root, id=settings.SITH_SAS_ROOT_DIR_ID
         )
-        SithFile.objects.create(
-            name="CGU",
-            is_folder=False,
-            file=ContentFile(
-                content="Conditions générales d'utilisation", name="cgu.txt"
-            ),
-            owner=root,
-        )
-        # Page needed for club creation
-        p = Page(name=settings.SITH_CLUB_ROOT_PAGE)
-        p.save(force_lock=True)
         clubs = self._create_clubs()
 
         self.reset_index("club")
@@ -754,6 +747,7 @@ class Command(BaseCommand):
                     "add_subscription",
                     "add_membership",
                     "view_hidden_user",
+                    "add_refilling",
                 ]
             )
         )

core/migrations/0051_user_eula_approved.py

@@ -1,15 +0,0 @@
-# Generated by Django 5.2.17 on 2026-09-15 11:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0050_alter_sithfile_moderator")]
-
-    operations = [
-        migrations.AddField(
-            model_name="user",
-            name="cgu_approved",
-            field=models.BooleanField(default=False, verbose_name="EULA approved"),
-        ),
-    ]

core/models.py

@@ -291,7 +291,6 @@ class User(AbstractUser):
         ),
         blank=True,
     )
-    cgu_approved = models.BooleanField(_("EULA approved"), default=False)
     godfathers = models.ManyToManyField("User", related_name="godchildren", blank=True)
 
     objects = CustomUserManager()

core/static/user/login.scss

@@ -49,29 +49,67 @@ body {
       max-width: 500px;
       margin-top: 20px;
 
-      input[type="submit"] {
+      >p,
+      >div {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
         width: 100%;
-        max-width: 300px;
         margin: 0;
+
+        >label {
+          width: 100%;
+
+          @media (min-width: 500px) {
+            width: 300px;
+          }
+        }
       }
 
-      .errorlist {
+      >input,
+      >p>input,
+      >div>input {
+        box-sizing: border-box;
+        width: 100%;
+        max-width: 500px;
+
+        @media (min-width: 500px) {
+          max-width: 300px;
+        }
+      }
+
+      >.errorlist {
         color: red;
         text-align: center;
         margin: 10px 0 0 0;
         list-style-type: none;
       }
 
-      div, fieldset {
-        max-width: 300px;
+      >.required>.helptext {
+        text-align: center;
+        font-style: italic;
       }
-      .captcha {
+
+      >.required:last-of-type {
         box-sizing: border-box;
+        max-width: 300px;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-between;
+
+        >label {
+          width: 100%;
+        }
 
         >img {
           width: 70px;
           object-fit: contain;
         }
+
+        >input {
+          width: 200px;
+        }
       }
     }
   }

core/templates/core/login.jinja

@@ -50,12 +50,13 @@
     <input type="hidden" name="next" value="{{ next }}">
     <input type="submit" value="{% trans %}Login{% endtrans %}">
 
-    <div>
+
+        {# Assumes you setup the password_reset view in your URLconf #}
+    <p>
       <a href="{{ url('core:password_reset') }}">{% trans %}Lost password?{% endtrans %}</a>
-    </div>
-    <div>
+      &nbsp;&nbsp;
       <a href="{{ url('core:register') }}">{% trans %}Create account{% endtrans %}</a>
-    </div>
+    </p>
   </form>
 {% endblock %}
 

core/templates/core/register.jinja

@@ -18,17 +18,7 @@
   <form action="{{ url('core:register') }}" method="post">
     {% csrf_token %}
     {% render_honeypot_field %}
-    {% for field in form %}
-      {% if field.name not in ["cgu_approved", "captcha"] %}
-        <div>{{ field.as_field_group() }}</div>
-      {% endif %}
-    {% endfor %}
-    <div class="captcha">{{ form.captcha.as_field_group() }}</div>
-    <fieldset>
-      {{ form.cgu_approved.errors }}
-      {{ form.cgu_approved }}
-      {{ form.cgu_approved.label_tag() }}
-    </fieldset>
-    <input type="submit" class="btn btn-blue" value="{% trans %}Register{% endtrans %}" />
+    {{ form.as_p() }}
+    <input type="submit" value="{% trans %}Register{% endtrans %}" />
   </form>
 {% endblock %}

core/tests/test_auth_backend.py

@@ -0,0 +1,27 @@
+import pytest
+from django.contrib.auth.models import Permission
+from model_bakery import baker
+
+from core.models import Group, User
+
+
+@pytest.mark.django_db
+def test_with_perm():
+    """Test that `SithModelBackend.with_perm` works as intended."""
+    perms = baker.make(Permission, _quantity=4)
+    groups = baker.make(Group, _quantity=2)
+    groups[0].permissions.set(perms[0:2])
+    groups[1].permissions.set(perms[2:4])
+    users = [
+        baker.make(User),
+        baker.make(User, groups=[groups[0]]),
+        baker.make(User, groups=[groups[1]]),
+        baker.make(User, user_permissions=[perms[0]]),
+        baker.make(User, user_permissions=[perms[2]]),
+        baker.make(User, groups=[groups[1]], user_permissions=[perms[0]]),
+    ]
+
+    expected = [users[1], users[3], users[5]]
+    assert list(User.objects.with_perm(perms[0])) == expected
+    str_repr = f"{perms[0].content_type.app_label}.{perms[0].codename}"
+    assert list(User.objects.with_perm(str_repr)) == expected

core/tests/test_core.py

@@ -55,7 +55,6 @@ class TestUserRegistration:
             "password2": "plop",
             "captcha_0": "dummy-value",
             "captcha_1": "PASSED",
-            "cgu_approved": True,
         }
 
     @pytest.fixture()
@@ -93,7 +92,6 @@ class TestUserRegistration:
             ({"first_name": ""}, "Ce champ est obligatoire."),
             ({"last_name": ""}, "Ce champ est obligatoire."),
             ({"captcha_1": "WRONG_CAPTCHA"}, "CAPTCHA invalide"),
-            ({"cgu_approved": ""}, "Ce champ est obligatoire."),
         ],
     )
     def test_register_user_form_fail(

core/views/forms.py

@@ -42,8 +42,6 @@ from django.forms import (
     TextInput,
     Widget,
 )
-from django.urls import reverse
-from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
@@ -148,25 +146,9 @@ class RegisteringForm(UserCreationForm):
 
     class Meta:
         model = User
-        fields = ("first_name", "last_name", "email", "cgu_approved")
+        fields = ("first_name", "last_name", "email")
         field_classes = {"email": AntiSpamEmailField}
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["cgu_approved"].required = True
-        self.fields["cgu_approved"].label_suffix = ""
-        self.fields["cgu_approved"].label = mark_safe(
-            _(
-                "I have read and I approve the "
-                '<a href="%(url)s" target="_blank">End User License Agreement</a>'
-            )
-            % {
-                "url": reverse(
-                    "core:download", kwargs={"file_id": settings.SITH_CGU_FILE_ID}
-                )
-            }
-        )
-
 
 class UserProfileForm(forms.ModelForm):
     """Form handling the user profile, managing the files"""

counter/migrations/0012_auto_20170515_2202.py

@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
             model_name="permanency",
             name="end",
             field=models.DateTimeField(
-                db_index=True, verbose_name="end date", null=True, blank=True
+                db_index=True, verbose_name="end date", null=True
             ),
         )
     ]

counter/migrations/0019_billinginfo.py

@@ -6,7 +6,9 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-    dependencies = [("counter", "0018_producttype_priority")]
+    dependencies = [
+        ("counter", "0018_producttype_priority"),
+    ]
 
     operations = [
         migrations.AlterModelOptions(

counter/migrations/0020_auto_20221215_1709.py

@@ -6,7 +6,9 @@ import counter.fields
 
 
 class Migration(migrations.Migration):
-    dependencies = [("counter", "0019_billinginfo")]
+    dependencies = [
+        ("counter", "0019_billinginfo"),
+    ]
 
     operations = [
         migrations.AlterField(

counter/models.py

@@ -669,13 +669,18 @@ class Counter(models.Model):
         """Update the barman activity to prevent timeout."""
         self.permanencies.filter(end=None).update(activity=timezone.now())
 
+    @cached_property
     def can_refill(self) -> bool:
-        """Show if the counter authorize the refilling with physic money."""
-        if self.type != "BAR":
-            return False
-        # at least one of the barmen is in the AE board
-        ae = Club.objects.get(id=settings.SITH_MAIN_CLUB_ID)
-        return any(ae.get_membership_for(barman) for barman in self.barmen_list)
+        """Show if the counter authorize the refilling with physic money.
+
+        Refills are authorized if a user having the required permission
+        is currently logged in.
+        """
+        return self.type == "BAR" and (
+            User.objects.with_perm("counter.add_refilling")
+            .filter(id__in=[u.id for u in self.barmen_list])
+            .exists()
+        )
 
     def get_top_barmen(self) -> QuerySet:
         """Return a QuerySet querying the office hours stats of all the barmen of all time

counter/tests/test_counter.py

@@ -108,6 +108,13 @@ class TestFullClickBase(TestCase):
 
 
 class TestRefilling(TestFullClickBase):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.board_admin.user_permissions.add(
+            Permission.objects.get(codename="add_refilling")
+        )
+
     def login_in_bar(self, barmen: User | None = None):
         used_barman = barmen if barmen is not None else self.board_admin
         self.client.post(
@@ -147,7 +154,7 @@ class TestRefilling(TestFullClickBase):
         assert self.updated_amount(self.customer) == 0
 
     def test_refilling_no_refer_fail(self):
-        """Check that the refill fails is the HTTP_REFERER header is missing"""
+        """Check that the refill fails if the HTTP_REFERER header is missing"""
 
         def refill():
             return self.client.post(

counter/views/click.py

@@ -204,7 +204,7 @@ class CounterClick(
             res["student_card_fragment"] = StudentCardFormFragment.as_fragment()(
                 self.request, customer=self.customer
             )
-        if self.object.can_refill():
+        if self.object.can_refill:
             res["refilling_fragment"] = RefillingCreateView.as_fragment()(
                 self.request, customer=self.customer, counter=self.object
             )
@@ -250,7 +250,7 @@ class RefillingCreateView(FragmentMixin, CreateView):
         if not (
             request.barmen
             and request.barmen.issubset(self.counter.barmen_list)
-            and self.counter.can_refill()
+            and self.counter.can_refill
         ):
             raise PermissionDenied
 

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-09-15 23:49+0200\n"
+"POT-Creation-Date: 2026-09-09 07:21+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -1835,10 +1835,6 @@ msgstr ""
 "Même si ce profil est caché, les utilisateurs sur cette liste pourront "
 "toujours le voir."
 
-#: core/models.py
-msgid "EULA approved"
-msgstr "CGU approuvées"
-
 #: core/models.py
 msgid "A user with that username already exists"
 msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
@@ -3141,15 +3137,6 @@ msgstr "Assurez-vous que cet horodatage est dans le futur"
 msgid "Username, email, or account number"
 msgstr "Nom d'utilisateur, email, ou numéro de compte AE"
 
-#: core/views/forms.py
-#, python-format
-msgid ""
-"I have read and I approve the <a href=\"%(url)s\" target=\"_blank\">End User "
-"License Agreement</a>"
-msgstr ""
-"J'ai lu et j'approuve les <a href=\"%(url)s\" target=\"_blank\">Conditions "
-"Générales d'utilisation</a>"
-
 #: core/views/forms.py
 msgid ""
 "Profile: you need to be visible on the picture, in order to be recognized "
@@ -3791,8 +3778,8 @@ msgid "Emptied"
 msgstr "Coffre vidé"
 
 #: counter/templates/counter/cash_summary_list.jinja counter/views/cash.py
-#: pedagogy/templates/pedagogy/fragments/ue_comment_form.jinja
 #: pedagogy/templates/pedagogy/moderation.jinja
+#: pedagogy/templates/pedagogy/ue_detail.jinja
 #: trombi/templates/trombi/comment.jinja
 #: trombi/templates/trombi/user_tools.jinja
 msgid "Comment"

sith/settings.py

@@ -417,8 +417,6 @@ SITH_FORUM_PAGE_LENGTH = 30
 SITH_SAS_ROOT_DIR_ID = env.int("SITH_SAS_ROOT_DIR_ID", default=4)
 SITH_SAS_IMAGES_PER_PAGE = 60
 
-SITH_CGU_FILE_ID = env.int("SITH_CGU_FILE_ID", default=5)
-
 SITH_PROFILE_DEPARTMENTS = [
     ("TC", _("TC")),
     ("IMSI", _("IMSI")),