Bump tar and @hey-api/openapi-ts

Removes [tar](https://github.com/isaacs/node-tar). It's no longer used after updating ancestor dependency [@hey-api/openapi-ts](https://github.com/hey-api/openapi-ts). These dependencies need to be updated together.


Removes `tar`

Updates `@hey-api/openapi-ts` from 0.73.0 to 0.90.10
- [Release notes](https://github.com/hey-api/openapi-ts/releases)
- [Changelog](https://github.com/hey-api/openapi-ts/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/hey-api/openapi-ts/compare/@hey-api/openapi-ts@0.73.0...@hey-api/openapi-ts@0.90.10)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 
  dependency-type: indirect
- dependency-name: "@hey-api/openapi-ts"
  dependency-version: 0.90.10
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

club/schemas.py

@@ -1,16 +1,18 @@
 from typing import Annotated
 
+from annotated_types import MinLen
 from django.db.models import Q
-from ninja import FilterLookup, FilterSchema, ModelSchema
+from ninja import Field, FilterSchema, ModelSchema
 
 from club.models import Club, Membership
-from core.schemas import NonEmptyStr, SimpleUserSchema
+from core.schemas import SimpleUserSchema
 
 
 class ClubSearchFilterSchema(FilterSchema):
-    search: Annotated[NonEmptyStr | None, FilterLookup("name__icontains")] = None
+    search: Annotated[str, MinLen(1)] | None = Field(None, q="name__icontains")
     is_active: bool | None = None
     parent_id: int | None = None
+    parent_name: str | None = Field(None, q="parent__name__icontains")
     exclude_ids: set[int] | None = None
 
     def filter_exclude_ids(self, value: set[int] | None):

com/ics_calendar.py

@@ -4,16 +4,15 @@ from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.contrib.syndication.views import add_domain
-from django.db.models import Count, OuterRef, QuerySet, Subquery
+from django.db.models import F, QuerySet
 from django.http import HttpRequest
 from django.urls import reverse
 from django.utils import timezone
 from ical.calendar import Calendar
 from ical.calendar_stream import IcsCalendarStream
 from ical.event import Event
-from ical.types import Frequency, Recur
 
-from com.models import News, NewsDate
+from com.models import NewsDate
 from core.models import User
 
 
@@ -43,9 +42,9 @@ class IcsCalendar:
         with open(cls._INTERNAL_CALENDAR, "wb") as f:
             _ = f.write(
                 cls.ics_from_queryset(
-                    News.objects.filter(
+                    NewsDate.objects.filter(
-                        is_published=True,
+                        news__is_published=True,
-                        dates__end_date__gte=timezone.now() - relativedelta(months=6),
+                        end_date__gte=timezone.now() - (relativedelta(months=6)),
                     )
                 )
             )
@@ -54,35 +53,24 @@ class IcsCalendar:
     @classmethod
     def get_unpublished(cls, user: User) -> bytes:
         return cls.ics_from_queryset(
-            News.objects.viewable_by(user).filter(
+            NewsDate.objects.viewable_by(user).filter(
-                is_published=False,
+                news__is_published=False,
-                dates__end_date__gte=timezone.now() - relativedelta(months=6),
+                end_date__gte=timezone.now() - (relativedelta(months=6)),
-            )
+            ),
         )
 
     @classmethod
-    def ics_from_queryset(cls, queryset: QuerySet[News]) -> bytes:
+    def ics_from_queryset(cls, queryset: QuerySet[NewsDate]) -> bytes:
         calendar = Calendar()
-        date_subquery = NewsDate.objects.filter(news=OuterRef("pk")).order_by(
+        for news_date in queryset.annotate(news_title=F("news__title")):
-            "start_date"
-        )
-        queryset = queryset.annotate(
-            start=Subquery(date_subquery.values("start_date")[:1]),
-            end=Subquery(date_subquery.values("end_date")[:1]),
-            nb_dates=Count("dates"),
-        )
-        for news in queryset:
             event = Event(
-                summary=news.title,
+                summary=news_date.news_title,
-                description=news.summary,
+                start=news_date.start_date,
-                dtstart=news.start,
+                end=news_date.end_date,
-                dtend=news.end,
                 url=as_absolute_url(
-                    reverse("com:news_detail", kwargs={"news_id": news.id})
+                    reverse("com:news_detail", kwargs={"news_id": news_date.news_id})
                 ),
             )
-            if news.nb_dates > 1:
-                event.rrule = Recur(freq=Frequency.WEEKLY, count=news.nb_dates)
             calendar.events.append(event)
 
         return IcsCalendarStream.calendar_to_ics(calendar).encode("utf-8")

com/schemas.py

@@ -1,9 +1,9 @@
 from datetime import datetime
-from typing import Annotated
 
-from ninja import FilterLookup, FilterSchema, ModelSchema
+from ninja import FilterSchema, ModelSchema
 from ninja_extra import service_resolver
 from ninja_extra.context import RouteContext
+from pydantic import Field
 
 from club.schemas import ClubProfileSchema
 from com.models import News, NewsDate
@@ -11,12 +11,12 @@ from core.markdown import markdown
 
 
 class NewsDateFilterSchema(FilterSchema):
-    before: Annotated[datetime | None, FilterLookup("end_date__lt")] = None
+    before: datetime | None = Field(None, q="end_date__lt")
-    after: Annotated[datetime | None, FilterLookup("start_date__gt")] = None
+    after: datetime | None = Field(None, q="start_date__gt")
-    club_id: Annotated[int | None, FilterLookup("news__club_id")] = None
+    club_id: int | None = Field(None, q="news__club_id")
     news_id: int | None = None
-    is_published: Annotated[bool | None, FilterLookup("news__is_published")] = None
+    is_published: bool | None = Field(None, q="news__is_published")
-    title: Annotated[str | None, FilterLookup("news__title__icontains")] = None
+    title: str | None = Field(None, q="news__title__icontains")
 
 
 class NewsSchema(ModelSchema):

com/static/bundled/com/components/ics-calendar-index.ts

@@ -1,6 +1,6 @@
 import { makeUrl } from "#core:utils/api";
 import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
-import { Calendar, type EventClickArg, type EventContentArg } from "@fullcalendar/core";
+import { Calendar, type EventClickArg } from "@fullcalendar/core";
 import type { EventImpl } from "@fullcalendar/core/internal";
 import enLocale from "@fullcalendar/core/locales/en-gb";
 import frLocale from "@fullcalendar/core/locales/fr";
@@ -25,11 +25,6 @@ export class IcsCalendar extends inheritHtmlElement("div") {
   private canDelete = false;
   private helpUrl = "";
 
-  // Hack variable to detect recurring events
-  // The underlying ics library doesn't include any info about rrules
-  // That's why we have to detect those events ourselves
-  private recurrenceMap: Map<string, EventImpl> = new Map();
-
   attributeChangedCallback(name: string, _oldValue?: string, newValue?: string) {
     if (name === "locale") {
       this.locale = newValue;
@@ -100,7 +95,6 @@ export class IcsCalendar extends inheritHtmlElement("div") {
 
   refreshEvents() {
     this.click(); // Remove focus from popup
-    this.recurrenceMap.clear(); // Avoid double detection of the same non recurring event
     this.calendar.refetchEvents();
   }
 
@@ -159,24 +153,12 @@ export class IcsCalendar extends inheritHtmlElement("div") {
   }
 
   async getEventSources() {
-    const tagRecurringEvents = (eventData: EventImpl) => {
-      // This functions tags events with a similar event url
-      // We rely on the fact that the event url is always the same
-      // for recurring events and always different for single events
-      const firstEvent = this.recurrenceMap.get(eventData.url);
-      if (firstEvent !== undefined) {
-        eventData.extendedProps.isRecurring = true;
-        firstEvent.extendedProps.isRecurring = true; // Don't forget the first event
-      }
-      this.recurrenceMap.set(eventData.url, eventData);
-    };
     return [
       {
         url: `${await makeUrl(calendarCalendarInternal)}`,
         format: "ics",
         className: "internal",
         cache: false,
-        eventDataTransform: tagRecurringEvents,
       },
       {
         url: `${await makeUrl(calendarCalendarUnpublished)}`,
@@ -184,7 +166,6 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         color: "red",
         className: "unpublished",
         cache: false,
-        eventDataTransform: tagRecurringEvents,
       },
     ];
   }
@@ -380,14 +361,6 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         event.jsEvent.preventDefault();
         this.createEventDetailPopup(event);
       },
-      eventClassNames: (classNamesEvent: EventContentArg) => {
-        const classes: string[] = [];
-        if (classNamesEvent.event.extendedProps?.isRecurring) {
-          classes.push("recurring");
-        }
-
-        return classes;
-      },
     });
     this.calendar.render();
 

com/static/com/components/ics-calendar.scss

@@ -18,8 +18,6 @@
   --event-details-border-radius: 4px;
   --event-details-box-shadow: 0px 6px 20px 4px rgb(0 0 0 / 16%);
   --event-details-max-width: 600px;
-  --event-recurring-internal-color: #6f69cd;
-  --event-recurring-unpublished-color: orange;
 }
 
 ics-calendar {
@@ -148,29 +146,4 @@ ics-calendar {
 .tooltip.calendar-copy-tooltip.text-copied {
   opacity: 0;
   transition: opacity 500ms ease-out;
-}
+}
-
-// We have to override the color set by the lib in the html
-// Hence the !important tag everywhere
-.internal.recurring {
-  .fc-daygrid-event-dot {
-    border-color: var(--event-recurring-internal-color) !important;
-  }
-
-  &.fc-daygrid-block-event {
-    background-color: var(--event-recurring-internal-color) !important;
-    border-color: var(--event-recurring-internal-color) !important;
-  }
-
-}
-
-.unpublished.recurring {
-  .fc-daygrid-event-dot {
-    border-color: var(--event-recurring-unpublished-color) !important;
-  }
-
-  &.fc-daygrid-block-event {
-    background-color: var(--event-recurring-unpublished-color) !important;
-    border-color: var(--event-recurring-unpublished-color) !important;
-  }
-}

com/templates/com/news_list.jinja

@@ -203,7 +203,7 @@
           <ul>
             <li>
               <i class="fa-solid fa-graduation-cap fa-xl"></i>
-              <a href="{{ url("pedagogy:guide") }}">{% trans %}UE Guide{% endtrans %}</a>
+              <a href="{{ url("pedagogy:guide") }}">{% trans %}UV Guide{% endtrans %}</a>
             </li>
             <li>
               <i class="fa-solid fa-calendar-days fa-xl"></i>
@@ -211,7 +211,7 @@
             </li>
             <li>
               <i class="fa-solid fa-magnifying-glass fa-xl"></i>
-              <a href="{{ url("matmat:search") }}">{% trans %}Matmatronch{% endtrans %}</a>
+              <a href="{{ url("matmat:search_clear") }}">{% trans %}Matmatronch{% endtrans %}</a>
             </li>
             <li>
               <i class="fa-solid fa-check-to-slot fa-xl"></i>

core/admin.py

@@ -98,9 +98,9 @@ class PageAdmin(admin.ModelAdmin):
 
 @admin.register(SithFile)
 class SithFileAdmin(admin.ModelAdmin):
-    list_display = ("name", "owner", "size", "date")
+    list_display = ("name", "owner", "size", "date", "is_in_sas")
     autocomplete_fields = ("parent", "owner", "moderator")
-    search_fields = ("name",)
+    search_fields = ("name", "parent__name")
 
 
 @admin.register(OperationLog)

core/api.py

@@ -110,7 +110,7 @@ class SithFileController(ControllerBase):
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_files(self, search: Annotated[str, MinLen(1)]):
-        return SithFile.objects.filter(name__icontains=search)
+        return SithFile.objects.filter(is_in_sas=False).filter(name__icontains=search)
 
 
 @api_controller("/group")

core/management/commands/populate.py

@@ -44,7 +44,7 @@ from core.utils import resize_image
 from counter.models import Counter, Product, ProductType, ReturnableProduct, StudentCard
 from election.models import Candidature, Election, ElectionList, Role
 from forum.models import Forum
-from pedagogy.models import UE
+from pedagogy.models import UV
 from sas.models import Album, PeoplePictureRelation, Picture
 from subscription.models import Subscription
 
@@ -110,6 +110,7 @@ class Command(BaseCommand):
         p.save(force_lock=True)
 
         club_root = SithFile.objects.create(name="clubs", owner=root)
+        sas = SithFile.objects.create(name="SAS", owner=root)
         main_club = Club.objects.create(
             id=1, name="AE", address="6 Boulevard Anatole France, 90000 Belfort"
         )
@@ -660,20 +661,20 @@ class Command(BaseCommand):
 
         # Create some data for pedagogy
 
-        UE(
+        UV(
             code="PA00",
             author=User.objects.get(id=0),
-            credit_type=settings.SITH_PEDAGOGY_UE_TYPE[3][0],
+            credit_type=settings.SITH_PEDAGOGY_UV_TYPE[3][0],
             manager="Laurent HEYBERGER",
-            semester=settings.SITH_PEDAGOGY_UE_SEMESTER[3][0],
+            semester=settings.SITH_PEDAGOGY_UV_SEMESTER[3][0],
-            language=settings.SITH_PEDAGOGY_UE_LANGUAGE[0][0],
+            language=settings.SITH_PEDAGOGY_UV_LANGUAGE[0][0],
             department=settings.SITH_PROFILE_DEPARTMENTS[-2][0],
             credits=5,
             title="Participation dans une association étudiante",
             objectives="* Permettre aux étudiants de réaliser, pendant un semestre, un projet culturel ou associatif et de le valoriser.",
             program="""* Semestre précédent proposition d'un projet et d'un cahier des charges
 * Evaluation par un jury de six membres
-* Si accord réalisation dans le cadre de l'UE
+* Si accord réalisation dans le cadre de l'UV
 * Compte-rendu de l'expérience
 * Présentation""",
             skills="""* Gérer un projet associatif ou une action éducative en autonomie:
@@ -693,21 +694,33 @@ class Command(BaseCommand):
         # SAS
         for f in self.SAS_FIXTURE_PATH.glob("*"):
             if f.is_dir():
-                album = Album.objects.create(name=f.name, is_moderated=True)
+                album = Album(
+                    parent=sas,
+                    name=f.name,
+                    owner=root,
+                    is_folder=True,
+                    is_in_sas=True,
+                    is_moderated=True,
+                )
+                album.clean()
+                album.save()
                 for p in f.iterdir():
                     file = resize_image(Image.open(p), 1000, "WEBP")
                     pict = Picture(
                         parent=album,
                         name=p.name,
-                        original=file,
+                        file=file,
                         owner=root,
+                        is_folder=False,
+                        is_in_sas=True,
                         is_moderated=True,
+                        mime_type="image/webp",
+                        size=file.size,
                     )
-                    pict.original.name = pict.name
+                    pict.file.name = p.name
-                    pict.generate_thumbnails()
                     pict.full_clean()
+                    pict.generate_thumbnails()
                     pict.save()
-                album.generate_thumbnail()
 
         img_skia = Picture.objects.get(name="skia.jpg")
         img_sli = Picture.objects.get(name="sli.jpg")
@@ -777,16 +790,16 @@ class Command(BaseCommand):
 
         subscribers = Group.objects.create(name="Cotisants")
         subscribers.permissions.add(
-            *list(perms.filter(codename__in=["add_news", "add_uecomment"]))
+            *list(perms.filter(codename__in=["add_news", "add_uvcomment"]))
         )
         old_subscribers = Group.objects.create(name="Anciens cotisants")
         old_subscribers.permissions.add(
             *list(
                 perms.filter(
                     codename__in=[
-                        "view_ue",
+                        "view_uv",
-                        "view_uecomment",
+                        "view_uvcomment",
-                        "add_uecommentreport",
+                        "add_uvcommentreport",
                         "view_user",
                         "view_picture",
                         "view_album",
@@ -862,7 +875,7 @@ class Command(BaseCommand):
         pedagogy_admin.permissions.add(
             *list(
                 perms.filter(content_type__app_label="pedagogy")
-                .exclude(codename__in=["change_uecomment"])
+                .exclude(codename__in=["change_uvcomment"])
                 .values_list("pk", flat=True)
             )
         )

core/management/commands/populate_more.py

@@ -23,7 +23,7 @@ from counter.models import (
     Selling,
 )
 from forum.models import Forum, ForumMessage, ForumTopic
-from pedagogy.models import UE
+from pedagogy.models import UV
 from subscription.models import Subscription
 
 
@@ -74,7 +74,7 @@ class Command(BaseCommand):
             random.sample(old_subscribers, k=min(80, len(old_subscribers))),
         )
         self.stdout.write("Creating uvs...")
-        self.create_ues()
+        self.create_uvs()
         self.stdout.write("Creating products...")
         self.create_products()
         self.stdout.write("Creating sales and refills...")
@@ -192,7 +192,7 @@ class Command(BaseCommand):
         memberships = Membership.objects.bulk_create(memberships)
         Membership._add_club_groups(memberships)
 
-    def create_ues(self):
+    def create_uvs(self):
         root = User.objects.get(username="root")
         categories = ["CS", "TM", "OM", "QC", "EC"]
         branches = ["TC", "GMC", "GI", "EDIM", "E", "IMSI", "HUMA"]
@@ -207,7 +207,7 @@ class Command(BaseCommand):
                 + str(random.randint(10, 90))
             )
             uvs.append(
-                UE(
+                UV(
                     code=code,
                     author=root,
                     manager=random.choice(teachers),
@@ -229,7 +229,7 @@ class Command(BaseCommand):
                     hours_TE=random.randint(15, 40),
                 )
             )
-        UE.objects.bulk_create(uvs, ignore_conflicts=True)
+        UV.objects.bulk_create(uvs, ignore_conflicts=True)
 
     def create_products(self):
         categories = [
@@ -350,6 +350,7 @@ class Command(BaseCommand):
                         date=make_aware(
                             self.faker.date_time_between(customer.since, localdate())
                         ),
+                        is_validated=True,
                     )
                 )
             sales.extend(this_customer_sales)

core/migrations/0048_remove_sithfiles.py

@@ -1,27 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-26 15:01
-
-from typing import TYPE_CHECKING
-
-from django.db import migrations
-from django.db.migrations.state import StateApps
-
-if TYPE_CHECKING:
-    import core.models
-
-
-def remove_sas_sithfiles(apps: StateApps, schema_editor):
-    SithFile: type[core.models.SithFile] = apps.get_model("core", "SithFile")
-    SithFile.objects.filter(is_in_sas=True).delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0047_alter_notification_date_alter_notification_type"),
-        ("sas", "0007_alter_peoplepicturerelation_picture_and_more"),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            remove_sas_sithfiles, reverse_code=migrations.RunPython.noop, elidable=True
-        )
-    ]

core/migrations/0049_remove_sithfile_is_in_sas.py

@@ -1,9 +0,0 @@
-# Generated by Django 4.2.17 on 2025-02-14 11:58
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0048_remove_sithfiles")]
-
-    operations = [migrations.RemoveField(model_name="sithfile", name="is_in_sas")]

core/models.py

@@ -38,6 +38,7 @@ from django.contrib.auth.models import AnonymousUser as AuthAnonymousUser
 from django.contrib.auth.models import Group as AuthGroup
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core import validators
+from django.core.cache import cache
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.core.files import File
 from django.core.files.base import ContentFile
@@ -76,6 +77,16 @@ class Group(AuthGroup):
     def get_absolute_url(self) -> str:
         return reverse("core:group_list")
 
+    def save(self, *args, **kwargs) -> None:
+        super().save(*args, **kwargs)
+        cache.set(f"sith_group_{self.id}", self)
+        cache.set(f"sith_group_{self.name.replace(' ', '_')}", self)
+
+    def delete(self, *args, **kwargs) -> None:
+        super().delete(*args, **kwargs)
+        cache.delete(f"sith_group_{self.id}")
+        cache.delete(f"sith_group_{self.name.replace(' ', '_')}")
+
 
 def validate_promo(value: int) -> None:
     last_promo = get_last_promo()
@@ -833,6 +844,9 @@ class SithFile(models.Model):
         on_delete=models.CASCADE,
     )
     asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
+    is_in_sas = models.BooleanField(
+        _("is in the SAS"), default=False, db_index=True
+    )  # Allows to query this flag, updated at each call to save()
 
     class Meta:
         verbose_name = _("file")
@@ -841,10 +855,22 @@ class SithFile(models.Model):
         return self.get_parent_path() + "/" + self.name
 
     def save(self, *args, **kwargs):
+        sas = SithFile.objects.filter(id=settings.SITH_SAS_ROOT_DIR_ID).first()
+        self.is_in_sas = sas in self.get_parent_list() or self == sas
         adding = self._state.adding
         super().save(*args, **kwargs)
         if adding:
             self.copy_rights()
+        if self.is_in_sas:
+            for user in User.objects.filter(
+                groups__id__in=[settings.SITH_GROUP_SAS_ADMIN_ID]
+            ):
+                Notification(
+                    user=user,
+                    url=reverse("sas:moderation"),
+                    type="SAS_MODERATION",
+                    param="1",
+                ).save()
 
     def is_owned_by(self, user: User) -> bool:
         if user.is_anonymous:
@@ -857,6 +883,8 @@ class SithFile(models.Model):
             return user.is_board_member
         if user.is_com_admin:
             return True
+        if self.is_in_sas and user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
+            return True
         return user.id == self.owner_id
 
     def can_be_viewed_by(self, user: User) -> bool:
@@ -883,6 +911,8 @@ class SithFile(models.Model):
         super().clean()
         if "/" in self.name:
             raise ValidationError(_("Character '/' not authorized in name"))
+        if self == self.parent:
+            raise ValidationError(_("Loop in folder tree"), code="loop")
         if self == self.parent or (
             self.parent is not None and self in self.get_parent_list()
         ):
@@ -963,6 +993,18 @@ class SithFile(models.Model):
     def is_file(self):
         return not self.is_folder
 
+    @cached_property
+    def as_picture(self):
+        from sas.models import Picture
+
+        return Picture.objects.filter(id=self.id).first()
+
+    @cached_property
+    def as_album(self):
+        from sas.models import Album
+
+        return Album.objects.filter(id=self.id).first()
+
     def get_parent_list(self):
         parents = []
         current = self.parent

core/schemas.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from pathlib import Path
 from typing import Annotated, Any
 
@@ -9,14 +8,12 @@ from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.translation import gettext as _
 from haystack.query import SearchQuerySet
-from ninja import FilterLookup, FilterSchema, ModelSchema, Schema, UploadedFile
+from ninja import FilterSchema, ModelSchema, Schema, UploadedFile
-from pydantic import AliasChoices, Field, field_validator
+from pydantic import AliasChoices, Field
 from pydantic_core.core_schema import ValidationInfo
 
 from core.models import Group, QuickUploadImage, SithFile, User
-from core.utils import get_last_promo, is_image
+from core.utils import is_image
-
-NonEmptyStr = Annotated[str, MinLen(1)]
 
 
 class UploadedImage(UploadedFile):
@@ -110,11 +107,7 @@ class GroupSchema(ModelSchema):
 
 
 class UserFilterSchema(FilterSchema):
-    search: Annotated[str, MinLen(1)] | None = None
+    search: Annotated[str, MinLen(1)]
-    role: Annotated[str, FilterLookup("role__icontains")] | None = None
-    department: str | None = None
-    promo: int | None = None
-    date_of_birth: datetime | None = None
     exclude: list[int] | None = Field(
         None, validation_alias=AliasChoices("exclude", "exclude[]")
     )
@@ -143,13 +136,6 @@ class UserFilterSchema(FilterSchema):
             return Q()
         return ~Q(id__in=value)
 
-    @field_validator("promo", mode="after")
-    @classmethod
-    def validate_promo(cls, value: int) -> int:
-        if not 0 < value <= get_last_promo():
-            raise ValueError(f"{value} is not a valid promo")
-        return value
-
 
 class MarkdownSchema(Schema):
     text: str

core/static/bundled/htmx-index.js

@@ -1,11 +1,11 @@
 import htmx from "htmx.org";
 
 document.body.addEventListener("htmx:beforeRequest", (event) => {
-  event.detail.target.ariaBusy = true;
+  event.target.ariaBusy = true;
 });
 
-document.body.addEventListener("htmx:beforeSwap", (event) => {
+document.body.addEventListener("htmx:afterRequest", (event) => {
-  event.detail.target.ariaBusy = null;
+  event.originalTarget.ariaBusy = null;
 });
 
 Object.assign(window, { htmx });

core/static/core/forms.scss

@@ -143,15 +143,6 @@ form {
   line-height: 1;
   white-space: nowrap;
 
-  .fields-centered {
-    padding: 10px 10px 0;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    gap: var(--nf-input-size) 10px;
-    justify-content: center;
-  }
-
   .helptext {
     margin-top: .25rem;
     margin-bottom: .25rem;

core/static/user/user_edit.scss

@@ -114,6 +114,15 @@
     }
   }
 
+  &-fields {
+    padding: 10px 10px 0;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: var(--nf-input-size) 10px;
+    justify-content: center;
+  }
+
   &-field {
     display: flex;
     flex-wrap: wrap;

core/static/user/user_godfathers.scss

@@ -195,18 +195,18 @@
           }
         }
       }
-    }
 
-    form .link-like {
+      &.delete {
-      margin-top: 10px;
+        margin-top: 10px;
-      display: block;
+        display: block;
-      text-align: center;
+        text-align: center;
-      color: orangered;
+        color: orangered;
 
-      @media (max-width: 375px) {
+        @media (max-width: 375px) {
-        position: absolute;
+          position: absolute;
-        bottom: 0;
+          bottom: 0;
-        right: 0;
+          right: 0;
+        }
       }
     }
   }

core/templates/core/base/navbar.jinja

@@ -23,7 +23,7 @@
     <details name="navbar" class="menu">
       <summary class="head">{% trans %}Services{% endtrans %}</summary>
       <ul class="content">
-        <li><a href="{{ url('matmat:search') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
+        <li><a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
         <li><a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a></li>
         <li><a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a></li>
       </ul>

core/templates/core/macros.jinja

@@ -78,6 +78,12 @@
   {% endif %}
 {% endmacro %}
 
+{% macro delete_godfather(user, profile, godfather, is_father) %}
+  {% if user == profile or user.is_root or user.is_board_member %}
+    <a class="delete" href="{{ url("core:user_godfathers_delete", user_id=profile.id, godfather_id=godfather.id, is_father=is_father) }}">{% trans %}Delete{% endtrans %}</a>
+  {% endif %}
+{% endmacro %}
+
 {% macro paginate_alpine(page, nb_pages) %}
     {# Add pagination buttons for ajax based content with alpine
 
@@ -151,13 +157,12 @@
     {% if current_page.has_previous() %}
       <a
         {% if use_htmx -%}
-          hx-get="?{{ querystring(page=current_page.previous_page_number()) }}"
+          hx-get="?page={{ current_page.previous_page_number() }}"
           hx-swap="innerHTML"
           hx-target="#content"
           hx-push-url="true"
-          hx-trigger="click, keyup[key=='ArrowLeft'] from:body"
         {%- else -%}
-          href="?{{ querystring(page=current_page.previous_page_number()) }}"
+          href="?page={{ current_page.previous_page_number() }}"
         {%- endif -%}
       >
         <button>
@@ -175,12 +180,12 @@
       {% else %}
         <a
           {% if use_htmx -%}
-            hx-get="?{{ querystring(page=i) }}"
+            hx-get="?page={{ i }}"
             hx-swap="innerHTML"
             hx-target="#content"
             hx-push-url="true"
           {%- else -%}
-            href="?{{ querystring(page=i) }}"
+            href="?page={{ i }}"
           {%- endif -%}
         >
           <button>{{ i }}</button>
@@ -190,13 +195,12 @@
     {% if current_page.has_next() %}
       <a
         {% if use_htmx -%}
-          hx-get="?{{querystring(page=current_page.next_page_number())}}"
+          hx-get="?page={{ current_page.next_page_number() }}"
           hx-swap="innerHTML"
           hx-target="#content"
           hx-push-url="true"
-          hx-trigger="click, keyup[key=='ArrowRight'] from:body"
         {%- else -%}
-          href="?{{querystring(page=current_page.next_page_number())}}"
+          href="?page={{ current_page.next_page_number() }}"
         {%- endif -%}
       ><button>
         <i class="fa fa-caret-right"></i>
@@ -245,17 +249,3 @@
                  }"></div>
   {% endif %}
 {% endmacro %}
-
-
-{% macro querystring() %}
-  {%- for key, values in request.GET.lists() -%}
-    {%- if key not in kwargs -%}
-      {%- for value in values -%}
-        {{ key }}={{ value }}&amp;
-      {%- endfor -%}
-    {%- endif -%}
-  {%- endfor -%}
-  {%- for key, value in kwargs.items() -%}
-    {{ key }}={{ value }}&amp;
-  {%- endfor -%}
-{% endmacro %}

core/templates/core/password_change.jinja

@@ -3,7 +3,7 @@
 {% block content %}
 
   {% if target %}
-    <p>{% trans user=form.user.get_display_name() %}Change password for {{ user }}{% endtrans %}</p>
+    <p>{% trans user=target.get_display_name() %}Change password for {{ user }}{% endtrans %}</p>
   {% endif %}
   <form method="post" action="">
     {% csrf_token %}

core/templates/core/search.jinja

@@ -9,17 +9,19 @@
 {% block content %}
   <h4>{% trans %}Users{% endtrans %}</h4>
   <ul>
-    {% for user in users %}
+    {% for i in result.users %}
-      <li>
+      {% if user.can_view(i) %}
-        {{ user_link_with_pict(user) }}
+        <li>
-      </li>
+          {{ user_link_with_pict(i) }}
+        </li>
+      {% endif %}
     {% endfor %}
   </ul>
   <h4>{% trans %}Clubs{% endtrans %}</h4>
   <ul>
-    {% for club in clubs %}
+    {% for i in result.clubs %}
       <li>
-        <a href="{{ url("club:club_view", club_id=club.id) }}">{{ club }}</a>
+        <a href="{{ url("club:club_view", club_id=i.id) }}">{{ i }}</a>
       </li>
     {% endfor %}
   </ul>

core/templates/core/user_edit.jinja

@@ -114,7 +114,7 @@
 
 
     {# All fields #}
-    <div class="fields-centered">
+    <div class="profile-fields">
       {%- for field in form -%}
         {%- if field.name in ["quote","profile_pict","avatar_pict","scrub_pict","is_viewable","forum_signature"] -%}
           {%- continue -%}
@@ -133,7 +133,7 @@
     </div>
 
     {# Textareas #}
-    <div class="fields-centered">
+    <div class="profile-fields">
       {%- for field in [form.quote, form.forum_signature] -%}
         <div class="profile-field">
           {{ field.label_tag() }}

core/templates/core/user_godfathers.jinja

@@ -29,16 +29,7 @@
             <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
               {{ u.get_mini_item() | safe }}
             </a>
-            {% if user == profile or user.is_root or user.is_board_member %}
+            {{ delete_godfather(user, profile, u, True) }}
-              <form
-                method="post"
-                class="no-margin"
-                action="{{ url("core:user_godfathers_delete", user_id=profile.id, godfather_id=u.id, is_father=True) }}"
-              >
-                {% csrf_token %}
-                <input type="submit" class="link-like" value="{% trans %}Delete{% endtrans %}">
-              </form>
-            {% endif %}
           </li>
         {% endfor %}
       </ul>
@@ -55,16 +46,7 @@
             <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
               {{ u.get_mini_item()|safe }}
             </a>
-            {% if user == profile or user.is_root or user.is_board_member %}
+            {{ delete_godfather(user, profile, u, False) }}
-              <form
-                method="post"
-                class="no-margin"
-                action="{{ url("core:user_godfathers_delete", user_id=profile.id, godfather_id=u.id, is_father=False) }}"
-              >
-                {% csrf_token %}
-                <input type="submit" class="link-like link-red" value="{% trans %}Delete{% endtrans %}">
-              </form>
-            {% endif %}
           </li>
         {% endfor %}
       </ul>

core/templates/core/user_stats.jinja

@@ -11,35 +11,32 @@
 {% block content %}
   <div class="container">
     <div class="row">
-      {% if total_perm_time %}
+      {% if profile.permanencies %}
         <div>
           <h3>{% trans %}Permanencies{% endtrans %}</h3>
           <div class="flexed">
-            {% for perm in perm_time %}
+            <div><span>Foyer :</span><span>{{ total_foyer_time }}</span></div>
-              <div>
+            <div><span>Gommette :</span><span>{{ total_gommette_time }}</span></div>
-                <span>{{ perm["counter__name"] }} :</span>
+            <div><span>MDE :</span><span>{{ total_mde_time }}</span></div>
-                <span>{{ perm["total"]|format_timedelta }}</span>
+            <div><b>Total :</b><b>{{ total_perm_time }}</b></div>
-              </div>
-            {% endfor %}
-            <div><b>Total :</b><b>{{ total_perm_time|format_timedelta }}</b></div>
           </div>
         </div>
       {% endif %}
+
       <div>
         <h3>{% trans %}Buyings{% endtrans %}</h3>
         <div class="flexed">
-          {% for sum in purchase_sums %}
+          <div><span>Foyer :</span><span>{{ total_foyer_buyings }}&nbsp;€</span></div>
-            <div>
+          <div><span>Gommette :</span><span>{{ total_gommette_buyings }}&nbsp;€</span></div>
-              <span>{{ sum["counter__name"] }}</span>
+          <div><span>MDE :</span><span>{{ total_mde_buyings }}&nbsp;€</span></div>
-              <span>{{ sum["total"] }} €</span>
+          <div><b>Total :</b><b>{{ total_foyer_buyings + total_gommette_buyings + total_mde_buyings }}&nbsp;€</b>
-            </div>
+          </div>
-          {% endfor %}
-          <div><b>Total : </b><b>{{ total_purchases }} €</b></div>
         </div>
       </div>
     </div>
+
     <div>
-      <h3>{% trans %}Product top 15{% endtrans %}</h3>
+      <h3>{% trans %}Product top 10{% endtrans %}</h3>
       <table>
         <thead>
           <tr>

core/templates/core/user_tools.jinja

@@ -184,18 +184,18 @@
         </div>
       {% endif %}
 
-      {% if user.has_perm("pedagogy.add_ue") or user.has_perm("pedagogy.delete_uecomment") %}
+      {% if user.has_perm("pedagogy.add_uv") or user.has_perm("pedagogy.delete_uvcomment") %}
         <div>
           <h4>{% trans %}Pedagogy{% endtrans %}</h4>
           <ul>
-            {% if user.has_perm("pedagogy.add_ue") %}
+            {% if user.has_perm("pedagogy.add_uv") %}
               <li>
-                <a href="{{ url("pedagogy:ue_create") }}">
+                <a href="{{ url("pedagogy:uv_create") }}">
-                  {% trans %}Create UE{% endtrans %}
+                  {% trans %}Create UV{% endtrans %}
                 </a>
               </li>
             {% endif %}
-            {% if user.has_perm("pedagogy.delete_uecomment") %}
+            {% if user.has_perm("pedagogy.delete_uvcomment") %}
               <li>
                 <a href="{{ url("pedagogy:moderation") }}">
                   {% trans %}Moderate comments{% endtrans %}

core/templatetags/renderer.py

@@ -55,17 +55,31 @@ def phonenumber(
         return value
 
 
+@register.filter(name="truncate_time")
+def truncate_time(value, time_unit):
+    """Remove everything in the time format lower than the specified unit.
+
+    Args:
+        value: the value to truncate
+        time_unit: the lowest unit to display
+    """
+    value = str(value)
+    return {
+        "millis": lambda: value.split(".")[0],
+        "seconds": lambda: value.rsplit(":", maxsplit=1)[0],
+        "minutes": lambda: value.split(":", maxsplit=1)[0],
+        "hours": lambda: value.rsplit(" ")[0],
+    }[time_unit]()
+
+
 @register.filter(name="format_timedelta")
 def format_timedelta(value: datetime.timedelta) -> str:
-    value = value - datetime.timedelta(microseconds=value.microseconds)
     days = value.days
     if days == 0:
         return str(value)
     remainder = value - datetime.timedelta(days=days)
     return ngettext(
-        "%(nb_days)d day, %(remainder)s",
+        "%(nb_days)d day, %(remainder)s", "%(nb_days)d days, %(remainder)s", days
-        "%(nb_days)d days, %(remainder)s",
-        days,
     ) % {"nb_days": days, "remainder": str(remainder)}
 
 

core/tests/test_core.py

@@ -35,7 +35,6 @@ from pytest_django.asserts import assertInHTML, assertRedirects
 
 from antispam.models import ToxicDomain
 from club.models import Club, Membership
-from core.baker_recipes import subscriber_user
 from core.markdown import markdown
 from core.models import AnonymousUser, Group, Page, User, validate_promo
 from core.utils import get_last_promo, get_semester_code, get_start_of_semester
@@ -552,10 +551,3 @@ def test_allow_fragment_mixin():
     assert not TestAllowFragmentView.as_view()(request)
     request.headers = {"HX-Request": True, **base_headers}
     assert TestAllowFragmentView.as_view()(request)
-
-
-@pytest.mark.django_db
-def test_search_view(client: Client):
-    client.force_login(subscriber_user.make())
-    response = client.get(reverse("core:search", query={"query": "foo"}))
-    assert response.status_code == 200

core/tests/test_files.py

@@ -5,7 +5,6 @@ from typing import Callable
 from uuid import uuid4
 
 import pytest
-from django.conf import settings
 from django.core.cache import cache
 from django.core.files.uploadedfile import SimpleUploadedFile, UploadedFile
 from django.test import Client, TestCase
@@ -18,8 +17,8 @@ from pytest_django.asserts import assertNumQueries
 from core.baker_recipes import board_user, old_subscriber_user, subscriber_user
 from core.models import Group, QuickUploadImage, SithFile, User
 from core.utils import RED_PIXEL_PNG
-from sas.baker_recipes import picture_recipe
 from sas.models import Picture
+from sith import settings
 
 
 @pytest.mark.django_db
@@ -31,19 +30,24 @@ class TestImageAccess:
             lambda: baker.make(
                 User, groups=[Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
             ),
+            lambda: baker.make(
+                User, groups=[Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)]
+            ),
         ],
     )
     def test_sas_image_access(self, user_factory: Callable[[], User]):
         """Test that only authorized users can access the sas image."""
         user = user_factory()
-        picture = picture_recipe.make()
+        picture: SithFile = baker.make(
-        assert user.can_edit(picture)
+            Picture, parent=SithFile.objects.get(pk=settings.SITH_SAS_ROOT_DIR_ID)
+        )
+        assert picture.is_owned_by(user)
 
     def test_sas_image_access_owner(self):
         """Test that the owner of the image can access it."""
         user = baker.make(User)
-        picture = picture_recipe.make(owner=user)
+        picture: Picture = baker.make(Picture, owner=user)
-        assert user.can_edit(picture)
+        assert picture.is_owned_by(user)
 
     @pytest.mark.parametrize(
         "user_factory",
@@ -59,41 +63,7 @@ class TestImageAccess:
         user = user_factory()
         owner = baker.make(User)
         picture: Picture = baker.make(Picture, owner=owner)
-        assert not user.can_edit(picture)
+        assert not picture.is_owned_by(user)
-
-
-@pytest.mark.django_db
-class TestUserPicture:
-    def test_anonymous_user_unauthorized(self, client):
-        """An anonymous user shouldn't have access to an user's photo page."""
-        response = client.get(
-            reverse(
-                "core:user_pictures",
-                kwargs={"user_id": User.objects.get(username="sli").pk},
-            )
-        )
-        assert response.status_code == 403
-
-    @pytest.mark.parametrize(
-        ("username", "status"),
-        [
-            ("guy", 403),
-            ("root", 200),
-            ("skia", 200),
-            ("sli", 200),
-        ],
-    )
-    def test_page_is_working(self, client, username, status):
-        """Only user that subscribed (or admins) should be able to see the page."""
-        # Test for simple user
-        client.force_login(User.objects.get(username=username))
-        response = client.get(
-            reverse(
-                "core:user_pictures",
-                kwargs={"user_id": User.objects.get(username="sli").pk},
-            )
-        )
-        assert response.status_code == status
 
 
 # TODO: many tests on the pages:

core/tests/test_notification.py

@@ -1,64 +0,0 @@
-from datetime import timedelta
-from operator import attrgetter
-
-import pytest
-from bs4 import BeautifulSoup
-from django.test import Client, TestCase
-from django.urls import reverse
-from django.utils.timezone import now
-from model_bakery import baker, seq
-from pytest_django.asserts import assertRedirects
-
-from core.baker_recipes import subscriber_user
-from core.models import Notification
-
-
-@pytest.mark.django_db
-class TestNotificationList(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.user = subscriber_user.make()
-        url = reverse("core:user_profile", kwargs={"user_id": cls.user.id})
-        cls.notifs = baker.make(
-            Notification,
-            user=cls.user,
-            url=url,
-            viewed=False,
-            date=seq(now() - timedelta(days=1), timedelta(hours=1)),
-            _quantity=10,
-            _bulk_create=True,
-        )
-
-    def test_list(self):
-        self.client.force_login(self.user)
-        response = self.client.get(reverse("core:notification_list"))
-        assert response.status_code == 200
-        soup = BeautifulSoup(response.text, "lxml")
-        ul = soup.find("ul", id="notifications")
-        elements = list(ul.find_all("li"))
-        assert len(elements) == len(self.notifs)
-        notifs = sorted(self.notifs, key=attrgetter("date"), reverse=True)
-        for element, notif in zip(elements, notifs, strict=True):
-            assert element.find("a")["href"] == reverse(
-                "core:notification", kwargs={"notif_id": notif.id}
-            )
-
-    def test_read_all(self):
-        self.client.force_login(self.user)
-        response = self.client.get(
-            reverse("core:notification_list", query={"read_all": None})
-        )
-        assert response.status_code == 200
-        assert not self.user.notifications.filter(viewed=True).exists()
-
-
-@pytest.mark.django_db
-def test_notification_redirect(client: Client):
-    user = subscriber_user.make()
-    url = reverse("core:user_profile", kwargs={"user_id": user.id})
-    notif = baker.make(Notification, user=user, url=url, viewed=False)
-    client.force_login(user)
-    response = client.get(reverse("core:notification", kwargs={"notif_id": notif.id}))
-    assertRedirects(response, url)
-    notif.refresh_from_db()
-    assert notif.viewed is True

core/tests/test_user.py

@@ -1,4 +1,3 @@
-import itertools
 from datetime import timedelta
 from unittest import mock
 
@@ -24,10 +23,9 @@ from core.baker_recipes import (
 from core.models import AnonymousUser, Group, User
 from core.views import UserTabsMixin
 from counter.baker_recipes import sale_recipe
-from counter.models import Counter, Customer, Permanency, Refilling, Selling
+from counter.models import Counter, Customer, Refilling, Selling
 from counter.utils import is_logged_in_counter
 from eboutic.models import Invoice, InvoiceItem
-from sas.models import Picture
 
 
 class TestSearchUsers(TestCase):
@@ -35,7 +33,6 @@ class TestSearchUsers(TestCase):
     def setUpTestData(cls):
         # News.author has on_delete=PROTECT, so news must be deleted beforehand
         News.objects.all().delete()
-        Picture.objects.all().delete()  # same for pictures
         User.objects.all().delete()
         user_recipe = Recipe(
             User,
@@ -190,7 +187,11 @@ class TestFilterInactive(TestCase):
         time_inactive = time_active - timedelta(days=3)
         counter, seller = baker.make(Counter), baker.make(User)
         sale_recipe = Recipe(
-            Selling, counter=counter, club=counter.club, seller=seller, unit_price=0
+            Selling,
+            counter=counter,
+            club=counter.club,
+            seller=seller,
+            is_validated=True,
         )
 
         cls.users = [
@@ -427,106 +428,3 @@ class TestUserQuerySetViewableBy:
         user = user_factory()
         viewable = User.objects.filter(id__in=[u.id for u in users]).viewable_by(user)
         assert not viewable.exists()
-
-
-@pytest.mark.django_db
-def test_user_preferences(client: Client):
-    user = subscriber_user.make()
-    client.force_login(user)
-    url = reverse("core:user_prefs", kwargs={"user_id": user.id})
-    response = client.get(url)
-    assert response.status_code == 200
-    response = client.post(url, {"notify_on_click": "true"})
-    assertRedirects(response, url)
-    user.preferences.refresh_from_db()
-    assert user.preferences.notify_on_click is True
-
-
-@pytest.mark.django_db
-def test_user_stats(client: Client):
-    user = subscriber_user.make()
-    baker.make(Refilling, customer=user.customer, amount=99999)
-    bars = [b[0] for b in settings.SITH_COUNTER_BARS]
-    baker.make(
-        Permanency,
-        end=now() - timedelta(days=5),
-        start=now() - timedelta(days=5, hours=3),
-        counter_id=itertools.cycle(bars),
-        _quantity=5,
-        _bulk_create=True,
-    )
-    sale_recipe.make(
-        counter_id=itertools.cycle(bars),
-        customer=user.customer,
-        unit_price=1,
-        quantity=1,
-        _quantity=5,
-    )
-    client.force_login(user)
-    response = client.get(reverse("core:user_stats", kwargs={"user_id": user.id}))
-    assert response.status_code == 200
-
-
-@pytest.mark.django_db
-class TestChangeUserPassword:
-    def test_as_root(self, client: Client, admin_user: User):
-        client.force_login(admin_user)
-        user = subscriber_user.make()
-        url = reverse("core:password_root_change", kwargs={"user_id": user.id})
-        response = client.get(url)
-        assert response.status_code == 200
-        response = client.post(
-            url, {"new_password1": "poutou", "new_password2": "poutou"}
-        )
-        assertRedirects(response, reverse("core:password_change_done"))
-        user.refresh_from_db()
-        assert user.check_password("poutou") is True
-
-
-@pytest.mark.django_db
-class TestUserGodfather:
-    @pytest.mark.parametrize("godfather", [True, False])
-    def test_add_family(self, client: Client, godfather):
-        user = subscriber_user.make()
-        other_user = subscriber_user.make()
-        client.force_login(user)
-        url = reverse("core:user_godfathers", kwargs={"user_id": user.id})
-        response = client.get(url)
-        assert response.status_code == 200
-        response = client.post(
-            url,
-            {"type": "godfather" if godfather else "godchild", "user": other_user.id},
-        )
-        assertRedirects(response, url)
-        if godfather:
-            assert user.godfathers.contains(other_user)
-        else:
-            assert user.godchildren.contains(other_user)
-
-    def test_tree(self, client: Client):
-        user = subscriber_user.make()
-        client.force_login(user)
-        response = client.get(
-            reverse("core:user_godfathers_tree", kwargs={"user_id": user.id})
-        )
-        assert response.status_code == 200
-
-    def test_remove_family(self, client: Client):
-        user = subscriber_user.make()
-        other_user = subscriber_user.make()
-        user.godfathers.add(other_user)
-        client.force_login(user)
-        response = client.post(
-            reverse(
-                "core:user_godfathers_delete",
-                kwargs={
-                    "user_id": user.id,
-                    "godfather_id": other_user.id,
-                    "is_father": True,
-                },
-            )
-        )
-        assertRedirects(
-            response, reverse("core:user_godfathers", kwargs={"user_id": user.id})
-        )
-        assert not user.godfathers.contains(other_user)

core/urls.py

@@ -24,7 +24,6 @@
 from django.urls import path, re_path, register_converter
 from django.views.generic import RedirectView
 
-from com.views import NewsListView
 from core.converters import (
     BooleanStringConverter,
     FourDigitYearConverter,
@@ -54,8 +53,6 @@ from core.views import (
     PagePropView,
     PageRevView,
     PageView,
-    PasswordRootChangeView,
-    SearchView,
     SithLoginView,
     SithPasswordChangeDoneView,
     SithPasswordChangeView,
@@ -79,8 +76,13 @@ from core.views import (
     UserUpdateProfileView,
     UserView,
     delete_user_godfather,
+    index,
     logout,
     notification,
+    password_root_change,
+    search_json,
+    search_user_json,
+    search_view,
     send_file,
 )
 
@@ -89,18 +91,20 @@ register_converter(TwoDigitMonthConverter, "mm")
 register_converter(BooleanStringConverter, "bool")
 
 urlpatterns = [
-    path("", NewsListView.as_view(), name="index"),
+    path("", index, name="index"),
     path("notifications/", NotificationList.as_view(), name="notification_list"),
     path("notification/<int:notif_id>/", notification, name="notification"),
     # Search
-    path("search/", SearchView.as_view(), name="search"),
+    path("search/", search_view, name="search"),
+    path("search_json/", search_json, name="search_json"),
+    path("search_user/", search_user_json, name="search_user"),
     # Login and co
     path("login/", SithLoginView.as_view(), name="login"),
     path("logout/", logout, name="logout"),
     path("password_change/", SithPasswordChangeView.as_view(), name="password_change"),
     path(
         "password_change/<int:user_id>/",
-        PasswordRootChangeView.as_view(),
+        password_root_change,
         name="password_root_change",
     ),
     path(

core/utils.py

@@ -12,23 +12,18 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from dataclasses import dataclass
+
 from datetime import date, timedelta
 
 # Image utils
 from io import BytesIO
-from typing import Any, Final, Unpack
+from typing import Final
 
 import PIL
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import UploadedFile
-from django.db import models
+from django.http import HttpRequest
-from django.forms import BaseForm
-from django.http import Http404, HttpRequest
-from django.shortcuts import get_list_or_404
-from django.template.loader import render_to_string
-from django.utils.safestring import SafeString
 from django.utils.timezone import localdate
 from PIL import ExifTags
 from PIL.Image import Image, Resampling
@@ -47,21 +42,6 @@ to generate a dummy image that is considered valid nonetheless
 """
 
 
-@dataclass
-class FormFragmentTemplateData[T: BaseForm]:
-    """Dataclass used to pre-render form fragments"""
-
-    form: T
-    template: str
-    context: dict[str, Any]
-
-    def render(self, request: HttpRequest) -> SafeString:
-        # Request is needed for csrf_tokens
-        return render_to_string(
-            self.template, context={"form": self.form, **self.context}, request=request
-        )
-
-
 def get_start_of_semester(today: date | None = None) -> date:
     """Return the date of the start of the semester of the given date.
     If no date is given, return the start date of the current semester.
@@ -225,56 +205,3 @@ def get_client_ip(request: HttpRequest) -> str | None:
             return ip
 
     return None
-
-
-Filterable = models.Model | models.QuerySet | models.Manager
-ListFilter = dict[str, list | tuple | set]
-
-
-def get_list_exact_or_404(klass: Filterable, **kwargs: Unpack[ListFilter]) -> list:
-    """Use filter() to return a list of objects from a list of unique keys (like ids)
-    or raises Http404 if the list has not the same length as the given one.
-
-    Work like `get_object_or_404()` but for lists of objects, with some caveats :
-
-    - The filter must be a list, a tuple or a set.
-    - There can't be more than exactly one filter.
-    - There must be no duplicate in the filter.
-    - The filter should consist in unique keys (like ids), or it could fail randomly.
-
-    klass may be a Model, Manager, or QuerySet object. All other passed
-    arguments and keyword arguments are used in the filter() query.
-
-    Raises:
-        Http404: If the list is empty or doesn't have as many elements as the keys list.
-        ValueError: If the first argument is not a Model, Manager, or QuerySet object.
-        ValueError: If more than one filter is passed.
-        TypeError: If the given filter is not a list, a tuple or a set.
-
-    Examples:
-        Get all the products with ids 1, 2, 3: ::
-
-            products = get_list_exact_or_404(Product, id__in=[1, 2, 3])
-
-        Don't work with duplicate ids: ::
-
-            products = get_list_exact_or_404(Product, id__in=[1, 2, 3, 3])
-            # Raises Http404: "The list of keys must contain no duplicates."
-    """
-    if len(kwargs) > 1:
-        raise ValueError("get_list_exact_or_404() only accepts one filter.")
-    key, list_filter = next(iter(kwargs.items()))
-    if not isinstance(list_filter, (list, tuple, set)):
-        raise TypeError(
-            f"The given filter must be a list, a tuple or a set, not {type(list_filter)}"
-        )
-    if len(list_filter) != len(set(list_filter)):
-        raise ValueError("The list of keys must contain no duplicates.")
-    kwargs = {key: list_filter}
-    obj_list = get_list_or_404(klass, **kwargs)
-    if len(obj_list) != len(list_filter):
-        raise Http404(
-            "The given list of keys doesn't match the number of objects found."
-            f"Expected {len(list_filter)} items, got {len(obj_list)}."
-        )
-    return obj_list

core/views/files.py

@@ -374,7 +374,7 @@ class FileDeleteView(AllowFragment, CanEditPropMixin, DeleteView):
 class FileModerationView(AllowFragment, ListView):
     model = SithFile
     template_name = "core/file_moderation.jinja"
-    queryset = SithFile.objects.filter(is_moderated=False)
+    queryset = SithFile.objects.filter(is_moderated=False, is_in_sas=False)
     ordering = "id"
     paginate_by = 100
 

core/views/forms.py

@@ -303,6 +303,7 @@ class UserGodfathersForm(forms.Form):
     )
     user = forms.ModelChoiceField(
         label=_("Select user"),
+        help_text=None,
         required=True,
         widget=AutoCompleteSelectUser,
         queryset=User.objects.all(),
@@ -314,6 +315,8 @@ class UserGodfathersForm(forms.Form):
 
     def clean_user(self):
         other_user = self.cleaned_data.get("user")
+        if not other_user:
+            raise ValidationError(_("This user does not exist"))
         if other_user == self.target_user:
             raise ValidationError(_("You cannot be related to yourself"))
         return other_user

core/views/index.py

@@ -22,49 +22,106 @@
 #
 #
 
+import json
+
 from django.conf import settings
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.decorators import login_required
-from django.db.models import F
+from django.core import serializers
 from django.db.models.query import QuerySet
-from django.http import HttpRequest
+from django.http import JsonResponse
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import redirect, render
-from django.views.generic import ListView, TemplateView
+from django.utils import html
+from django.utils.text import slugify
+from django.views.generic import ListView
+from haystack.query import SearchQuerySet
 
 from club.models import Club
 from core.models import Notification, User
-from core.schemas import UserFilterSchema
 
 
-class NotificationList(LoginRequiredMixin, ListView):
+def index(request, context=None):
+    from com.views import NewsListView
+
+    return NewsListView.as_view()(request)
+
+
+class NotificationList(ListView):
     model = Notification
     template_name = "core/notification_list.jinja"
 
     def get_queryset(self) -> QuerySet[Notification]:
+        if self.request.user.is_anonymous:
+            return Notification.objects.none()
+        # TODO: Bulk update in django 2.2
         if "see_all" in self.request.GET:
             self.request.user.notifications.filter(viewed=False).update(viewed=True)
         return self.request.user.notifications.order_by("-date")[:20]
 
 
-def notification(request: HttpRequest, notif_id: int):
+def notification(request, notif_id):
-    notif = get_object_or_404(Notification, id=notif_id)
+    notif = Notification.objects.filter(id=notif_id).first()
-    if notif.type not in settings.SITH_PERMANENT_NOTIFICATIONS:
+    if notif:
-        notif.viewed = True
+        if notif.type not in settings.SITH_PERMANENT_NOTIFICATIONS:
-    else:
+            notif.viewed = True
-        notif.callback()
+        else:
-    notif.save()
+            notif.callback()
-    return redirect(notif.url)
+        notif.save()
+        return redirect(notif.url)
+    return redirect("/")
 
 
-class SearchView(LoginRequiredMixin, TemplateView):
+def search_user(query):
-    template_name = "core/search.jinja"
+    try:
+        # slugify turns everything into ascii and every whitespace into -
+        # it ends by removing duplicate - (so ' - ' will turn into '-')
+        # replace('-', ' ') because search is whitespace based
+        query = slugify(query).replace("-", " ")
+        # TODO: is this necessary?
+        query = html.escape(query)
+        res = (
+            SearchQuerySet()
+            .models(User)
+            .autocomplete(auto=query)
+            .order_by("-last_login")
+            .load_all()[:20]
+        )
+        return [r.object for r in res]
+    except TypeError:
+        return []
 
-    def get_context_data(self, **kwargs):
+
-        users, clubs = [], []
+def search_club(query, *, as_json=False):
-        if query := self.request.GET.get("query"):
+    clubs = []
-            users = list(
+    if query:
-                UserFilterSchema(search=query)
+        clubs = Club.objects.filter(name__icontains=query).all()
-                .filter(User.objects.viewable_by(self.request.user))
+        clubs = clubs[:5]
-                .order_by(F("last_login").desc(nulls_last=True))
+        if as_json:
-            )
+            # Re-loads json to avoid double encoding by JsonResponse, but still benefit from serializers
-            clubs = list(Club.objects.filter(name__icontains=query)[:5])
+            clubs = json.loads(serializers.serialize("json", clubs, fields=("name")))
-        return super().get_context_data(**kwargs) | {"users": users, "clubs": clubs}
+        else:
+            clubs = list(clubs)
+    return clubs
+
+
+@login_required
+def search_view(request):
+    result = {
+        "users": search_user(request.GET.get("query", "")),
+        "clubs": search_club(request.GET.get("query", "")),
+    }
+    return render(request, "core/search.jinja", context={"result": result})
+
+
+@login_required
+def search_user_json(request):
+    result = {"users": search_user(request.GET.get("query", ""))}
+    return JsonResponse(result)
+
+
+@login_required
+def search_json(request):
+    result = {
+        "users": search_user(request.GET.get("query", "")),
+        "clubs": search_club(request.GET.get("query", ""), as_json=True),
+    }
+    return JsonResponse(result)

core/views/user.py

@@ -22,28 +22,27 @@
 #
 #
 import itertools
-from datetime import timedelta
 
 # This file contains all the views that concern the user model
+from datetime import date, timedelta
 from operator import itemgetter
 from smtplib import SMTPException
 
 from django.contrib.auth import login, views
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.forms import PasswordChangeForm
-from django.contrib.auth.forms import PasswordChangeForm, SetPasswordForm
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.core.exceptions import PermissionDenied
-from django.db.models import DateField, F, QuerySet, Sum
+from django.db.models import DateField, QuerySet
 from django.db.models.functions import Trunc
 from django.forms.models import modelform_factory
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import render_to_string
+from django.template.response import TemplateResponse
 from django.urls import reverse, reverse_lazy
 from django.utils.decorators import method_decorator
 from django.utils.safestring import SafeString
 from django.utils.translation import gettext as _
-from django.views.decorators.http import require_POST
 from django.views.generic import (
     CreateView,
     DeleteView,
@@ -67,8 +66,9 @@ from core.views.forms import (
     UserProfileForm,
 )
 from core.views.mixins import TabedViewMixin, UseFragmentsMixin
-from counter.models import Refilling, Selling
+from counter.models import Counter, Refilling, Selling
 from eboutic.models import Invoice
+from subscription.models import Subscription
 from trombi.views import UserTrombiForm
 
 
@@ -99,23 +99,21 @@ def logout(request):
     return views.logout_then_login(request)
 
 
-class PasswordRootChangeView(UserPassesTestMixin, FormView):
+def password_root_change(request, user_id):
     """Allows a root user to change someone's password."""
-
+    if not request.user.is_root:
-    template_name = "core/password_change.jinja"
+        raise PermissionDenied
-    form_class = SetPasswordForm
+    user = get_object_or_404(User, id=user_id)
-    success_url = reverse_lazy("core:password_change_done")
+    if request.method == "POST":
-
+        form = views.SetPasswordForm(user=user, data=request.POST)
-    def test_func(self):
+        if form.is_valid():
-        return self.request.user.is_root
+            form.save()
-
+            return redirect("core:password_change_done")
-    def get_form_kwargs(self):
+    else:
-        user = get_object_or_404(User, id=self.kwargs["user_id"])
+        form = views.SetPasswordForm(user=user)
-        return super().get_form_kwargs() | {"user": user}
+    return TemplateResponse(
-
+        request, "core/password_change.jinja", {"form": form, "target": user}
-    def form_valid(self, form: SetPasswordForm):
+    )
-        form.save()
-        return super().form_valid(form)
 
 
 @method_decorator(check_honeypot, name="post")
@@ -290,12 +288,10 @@ class UserView(UserTabsMixin, CanViewMixin, DetailView):
         return kwargs
 
 
-@require_POST
-@login_required
 def delete_user_godfather(request, user_id, godfather_id, is_father):
     user_is_admin = request.user.is_root or request.user.is_board_member
     if user_id != request.user.id and not user_is_admin:
-        raise PermissionDenied
+        raise PermissionDenied()
     user = get_object_or_404(User, id=user_id)
     to_remove = get_object_or_404(User, id=godfather_id)
     if is_father:
@@ -357,40 +353,87 @@ class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
     context_object_name = "profile"
     template_name = "core/user_stats.jinja"
     current_tab = "stats"
-    queryset = User.objects.exclude(customer=None).select_related("customer")
 
     def dispatch(self, request, *arg, **kwargs):
         profile = self.get_object()
+
+        if not hasattr(profile, "customer"):
+            raise Http404
+
         if not (
             profile == request.user or request.user.has_perm("counter.view_customer")
         ):
             raise PermissionDenied
+
         return super().dispatch(request, *arg, **kwargs)
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
+        from django.db.models import Sum
 
-        kwargs["perm_time"] = list(
+        foyer = Counter.objects.filter(name="Foyer").first()
-            self.object.permanencies.filter(end__isnull=False, counter__type="BAR")
+        mde = Counter.objects.filter(name="MDE").first()
-            .values("counter", "counter__name")
+        gommette = Counter.objects.filter(name="La Gommette").first()
-            .annotate(total=Sum(F("end") - F("start"), default=timedelta(seconds=0)))
+        semester_start = Subscription.compute_start(d=date.today(), duration=3)
-            .order_by("-total")
-        )
         kwargs["total_perm_time"] = sum(
-            [perm["total"] for perm in kwargs["perm_time"]], start=timedelta(seconds=0)
+            [p.end - p.start for p in self.object.permanencies.exclude(end=None)],
+            timedelta(),
         )
-        kwargs["purchase_sums"] = list(
+        kwargs["total_foyer_time"] = sum(
-            self.object.customer.buyings.filter(counter__type="BAR")
+            [
-            .values("counter", "counter__name")
+                p.end - p.start
-            .annotate(total=Sum(F("unit_price") * F("quantity")))
+                for p in self.object.permanencies.filter(counter=foyer).exclude(
-            .order_by("-total")
+                    end=None
+                )
+            ],
+            timedelta(),
+        )
+        kwargs["total_mde_time"] = sum(
+            [
+                p.end - p.start
+                for p in self.object.permanencies.filter(counter=mde).exclude(end=None)
+            ],
+            timedelta(),
+        )
+        kwargs["total_gommette_time"] = sum(
+            [
+                p.end - p.start
+                for p in self.object.permanencies.filter(counter=gommette).exclude(
+                    end=None
+                )
+            ],
+            timedelta(),
+        )
+        kwargs["total_foyer_buyings"] = sum(
+            [
+                b.unit_price * b.quantity
+                for b in self.object.customer.buyings.filter(
+                    counter=foyer, date__gte=semester_start
+                )
+            ]
+        )
+        kwargs["total_mde_buyings"] = sum(
+            [
+                b.unit_price * b.quantity
+                for b in self.object.customer.buyings.filter(
+                    counter=mde, date__gte=semester_start
+                )
+            ]
+        )
+        kwargs["total_gommette_buyings"] = sum(
+            [
+                b.unit_price * b.quantity
+                for b in self.object.customer.buyings.filter(
+                    counter=gommette, date__gte=semester_start
+                )
+            ]
         )
-        kwargs["total_purchases"] = sum(s["total"] for s in kwargs["purchase_sums"])
         kwargs["top_product"] = (
             self.object.customer.buyings.values("product__name")
             .annotate(product_sum=Sum("quantity"))
+            .exclude(product_sum=None)
             .order_by("-product_sum")
-            .all()[:15]
+            .all()[:10]
         )
         return kwargs
 
@@ -422,6 +465,7 @@ class UserUpdateProfileView(UserTabsMixin, CanEditMixin, UpdateView):
     form_class = UserProfileForm
     current_tab = "edit"
     edit_once = ["profile_pict", "date_of_birth", "first_name", "last_name"]
+    board_only = []
 
     def remove_restricted_fields(self, request):
         """Removes edit_once and board_only fields."""
@@ -430,6 +474,9 @@ class UserUpdateProfileView(UserTabsMixin, CanEditMixin, UpdateView):
                 request.user.is_board_member or request.user.is_root
             ):
                 self.form.fields.pop(i, None)
+        for i in self.board_only:
+            if not (request.user.is_board_member or request.user.is_root):
+                self.form.fields.pop(i, None)
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
@@ -481,10 +528,10 @@ class UserPreferencesView(UserTabsMixin, UseFragmentsMixin, CanEditMixin, Update
     current_tab = "prefs"
 
     def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"instance": self.object.preferences}
+        kwargs = super().get_form_kwargs()
-
+        pref = self.object.preferences
-    def get_success_url(self):
+        kwargs.update({"instance": pref})
-        return self.request.path
+        return kwargs
 
     def get_fragment_context_data(self) -> dict[str, SafeString]:
         # Avoid cyclic import error

counter/apps.py

@@ -24,6 +24,12 @@
 from django.apps import AppConfig
 from django.utils.translation import gettext_lazy as _
 
+PAYMENT_METHOD = [
+    ("CHECK", _("Check")),
+    ("CASH", _("Cash")),
+    ("CARD", _("Credit card")),
+]
+
 
 class CounterConfig(AppConfig):
     name = "counter"

counter/forms.py

@@ -1,7 +1,7 @@
 import json
 import math
 import uuid
-from datetime import date, datetime, timezone
+from datetime import date
 
 from dateutil.relativedelta import relativedelta
 from django import forms
@@ -136,10 +136,7 @@ class GetUserForm(forms.Form):
 
 
 class RefillForm(forms.ModelForm):
-    allowed_refilling_methods = [
+    allowed_refilling_methods = ["CASH", "CARD"]
-        Refilling.PaymentMethod.CASH,
-        Refilling.PaymentMethod.CARD,
-    ]
 
     error_css_class = "error"
     required_css_class = "required"
@@ -149,7 +146,7 @@ class RefillForm(forms.ModelForm):
 
     class Meta:
         model = Refilling
-        fields = ["amount", "payment_method"]
+        fields = ["amount", "payment_method", "bank"]
         widgets = {"payment_method": forms.RadioSelect}
 
     def __init__(self, *args, **kwargs):
@@ -163,6 +160,9 @@ class RefillForm(forms.ModelForm):
         if self.fields["payment_method"].initial not in self.allowed_refilling_methods:
             self.fields["payment_method"].initial = self.allowed_refilling_methods[0]
 
+        if "CHECK" not in self.allowed_refilling_methods:
+            del self.fields["bank"]
+
 
 class CounterEditForm(forms.ModelForm):
     class Meta:
@@ -235,19 +235,6 @@ class ScheduledProductActionForm(forms.ModelForm):
         )
         return super().clean()
 
-    def set_product(self, product: Product):
-        """Set the product to which this form's instance is linked.
-
-        When this form is linked to a ProductForm in the case of a product's creation,
-        the product doesn't exist yet, so saving this form as is will result
-        in having `{"product_id": null}` in the action kwargs.
-        For the creation to be useful, it may be needed to inject the newly created
-        product into this form, before saving the latter.
-        """
-        self.product = product
-        kwargs = json.loads(self.instance.kwargs) | {"product_id": self.product.id}
-        self.instance.kwargs = json.dumps(kwargs)
-
 
 class BaseScheduledProductActionFormSet(BaseModelFormSet):
     def __init__(self, *args, product: Product, **kwargs):
@@ -334,19 +321,11 @@ class ProductForm(forms.ModelForm):
     def is_valid(self):
         return super().is_valid() and self.action_formset.is_valid()
 
-    def save(self, *args, **kwargs) -> Product:
+    def save(self, *args, **kwargs):
-        product = super().save(*args, **kwargs)
+        ret = super().save(*args, **kwargs)
-        product.counters.set(self.cleaned_data["counters"])
+        self.instance.counters.set(self.cleaned_data["counters"])
-        for form in self.action_formset:
-            # if it's a creation, the product given in the formset
-            # wasn't a persisted instance.
-            # So if we tried to persist the scheduled actions in the current state,
-            # they would be linked to no product, thus be completely useless
-            # To make it work, we have to replace
-            # the initial product with a persisted one
-            form.set_product(product)
         self.action_formset.save()
-        return product
+        return ret
 
 
 class ReturnableProductForm(forms.ModelForm):
@@ -390,6 +369,7 @@ class EticketForm(forms.ModelForm):
 class CloseCustomerAccountForm(forms.Form):
     user = forms.ModelChoiceField(
         label=_("Refound this account"),
+        help_text=None,
         required=True,
         widget=AutoCompleteSelectUser,
         queryset=User.objects.all(),
@@ -509,14 +489,13 @@ class InvoiceCallForm(forms.Form):
     def __init__(self, *args, month: date, **kwargs):
         super().__init__(*args, **kwargs)
         self.month = month
-        month_start = datetime(month.year, month.month, month.day, tzinfo=timezone.utc)
         self.clubs = list(
             Club.objects.filter(
                 Exists(
                     Selling.objects.filter(
                         club=OuterRef("pk"),
-                        date__gte=month_start,
+                        date__gte=month,
-                        date__lte=month_start + relativedelta(months=1),
+                        date__lte=month + relativedelta(months=1),
                     )
                 )
             ).annotate(

counter/management/commands/dump_accounts.py

@@ -119,6 +119,7 @@ class Command(BaseCommand):
                     quantity=1,
                     unit_price=account.amount,
                     date=now(),
+                    is_validated=True,
                 )
                 for account in accounts
             ]

counter/migrations/0035_remove_selling_is_validated_and_more.py

@@ -1,84 +0,0 @@
-# Generated by Django 5.2.8 on 2025-11-19 17:59
-
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-from django.db.models import Case, When
-
-
-def migrate_selling_payment_method(apps: StateApps, schema_editor):
-    # 0 <=> SITH_ACCOUNT is the default value, so no need to migrate it
-    Selling = apps.get_model("counter", "Selling")
-    Selling.objects.filter(payment_method_str="CARD").update(payment_method=1)
-
-
-def migrate_selling_payment_method_reverse(apps: StateApps, schema_editor):
-    Selling = apps.get_model("counter", "Selling")
-    Selling.objects.filter(payment_method=1).update(payment_method_str="CARD")
-
-
-def migrate_refilling_payment_method(apps: StateApps, schema_editor):
-    Refilling = apps.get_model("counter", "Refilling")
-    Refilling.objects.update(
-        payment_method=Case(
-            When(payment_method_str="CARD", then=0),
-            When(payment_method_str="CASH", then=1),
-            When(payment_method_str="CHECK", then=2),
-        )
-    )
-
-
-def migrate_refilling_payment_method_reverse(apps: StateApps, schema_editor):
-    Refilling = apps.get_model("counter", "Refilling")
-    Refilling.objects.update(
-        payment_method_str=Case(
-            When(payment_method=0, then="CARD"),
-            When(payment_method=1, then="CASH"),
-            When(payment_method=2, then="CHECK"),
-        )
-    )
-
-
-class Migration(migrations.Migration):
-    dependencies = [("counter", "0034_alter_selling_date_selling_date_month_idx")]
-
-    operations = [
-        migrations.RemoveField(model_name="selling", name="is_validated"),
-        migrations.RemoveField(model_name="refilling", name="is_validated"),
-        migrations.RemoveField(model_name="refilling", name="bank"),
-        migrations.RenameField(
-            model_name="selling",
-            old_name="payment_method",
-            new_name="payment_method_str",
-        ),
-        migrations.AddField(
-            model_name="selling",
-            name="payment_method",
-            field=models.PositiveSmallIntegerField(
-                choices=[(0, "Sith account"), (1, "Credit card")],
-                default=0,
-                verbose_name="payment method",
-            ),
-        ),
-        migrations.RunPython(
-            migrate_selling_payment_method, migrate_selling_payment_method_reverse
-        ),
-        migrations.RemoveField(model_name="selling", name="payment_method_str"),
-        migrations.RenameField(
-            model_name="refilling",
-            old_name="payment_method",
-            new_name="payment_method_str",
-        ),
-        migrations.AddField(
-            model_name="refilling",
-            name="payment_method",
-            field=models.PositiveSmallIntegerField(
-                choices=[(0, "Credit card"), (1, "Cash"), (2, "Check")],
-                default=0,
-                verbose_name="payment method",
-            ),
-        ),
-        migrations.RunPython(
-            migrate_refilling_payment_method, migrate_refilling_payment_method_reverse
-        ),
-        migrations.RemoveField(model_name="refilling", name="payment_method_str"),
-    ]

counter/models.py

@@ -44,6 +44,7 @@ from club.models import Club
 from core.fields import ResizedImageField
 from core.models import Group, Notification, User
 from core.utils import get_start_of_semester
+from counter.apps import PAYMENT_METHOD
 from counter.fields import CurrencyField
 from subscription.models import Subscription
 
@@ -79,8 +80,7 @@ class CustomerQuerySet(models.QuerySet):
         )
         money_out = Subquery(
             Selling.objects.filter(
-                customer=OuterRef("pk"),
+                customer=OuterRef("pk"), payment_method="SITH_ACCOUNT"
-                payment_method=Selling.PaymentMethod.SITH_ACCOUNT,
             )
             .values("customer_id")
             .annotate(res=Sum(F("unit_price") * F("quantity"), default=0))
@@ -731,11 +731,6 @@ class RefillingQuerySet(models.QuerySet):
 class Refilling(models.Model):
     """Handle the refilling."""
 
-    class PaymentMethod(models.IntegerChoices):
-        CARD = 0, _("Credit card")
-        CASH = 1, _("Cash")
-        CHECK = 2, _("Check")
-
     counter = models.ForeignKey(
         Counter, related_name="refillings", blank=False, on_delete=models.CASCADE
     )
@@ -750,9 +745,16 @@ class Refilling(models.Model):
         Customer, related_name="refillings", blank=False, on_delete=models.CASCADE
     )
     date = models.DateTimeField(_("date"))
-    payment_method = models.PositiveSmallIntegerField(
+    payment_method = models.CharField(
-        _("payment method"), choices=PaymentMethod, default=PaymentMethod.CARD
+        _("payment method"),
+        max_length=255,
+        choices=PAYMENT_METHOD,
+        default="CARD",
     )
+    bank = models.CharField(
+        _("bank"), max_length=255, choices=settings.SITH_COUNTER_BANK, default="OTHER"
+    )
+    is_validated = models.BooleanField(_("is validated"), default=False)
 
     objects = RefillingQuerySet.as_manager()
 
@@ -769,9 +771,10 @@ class Refilling(models.Model):
         if not self.date:
             self.date = timezone.now()
         self.full_clean()
-        if self._state.adding:
+        if not self.is_validated:
             self.customer.amount += self.amount
             self.customer.save()
+            self.is_validated = True
         if self.customer.user.preferences.notify_on_refill:
             Notification(
                 user=self.customer.user,
@@ -811,10 +814,6 @@ class SellingQuerySet(models.QuerySet):
 class Selling(models.Model):
     """Handle the sellings."""
 
-    class PaymentMethod(models.IntegerChoices):
-        SITH_ACCOUNT = 0, _("Sith account")
-        CARD = 1, _("Credit card")
-
     # We make sure that sellings have a way begger label than any product name is allowed to
     label = models.CharField(_("label"), max_length=128)
     product = models.ForeignKey(
@@ -851,9 +850,13 @@ class Selling(models.Model):
         on_delete=models.SET_NULL,
     )
     date = models.DateTimeField(_("date"), db_index=True)
-    payment_method = models.PositiveSmallIntegerField(
+    payment_method = models.CharField(
-        _("payment method"), choices=PaymentMethod, default=PaymentMethod.SITH_ACCOUNT
+        _("payment method"),
+        max_length=255,
+        choices=[("SITH_ACCOUNT", _("Sith account")), ("CARD", _("Credit card"))],
+        default="SITH_ACCOUNT",
     )
+    is_validated = models.BooleanField(_("is validated"), default=False)
 
     objects = SellingQuerySet.as_manager()
 
@@ -872,12 +875,10 @@ class Selling(models.Model):
         if not self.date:
             self.date = timezone.now()
         self.full_clean()
-        if (
+        if not self.is_validated:
-            self._state.adding
-            and self.payment_method == self.PaymentMethod.SITH_ACCOUNT
-        ):
             self.customer.amount -= self.quantity * self.unit_price
             self.customer.save(allow_negative=allow_negative)
+            self.is_validated = True
         user = self.customer.user
         if user.was_subscribed:
             if (
@@ -947,9 +948,7 @@ class Selling(models.Model):
     def is_owned_by(self, user: User) -> bool:
         if user.is_anonymous:
             return False
-        return self.payment_method != self.PaymentMethod.CARD and user.is_owner(
+        return self.payment_method != "CARD" and user.is_owner(self.counter)
-            self.counter
-        )
 
     def can_be_viewed_by(self, user: User) -> bool:
         if (
@@ -959,7 +958,7 @@ class Selling(models.Model):
         return user == self.customer.user
 
     def delete(self, *args, **kwargs):
-        if self.payment_method == Selling.PaymentMethod.SITH_ACCOUNT:
+        if self.payment_method == "SITH_ACCOUNT":
             self.customer.amount += self.quantity * self.unit_price
             self.customer.save()
         super().delete(*args, **kwargs)

counter/schemas.py

@@ -1,12 +1,13 @@
 from datetime import datetime
 from typing import Annotated, Self
 
+from annotated_types import MinLen
 from django.urls import reverse
-from ninja import FilterLookup, FilterSchema, ModelSchema, Schema
+from ninja import Field, FilterSchema, ModelSchema, Schema
 from pydantic import model_validator
 
 from club.schemas import SimpleClubSchema
-from core.schemas import GroupSchema, NonEmptyStr, SimpleUserSchema
+from core.schemas import GroupSchema, SimpleUserSchema
 from counter.models import Counter, Product, ProductType
 
 
@@ -20,7 +21,7 @@ class CounterSchema(ModelSchema):
 
 
 class CounterFilterSchema(FilterSchema):
-    search: Annotated[NonEmptyStr | None, FilterLookup("name__icontains")] = None
+    search: Annotated[str, MinLen(1)] = Field(None, q="name__icontains")
 
 
 class SimplifiedCounterSchema(ModelSchema):
@@ -92,18 +93,18 @@ class ProductSchema(ModelSchema):
 
 
 class ProductFilterSchema(FilterSchema):
-    search: Annotated[
+    search: Annotated[str, MinLen(1)] | None = Field(
-        NonEmptyStr | None, FilterLookup(["name__icontains", "code__icontains"])
+        None, q=["name__icontains", "code__icontains"]
-    ] = None
+    )
-    is_archived: Annotated[bool | None, FilterLookup("archived")] = None
+    is_archived: bool | None = Field(None, q="archived")
-    buying_groups: Annotated[set[int] | None, FilterLookup("buying_groups__in")] = None
+    buying_groups: set[int] | None = Field(None, q="buying_groups__in")
-    product_type: Annotated[set[int] | None, FilterLookup("product_type__in")] = None
+    product_type: set[int] | None = Field(None, q="product_type__in")
-    club: Annotated[set[int] | None, FilterLookup("club__in")] = None
+    club: set[int] | None = Field(None, q="club__in")
-    counter: Annotated[set[int] | None, FilterLookup("counters__in")] = None
+    counter: set[int] | None = Field(None, q="counters__in")
 
 
 class SaleFilterSchema(FilterSchema):
-    before: Annotated[datetime | None, FilterLookup("date__lt")] = None
+    before: datetime | None = Field(None, q="date__lt")
-    after: Annotated[datetime | None, FilterLookup("date__gt")] = None
+    after: datetime | None = Field(None, q="date__gt")
-    counters: Annotated[set[int] | None, FilterLookup("counter__in")] = None
+    counters: set[int] | None = Field(None, q="counter__in")
-    products: Annotated[set[int] | None, FilterLookup("product__in")] = None
+    products: set[int] | None = Field(None, q="product__in")

counter/templates/counter/counter_click.jinja

@@ -104,7 +104,7 @@
             </div>
             <ul>
               <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
-              <template x-for="(item, index) in Object.values(basket)" :key="item.product.id">
+              <template x-for="(item, index) in Object.values(basket)">
                 <li>
                   <template x-for="error in item.errors">
                     <div class="alert alert-red" x-text="error">

counter/templates/counter/stats.jinja

@@ -51,7 +51,7 @@
           <td>{{ loop.index }}</td>
           <td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
           <td>{{ barman.promo or '' }}</td>
-          <td>{{ barman.perm_sum|format_timedelta }}</td>
+          <td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
         </tr>
       {% endfor %}
     </tbody>
@@ -73,7 +73,7 @@
           <td>{{ loop.index }}</td>
           <td>{{ barman.name }} {% if barman.nickname %}({{ barman.nickname }}){% endif %}</td>
           <td>{{ barman.promo or '' }}</td>
-          <td>{{ barman.perm_sum|format_timedelta }}</td>
+          <td>{{ barman.perm_sum|format_timedelta|truncate_time("millis") }}</td>
         </tr>
       {% endfor %}
     </tbody>

counter/tests/test_account_dump.py

@@ -116,6 +116,7 @@ class TestAccountDumpCommand(TestAccountDump):
             operation: Selling = customer.buyings.order_by("date").last()
             assert operation.unit_price == initial_amount
             assert operation.counter_id == settings.SITH_COUNTER_ACCOUNT_DUMP_ID
+            assert operation.is_validated is True
             dump = customer.dumps.last()
             assert dump.dump_operation == operation
 

counter/tests/test_auto_actions.py

@@ -11,12 +11,8 @@ from model_bakery import baker
 
 from core.models import Group, User
 from counter.baker_recipes import counter_recipe, product_recipe
-from counter.forms import (
+from counter.forms import ScheduledProductActionForm, ScheduledProductActionFormSet
-    ProductForm,
+from counter.models import ScheduledProductAction
-    ScheduledProductActionForm,
-    ScheduledProductActionFormSet,
-)
-from counter.models import Product, ScheduledProductAction
 
 
 @pytest.mark.django_db
@@ -38,39 +34,6 @@ def test_edit_product(client: Client):
     assert res.status_code == 200
 
 
-@pytest.mark.django_db
-def test_create_actions_alongside_product():
-    """The form should work when the product and the actions are created alongside."""
-    # non-persisted instance
-    product: Product = product_recipe.prepare(_save_related=True)
-    trigger_at = now() + timedelta(minutes=10)
-    form = ProductForm(
-        data={
-            "name": "foo",
-            "description": "bar",
-            "product_type": product.product_type_id,
-            "club": product.club_id,
-            "code": "FOO",
-            "purchase_price": 1.0,
-            "selling_price": 1.0,
-            "special_selling_price": 1.0,
-            "limit_age": 0,
-            "form-TOTAL_FORMS": "2",
-            "form-INITIAL_FORMS": "0",
-            "form-0-task": "counter.tasks.archive_product",
-            "form-0-trigger_at": trigger_at,
-        },
-    )
-    assert form.is_valid()
-    product = form.save()
-    action = ScheduledProductAction.objects.last()
-    assert action.clocked.clocked_time == trigger_at
-    assert action.enabled is True
-    assert action.one_off is True
-    assert action.task == "counter.tasks.archive_product"
-    assert action.kwargs == json.dumps({"product_id": product.id})
-
-
 @pytest.mark.django_db
 class TestProductActionForm:
     def test_single_form_archive(self):

counter/tests/test_counter.py

@@ -53,7 +53,7 @@ def set_age(user: User, age: int):
 
 
 def force_refill_user(user: User, amount: Decimal | int):
-    baker.make(Refilling, amount=amount, customer=user.customer)
+    baker.make(Refilling, amount=amount, customer=user.customer, is_validated=False)
 
 
 class TestFullClickBase(TestCase):
@@ -115,10 +115,18 @@ class TestRefilling(TestFullClickBase):
     ) -> HttpResponse:
         used_client = client if client is not None else self.client
         return used_client.post(
-            reverse("counter:refilling_create", kwargs={"customer_id": user.pk}),
+            reverse(
-            {"amount": str(amount), "payment_method": Refilling.PaymentMethod.CASH},
+                "counter:refilling_create",
+                kwargs={"customer_id": user.pk},
+            ),
+            {
+                "amount": str(amount),
+                "payment_method": "CASH",
+                "bank": "OTHER",
+            },
             HTTP_REFERER=reverse(
-                "counter:click", kwargs={"counter_id": counter.id, "user_id": user.pk}
+                "counter:click",
+                kwargs={"counter_id": counter.id, "user_id": user.pk},
             ),
         )
 
@@ -141,7 +149,11 @@ class TestRefilling(TestFullClickBase):
                     "counter:refilling_create",
                     kwargs={"customer_id": self.customer.pk},
                 ),
-                {"amount": "10", "payment_method": "CASH"},
+                {
+                    "amount": "10",
+                    "payment_method": "CASH",
+                    "bank": "OTHER",
+                },
             )
 
         self.client.force_login(self.club_admin)

counter/tests/test_customer.py

@@ -298,6 +298,7 @@ def test_update_balance():
             _quantity=len(customers),
             unit_price=10,
             quantity=1,
+            payment_method="SITH_ACCOUNT",
             _save_related=True,
         ),
         *sale_recipe.prepare(
@@ -305,12 +306,14 @@ def test_update_balance():
             _quantity=3,
             unit_price=5,
             quantity=2,
+            payment_method="SITH_ACCOUNT",
             _save_related=True,
         ),
         sale_recipe.prepare(
             customer=customers[4],
             quantity=1,
             unit_price=50,
+            payment_method="SITH_ACCOUNT",
             _save_related=True,
         ),
         *sale_recipe.prepare(
@@ -321,7 +324,7 @@ def test_update_balance():
             _quantity=len(customers),
             unit_price=50,
             quantity=1,
-            payment_method=Selling.PaymentMethod.CARD,
+            payment_method="CARD",
             _save_related=True,
         ),
     ]

counter/tests/test_invoices.py

@@ -6,7 +6,7 @@ from django.contrib.auth.models import Permission
 from django.core.exceptions import ValidationError
 from django.test import Client
 from django.urls import reverse
-from django.utils.timezone import now
+from django.utils.timezone import localdate
 from model_bakery import baker
 from pytest_django.asserts import assertRedirects
 
@@ -57,7 +57,7 @@ def test_invoice_call_view(client: Client, query: dict | None):
 @pytest.mark.django_db
 def test_invoice_call_form():
     Selling.objects.all().delete()
-    month = now() - relativedelta(months=1)
+    month = localdate() - relativedelta(months=1)
     clubs = baker.make(Club, _quantity=2)
     recipe = sale_recipe.extend(date=month, customer=baker.make(Customer, amount=10000))
     recipe.make(club=clubs[0], quantity=2, unit_price=200)

counter/views/admin.py

@@ -12,7 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from django.conf import settings
 from django.contrib.auth.mixins import PermissionRequiredMixin, UserPassesTestMixin
@@ -23,7 +23,6 @@ from django.forms.models import modelform_factory
 from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
-from django.utils.timezone import get_current_timezone
 from django.utils.translation import gettext as _
 from django.views.generic import DetailView, ListView, TemplateView
 from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateView
@@ -286,13 +285,7 @@ class CounterStatView(PermissionRequiredMixin, DetailView):
     def get_context_data(self, **kwargs):
         """Add stats to the context."""
         counter: Counter = self.object
-        start_date = get_start_of_semester()
+        semester_start = get_start_of_semester()
-        semester_start = datetime(
-            start_date.year,
-            start_date.month,
-            start_date.day,
-            tzinfo=get_current_timezone(),
-        )
         office_hours = counter.get_top_barmen()
         kwargs = super().get_context_data(**kwargs)
         kwargs.update(

counter/views/invoice.py

@@ -12,7 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from datetime import datetime, timezone
+from datetime import datetime
 from urllib.parse import urlencode
 
 from dateutil.relativedelta import relativedelta
@@ -63,18 +63,19 @@ class InvoiceCallView(
         """Add sums to the context."""
         kwargs = super().get_context_data(**kwargs)
         kwargs["months"] = Selling.objects.datetimes("date", "month", order="DESC")
-        month = self.get_month()
+        start_date = self.get_month()
-        start_date = datetime(month.year, month.month, month.day, tzinfo=timezone.utc)
         end_date = start_date + relativedelta(months=1)
 
         kwargs["sum_cb"] = Refilling.objects.filter(
-            payment_method=Refilling.PaymentMethod.CARD,
+            payment_method="CARD",
+            is_validated=True,
             date__gte=start_date,
             date__lte=end_date,
         ).aggregate(res=Sum("amount", default=0))["res"]
         kwargs["sum_cb"] += (
             Selling.objects.filter(
-                payment_method=Selling.PaymentMethod.CARD,
+                payment_method="CARD",
+                is_validated=True,
                 date__gte=start_date,
                 date__lte=end_date,
             )

docs/howto/migrations.md

@@ -177,7 +177,7 @@ from django.conf import settings
 class Migration(migrations.Migration):
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("pedagogy", "0003_alter_ue_language"),
+        ("pedagogy", "0003_alter_uv_language"),
     ]
 
     operations = [
@@ -215,12 +215,11 @@ On modifie donc le modèle :
 ```python
 from django.db import models
 from core.models import User
-from pedagogy.models import UE
+from pedagogy.models import UV
-
 
 class UserUe(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
-    ue = models.ForeignKey(UE, on_delete=models.CASCADE)
+    ue = models.ForeignKey(UV, on_delete=models.CASCADE)
 ```
 
 On refait la commande `makemigrations` et on obtient :
@@ -238,7 +237,7 @@ class Migration(migrations.Migration):
             model_name="userue",
             name="ue",
             field=models.ForeignKey(
-                on_delete=models.deletion.CASCADE, to="pedagogy.ue"
+                on_delete=models.deletion.CASCADE, to="pedagogy.uv"
             ),
         ),
     ]
@@ -281,7 +280,7 @@ python ./manage.py squasmigrations <app> <migration de début (incluse)> <migrat
 Par exemple, dans notre cas, ça donnera :
 
 ```bash
-python ./manage.py squashmigrations pedagogy 0004 0005 
+python ./manage.py squasmigrations pedagogy 0004 0005 
 ```
 
 La commande vous donnera ceci :
@@ -293,7 +292,7 @@ class Migration(migrations.Migration):
     replaces = [("pedagogy", "0004_userue"), ("pedagogy", "0005_alter_userue_ue")]
 
     dependencies = [
-        ("pedagogy", "0003_alter_ue_language"),
+        ("pedagogy", "0003_alter_uv_language"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
@@ -313,7 +312,7 @@ class Migration(migrations.Migration):
                 (
                     "ue",
                     models.ForeignKey(
-                        on_delete=models.deletion.CASCADE, to="pedagogy.ue"
+                        on_delete=models.deletion.CASCADE, to="pedagogy.uv"
                     ),
                 ),
                 (

docs/tutorial/groups.md

@@ -263,35 +263,3 @@ avec un unique champ permettant de sélectionner des groupes.
 Par défaut, seuls les utilisateurs avec la permission
 `auth.change_permission` auront accès à ce formulaire
 (donc, normalement, uniquement les utilisateurs Root).
-
-```mermaid
-sequenceDiagram
-    participant A as Utilisateur
-    participant B as ReverseProxy
-    participant C as MarkdownImage
-    participant D as Model
-
-    A->>B: GET /page/foo
-    B->>C: GET /page/foo
-    C-->>B: La page, avec les urls
-    B-->>A: La page, avec les urls
-    alt image publique 
-        A->>B: GET markdown/public/2025/img.webp
-        B-->>A: img.webp
-    end
-    alt image privée 
-        A->>B: GET markdown_image/{id}
-        B->>C: GET markdown_image/{id}
-        C->>D: user.can_view(image)
-        alt l'utilisateur a le droit de voir l'image
-            D-->>C: True
-            C-->>B: 200 (avec le X-Accel-Redirect)
-            B-->>A: img.webp
-        end
-        alt l'utilisateur n'a pas le droit de l'image
-            D-->>C: False
-            C-->>B: 403
-            B-->>A: 403
-        end
-    end
-```

eboutic/models.py

@@ -110,9 +110,7 @@ class Basket(models.Model):
             )["total"]
         )
 
-    def generate_sales(
+    def generate_sales(self, counter, seller: User, payment_method: str):
-        self, counter, seller: User, payment_method: Selling.PaymentMethod
-    ):
         """Generate a list of sold items corresponding to the items
         of this basket WITHOUT saving them NOR deleting the basket.
 
@@ -253,7 +251,8 @@ class Invoice(models.Model):
                     customer=customer,
                     operator=self.user,
                     amount=i.product_unit_price * i.quantity,
-                    payment_method=Refilling.PaymentMethod.CARD,
+                    payment_method="CARD",
+                    bank="OTHER",
                     date=self.date,
                 )
                 new.save()
@@ -268,7 +267,8 @@ class Invoice(models.Model):
                     customer=customer,
                     unit_price=i.product_unit_price,
                     quantity=i.quantity,
-                    payment_method=Selling.PaymentMethod.CARD,
+                    payment_method="CARD",
+                    is_validated=True,
                     date=self.date,
                 )
                 new.save()

eboutic/tests/test_basket.py

@@ -108,22 +108,12 @@ def test_eboutic_basket_expiry(
 
     client.force_login(customer.user)
 
-    if sellings:
+    for date in sellings:
         sale_recipe.make(
-            customer=customer,
+            customer=customer, counter=eboutic, date=date, is_validated=True
-            counter=eboutic,
-            date=iter(sellings),
-            _quantity=len(sellings),
-            _bulk_create=True,
-        )
-    if refillings:
-        refill_recipe.make(
-            customer=customer,
-            counter=eboutic,
-            date=iter(refillings),
-            _quantity=len(refillings),
-            _bulk_create=True,
         )
+    for date in refillings:
+        refill_recipe.make(customer=customer, counter=eboutic, date=date)
 
     assert (
         f'x-data="basket({int(expected.timestamp() * 1000) if expected else "null"})"'

eboutic/tests/test_payment.py

@@ -114,13 +114,13 @@ class TestPaymentSith(TestPaymentBase):
             "quantity"
         )
         assert len(sellings) == 2
-        assert sellings[0].payment_method == Selling.PaymentMethod.SITH_ACCOUNT
+        assert sellings[0].payment_method == "SITH_ACCOUNT"
         assert sellings[0].quantity == 1
         assert sellings[0].unit_price == self.snack.selling_price
         assert sellings[0].counter.type == "EBOUTIC"
         assert sellings[0].product == self.snack
 
-        assert sellings[1].payment_method == Selling.PaymentMethod.SITH_ACCOUNT
+        assert sellings[1].payment_method == "SITH_ACCOUNT"
         assert sellings[1].quantity == 2
         assert sellings[1].unit_price == self.beer.selling_price
         assert sellings[1].counter.type == "EBOUTIC"
@@ -198,13 +198,13 @@ class TestPaymentCard(TestPaymentBase):
             "quantity"
         )
         assert len(sellings) == 2
-        assert sellings[0].payment_method == Selling.PaymentMethod.CARD
+        assert sellings[0].payment_method == "CARD"
         assert sellings[0].quantity == 1
         assert sellings[0].unit_price == self.snack.selling_price
         assert sellings[0].counter.type == "EBOUTIC"
         assert sellings[0].product == self.snack
 
-        assert sellings[1].payment_method == Selling.PaymentMethod.CARD
+        assert sellings[1].payment_method == "CARD"
         assert sellings[1].quantity == 2
         assert sellings[1].unit_price == self.beer.selling_price
         assert sellings[1].counter.type == "EBOUTIC"

eboutic/views.py

@@ -275,9 +275,7 @@ class EbouticPayWithSith(CanViewMixin, SingleObjectMixin, View):
             return redirect("eboutic:payment_result", "failure")
 
         eboutic = get_eboutic()
-        sales = basket.generate_sales(
+        sales = basket.generate_sales(eboutic, basket.user, "SITH_ACCOUNT")
-            eboutic, basket.user, Selling.PaymentMethod.SITH_ACCOUNT
-        )
         try:
             with transaction.atomic():
                 # Selling.save has some important business logic in it.

galaxy/management/commands/generate_galaxy_test_data.py

@@ -25,12 +25,13 @@ import warnings
 from datetime import timedelta
 from typing import Final, Optional
 
+from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 
 from club.models import Club, Membership
-from core.models import Group, Page, User
+from core.models import Group, Page, SithFile, User
 from core.utils import RED_PIXEL_PNG
 from sas.models import Album, PeoplePictureRelation, Picture
 from subscription.models import Subscription
@@ -90,8 +91,13 @@ class Command(BaseCommand):
         self.NB_CLUBS = options["club_count"]
 
         root = User.objects.filter(username="root").first()
+        sas = SithFile.objects.get(id=settings.SITH_SAS_ROOT_DIR_ID)
         self.galaxy_album = Album.objects.create(
-            name="galaxy-register-file", owner=root, is_moderated=True
+            name="galaxy-register-file",
+            owner=root,
+            is_moderated=True,
+            is_in_sas=True,
+            parent=sas,
         )
 
         self.make_clubs()
@@ -279,10 +285,14 @@ class Command(BaseCommand):
                     owner=u,
                     name=f"galaxy-picture {u} {i // self.NB_USERS}",
                     is_moderated=True,
+                    is_folder=False,
                     parent=self.galaxy_album,
-                    original=ContentFile(RED_PIXEL_PNG),
+                    is_in_sas=True,
+                    file=ContentFile(RED_PIXEL_PNG),
                     compressed=ContentFile(RED_PIXEL_PNG),
                     thumbnail=ContentFile(RED_PIXEL_PNG),
+                    mime_type="image/png",
+                    size=len(RED_PIXEL_PNG),
                 )
             )
             self.picts[i].file.name = self.picts[i].name

matmat/forms.py

@@ -1,54 +0,0 @@
-#
-# Copyright 2025
-# - Maréchal <thomas.girod@utbm.fr>
-#
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
-# http://ae.utbm.fr.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-from typing import Any
-
-from django import forms
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext_lazy as _
-
-from core.models import User
-from core.views.forms import SelectDate
-
-
-class SearchForm(forms.ModelForm):
-    class Meta:
-        model = User
-        fields = ["promo", "role", "department", "semester", "date_of_birth"]
-        widgets = {"date_of_birth": SelectDate}
-
-    name = forms.CharField(
-        label=_("Last/First name or nickname"), min_length=1, max_length=255
-    )
-    field_order = ["name", "promo", "role", "department", "semester", "date_of_birth"]
-
-    def __init__(self, *args, initial: dict[str, Any], **kwargs):
-        super().__init__(*args, initial=initial, **kwargs)
-        for key in self.fields:
-            self.fields[key].required = False
-            if key not in initial:
-                self.fields[key].initial = None
-
-    def clean(self):
-        data = self.cleaned_data
-        if all(data[key] in self.fields[key].empty_values for key in self.fields):
-            raise ValidationError(_("Empty search"))

matmat/templates/matmat/search_form.jinja

@@ -1,18 +1,12 @@
-{% if is_fragment %}
+{% extends "core/base.jinja" %}
-  {% extends "core/base_fragment.jinja" %}
+{% from "core/macros.jinja" import user_mini_profile, paginate_jinja %}
-{% else %}
-  {% extends "core/base.jinja" %}
-{% endif %}
-
-{% from "core/macros.jinja" import user_mini_profile, paginate_htmx with context %}
-
 
 {% block title %}
   {% trans %}Search user{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  {% if paginator.count > 0 %}
+  {% if result_exists %}
     <h2>{% trans %}Results{% endtrans %}</h2>
     <div class="matmat_results">
       {% for user in object_list %}
@@ -25,24 +19,47 @@
       {% endfor %}
     </div>
     {% if page_obj.has_other_pages() %}
-      {{ paginate_htmx(page_obj, paginator) }}
+      {{ paginate_jinja(page_obj, paginator) }}
     {% endif %}
     <hr>
   {% endif %}
   <h2>{% trans %}Search user{% endtrans %}</h2>
-  <form action="{{ url('matmat:search') }}" method="get">
+  <h3>{% trans %}Search by profile{% endtrans %}</h3>
-    {{ form.non_field_errors() }}
+  <form action="{{ url('matmat:search') }}" method="post" enctype="multipart/form-data">
-    <fieldset class="fields-centered">
+    {% csrf_token %}
-      {% for field in form %}
+    {% for field in form %}
-        <div>
+      {% if field.name not in ('phone', 'quick') %}
-          {{ field.label_tag() }}
+        <p>
-          {{ field }}
           {{ field.errors }}
-        </div>
+          <label for="{{ field.id_for_label }}">{{ field.label }}</label>
-      {% endfor %}
+          {{ field }}
-    </fieldset>
+        </p>
-    <div class="fields-centered">
+      {% endif %}
-      <input class="btn btn-blue" type="submit" value="{% trans %}Search{% endtrans %}" />
+    {% endfor %}
-    </div>
+    <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
+  </form>
+  <h3>{% trans %}Inverted search{% endtrans %}</h3>
+  <form action="{{ url('matmat:search_reverse') }}" method="post" enctype="multipart/form-data">
+    {% csrf_token %}
+    <p>
+      {{ form.phone.errors }}
+      <label for="{{ form.phone.id_for_label }}">{{ form.phone.label }}</label>
+      {{ form.phone }}
+      <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
+    </p>
+  </form>
+  <h3>{% trans %}Quick search{% endtrans %}</h3>
+  <form action="{{ url('matmat:search_quick') }}" method="post">
+    {% csrf_token %}
+    <p>
+      {{ form.quick.errors }}
+      <label for="{{ form.quick.id_for_label }}">{{ form.quick.label }}</label>
+      {{ form.quick }}
+      <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
+    </p>
   </form>
 {% endblock %}
+
+{% block script %}
+  {{ super() }}
+{% endblock %}

matmat/tests.py

@@ -1,59 +1 @@
 # Create your tests here.
-
-from django.core.management import call_command
-from django.test import TestCase
-from django.urls import reverse
-from model_bakery import baker
-
-from com.models import News
-from core.baker_recipes import subscriber_user
-from core.models import User
-
-
-class TestMatmatronch(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        News.objects.all().delete()
-        User.objects.all().delete()
-        users = [
-            baker.prepare(User, promo=17),
-            baker.prepare(User, promo=17),
-            baker.prepare(User, promo=17, department="INFO"),
-            baker.prepare(User, promo=18, department="INFO"),
-        ]
-        cls.users = User.objects.bulk_create(users)
-        call_command("update_index", "core", "--remove")
-
-    def test_search(self):
-        self.client.force_login(subscriber_user.make())
-        response = self.client.get(reverse("matmat:search"))
-        assert response.status_code == 200
-        response = self.client.get(
-            reverse("matmat:search", query={"promo": 17, "department": "INFO"})
-        )
-        assert response.status_code == 200
-        assert list(response.context_data["object_list"]) == [self.users[2]]
-
-    def test_empty_search(self):
-        self.client.force_login(subscriber_user.make())
-        response = self.client.get(reverse("matmat:search"))
-        assert response.status_code == 200
-        assert list(response.context_data["object_list"]) == []
-        assert not response.context_data["form"].is_valid()
-
-        response = self.client.get(
-            reverse(
-                "matmat:search",
-                query={
-                    "promo": "",
-                    "role": "",
-                    "department": "",
-                    "semester": "",
-                    "date_of_birth": "",
-                },
-            )
-        )
-        assert response.status_code == 200
-        assert list(response.context_data["object_list"]) == []
-        assert not response.context_data["form"].is_valid()
-        assert "Recherche vide" in response.context_data["form"].non_field_errors()

matmat/urls.py

@@ -23,8 +23,16 @@
 
 from django.urls import path
 
-from matmat.views import MatmatronchView
+from matmat.views import (
+    SearchClearFormView,
+    SearchNormalFormView,
+    SearchQuickFormView,
+    SearchReverseFormView,
+)
 
 urlpatterns = [
-    path("", MatmatronchView.as_view(), name="search"),
+    path("", SearchNormalFormView.as_view(), name="search"),
+    path("reverse/", SearchReverseFormView.as_view(), name="search_reverse"),
+    path("quick/", SearchQuickFormView.as_view(), name="search_quick"),
+    path("clear/", SearchClearFormView.as_view(), name="search_clear"),
 ]

matmat/views.py

@@ -16,49 +16,192 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
+from ast import literal_eval
+from enum import Enum
 
-from django.db.models import F
+from django import forms
-from django.views.generic import ListView
+from django.http.response import HttpResponseRedirect
-from django.views.generic.edit import FormMixin
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import ListView, View
+from django.views.generic.detail import SingleObjectMixin
+from django.views.generic.edit import FormView
+from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
 from core.auth.mixins import FormerSubscriberMixin
-from core.models import User, UserQuerySet
+from core.models import User
-from core.schemas import UserFilterSchema
+from core.views import search_user
-from core.views.mixins import AllowFragment
+from core.views.forms import SelectDate
-from matmat.forms import SearchForm
+
+# Enum to select search type
 
 
-class MatmatronchView(AllowFragment, FormerSubscriberMixin, FormMixin, ListView):
+class SearchType(Enum):
+    NORMAL = 1
+    REVERSE = 2
+    QUICK = 3
+
+
+# Custom form
+
+
+class SearchForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = [
+            "first_name",
+            "last_name",
+            "nick_name",
+            "role",
+            "department",
+            "semester",
+            "promo",
+            "date_of_birth",
+            "phone",
+        ]
+        widgets = {
+            "date_of_birth": SelectDate,
+            "phone": RegionalPhoneNumberWidget,
+        }
+
+    quick = forms.CharField(label=_("Last/First name or nickname"), max_length=255)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        for key in self.fields:
+            self.fields[key].required = False
+
+    @property
+    def cleaned_data_json(self):
+        data = self.cleaned_data
+        for key, val in data.items():
+            if key in ("date_of_birth", "phone") and val is not None:
+                data[key] = str(val)
+        return data
+
+
+# Views
+
+
+class SearchFormListView(FormerSubscriberMixin, SingleObjectMixin, ListView):
     model = User
-    paginate_by = 20
+    ordering = ["-id"]
+    paginate_by = 12
     template_name = "matmat/search_form.jinja"
-    form_class = SearchForm
 
-    def get(self, request, *args, **kwargs):
+    def dispatch(self, request, *args, **kwargs):
-        self.form = self.get_form()
+        self.form_class = kwargs["form"]
-        return super().get(request, *args, **kwargs)
+        self.search_type = kwargs["search_type"]
+        self.session = request.session
+        self.last_search = self.session.get("matmat_search_result", str([]))
+        self.last_search = literal_eval(self.last_search)
+        self.valid_form = kwargs.get("valid_form")
 
-    def get_initial(self):
+        self.init_query = self.model.objects
-        return self.request.GET
+        self.can_see_hidden = True
+        if not (request.user.is_board_member or request.user.is_root):
+            self.can_see_hidden = False
+            self.init_query = self.init_query.filter(is_viewable=True)
 
-    def get_form_kwargs(self):
+        return super().dispatch(request, *args, **kwargs)
-        res = super().get_form_kwargs()
-        if self.request.GET:
-            res["data"] = self.request.GET
-        return res
 
-    def get_queryset(self) -> UserQuerySet:
+    def post(self, request, *args, **kwargs):
-        if not self.form.is_valid():
+        return self.get(request, *args, **kwargs)
-            return User.objects.none()
-        data = self.form.cleaned_data
-        data["search"] = data.get("name")
-        filters = UserFilterSchema(**{key: val for key, val in data.items() if val})
-        qs = User.objects.viewable_by(self.request.user).select_related("profile_pict")
-        return filters.filter(qs).order_by(F("last_login").desc(nulls_last=True))
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(form=self.form, **kwargs)
+        self.object = None
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["form"] = self.form_class
+        kwargs["result_exists"] = self.result_exists
+        return kwargs
+
+    def get_queryset(self):
+        q = self.init_query
+        if self.valid_form is not None:
+            if self.search_type == SearchType.REVERSE:
+                q = q.filter(phone=self.valid_form["phone"]).all()
+            elif self.search_type == SearchType.QUICK:
+                if self.valid_form["quick"].strip():
+                    q = search_user(self.valid_form["quick"])
+                else:
+                    q = []
+                if not self.can_see_hidden and len(q) > 0:
+                    q = [user for user in q if user.is_viewable]
+            else:
+                search_dict = {}
+                for key, value in self.valid_form.items():
+                    if key not in ("phone", "quick") and not (
+                        value == "" or value is None
+                    ):
+                        search_dict[key + "__icontains"] = value
+                q = q.filter(**search_dict).all()
+        else:
+            q = q.filter(pk__in=self.last_search).all()
+        if isinstance(q, list):
+            self.result_exists = len(q) > 0
+        else:
+            self.result_exists = q.exists()
+        self.last_search = []
+        for user in q:
+            self.last_search.append(user.id)
+        self.session["matmat_search_result"] = str(self.last_search)
+        return q
+
+
+class SearchFormView(FormerSubscriberMixin, FormView):
+    """Allows users to search inside the user list."""
+
+    form_class = SearchForm
+
+    def dispatch(self, request, *args, **kwargs):
+        self.session = request.session
+        self.init_query = User.objects
+        kwargs["form"] = self.get_form()
+        kwargs["search_type"] = self.search_type
+        return super().dispatch(request, *args, **kwargs)
+
+    def get(self, request, *args, **kwargs):
+        view = SearchFormListView.as_view()
+        return view(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        form = self.get_form()
+        view = SearchFormListView.as_view()
+        if form.is_valid():
+            kwargs["valid_form"] = form.clean()
+            request.session["matmat_search_form"] = form.cleaned_data_json
+        return view(request, *args, **kwargs)
+
+    def get_initial(self):
+        init = self.session.get("matmat_search_form", {})
+        if not init:
+            init["department"] = ""
+        return init
+
+
+class SearchNormalFormView(SearchFormView):
+    search_type = SearchType.NORMAL
+
+
+class SearchReverseFormView(SearchFormView):
+    search_type = SearchType.REVERSE
+
+
+class SearchQuickFormView(SearchFormView):
+    search_type = SearchType.QUICK
+
+
+class SearchClearFormView(FormerSubscriberMixin, View):
+    """Clear SearchFormView and redirect to it."""
+
+    def dispatch(self, request, *args, **kwargs):
+        super().dispatch(request, *args, **kwargs)
+        if "matmat_search_form" in request.session:
+            request.session.pop("matmat_search_form")
+        if "matmat_search_result" in request.session:
+            request.session.pop("matmat_search_result")
+        return HttpResponseRedirect(reverse("matmat:search"))

package-lock.json

@@ -42,7 +42,7 @@
         "@babel/core": "^7.28.5",
         "@babel/preset-env": "^7.28.5",
         "@biomejs/biome": "^1.9.4",
-        "@hey-api/openapi-ts": "^0.73.0",
+        "@hey-api/openapi-ts": "^0.90.10",
         "@rollup/plugin-inject": "^5.0.5",
         "@types/alpinejs": "^3.13.11",
         "@types/cytoscape-cxtmenu": "^3.4.5",
@@ -2266,16 +2266,38 @@
         "@fullcalendar/core": "~6.1.19"
       }
     },
+    "node_modules/@hey-api/codegen-core": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@hey-api/codegen-core/-/codegen-core-0.5.5.tgz",
+      "integrity": "sha512-f2ZHucnA2wBGAY8ipB4wn/mrEYW+WUxU2huJmUvfDO6AE2vfILSHeF3wCO39Pz4wUYPoAWZByaauftLrOfC12Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@hey-api/types": "0.1.2",
+        "ansi-colors": "4.1.3",
+        "c12": "3.3.3",
+        "color-support": "1.1.3"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/hey-api"
+      },
+      "peerDependencies": {
+        "typescript": ">=5.5.3"
+      }
+    },
     "node_modules/@hey-api/json-schema-ref-parser": {
-      "version": "1.0.6",
+      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@hey-api/json-schema-ref-parser/-/json-schema-ref-parser-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/@hey-api/json-schema-ref-parser/-/json-schema-ref-parser-1.2.2.tgz",
-      "integrity": "sha512-yktiFZoWPtEW8QKS65eqKwA5MTKp88CyiL8q72WynrBs/73SAaxlSWlA2zW/DZlywZ5hX1OYzrCC0wFdvO9c2w==",
+      "integrity": "sha512-oS+5yAdwnK20lSeFO1d53Ku+yaGCsY8PcrmSq2GtSs3bsBfRnHAbpPKSVzQcaxAOrzj5NB+f34WhZglVrNayBA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jsdevtools/ono": "^7.1.3",
         "@types/json-schema": "^7.0.15",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "lodash": "^4.17.21"
       },
       "engines": {
@@ -2286,33 +2308,54 @@
       }
     },
     "node_modules/@hey-api/openapi-ts": {
-      "version": "0.73.0",
+      "version": "0.90.10",
-      "resolved": "https://registry.npmjs.org/@hey-api/openapi-ts/-/openapi-ts-0.73.0.tgz",
+      "resolved": "https://registry.npmjs.org/@hey-api/openapi-ts/-/openapi-ts-0.90.10.tgz",
-      "integrity": "sha512-sUscR3OIGW0k9U//28Cu6BTp3XaogWMDORj9H+5Du9E5AvTT7LZbCEDvkLhebFOPkp2cZAQfd66HiZsiwssBcQ==",
+      "integrity": "sha512-o0wlFxuLt1bcyIV/ZH8DQ1wrgODTnUYj/VfCHOOYgXUQlLp9Dm2PjihOz+WYrZLowhqUhSKeJRArOGzvLuOTsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@hey-api/json-schema-ref-parser": "1.0.6",
+        "@hey-api/codegen-core": "^0.5.5",
+        "@hey-api/json-schema-ref-parser": "1.2.2",
+        "@hey-api/types": "0.1.2",
         "ansi-colors": "4.1.3",
-        "c12": "2.0.1",
         "color-support": "1.1.3",
-        "commander": "13.0.0",
+        "commander": "14.0.2",
-        "handlebars": "4.7.8",
+        "open": "11.0.0",
-        "open": "10.1.2"
+        "semver": "7.7.3"
       },
       "bin": {
-        "openapi-ts": "bin/index.cjs"
+        "openapi-ts": "bin/run.js"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=22.10.0"
+        "node": ">=20.19.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/hey-api"
       },
       "peerDependencies": {
-        "typescript": "^5.5.3"
+        "typescript": ">=5.5.3"
       }
     },
+    "node_modules/@hey-api/openapi-ts/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@hey-api/types": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@hey-api/types/-/types-0.1.2.tgz",
+      "integrity": "sha512-uNNtiVAWL7XNrV/tFXx7GLY9lwaaDazx1173cGW3+UEaw4RUPsHEmiB4DSpcjNxMIcrctfz2sGKLnVx5PBG2RA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@isaacs/balanced-match": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
@@ -2992,19 +3035,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/alpinejs": {
       "version": "3.15.1",
       "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.15.1.tgz",
@@ -3220,27 +3250,27 @@
       }
     },
     "node_modules/c12": {
-      "version": "2.0.1",
+      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/c12/-/c12-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/c12/-/c12-3.3.3.tgz",
-      "integrity": "sha512-Z4JgsKXHG37C6PYUtIxCfLJZvo6FyhHJoClwwb9ftUkLpPSkuYqn6Tr+vnaN8hymm0kIbcg6Ey3kv/Q71k5w/A==",
+      "integrity": "sha512-750hTRvgBy5kcMNPdh95Qo+XUBeGo8C7nsKSmedDmaQI+E0r82DwHeM6vBewDe4rGFbnxoa4V9pw+sPh5+Iz8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": "^4.0.1",
+        "chokidar": "^5.0.0",
-        "confbox": "^0.1.7",
+        "confbox": "^0.2.2",
         "defu": "^6.1.4",
-        "dotenv": "^16.4.5",
+        "dotenv": "^17.2.3",
-        "giget": "^1.2.3",
+        "exsolve": "^1.0.8",
-        "jiti": "^2.3.0",
+        "giget": "^2.0.0",
-        "mlly": "^1.7.1",
+        "jiti": "^2.6.1",
-        "ohash": "^1.1.4",
+        "ohash": "^2.0.11",
-        "pathe": "^1.1.2",
+        "pathe": "^2.0.3",
-        "perfect-debounce": "^1.0.0",
+        "perfect-debounce": "^2.0.0",
-        "pkg-types": "^1.2.0",
+        "pkg-types": "^2.3.0",
         "rc9": "^2.1.2"
       },
       "peerDependencies": {
-        "magicast": "^0.3.5"
+        "magicast": "*"
       },
       "peerDependenciesMeta": {
         "magicast": {
@@ -3292,31 +3322,21 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "4.0.3",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
+        "readdirp": "^5.0.0"
       },
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/citty": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz",
@@ -3465,19 +3485,19 @@
       }
     },
     "node_modules/commander": {
-      "version": "13.0.0",
+      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-13.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
-      "integrity": "sha512-oPYleIY8wmTVzkvQq10AEok6YcTC4sRUBl8F9gVuwchGVUCTbl/vhLTaQqutuuySYOsu8YTgV+OxKc/8Yvx+mQ==",
+      "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/confbox": {
-      "version": "0.1.8",
+      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz",
-      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+      "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -3761,9 +3781,9 @@
       }
     },
     "node_modules/default-browser": {
-      "version": "5.2.1",
+      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz",
-      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3778,9 +3798,9 @@
       }
     },
     "node_modules/default-browser-id": {
-      "version": "5.0.0",
+      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.1.tgz",
-      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
+      "integrity": "sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3818,9 +3838,9 @@
       "license": "MIT"
     },
     "node_modules/dotenv": {
-      "version": "16.6.1",
+      "version": "17.2.3",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
-      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -3931,6 +3951,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/exsolve": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz",
+      "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -4016,39 +4043,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fs-minipass/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -4095,9 +4089,9 @@
       }
     },
     "node_modules/giget": {
-      "version": "1.2.5",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz",
-      "integrity": "sha512-r1ekGw/Bgpi3HLV3h1MRBIlSAdHoIMklpaQ3OQLFcRw9PwAj2rqigvIbg+dBUI51OxVI2jsEtDywDBjSiuf7Ug==",
+      "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4105,21 +4099,13 @@
         "consola": "^3.4.0",
         "defu": "^6.1.4",
         "node-fetch-native": "^1.6.6",
-        "nypm": "^0.5.4",
+        "nypm": "^0.6.0",
-        "pathe": "^2.0.3",
+        "pathe": "^2.0.3"
-        "tar": "^6.2.1"
       },
       "bin": {
         "giget": "dist/cli.mjs"
       }
     },
-    "node_modules/giget/node_modules/pathe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/glob": {
       "version": "11.0.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz",
@@ -4156,28 +4142,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -4328,6 +4292,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-in-ssh": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-in-ssh/-/is-in-ssh-1.0.0.tgz",
+      "integrity": "sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-inside-container": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
@@ -4421,9 +4398,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
+      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4487,9 +4464,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
+      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "dev": true,
       "license": "MIT"
     },
@@ -4553,16 +4530,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -4572,73 +4539,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/mlly": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz",
-      "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.15.0",
-        "pathe": "^2.0.3",
-        "pkg-types": "^1.3.1",
-        "ufo": "^1.6.1"
-      }
-    },
-    "node_modules/mlly/node_modules/pathe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -4687,13 +4587,6 @@
         "fetch-blob": "^3.2.0"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/ngraph.events": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ngraph.events/-/ngraph.events-1.4.0.tgz",
@@ -4778,54 +4671,53 @@
       }
     },
     "node_modules/nypm": {
-      "version": "0.5.4",
+      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.4.tgz",
-      "integrity": "sha512-X0SNNrZiGU8/e/zAB7sCTtdxWTMSIO73q+xuKgglm2Yvzwlo8UoC5FNySQFCvl84uPaeADkqHUZUkWy4aH4xOA==",
+      "integrity": "sha512-1TvCKjZyyklN+JJj2TS3P4uSQEInrM/HkkuSXsEzm1ApPgBffOn8gFguNnZf07r/1X6vlryfIqMUkJKQMzlZiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "citty": "^0.1.6",
+        "citty": "^0.2.0",
-        "consola": "^3.4.0",
         "pathe": "^2.0.3",
-        "pkg-types": "^1.3.1",
+        "tinyexec": "^1.0.2"
-        "tinyexec": "^0.3.2",
-        "ufo": "^1.5.4"
       },
       "bin": {
         "nypm": "dist/cli.mjs"
       },
       "engines": {
-        "node": "^14.16.0 || >=16.10.0"
+        "node": ">=18"
       }
     },
-    "node_modules/nypm/node_modules/pathe": {
+    "node_modules/nypm/node_modules/citty": {
-      "version": "2.0.3",
+      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/citty/-/citty-0.2.0.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "integrity": "sha512-8csy5IBFI2ex2hTVpaHN2j+LNE199AgiI7y4dMintrr8i0lQiFn+0AWMZrWdHKIgMOer65f8IThysYhoReqjWA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/ohash": {
-      "version": "1.1.6",
+      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
-      "integrity": "sha512-TBu7PtV8YkAZn0tSxobKY2n2aAQva936lhRrj6957aDaCf9IEtqsKbgMzXE/F/sjqYOwmrukeORHNLe5glk7Cg==",
+      "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/open": {
-      "version": "10.1.2",
+      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/open/-/open-11.0.0.tgz",
-      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
+      "integrity": "sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "default-browser": "^5.2.1",
+        "default-browser": "^5.4.0",
         "define-lazy-prop": "^3.0.0",
+        "is-in-ssh": "^1.0.0",
         "is-inside-container": "^1.0.0",
-        "is-wsl": "^3.1.0"
+        "powershell-utils": "^0.1.0",
+        "wsl-utils": "^0.3.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -4892,16 +4784,16 @@
       }
     },
     "node_modules/pathe": {
-      "version": "1.1.2",
+      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/perfect-debounce": {
-      "version": "1.0.0",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.1.0.tgz",
-      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+      "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==",
       "dev": true,
       "license": "MIT"
     },
@@ -4926,24 +4818,17 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.3.1",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
-      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+      "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "confbox": "^0.1.8",
+        "confbox": "^0.2.2",
-        "mlly": "^1.7.4",
+        "exsolve": "^1.0.7",
-        "pathe": "^2.0.1"
+        "pathe": "^2.0.3"
       }
     },
-    "node_modules/pkg-types/node_modules/pathe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/polished": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/polished/-/polished-4.3.1.tgz",
@@ -4985,6 +4870,19 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/powershell-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/powershell-utils/-/powershell-utils-0.1.0.tgz",
+      "integrity": "sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/preact": {
       "version": "10.12.1",
       "resolved": "https://registry.npmjs.org/preact/-/preact-10.12.1.tgz",
@@ -5007,13 +4905,13 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "4.1.2",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 14.18.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "type": "individual",
@@ -5305,16 +5203,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -5434,41 +5322,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/text-segmentation": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
@@ -5546,11 +5399,14 @@
       "license": "MIT"
     },
     "node_modules/tinyexec": {
-      "version": "0.3.2",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz",
-      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/tinyglobby": {
       "version": "0.2.15",
@@ -5629,27 +5485,6 @@
       "integrity": "sha512-elJkpCL6Z77Ghw0Lv0lGnhBAjSTOQ5FhiVOCfOuxhaoTT2xtLVbqikYItK5HHchzPbHEUFAcjOH669T2ZzeCbg==",
       "license": "BSD-3-Clause"
     },
-    "node_modules/ufo": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz",
-      "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/uglify-js": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
-      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
@@ -5923,13 +5758,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/wrap-ansi": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -6021,6 +5849,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/wsl-utils": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.3.1.tgz",
+      "integrity": "sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0",
+        "powershell-utils": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

package.json

@@ -27,7 +27,7 @@
     "@babel/core": "^7.28.5",
     "@babel/preset-env": "^7.28.5",
     "@biomejs/biome": "^1.9.4",
-    "@hey-api/openapi-ts": "^0.73.0",
+    "@hey-api/openapi-ts": "^0.90.10",
     "@rollup/plugin-inject": "^5.0.5",
     "@types/alpinejs": "^3.13.11",
     "@types/cytoscape-cxtmenu": "^3.4.5",

pedagogy/admin.py

@@ -23,35 +23,35 @@
 from django.contrib import admin
 from haystack.admin import SearchModelAdmin
 
-from pedagogy.models import UE, UEComment, UECommentReport
+from pedagogy.models import UV, UVComment, UVCommentReport
 
 
-@admin.register(UE)
+@admin.register(UV)
-class UEAdmin(admin.ModelAdmin):
+class UVAdmin(admin.ModelAdmin):
     list_display = ("code", "title", "credit_type", "credits", "department")
     search_fields = ("code", "title", "department")
     autocomplete_fields = ("author",)
 
 
-@admin.register(UEComment)
+@admin.register(UVComment)
-class UECommentAdmin(admin.ModelAdmin):
+class UVCommentAdmin(admin.ModelAdmin):
-    list_display = ("author", "ue", "grade_global", "publish_date")
+    list_display = ("author", "uv", "grade_global", "publish_date")
     search_fields = (
         "author__username",
         "author__first_name",
         "author__last_name",
-        "ue__code",
+        "uv__code",
     )
     autocomplete_fields = ("author",)
 
 
-@admin.register(UECommentReport)
+@admin.register(UVCommentReport)
-class UECommentReportAdmin(SearchModelAdmin):
+class UVCommentReportAdmin(SearchModelAdmin):
-    list_display = ("reporter", "ue")
+    list_display = ("reporter", "uv")
     search_fields = (
         "reporter__username",
         "reporter__first_name",
         "reporter__last_name",
-        "comment__ue__code",
+        "comment__uv__code",
     )
     autocomplete_fields = ("reporter",)

pedagogy/api.py

@@ -10,23 +10,23 @@ from ninja_extra.pagination import PageNumberPaginationExtra, PaginatedResponseS
 
 from api.auth import ApiKeyAuth
 from api.permissions import HasPerm
-from pedagogy.models import UE
+from pedagogy.models import UV
-from pedagogy.schemas import SimpleUeSchema, UeFilterSchema, UeSchema
+from pedagogy.schemas import SimpleUvSchema, UvFilterSchema, UvSchema
 from pedagogy.utbm_api import UtbmApiClient
 
 
-@api_controller("/ue")
+@api_controller("/uv")
-class UeController(ControllerBase):
+class UvController(ControllerBase):
     @route.get(
         "/{code}",
         auth=[ApiKeyAuth(), SessionAuth()],
         permissions=[
             # this route will almost always be called in the context
-            # of a UE creation/edition
+            # of a UV creation/edition
-            HasPerm(["pedagogy.add_ue", "pedagogy.change_ue"], op=operator.or_)
+            HasPerm(["pedagogy.add_uv", "pedagogy.change_uv"], op=operator.or_)
         ],
-        url_name="fetch_ue_from_utbm",
+        url_name="fetch_uv_from_utbm",
-        response=UeSchema,
+        response=UvSchema,
     )
     def fetch_from_utbm_api(
         self,
@@ -34,20 +34,20 @@ class UeController(ControllerBase):
         lang: Query[str] = "fr",
         year: Query[Annotated[int, Ge(2010)] | None] = None,
     ):
-        """Fetch UE data from the UTBM API and returns it after some parsing."""
+        """Fetch UV data from the UTBM API and returns it after some parsing."""
         with UtbmApiClient() as client:
-            res = client.find_ue(lang, code, year)
+            res = client.find_uv(lang, code, year)
         if res is None:
             raise NotFound
         return res
 
     @route.get(
         "",
-        response=PaginatedResponseSchema[SimpleUeSchema],
+        response=PaginatedResponseSchema[SimpleUvSchema],
-        url_name="fetch_ues",
+        url_name="fetch_uvs",
         auth=[ApiKeyAuth(), SessionAuth()],
-        permissions=[HasPerm("pedagogy.view_ue")],
+        permissions=[HasPerm("pedagogy.view_uv")],
     )
     @paginate(PageNumberPaginationExtra, page_size=100)
-    def fetch_ue_list(self, search: Query[UeFilterSchema]):
+    def fetch_uv_list(self, search: Query[UvFilterSchema]):
-        return search.filter(UE.objects.order_by("code"))
+        return search.filter(UV.objects.order_by("code").values())

pedagogy/forms.py

@@ -26,14 +26,14 @@ from django.utils.translation import gettext_lazy as _
 
 from core.models import User
 from core.views.widgets.markdown import MarkdownInput
-from pedagogy.models import UE, UEComment, UECommentReport
+from pedagogy.models import UV, UVComment, UVCommentReport
 
 
-class UEForm(forms.ModelForm):
+class UVForm(forms.ModelForm):
-    """Form handeling creation and edit of an UE."""
+    """Form handeling creation and edit of an UV."""
 
     class Meta:
-        model = UE
+        model = UV
         fields = (
             "code",
             "author",
@@ -82,14 +82,14 @@ class StarList(forms.NumberInput):
         return context
 
 
-class UECommentForm(forms.ModelForm):
+class UVCommentForm(forms.ModelForm):
-    """Form handeling creation and edit of an UEComment."""
+    """Form handeling creation and edit of an UVComment."""
 
     class Meta:
-        model = UEComment
+        model = UVComment
         fields = (
             "author",
-            "ue",
+            "uv",
             "grade_global",
             "grade_utility",
             "grade_interest",
@@ -100,7 +100,7 @@ class UECommentForm(forms.ModelForm):
         widgets = {
             "comment": MarkdownInput,
             "author": forms.HiddenInput,
-            "ue": forms.HiddenInput,
+            "uv": forms.HiddenInput,
             "grade_global": StarList(5),
             "grade_utility": StarList(5),
             "grade_interest": StarList(5),
@@ -108,35 +108,35 @@ class UECommentForm(forms.ModelForm):
             "grade_work_load": StarList(5),
         }
 
-    def __init__(self, author_id, ue_id, is_creation, *args, **kwargs):
+    def __init__(self, author_id, uv_id, is_creation, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["author"].queryset = User.objects.filter(id=author_id).all()
         self.fields["author"].initial = author_id
-        self.fields["ue"].queryset = UE.objects.filter(id=ue_id).all()
+        self.fields["uv"].queryset = UV.objects.filter(id=uv_id).all()
-        self.fields["ue"].initial = ue_id
+        self.fields["uv"].initial = uv_id
         self.is_creation = is_creation
 
     def clean(self):
         self.cleaned_data = super().clean()
-        ue = self.cleaned_data.get("ue")
+        uv = self.cleaned_data.get("uv")
         author = self.cleaned_data.get("author")
 
-        if self.is_creation and ue and author and ue.has_user_already_commented(author):
+        if self.is_creation and uv and author and uv.has_user_already_commented(author):
             self.add_error(
                 None,
                 forms.ValidationError(
-                    _("This user has already commented on this UE"), code="invalid"
+                    _("This user has already commented on this UV"), code="invalid"
                 ),
             )
 
         return self.cleaned_data
 
 
-class UECommentReportForm(forms.ModelForm):
+class UVCommentReportForm(forms.ModelForm):
-    """Form handeling creation and edit of an UEReport."""
+    """Form handeling creation and edit of an UVReport."""
 
     class Meta:
-        model = UECommentReport
+        model = UVCommentReport
         fields = ("comment", "reporter", "reason")
         widgets = {
             "comment": forms.HiddenInput,
@@ -148,22 +148,22 @@ class UECommentReportForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         self.fields["reporter"].queryset = User.objects.filter(id=reporter_id).all()
         self.fields["reporter"].initial = reporter_id
-        self.fields["comment"].queryset = UEComment.objects.filter(id=comment_id).all()
+        self.fields["comment"].queryset = UVComment.objects.filter(id=comment_id).all()
         self.fields["comment"].initial = comment_id
 
 
-class UECommentModerationForm(forms.Form):
+class UVCommentModerationForm(forms.Form):
     """Form handeling bulk comment deletion."""
 
     accepted_reports = forms.ModelMultipleChoiceField(
-        UECommentReport.objects.all(),
+        UVCommentReport.objects.all(),
         label=_("Accepted reports"),
         widget=forms.CheckboxSelectMultiple,
         required=False,
     )
 
     denied_reports = forms.ModelMultipleChoiceField(
-        UECommentReport.objects.all(),
+        UVCommentReport.objects.all(),
         label=_("Denied reports"),
         widget=forms.CheckboxSelectMultiple,
         required=False,

pedagogy/management/commands/update_uv_guide.py

@@ -2,36 +2,36 @@ from django.conf import settings
 from django.core.management import BaseCommand
 
 from core.models import User
-from pedagogy.models import UE
+from pedagogy.models import UV
-from pedagogy.schemas import UeSchema
+from pedagogy.schemas import UvSchema
 from pedagogy.utbm_api import UtbmApiClient
 
 
 class Command(BaseCommand):
-    help = "Update the UE guide"
+    help = "Update the UV guide"
 
     def handle(self, *args, **options):
-        seen_ues: set[int] = set()
+        seen_uvs: set[int] = set()
         root_user = User.objects.get(pk=settings.SITH_ROOT_USER_ID)
         with UtbmApiClient() as client:
             self.stdout.write(
-                "Fetching UEs from the UTBM API.\n"
+                "Fetching UVs from the UTBM API.\n"
                 "This may take a few minutes to complete."
             )
-            for ue in client.fetch_ues():
+            for uv in client.fetch_uvs():
-                db_ue = UE.objects.filter(code=ue.code).first()
+                db_uv = UV.objects.filter(code=uv.code).first()
-                if db_ue is None:
+                if db_uv is None:
-                    db_ue = UE(code=ue.code, author=root_user)
+                    db_uv = UV(code=uv.code, author=root_user)
-                fields = list(UeSchema.model_fields.keys())
+                fields = list(UvSchema.model_fields.keys())
                 fields.remove("id")
                 fields.remove("code")
                 for field in fields:
-                    setattr(db_ue, field, getattr(ue, field))
+                    setattr(db_uv, field, getattr(uv, field))
-                db_ue.save()
+                db_uv.save()
                 # if it's a creation, django will set the id when saving,
-                # so at this point, a db_ue will always have an id
+                # so at this point, a db_uv will always have an id
-                seen_ues.add(db_ue.id)
+                seen_uvs.add(db_uv.id)
-        # UEs that are in database but have not been returned by the API
+        # UVs that are in database but have not been returned by the API
         # are considered as closed UEs
-        UE.objects.exclude(id__in=seen_ues).update(semester="CLOSED")
+        UV.objects.exclude(id__in=seen_uvs).update(semester="CLOSED")
-        self.stdout.write(self.style.SUCCESS("UE guide updated successfully"))
+        self.stdout.write(self.style.SUCCESS("UV guide updated successfully"))

pedagogy/migrations/0004_rename_uv_ue_rename_uvcomment_uecomment_and_more.py

@@ -1,140 +0,0 @@
-# Generated by Django 4.2.20 on 2025-04-08 10:12
-
-import django.core.validators
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("pedagogy", "0003_alter_uv_language"),
-    ]
-
-    operations = [
-        migrations.RenameModel(old_name="UV", new_name="UE"),
-        migrations.RenameModel(old_name="UVComment", new_name="UEComment"),
-        migrations.RenameModel(old_name="UVCommentReport", new_name="UECommentReport"),
-        migrations.RenameModel(old_name="UVResult", new_name="UEResult"),
-        migrations.RenameField(model_name="ueresult", old_name="uv", new_name="ue"),
-        migrations.RenameField(model_name="uecomment", old_name="uv", new_name="ue"),
-        migrations.AlterField(
-            model_name="ue",
-            name="credits",
-            field=models.PositiveIntegerField(verbose_name="credits"),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="hours_CM",
-            field=models.PositiveIntegerField(default=0, verbose_name="hours CM"),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="hours_TD",
-            field=models.PositiveIntegerField(default=0, verbose_name="hours TD"),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="hours_TE",
-            field=models.PositiveIntegerField(default=0, verbose_name="hours TE"),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="hours_THE",
-            field=models.PositiveIntegerField(default=0, verbose_name="hours THE"),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="hours_TP",
-            field=models.PositiveIntegerField(default=0, verbose_name="hours TP"),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="manager",
-            field=models.CharField(max_length=300, verbose_name="ue manager"),
-        ),
-        migrations.AlterField(
-            model_name="ueresult",
-            name="ue",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="results",
-                to="pedagogy.ue",
-                verbose_name="ue",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="author",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="ue_created",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="author",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="ue",
-            name="code",
-            field=models.CharField(
-                max_length=10,
-                unique=True,
-                validators=[
-                    django.core.validators.RegexValidator(
-                        message=(
-                            "The code of an UE must only contains "
-                            "uppercase characters without accent and numbers"
-                        ),
-                        regex="([A-Z0-9]+)",
-                    )
-                ],
-                verbose_name="code",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="uecomment",
-            name="author",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="ue_comments",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="author",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="uecomment",
-            name="comment",
-            field=models.TextField(blank=True, default="", verbose_name="comment"),
-        ),
-        migrations.AlterField(
-            model_name="uecomment",
-            name="ue",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="comments",
-                to="pedagogy.ue",
-                verbose_name="ue",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="uecommentreport",
-            name="reporter",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="reported_ue_comment",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="reporter",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="ueresult",
-            name="user",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="ue_results",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="user",
-            ),
-        ),
-    ]

pedagogy/models.py

@@ -36,8 +36,8 @@ from core.models import User
 # Create your models here.
 
 
-class UE(models.Model):
+class UV(models.Model):
-    """Contains infos about an UE (course)."""
+    """Contains infos about an UV (course)."""
 
     code = models.CharField(
         _("code"),
@@ -47,7 +47,7 @@ class UE(models.Model):
             validators.RegexValidator(
                 regex="([A-Z0-9]+)",
                 message=_(
-                    "The code of an UE must only contains "
+                    "The code of an UV must only contains "
                     "uppercase characters without accent and numbers"
                 ),
             )
@@ -55,7 +55,7 @@ class UE(models.Model):
     )
     author = models.ForeignKey(
         User,
-        related_name="ue_created",
+        related_name="uv_created",
         verbose_name=_("author"),
         null=False,
         blank=False,
@@ -64,23 +64,29 @@ class UE(models.Model):
     credit_type = models.CharField(
         _("credit type"),
         max_length=10,
-        choices=settings.SITH_PEDAGOGY_UE_TYPE,
+        choices=settings.SITH_PEDAGOGY_UV_TYPE,
-        default=settings.SITH_PEDAGOGY_UE_TYPE[0][0],
+        default=settings.SITH_PEDAGOGY_UV_TYPE[0][0],
     )
-    manager = models.CharField(_("ue manager"), max_length=300)
+    manager = models.CharField(_("uv manager"), max_length=300)
     semester = models.CharField(
         _("semester"),
         max_length=20,
-        choices=settings.SITH_PEDAGOGY_UE_SEMESTER,
+        choices=settings.SITH_PEDAGOGY_UV_SEMESTER,
-        default=settings.SITH_PEDAGOGY_UE_SEMESTER[0][0],
+        default=settings.SITH_PEDAGOGY_UV_SEMESTER[0][0],
     )
     language = models.CharField(
         _("language"),
         max_length=10,
-        choices=settings.SITH_PEDAGOGY_UE_LANGUAGE,
+        choices=settings.SITH_PEDAGOGY_UV_LANGUAGE,
-        default=settings.SITH_PEDAGOGY_UE_LANGUAGE[0][0],
+        default=settings.SITH_PEDAGOGY_UV_LANGUAGE[0][0],
     )
-    credits = models.PositiveIntegerField(_("credits"))
+    credits = models.IntegerField(
+        _("credits"),
+        validators=[validators.MinValueValidator(0)],
+        blank=False,
+        null=False,
+    )
+    # Double star type not implemented yet
 
     department = models.CharField(
         _("departmenmt"),
@@ -89,9 +95,9 @@ class UE(models.Model):
         default=settings.SITH_PROFILE_DEPARTMENTS[-1][0],
     )
 
-    # All texts about the UE
+    # All texts about the UV
     title = models.CharField(_("title"), max_length=300)
-    manager = models.CharField(_("ue manager"), max_length=300)
+    manager = models.CharField(_("uv manager"), max_length=300)
     objectives = models.TextField(_("objectives"))
     program = models.TextField(_("program"))
     skills = models.TextField(_("skills"))
@@ -99,17 +105,47 @@ class UE(models.Model):
 
     # Hours types CM, TD, TP, THE and TE
     # Kind of dirty but I have nothing else in mind for now
-    hours_CM = models.PositiveIntegerField(_("hours CM"), default=0)
+    hours_CM = models.IntegerField(
-    hours_TD = models.PositiveIntegerField(_("hours TD"), default=0)
+        _("hours CM"),
-    hours_TP = models.PositiveIntegerField(_("hours TP"), default=0)
+        validators=[validators.MinValueValidator(0)],
-    hours_THE = models.PositiveIntegerField(_("hours THE"), default=0)
+        blank=False,
-    hours_TE = models.PositiveIntegerField(_("hours TE"), default=0)
+        null=False,
+        default=0,
+    )
+    hours_TD = models.IntegerField(
+        _("hours TD"),
+        validators=[validators.MinValueValidator(0)],
+        blank=False,
+        null=False,
+        default=0,
+    )
+    hours_TP = models.IntegerField(
+        _("hours TP"),
+        validators=[validators.MinValueValidator(0)],
+        blank=False,
+        null=False,
+        default=0,
+    )
+    hours_THE = models.IntegerField(
+        _("hours THE"),
+        validators=[validators.MinValueValidator(0)],
+        blank=False,
+        null=False,
+        default=0,
+    )
+    hours_TE = models.IntegerField(
+        _("hours TE"),
+        validators=[validators.MinValueValidator(0)],
+        blank=False,
+        null=False,
+        default=0,
+    )
 
     def __str__(self):
         return self.code
 
     def get_absolute_url(self):
-        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.id})
+        return reverse("pedagogy:uv_detail", kwargs={"uv_id": self.id})
 
     def __grade_average_generic(self, field):
         comments = self.comments.filter(**{field + "__gte": 0})
@@ -124,7 +160,7 @@ class UE(models.Model):
         This function checks that no other comment has been posted by a specified user.
 
         Returns:
-            True if the user has already posted a comment on this UE, else False.
+            True if the user has already posted a comment on this UV, else False.
         """
         return self.comments.filter(author=user).exists()
 
@@ -149,66 +185,78 @@ class UE(models.Model):
         return self.__grade_average_generic("grade_work_load")
 
 
-class UECommentQuerySet(models.QuerySet):
+class UVCommentQuerySet(models.QuerySet):
     def viewable_by(self, user: User) -> Self:
-        if user.has_perms(["pedagogy.view_uecomment", "pedagogy.view_uecommentreport"]):
+        if user.has_perms(["pedagogy.view_uvcomment", "pedagogy.view_uvcommentreport"]):
-            # the user can view ue comment reports,
+            # the user can view uv comment reports,
             # so he can view non-moderated comments
             return self
-        if user.has_perm("pedagogy.view_uecomment"):
+        if user.has_perm("pedagogy.view_uvcomment"):
             return self.filter(reports=None)
         return self.filter(author=user)
 
     def annotate_is_reported(self) -> Self:
         return self.annotate(
-            is_reported=Exists(UECommentReport.objects.filter(comment=OuterRef("pk")))
+            is_reported=Exists(UVCommentReport.objects.filter(comment=OuterRef("pk")))
         )
 
 
-class UEComment(models.Model):
+class UVComment(models.Model):
-    """A comment about an UE."""
+    """A comment about an UV."""
 
     author = models.ForeignKey(
         User,
-        related_name="ue_comments",
+        related_name="uv_comments",
         verbose_name=_("author"),
+        null=False,
+        blank=False,
         on_delete=models.CASCADE,
     )
-    ue = models.ForeignKey(
+    uv = models.ForeignKey(
-        UE, related_name="comments", verbose_name=_("ue"), on_delete=models.CASCADE
+        UV, related_name="comments", verbose_name=_("uv"), on_delete=models.CASCADE
     )
-    comment = models.TextField(_("comment"), blank=True, default="")
+    comment = models.TextField(_("comment"), blank=True)
     grade_global = models.IntegerField(
         _("global grade"),
         validators=[validators.MinValueValidator(-1), validators.MaxValueValidator(4)],
+        blank=False,
+        null=False,
         default=-1,
     )
     grade_utility = models.IntegerField(
         _("utility grade"),
         validators=[validators.MinValueValidator(-1), validators.MaxValueValidator(4)],
+        blank=False,
+        null=False,
         default=-1,
     )
     grade_interest = models.IntegerField(
         _("interest grade"),
         validators=[validators.MinValueValidator(-1), validators.MaxValueValidator(4)],
+        blank=False,
+        null=False,
         default=-1,
     )
     grade_teaching = models.IntegerField(
         _("teaching grade"),
         validators=[validators.MinValueValidator(-1), validators.MaxValueValidator(4)],
+        blank=False,
+        null=False,
         default=-1,
     )
     grade_work_load = models.IntegerField(
         _("work load grade"),
         validators=[validators.MinValueValidator(-1), validators.MaxValueValidator(4)],
+        blank=False,
+        null=False,
         default=-1,
     )
     publish_date = models.DateTimeField(_("publish date"), blank=True)
 
-    objects = UECommentQuerySet.as_manager()
+    objects = UVCommentQuerySet.as_manager()
 
     def __str__(self):
-        return f"{self.ue} - {self.author}"
+        return f"{self.uv} - {self.author}"
 
     def save(self, *args, **kwargs):
         if self.publish_date is None:
@@ -220,32 +268,30 @@ class UEComment(models.Model):
 #        to use this model.
 #        However, it seems that the implementation finally didn't happen.
 #        It should be discussed, when possible, of what to do with that :
-#        - go on and finally implement the UE results features ?
+#        - go on and finally implement the UV results features ?
 #        - or fuck go back and remove this model ?
-class UEResult(models.Model):
+class UVResult(models.Model):
-    """Results got to an UE.
+    """Results got to an UV.
 
     Views will be implemented after the first release
-    Will list every UE done by an user
+    Will list every UV done by an user
-    Linked to user and ue
+    Linked to user
-    Contains a grade settings.SITH_PEDAGOGY_UE_RESULT_GRADE
+              uv
+    Contains a grade settings.SITH_PEDAGOGY_UV_RESULT_GRADE
              a semester (P/A)20xx.
     """
 
-    ue = models.ForeignKey(
+    uv = models.ForeignKey(
-        UE, related_name="results", verbose_name=_("ue"), on_delete=models.CASCADE
+        UV, related_name="results", verbose_name=_("uv"), on_delete=models.CASCADE
     )
     user = models.ForeignKey(
-        User,
+        User, related_name="uv_results", verbose_name=("user"), on_delete=models.CASCADE
-        related_name="ue_results",
-        verbose_name=_("user"),
-        on_delete=models.CASCADE,
     )
     grade = models.CharField(
         _("grade"),
         max_length=10,
-        choices=settings.SITH_PEDAGOGY_UE_RESULT_GRADE,
+        choices=settings.SITH_PEDAGOGY_UV_RESULT_GRADE,
-        default=settings.SITH_PEDAGOGY_UE_RESULT_GRADE[0][0],
+        default=settings.SITH_PEDAGOGY_UV_RESULT_GRADE[0][0],
     )
     semester = models.CharField(
         _("semester"),
@@ -254,21 +300,21 @@ class UEResult(models.Model):
     )
 
     def __str__(self):
-        return f"{self.user.username} ; {self.ue.code} ; {self.grade}"
+        return f"{self.user.username} ; {self.uv.code} ; {self.grade}"
 
 
-class UECommentReport(models.Model):
+class UVCommentReport(models.Model):
     """Report an inapropriate comment."""
 
     comment = models.ForeignKey(
-        UEComment,
+        UVComment,
         related_name="reports",
         verbose_name=_("report"),
         on_delete=models.CASCADE,
     )
     reporter = models.ForeignKey(
         User,
-        related_name="reported_ue_comment",
+        related_name="reported_uv_comment",
         verbose_name=_("reporter"),
         on_delete=models.CASCADE,
     )
@@ -278,5 +324,5 @@ class UECommentReport(models.Model):
         return f"{self.reporter.username} : {self.reason}"
 
     @cached_property
-    def ue(self):
+    def uv(self):
-        return self.comment.ue
+        return self.comment.uv

pedagogy/schemas.py

@@ -1,18 +1,17 @@
-from typing import Annotated, Literal
+from typing import Literal
 
 from django.db.models import Q
-from django.urls import reverse
 from django.utils import html
 from haystack.query import SearchQuerySet
-from ninja import FilterLookup, FilterSchema, ModelSchema, Schema
+from ninja import FilterSchema, ModelSchema, Schema
 from pydantic import AliasPath, ConfigDict, Field, TypeAdapter
 from pydantic.alias_generators import to_camel
 
-from pedagogy.models import UE
+from pedagogy.models import UV
 
 
-class UtbmShortUeSchema(Schema):
+class UtbmShortUvSchema(Schema):
-    """Short representation of an UE in the UTBM API.
+    """Short representation of an UV in the UTBM API.
 
     Notes:
         This schema holds only the fields we actually need.
@@ -36,8 +35,8 @@ class WorkloadSchema(Schema):
     nbh: int
 
 
-class SemesterUeState(Schema):
+class SemesterUvState(Schema):
-    """The state of the UE during either autumn or spring semester"""
+    """The state of the UV during either autumn or spring semester"""
 
     model_config = ConfigDict(alias_generator=to_camel)
 
@@ -45,11 +44,11 @@ class SemesterUeState(Schema):
     ouvert: bool
 
 
-ShortUeList = TypeAdapter(list[UtbmShortUeSchema])
+ShortUvList = TypeAdapter(list[UtbmShortUvSchema])
 
 
-class UtbmFullUeSchema(Schema):
+class UtbmFullUvSchema(Schema):
-    """Long representation of an UE in the UTBM API."""
+    """Long representation of an UV in the UTBM API."""
 
     model_config = ConfigDict(alias_generator=to_camel)
 
@@ -72,11 +71,11 @@ class UtbmFullUeSchema(Schema):
     )
 
 
-class SimpleUeSchema(ModelSchema):
+class SimpleUvSchema(ModelSchema):
-    """Our minimal representation of an UE."""
+    """Our minimal representation of an UV."""
 
     class Meta:
-        model = UE
+        model = UV
         fields = [
             "id",
             "title",
@@ -86,28 +85,12 @@ class SimpleUeSchema(ModelSchema):
             "department",
         ]
 
-    detail_url: str
-    edit_url: str
-    delete_url: str
 
-    @staticmethod
+class UvSchema(ModelSchema):
-    def resolve_detail_url(obj: UE) -> str:
+    """Our complete representation of an UV"""
-        return reverse("pedagogy:ue_detail", kwargs={"ue_id": obj.id})
-
-    @staticmethod
-    def resolve_edit_url(obj: UE) -> str:
-        return reverse("pedagogy:ue_update", kwargs={"ue_id": obj.id})
-
-    @staticmethod
-    def resolve_delete_url(obj: UE) -> str:
-        return reverse("pedagogy:ue_delete", kwargs={"ue_id": obj.id})
-
-
-class UeSchema(ModelSchema):
-    """Our complete representation of an UE"""
 
     class Meta:
-        model = UE
+        model = UV
         fields = [
             "id",
             "title",
@@ -130,15 +113,14 @@ class UeSchema(ModelSchema):
         ]
 
 
-class UeFilterSchema(FilterSchema):
+class UvFilterSchema(FilterSchema):
-    search: Annotated[str | None, FilterLookup("code__icontains")] = None
+    search: str | None = Field(None, q="code__icontains")
     semester: set[Literal["AUTUMN", "SPRING"]] | None = None
-    credit_type: Annotated[
+    credit_type: set[Literal["CS", "TM", "EC", "OM", "QC"]] | None = Field(
-        set[Literal["CS", "TM", "EC", "OM", "QC"]] | None,
+        None, q="credit_type__in"
-        FilterLookup("credit_type__in"),
+    )
-    ] = None
     language: str = "FR"
-    department: Annotated[set[str] | None, FilterLookup("department__in")] = None
+    department: set[str] | None = Field(None, q="department__in")
 
     def filter_search(self, value: str | None) -> Q:
         """Special filter for the search text.
@@ -149,12 +131,12 @@ class UeFilterSchema(FilterSchema):
             return Q()
 
         if len(value) < 3 or (len(value) < 5 and any(c.isdigit() for c in value)):
-            # Likely to be an UE code
+            # Likely to be an UV code
             return Q(code__istartswith=value)
 
         qs = list(
             SearchQuerySet()
-            .models(UE)
+            .models(UV)
             .autocomplete(auto=html.escape(value))
             .values_list("pk", flat=True)
         )
@@ -164,7 +146,7 @@ class UeFilterSchema(FilterSchema):
     def filter_semester(self, value: set[str] | None) -> Q:
         """Special filter for the semester.
 
-        If either "SPRING" or "AUTUMN" is given, UE that are available
+        If either "SPRING" or "AUTUMN" is given, UV that are available
         during "AUTUMN_AND_SPRING" will be filtered.
         """
         if not value:

pedagogy/search_indexes.py

@@ -25,28 +25,28 @@ from django.db import models
 from haystack import indexes, signals
 
 from core.search_indexes import BigCharFieldIndex
-from pedagogy.models import UE
+from pedagogy.models import UV
 
 
 class IndexSignalProcessor(signals.BaseSignalProcessor):
     """Auto update index on CRUD operations."""
 
     def setup(self):
-        # Listen only to the ``UE`` model.
+        # Listen only to the ``UV`` model.
-        models.signals.post_save.connect(self.handle_save, sender=UE)
+        models.signals.post_save.connect(self.handle_save, sender=UV)
-        models.signals.post_delete.connect(self.handle_delete, sender=UE)
+        models.signals.post_delete.connect(self.handle_delete, sender=UV)
 
     def teardown(self):
-        # Disconnect only to the ``UE`` model.
+        # Disconnect only to the ``UV`` model.
-        models.signals.post_save.disconnect(self.handle_save, sender=UE)
+        models.signals.post_save.disconnect(self.handle_save, sender=UV)
-        models.signals.post_delete.disconnect(self.handle_delete, sender=UE)
+        models.signals.post_delete.disconnect(self.handle_delete, sender=UV)
 
 
-class UEIndex(indexes.SearchIndex, indexes.Indexable):
+class UVIndex(indexes.SearchIndex, indexes.Indexable):
-    """Indexer class for UEs."""
+    """Indexer class for UVs."""
 
     text = BigCharFieldIndex(document=True, use_template=True)
     auto = indexes.EdgeNgramField(use_template=True)
 
     def get_model(self):
-        return UE
+        return UV

pedagogy/static/bundled/pedagogy/guide-index.js

@@ -1,12 +1,12 @@
 import { History, getCurrentUrlParams, updateQueryString } from "#core:utils/history";
-import { ueFetchUeList } from "#openapi";
+import { uvFetchUvList } from "#openapi";
 
 const pageDefault = 1;
 const pageSizeDefault = 100;
 
 document.addEventListener("alpine:init", () => {
-  Alpine.data("ue_search", () => ({
+  Alpine.data("uv_search", () => ({
-    ues: {
+    uvs: {
       count: 0,
       next: null,
       previous: null,
@@ -103,12 +103,16 @@ document.addEventListener("alpine:init", () => {
           args[param] = value;
         }
       }
-      this.ues = (await ueFetchUeList({ query: args })).data;
+      this.uvs = (
+        await uvFetchUvList({
+          query: args,
+        })
+      ).data;
       this.loading = false;
     },
 
     maxPage() {
-      return Math.ceil(this.ues.count / this.page_size);
+      return Math.ceil(this.uvs.count / this.page_size);
     },
   }));
 });

pedagogy/static/pedagogy/css/pedagogy.scss

@@ -50,7 +50,7 @@ $large-devices: 992px;
     }
   }
 
-  #ue-list {
+  #uv-list {
     font-size: 1.1em;
 
     overflow-wrap: break-word;
@@ -164,10 +164,10 @@ $large-devices: 992px;
     }
   }
 
-  #ue_detail {
+  #uv_detail {
     color: #062f38;
 
-    .ue-quick-info-container {
+    .uv-quick-info-container {
       display: grid;
       grid-template-columns: 20% 20% 20% 20% auto;
       grid-template-rows: auto auto;
@@ -254,20 +254,20 @@ $large-devices: 992px;
       }
     }
 
-    .ue-details-container {
+    .uv-details-container {
       display: grid;
       grid-template-columns: 150px 100px auto;
       grid-template-rows: 156px 1fr;
       grid-template-areas:
-      "grade grade-stars ue-infos"
+      "grade grade-stars uv-infos"
-      ". . ue-infos";
+      ". . uv-infos";
 
       @media screen and (max-width: $large-devices) {
         grid-template-columns: 50% 50%;
         grid-template-rows: auto auto;
         grid-template-areas:
         "grade grade-stars"
-        "ue-infos ue-infos";
+        "uv-infos uv-infos";
       }
     }
 
@@ -290,8 +290,8 @@ $large-devices: 992px;
       font-weight: bold;
     }
 
-    .ue-infos {
+    .uv-infos {
-      grid-area: ue-infos;
+      grid-area: uv-infos;
       padding-left: 10px;
     }
 

pedagogy/templates/pedagogy/guide.jinja

@@ -23,10 +23,10 @@
 {% endblock head %}
 
 {% block content %}
-  {% if user.has_perm("pedagogy.add_ue") %}
+  {% if user.has_perm("pedagogy.add_uv") %}
     <div class="action-bar">
       <p>
-        <a href="{{ url('pedagogy:ue_create') }}">{% trans %}Create UE{% endtrans %}</a>
+        <a href="{{ url('pedagogy:uv_create') }}">{% trans %}Create UV{% endtrans %}</a>
       </p>
       <p>
         <a href="{{ url('pedagogy:moderation') }}">{% trans %}Moderate comments{% endtrans %}</a>
@@ -34,7 +34,7 @@
     </div>
     <br/>
   {% endif %}
-  <div class="pedagogy" x-data="ue_search" x-cloak>
+  <div class="pedagogy" x-data="uv_search" x-cloak>
     <form id="search_form">
       <div class="search-form-container">
         <div class="search-bar">
@@ -89,43 +89,43 @@
         </div>
       </div>
     </form>
-    <table id="ue-list">
+    <table id="uv-list">
       <thead>
         <tr>
-          <td>{% trans %}UE{% endtrans %}</td>
+          <td>{% trans %}UV{% endtrans %}</td>
           <td>{% trans %}Title{% endtrans %}</td>
           <td>{% trans %}Department{% endtrans %}</td>
           <td>{% trans %}Credit type{% endtrans %}</td>
           <td><i class="fa fa-leaf"></i></td>
           <td><i class="fa-regular fa-sun"></i></td>
-          {%- if user.has_perm("pedagogy.change_ue") -%}
+          {%- if user.has_perm("pedagogy.change_uv") -%}
             <td>{% trans %}Edit{% endtrans %}</td>
           {%- endif -%}
-          {%- if user.has_perm("pedagogy.delete_ue") -%}
+          {%- if user.has_perm("pedagogy.delete_uv") -%}
             <td>{% trans %}Delete{% endtrans %}</td>
           {% endif %}
         </tr>
       </thead>
       <tbody :aria-busy="loading">
-        <template x-for="ue in ues.results" :key="ue.id">
+        <template x-for="uv in uvs.results" :key="uv.id">
           <tr
-            @click="window.location.href = ue.detail_url"
+            @click="window.location.href = `/pedagogy/uv/${uv.id}`"
             class="clickable"
-            :class="{closed: ue.semester === 'CLOSED'}"
+            :class="{closed: uv.semester === 'CLOSED'}"
           >
-            <td><a :href="`/pedagogy/ue/${ue.id}`" x-text="ue.code"></a></td>
+            <td><a :href="`/pedagogy/uv/${uv.id}`" x-text="uv.code"></a></td>
             <td class="title"
-                x-text="ue.title + (ue.semester === 'CLOSED' ? ' ({% trans %}closed ue{% endtrans %})' : '')"
+                x-text="uv.title + (uv.semester === 'CLOSED' ? ' ({% trans %}closed uv{% endtrans %})' : '')"
             ></td>
-            <td x-text="ue.department"></td>
+            <td x-text="uv.department"></td>
-            <td x-text="ue.credit_type"></td>
+            <td x-text="uv.credit_type"></td>
-            <td><i :class="ue.semester.includes('AUTUMN') && 'fa fa-leaf'"></i></td>
+            <td><i :class="uv.semester.includes('AUTUMN') && 'fa fa-leaf'"></i></td>
-            <td><i :class="ue.semester.includes('SPRING') && 'fa-regular fa-sun'"></i></td>
+            <td><i :class="uv.semester.includes('SPRING') && 'fa-regular fa-sun'"></i></td>
-            {%- if user.has_perm("pedagogy.change_ue") -%}
+            {%- if user.has_perm("pedagogy.change_uv") -%}
-              <td><a :href="ue.edit_url">{% trans %}Edit{% endtrans %}</a></td>
+              <td><a :href="`/pedagogy/uv/${uv.id}/edit`">{% trans %}Edit{% endtrans %}</a></td>
             {%- endif -%}
-            {%- if user.has_perm("pedagogy.delete_ue") -%}
+            {%- if user.has_perm("pedagogy.delete_uv") -%}
-              <td><a :href="ue.delete_url">{% trans %}Delete{% endtrans %}</a></td>
+              <td><a :href="`/pedagogy/uv/${uv.id}/delete`">{% trans %}Delete{% endtrans %}</a></td>
             {%- endif -%}
           </tr>
         </template>

pedagogy/templates/pedagogy/moderation.jinja

@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}UE comment moderation{% endtrans %}
+  {% trans %}UV comment moderation{% endtrans %}
 {% endblock title %}
 
 {% block content %}
@@ -9,7 +9,7 @@
   <table>
     <thead>
       <tr>
-        <td>{% trans %}UE{% endtrans %}</td>
+        <td>{% trans %}UV{% endtrans %}</td>
         <td>{% trans %}Comment{% endtrans %}</td>
         <td>{% trans %}Reason{% endtrans %}</td>
         <td>{% trans %}Action{% endtrans %}</td>
@@ -22,7 +22,7 @@
         <form action="{{ url('pedagogy:moderation') }}" method="post" enctype="multipart/form-data">
           {% csrf_token %}
           <tr>
-            <td><a href="{{ url('pedagogy:ue_detail', ue_id=report.comment.ue_id) }}#{{ report.comment.ue_id }}">{{ report.comment.ue }}</a></td>
+            <td><a href="{{ url('pedagogy:uv_detail', uv_id=report.comment.uv.id) }}#{{ report.comment.uv.id }}">{{ report.comment.uv }}</a></td>
             <td>{{ report.comment.comment|markdown }}</td>
             <td>{{ report.reason|markdown }}</td>
             <td>

pedagogy/templates/pedagogy/uv_detail.jinja

@@ -7,12 +7,12 @@
 {% endblock %}
 
 {% block title %}
-  {% trans %}UE Details{% endtrans %}
+  {% trans %}UV Details{% endtrans %}
 {% endblock %}
 
 {% block content %}
   <div class="pedagogy">
-    <div id="ue_detail">
+    <div id="uv_detail">
       <button onclick='(function(){
                        // If comes from the guide page, go back with history
                        if (document.referrer.replace(/\?(.+)/gm,"").endsWith(`{{ url("pedagogy:guide") }}`)){
@@ -25,7 +25,7 @@
 
       <h1>{{ object.code }} - {{ object.title }}</h1>
       <br>
-      <div class="ue-quick-info-container">
+      <div class="uv-quick-info-container">
         <div class="hours-cm">
           <b>{% trans %}CM: {% endtrans %}</b>{{ object.hours_CM }}
         </div>
@@ -55,7 +55,7 @@
 
       <br>
 
-      <div class="ue-details-container">
+      <div class="uv-details-container">
         <div class="grade">
           <p>{% trans %}Global grade{% endtrans %}</p>
           <p>{% trans %}Utility{% endtrans %}</p>
@@ -70,7 +70,7 @@
           <p>{{ display_star(object.grade_teaching_average) }}</p>
           <p>{{ display_star(object.grade_work_load_average) }}</p>
         </div>
-        <div class="ue-infos">
+        <div class="uv-infos">
           <p><b>{% trans %}Objectives{% endtrans %}</b></p>
           <p>{{ object.objectives|markdown }}</p>
           <p><b>{% trans %}Program{% endtrans %}</b></p>
@@ -86,21 +86,21 @@
       <br>
       {% if object.has_user_already_commented(user) %}
         <div id="leave_comment_not_allowed">
-          <p>{% trans %}You already posted a comment on this UE. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
+          <p>{% trans %}You already posted a comment on this UV. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
         </div>
-      {% elif user.has_perm("pedagogy.add_uecomment") %}
+      {% elif user.has_perm("pedagogy.add_uvcomment") %}
         <details class="accordion" id="leave_comment">
           <summary>{% trans %}Leave comment{% endtrans %}</summary>
           <div class="accordion-content">
-            <form action="{{ url('pedagogy:ue_detail', ue_id=object.id) }}" method="post" enctype="multipart/form-data">
+            <form action="{{ url('pedagogy:uv_detail', uv_id=object.id) }}" method="post" enctype="multipart/form-data">
               {% csrf_token %}
               <div class="leave-comment-grid-container">
                 <div class="form-stars">
                   {{ form.author.errors }}
-                  {{ form.ue.errors }}
+                  {{ form.uv.errors }}
 
                   {{ form.author }}
-                  {{ form.ue }}
+                  {{ form.uv }}
 
                   <div class="input-stars">
                     <label for="{{ form.grade_global.id_for_label }}">{{ form.grade_global.label }} :</label>
@@ -170,7 +170,7 @@
 
             <div class="comment">
               <div class="anchor">
-                <a href="{{ url('pedagogy:ue_detail', ue_id=ue.id) }}#{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
+                <a href="{{ url('pedagogy:uv_detail', uv_id=uv.id) }}#{{ comment.id }}"><i class="fa fa-paragraph"></i></a>
               </div>
               {{ comment.comment|markdown }}
             </div>

pedagogy/tests/test_api.py

@@ -9,19 +9,19 @@ from model_bakery.recipe import Recipe
 
 from core.baker_recipes import subscriber_user
 from core.models import Group, User
-from pedagogy.models import UE
+from pedagogy.models import UV
 
 
-class TestUESearch(TestCase):
+class TestUVSearch(TestCase):
-    """Test UE guide rights for view and API."""
+    """Test UV guide rights for view and API."""
 
     @classmethod
     def setUpTestData(cls):
         cls.root = User.objects.get(username="root")
-        cls.url = reverse("api:fetch_ues")
+        cls.url = reverse("api:fetch_uvs")
-        ue_recipe = Recipe(UE, author=cls.root)
+        uv_recipe = Recipe(UV, author=cls.root)
-        ues = [
+        uvs = [
-            ue_recipe.prepare(
+            uv_recipe.prepare(
                 code="AP4A",
                 credit_type="CS",
                 semester="AUTUMN",
@@ -32,7 +32,7 @@ class TestUESearch(TestCase):
                     "Concepts fondamentaux et mise en pratique avec le langage C++"
                 ),
             ),
-            ue_recipe.prepare(
+            uv_recipe.prepare(
                 code="MT01",
                 credit_type="CS",
                 semester="AUTUMN",
@@ -40,10 +40,10 @@ class TestUESearch(TestCase):
                 manager="ben",
                 title="Intégration1. Algèbre linéaire - Fonctions de deux variables",
             ),
-            ue_recipe.prepare(
+            uv_recipe.prepare(
                 code="PHYS11", credit_type="CS", semester="AUTUMN", department="TC"
             ),
-            ue_recipe.prepare(
+            uv_recipe.prepare(
                 code="TNEV",
                 credit_type="TM",
                 semester="SPRING",
@@ -51,10 +51,10 @@ class TestUESearch(TestCase):
                 manager="moss",
                 title="tnetennba",
             ),
-            ue_recipe.prepare(
+            uv_recipe.prepare(
                 code="MT10", credit_type="TM", semester="AUTUMN", department="IMSI"
             ),
-            ue_recipe.prepare(
+            uv_recipe.prepare(
                 code="DA50",
                 credit_type="TM",
                 semester="AUTUMN_AND_SPRING",
@@ -62,7 +62,7 @@ class TestUESearch(TestCase):
                 manager="francky",
             ),
         ]
-        UE.objects.bulk_create(ues)
+        UV.objects.bulk_create(uvs)
         call_command("update_index")
 
     def test_permissions(self):
@@ -93,7 +93,7 @@ class TestUESearch(TestCase):
         """Test that the return data format is correct"""
         self.client.force_login(self.root)
         res = self.client.get(self.url + "?search=PA00")
-        ue = UE.objects.get(code="PA00")
+        uv = UV.objects.get(code="PA00")
         assert res.status_code == 200
         assert json.loads(res.content) == {
             "count": 1,
@@ -101,19 +101,12 @@ class TestUESearch(TestCase):
             "previous": None,
             "results": [
                 {
-                    "id": ue.id,
+                    "id": uv.id,
-                    "title": ue.title,
+                    "title": uv.title,
-                    "code": ue.code,
+                    "code": uv.code,
-                    "credit_type": ue.credit_type,
+                    "credit_type": uv.credit_type,
-                    "semester": ue.semester,
+                    "semester": uv.semester,
-                    "department": ue.department,
+                    "department": uv.department,
-                    "detail_url": reverse(
-                        "pedagogy:ue_detail", kwargs={"ue_id": ue.id}
-                    ),
-                    "edit_url": reverse("pedagogy:ue_update", kwargs={"ue_id": ue.id}),
-                    "delete_url": reverse(
-                        "pedagogy:ue_delete", kwargs={"ue_id": ue.id}
-                    ),
                 }
             ],
         }
@@ -121,7 +114,7 @@ class TestUESearch(TestCase):
     def test_search_by_text(self):
         self.client.force_login(self.root)
         for query, expected in (
-            # UE code search case insensitive
+            # UV code search case insensitive
             ("m", {"MT01", "MT10"}),
             ("M", {"MT01", "MT10"}),
             ("mt", {"MT01", "MT10"}),
@@ -133,24 +126,24 @@ class TestUESearch(TestCase):
         ):
             res = self.client.get(self.url + f"?search={query}")
             assert res.status_code == 200
-            assert {ue["code"] for ue in json.loads(res.content)["results"]} == expected
+            assert {uv["code"] for uv in json.loads(res.content)["results"]} == expected
 
     def test_search_by_credit_type(self):
         self.client.force_login(self.root)
         res = self.client.get(self.url + "?credit_type=CS")
         assert res.status_code == 200
-        codes = [ue["code"] for ue in json.loads(res.content)["results"]]
+        codes = [uv["code"] for uv in json.loads(res.content)["results"]]
         assert codes == ["AP4A", "MT01", "PHYS11"]
         res = self.client.get(self.url + "?credit_type=CS&credit_type=OM")
         assert res.status_code == 200
-        codes = {ue["code"] for ue in json.loads(res.content)["results"]}
+        codes = {uv["code"] for uv in json.loads(res.content)["results"]}
         assert codes == {"AP4A", "MT01", "PHYS11", "PA00"}
 
     def test_search_by_semester(self):
         self.client.force_login(self.root)
         res = self.client.get(self.url + "?semester=SPRING")
         assert res.status_code == 200
-        codes = {ue["code"] for ue in json.loads(res.content)["results"]}
+        codes = {uv["code"] for uv in json.loads(res.content)["results"]}
         assert codes == {"DA50", "TNEV", "PA00"}
 
     def test_search_multiple_filters(self):
@@ -159,7 +152,7 @@ class TestUESearch(TestCase):
             self.url + "?semester=AUTUMN&credit_type=CS&department=TC"
         )
         assert res.status_code == 200
-        codes = {ue["code"] for ue in json.loads(res.content)["results"]}
+        codes = {uv["code"] for uv in json.loads(res.content)["results"]}
         assert codes == {"MT01", "PHYS11"}
 
     def test_search_fails(self):
@@ -170,15 +163,15 @@ class TestUESearch(TestCase):
 
     def test_search_pa00_fail(self):
         self.client.force_login(self.root)
-        # Search with UE code
+        # Search with UV code
         response = self.client.get(reverse("pedagogy:guide"), {"search": "IFC"})
         self.assertNotContains(response, text="PA00")
 
-        # Search with first letter of UE code
+        # Search with first letter of UV code
         response = self.client.get(reverse("pedagogy:guide"), {"search": "I"})
         self.assertNotContains(response, text="PA00")
 
-        # Search with UE manager
+        # Search with UV manager
         response = self.client.get(reverse("pedagogy:guide"), {"search": "GILLES"})
         self.assertNotContains(response, text="PA00")
 

pedagogy/tests/tests.py

@@ -33,14 +33,14 @@ from pytest_django.asserts import assertRedirects
 
 from core.baker_recipes import old_subscriber_user, subscriber_user
 from core.models import Notification, User
-from pedagogy.models import UE, UEComment, UECommentReport
+from pedagogy.models import UV, UVComment, UVCommentReport
 
 
-def create_ue_template(user_id, code="IFC1", exclude_list=None):
+def create_uv_template(user_id, code="IFC1", exclude_list=None):
-    """Factory to help UE creation/update in post requests."""
+    """Factory to help UV creation/update in post requests."""
     if exclude_list is None:
         exclude_list = []
-    ue = {
+    uv = {
         "code": code,
         "author": user_id,
         "credit_type": "TM",
@@ -74,15 +74,15 @@ def create_ue_template(user_id, code="IFC1", exclude_list=None):
 * Chaînes de caractères""",
     }
     for excluded in exclude_list:
-        ue.pop(excluded)
+        uv.pop(excluded)
-    return ue
+    return uv
 
 
-# UE class tests
+# UV class tests
 
 
-class TestUECreation(TestCase):
+class TestUVCreation(TestCase):
-    """Test ue creation."""
+    """Test uv creation."""
 
     @classmethod
     def setUpTestData(cls):
@@ -90,62 +90,62 @@ class TestUECreation(TestCase):
         cls.tutu = User.objects.get(username="tutu")
         cls.sli = User.objects.get(username="sli")
         cls.guy = User.objects.get(username="guy")
-        cls.create_ue_url = reverse("pedagogy:ue_create")
+        cls.create_uv_url = reverse("pedagogy:uv_create")
 
-    def test_create_ue_admin_success(self):
+    def test_create_uv_admin_success(self):
         self.client.force_login(self.bibou)
         response = self.client.post(
-            self.create_ue_url, create_ue_template(self.bibou.id)
+            self.create_uv_url, create_uv_template(self.bibou.id)
         )
         assert response.status_code == 302
-        assert UE.objects.filter(code="IFC1").exists()
+        assert UV.objects.filter(code="IFC1").exists()
 
-    def test_create_ue_pedagogy_admin_success(self):
+    def test_create_uv_pedagogy_admin_success(self):
         self.client.force_login(self.tutu)
         response = self.client.post(
-            self.create_ue_url, create_ue_template(self.tutu.id)
+            self.create_uv_url, create_uv_template(self.tutu.id)
         )
         assert response.status_code == 302
-        assert UE.objects.filter(code="IFC1").exists()
+        assert UV.objects.filter(code="IFC1").exists()
 
-    def test_create_ue_unauthorized_fail(self):
+    def test_create_uv_unauthorized_fail(self):
         # Test with anonymous user
-        response = self.client.post(self.create_ue_url, create_ue_template(0))
+        response = self.client.post(self.create_uv_url, create_uv_template(0))
         assertRedirects(
-            response, reverse("core:login", query={"next": self.create_ue_url})
+            response, reverse("core:login", query={"next": self.create_uv_url})
         )
 
         # Test with subscribed user
         self.client.force_login(self.sli)
-        response = self.client.post(self.create_ue_url, create_ue_template(self.sli.id))
+        response = self.client.post(self.create_uv_url, create_uv_template(self.sli.id))
         assert response.status_code == 403
 
         # Test with non subscribed user
         self.client.force_login(self.guy)
-        response = self.client.post(self.create_ue_url, create_ue_template(self.guy.id))
+        response = self.client.post(self.create_uv_url, create_uv_template(self.guy.id))
         assert response.status_code == 403
 
-        # Check that the UE has never been created
+        # Check that the UV has never been created
-        assert not UE.objects.filter(code="IFC1").exists()
+        assert not UV.objects.filter(code="IFC1").exists()
 
-    def test_create_ue_bad_request_fail(self):
+    def test_create_uv_bad_request_fail(self):
         self.client.force_login(self.tutu)
 
         # Test with wrong user id (if someone cheats on the hidden input)
         response = self.client.post(
-            self.create_ue_url, create_ue_template(self.bibou.id)
+            self.create_uv_url, create_uv_template(self.bibou.id)
         )
         assert response.status_code == 200
 
         # Remove a required field
         response = self.client.post(
-            self.create_ue_url,
+            self.create_uv_url,
-            create_ue_template(self.tutu.id, exclude_list=["title"]),
+            create_uv_template(self.tutu.id, exclude_list=["title"]),
         )
         assert response.status_code == 200
 
-        # Check that the UE has never been created
+        # Check that the UV hase never been created
-        assert not UE.objects.filter(code="IFC1").exists()
+        assert not UV.objects.filter(code="IFC1").exists()
 
 
 @pytest.mark.django_db
@@ -171,8 +171,8 @@ def test_guide_anonymous_permission_denied(client: Client):
     assert res.status_code == 302
 
 
-class TestUEDelete(TestCase):
+class TestUVDelete(TestCase):
-    """Test UE deletion rights."""
+    """Test UV deletion rights."""
 
     @classmethod
     def setUpTestData(cls):
@@ -180,37 +180,37 @@ class TestUEDelete(TestCase):
         cls.tutu = User.objects.get(username="tutu")
         cls.sli = User.objects.get(username="sli")
         cls.guy = User.objects.get(username="guy")
-        cls.ue = UE.objects.get(code="PA00")
+        cls.uv = UV.objects.get(code="PA00")
-        cls.delete_ue_url = reverse("pedagogy:ue_delete", kwargs={"ue_id": cls.ue.id})
+        cls.delete_uv_url = reverse("pedagogy:uv_delete", kwargs={"uv_id": cls.uv.id})
 
-    def test_ue_delete_root_success(self):
+    def test_uv_delete_root_success(self):
         self.client.force_login(self.bibou)
-        self.client.post(self.delete_ue_url)
+        self.client.post(self.delete_uv_url)
-        assert not UE.objects.filter(pk=self.ue.pk).exists()
+        assert not UV.objects.filter(pk=self.uv.pk).exists()
 
-    def test_ue_delete_pedagogy_admin_success(self):
+    def test_uv_delete_pedagogy_admin_success(self):
         self.client.force_login(self.tutu)
-        self.client.post(self.delete_ue_url)
+        self.client.post(self.delete_uv_url)
-        assert not UE.objects.filter(pk=self.ue.pk).exists()
+        assert not UV.objects.filter(pk=self.uv.pk).exists()
 
-    def test_ue_delete_pedagogy_unauthorized_fail(self):
+    def test_uv_delete_pedagogy_unauthorized_fail(self):
         # Anonymous user
-        response = self.client.post(self.delete_ue_url)
+        response = self.client.post(self.delete_uv_url)
         assertRedirects(
-            response, reverse("core:login", query={"next": self.delete_ue_url})
+            response, reverse("core:login", query={"next": self.delete_uv_url})
         )
-        assert UE.objects.filter(pk=self.ue.pk).exists()
+        assert UV.objects.filter(pk=self.uv.pk).exists()
 
         for user in baker.make(User), subscriber_user.make():
             with self.subTest():
                 self.client.force_login(user)
-                response = self.client.post(self.delete_ue_url)
+                response = self.client.post(self.delete_uv_url)
                 assert response.status_code == 403
-                assert UE.objects.filter(pk=self.ue.pk).exists()
+                assert UV.objects.filter(pk=self.uv.pk).exists()
 
 
-class TestUEUpdate(TestCase):
+class TestUVUpdate(TestCase):
-    """Test UE update rights."""
+    """Test UV update rights."""
 
     @classmethod
     def setUpTestData(cls):
@@ -218,79 +218,79 @@ class TestUEUpdate(TestCase):
         cls.tutu = User.objects.get(username="tutu")
         cls.sli = User.objects.get(username="sli")
         cls.guy = User.objects.get(username="guy")
-        cls.ue = UE.objects.get(code="PA00")
+        cls.uv = UV.objects.get(code="PA00")
-        cls.update_ue_url = reverse("pedagogy:ue_update", kwargs={"ue_id": cls.ue.id})
+        cls.update_uv_url = reverse("pedagogy:uv_update", kwargs={"uv_id": cls.uv.id})
 
-    def test_ue_update_root_success(self):
+    def test_uv_update_root_success(self):
         self.client.force_login(self.bibou)
         self.client.post(
-            self.update_ue_url, create_ue_template(self.bibou.id, code="PA00")
+            self.update_uv_url, create_uv_template(self.bibou.id, code="PA00")
         )
-        self.ue.refresh_from_db()
+        self.uv.refresh_from_db()
-        assert self.ue.credit_type == "TM"
+        assert self.uv.credit_type == "TM"
 
-    def test_ue_update_pedagogy_admin_success(self):
+    def test_uv_update_pedagogy_admin_success(self):
         self.client.force_login(self.tutu)
         self.client.post(
-            self.update_ue_url, create_ue_template(self.bibou.id, code="PA00")
+            self.update_uv_url, create_uv_template(self.bibou.id, code="PA00")
         )
-        self.ue.refresh_from_db()
+        self.uv.refresh_from_db()
-        assert self.ue.credit_type == "TM"
+        assert self.uv.credit_type == "TM"
 
-    def test_ue_update_original_author_does_not_change(self):
+    def test_uv_update_original_author_does_not_change(self):
         self.client.force_login(self.tutu)
         response = self.client.post(
-            self.update_ue_url,
+            self.update_uv_url,
-            create_ue_template(self.tutu.id, code="PA00"),
+            create_uv_template(self.tutu.id, code="PA00"),
         )
         assert response.status_code == 200
-        self.ue.refresh_from_db()
+        self.uv.refresh_from_db()
-        assert self.ue.author == self.bibou
+        assert self.uv.author == self.bibou
 
-    def test_ue_update_pedagogy_unauthorized_fail(self):
+    def test_uv_update_pedagogy_unauthorized_fail(self):
         # Anonymous user
         response = self.client.post(
-            self.update_ue_url, create_ue_template(self.bibou.id, code="PA00")
+            self.update_uv_url, create_uv_template(self.bibou.id, code="PA00")
         )
         assertRedirects(
-            response, reverse("core:login", query={"next": self.update_ue_url})
+            response, reverse("core:login", query={"next": self.update_uv_url})
         )
 
         # Not subscribed user
         self.client.force_login(self.guy)
         response = self.client.post(
-            self.update_ue_url, create_ue_template(self.bibou.id, code="PA00")
+            self.update_uv_url, create_uv_template(self.bibou.id, code="PA00")
         )
         assert response.status_code == 403
 
         # Simply subscribed user
         self.client.force_login(self.sli)
         response = self.client.post(
-            self.update_ue_url, create_ue_template(self.bibou.id, code="PA00")
+            self.update_uv_url, create_uv_template(self.bibou.id, code="PA00")
         )
         assert response.status_code == 403
 
-        # Check that the UE has not changed
+        # Check that the UV has not changed
-        self.ue.refresh_from_db()
+        self.uv.refresh_from_db()
-        assert self.ue.credit_type == "OM"
+        assert self.uv.credit_type == "OM"
 
 
-# UEComment class tests
+# UVComment class tests
 
 
-def create_ue_comment_template(user_id, ue_code="PA00", exclude_list=None):
+def create_uv_comment_template(user_id, uv_code="PA00", exclude_list=None):
-    """Factory to help UEComment creation/update in post requests."""
+    """Factory to help UVComment creation/update in post requests."""
     if exclude_list is None:
         exclude_list = []
     comment = {
         "author": user_id,
-        "ue": UE.objects.get(code=ue_code).id,
+        "uv": UV.objects.get(code=uv_code).id,
         "grade_global": 4,
         "grade_utility": 4,
         "grade_interest": 4,
         "grade_teaching": -1,
         "grade_work_load": 2,
-        "comment": "Superbe UE qui fait vivre la vie associative de l'école",
+        "comment": "Superbe UV qui fait vivre la vie associative de l'école",
     }
     for excluded in exclude_list:
         comment.pop(excluded)
@@ -298,7 +298,7 @@ def create_ue_comment_template(user_id, ue_code="PA00", exclude_list=None):
 
 
 class TestUVCommentCreationAndDisplay(TestCase):
-    """Test UEComment creation and its display.
+    """Test UVComment creation and its display.
 
     Display and creation are the same view.
     """
@@ -309,124 +309,124 @@ class TestUVCommentCreationAndDisplay(TestCase):
         cls.tutu = User.objects.get(username="tutu")
         cls.sli = User.objects.get(username="sli")
         cls.guy = User.objects.get(username="guy")
-        cls.ue = UE.objects.get(code="PA00")
+        cls.uv = UV.objects.get(code="PA00")
-        cls.ue_url = reverse("pedagogy:ue_detail", kwargs={"ue_id": cls.ue.id})
+        cls.uv_url = reverse("pedagogy:uv_detail", kwargs={"uv_id": cls.uv.id})
 
-    def test_create_ue_comment_admin_success(self):
+    def test_create_uv_comment_admin_success(self):
         self.client.force_login(self.bibou)
         response = self.client.post(
-            self.ue_url, create_ue_comment_template(self.bibou.id)
+            self.uv_url, create_uv_comment_template(self.bibou.id)
         )
-        assertRedirects(response, self.ue_url)
+        assertRedirects(response, self.uv_url)
-        response = self.client.get(self.ue_url)
+        response = self.client.get(self.uv_url)
-        self.assertContains(response, text="Superbe UE")
+        self.assertContains(response, text="Superbe UV")
 
-    def test_create_ue_comment_pedagogy_admin_success(self):
+    def test_create_uv_comment_pedagogy_admin_success(self):
         self.client.force_login(self.tutu)
         response = self.client.post(
-            self.ue_url, create_ue_comment_template(self.tutu.id)
+            self.uv_url, create_uv_comment_template(self.tutu.id)
         )
-        self.assertRedirects(response, self.ue_url)
+        self.assertRedirects(response, self.uv_url)
-        response = self.client.get(self.ue_url)
+        response = self.client.get(self.uv_url)
-        self.assertContains(response, text="Superbe UE")
+        self.assertContains(response, text="Superbe UV")
 
-    def test_create_ue_comment_subscriber_success(self):
+    def test_create_uv_comment_subscriber_success(self):
         self.client.force_login(self.sli)
         response = self.client.post(
-            self.ue_url, create_ue_comment_template(self.sli.id)
+            self.uv_url, create_uv_comment_template(self.sli.id)
         )
-        self.assertRedirects(response, self.ue_url)
+        self.assertRedirects(response, self.uv_url)
-        response = self.client.get(self.ue_url)
+        response = self.client.get(self.uv_url)
-        self.assertContains(response, text="Superbe UE")
+        self.assertContains(response, text="Superbe UV")
 
-    def test_create_ue_comment_unauthorized_fail(self):
+    def test_create_uv_comment_unauthorized_fail(self):
-        nb_comments = self.ue.comments.count()
+        nb_comments = self.uv.comments.count()
         # Test with anonymous user
-        response = self.client.post(self.ue_url, create_ue_comment_template(0))
+        response = self.client.post(self.uv_url, create_uv_comment_template(0))
-        assertRedirects(response, reverse("core:login", query={"next": self.ue_url}))
+        assertRedirects(response, reverse("core:login", query={"next": self.uv_url}))
 
         # Test with non subscribed user
         self.client.force_login(self.guy)
         response = self.client.post(
-            self.ue_url, create_ue_comment_template(self.guy.id)
+            self.uv_url, create_uv_comment_template(self.guy.id)
         )
         assert response.status_code == 403
 
         # Check that no comment has been created
-        assert self.ue.comments.count() == nb_comments
+        assert self.uv.comments.count() == nb_comments
 
-    def test_create_ue_comment_bad_form_fail(self):
+    def test_create_uv_comment_bad_form_fail(self):
-        nb_comments = self.ue.comments.count()
+        nb_comments = self.uv.comments.count()
         self.client.force_login(self.bibou)
         response = self.client.post(
-            self.ue_url,
+            self.uv_url,
-            create_ue_comment_template(self.bibou.id, exclude_list=["grade_global"]),
+            create_uv_comment_template(self.bibou.id, exclude_list=["grade_global"]),
         )
 
         assert response.status_code == 200
-        assert self.ue.comments.count() == nb_comments
+        assert self.uv.comments.count() == nb_comments
 
-    def test_create_ue_comment_twice_fail(self):
+    def test_create_uv_comment_twice_fail(self):
         # Checks that the has_user_already_commented method works proprely
-        assert not self.ue.has_user_already_commented(self.bibou)
+        assert not self.uv.has_user_already_commented(self.bibou)
 
         # Create a first comment
         self.client.force_login(self.bibou)
-        self.client.post(self.ue_url, create_ue_comment_template(self.bibou.id))
+        self.client.post(self.uv_url, create_uv_comment_template(self.bibou.id))
 
         # Checks that the has_user_already_commented method works proprely
-        assert self.ue.has_user_already_commented(self.bibou)
+        assert self.uv.has_user_already_commented(self.bibou)
 
         # Create the second comment
-        comment = create_ue_comment_template(self.bibou.id)
+        comment = create_uv_comment_template(self.bibou.id)
         comment["comment"] = "Twice"
-        response = self.client.post(self.ue_url, comment)
+        response = self.client.post(self.uv_url, comment)
         assert response.status_code == 200
-        assert UEComment.objects.filter(comment__contains="Superbe UE").exists()
+        assert UVComment.objects.filter(comment__contains="Superbe UV").exists()
-        assert not UEComment.objects.filter(comment__contains="Twice").exists()
+        assert not UVComment.objects.filter(comment__contains="Twice").exists()
         self.assertContains(
             response,
             _(
-                "You already posted a comment on this UE. "
+                "You already posted a comment on this UV. "
                 "If you want to comment again, "
                 "please modify or delete your previous comment."
             ),
         )
 
-        # Ensure that there is no crash when no ue or no author is given
+        # Ensure that there is no crash when no uv or no author is given
         self.client.post(
-            self.ue_url, create_ue_comment_template(self.bibou.id, exclude_list=["ue"])
+            self.uv_url, create_uv_comment_template(self.bibou.id, exclude_list=["uv"])
         )
         assert response.status_code == 200
         self.client.post(
-            self.ue_url,
+            self.uv_url,
-            create_ue_comment_template(self.bibou.id, exclude_list=["author"]),
+            create_uv_comment_template(self.bibou.id, exclude_list=["author"]),
         )
         assert response.status_code == 200
 
 
 class TestUVCommentDelete(TestCase):
-    """Test UEComment deletion rights."""
+    """Test UVComment deletion rights."""
 
     @classmethod
     def setUpTestData(cls):
-        cls.comment = baker.make(UEComment)
+        cls.comment = baker.make(UVComment)
 
-    def test_ue_comment_delete_success(self):
+    def test_uv_comment_delete_success(self):
         url = reverse("pedagogy:comment_delete", kwargs={"comment_id": self.comment.id})
         for user in (
             baker.make(User, is_superuser=True),
             baker.make(
-                User, user_permissions=[Permission.objects.get(codename="view_ue")]
+                User, user_permissions=[Permission.objects.get(codename="view_uv")]
             ),
             self.comment.author,
         ):
             with self.subTest():
                 self.client.force_login(user)
                 self.client.post(url)
-                assert not UEComment.objects.filter(id=self.comment.id).exists()
+                assert not UVComment.objects.filter(id=self.comment.id).exists()
 
-    def test_ue_comment_delete_unauthorized_fail(self):
+    def test_uv_comment_delete_unauthorized_fail(self):
         url = reverse("pedagogy:comment_delete", kwargs={"comment_id": self.comment.id})
 
         # Anonymous user
@@ -441,11 +441,11 @@ class TestUVCommentDelete(TestCase):
                 assert response.status_code == 403
 
         # Check that the comment still exists
-        assert UEComment.objects.filter(id=self.comment.id).exists()
+        assert UVComment.objects.filter(id=self.comment.id).exists()
 
 
 class TestUVCommentUpdate(TestCase):
-    """Test UEComment update rights."""
+    """Test UVComment update rights."""
 
     @classmethod
     def setUpTestData(cls):
@@ -457,17 +457,17 @@ class TestUVCommentUpdate(TestCase):
 
     def setUp(self):
         # Prepare a comment
-        comment_kwargs = create_ue_comment_template(self.krophil.id)
+        comment_kwargs = create_uv_comment_template(self.krophil.id)
         comment_kwargs["author"] = self.krophil
-        comment_kwargs["ue"] = UE.objects.get(id=comment_kwargs["ue"])
+        comment_kwargs["uv"] = UV.objects.get(id=comment_kwargs["uv"])
-        self.comment = UEComment(**comment_kwargs)
+        self.comment = UVComment(**comment_kwargs)
         self.comment.save()
 
         # Prepare edit of this comment for post requests
-        self.comment_edit = create_ue_comment_template(self.krophil.id)
+        self.comment_edit = create_uv_comment_template(self.krophil.id)
         self.comment_edit["comment"] = "Edited"
 
-    def test_ue_comment_update_root_success(self):
+    def test_uv_comment_update_root_success(self):
         self.client.force_login(self.bibou)
         response = self.client.post(
             reverse("pedagogy:comment_update", kwargs={"comment_id": self.comment.id}),
@@ -477,7 +477,7 @@ class TestUVCommentUpdate(TestCase):
         self.comment.refresh_from_db()
         self.assertEqual(self.comment.comment, self.comment_edit["comment"])
 
-    def test_ue_comment_update_author_success(self):
+    def test_uv_comment_update_author_success(self):
         self.client.force_login(self.krophil)
         response = self.client.post(
             reverse("pedagogy:comment_update", kwargs={"comment_id": self.comment.id}),
@@ -487,7 +487,7 @@ class TestUVCommentUpdate(TestCase):
         self.comment.refresh_from_db()
         self.assertEqual(self.comment.comment, self.comment_edit["comment"])
 
-    def test_ue_comment_update_unauthorized_fail(self):
+    def test_uv_comment_update_unauthorized_fail(self):
         url = reverse("pedagogy:comment_update", kwargs={"comment_id": self.comment.id})
         # Anonymous user
         response = self.client.post(url, self.comment_edit)
@@ -506,7 +506,7 @@ class TestUVCommentUpdate(TestCase):
         self.comment.refresh_from_db()
         self.assertNotEqual(self.comment.comment, self.comment_edit["comment"])
 
-    def test_ue_comment_update_original_author_does_not_change(self):
+    def test_uv_comment_update_original_author_does_not_change(self):
         self.client.force_login(self.bibou)
         self.comment_edit["author"] = User.objects.get(username="root").id
 
@@ -531,31 +531,31 @@ class TestUVModerationForm(TestCase):
 
     def setUp(self):
         # Prepare a comment
-        comment_kwargs = create_ue_comment_template(self.krophil.id)
+        comment_kwargs = create_uv_comment_template(self.krophil.id)
         comment_kwargs["author"] = self.krophil
-        comment_kwargs["ue"] = UE.objects.get(id=comment_kwargs["ue"])
+        comment_kwargs["uv"] = UV.objects.get(id=comment_kwargs["uv"])
-        self.comment_1 = UEComment(**comment_kwargs)
+        self.comment_1 = UVComment(**comment_kwargs)
         self.comment_1.save()
 
         # Prepare another comment
-        comment_kwargs = create_ue_comment_template(self.krophil.id)
+        comment_kwargs = create_uv_comment_template(self.krophil.id)
         comment_kwargs["author"] = self.krophil
-        comment_kwargs["ue"] = UE.objects.get(id=comment_kwargs["ue"])
+        comment_kwargs["uv"] = UV.objects.get(id=comment_kwargs["uv"])
-        self.comment_2 = UEComment(**comment_kwargs)
+        self.comment_2 = UVComment(**comment_kwargs)
         self.comment_2.save()
 
         # Prepare a comment report for comment 1
-        self.report_1 = UECommentReport(
+        self.report_1 = UVCommentReport(
             comment=self.comment_1, reporter=self.krophil, reason="C'est moche"
         )
         self.report_1.save()
-        self.report_1_bis = UECommentReport(
+        self.report_1_bis = UVCommentReport(
             comment=self.comment_1, reporter=self.krophil, reason="C'est moche 2"
         )
         self.report_1_bis.save()
 
         # Prepare a comment report for comment 2
-        self.report_2 = UECommentReport(
+        self.report_2 = UVCommentReport(
             comment=self.comment_2, reporter=self.krophil, reason="C'est moche"
         )
         self.report_2.save()
@@ -593,11 +593,11 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that nothing has changed
-        assert UECommentReport.objects.filter(id=self.report_1.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_1.id).exists()
-        assert UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert UVComment.objects.filter(id=self.comment_1.id).exists()
-        assert UECommentReport.objects.filter(id=self.report_1_bis.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_1_bis.id).exists()
-        assert UECommentReport.objects.filter(id=self.report_2.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_2.id).exists()
-        assert UEComment.objects.filter(id=self.comment_2.id).exists()
+        assert UVComment.objects.filter(id=self.comment_2.id).exists()
 
     def test_delete_comment(self):
         self.client.force_login(self.bibou)
@@ -607,14 +607,14 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that the comment and it's associated report has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_1.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1.id).exists()
-        assert not UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert not UVComment.objects.filter(id=self.comment_1.id).exists()
         # Test that the bis report has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_1_bis.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1_bis.id).exists()
 
         # Test that the other comment and report still exists
-        assert UECommentReport.objects.filter(id=self.report_2.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_2.id).exists()
-        assert UEComment.objects.filter(id=self.comment_2.id).exists()
+        assert UVComment.objects.filter(id=self.comment_2.id).exists()
 
     def test_delete_comment_bulk(self):
         self.client.force_login(self.bibou)
@@ -625,12 +625,12 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that comments and their associated reports has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_1.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1.id).exists()
-        assert not UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert not UVComment.objects.filter(id=self.comment_1.id).exists()
-        assert not UECommentReport.objects.filter(id=self.report_2.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_2.id).exists()
-        assert not UEComment.objects.filter(id=self.comment_2.id).exists()
+        assert not UVComment.objects.filter(id=self.comment_2.id).exists()
         # Test that the bis report has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_1_bis.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1_bis.id).exists()
 
     def test_delete_comment_with_bis(self):
         # Test case if two reports targets the same comment and are both deleted
@@ -642,10 +642,10 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that the comment and it's associated report has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_1.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1.id).exists()
-        assert not UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert not UVComment.objects.filter(id=self.comment_1.id).exists()
         # Test that the bis report has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_1_bis.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1_bis.id).exists()
 
     def test_delete_report(self):
         self.client.force_login(self.bibou)
@@ -655,14 +655,14 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that the report has been deleted and that the comment still exists
-        assert not UECommentReport.objects.filter(id=self.report_1.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1.id).exists()
-        assert UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert UVComment.objects.filter(id=self.comment_1.id).exists()
         # Test that the bis report is still there
-        assert UECommentReport.objects.filter(id=self.report_1_bis.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_1_bis.id).exists()
 
         # Test that the other comment and report still exists
-        assert UECommentReport.objects.filter(id=self.report_2.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_2.id).exists()
-        assert UEComment.objects.filter(id=self.comment_2.id).exists()
+        assert UVComment.objects.filter(id=self.comment_2.id).exists()
 
     def test_delete_report_bulk(self):
         self.client.force_login(self.bibou)
@@ -679,12 +679,12 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that every reports has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_1.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1.id).exists()
-        assert not UECommentReport.objects.filter(id=self.report_1_bis.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1_bis.id).exists()
-        assert not UECommentReport.objects.filter(id=self.report_2.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_2.id).exists()
         # Test that comments still exists
-        assert UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert UVComment.objects.filter(id=self.comment_1.id).exists()
-        assert UEComment.objects.filter(id=self.comment_2.id).exists()
+        assert UVComment.objects.filter(id=self.comment_2.id).exists()
 
     def test_delete_mixed(self):
         self.client.force_login(self.bibou)
@@ -698,15 +698,15 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that report 2 and his comment has been deleted
-        assert not UECommentReport.objects.filter(id=self.report_2.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_2.id).exists()
-        assert not UEComment.objects.filter(id=self.comment_2.id).exists()
+        assert not UVComment.objects.filter(id=self.comment_2.id).exists()
 
         # Test that report 1 has been deleted and it's comment still exists
-        assert not UECommentReport.objects.filter(id=self.report_1.id).exists()
+        assert not UVCommentReport.objects.filter(id=self.report_1.id).exists()
-        assert UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert UVComment.objects.filter(id=self.comment_1.id).exists()
 
         # Test that report 1 bis is still there
-        assert UECommentReport.objects.filter(id=self.report_1_bis.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_1_bis.id).exists()
 
     def test_delete_mixed_with_bis(self):
         self.client.force_login(self.bibou)
@@ -720,16 +720,16 @@ class TestUVModerationForm(TestCase):
         assert response.status_code == 302
 
         # Test that report 1 and 1 bis has been deleted
-        assert not UECommentReport.objects.filter(
+        assert not UVCommentReport.objects.filter(
             id__in=[self.report_1.id, self.report_1_bis.id]
         ).exists()
 
         # Test that comment 1 has been deleted
-        assert not UEComment.objects.filter(id=self.comment_1.id).exists()
+        assert not UVComment.objects.filter(id=self.comment_1.id).exists()
 
         # Test that report and comment 2 still exists
-        assert UECommentReport.objects.filter(id=self.report_2.id).exists()
+        assert UVCommentReport.objects.filter(id=self.report_2.id).exists()
-        assert UEComment.objects.filter(id=self.comment_2.id).exists()
+        assert UVComment.objects.filter(id=self.comment_2.id).exists()
 
 
 class TestUVCommentReportCreate(TestCase):
@@ -743,10 +743,10 @@ class TestUVCommentReportCreate(TestCase):
         self.tutu = User.objects.get(username="tutu")
 
         # Prepare a comment
-        comment_kwargs = create_ue_comment_template(self.krophil.id)
+        comment_kwargs = create_uv_comment_template(self.krophil.id)
         comment_kwargs["author"] = self.krophil
-        comment_kwargs["ue"] = UE.objects.get(id=comment_kwargs["ue"])
+        comment_kwargs["uv"] = UV.objects.get(id=comment_kwargs["uv"])
-        self.comment = UEComment(**comment_kwargs)
+        self.comment = UVComment(**comment_kwargs)
         self.comment.save()
 
     def create_report_test(self, username: str, *, success: bool):
@@ -763,7 +763,7 @@ class TestUVCommentReportCreate(TestCase):
             assert response.status_code == 302
         else:
             assert response.status_code == 403
-        self.assertEqual(UECommentReport.objects.all().exists(), success)
+        self.assertEqual(UVCommentReport.objects.all().exists(), success)
 
     def test_create_report_root_success(self):
         self.create_report_test("root", success=True)
@@ -783,7 +783,7 @@ class TestUVCommentReportCreate(TestCase):
             url, {"comment": self.comment.id, "reporter": 0, "reason": "C'est moche"}
         )
         assertRedirects(response, reverse("core:login", query={"next": url}))
-        assert not UECommentReport.objects.all().exists()
+        assert not UVCommentReport.objects.all().exists()
 
     def test_notifications(self):
         assert not self.tutu.notifications.filter(type="PEDAGOGY_MODERATION").exists()

pedagogy/urls.py

@@ -24,40 +24,40 @@
 from django.urls import path
 
 from pedagogy.views import (
-    UECommentDeleteView,
+    UVCommentDeleteView,
-    UECommentReportCreateView,
+    UVCommentReportCreateView,
-    UECommentUpdateView,
+    UVCommentUpdateView,
-    UECreateView,
+    UVCreateView,
-    UEDeleteView,
+    UVDeleteView,
-    UEDetailFormView,
+    UVDetailFormView,
-    UEGuideView,
+    UVGuideView,
-    UEModerationFormView,
+    UVModerationFormView,
-    UEUpdateView,
+    UVUpdateView,
 )
 
 urlpatterns = [
     # Urls displaying the actual application for visitors
-    path("", UEGuideView.as_view(), name="guide"),
+    path("", UVGuideView.as_view(), name="guide"),
-    path("ue/<int:ue_id>/", UEDetailFormView.as_view(), name="ue_detail"),
+    path("uv/<int:uv_id>/", UVDetailFormView.as_view(), name="uv_detail"),
     path(
         "comment/<int:comment_id>/edit/",
-        UECommentUpdateView.as_view(),
+        UVCommentUpdateView.as_view(),
         name="comment_update",
     ),
     path(
         "comment/<int:comment_id>/delete/",
-        UECommentDeleteView.as_view(),
+        UVCommentDeleteView.as_view(),
         name="comment_delete",
     ),
     path(
         "comment/<int:comment_id>/report/",
-        UECommentReportCreateView.as_view(),
+        UVCommentReportCreateView.as_view(),
         name="comment_report",
     ),
     # Moderation
-    path("moderation/", UEModerationFormView.as_view(), name="moderation"),
+    path("moderation/", UVModerationFormView.as_view(), name="moderation"),
     # Administration : Create Update Delete Edit
-    path("ue/create/", UECreateView.as_view(), name="ue_create"),
+    path("uv/create/", UVCreateView.as_view(), name="uv_create"),
-    path("ue/<int:ue_id>/delete/", UEDeleteView.as_view(), name="ue_delete"),
+    path("uv/<int:uv_id>/delete/", UVDeleteView.as_view(), name="uv_delete"),
-    path("ue/<int:ue_id>/edit/", UEUpdateView.as_view(), name="ue_update"),
+    path("uv/<int:uv_id>/edit/", UVUpdateView.as_view(), name="uv_update"),
 ]

pedagogy/utbm_api.py

@@ -1,4 +1,4 @@
-"""Set of functions to interact with the UTBM UE api."""
+"""Set of functions to interact with the UTBM UV api."""
 
 from typing import Iterator
 
@@ -6,14 +6,14 @@ import requests
 from django.conf import settings
 from django.utils.functional import cached_property
 
-from pedagogy.schemas import ShortUeList, UeSchema, UtbmFullUeSchema, UtbmShortUeSchema
+from pedagogy.schemas import ShortUvList, UtbmFullUvSchema, UtbmShortUvSchema, UvSchema
 
 
 class UtbmApiClient(requests.Session):
-    """A wrapper around `requests.Session` to perform requests to the UTBM UE API."""
+    """A wrapper around `requests.Session` to perform requests to the UTBM UV API."""
 
     BASE_URL = settings.SITH_PEDAGOGY_UTBM_API
-    _cache = {"short_ues": {}}
+    _cache = {"short_uvs": {}}
 
     @cached_property
     def current_year(self) -> int:
@@ -22,83 +22,83 @@ class UtbmApiClient(requests.Session):
         response = self.get(url)
         return response.json()[-1]["annee"]
 
-    def fetch_short_ues(
+    def fetch_short_uvs(
         self, lang: str = "fr", year: int | None = None
-    ) -> list[UtbmShortUeSchema]:
+    ) -> list[UtbmShortUvSchema]:
-        """Get the list of UEs in their short format from the UTBM API"""
+        """Get the list of UVs in their short format from the UTBM API"""
         if year is None:
             year = self.current_year
-        if lang not in self._cache["short_ues"]:
+        if lang not in self._cache["short_uvs"]:
-            self._cache["short_ues"][lang] = {}
+            self._cache["short_uvs"][lang] = {}
-        if year not in self._cache["short_ues"][lang]:
+        if year not in self._cache["short_uvs"][lang]:
             url = f"{self.BASE_URL}/uvs/{lang}/{year}"
             response = self.get(url)
-            ues = ShortUeList.validate_json(response.content)
+            uvs = ShortUvList.validate_json(response.content)
-            self._cache["short_ues"][lang][year] = ues
+            self._cache["short_uvs"][lang][year] = uvs
-        return self._cache["short_ues"][lang][year]
+        return self._cache["short_uvs"][lang][year]
 
-    def fetch_ues(
+    def fetch_uvs(
         self, lang: str = "fr", year: int | None = None
-    ) -> Iterator[UeSchema]:
+    ) -> Iterator[UvSchema]:
-        """Fetch all UEs from the UTBM API, parsed in a format that we can use.
+        """Fetch all UVs from the UTBM API, parsed in a format that we can use.
 
         Warning:
-            We need infos from the full ue schema, and the UTBM UE API
+            We need infos from the full uv schema, and the UTBM UV API
             has no route to get all of them at once.
-            We must do one request per UE (for a total of around 730 UEs),
+            We must do one request per UV (for a total of around 730 UVs),
             which takes a lot of time.
             Hopefully, there seems to be no rate-limit, so an error
             in the middle of the process isn't likely to occur.
         """
         if year is None:
             year = self.current_year
-        shorts_ues = self.fetch_short_ues(lang, year)
+        shorts_uvs = self.fetch_short_uvs(lang, year)
-        # When UEs are common to multiple branches (like most HUMA)
+        # When UVs are common to multiple branches (like most HUMA)
         # the UTBM API duplicates them for every branch.
-        # We have no way in our db to link a UE to multiple formations,
+        # We have no way in our db to link a UV to multiple formations,
-        # so we just create a single UE, which formation is the one
+        # so we just create a single UV, which formation is the one
-        # of the first UE found in the list.
+        # of the first UV found in the list.
         # For example, if we have CC01 (TC), CC01 (IMSI) and CC01 (EDIM),
         # we will only keep CC01 (TC).
-        unique_short_ues = {}
+        unique_short_uvs = {}
-        for ue in shorts_ues:
+        for uv in shorts_uvs:
-            if ue.code not in unique_short_ues:
+            if uv.code not in unique_short_uvs:
-                unique_short_ues[ue.code] = ue
+                unique_short_uvs[uv.code] = uv
-        for ue in unique_short_ues.values():
+        for uv in unique_short_uvs.values():
-            ue_url = f"{self.BASE_URL}/uv/{lang}/{year}/{ue.code}/{ue.code_formation}"
+            uv_url = f"{self.BASE_URL}/uv/{lang}/{year}/{uv.code}/{uv.code_formation}"
-            response = requests.get(ue_url)
+            response = requests.get(uv_url)
-            full_ue = UtbmFullUeSchema.model_validate_json(response.content)
+            full_uv = UtbmFullUvSchema.model_validate_json(response.content)
-            yield make_clean_ue(ue, full_ue)
+            yield make_clean_uv(uv, full_uv)
 
-    def find_uu(self, lang: str, code: str, year: int | None = None) -> UeSchema | None:
+    def find_uv(self, lang: str, code: str, year: int | None = None) -> UvSchema | None:
-        """Find an UE from the UTBM API."""
+        """Find an UV from the UTBM API."""
-        # query the UE list
+        # query the UV list
         if not year:
             year = self.current_year
-        # the UTBM API has no way to fetch a single short ue,
+        # the UTBM API has no way to fetch a single short uv,
-        # and short ues contain infos that we need and are not
+        # and short uvs contain infos that we need and are not
-        # in the full ue schema, so we must fetch everything.
+        # in the full uv schema, so we must fetch everything.
-        short_ues = self.fetch_short_ues(lang, year)
+        short_uvs = self.fetch_short_uvs(lang, year)
-        short_ue = next((ue for ue in short_ues if ue.code == code), None)
+        short_uv = next((uv for uv in short_uvs if uv.code == code), None)
-        if short_ue is None:
+        if short_uv is None:
             return None
 
-        # get detailed information about the UE
+        # get detailed information about the UV
-        ue_url = f"{self.BASE_URL}/uv/{lang}/{year}/{code}/{short_ue.code_formation}"
+        uv_url = f"{self.BASE_URL}/uv/{lang}/{year}/{code}/{short_uv.code_formation}"
-        response = requests.get(ue_url)
+        response = requests.get(uv_url)
-        full_ue = UtbmFullUeSchema.model_validate_json(response.content)
+        full_uv = UtbmFullUvSchema.model_validate_json(response.content)
-        return make_clean_ue(short_ue, full_ue)
+        return make_clean_uv(short_uv, full_uv)
 
 
-def make_clean_ue(short_ue: UtbmShortUeSchema, full_ue: UtbmFullUeSchema) -> UeSchema:
+def make_clean_uv(short_uv: UtbmShortUvSchema, full_uv: UtbmFullUvSchema) -> UvSchema:
     """Cleans the data up so that it corresponds to our data representation.
 
-    Some of the needed information are in the short ue schema, some
+    Some of the needed information are in the short uv schema, some
-    other in the full ue schema.
+    other in the full uv schema.
     Thus we combine those information to obtain a data schema suitable
     for our needs.
     """
-    if full_ue.departement == "Pôle Humanités":
+    if full_uv.departement == "Pôle Humanités":
         department = "HUMA"
     else:
         department = {
@@ -112,9 +112,9 @@ def make_clean_ue(short_ue: UtbmShortUeSchema, full_ue: UtbmFullUeSchema) -> UeS
             "ED": "EDIM",
             "AI": "GI",
             "AM": "MC",
-        }.get(short_ue.code_formation, "NA")
+        }.get(short_uv.code_formation, "NA")
 
-    match short_ue.ouvert_printemps, short_ue.ouvert_automne:
+    match short_uv.ouvert_printemps, short_uv.ouvert_automne:
         case True, True:
             semester = "AUTUMN_AND_SPRING"
         case True, False:
@@ -124,22 +124,22 @@ def make_clean_ue(short_ue: UtbmShortUeSchema, full_ue: UtbmFullUeSchema) -> UeS
         case _:
             semester = "CLOSED"
 
-    return UeSchema(
+    return UvSchema(
-        title=full_ue.libelle or "",
+        title=full_uv.libelle or "",
-        code=full_ue.code,
+        code=full_uv.code,
-        credit_type=short_ue.code_categorie or "FREE",
+        credit_type=short_uv.code_categorie or "FREE",
         semester=semester,
-        language=short_ue.code_langue.upper(),
+        language=short_uv.code_langue.upper(),
-        credits=full_ue.credits_ects,
+        credits=full_uv.credits_ects,
         department=department,
-        hours_THE=next((i.nbh for i in full_ue.activites if i.code == "THE"), 0) // 60,
+        hours_THE=next((i.nbh for i in full_uv.activites if i.code == "THE"), 0) // 60,
-        hours_TD=next((i.nbh for i in full_ue.activites if i.code == "TD"), 0) // 60,
+        hours_TD=next((i.nbh for i in full_uv.activites if i.code == "TD"), 0) // 60,
-        hours_TP=next((i.nbh for i in full_ue.activites if i.code == "TP"), 0) // 60,
+        hours_TP=next((i.nbh for i in full_uv.activites if i.code == "TP"), 0) // 60,
-        hours_TE=next((i.nbh for i in full_ue.activites if i.code == "TE"), 0) // 60,
+        hours_TE=next((i.nbh for i in full_uv.activites if i.code == "TE"), 0) // 60,
-        hours_CM=next((i.nbh for i in full_ue.activites if i.code == "CM"), 0) // 60,
+        hours_CM=next((i.nbh for i in full_uv.activites if i.code == "CM"), 0) // 60,
-        manager=full_ue.respo_automne or full_ue.respo_printemps or "",
+        manager=full_uv.respo_automne or full_uv.respo_printemps or "",
-        objectives=full_ue.objectifs or "",
+        objectives=full_uv.objectifs or "",
-        program=full_ue.programme or "",
+        program=full_uv.programme or "",
-        skills=full_ue.acquisition_competences or "",
+        skills=full_uv.acquisition_competences or "",
-        key_concepts=full_ue.acquisition_notions or "",
+        key_concepts=full_uv.acquisition_notions or "",
     )

pedagogy/views.py

@@ -38,39 +38,39 @@ from core.auth.mixins import PermissionOrAuthorRequiredMixin
 from core.models import Notification, User
 from core.views import DetailFormView
 from pedagogy.forms import (
-    UECommentForm,
+    UVCommentForm,
-    UECommentModerationForm,
+    UVCommentModerationForm,
-    UECommentReportForm,
+    UVCommentReportForm,
-    UEForm,
+    UVForm,
 )
-from pedagogy.models import UE, UEComment, UECommentReport
+from pedagogy.models import UV, UVComment, UVCommentReport
 
 
-class UEDetailFormView(PermissionRequiredMixin, DetailFormView):
+class UVDetailFormView(PermissionRequiredMixin, DetailFormView):
-    """Display every comment of an UE and detailed infos about it.
+    """Display every comment of an UV and detailed infos about it.
 
-    Allow to comment the UE.
+    Allow to comment the UV.
     """
 
-    model = UE
+    model = UV
-    pk_url_kwarg = "ue_id"
+    pk_url_kwarg = "uv_id"
-    template_name = "pedagogy/ue_detail.jinja"
+    template_name = "pedagogy/uv_detail.jinja"
-    form_class = UECommentForm
+    form_class = UVCommentForm
-    permission_required = "pedagogy.view_ue"
+    permission_required = "pedagogy.view_uv"
 
     def has_permission(self):
         if self.request.method == "POST" and not self.request.user.has_perm(
-            "pedagogy.add_uecomment"
+            "pedagogy.add_uvcomment"
         ):
-            # if it's a POST request, the user is trying to add a new UEComment
+            # if it's a POST request, the user is trying to add a new UVComment
-            # thus he also needs the "add_uecomment" permission
+            # thus he also needs the "add_uvcomment" permission
             return False
         return super().has_permission()
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["author_id"] = self.request.user.id
-        kwargs["ue_id"] = self.object.id
+        kwargs["uv_id"] = self.object.id
         kwargs["is_creation"] = True
         return kwargs
 
@@ -89,68 +89,68 @@ class UEDetailFormView(PermissionRequiredMixin, DetailFormView):
         }
 
     def get_success_url(self):
-        # once the new ue comment has been saved
+        # once the new uv comment has been saved
         # redirect to the same page we are currently
         return self.request.path
 
 
-class UECommentUpdateView(PermissionOrAuthorRequiredMixin, UpdateView):
+class UVCommentUpdateView(PermissionOrAuthorRequiredMixin, UpdateView):
     """Allow edit of a given comment."""
 
-    model = UEComment
+    model = UVComment
-    form_class = UECommentForm
+    form_class = UVCommentForm
     pk_url_kwarg = "comment_id"
     template_name = "core/edit.jinja"
-    permission_required = "pedagogy.change_uecomment"
+    permission_required = "pedagogy.change_uvcomment"
     author_field = "author"
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["author_id"] = self.object.author_id
-        kwargs["ue_id"] = self.object.ue_id
+        kwargs["uv_id"] = self.object.uv_id
         kwargs["is_creation"] = False
         return kwargs
 
     def get_success_url(self):
-        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.object.ue_id})
+        return reverse("pedagogy:uv_detail", kwargs={"uv_id": self.object.uv_id})
 
 
-class UECommentDeleteView(PermissionOrAuthorRequiredMixin, DeleteView):
+class UVCommentDeleteView(PermissionOrAuthorRequiredMixin, DeleteView):
-    """Allow to delete a given comment."""
+    """Allow delete of a given comment."""
 
-    model = UEComment
+    model = UVComment
     pk_url_kwarg = "comment_id"
     template_name = "core/delete_confirm.jinja"
-    permission_required = "pedagogy.delete_uecomment"
+    permission_required = "pedagogy.delete_uvcomment"
     author_field = "author"
 
     def get_success_url(self):
-        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.object.ue_id})
+        return reverse("pedagogy:uv_detail", kwargs={"uv_id": self.object.uv_id})
 
 
-class UEGuideView(PermissionRequiredMixin, TemplateView):
+class UVGuideView(PermissionRequiredMixin, TemplateView):
-    """UE guide main page."""
+    """UV guide main page."""
 
     template_name = "pedagogy/guide.jinja"
-    permission_required = "pedagogy.view_ue"
+    permission_required = "pedagogy.view_uv"
 
 
-class UECommentReportCreateView(PermissionRequiredMixin, CreateView):
+class UVCommentReportCreateView(PermissionRequiredMixin, CreateView):
-    """Create a new report for an inappropriate comment."""
+    """Create a new report for an inapropriate comment."""
 
-    model = UECommentReport
+    model = UVCommentReport
-    form_class = UECommentReportForm
+    form_class = UVCommentReportForm
     template_name = "core/edit.jinja"
-    permission_required = "pedagogy.add_uecommentreport"
+    permission_required = "pedagogy.add_uvcommentreport"
 
     def dispatch(self, request, *args, **kwargs):
-        self.ue_comment = get_object_or_404(UEComment, pk=kwargs["comment_id"])
+        self.uv_comment = get_object_or_404(UVComment, pk=kwargs["comment_id"])
         return super().dispatch(request, *args, **kwargs)
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["reporter_id"] = self.request.user.id
-        kwargs["comment_id"] = self.ue_comment.id
+        kwargs["comment_id"] = self.uv_comment.id
         return kwargs
 
     def form_valid(self, form):
@@ -172,35 +172,35 @@ class UECommentReportCreateView(PermissionRequiredMixin, CreateView):
         return resp
 
     def get_success_url(self):
-        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.ue_comment.ue_id})
+        return reverse("pedagogy:uv_detail", kwargs={"uv_id": self.uv_comment.uv_id})
 
 
-class UEModerationFormView(PermissionRequiredMixin, FormView):
+class UVModerationFormView(PermissionRequiredMixin, FormView):
     """Moderation interface (Privileged)."""
 
-    form_class = UECommentModerationForm
+    form_class = UVCommentModerationForm
     template_name = "pedagogy/moderation.jinja"
-    permission_required = "pedagogy.delete_uecomment"
+    permission_required = "pedagogy.delete_uvcomment"
     success_url = reverse_lazy("pedagogy:moderation")
 
     def form_valid(self, form):
         form_clean = form.clean()
         accepted = form_clean.get("accepted_reports", [])
         if len(accepted) > 0:  # delete the reported comments
-            UEComment.objects.filter(reports__in=accepted).delete()
+            UVComment.objects.filter(reports__in=accepted).delete()
         denied = form_clean.get("denied_reports", [])
         if len(denied) > 0:  # delete the comments themselves
-            UECommentReport.objects.filter(id__in={d.id for d in denied}).delete()
+            UVCommentReport.objects.filter(id__in={d.id for d in denied}).delete()
         return super().form_valid(form)
 
 
-class UECreateView(PermissionRequiredMixin, CreateView):
+class UVCreateView(PermissionRequiredMixin, CreateView):
-    """Add a new UE (Privileged)."""
+    """Add a new UV (Privileged)."""
 
-    model = UE
+    model = UV
-    form_class = UEForm
+    form_class = UVForm
-    template_name = "pedagogy/ue_edit.jinja"
+    template_name = "pedagogy/uv_edit.jinja"
-    permission_required = "pedagogy.add_ue"
+    permission_required = "pedagogy.add_uv"
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
@@ -208,24 +208,24 @@ class UECreateView(PermissionRequiredMixin, CreateView):
         return kwargs
 
 
-class UEDeleteView(PermissionRequiredMixin, DeleteView):
+class UVDeleteView(PermissionRequiredMixin, DeleteView):
-    """Allow to delete an UE (Privileged)."""
+    """Allow to delete an UV (Privileged)."""
 
-    model = UE
+    model = UV
-    pk_url_kwarg = "ue_id"
+    pk_url_kwarg = "uv_id"
     template_name = "core/delete_confirm.jinja"
-    permission_required = "pedagogy.delete_ue"
+    permission_required = "pedagogy.delete_uv"
     success_url = reverse_lazy("pedagogy:guide")
 
 
-class UEUpdateView(PermissionRequiredMixin, UpdateView):
+class UVUpdateView(PermissionRequiredMixin, UpdateView):
-    """Allow to edit an UE (Privilegied)."""
+    """Allow to edit an UV (Privilegied)."""
 
-    model = UE
+    model = UV
-    form_class = UEForm
+    form_class = UVForm
-    pk_url_kwarg = "ue_id"
+    pk_url_kwarg = "uv_id"
-    template_name = "pedagogy/ue_edit.jinja"
+    template_name = "pedagogy/uv_edit.jinja"
-    permission_required = "pedagogy.change_ue"
+    permission_required = "pedagogy.change_uv"
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()

pyproject.toml

@@ -19,37 +19,37 @@ authors = [
 license = { text = "GPL-3.0-only" }
 requires-python = "<4.0,>=3.12"
 dependencies = [
-    "django>=5.2.8,<6.0.0",
+    "django>=5.2.9,<6.0.0",
-    "django-ninja>=1.5.0,<6.0.0",
+    "django-ninja>=1.5.0,<2.0.0",
-    "django-ninja-extra>=0.30.6",
+    "django-ninja-extra>=0.30.6,<1.0.0",
     "Pillow>=12.0.0,<13.0.0",
     "mistune>=3.1.4,<4.0.0",
     "django-jinja<3.0.0,>=2.11.0",
     "cryptography>=46.0.3,<47.0.0",
-    "django-phonenumber-field>=8.3.0,<9.0.0",
+    "django-phonenumber-field>=8.4.0,<9.0.0",
-    "phonenumbers>=9.0.18,<10.0.0",
+    "phonenumbers>=9.0.20,<10.0.0",
-    "reportlab>=4.4.4,<5.0.0",
+    "reportlab>=4.4.6,<5.0.0",
     "django-haystack<4.0.0,>=3.3.0",
     "xapian-haystack<4.0.0,>=3.1.0",
     "libsass<1.0.0,>=0.23.0",
     "django-ordered-model<4.0.0,>=3.7.4",
-    "django-simple-captcha<1.0.0,>=0.6.2",
+    "django-simple-captcha<1.0.0,>=0.6.3",
     "python-dateutil<3.0.0.0,>=2.9.0.post0",
-    "sentry-sdk>=2.43.0,<3.0.0",
+    "sentry-sdk>=2.47.0,<3.0.0",
     "jinja2<4.0.0,>=3.1.6",
-    "django-countries>=8.0.0,<9.0.0",
+    "django-countries>=8.2.0,<9.0.0",
     "dict2xml>=1.7.7,<2.0.0",
     "Sphinx<6,>=5",
     "tomli>=2.3.0,<3.0.0",
     "django-honeypot>=1.3.0,<2",
     "pydantic-extra-types>=2.10.6,<3.0.0",
     "ical>=11.1.0,<12",
-    "redis[hiredis]<7,>=5.3.0",
+    "redis[hiredis]<7,>=6.4.0",
     "environs[django]>=14.5.0,<15.0.0",
     "requests>=2.32.5,<3.0.0",
     "honcho>=2.0.0",
     "psutil>=7.1.3,<8.0.0",
-    "celery[redis]>=5.5.2",
+    "celery[redis]>=5.6.0",
     "django-celery-results>=2.5.1",
     "django-celery-beat>=2.7.0",
 ]
@@ -60,13 +60,13 @@ documentation = "https://sith-ae.readthedocs.io/"
 
 [dependency-groups]
 prod = [
-    "psycopg[c]>=3.2.12,<4.0.0",
+    "psycopg[c]>=3.3.2,<4.0.0",
 ]
 dev = [
     "django-debug-toolbar>=6.1.0,<7",
-    "ipython>=9.7.0,<10.0.0",
+    "ipython>=9.8.0,<10.0.0",
-    "pre-commit>=4.3.0,<5.0.0",
+    "pre-commit>=4.5.0,<5.0.0",
-    "ruff>=0.14.4,<1.0.0",
+    "ruff>=0.14.9,<1.0.0",
     "djhtml>=3.0.10,<4.0.0",
     "faker>=37.12.0,<38.0.0",
     "rjsmin>=1.2.5,<2.0.0",
@@ -77,14 +77,14 @@ tests = [
     "pytest-cov>=7.0.0,<8.0.0",
     "pytest-django<5.0.0,>=4.10.0",
     "model-bakery<2.0.0,>=1.20.4",
-    "beautifulsoup4>=4.14.2,<5",
+    "beautifulsoup4>=4.14.3,<5",
     "lxml>=6.0.2,<7",
 ]
 docs = [
     "mkdocs<2.0.0,>=1.6.1",
-    "mkdocs-material>=9.6.23,<10.0.0",
+    "mkdocs-material>=9.7.0,<10.0.0",
     "mkdocstrings>=0.30.1,<1.0.0",
-    "mkdocstrings-python>=1.18.2,<2.0.0",
+    "mkdocstrings-python>=1.19.0,<2.0.0",
     "mkdocs-include-markdown-plugin>=7.2.0,<8.0.0",
 ]
 

rootplace/tests/test_merge_users.py

@@ -114,6 +114,7 @@ class TestMergeUser(TestCase):
             seller=self.root,
             unit_price=2,
             quantity=2,
+            payment_method="SITH_ACCOUNT",
         ).save()
         Selling(
             label="barbar",
@@ -124,6 +125,7 @@ class TestMergeUser(TestCase):
             seller=self.root,
             unit_price=2,
             quantity=4,
+            payment_method="SITH_ACCOUNT",
         ).save()
         today = localtime(now()).date()
         # both subscriptions began last month and shall end in 5 months
@@ -195,6 +197,7 @@ class TestMergeUser(TestCase):
             seller=self.root,
             unit_price=2,
             quantity=4,
+            payment_method="SITH_ACCOUNT",
         ).save()
         data = {"user1": self.to_keep.id, "user2": self.to_delete.id}
         res = self.client.post(reverse("rootplace:merge"), data)
@@ -222,6 +225,7 @@ class TestMergeUser(TestCase):
             seller=self.root,
             unit_price=2,
             quantity=4,
+            payment_method="SITH_ACCOUNT",
         ).save()
         data = {"user1": self.to_keep.id, "user2": self.to_delete.id}
         res = self.client.post(reverse("rootplace:merge"), data)

sas/admin.py

@@ -20,9 +20,9 @@ from sas.models import Album, PeoplePictureRelation, Picture, PictureModerationR
 
 @admin.register(Picture)
 class PictureAdmin(admin.ModelAdmin):
-    list_display = ("name", "parent", "is_moderated")
+    list_display = ("name", "parent", "date", "size", "is_moderated")
     search_fields = ("name",)
-    autocomplete_fields = ("owner", "parent", "moderator")
+    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups", "moderator")
 
 
 @admin.register(PeoplePictureRelation)
@@ -33,9 +33,9 @@ class PeoplePictureRelationAdmin(admin.ModelAdmin):
 
 @admin.register(Album)
 class AlbumAdmin(admin.ModelAdmin):
-    list_display = ("name", "parent")
+    list_display = ("name", "parent", "date", "owner", "is_moderated")
     search_fields = ("name",)
-    autocomplete_fields = ("parent", "edit_groups", "view_groups")
+    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups")
 
 
 @admin.register(PictureModerationRequest)

sas/api.py

@@ -2,10 +2,8 @@ from typing import Any, Literal
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.shortcuts import get_list_or_404
 from django.urls import reverse
-from ninja import Body, Query, UploadedFile
+from ninja import Body, File, Query
-from ninja.errors import HttpError
 from ninja.security import SessionAuth
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.exceptions import NotFound, PermissionDenied
@@ -18,12 +16,11 @@ from api.permissions import (
     CanAccessLookup,
     CanEdit,
     CanView,
-    HasPerm,
     IsInGroup,
     IsRoot,
 )
 from core.models import Notification, User
-from core.utils import get_list_exact_or_404
+from core.schemas import UploadedImage
 from sas.models import Album, PeoplePictureRelation, Picture
 from sas.schemas import (
     AlbumAutocompleteSchema,
@@ -31,7 +28,6 @@ from sas.schemas import (
     AlbumSchema,
     IdentifiedUserSchema,
     ModerationRequestSchema,
-    MoveAlbumSchema,
     PictureFilterSchema,
     PictureSchema,
 )
@@ -73,48 +69,6 @@ class AlbumController(ControllerBase):
             Album.objects.viewable_by(self.context.request.user).order_by("-date")
         )
 
-    @route.patch("/parent", permissions=[IsAuthenticated])
-    def change_album_parent(self, payload: list[MoveAlbumSchema]):
-        """Change parents of albums
-
-        Note:
-            For this operation to work, the user must be authorized
-            to edit both the moved albums and their new parent.
-        """
-        user: User = self.context.request.user
-        albums: list[Album] = get_list_exact_or_404(
-            Album, pk__in={a.id for a in payload}
-        )
-        if not user.has_perm("sas.change_album"):
-            unauthorized = [a.id for a in albums if not user.can_edit(a)]
-            raise PermissionDenied(
-                f"You can't move the following albums : {unauthorized}"
-            )
-        parents: list[Album] = get_list_exact_or_404(
-            Album, pk__in={a.new_parent_id for a in payload}
-        )
-        if not user.has_perm("sas.change_album"):
-            unauthorized = [a.id for a in parents if not user.can_edit(a)]
-            raise PermissionDenied(
-                f"You can't move to the following albums : {unauthorized}"
-            )
-        id_to_new_parent = {i.id: i.new_parent_id for i in payload}
-        for album in albums:
-            album.parent_id = id_to_new_parent[album.id]
-        # known caveat : moving an album won't move it's thumbnail.
-        # E.g. if the album foo/bar is moved to foo/baz,
-        # the thumbnail will still be foo/bar/thumb.webp
-        # This has no impact for the end user
-        # and doing otherwise would be hard for us to implement,
-        # because we would then have to manage rollbacks on fail.
-        Album.objects.bulk_update(albums, fields=["parent_id"])
-
-    @route.delete("", permissions=[HasPerm("sas.delete_album")])
-    def delete_album(self, album_ids: list[int]):
-        # known caveat : deleting an album doesn't delete the pictures on the disk.
-        # It's a db only operation.
-        albums: list[Album] = get_list_or_404(Album, pk__in=album_ids)
-
 
 @api_controller("/sas/picture")
 class PicturesController(ControllerBase):
@@ -142,7 +96,7 @@ class PicturesController(ControllerBase):
         return (
             filters.filter(Picture.objects.viewable_by(user))
             .distinct()
-            .order_by("-parent__event_date", "created_at")
+            .order_by("-parent__date", "date")
             .select_related("owner", "parent")
         )
 
@@ -156,25 +110,27 @@ class PicturesController(ControllerBase):
         },
         url_name="upload_picture",
     )
-    def upload_picture(self, album_id: Body[int], picture: UploadedFile):
+    def upload_picture(self, album_id: Body[int], picture: File[UploadedImage]):
         album = self.get_object_or_exception(Album, pk=album_id)
         user = self.context.request.user
         self_moderate = user.has_perm("sas.moderate_sasfile")
         new = Picture(
             parent=album,
             name=picture.name,
-            original=picture,
+            file=picture,
             owner=user,
             is_moderated=self_moderate,
+            is_folder=False,
+            mime_type=picture.content_type,
         )
         if self_moderate:
             new.moderator = user
-        new.generate_thumbnails()
         try:
+            new.generate_thumbnails()
             new.full_clean()
+            new.save()
         except ValidationError as e:
-            raise HttpError(status_code=409, message=str(e)) from e
+            return self.create_response({"detail": dict(e)}, status_code=409)
-        new.save()
 
     @route.get(
         "/{picture_id}/identified",

sas/baker_recipes.py

@@ -1,35 +1,18 @@
-from django.core.files.uploadedfile import SimpleUploadedFile
 from model_bakery import seq
 from model_bakery.recipe import Recipe
 
-from core.utils import RED_PIXEL_PNG
+from sas.models import Picture
-from sas.models import Album, Picture
-
-album_recipe = Recipe(
-    Album,
-    name=seq("Album "),
-    thumbnail=SimpleUploadedFile(
-        name="thumb.webp", content=b"", content_type="image/webp"
-    ),
-)
-
 
 picture_recipe = Recipe(
     Picture,
+    is_in_sas=True,
+    is_folder=False,
     is_moderated=True,
     name=seq("Picture "),
-    original=SimpleUploadedFile(
-        # compressed and thumbnail are generated on save (except if bulk creating).
-        # For this step no to fail, original must be a valid image.
-        name="img.png",
-        content=RED_PIXEL_PNG,
-        content_type="image/png",
-    ),
-    compressed=SimpleUploadedFile(
-        name="img.webp", content=b"", content_type="image/webp"
-    ),
-    thumbnail=SimpleUploadedFile(
-        name="img.webp", content=b"", content_type="image/webp"
-    ),
 )
-"""A SAS Picture fixture."""
+"""A SAS Picture fixture.
+
+Warnings:
+    If you don't `bulk_create` this, you need
+    to explicitly set the parent album, or it won't work
+"""

sas/forms.py

@@ -48,12 +48,13 @@ class PictureEditForm(forms.ModelForm):
 class AlbumEditForm(forms.ModelForm):
     class Meta:
         model = Album
-        fields = ["name", "date", "thumbnail", "parent", "edit_groups"]
+        fields = ["name", "date", "file", "parent", "edit_groups"]
         widgets = {
             "parent": AutoCompleteSelectAlbum,
             "edit_groups": AutoCompleteSelectMultipleGroup,
         }
 
+    name = forms.CharField(max_length=Album.NAME_MAX_LENGTH, label=_("file name"))
     date = forms.DateField(label=_("Date"), widget=SelectDate, required=True)
     recursive = forms.BooleanField(label=_("Apply rights recursively"), required=False)
 

sas/migrations/0006_move_the_whole_sas.py

@@ -1,357 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-22 21:53
-import collections
-import itertools
-import logging
-from typing import TYPE_CHECKING
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-
-import sas.models
-
-if TYPE_CHECKING:
-    import core.models
-
-# NB : tous les commentaires sont écrits en français,
-#      parce qu'on est sur des opérations qui sont complexes,
-#      et qui sont surtout DANGEREUSES.
-#      Ici, la clarté des explications prime sur toute autre considération.
-
-
-def copy_albums_and_pictures(apps: StateApps, schema_editor):
-    SithFile: type[core.models.SithFile] = apps.get_model("core", "SithFile")
-    Album: type[sas.models.Album] = apps.get_model("sas", "Album")
-    Picture: type[sas.models.Picture] = apps.get_model("sas", "Picture")
-    logger = logging.getLogger("django")
-
-    # Il y a environ 1800 albums, 257k photos et 488k identifications
-    # d'utilisateurs dans la db de prod.
-    # En supposant qu'une insertion prenne 10ms (ce qui est très optimiste),
-    # migrer tous les enregistrements de la db prendrait plus de 2h.
-    # C'est trop long.
-    # Mais d'un autre côté, j'ai pas assez confiance dans les capacités de nos
-    # machines pour charger presque un million d'objets en mémoire.
-    # Pour faire un compromis, les albums sont migrés individuellement un à un,
-    # mais tous les objets liés à ces albums
-    # (photos, groupes de vue, groupe d'édition, identification d'utilisateurs)
-    # sont migrés en tas.
-    #
-    # Ordre des opérations :
-    # 1. On migre les albums 1 à 1 (il y en a 1800, donc c'est relativement court)
-    # 2. On migre les photos par paquet de 2500 (soit ~une centaine d'opérations)
-    # 3. On migre tous les groupes de vue et tous les groupes d'édition des albums
-    #
-    # Au total, la migration devrait demander aux alentours de 2000 insertions,
-    # ce qui est un compromis acceptable entre une migration
-    # pas trop longue et une RAM pas trop surchargée.
-    #
-    # Pour ce qui est de la répartition des tables, quatre nouvelles tables
-    # sont créées : sas_album, sas_picture,
-    # sas_pictureviewgroups et sas_picture_editgroups.
-    # Tous les albums et toutes les photos qui sont dans core_sithfile
-    # vont être copiés dans ces tables.
-    # Comme les albums sont migrés un à un, ils recevront une nouvelle
-    # clef primaire.
-    # Pour les photos, en revanche, c'est beaucoup plus sûr de leur donner
-    # le même id que celui qu'il y avait dans core_sithfile.
-    #
-    # Les identifications des photos ne sont pas migrées pour l'instant.
-    # Ce qu'on va faire, c'est qu'on va changer la contrainte de clef étrangère
-    # sur la colonne des photos pour pointer vers sas_picture
-    # au lieu de core_sithfile.
-    # Cependant, pour que ça marche,
-    # il faut qu'au moment où ce changement est effectué,
-    # toutes les clefs primaires référencées existent à la fois dans
-    # les deux tables, sinon les contraintes d'intégrité ne sont pas respectées.
-    # La migration de ce fichier va donc s'occuper de créer les nouvelles tables
-    # et d'y copier les données nécessaires.
-    # Puis une deuxième migration s'occupera de changer les contraintes.
-    # Et enfin une troisième migration supprimera les anciennes données.
-    #
-    # Pavé César
-
-    albums = SithFile.objects.filter(is_in_sas=True, is_folder=True).prefetch_related(
-        "view_groups", "edit_groups"
-    )
-    old_albums = collections.deque(
-        albums.filter(parent_id=settings.SITH_SAS_ROOT_DIR_ID)
-    )
-
-    # Changement de représentation en DB.
-    # Dans l'ancien système, un fichier était dans le SAS si
-    # un fichier spécial (le SAS_ROOT) était parmi ses ancêtres.
-    # Comme maintenant les fichiers du SAS sont dans des tables à part,
-    # il ne peut plus y avoir de confusion.
-    # Les photos ont donc obligatoirement un parent (qui est un album)
-    # et les albums peuvent avoir un parent null.
-    # Un album sans parent est considéré comme se trouvant à la racine
-    # de l'arborescence.
-    # En quelque sorte, None est le nouveau SITH_SAS_ROOT_DIR_ID
-    album_id_old_to_new = {settings.SITH_SAS_ROOT_DIR_ID: None}
-
-    logger.info(f"migrating {albums.count()} albums")
-    while len(old_albums) > 0:
-        # Comme les albums référencent leur parent, les albums doivent être migrés
-        # par ordre croissant de profondeur dans l'arborescence.
-        # Chaque album est donc pris par la gauche de la file
-        # et ses enfants ajoutés sur la droite.
-        old_album = old_albums.popleft()
-        old_albums.extend(list(albums.filter(parent=old_album)))
-        new_album = Album.objects.create(
-            parent_id=album_id_old_to_new[old_album.parent_id],
-            event_date=old_album.date.date(),
-            name=old_album.name,
-            thumbnail=(old_album.file or None),
-            is_moderated=old_album.is_moderated,
-        )
-        # on garde un dictionnaire qui associe les id des albums dans l'ancienne table
-        # à leur id dans la nouvelle table, pour pouvoir recréer
-        # les liens de parenté entre albums
-        album_id_old_to_new[old_album.id] = new_album.id
-
-    pictures = SithFile.objects.filter(is_in_sas=True, is_folder=False)
-    nb_pictures = pictures.count()
-    logger.info(f"migrating {nb_pictures} pictures")
-    for i, pictures_batch in enumerate(itertools.batched(pictures, 2500), start=1):
-        Picture.objects.bulk_create(
-            [
-                Picture(
-                    id=p.id,
-                    name=p.name,
-                    parent_id=album_id_old_to_new[p.parent_id],
-                    thumbnail=p.thumbnail,
-                    compressed=p.compressed,
-                    original=p.file,
-                    owner_id=p.owner_id,
-                    created_at=p.date,
-                    is_moderated=p.is_moderated,
-                    asked_for_removal=p.asked_for_removal,
-                    moderator_id=p.moderator_id,
-                )
-                for p in pictures_batch
-            ]
-        )
-        logger.info(f"Migrated {min(i * 2500, nb_pictures)} / {nb_pictures} pictures")
-
-    logger.info("Migrating album groups")
-    albums = SithFile.objects.filter(is_in_sas=True, is_folder=True).exclude(
-        id=settings.SITH_SAS_ROOT_DIR_ID
-    )
-    Album.edit_groups.through.objects.bulk_create(
-        [
-            Album.view_groups.through(
-                album=album_id_old_to_new[g.sithfile_id], group_id=g.group_id
-            )
-            for g in SithFile.view_groups.through.objects.filter(sithfile__in=albums)
-        ]
-    )
-    Album.edit_groups.through.objects.bulk_create(
-        [
-            Album.view_groups.through(
-                album=album_id_old_to_new[g.sithfile_id], group_id=g.group_id
-            )
-            for g in SithFile.view_groups.through.objects.filter(sithfile__in=albums)
-        ]
-    )
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("core", "0044_alter_userban_options"),
-        ("sas", "0005_alter_sasfile_options"),
-    ]
-
-    operations = [
-        # les relations et les demandes de modération étaient liées à SithFile,
-        # via le model proxy Picture.
-        # Pour que la migration marche malgré la disparition du modèle Proxy,
-        # on change la relation pour qu'elle pointe directement vers SithFile
-        migrations.AlterField(
-            model_name="peoplepicturerelation",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="people",
-                to="core.sithfile",
-                verbose_name="picture",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="picturemoderationrequest",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="moderation_requests",
-                to="core.sithfile",
-                verbose_name="Picture",
-            ),
-        ),
-        migrations.DeleteModel(name="Album"),
-        migrations.DeleteModel(name="Picture"),
-        migrations.DeleteModel(name="SasFile"),
-        migrations.CreateModel(
-            name="Album",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "thumbnail",
-                    models.FileField(
-                        max_length=256,
-                        upload_to=sas.models.get_thumbnail_directory,
-                        verbose_name="thumbnail",
-                    ),
-                ),
-                ("name", models.CharField(max_length=100, verbose_name="name")),
-                (
-                    "event_date",
-                    models.DateField(
-                        default=django.utils.timezone.localdate,
-                        help_text="The date on which the photos in this album were taken",
-                        verbose_name="event date",
-                    ),
-                ),
-                (
-                    "is_moderated",
-                    models.BooleanField(default=False, verbose_name="is moderated"),
-                ),
-                (
-                    "edit_groups",
-                    models.ManyToManyField(
-                        related_name="editable_albums",
-                        to="core.group",
-                        verbose_name="edit groups",
-                    ),
-                ),
-                (
-                    "parent",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="children",
-                        to="sas.album",
-                        verbose_name="parent",
-                    ),
-                ),
-                (
-                    "view_groups",
-                    models.ManyToManyField(
-                        related_name="viewable_albums",
-                        to="core.group",
-                        verbose_name="view groups",
-                    ),
-                ),
-            ],
-            options={"verbose_name": "album"},
-        ),
-        migrations.CreateModel(
-            name="Picture",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "thumbnail",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_thumbnail_directory,
-                        verbose_name="thumbnail",
-                        max_length=256,
-                    ),
-                ),
-                ("name", models.CharField(max_length=256, verbose_name="file name")),
-                (
-                    "original",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_directory,
-                        verbose_name="original image",
-                        max_length=256,
-                    ),
-                ),
-                (
-                    "compressed",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_compressed_directory,
-                        verbose_name="compressed image",
-                        max_length=256,
-                    ),
-                ),
-                ("created_at", models.DateTimeField(default=django.utils.timezone.now)),
-                (
-                    "is_moderated",
-                    models.BooleanField(default=False, verbose_name="is moderated"),
-                ),
-                (
-                    "asked_for_removal",
-                    models.BooleanField(
-                        default=False, verbose_name="asked for removal"
-                    ),
-                ),
-                (
-                    "moderator",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="moderated_pictures",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.PROTECT,
-                        related_name="owned_pictures",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="owner",
-                    ),
-                ),
-                (
-                    "parent",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="pictures",
-                        to="sas.album",
-                        verbose_name="album",
-                    ),
-                ),
-            ],
-            options={"abstract": False, "verbose_name": "picture"},
-        ),
-        migrations.AddConstraint(
-            model_name="picture",
-            constraint=models.UniqueConstraint(
-                fields=("name", "parent"), name="sas_picture_unique_per_album"
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="album",
-            constraint=models.UniqueConstraint(
-                fields=("name", "parent"), name="unique_album_name_if_same_parent"
-            ),
-        ),
-        migrations.RunPython(
-            copy_albums_and_pictures,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True,
-        ),
-    ]

sas/migrations/0007_alter_peoplepicturerelation_picture_and_more.py

@@ -1,31 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-25 23:50
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("sas", "0006_move_the_whole_sas")]
-
-    operations = [
-        migrations.AlterField(
-            model_name="peoplepicturerelation",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="people",
-                to="sas.picture",
-                verbose_name="picture",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="picturemoderationrequest",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="moderation_requests",
-                to="sas.picture",
-                verbose_name="Picture",
-            ),
-        ),
-    ]

sas/models.py

@@ -18,52 +18,29 @@ from __future__ import annotations
 import contextlib
 from io import BytesIO
 from pathlib import Path
-from typing import TYPE_CHECKING, ClassVar, Self
+from typing import ClassVar, Self
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
-from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models import Exists, OuterRef, Q
-from django.db.models.deletion import Collector
 from django.urls import reverse
-from django.utils import timezone
-from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from PIL import Image
 
-from core.models import Group, Notification, User
+from core.models import Notification, SithFile, User
 from core.utils import exif_auto_rotate, resize_image
 
-if TYPE_CHECKING:
-    from django.db.models.fields.files import FieldFile
 
-
+class SasFile(SithFile):
-def get_directory(instance: SasFile, filename: str):
+    """Proxy model for any file in the SAS.
-    return f"./{instance.parent_path}/{filename}"
-
-
-def get_compressed_directory(instance: SasFile, filename: str):
-    return f"./.compressed/{instance.parent_path}/{filename}"
-
-
-def get_thumbnail_directory(instance: SasFile, filename: str):
-    if isinstance(instance, Album):
-        _, extension = filename.rsplit(".", 1)
-        filename = f"{instance.name}/thumb.{extension}"
-    return f"./.thumbnails/{instance.parent_path}/{filename}"
-
-
-class SasFile(models.Model):
-    """Abstract model for SAS files
 
     May be used to have logic that should be shared by both
     [Picture][sas.models.Picture] and [Album][sas.models.Album].
     """
 
     class Meta:
-        abstract = True
+        proxy = True
         permissions = [
             ("moderate_sasfile", "Can moderate SAS files"),
             ("view_unmoderated_sasfile", "Can view not moderated SAS files"),
@@ -88,169 +65,6 @@ class SasFile(models.Model):
     def can_be_edited_by(self, user):
         return user.has_perm("sas.change_sasfile")
 
-    @cached_property
-    def parent_path(self) -> str:
-        """The parent location in the SAS album tree (e.g. `SAS/foo/bar`)."""
-        return "/".join(["SAS", *[p.name for p in self.parent_list]])
-
-    @cached_property
-    def parent_list(self) -> list[Album]:
-        """The ancestors of this SAS object.
-
-        The result is ordered from the direct parent to the farthest one.
-        """
-        parents = []
-        current = self.parent
-        while current is not None:
-            parents.append(current)
-            current = current.parent
-        return parents
-
-
-class AlbumQuerySet(models.QuerySet):
-    def viewable_by(self, user: User) -> Self:
-        """Filter the albums that this user can view.
-
-        Warning:
-            Calling this queryset method may add several additional requests.
-        """
-        if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
-            return self.all()
-        if user.was_subscribed:
-            return self.filter(is_moderated=True)
-        # known bug : if all children of an album are also albums
-        # then this album is excluded, even if one of the sub-albums should be visible.
-        # The fs-like navigation is likely to be half-broken for non-subscribers,
-        # but that's ok, since non-subscribers are expected to see only the albums
-        # containing pictures on which they have been identified (hence, very few).
-        # Most, if not all, of their albums will be displayed on the
-        # `latest albums` section of the SAS.
-        # Moreover, they will still see all of their picture in their profile.
-        return self.filter(
-            Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user))
-        )
-
-
-class Album(SasFile):
-    NAME_MAX_LENGTH: ClassVar[int] = 50
-
-    name = models.CharField(_("name"), max_length=100)
-    parent = models.ForeignKey(
-        "self",
-        related_name="children",
-        verbose_name=_("parent"),
-        null=True,
-        blank=True,
-        on_delete=models.CASCADE,
-    )
-    thumbnail = models.FileField(
-        upload_to=get_thumbnail_directory,
-        verbose_name=_("thumbnail"),
-        max_length=256,
-        blank=True,
-    )
-    view_groups = models.ManyToManyField(
-        Group, related_name="viewable_albums", verbose_name=_("view groups"), blank=True
-    )
-    edit_groups = models.ManyToManyField(
-        Group, related_name="editable_albums", verbose_name=_("edit groups"), blank=True
-    )
-    event_date = models.DateField(
-        _("event date"),
-        help_text=_("The date on which the photos in this album were taken"),
-        default=timezone.localdate,
-        blank=True,
-    )
-    is_moderated = models.BooleanField(_("is moderated"), default=False)
-
-    objects = AlbumQuerySet.as_manager()
-
-    class Meta:
-        verbose_name = _("album")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "parent"],
-                name="unique_album_name_if_same_parent",
-                # TODO : add `nulls_distinct=True` after upgrading to django>=5.0
-            )
-        ]
-
-    def __str__(self):
-        return f"Album {self.name}"
-
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        for user in User.objects.filter(
-            groups__id__in=[settings.SITH_GROUP_SAS_ADMIN_ID]
-        ):
-            Notification(
-                user=user,
-                url=reverse("sas:moderation"),
-                type="SAS_MODERATION",
-                param="1",
-            ).save()
-
-    def get_absolute_url(self):
-        return reverse("sas:album", kwargs={"album_id": self.id})
-
-    def clean(self):
-        super().clean()
-        if "/" in self.name:
-            raise ValidationError(_("Character '/' not authorized in name"))
-        if self.parent_id is not None and (
-            self.id == self.parent_id or self in self.parent_list
-        ):
-            raise ValidationError(_("Loop in album tree"), code="loop")
-        if self.thumbnail:
-            try:
-                Image.open(BytesIO(self.thumbnail.read()))
-            except Image.UnidentifiedImageError as e:
-                raise ValidationError(_("This is not a valid album thumbnail")) from e
-
-    def delete(self, *args, **kwargs):
-        """Delete the album, all of its children and all linked disk files"""
-        collector = Collector(using="default")
-        collector.collect([self])
-        albums: set[Album] = collector.data[Album]
-        pictures: set[Picture] = collector.data[Picture]
-        files: list[FieldFile] = [
-            *[a.thumbnail for a in albums],
-            *[p.thumbnail for p in pictures],
-            *[p.compressed for p in pictures],
-            *[p.original for p in pictures],
-        ]
-        # `bool(f)` checks that the file actually exists on the disk
-        files = [f for f in files if bool(f)]
-        folders = {Path(f.path).parent for f in files}
-        res = super().delete(*args, **kwargs)
-        # once the model instances have been deleted,
-        # delete the actual files.
-        for file in files:
-            # save=False ensures that django doesn't recreate the db record,
-            # which would make the whole deletion pointless
-            # cf. https://docs.djangoproject.com/en/stable/ref/models/fields/#django.db.models.fields.files.FieldFile.delete
-            file.delete(save=False)
-        for folder in folders:
-            # now that the files are deleted, remove the empty folders
-            if folder.is_dir() and next(folder.iterdir(), None) is None:
-                folder.rmdir()
-        return res
-
-    def get_download_url(self):
-        return reverse("sas:album_preview", kwargs={"album_id": self.id})
-
-    def generate_thumbnail(self):
-        p = (
-            self.pictures.exclude(thumbnail="").order_by("?").first()
-            or self.children.exclude(thumbnail="").order_by("?").first()
-        )
-        if p:
-            # The file is loaded into memory to duplicate it.
-            # It may not be the most efficient way, but thumbnails are
-            # usually quite small, so it's still ok
-            self.thumbnail = ContentFile(p.thumbnail.read(), name="thumb.webp")
-            self.save()
-
 
 class PictureQuerySet(models.QuerySet):
     def viewable_by(self, user: User) -> Self:
@@ -266,65 +80,23 @@ class PictureQuerySet(models.QuerySet):
         return self.filter(people__user_id=user.id, is_moderated=True)
 
 
+class SASPictureManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_in_sas=True, is_folder=False)
+
+
 class Picture(SasFile):
-    name = models.CharField(_("file name"), max_length=256)
-    parent = models.ForeignKey(
-        Album,
-        related_name="pictures",
-        verbose_name=_("album"),
-        on_delete=models.CASCADE,
-    )
-    thumbnail = models.FileField(
-        upload_to=get_thumbnail_directory,
-        verbose_name=_("thumbnail"),
-        max_length=256,
-        unique=True,
-    )
-    original = models.FileField(
-        upload_to=get_directory,
-        verbose_name=_("original image"),
-        max_length=256,
-        unique=True,
-    )
-    compressed = models.FileField(
-        upload_to=get_compressed_directory,
-        verbose_name=_("compressed image"),
-        max_length=256,
-        unique=True,
-    )
-    created_at = models.DateTimeField(default=timezone.now)
-    owner = models.ForeignKey(
-        User,
-        related_name="owned_pictures",
-        verbose_name=_("owner"),
-        on_delete=models.PROTECT,
-    )
-
-    is_moderated = models.BooleanField(_("is moderated"), default=False)
-    asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
-    moderator = models.ForeignKey(
-        User,
-        related_name="moderated_pictures",
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-    )
-
-    objects = PictureQuerySet.as_manager()
-
     class Meta:
-        verbose_name = _("picture")
+        proxy = True
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "parent"], name="sas_picture_unique_per_album"
-            )
-        ]
 
-    def __str__(self):
+    objects = SASPictureManager.from_queryset(PictureQuerySet)()
-        return self.name
 
-    def get_absolute_url(self):
+    @property
-        return reverse("sas:picture", kwargs={"picture_id": self.id})
+    def is_vertical(self):
+        with open(settings.MEDIA_ROOT / self.file.name, "rb") as f:
+            im = Image.open(BytesIO(f.read()))
+            (w, h) = im.size
+            return (w / h) < 1
 
     def get_download_url(self):
         return reverse("sas:download", kwargs={"picture_id": self.id})
@@ -335,34 +107,41 @@ class Picture(SasFile):
     def get_download_thumb_url(self):
         return reverse("sas:download_thumb", kwargs={"picture_id": self.id})
 
-    @property
+    def get_absolute_url(self):
-    def is_vertical(self):
+        return reverse("sas:picture", kwargs={"picture_id": self.id})
-        # original, compressed and thumbnail image have all three the same ratio,
-        # so the smallest one is used to tell if the image is vertical
-        im = Image.open(BytesIO(self.thumbnail.read()))
-        (w, h) = im.size
-        return w < h
 
-    def generate_thumbnails(self):
+    def generate_thumbnails(self, *, overwrite=False):
-        im = Image.open(self.original)
+        im = Image.open(BytesIO(self.file.read()))
         with contextlib.suppress(Exception):
             im = exif_auto_rotate(im)
         # convert the compressed image and the thumbnail into webp
+        # The original image keeps its original type, because it's not
+        # meant to be shown on the website, but rather to keep the real image
+        # for less frequent cases (like downloading the pictures of an user)
+        extension = self.mime_type.split("/")[-1]
         # the HD version of the image doesn't need to be optimized, because :
         # - it isn't frequently queried
-        # - optimizing large images takes a lot of time, which greatly hinders the UX
+        # - optimizing large images takes a lot time, which greatly hinders the UX
         # - photographers usually already optimize their images
+        file = resize_image(im, max(im.size), extension, optimize=False)
         thumb = resize_image(im, 200, "webp")
         compressed = resize_image(im, 1200, "webp")
-        new_extension_name = str(Path(self.original.name).with_suffix(".webp"))
+        if overwrite:
+            self.file.delete()
+            self.thumbnail.delete()
+            self.compressed.delete()
+        new_extension_name = str(Path(self.name).with_suffix(".webp"))
+        self.file = file
+        self.file.name = self.name
         self.thumbnail = thumb
         self.thumbnail.name = new_extension_name
         self.compressed = compressed
         self.compressed.name = new_extension_name
 
     def rotate(self, degree):
-        for field in self.original, self.compressed, self.thumbnail:
+        for attr in ["file", "compressed", "thumbnail"]:
-            with open(field.file, "r+b") as file:
+            name = self.__getattribute__(attr).name
+            with open(settings.MEDIA_ROOT / name, "r+b") as file:
                 if file:
                     im = Image.open(BytesIO(file.read()))
                     file.seek(0)
@@ -375,6 +154,110 @@ class Picture(SasFile):
                         progressive=True,
                     )
 
+    def get_next(self):
+        if self.is_moderated:
+            pictures_qs = self.parent.children.filter(
+                is_moderated=True,
+                asked_for_removal=False,
+                is_folder=False,
+                id__gt=self.id,
+            )
+        else:
+            pictures_qs = Picture.objects.filter(id__gt=self.id, is_moderated=False)
+        return pictures_qs.order_by("id").first()
+
+    def get_previous(self):
+        if self.is_moderated:
+            pictures_qs = self.parent.children.filter(
+                is_moderated=True,
+                asked_for_removal=False,
+                is_folder=False,
+                id__lt=self.id,
+            )
+        else:
+            pictures_qs = Picture.objects.filter(id__lt=self.id, is_moderated=False)
+        return pictures_qs.order_by("-id").first()
+
+
+class AlbumQuerySet(models.QuerySet):
+    def viewable_by(self, user: User) -> Self:
+        """Filter the albums that this user can view.
+
+        Warning:
+            Calling this queryset method may add several additional requests.
+        """
+        if user.has_perm("sas.moderate_sasfile"):
+            return self.all()
+        if user.was_subscribed:
+            return self.filter(Q(is_moderated=True) | Q(owner=user))
+        # known bug : if all children of an album are also albums
+        # then this album is excluded, even if one of the sub-albums should be visible.
+        # The fs-like navigation is likely to be half-broken for non-subscribers,
+        # but that's ok, since non-subscribers are expected to see only the albums
+        # containing pictures on which they have been identified (hence, very few).
+        # Most, if not all, of their albums will be displayed on the
+        # `latest albums` section of the SAS.
+        # Moreover, they will still see all of their picture in their profile.
+        return self.filter(
+            Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user))
+        )
+
+
+class SASAlbumManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_in_sas=True, is_folder=True)
+
+
+class Album(SasFile):
+    NAME_MAX_LENGTH: ClassVar[int] = 50
+    """Maximum length of an album's name.
+    
+    [SithFile][core.models.SithFile] have a maximum length
+    of 256 characters.
+    However, this limit is too high for albums.
+    Names longer than 50 characters are harder to read
+    and harder to display on the SAS page.
+    
+    It is to be noted, though, that this does not
+    add or modify any db behaviour.
+    It's just a constant to be used in views and forms.
+    """
+
+    class Meta:
+        proxy = True
+
+    objects = SASAlbumManager.from_queryset(AlbumQuerySet)()
+
+    @property
+    def children_pictures(self):
+        return Picture.objects.filter(parent=self)
+
+    @property
+    def children_albums(self):
+        return Album.objects.filter(parent=self)
+
+    def get_absolute_url(self):
+        if self.id == settings.SITH_SAS_ROOT_DIR_ID:
+            return reverse("sas:main")
+        return reverse("sas:album", kwargs={"album_id": self.id})
+
+    def get_download_url(self):
+        return reverse("sas:album_preview", kwargs={"album_id": self.id})
+
+    def generate_thumbnail(self):
+        p = (
+            self.children_pictures.order_by("?").first()
+            or self.children_albums.exclude(file=None)
+            .exclude(file="")
+            .order_by("?")
+            .first()
+        )
+        if p and p.file:
+            image = resize_image(Image.open(BytesIO(p.file.read())), 200, "webp")
+            self.file = image
+            self.file.name = f"{self.name}/thumb.webp"
+            self.save()
+
 
 def sas_notification_callback(notif: Notification):
     count = Picture.objects.filter(is_moderated=False).count()

sas/schemas.py

@@ -2,19 +2,20 @@ from datetime import datetime
 from pathlib import Path
 from typing import Annotated
 
+from annotated_types import MinLen
 from django.urls import reverse
-from ninja import FilterLookup, FilterSchema, ModelSchema, Schema
+from ninja import FilterSchema, ModelSchema, Schema
 from pydantic import Field, NonNegativeInt
 
-from core.schemas import NonEmptyStr, SimpleUserSchema, UserProfileSchema
+from core.schemas import SimpleUserSchema, UserProfileSchema
 from sas.models import Album, Picture, PictureModerationRequest
 
 
 class AlbumFilterSchema(FilterSchema):
-    search: Annotated[NonEmptyStr | None, FilterLookup("name__icontains")] = None
+    search: Annotated[str, MinLen(1)] | None = Field(None, q="name__icontains")
-    before_date: Annotated[datetime | None, FilterLookup("event_date__lte")] = None
+    before_date: datetime | None = Field(None, q="event_date__lte")
-    after_date: Annotated[datetime | None, FilterLookup("event_date__gte")] = None
+    after_date: datetime | None = Field(None, q="event_date__gte")
-    parent_id: Annotated[int | None, FilterLookup("parent_id")] = None
+    parent_id: int | None = Field(None, q="parent_id")
 
 
 class SimpleAlbumSchema(ModelSchema):
@@ -55,27 +56,20 @@ class AlbumAutocompleteSchema(ModelSchema):
 
     @staticmethod
     def resolve_path(obj: Album) -> str:
-        return str(Path(obj.parent_path) / obj.name)
+        return str(Path(obj.get_parent_path()) / obj.name)
-
-
-class MoveAlbumSchema(Schema):
-    id: int
-    new_parent_id: int
 
 
 class PictureFilterSchema(FilterSchema):
-    before_date: Annotated[datetime | None, FilterLookup("date__lte")] = None
+    before_date: datetime | None = Field(None, q="date__lte")
-    after_date: Annotated[datetime | None, FilterLookup("date__gte")] = None
+    after_date: datetime | None = Field(None, q="date__gte")
-    users_identified: Annotated[
+    users_identified: set[int] | None = Field(None, q="people__user_id__in")
-        set[int] | None, FilterLookup("people__user_id__in")
+    album_id: int | None = Field(None, q="parent_id")
-    ] = None
-    album_id: Annotated[int | None, FilterLookup("parent_id")] = None
 
 
 class PictureSchema(ModelSchema):
     class Meta:
         model = Picture
-        fields = ["id", "name", "created_at", "is_moderated", "asked_for_removal"]
+        fields = ["id", "name", "date", "size", "is_moderated", "asked_for_removal"]
 
     owner: UserProfileSchema
     sas_url: str

sas/static/bundled/sas/album-index.ts

@@ -125,108 +125,3 @@ document.addEventListener("alpine:init", () => {
     },
   }));
 });
-
-// Todo: migrate to alpine.js if we have some time
-// $("form#upload_form").submit(function (event) {
-//   const formData = new FormData($(this)[0]);
-//
-//   if (!formData.get("album_name") && !formData.get("images").name) return false;
-//
-//   if (!formData.get("images").name) {
-//     return true;
-//   }
-//
-//   event.preventDefault();
-//
-//   let errorList = this.querySelector("#upload_form ul.errorlist.nonfield");
-//   if (errorList === null) {
-//     errorList = document.createElement("ul");
-//     errorList.classList.add("errorlist", "nonfield");
-//     this.insertBefore(errorList, this.firstElementChild);
-//   }
-//
-//   while (errorList.childElementCount > 0)
-//     errorList.removeChild(errorList.firstElementChild);
-//
-//   let progress = this.querySelector("progress");
-//   if (progress === null) {
-//     progress = document.createElement("progress");
-//     progress.value = 0;
-//     const p = document.createElement("p");
-//     p.appendChild(progress);
-//     this.insertBefore(p, this.lastElementChild);
-//   }
-//
-//   let dataHolder;
-//
-//   if (formData.get("album_name")) {
-//     dataHolder = new FormData();
-//     dataHolder.set("csrfmiddlewaretoken", "{{ csrf_token }}");
-//     dataHolder.set("album_name", formData.get("album_name"));
-//     $.ajax({
-//       method: "POST",
-//       url: "{{ url('sas:album_upload', album_id=object.id) }}",
-//       data: dataHolder,
-//       processData: false,
-//       contentType: false,
-//       success: onSuccess,
-//     });
-//   }
-//
-//   const images = formData.getAll("images");
-//   const imagesCount = images.length;
-//   let completeCount = 0;
-//
-//   const poolSize = 1;
-//   const imagePool = [];
-//
-//   while (images.length > 0 && imagePool.length < poolSize) {
-//     const image = images.shift();
-//     imagePool.push(image);
-//     sendImage(image);
-//   }
-//
-//   function sendImage(image) {
-//     dataHolder = new FormData();
-//     dataHolder.set("csrfmiddlewaretoken", "{{ csrf_token }}");
-//     dataHolder.set("images", image);
-//
-//     $.ajax({
-//       method: "POST",
-//       url: "{{ url('sas:album_upload', album_id=object.id) }}",
-//       data: dataHolder,
-//       processData: false,
-//       contentType: false,
-//     })
-//       .fail(onSuccess.bind(undefined, image))
-//       .done(onSuccess.bind(undefined, image))
-//       .always(next.bind(undefined, image));
-//   }
-//
-//   function next(image, _, __) {
-//     const index = imagePool.indexOf(image);
-//     const nextImage = images.shift();
-//
-//     if (index !== -1) {
-//       imagePool.splice(index, 1);
-//     }
-//
-//     if (nextImage) {
-//       imagePool.push(nextImage);
-//       sendImage(nextImage);
-//     }
-//   }
-//
-//   function onSuccess(image, data, _, __) {
-//     let errors = [];
-//
-//     if ($(data.responseText).find(".errorlist.nonfield")[0])
-//       errors = Array.from($(data.responseText).find(".errorlist.nonfield")[0].children);
-//
-//     while (errors.length > 0) errorList.appendChild(errors.shift());
-//
-//     progress.value = ++completeCount / imagesCount;
-//     if (progress.value === 1 && errorList.children.length === 0)
-//       document.location.reload();
-//   }
-// });

sas/static/bundled/sas/pictures-download-index.ts

@@ -31,10 +31,10 @@ document.addEventListener("alpine:init", () => {
 
       await Promise.all(
         this.downloadPictures.map(async (p: PictureSchema) => {
-          const imgName = `${p.album.name}/IMG_${p.id}_${p.created_at.replace(/[:\-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
+          const imgName = `${p.album}/IMG_${p.date.replace(/[:\-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
           return zipWriter.add(imgName, new HttpReader(p.full_size_url), {
             level: 9,
-            lastModDate: new Date(p.created_at),
+            lastModDate: new Date(p.date),
             onstart: incrementProgressBar,
           });
         }),