WIP

Refactor Matmatronch

club/schemas.py

@@ -1,18 +1,16 @@
 from typing import Annotated
 
-from annotated_types import MinLen
 from django.db.models import Q
-from ninja import Field, FilterSchema, ModelSchema
+from ninja import FilterLookup, FilterSchema, ModelSchema
 
 from club.models import Club, Membership
-from core.schemas import SimpleUserSchema
+from core.schemas import NonEmptyStr, SimpleUserSchema
 
 
 class ClubSearchFilterSchema(FilterSchema):
-    search: Annotated[str, MinLen(1)] | None = Field(None, q="name__icontains")
+    search: Annotated[NonEmptyStr | None, FilterLookup("name__icontains")] = None
     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,15 +4,16 @@ 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 F, QuerySet
+from django.db.models import Count, OuterRef, QuerySet, Subquery
 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 NewsDate
+from com.models import News, NewsDate
 from core.models import User
 
 
@@ -42,9 +43,9 @@ class IcsCalendar:
         with open(cls._INTERNAL_CALENDAR, "wb") as f:
             _ = f.write(
                 cls.ics_from_queryset(
-                    NewsDate.objects.filter(
+                    News.objects.filter(
-                        news__is_published=True,
+                        is_published=True,
-                        end_date__gte=timezone.now() - (relativedelta(months=6)),
+                        dates__end_date__gte=timezone.now() - relativedelta(months=6),
                     )
                 )
             )
@@ -53,24 +54,35 @@ class IcsCalendar:
     @classmethod
     def get_unpublished(cls, user: User) -> bytes:
         return cls.ics_from_queryset(
-            NewsDate.objects.viewable_by(user).filter(
+            News.objects.viewable_by(user).filter(
-                news__is_published=False,
+                is_published=False,
-                end_date__gte=timezone.now() - (relativedelta(months=6)),
+                dates__end_date__gte=timezone.now() - relativedelta(months=6),
-            ),
+            )
         )
 
     @classmethod
-    def ics_from_queryset(cls, queryset: QuerySet[NewsDate]) -> bytes:
+    def ics_from_queryset(cls, queryset: QuerySet[News]) -> bytes:
         calendar = Calendar()
-        for news_date in queryset.annotate(news_title=F("news__title")):
+        date_subquery = NewsDate.objects.filter(news=OuterRef("pk")).order_by(
+            "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_date.news_title,
+                summary=news.title,
-                start=news_date.start_date,
+                description=news.summary,
-                end=news_date.end_date,
+                dtstart=news.start,
+                dtend=news.end,
                 url=as_absolute_url(
-                    reverse("com:news_detail", kwargs={"news_id": news_date.news_id})
+                    reverse("com:news_detail", kwargs={"news_id": 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 FilterSchema, ModelSchema
+from ninja import FilterLookup, 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: datetime | None = Field(None, q="end_date__lt")
+    before: Annotated[datetime | None, FilterLookup("end_date__lt")] = None
-    after: datetime | None = Field(None, q="start_date__gt")
+    after: Annotated[datetime | None, FilterLookup("start_date__gt")] = None
-    club_id: int | None = Field(None, q="news__club_id")
+    club_id: Annotated[int | None, FilterLookup("news__club_id")] = None
     news_id: int | None = None
-    is_published: bool | None = Field(None, q="news__is_published")
+    is_published: Annotated[bool | None, FilterLookup("news__is_published")] = None
-    title: str | None = Field(None, q="news__title__icontains")
+    title: Annotated[str | None, FilterLookup("news__title__icontains")] = None
 
 
 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 } from "@fullcalendar/core";
+import { Calendar, type EventClickArg, type EventContentArg } 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,6 +25,11 @@ 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;
@@ -95,6 +100,7 @@ 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();
   }
 
@@ -153,12 +159,24 @@ 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)}`,
@@ -166,6 +184,7 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         color: "red",
         className: "unpublished",
         cache: false,
+        eventDataTransform: tagRecurringEvents,
       },
     ];
   }
@@ -361,6 +380,14 @@ 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,6 +18,8 @@
   --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 {
@@ -147,3 +149,28 @@ ics-calendar {
   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

@@ -211,7 +211,7 @@
             </li>
             <li>
               <i class="fa-solid fa-magnifying-glass fa-xl"></i>
-              <a href="{{ url("matmat:search_clear") }}">{% trans %}Matmatronch{% endtrans %}</a>
+              <a href="{{ url("matmat:search") }}">{% 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", "is_in_sas")
+    list_display = ("name", "owner", "size", "date")
     autocomplete_fields = ("parent", "owner", "moderator")
-    search_fields = ("name", "parent__name")
+    search_fields = ("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(is_in_sas=False).filter(name__icontains=search)
+        return SithFile.objects.filter(name__icontains=search)
 
 
 @api_controller("/group")

core/management/commands/populate.py

@@ -110,7 +110,6 @@ 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"
         )
@@ -694,33 +693,21 @@ class Command(BaseCommand):
         # SAS
         for f in self.SAS_FIXTURE_PATH.glob("*"):
             if f.is_dir():
-                album = Album(
+                album = Album.objects.create(name=f.name, is_moderated=True)
-                    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,
-                        file=file,
+                        original=file,
                         owner=root,
-                        is_folder=False,
-                        is_in_sas=True,
                         is_moderated=True,
-                        mime_type="image/webp",
-                        size=file.size,
                     )
-                    pict.file.name = p.name
+                    pict.original.name = pict.name
-                    pict.full_clean()
                     pict.generate_thumbnails()
+                    pict.full_clean()
                     pict.save()
+                album.generate_thumbnail()
 
         img_skia = Picture.objects.get(name="skia.jpg")
         img_sli = Picture.objects.get(name="sli.jpg")

core/management/commands/populate_more.py

@@ -350,7 +350,6 @@ 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

@@ -0,0 +1,27 @@
+# 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

@@ -0,0 +1,9 @@
+# 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,7 +38,6 @@ 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
@@ -77,16 +76,6 @@ 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()
@@ -844,9 +833,6 @@ 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")
@@ -855,22 +841,10 @@ 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:
@@ -883,8 +857,6 @@ 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:
@@ -911,8 +883,6 @@ 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()
         ):
@@ -993,18 +963,6 @@ 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,3 +1,4 @@
+from datetime import datetime
 from pathlib import Path
 from typing import Annotated, Any
 
@@ -8,12 +9,14 @@ 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 FilterSchema, ModelSchema, Schema, UploadedFile
+from ninja import FilterLookup, FilterSchema, ModelSchema, Schema, UploadedFile
-from pydantic import AliasChoices, Field
+from pydantic import AliasChoices, Field, field_validator
 from pydantic_core.core_schema import ValidationInfo
 
 from core.models import Group, QuickUploadImage, SithFile, User
-from core.utils import is_image
+from core.utils import get_last_promo, is_image
+
+NonEmptyStr = Annotated[str, MinLen(1)]
 
 
 class UploadedImage(UploadedFile):
@@ -107,7 +110,11 @@ class GroupSchema(ModelSchema):
 
 
 class UserFilterSchema(FilterSchema):
-    search: Annotated[str, MinLen(1)]
+    search: Annotated[str, MinLen(1)] | None = None
+    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[]")
     )
@@ -136,6 +143,13 @@ 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.target.ariaBusy = true;
+  event.detail.target.ariaBusy = true;
 });
 
-document.body.addEventListener("htmx:afterRequest", (event) => {
+document.body.addEventListener("htmx:beforeSwap", (event) => {
-  event.originalTarget.ariaBusy = null;
+  event.detail.target.ariaBusy = null;
 });
 
 Object.assign(window, { htmx });

core/static/core/forms.scss

@@ -143,6 +143,15 @@ 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,15 +114,6 @@
     }
   }
 
-  &-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 @@
           }
         }
       }
+    }
 
-      &.delete {
+    form .link-like {
-        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_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
+        <li><a href="{{ url('matmat:search') }}">{% 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,12 +78,6 @@
   {% 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
 
@@ -157,12 +151,13 @@
     {% if current_page.has_previous() %}
       <a
         {% if use_htmx -%}
-          hx-get="?page={{ current_page.previous_page_number() }}"
+          hx-get="?{{ querystring(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="?page={{ current_page.previous_page_number() }}"
+          href="?{{ querystring(page=current_page.previous_page_number()) }}"
         {%- endif -%}
       >
         <button>
@@ -180,12 +175,12 @@
       {% else %}
         <a
           {% if use_htmx -%}
-            hx-get="?page={{ i }}"
+            hx-get="?{{ querystring(page=i) }}"
             hx-swap="innerHTML"
             hx-target="#content"
             hx-push-url="true"
           {%- else -%}
-            href="?page={{ i }}"
+            href="?{{ querystring(page=i) }}"
           {%- endif -%}
         >
           <button>{{ i }}</button>
@@ -195,12 +190,13 @@
     {% if current_page.has_next() %}
       <a
         {% if use_htmx -%}
-          hx-get="?page={{ current_page.next_page_number() }}"
+          hx-get="?{{querystring(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="?page={{ current_page.next_page_number() }}"
+          href="?{{querystring(page=current_page.next_page_number())}}"
         {%- endif -%}
       ><button>
         <i class="fa fa-caret-right"></i>
@@ -249,3 +245,17 @@
                  }"></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=target.get_display_name() %}Change password for {{ user }}{% endtrans %}</p>
+    <p>{% trans user=form.user.get_display_name() %}Change password for {{ user }}{% endtrans %}</p>
   {% endif %}
   <form method="post" action="">
     {% csrf_token %}

core/templates/core/search.jinja

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

core/templates/core/user_edit.jinja

@@ -114,7 +114,7 @@
 
 
     {# All fields #}
-    <div class="profile-fields">
+    <div class="fields-centered">
       {%- 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="profile-fields">
+    <div class="fields-centered">
       {%- for field in [form.quote, form.forum_signature] -%}
         <div class="profile-field">
           {{ field.label_tag() }}

core/templates/core/user_godfathers.jinja

@@ -29,7 +29,16 @@
             <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
               {{ u.get_mini_item() | safe }}
             </a>
-            {{ delete_godfather(user, profile, u, True) }}
+            {% if user == profile or user.is_root or user.is_board_member %}
+              <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>
@@ -46,7 +55,16 @@
             <a href="{{ url('core:user_godfathers', user_id=u.id) }}" class="mini_profile_link">
               {{ u.get_mini_item()|safe }}
             </a>
-            {{ delete_godfather(user, profile, u, False) }}
+            {% if user == profile or user.is_root or user.is_board_member %}
+              <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,32 +11,35 @@
 {% block content %}
   <div class="container">
     <div class="row">
-      {% if profile.permanencies %}
+      {% if total_perm_time %}
         <div>
           <h3>{% trans %}Permanencies{% endtrans %}</h3>
           <div class="flexed">
-            <div><span>Foyer :</span><span>{{ total_foyer_time }}</span></div>
+            {% for perm in perm_time %}
-            <div><span>Gommette :</span><span>{{ total_gommette_time }}</span></div>
+              <div>
-            <div><span>MDE :</span><span>{{ total_mde_time }}</span></div>
+                <span>{{ perm["counter__name"] }} :</span>
-            <div><b>Total :</b><b>{{ total_perm_time }}</b></div>
+                <span>{{ perm["total"]|format_timedelta }}</span>
+              </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">
-          <div><span>Foyer :</span><span>{{ total_foyer_buyings }}&nbsp;€</span></div>
+          {% for sum in purchase_sums %}
-          <div><span>Gommette :</span><span>{{ total_gommette_buyings }}&nbsp;€</span></div>
+            <div>
-          <div><span>MDE :</span><span>{{ total_mde_buyings }}&nbsp;€</span></div>
+              <span>{{ sum["counter__name"] }}</span>
-          <div><b>Total :</b><b>{{ total_foyer_buyings + total_gommette_buyings + total_mde_buyings }}&nbsp;€</b>
+              <span>{{ sum["total"] }} €</span>
-          </div>
+            </div>
+          {% endfor %}
+          <div><b>Total : </b><b>{{ total_purchases }} €</b></div>
         </div>
       </div>
     </div>
-
     <div>
-      <h3>{% trans %}Product top 10{% endtrans %}</h3>
+      <h3>{% trans %}Product top 15{% endtrans %}</h3>
       <table>
         <thead>
           <tr>

core/templatetags/renderer.py

@@ -55,31 +55,17 @@ 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 days, %(remainder)s", days
+        "%(nb_days)d day, %(remainder)s",
+        "%(nb_days)d days, %(remainder)s",
+        days,
     ) % {"nb_days": days, "remainder": str(remainder)}
 
 

core/tests/test_core.py

@@ -35,6 +35,7 @@ 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
@@ -551,3 +552,10 @@ 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,6 +5,7 @@ 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
@@ -17,8 +18,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
@@ -30,24 +31,19 @@ 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: SithFile = baker.make(
+        picture = picture_recipe.make()
-            Picture, parent=SithFile.objects.get(pk=settings.SITH_SAS_ROOT_DIR_ID)
+        assert user.can_edit(picture)
-        )
-        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 = baker.make(Picture, owner=user)
+        picture = picture_recipe.make(owner=user)
-        assert picture.is_owned_by(user)
+        assert user.can_edit(picture)
 
     @pytest.mark.parametrize(
         "user_factory",
@@ -63,7 +59,41 @@ class TestImageAccess:
         user = user_factory()
         owner = baker.make(User)
         picture: Picture = baker.make(Picture, owner=owner)
-        assert not picture.is_owned_by(user)
+        assert not user.can_edit(picture)
+
+
+@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

@@ -0,0 +1,64 @@
+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,3 +1,4 @@
+import itertools
 from datetime import timedelta
 from unittest import mock
 
@@ -23,9 +24,10 @@ 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, Refilling, Selling
+from counter.models import Counter, Customer, Permanency, Refilling, Selling
 from counter.utils import is_logged_in_counter
 from eboutic.models import Invoice, InvoiceItem
+from sas.models import Picture
 
 
 class TestSearchUsers(TestCase):
@@ -33,6 +35,7 @@ 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,
@@ -187,11 +190,7 @@ class TestFilterInactive(TestCase):
         time_inactive = time_active - timedelta(days=3)
         counter, seller = baker.make(Counter), baker.make(User)
         sale_recipe = Recipe(
-            Selling,
+            Selling, counter=counter, club=counter.club, seller=seller, unit_price=0
-            counter=counter,
-            club=counter.club,
-            seller=seller,
-            is_validated=True,
         )
 
         cls.users = [
@@ -428,3 +427,106 @@ 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,6 +24,7 @@
 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,
@@ -53,6 +54,8 @@ from core.views import (
     PagePropView,
     PageRevView,
     PageView,
+    PasswordRootChangeView,
+    SearchView,
     SithLoginView,
     SithPasswordChangeDoneView,
     SithPasswordChangeView,
@@ -76,13 +79,8 @@ from core.views import (
     UserUpdateProfileView,
     UserView,
     delete_user_godfather,
-    index,
     logout,
     notification,
-    password_root_change,
-    search_json,
-    search_user_json,
-    search_view,
     send_file,
 )
 
@@ -91,20 +89,18 @@ register_converter(TwoDigitMonthConverter, "mm")
 register_converter(BooleanStringConverter, "bool")
 
 urlpatterns = [
-    path("", index, name="index"),
+    path("", NewsListView.as_view(), name="index"),
     path("notifications/", NotificationList.as_view(), name="notification_list"),
     path("notification/<int:notif_id>/", notification, name="notification"),
     # Search
-    path("search/", search_view, name="search"),
+    path("search/", SearchView.as_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>/",
-        password_root_change,
+        PasswordRootChangeView.as_view(),
         name="password_root_change",
     ),
     path(

core/utils.py

@@ -12,18 +12,23 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-
+from dataclasses import dataclass
 from datetime import date, timedelta
 
 # Image utils
 from io import BytesIO
-from typing import Final
+from typing import Any, Final, Unpack
 
 import PIL
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import UploadedFile
-from django.http import HttpRequest
+from django.db import models
+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
@@ -42,6 +47,21 @@ 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.
@@ -205,3 +225,56 @@ 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, is_in_sas=False)
+    queryset = SithFile.objects.filter(is_moderated=False)
     ordering = "id"
     paginate_by = 100
 

core/views/forms.py

@@ -303,7 +303,6 @@ class UserGodfathersForm(forms.Form):
     )
     user = forms.ModelChoiceField(
         label=_("Select user"),
-        help_text=None,
         required=True,
         widget=AutoCompleteSelectUser,
         queryset=User.objects.all(),
@@ -315,8 +314,6 @@ 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,106 +22,49 @@
 #
 #
 
-import json
-
 from django.conf import settings
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core import serializers
+from django.db.models import F
 from django.db.models.query import QuerySet
-from django.http import JsonResponse
+from django.http import HttpRequest
-from django.shortcuts import redirect, render
+from django.shortcuts import get_object_or_404, redirect
-from django.utils import html
+from django.views.generic import ListView, TemplateView
-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
 
 
-def index(request, context=None):
+class NotificationList(LoginRequiredMixin, ListView):
-    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, notif_id):
+def notification(request: HttpRequest, notif_id: int):
-    notif = Notification.objects.filter(id=notif_id).first()
+    notif = get_object_or_404(Notification, id=notif_id)
-    if notif:
+    if notif.type not in settings.SITH_PERMANENT_NOTIFICATIONS:
-        if notif.type not in settings.SITH_PERMANENT_NOTIFICATIONS:
+        notif.viewed = True
-            notif.viewed = True
+    else:
-        else:
+        notif.callback()
-            notif.callback()
+    notif.save()
-        notif.save()
+    return redirect(notif.url)
-        return redirect(notif.url)
-    return redirect("/")
 
 
-def search_user(query):
+class SearchView(LoginRequiredMixin, TemplateView):
-    try:
+    template_name = "core/search.jinja"
-        # 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):
-def search_club(query, *, as_json=False):
+        users, clubs = [], []
-    clubs = []
+        if query := self.request.GET.get("query"):
-    if query:
+            users = list(
-        clubs = Club.objects.filter(name__icontains=query).all()
+                UserFilterSchema(search=query)
-        clubs = clubs[:5]
+                .filter(User.objects.viewable_by(self.request.user))
-        if as_json:
+                .order_by(F("last_login").desc(nulls_last=True))
-            # Re-loads json to avoid double encoding by JsonResponse, but still benefit from serializers
+            )
-            clubs = json.loads(serializers.serialize("json", clubs, fields=("name")))
+            clubs = list(Club.objects.filter(name__icontains=query)[:5])
-        else:
+        return super().get_context_data(**kwargs) | {"users": users, "clubs": clubs}
-            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,27 +22,28 @@
 #
 #
 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.forms import PasswordChangeForm
+from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.forms import PasswordChangeForm, SetPasswordForm
+from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.core.exceptions import PermissionDenied
-from django.db.models import DateField, QuerySet
+from django.db.models import DateField, F, QuerySet, Sum
 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,
@@ -66,9 +67,8 @@ from core.views.forms import (
     UserProfileForm,
 )
 from core.views.mixins import TabedViewMixin, UseFragmentsMixin
-from counter.models import Counter, Refilling, Selling
+from counter.models import Refilling, Selling
 from eboutic.models import Invoice
-from subscription.models import Subscription
 from trombi.views import UserTrombiForm
 
 
@@ -99,21 +99,23 @@ def logout(request):
     return views.logout_then_login(request)
 
 
-def password_root_change(request, user_id):
+class PasswordRootChangeView(UserPassesTestMixin, FormView):
     """Allows a root user to change someone's password."""
-    if not request.user.is_root:
+
-        raise PermissionDenied
+    template_name = "core/password_change.jinja"
-    user = get_object_or_404(User, id=user_id)
+    form_class = SetPasswordForm
-    if request.method == "POST":
+    success_url = reverse_lazy("core:password_change_done")
-        form = views.SetPasswordForm(user=user, data=request.POST)
+
-        if form.is_valid():
+    def test_func(self):
-            form.save()
+        return self.request.user.is_root
-            return redirect("core:password_change_done")
+
-    else:
+    def get_form_kwargs(self):
-        form = views.SetPasswordForm(user=user)
+        user = get_object_or_404(User, id=self.kwargs["user_id"])
-    return TemplateResponse(
+        return super().get_form_kwargs() | {"user": user}
-        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")
@@ -288,10 +290,12 @@ 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:
@@ -353,87 +357,40 @@ 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
 
-        foyer = Counter.objects.filter(name="Foyer").first()
+        kwargs["perm_time"] = list(
-        mde = Counter.objects.filter(name="MDE").first()
+            self.object.permanencies.filter(end__isnull=False, counter__type="BAR")
-        gommette = Counter.objects.filter(name="La Gommette").first()
+            .values("counter", "counter__name")
-        semester_start = Subscription.compute_start(d=date.today(), duration=3)
+            .annotate(total=Sum(F("end") - F("start"), default=timedelta(seconds=0)))
+            .order_by("-total")
+        )
         kwargs["total_perm_time"] = sum(
-            [p.end - p.start for p in self.object.permanencies.exclude(end=None)],
+            [perm["total"] for perm in kwargs["perm_time"]], start=timedelta(seconds=0)
-            timedelta(),
         )
-        kwargs["total_foyer_time"] = sum(
+        kwargs["purchase_sums"] = list(
-            [
+            self.object.customer.buyings.filter(counter__type="BAR")
-                p.end - p.start
+            .values("counter", "counter__name")
-                for p in self.object.permanencies.filter(counter=foyer).exclude(
+            .annotate(total=Sum(F("unit_price") * F("quantity")))
-                    end=None
+            .order_by("-total")
-                )
-            ],
-            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()[:10]
+            .all()[:15]
         )
         return kwargs
 
@@ -465,7 +422,6 @@ 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."""
@@ -474,9 +430,6 @@ 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()
@@ -528,10 +481,10 @@ class UserPreferencesView(UserTabsMixin, UseFragmentsMixin, CanEditMixin, Update
     current_tab = "prefs"
 
     def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
+        return super().get_form_kwargs() | {"instance": self.object.preferences}
-        pref = self.object.preferences
+
-        kwargs.update({"instance": pref})
+    def get_success_url(self):
-        return kwargs
+        return self.request.path
 
     def get_fragment_context_data(self) -> dict[str, SafeString]:
         # Avoid cyclic import error

counter/apps.py

@@ -24,12 +24,6 @@
 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
+from datetime import date, datetime, timezone
 
 from dateutil.relativedelta import relativedelta
 from django import forms
@@ -136,7 +136,10 @@ class GetUserForm(forms.Form):
 
 
 class RefillForm(forms.ModelForm):
-    allowed_refilling_methods = ["CASH", "CARD"]
+    allowed_refilling_methods = [
+        Refilling.PaymentMethod.CASH,
+        Refilling.PaymentMethod.CARD,
+    ]
 
     error_css_class = "error"
     required_css_class = "required"
@@ -146,7 +149,7 @@ class RefillForm(forms.ModelForm):
 
     class Meta:
         model = Refilling
-        fields = ["amount", "payment_method", "bank"]
+        fields = ["amount", "payment_method"]
         widgets = {"payment_method": forms.RadioSelect}
 
     def __init__(self, *args, **kwargs):
@@ -160,9 +163,6 @@ 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,6 +235,19 @@ 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):
@@ -321,11 +334,19 @@ class ProductForm(forms.ModelForm):
     def is_valid(self):
         return super().is_valid() and self.action_formset.is_valid()
 
-    def save(self, *args, **kwargs):
+    def save(self, *args, **kwargs) -> Product:
-        ret = super().save(*args, **kwargs)
+        product = super().save(*args, **kwargs)
-        self.instance.counters.set(self.cleaned_data["counters"])
+        product.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 ret
+        return product
 
 
 class ReturnableProductForm(forms.ModelForm):
@@ -369,7 +390,6 @@ 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(),
@@ -489,13 +509,14 @@ 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,
+                        date__gte=month_start,
-                        date__lte=month + relativedelta(months=1),
+                        date__lte=month_start + relativedelta(months=1),
                     )
                 )
             ).annotate(

counter/management/commands/dump_accounts.py

@@ -119,7 +119,6 @@ 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

@@ -0,0 +1,84 @@
+# 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,7 +44,6 @@ 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
 
@@ -80,7 +79,8 @@ class CustomerQuerySet(models.QuerySet):
         )
         money_out = Subquery(
             Selling.objects.filter(
-                customer=OuterRef("pk"), payment_method="SITH_ACCOUNT"
+                customer=OuterRef("pk"),
+                payment_method=Selling.PaymentMethod.SITH_ACCOUNT,
             )
             .values("customer_id")
             .annotate(res=Sum(F("unit_price") * F("quantity"), default=0))
@@ -731,6 +731,11 @@ 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
     )
@@ -745,16 +750,9 @@ class Refilling(models.Model):
         Customer, related_name="refillings", blank=False, on_delete=models.CASCADE
     )
     date = models.DateTimeField(_("date"))
-    payment_method = models.CharField(
+    payment_method = models.PositiveSmallIntegerField(
-        _("payment method"),
+        _("payment method"), choices=PaymentMethod, default=PaymentMethod.CARD
-        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()
 
@@ -771,10 +769,9 @@ class Refilling(models.Model):
         if not self.date:
             self.date = timezone.now()
         self.full_clean()
-        if not self.is_validated:
+        if self._state.adding:
             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,
@@ -814,6 +811,10 @@ 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(
@@ -850,13 +851,9 @@ class Selling(models.Model):
         on_delete=models.SET_NULL,
     )
     date = models.DateTimeField(_("date"), db_index=True)
-    payment_method = models.CharField(
+    payment_method = models.PositiveSmallIntegerField(
-        _("payment method"),
+        _("payment method"), choices=PaymentMethod, default=PaymentMethod.SITH_ACCOUNT
-        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()
 
@@ -875,10 +872,12 @@ class Selling(models.Model):
         if not self.date:
             self.date = timezone.now()
         self.full_clean()
-        if not self.is_validated:
+        if (
+            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 (
@@ -948,7 +947,9 @@ class Selling(models.Model):
     def is_owned_by(self, user: User) -> bool:
         if user.is_anonymous:
             return False
-        return self.payment_method != "CARD" and user.is_owner(self.counter)
+        return self.payment_method != self.PaymentMethod.CARD and user.is_owner(
+            self.counter
+        )
 
     def can_be_viewed_by(self, user: User) -> bool:
         if (
@@ -958,7 +959,7 @@ class Selling(models.Model):
         return user == self.customer.user
 
     def delete(self, *args, **kwargs):
-        if self.payment_method == "SITH_ACCOUNT":
+        if self.payment_method == Selling.PaymentMethod.SITH_ACCOUNT:
             self.customer.amount += self.quantity * self.unit_price
             self.customer.save()
         super().delete(*args, **kwargs)

counter/schemas.py

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

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|truncate_time("millis") }}</td>
+          <td>{{ barman.perm_sum|format_timedelta }}</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|truncate_time("millis") }}</td>
+          <td>{{ barman.perm_sum|format_timedelta }}</td>
         </tr>
       {% endfor %}
     </tbody>

counter/tests/test_account_dump.py

@@ -116,7 +116,6 @@ 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,8 +11,12 @@ from model_bakery import baker
 
 from core.models import Group, User
 from counter.baker_recipes import counter_recipe, product_recipe
-from counter.forms import ScheduledProductActionForm, ScheduledProductActionFormSet
+from counter.forms import (
-from counter.models import ScheduledProductAction
+    ProductForm,
+    ScheduledProductActionForm,
+    ScheduledProductActionFormSet,
+)
+from counter.models import Product, ScheduledProductAction
 
 
 @pytest.mark.django_db
@@ -34,6 +38,39 @@ 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, is_validated=False)
+    baker.make(Refilling, amount=amount, customer=user.customer)
 
 
 class TestFullClickBase(TestCase):
@@ -115,18 +115,10 @@ class TestRefilling(TestFullClickBase):
     ) -> HttpResponse:
         used_client = client if client is not None else self.client
         return used_client.post(
-            reverse(
+            reverse("counter:refilling_create", kwargs={"customer_id": user.pk}),
-                "counter:refilling_create",
+            {"amount": str(amount), "payment_method": Refilling.PaymentMethod.CASH},
-                kwargs={"customer_id": user.pk},
-            ),
-            {
-                "amount": str(amount),
-                "payment_method": "CASH",
-                "bank": "OTHER",
-            },
             HTTP_REFERER=reverse(
-                "counter:click",
+                "counter:click", kwargs={"counter_id": counter.id, "user_id": user.pk}
-                kwargs={"counter_id": counter.id, "user_id": user.pk},
             ),
         )
 
@@ -149,11 +141,7 @@ 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,7 +298,6 @@ def test_update_balance():
             _quantity=len(customers),
             unit_price=10,
             quantity=1,
-            payment_method="SITH_ACCOUNT",
             _save_related=True,
         ),
         *sale_recipe.prepare(
@@ -306,14 +305,12 @@ 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(
@@ -324,7 +321,7 @@ def test_update_balance():
             _quantity=len(customers),
             unit_price=50,
             quantity=1,
-            payment_method="CARD",
+            payment_method=Selling.PaymentMethod.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 localdate
+from django.utils.timezone import now
 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 = localdate() - relativedelta(months=1)
+    month = now() - 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 timedelta
+from datetime import datetime, timedelta
 
 from django.conf import settings
 from django.contrib.auth.mixins import PermissionRequiredMixin, UserPassesTestMixin
@@ -23,6 +23,7 @@ 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
@@ -285,7 +286,13 @@ class CounterStatView(PermissionRequiredMixin, DetailView):
     def get_context_data(self, **kwargs):
         """Add stats to the context."""
         counter: Counter = self.object
-        semester_start = get_start_of_semester()
+        start_date = 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
+from datetime import datetime, timezone
 from urllib.parse import urlencode
 
 from dateutil.relativedelta import relativedelta
@@ -63,19 +63,18 @@ class InvoiceCallView(
         """Add sums to the context."""
         kwargs = super().get_context_data(**kwargs)
         kwargs["months"] = Selling.objects.datetimes("date", "month", order="DESC")
-        start_date = self.get_month()
+        month = 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="CARD",
+            payment_method=Refilling.PaymentMethod.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="CARD",
+                payment_method=Selling.PaymentMethod.CARD,
-                is_validated=True,
                 date__gte=start_date,
                 date__lte=end_date,
             )

docs/tutorial/groups.md

@@ -263,3 +263,35 @@ 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,7 +110,9 @@ class Basket(models.Model):
             )["total"]
         )
 
-    def generate_sales(self, counter, seller: User, payment_method: str):
+    def generate_sales(
+        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.
 
@@ -251,8 +253,7 @@ class Invoice(models.Model):
                     customer=customer,
                     operator=self.user,
                     amount=i.product_unit_price * i.quantity,
-                    payment_method="CARD",
+                    payment_method=Refilling.PaymentMethod.CARD,
-                    bank="OTHER",
                     date=self.date,
                 )
                 new.save()
@@ -267,8 +268,7 @@ class Invoice(models.Model):
                     customer=customer,
                     unit_price=i.product_unit_price,
                     quantity=i.quantity,
-                    payment_method="CARD",
+                    payment_method=Selling.PaymentMethod.CARD,
-                    is_validated=True,
                     date=self.date,
                 )
                 new.save()

eboutic/tests/test_basket.py

@@ -108,12 +108,22 @@ def test_eboutic_basket_expiry(
 
     client.force_login(customer.user)
 
-    for date in sellings:
+    if sellings:
         sale_recipe.make(
-            customer=customer, counter=eboutic, date=date, is_validated=True
+            customer=customer,
+            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 == "SITH_ACCOUNT"
+        assert sellings[0].payment_method == Selling.PaymentMethod.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 == "SITH_ACCOUNT"
+        assert sellings[1].payment_method == Selling.PaymentMethod.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 == "CARD"
+        assert sellings[0].payment_method == Selling.PaymentMethod.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 == "CARD"
+        assert sellings[1].payment_method == Selling.PaymentMethod.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,7 +275,9 @@ class EbouticPayWithSith(CanViewMixin, SingleObjectMixin, View):
             return redirect("eboutic:payment_result", "failure")
 
         eboutic = get_eboutic()
-        sales = basket.generate_sales(eboutic, basket.user, "SITH_ACCOUNT")
+        sales = basket.generate_sales(
+            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,13 +25,12 @@ 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, SithFile, User
+from core.models import Group, Page, User
 from core.utils import RED_PIXEL_PNG
 from sas.models import Album, PeoplePictureRelation, Picture
 from subscription.models import Subscription
@@ -91,13 +90,8 @@ 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",
+            name="galaxy-register-file", owner=root, is_moderated=True
-            owner=root,
-            is_moderated=True,
-            is_in_sas=True,
-            parent=sas,
         )
 
         self.make_clubs()
@@ -285,14 +279,10 @@ class Command(BaseCommand):
                     owner=u,
                     name=f"galaxy-picture {u} {i // self.NB_USERS}",
                     is_moderated=True,
-                    is_folder=False,
                     parent=self.galaxy_album,
-                    is_in_sas=True,
+                    original=ContentFile(RED_PIXEL_PNG),
-                    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

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-11-12 21:44+0100\n"
+"POT-Creation-Date: 2025-12-17 00:03+0100\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -16,6 +16,767 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: accounting/models.py club/models.py com/models.py counter/models.py
+#: forum/models.py launderette/models.py sas/models.py
+msgid "name"
+msgstr "nom"
+
+#: accounting/models.py
+msgid "street"
+msgstr "rue"
+
+#: accounting/models.py
+msgid "city"
+msgstr "ville"
+
+#: accounting/models.py
+msgid "postcode"
+msgstr "code postal"
+
+#: accounting/models.py
+msgid "country"
+msgstr "pays"
+
+#: accounting/models.py core/models.py
+msgid "phone"
+msgstr "téléphone"
+
+#: accounting/models.py
+msgid "email"
+msgstr "email"
+
+#: accounting/models.py
+msgid "website"
+msgstr "site internet"
+
+#: accounting/models.py
+msgid "company"
+msgstr "entreprise"
+
+#: accounting/models.py
+msgid "iban"
+msgstr "IBAN"
+
+#: accounting/models.py
+msgid "account number"
+msgstr "numéro de compte"
+
+#: accounting/models.py club/models.py com/models.py counter/models.py
+#: trombi/models.py
+msgid "club"
+msgstr "club"
+
+#: accounting/models.py
+msgid "Bank account"
+msgstr "Compte en banque"
+
+#: accounting/models.py
+msgid "bank account"
+msgstr "compte en banque"
+
+#: accounting/models.py
+msgid "Club account"
+msgstr "Compte club"
+
+#: accounting/models.py
+#, python-format
+msgid "%(club_account)s on %(bank_account)s"
+msgstr "%(club_account)s sur %(bank_account)s"
+
+#: accounting/models.py club/models.py counter/models.py election/models.py
+#: launderette/models.py
+msgid "start date"
+msgstr "date de début"
+
+#: accounting/models.py club/models.py counter/models.py election/models.py
+msgid "end date"
+msgstr "date de fin"
+
+#: accounting/models.py
+msgid "is closed"
+msgstr "est fermé"
+
+#: accounting/models.py
+msgid "club account"
+msgstr "compte club"
+
+#: accounting/models.py counter/models.py
+msgid "amount"
+msgstr "montant"
+
+#: accounting/models.py
+msgid "effective_amount"
+msgstr "montant effectif"
+
+#: accounting/models.py
+msgid "General journal"
+msgstr "Classeur"
+
+#: accounting/models.py
+msgid "number"
+msgstr "numéro"
+
+#: accounting/models.py
+msgid "journal"
+msgstr "classeur"
+
+#: accounting/models.py core/models.py counter/models.py eboutic/models.py
+#: forum/models.py
+msgid "date"
+msgstr "date"
+
+#: accounting/models.py counter/models.py pedagogy/models.py
+msgid "comment"
+msgstr "commentaire"
+
+#: accounting/models.py counter/models.py subscription/models.py
+msgid "payment method"
+msgstr "méthode de paiement"
+
+#: accounting/models.py
+msgid "cheque number"
+msgstr "numéro de chèque"
+
+#: accounting/models.py eboutic/models.py
+msgid "invoice"
+msgstr "facture"
+
+#: accounting/models.py
+msgid "is done"
+msgstr "est fait"
+
+#: accounting/models.py
+msgid "simple type"
+msgstr "type simplifié"
+
+#: accounting/models.py
+msgid "accounting type"
+msgstr "type comptable"
+
+#: accounting/models.py core/models.py counter/models.py
+msgid "label"
+msgstr "étiquette"
+
+#: accounting/models.py
+msgid "target type"
+msgstr "type de cible"
+
+#: accounting/models.py club/models.py club/templates/club/club_members.jinja
+#: club/templates/club/club_old_members.jinja club/templates/club/mailing.jinja
+#: counter/templates/counter/cash_summary_list.jinja
+#: counter/templates/counter/stats.jinja
+#: launderette/templates/launderette/launderette_admin.jinja
+msgid "User"
+msgstr "Utilisateur"
+
+#: accounting/models.py club/models.py club/templates/club/club_detail.jinja
+#: com/templates/com/mailing_admin.jinja
+#: com/templates/com/news_admin_list.jinja com/templates/com/weekmail.jinja
+#: core/templates/core/user_clubs.jinja
+#: counter/templates/counter/invoices_call.jinja
+#: trombi/templates/trombi/edit_profile.jinja
+#: trombi/templates/trombi/export.jinja
+#: trombi/templates/trombi/user_profile.jinja
+msgid "Club"
+msgstr "Club"
+
+#: accounting/models.py core/views/user.py
+msgid "Account"
+msgstr "Compte"
+
+#: accounting/models.py
+msgid "Company"
+msgstr "Entreprise"
+
+#: accounting/models.py core/models.py sith/settings.py
+msgid "Other"
+msgstr "Autre"
+
+#: accounting/models.py
+msgid "target id"
+msgstr "id de la cible"
+
+#: accounting/models.py
+msgid "target label"
+msgstr "nom de la cible"
+
+#: accounting/models.py
+msgid "linked operation"
+msgstr "opération liée"
+
+#: accounting/models.py
+msgid "The date must be set."
+msgstr "La date doit être indiquée."
+
+#: accounting/models.py
+#, python-format
+msgid ""
+"The date can not be before the start date of the journal, which is\n"
+"%(start_date)s."
+msgstr ""
+"La date ne peut pas être avant la date de début du journal, qui est\n"
+"%(start_date)s."
+
+#: accounting/models.py
+msgid "Target does not exists"
+msgstr "La cible n'existe pas."
+
+#: accounting/models.py
+msgid "Please add a target label if you set no existing target"
+msgstr ""
+"Merci d'ajouter un nom de cible si vous ne spécifiez pas de cible existante"
+
+#: accounting/models.py
+msgid ""
+"You need to provide ether a simplified accounting type or a standard "
+"accounting type"
+msgstr ""
+"Vous devez fournir soit un type comptable simplifié ou un type comptable "
+"standard"
+
+#: accounting/models.py counter/models.py pedagogy/models.py
+msgid "code"
+msgstr "code"
+
+#: accounting/models.py
+msgid "An accounting type code contains only numbers"
+msgstr "Un code comptable ne contient que des numéros"
+
+#: accounting/models.py
+msgid "movement type"
+msgstr "type de mouvement"
+
+#: accounting/models.py
+#: accounting/templates/accounting/journal_statement_nature.jinja
+#: accounting/templates/accounting/journal_statement_person.jinja
+#: accounting/views.py
+msgid "Credit"
+msgstr "Crédit"
+
+#: accounting/models.py
+#: accounting/templates/accounting/journal_statement_nature.jinja
+#: accounting/templates/accounting/journal_statement_person.jinja
+#: accounting/views.py
+msgid "Debit"
+msgstr "Débit"
+
+#: accounting/models.py
+msgid "Neutral"
+msgstr "Neutre"
+
+#: accounting/models.py
+msgid "simplified accounting types"
+msgstr "type simplifié"
+
+#: accounting/models.py
+msgid "simplified type"
+msgstr "type simplifié"
+
+#: accounting/templates/accounting/accountingtype_list.jinja
+msgid "Accounting type list"
+msgstr "Liste des types comptable"
+
+#: accounting/templates/accounting/accountingtype_list.jinja
+#: accounting/templates/accounting/bank_account_details.jinja
+#: accounting/templates/accounting/bank_account_list.jinja
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja
+#: accounting/templates/accounting/label_list.jinja
+#: accounting/templates/accounting/operation_edit.jinja
+#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
+#: core/templates/core/user_tools.jinja
+msgid "Accounting"
+msgstr "Comptabilité"
+
+#: accounting/templates/accounting/accountingtype_list.jinja
+msgid "Accounting types"
+msgstr "Type comptable"
+
+#: accounting/templates/accounting/accountingtype_list.jinja
+msgid "New accounting type"
+msgstr "Nouveau type comptable"
+
+#: accounting/templates/accounting/accountingtype_list.jinja
+#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
+msgid "There is no types in this website."
+msgstr "Il n'y a pas de types comptable dans ce site web."
+
+#: accounting/templates/accounting/bank_account_details.jinja
+#: core/templates/core/user_tools.jinja
+msgid "Bank account: "
+msgstr "Compte en banque : "
+
+#: accounting/templates/accounting/bank_account_details.jinja
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/label_list.jinja
+#: club/templates/club/club_sellings.jinja club/templates/club/mailing.jinja
+#: com/templates/com/macros.jinja com/templates/com/mailing_admin.jinja
+#: com/templates/com/news_admin_list.jinja com/templates/com/poster_edit.jinja
+#: com/templates/com/screen_edit.jinja com/templates/com/weekmail.jinja
+#: core/templates/core/file_detail.jinja
+#: core/templates/core/file_moderation.jinja
+#: core/templates/core/group_detail.jinja core/templates/core/group_list.jinja
+#: core/templates/core/macros.jinja core/templates/core/page_prop.jinja
+#: core/templates/core/user_account_detail.jinja
+#: core/templates/core/user_clubs.jinja core/templates/core/user_edit.jinja
+#: counter/templates/counter/fragments/create_student_card.jinja
+#: counter/templates/counter/last_ops.jinja
+#: election/templates/election/election_detail.jinja
+#: forum/templates/forum/macros.jinja
+#: launderette/templates/launderette/launderette_admin.jinja
+#: launderette/views.py pedagogy/templates/pedagogy/guide.jinja
+#: pedagogy/templates/pedagogy/uv_detail.jinja sas/templates/sas/album.jinja
+#: sas/templates/sas/moderation.jinja sas/templates/sas/picture.jinja
+#: trombi/templates/trombi/detail.jinja
+#: trombi/templates/trombi/edit_profile.jinja
+msgid "Delete"
+msgstr "Supprimer"
+
+#: accounting/templates/accounting/bank_account_details.jinja club/views.py
+#: core/views/user.py sas/templates/sas/picture.jinja
+msgid "Infos"
+msgstr "Infos"
+
+#: accounting/templates/accounting/bank_account_details.jinja
+msgid "IBAN: "
+msgstr "IBAN : "
+
+#: accounting/templates/accounting/bank_account_details.jinja
+msgid "Number: "
+msgstr "Numéro : "
+
+#: accounting/templates/accounting/bank_account_details.jinja
+msgid "New club account"
+msgstr "Nouveau compte club"
+
+#: accounting/templates/accounting/bank_account_details.jinja
+#: accounting/templates/accounting/bank_account_list.jinja
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja club/views.py
+#: com/templates/com/news_admin_list.jinja com/templates/com/poster_list.jinja
+#: com/templates/com/screen_list.jinja com/templates/com/weekmail.jinja
+#: core/templates/core/file.jinja core/templates/core/group_list.jinja
+#: core/templates/core/page.jinja core/templates/core/user_tools.jinja
+#: core/views/user.py counter/templates/counter/cash_summary_list.jinja
+#: counter/templates/counter/counter_list.jinja
+#: election/templates/election/election_detail.jinja
+#: forum/templates/forum/macros.jinja
+#: launderette/templates/launderette/launderette_list.jinja
+#: pedagogy/templates/pedagogy/guide.jinja
+#: pedagogy/templates/pedagogy/uv_detail.jinja sas/templates/sas/album.jinja
+#: trombi/templates/trombi/detail.jinja
+#: trombi/templates/trombi/edit_profile.jinja
+msgid "Edit"
+msgstr "Éditer"
+
+#: accounting/templates/accounting/bank_account_list.jinja
+msgid "Bank account list"
+msgstr "Liste des comptes en banque"
+
+#: accounting/templates/accounting/bank_account_list.jinja
+msgid "Manage simplified types"
+msgstr "Gérer les types simplifiés"
+
+#: accounting/templates/accounting/bank_account_list.jinja
+msgid "Manage accounting types"
+msgstr "Gérer les types comptable"
+
+#: accounting/templates/accounting/bank_account_list.jinja
+msgid "New bank account"
+msgstr "Nouveau compte en banque"
+
+#: accounting/templates/accounting/bank_account_list.jinja
+msgid "There is no accounts in this website."
+msgstr "Il n'y a pas de comptes dans ce site web."
+
+#: accounting/templates/accounting/club_account_details.jinja
+msgid "Club account:"
+msgstr "Compte club : "
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja
+#: accounting/templates/accounting/label_list.jinja
+msgid "New label"
+msgstr "Nouvelle étiquette"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja
+#: accounting/templates/accounting/label_list.jinja
+msgid "Label list"
+msgstr "Liste des étiquettes"
+
+#: accounting/templates/accounting/club_account_details.jinja
+msgid "New journal"
+msgstr "Nouveau classeur"
+
+#: accounting/templates/accounting/club_account_details.jinja
+msgid "You can not create new journal while you still have one opened"
+msgstr "Vous ne pouvez pas créer de journal tant qu'il y en a un d'ouvert"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: launderette/templates/launderette/launderette_admin.jinja
+msgid "Name"
+msgstr "Nom"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: com/templates/com/news_admin_list.jinja
+msgid "Start"
+msgstr "Début"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: com/templates/com/news_admin_list.jinja
+msgid "End"
+msgstr "Fin"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja
+#: core/templates/core/user_account_detail.jinja
+#: counter/templates/counter/last_ops.jinja
+#: counter/templates/counter/refilling_list.jinja
+msgid "Amount"
+msgstr "Montant"
+
+#: accounting/templates/accounting/club_account_details.jinja
+msgid "Effective amount"
+msgstr "Montant effectif"
+
+#: accounting/templates/accounting/club_account_details.jinja sith/settings.py
+msgid "Closed"
+msgstr "Fermé"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja
+#: com/templates/com/mailing_admin.jinja
+#: com/templates/com/news_admin_list.jinja com/templates/com/weekmail.jinja
+#: counter/templates/counter/refilling_list.jinja
+msgid "Actions"
+msgstr "Actions"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Yes"
+msgstr "Oui"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: accounting/templates/accounting/journal_details.jinja
+msgid "No"
+msgstr "Non"
+
+#: accounting/templates/accounting/club_account_details.jinja
+#: com/templates/com/news_admin_list.jinja core/templates/core/file.jinja
+#: core/templates/core/page.jinja
+msgid "View"
+msgstr "Voir"
+
+#: accounting/templates/accounting/co_list.jinja
+#: accounting/templates/accounting/journal_details.jinja
+#: core/templates/core/user_tools.jinja
+msgid "Company list"
+msgstr "Liste des entreprises"
+
+#: accounting/templates/accounting/co_list.jinja
+msgid "Create new company"
+msgstr "Nouvelle entreprise"
+
+#: accounting/templates/accounting/co_list.jinja
+msgid "Companies"
+msgstr "Entreprises"
+
+#: accounting/templates/accounting/journal_details.jinja
+#: accounting/templates/accounting/journal_statement_accounting.jinja
+#: accounting/templates/accounting/journal_statement_nature.jinja
+#: accounting/templates/accounting/journal_statement_person.jinja
+msgid "General journal:"
+msgstr "Classeur : "
+
+#: accounting/templates/accounting/journal_details.jinja
+#: accounting/templates/accounting/journal_statement_accounting.jinja
+#: core/templates/core/user_account.jinja
+#: core/templates/core/user_account_detail.jinja
+#: counter/templates/counter/counter_click.jinja
+msgid "Amount: "
+msgstr "Montant : "
+
+#: accounting/templates/accounting/journal_details.jinja
+#: accounting/templates/accounting/journal_statement_accounting.jinja
+msgid "Effective amount: "
+msgstr "Montant effectif: "
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Journal is closed, you can not create operation"
+msgstr "Le classeur est fermé, vous ne pouvez pas créer d'opération"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "New operation"
+msgstr "Nouvelle opération"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Nb"
+msgstr "No"
+
+#: accounting/templates/accounting/journal_details.jinja
+#: club/templates/club/club_sellings.jinja
+#: core/templates/core/user_account_detail.jinja
+#: counter/templates/counter/cash_summary_list.jinja
+#: counter/templates/counter/last_ops.jinja
+#: counter/templates/counter/refilling_list.jinja
+#: rootplace/templates/rootplace/logs.jinja sas/forms.py
+#: trombi/templates/trombi/user_profile.jinja
+msgid "Date"
+msgstr "Date"
+
+#: accounting/templates/accounting/journal_details.jinja
+#: club/templates/club/club_sellings.jinja
+#: core/templates/core/user_account_detail.jinja
+#: counter/templates/counter/last_ops.jinja
+#: rootplace/templates/rootplace/logs.jinja
+msgid "Label"
+msgstr "Étiquette"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Payment mode"
+msgstr "Méthode de paiement"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Target"
+msgstr "Cible"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Code"
+msgstr "Code"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Nature"
+msgstr "Nature"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Done"
+msgstr "Effectuées"
+
+#: accounting/templates/accounting/journal_details.jinja
+#: counter/templates/counter/cash_summary_list.jinja counter/views/cash.py
+#: pedagogy/templates/pedagogy/moderation.jinja
+#: pedagogy/templates/pedagogy/uv_detail.jinja
+#: trombi/templates/trombi/comment.jinja
+#: trombi/templates/trombi/user_tools.jinja
+msgid "Comment"
+msgstr "Commentaire"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "File"
+msgstr "Fichier"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "PDF"
+msgstr "PDF"
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid ""
+"Warning: this operation has no linked operation because the targeted club "
+"account has no opened journal."
+msgstr ""
+"Attention: cette opération n'a pas d'opération liée parce qu'il n'y a pas de "
+"classeur ouvert dans le compte club cible"
+
+#: accounting/templates/accounting/journal_details.jinja
+#, python-format
+msgid ""
+"Open a journal in <a href=\"%(url)s\">this club account</a>, then save this "
+"operation again to make the linked operation."
+msgstr ""
+"Ouvrez un classeur dans <a href=\"%(url)s\">ce compte club</a>, puis sauver "
+"cette opération à nouveau pour créer l'opération liée."
+
+#: accounting/templates/accounting/journal_details.jinja
+msgid "Generate"
+msgstr "Générer"
+
+#: accounting/templates/accounting/journal_statement_accounting.jinja
+msgid "Accounting statement: "
+msgstr "Bilan comptable : "
+
+#: accounting/templates/accounting/journal_statement_accounting.jinja
+#: rootplace/templates/rootplace/logs.jinja
+msgid "Operation type"
+msgstr "Type d'opération"
+
+#: accounting/templates/accounting/journal_statement_accounting.jinja
+#: accounting/templates/accounting/journal_statement_nature.jinja
+#: accounting/templates/accounting/journal_statement_person.jinja
+#: counter/templates/counter/invoices_call.jinja
+msgid "Sum"
+msgstr "Somme"
+
+#: accounting/templates/accounting/journal_statement_nature.jinja
+msgid "Nature of operation"
+msgstr "Nature de l'opération"
+
+#: accounting/templates/accounting/journal_statement_nature.jinja
+#: club/templates/club/club_sellings.jinja
+#: counter/templates/counter/counter_main.jinja
+msgid "Total: "
+msgstr "Total : "
+
+#: accounting/templates/accounting/journal_statement_nature.jinja
+msgid "Statement by nature: "
+msgstr "Bilan par nature : "
+
+#: accounting/templates/accounting/journal_statement_person.jinja
+msgid "Statement by person: "
+msgstr "Bilan par personne : "
+
+#: accounting/templates/accounting/journal_statement_person.jinja
+msgid "Target of the operation"
+msgstr "Cible de l'opération"
+
+#: accounting/templates/accounting/label_list.jinja
+msgid "Back to club account"
+msgstr "Retour au compte club"
+
+#: accounting/templates/accounting/label_list.jinja
+msgid "There is no label in this club account."
+msgstr "Il n'y a pas d'étiquette dans ce compte club."
+
+#: accounting/templates/accounting/operation_edit.jinja
+msgid "Edit operation"
+msgstr "Éditer l'opération"
+
+#: accounting/templates/accounting/operation_edit.jinja
+msgid ""
+"Warning: if you select <em>Account</em>, the opposite operation will be "
+"created in the target account. If you don't want that, select <em>Club</em> "
+"instead of <em>Account</em>."
+msgstr ""
+"Attention : si vous sélectionnez <em>Compte</em>, l'opération inverse sera "
+"créée dans le compte cible. Si vous ne le voulez pas, sélectionnez <em>Club</"
+"em> à la place de <em>Compte</em>."
+
+#: accounting/templates/accounting/operation_edit.jinja
+msgid "Linked operation:"
+msgstr "Opération liée : "
+
+#: accounting/templates/accounting/operation_edit.jinja
+#: com/templates/com/news_edit.jinja com/templates/com/poster_edit.jinja
+#: com/templates/com/screen_edit.jinja com/templates/com/weekmail.jinja
+#: core/templates/core/create.jinja core/templates/core/edit.jinja
+#: core/templates/core/file_edit.jinja core/templates/core/macros_pages.jinja
+#: core/templates/core/page_prop.jinja
+#: core/templates/core/user_godfathers.jinja
+#: core/templates/core/user_godfathers_tree.jinja
+#: core/templates/core/user_preferences.jinja
+#: counter/templates/counter/cash_register_summary.jinja
+#: forum/templates/forum/reply.jinja
+#: subscription/templates/subscription/fragments/creation_form.jinja
+#: trombi/templates/trombi/comment.jinja
+#: trombi/templates/trombi/edit_profile.jinja
+#: trombi/templates/trombi/user_tools.jinja
+msgid "Save"
+msgstr "Sauver"
+
+#: accounting/templates/accounting/refound_account.jinja accounting/views.py
+msgid "Refound account"
+msgstr "Remboursement de compte"
+
+#: accounting/templates/accounting/refound_account.jinja
+msgid "Refound"
+msgstr "Rembourser"
+
+#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
+msgid "Simplified type list"
+msgstr "Liste des types simplifiés"
+
+#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
+msgid "Simplified types"
+msgstr "Types simplifiés"
+
+#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
+msgid "New simplified type"
+msgstr "Nouveau type simplifié"
+
+#: accounting/views.py
+msgid "Journal"
+msgstr "Classeur"
+
+#: accounting/views.py
+msgid "Statement by nature"
+msgstr "Bilan par nature"
+
+#: accounting/views.py
+msgid "Statement by person"
+msgstr "Bilan par personne"
+
+#: accounting/views.py
+msgid "Accounting statement"
+msgstr "Bilan comptable"
+
+#: accounting/views.py
+msgid "Link this operation to the target account"
+msgstr "Lier cette opération au compte cible"
+
+#: accounting/views.py
+msgid "The target must be set."
+msgstr "La cible doit être indiquée."
+
+#: accounting/views.py
+msgid "The amount must be set."
+msgstr "Le montant doit être indiqué."
+
+#: accounting/views.py
+msgid "Operation"
+msgstr "Opération"
+
+#: accounting/views.py
+msgid "Financial proof: "
+msgstr "Justificatif de libellé : "
+
+#: accounting/views.py
+#, python-format
+msgid "Club: %(club_name)s"
+msgstr "Club : %(club_name)s"
+
+#: accounting/views.py
+#, python-format
+msgid "Label: %(op_label)s"
+msgstr "Libellé : %(op_label)s"
+
+#: accounting/views.py
+#, python-format
+msgid "Date: %(date)s"
+msgstr "Date : %(date)s"
+
+#: accounting/views.py
+#, python-format
+msgid "Amount: %(amount).2f €"
+msgstr "Montant : %(amount).2f €"
+
+#: accounting/views.py
+msgid "Debtor"
+msgstr "Débiteur"
+
+#: accounting/views.py
+msgid "Creditor"
+msgstr "Créditeur"
+
+#: accounting/views.py
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: accounting/views.py
+msgid "Signature:"
+msgstr "Signature :"
+
+#: accounting/views.py
+msgid "General statement"
+msgstr "Bilan général"
+
+#: accounting/views.py
+msgid "No label operations"
+msgstr "Opérations sans étiquette"
+
+#: accounting/views.py
+msgid "Refound this account"
+msgstr "Rembourser ce compte"
+
 #: antispam/forms.py
 msgid "Email domain is not allowed."
 msgstr "Le domaine de l'addresse e-mail n'est pas autorisé."
@@ -266,7 +1027,7 @@ msgid "Enter a valid address. Only the root of the address is needed."
 msgstr ""
 "Entrez une adresse valide. Seule la racine de l'adresse est nécessaire."
 
-#: club/models.py com/models.py core/models.py
+#: club/models.py com/models.py core/models.py sas/models.py
 msgid "is moderated"
 msgstr "est modéré"
 
@@ -1610,11 +2371,11 @@ msgstr "avoir une notification pour chaque click"
 msgid "get a notification for every refilling"
 msgstr "avoir une notification pour chaque rechargement"
 
-#: core/models.py sas/forms.py
+#: core/models.py sas/models.py
 msgid "file name"
 msgstr "nom du fichier"
 
-#: core/models.py
+#: core/models.py sas/models.py
 msgid "parent"
 msgstr "parent"
 
@@ -1622,10 +2383,14 @@ msgstr "parent"
 msgid "compressed file"
 msgstr "version allégée"
 
-#: core/models.py
+#: core/models.py sas/models.py
 msgid "thumbnail"
 msgstr "miniature"
 
+#: core/models.py sas/models.py
+msgid "owner"
+msgstr "propriétaire"
+
 #: core/models.py
 msgid "edit group"
 msgstr "groupe d'édition"
@@ -1654,10 +2419,6 @@ msgstr "date"
 msgid "asked for removal"
 msgstr "retrait demandé"
 
-#: core/models.py
-msgid "is in the SAS"
-msgstr "est dans le SAS"
-
 #: core/models.py
 msgid "Character '/' not authorized in name"
 msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier"
@@ -2658,8 +3419,8 @@ msgid "Buyings"
 msgstr "Achats"
 
 #: core/templates/core/user_stats.jinja
-msgid "Product top 10"
+msgid "Product top 15"
-msgstr "Top 10 produits"
+msgstr "Top 15 produits"
 
 #: core/templates/core/user_stats.jinja
 msgid "Product"
@@ -2819,8 +3580,8 @@ msgstr "Outils Trombi"
 #, python-format
 msgid "%(nb_days)d day, %(remainder)s"
 msgid_plural "%(nb_days)d days, %(remainder)s"
-msgstr[0] ""
+msgstr[0] "%(nb_days)d jour, %(remainder)s"
-msgstr[1] ""
+msgstr[1] "%(nb_days)d jours, %(remainder)s"
 
 #: core/views/files.py
 msgid "Add a new folder"
@@ -2928,18 +3689,6 @@ msgstr "Photos"
 msgid "Account"
 msgstr "Compte"
 
-#: counter/apps.py sith/settings.py
-msgid "Check"
-msgstr "Chèque"
-
-#: counter/apps.py sith/settings.py
-msgid "Cash"
-msgstr "Espèces"
-
-#: counter/apps.py counter/models.py sith/settings.py
-msgid "Credit card"
-msgstr "Carte bancaire"
-
 #: counter/apps.py counter/models.py
 msgid "counter"
 msgstr "comptoir"
@@ -3152,22 +3901,30 @@ msgstr "vendeurs"
 msgid "token"
 msgstr "jeton"
 
+#: counter/models.py sith/settings.py
+msgid "Credit card"
+msgstr "Carte bancaire"
+
+#: counter/models.py sith/settings.py
+msgid "Cash"
+msgstr "Espèces"
+
+#: counter/models.py sith/settings.py
+msgid "Check"
+msgstr "Chèque"
+
 #: counter/models.py subscription/models.py
 msgid "payment method"
 msgstr "méthode de paiement"
 
-#: counter/models.py
-msgid "bank"
-msgstr "banque"
-
-#: counter/models.py
-msgid "is validated"
-msgstr "est validé"
-
 #: counter/models.py
 msgid "refilling"
 msgstr "rechargement"
 
+#: counter/models.py
+msgid "Sith account"
+msgstr "Compte utilisateur"
+
 #: counter/models.py eboutic/models.py
 msgid "unit price"
 msgstr "prix unitaire"
@@ -3176,10 +3933,6 @@ msgstr "prix unitaire"
 msgid "quantity"
 msgstr "quantité"
 
-#: counter/models.py
-msgid "Sith account"
-msgstr "Compte utilisateur"
-
 #: counter/models.py
 msgid "selling"
 msgstr "vente"
@@ -3245,7 +3998,7 @@ msgstr "élément de relevé de caisse"
 msgid "banner"
 msgstr "bannière"
 
-#: counter/models.py
+#: counter/models.py sas/models.py
 msgid "event date"
 msgstr "date de l'événement"
 
@@ -3332,6 +4085,10 @@ msgid ""
 "“%(value)s” value has the correct format (YYYY-MM) but it is an invalid date."
 msgstr "La valeur « %(value)s » a le bon format, mais est une date invalide."
 
+#: counter/models.py
+msgid "is validated"
+msgstr "est validé"
+
 #: counter/models.py
 msgid "invoice date"
 msgstr "date de la facture"
@@ -4070,11 +4827,11 @@ msgstr "début des candidatures"
 msgid "end candidature"
 msgstr "fin des candidatures"
 
-#: election/models.py
+#: election/models.py sas/models.py
 msgid "edit groups"
 msgstr "groupe d'édition"
 
-#: election/models.py
+#: election/models.py sas/models.py
 msgid "view groups"
 msgstr "groupe de vue"
 
@@ -4388,6 +5145,14 @@ msgstr "Galaxie de %(user_name)s"
 msgid "This citizen has not yet joined the galaxy"
 msgstr "Ce citoyen n'a pas encore rejoint la galaxie"
 
+#: matmat/forms.py
+msgid "Last/First name or nickname"
+msgstr "Nom de famille, prénom ou surnom"
+
+#: matmat/forms.py
+msgid "Empty search"
+msgstr "Recherche vide"
+
 #: matmat/templates/matmat/search_form.jinja
 msgid "Search user"
 msgstr "Rechercher un utilisateur"
@@ -4396,22 +5161,6 @@ msgstr "Rechercher un utilisateur"
 msgid "Results"
 msgstr "Résultats"
 
-#: matmat/templates/matmat/search_form.jinja
-msgid "Search by profile"
-msgstr "Recherche par profil"
-
-#: matmat/templates/matmat/search_form.jinja
-msgid "Inverted search"
-msgstr "Recherche inversée"
-
-#: matmat/templates/matmat/search_form.jinja
-msgid "Quick search"
-msgstr "Recherche rapide"
-
-#: matmat/views.py
-msgid "Last/First name or nickname"
-msgstr "Nom de famille, prénom ou surnom"
-
 #: pedagogy/forms.py
 msgid "Do not vote"
 msgstr "Ne pas voter"
@@ -4766,6 +5515,22 @@ msgstr "Envoyer les images"
 msgid "You already requested moderation for this picture."
 msgstr "Vous avez déjà déposé une demande de retrait pour cette photo."
 
+#: sas/models.py
+msgid "The date on which the photos in this album were taken"
+msgstr "La date à laquelle les photos de cet album ont été prises"
+
+#: sas/models.py
+msgid "album"
+msgstr "album"
+
+#: sas/models.py
+msgid "original image"
+msgstr "image originale"
+
+#: sas/models.py
+msgid "compressed image"
+msgstr "version compressée"
+
 #: sas/models.py
 msgid "picture"
 msgstr "photo"

matmat/forms.py

@@ -0,0 +1,54 @@
+#
+# 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,12 +1,18 @@
-{% extends "core/base.jinja" %}
+{% if is_fragment %}
-{% from "core/macros.jinja" import user_mini_profile, paginate_jinja %}
+  {% extends "core/base_fragment.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 result_exists %}
+  {% if paginator.count > 0 %}
     <h2>{% trans %}Results{% endtrans %}</h2>
     <div class="matmat_results">
       {% for user in object_list %}
@@ -19,47 +25,24 @@
       {% endfor %}
     </div>
     {% if page_obj.has_other_pages() %}
-      {{ paginate_jinja(page_obj, paginator) }}
+      {{ paginate_htmx(page_obj, paginator) }}
     {% endif %}
     <hr>
   {% endif %}
   <h2>{% trans %}Search user{% endtrans %}</h2>
-  <h3>{% trans %}Search by profile{% endtrans %}</h3>
+  <form action="{{ url('matmat:search') }}" method="get">
-  <form action="{{ url('matmat:search') }}" method="post" enctype="multipart/form-data">
+    {{ form.non_field_errors() }}
-    {% csrf_token %}
+    <fieldset class="fields-centered">
-    {% for field in form %}
+      {% for field in form %}
-      {% if field.name not in ('phone', 'quick') %}
+        <div>
-        <p>
+          {{ field.label_tag() }}
-          {{ field.errors }}
-          <label for="{{ field.id_for_label }}">{{ field.label }}</label>
           {{ field }}
-        </p>
+          {{ field.errors }}
-      {% endif %}
+        </div>
-    {% endfor %}
+      {% endfor %}
-    <p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
+    </fieldset>
-  </form>
+    <div class="fields-centered">
-  <h3>{% trans %}Inverted search{% endtrans %}</h3>
+      <input class="btn btn-blue" type="submit" value="{% trans %}Search{% endtrans %}" />
-  <form action="{{ url('matmat:search_reverse') }}" method="post" enctype="multipart/form-data">
+    </div>
-    {% 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 +1,59 @@
 # 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,16 +23,8 @@
 
 from django.urls import path
 
-from matmat.views import (
+from matmat.views import MatmatronchView
-    SearchClearFormView,
-    SearchNormalFormView,
-    SearchQuickFormView,
-    SearchReverseFormView,
-)
 
 urlpatterns = [
-    path("", SearchNormalFormView.as_view(), name="search"),
+    path("", MatmatronchView.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,192 +16,49 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
-from ast import literal_eval
-from enum import Enum
 
-from django import forms
+from django.db.models import F
-from django.http.response import HttpResponseRedirect
+from django.views.generic import ListView
-from django.urls import reverse
+from django.views.generic.edit import FormMixin
-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
+from core.models import User, UserQuerySet
-from core.views import search_user
+from core.schemas import UserFilterSchema
-from core.views.forms import SelectDate
+from core.views.mixins import AllowFragment
-
+from matmat.forms import SearchForm
-# Enum to select search type
 
 
-class SearchType(Enum):
+class MatmatronchView(AllowFragment, FormerSubscriberMixin, FormMixin, ListView):
-    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
-    ordering = ["-id"]
+    paginate_by = 20
-    paginate_by = 12
     template_name = "matmat/search_form.jinja"
-
-    def dispatch(self, request, *args, **kwargs):
-        self.form_class = kwargs["form"]
-        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")
-
-        self.init_query = self.model.objects
-        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)
-
-        return super().dispatch(request, *args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        return self.get(request, *args, **kwargs)
-
-    def get_context_data(self, **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()
+        self.form = self.get_form()
-        return view(request, *args, **kwargs)
+        return super().get(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", {})
+        return self.request.GET
-        if not init:
-            init["department"] = ""
-        return init
 
+    def get_form_kwargs(self):
+        res = super().get_form_kwargs()
+        if self.request.GET:
+            res["data"] = self.request.GET
+        return res
 
-class SearchNormalFormView(SearchFormView):
+    def get_queryset(self) -> UserQuerySet:
-    search_type = SearchType.NORMAL
+        if not self.form.is_valid():
+            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):
-class SearchReverseFormView(SearchFormView):
+        return super().get_context_data(form=self.form, **kwargs)
-    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"))

pedagogy/schemas.py

@@ -1,9 +1,9 @@
-from typing import Literal
+from typing import Annotated, Literal
 
 from django.db.models import Q
 from django.utils import html
 from haystack.query import SearchQuerySet
-from ninja import FilterSchema, ModelSchema, Schema
+from ninja import FilterLookup, FilterSchema, ModelSchema, Schema
 from pydantic import AliasPath, ConfigDict, Field, TypeAdapter
 from pydantic.alias_generators import to_camel
 
@@ -114,13 +114,14 @@ class UvSchema(ModelSchema):
 
 
 class UvFilterSchema(FilterSchema):
-    search: str | None = Field(None, q="code__icontains")
+    search: Annotated[str | None, FilterLookup("code__icontains")] = None
     semester: set[Literal["AUTUMN", "SPRING"]] | None = None
-    credit_type: set[Literal["CS", "TM", "EC", "OM", "QC"]] | None = Field(
+    credit_type: Annotated[
-        None, q="credit_type__in"
+        set[Literal["CS", "TM", "EC", "OM", "QC"]] | None,
-    )
+        FilterLookup("credit_type__in"),
+    ] = None
     language: str = "FR"
-    department: set[str] | None = Field(None, q="department__in")
+    department: Annotated[set[str] | None, FilterLookup("department__in")] = None
 
     def filter_search(self, value: str | None) -> Q:
         """Special filter for the search text.

pyproject.toml

@@ -20,8 +20,8 @@ license = { text = "GPL-3.0-only" }
 requires-python = "<4.0,>=3.12"
 dependencies = [
     "django>=5.2.8,<6.0.0",
-    "django-ninja>=1.4.5,<2.0.0",
+    "django-ninja>=1.5.0,<6.0.0",
-    "django-ninja-extra>=0.30.2,<1.0.0",
+    "django-ninja-extra>=0.30.6",
     "Pillow>=12.0.0,<13.0.0",
     "mistune>=3.1.4,<4.0.0",
     "django-jinja<3.0.0,>=2.11.0",

rootplace/tests/test_merge_users.py

@@ -114,7 +114,6 @@ class TestMergeUser(TestCase):
             seller=self.root,
             unit_price=2,
             quantity=2,
-            payment_method="SITH_ACCOUNT",
         ).save()
         Selling(
             label="barbar",
@@ -125,7 +124,6 @@ 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
@@ -197,7 +195,6 @@ 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)
@@ -225,7 +222,6 @@ 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", "date", "size", "is_moderated")
+    list_display = ("name", "parent", "is_moderated")
     search_fields = ("name",)
-    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups", "moderator")
+    autocomplete_fields = ("owner", "parent", "moderator")
 
 
 @admin.register(PeoplePictureRelation)
@@ -33,9 +33,9 @@ class PeoplePictureRelationAdmin(admin.ModelAdmin):
 
 @admin.register(Album)
 class AlbumAdmin(admin.ModelAdmin):
-    list_display = ("name", "parent", "date", "owner", "is_moderated")
+    list_display = ("name", "parent")
     search_fields = ("name",)
-    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups")
+    autocomplete_fields = ("parent", "edit_groups", "view_groups")
 
 
 @admin.register(PictureModerationRequest)

sas/api.py

@@ -2,8 +2,10 @@ 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, File, Query
+from ninja import Body, Query, UploadedFile
+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
@@ -16,11 +18,12 @@ from api.permissions import (
     CanAccessLookup,
     CanEdit,
     CanView,
+    HasPerm,
     IsInGroup,
     IsRoot,
 )
 from core.models import Notification, User
-from core.schemas import UploadedImage
+from core.utils import get_list_exact_or_404
 from sas.models import Album, PeoplePictureRelation, Picture
 from sas.schemas import (
     AlbumAutocompleteSchema,
@@ -28,6 +31,7 @@ from sas.schemas import (
     AlbumSchema,
     IdentifiedUserSchema,
     ModerationRequestSchema,
+    MoveAlbumSchema,
     PictureFilterSchema,
     PictureSchema,
 )
@@ -69,6 +73,48 @@ 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):
@@ -96,7 +142,7 @@ class PicturesController(ControllerBase):
         return (
             filters.filter(Picture.objects.viewable_by(user))
             .distinct()
-            .order_by("-parent__date", "date")
+            .order_by("-parent__event_date", "created_at")
             .select_related("owner", "parent")
         )
 
@@ -110,27 +156,25 @@ class PicturesController(ControllerBase):
         },
         url_name="upload_picture",
     )
-    def upload_picture(self, album_id: Body[int], picture: File[UploadedImage]):
+    def upload_picture(self, album_id: Body[int], picture: UploadedFile):
         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,
-            file=picture,
+            original=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:
-            return self.create_response({"detail": dict(e)}, status_code=409)
+            raise HttpError(status_code=409, message=str(e)) from e
+        new.save()
 
     @route.get(
         "/{picture_id}/identified",

sas/baker_recipes.py

@@ -1,18 +1,35 @@
+from django.core.files.uploadedfile import SimpleUploadedFile
 from model_bakery import seq
 from model_bakery.recipe import Recipe
 
-from sas.models import Picture
+from core.utils import RED_PIXEL_PNG
+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,13 +48,12 @@ class PictureEditForm(forms.ModelForm):
 class AlbumEditForm(forms.ModelForm):
     class Meta:
         model = Album
-        fields = ["name", "date", "file", "parent", "edit_groups"]
+        fields = ["name", "date", "thumbnail", "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

@@ -0,0 +1,357 @@
+# 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

@@ -0,0 +1,31 @@
+# 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,29 +18,52 @@ from __future__ import annotations
 import contextlib
 from io import BytesIO
 from pathlib import Path
-from typing import ClassVar, Self
+from typing import TYPE_CHECKING, 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 Notification, SithFile, User
+from core.models import Group, Notification, User
 from core.utils import exif_auto_rotate, resize_image
 
+if TYPE_CHECKING:
+    from django.db.models.fields.files import FieldFile
 
-class SasFile(SithFile):
+
-    """Proxy model for any file in the SAS.
+def get_directory(instance: SasFile, filename: str):
+    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:
-        proxy = True
+        abstract = True
         permissions = [
             ("moderate_sasfile", "Can moderate SAS files"),
             ("view_unmoderated_sasfile", "Can view not moderated SAS files"),
@@ -65,6 +88,169 @@ class SasFile(SithFile):
     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:
@@ -80,23 +266,65 @@ 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:
-        proxy = True
+        verbose_name = _("picture")
+        constraints = [
+            models.UniqueConstraint(
+                fields=["name", "parent"], name="sas_picture_unique_per_album"
+            )
+        ]
 
-    objects = SASPictureManager.from_queryset(PictureQuerySet)()
+    def __str__(self):
+        return self.name
 
-    @property
+    def get_absolute_url(self):
-    def is_vertical(self):
+        return reverse("sas:picture", kwargs={"picture_id": self.id})
-        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})
@@ -107,41 +335,34 @@ class Picture(SasFile):
     def get_download_thumb_url(self):
         return reverse("sas:download_thumb", kwargs={"picture_id": self.id})
 
-    def get_absolute_url(self):
+    @property
-        return reverse("sas:picture", kwargs={"picture_id": self.id})
+    def is_vertical(self):
+        # 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, *, overwrite=False):
+    def generate_thumbnails(self):
-        im = Image.open(BytesIO(self.file.read()))
+        im = Image.open(self.original)
         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 time, which greatly hinders the UX
+        # - optimizing large images takes a lot of 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")
-        if overwrite:
+        new_extension_name = str(Path(self.original.name).with_suffix(".webp"))
-            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 attr in ["file", "compressed", "thumbnail"]:
+        for field in self.original, self.compressed, self.thumbnail:
-            name = self.__getattribute__(attr).name
+            with open(field.file, "r+b") as file:
-            with open(settings.MEDIA_ROOT / name, "r+b") as file:
                 if file:
                     im = Image.open(BytesIO(file.read()))
                     file.seek(0)
@@ -154,110 +375,6 @@ 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,20 +2,19 @@ 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 FilterSchema, ModelSchema, Schema
+from ninja import FilterLookup, FilterSchema, ModelSchema, Schema
 from pydantic import Field, NonNegativeInt
 
-from core.schemas import SimpleUserSchema, UserProfileSchema
+from core.schemas import NonEmptyStr, SimpleUserSchema, UserProfileSchema
 from sas.models import Album, Picture, PictureModerationRequest
 
 
 class AlbumFilterSchema(FilterSchema):
-    search: Annotated[str, MinLen(1)] | None = Field(None, q="name__icontains")
+    search: Annotated[NonEmptyStr | None, FilterLookup("name__icontains")] = None
-    before_date: datetime | None = Field(None, q="event_date__lte")
+    before_date: Annotated[datetime | None, FilterLookup("event_date__lte")] = None
-    after_date: datetime | None = Field(None, q="event_date__gte")
+    after_date: Annotated[datetime | None, FilterLookup("event_date__gte")] = None
-    parent_id: int | None = Field(None, q="parent_id")
+    parent_id: Annotated[int | None, FilterLookup("parent_id")] = None
 
 
 class SimpleAlbumSchema(ModelSchema):
@@ -56,20 +55,27 @@ class AlbumAutocompleteSchema(ModelSchema):
 
     @staticmethod
     def resolve_path(obj: Album) -> str:
-        return str(Path(obj.get_parent_path()) / obj.name)
+        return str(Path(obj.parent_path) / obj.name)
+
+
+class MoveAlbumSchema(Schema):
+    id: int
+    new_parent_id: int
 
 
 class PictureFilterSchema(FilterSchema):
-    before_date: datetime | None = Field(None, q="date__lte")
+    before_date: Annotated[datetime | None, FilterLookup("date__lte")] = None
-    after_date: datetime | None = Field(None, q="date__gte")
+    after_date: Annotated[datetime | None, FilterLookup("date__gte")] = None
-    users_identified: set[int] | None = Field(None, q="people__user_id__in")
+    users_identified: Annotated[
-    album_id: int | None = Field(None, q="parent_id")
+        set[int] | None, FilterLookup("people__user_id__in")
+    ] = None
+    album_id: Annotated[int | None, FilterLookup("parent_id")] = None
 
 
 class PictureSchema(ModelSchema):
     class Meta:
         model = Picture
-        fields = ["id", "name", "date", "size", "is_moderated", "asked_for_removal"]
+        fields = ["id", "name", "created_at", "is_moderated", "asked_for_removal"]
 
     owner: UserProfileSchema
     sas_url: str

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

@@ -125,3 +125,108 @@ 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}/IMG_${p.date.replace(/[:\-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
+          const imgName = `${p.album}/IMG_${p.created_at.replace(/[:\-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
           return zipWriter.add(imgName, new HttpReader(p.full_size_url), {
             level: 9,
-            lastModDate: new Date(p.date),
+            lastModDate: new Date(p.created_at),
             onstart: incrementProgressBar,
           });
         }),

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

@@ -142,7 +142,8 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
         // biome-ignore lint/style/useNamingConvention: api is in snake_case
         full_size_url: "",
         owner: "",
-        date: new Date(),
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        created_at: new Date(),
         identifications: [] as IdentifiedUserSchema[],
       },
       /**

sas/templates/sas/album.jinja

@@ -20,7 +20,7 @@
 
 {% block content %}
   <code>
-    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.get_display_name() }}
+    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.name }}
   </code>
 
   {% set is_sas_admin = user.can_edit(album) %}
@@ -30,7 +30,7 @@
     <form action="" method="post" enctype="multipart/form-data">
       {% csrf_token %}
       <div class="album-navbar">
-        <h3>{{ album.get_display_name() }}</h3>
+        <h3>{{ album.name }}</h3>
 
         <div class="toolbar">
           <a href="{{ url('sas:album_edit', album_id=album.id) }}">{% trans %}Edit{% endtrans %}</a>
@@ -40,17 +40,17 @@
         </div>
       </div>
 
-      {% if clipboard %}
+{#      {% if clipboard %}#}
-        <div class="clipboard">
+{#        <div class="clipboard">#}
-          {% trans %}Clipboard: {% endtrans %}
+{#          {% trans %}Clipboard: {% endtrans %}#}
-          <ul>
+{#          <ul>#}
-            {% for f in clipboard %}
+{#            {% for f in clipboard["albums"] %}#}
-              <li>{{ f.get_full_path() }}</li>
+{#              <li>{{ f.get_full_path() }}</li>#}
-            {% endfor %}
+{#            {% endfor %}#}
-          </ul>
+{#          </ul>#}
-          <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">
+{#          <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">#}
-        </div>
+{#        </div>#}
-      {% endif %}
+{#      {% endif %}#}
   {% endif %}
 
   {% if show_albums %}
@@ -73,8 +73,8 @@
                 <div class="text">{% trans %}To be moderated{% endtrans %}</div>
               </template>
             </div>
-            {% if is_sas_admin %}
+            {% if edit_mode %}
-              <input type="checkbox" name="file_list" :value="album.id">
+              <input type="checkbox" name="album_list" :value="album.id">
             {% endif %}
           </a>
         </template>
@@ -100,7 +100,7 @@
             </template>
           </div>
           {% if is_sas_admin %}
-            <input type="checkbox" name="file_list" :value="picture.id">
+            <input type="checkbox" name="picture_list" :value="picture.id">
           {% endif %}
         </a>
       </template>
@@ -120,9 +120,9 @@
       {% csrf_token %}
       <div class="inputs">
         <p>
-          <label for="{{ upload_form.images.id_for_label }}">{{ upload_form.images.label }} :</label>
+          <label for="{{ form.images.id_for_label }}">{{ form.images.label }} :</label>
-          {{ upload_form.images|add_attr("x-ref=pictures") }}
+          {{ form.images|add_attr("x-ref=pictures") }}
-          <span class="helptext">{{ upload_form.images.help_text }}</span>
+          <span class="helptext">{{ form.images.help_text }}</span>
         </p>
         <input type="submit" value="{% trans %}Upload{% endtrans %}" />
         <progress x-ref="progress" x-show="sending"></progress>

sas/templates/sas/macros.jinja

@@ -1,19 +1,13 @@
 {% macro display_album(a, edit_mode) %}
   <a href="{{ url('sas:album', album_id=a.id) }}">
-    {% if a.file %}
+    {% if a.thumbnail %}
       {% set img = a.get_download_url() %}
       {% set src = a.name %}
-    {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %}
-      {% set picture = a.children.filter(is_folder=False).first().as_picture %}
-      {% set img = picture.get_download_thumb_url()  %}
-      {% set src = picture.name %}
     {% else %}
       {% set img = static('core/img/sas.jpg') %}
       {% set src = "sas.jpg" %}
     {% endif %}
-    <div
+    <div class="album{% if not a.is_moderated %} not_moderated{% endif %}">
-      class="album{% if not a.is_moderated %} not_moderated{% endif %}"
-    >
       <img src="{{ img }}" alt="{{ src }}" loading="lazy" />
       {% if not a.is_moderated %}
         <div class="overlay">&nbsp;</div>
@@ -31,7 +25,7 @@
 {% macro print_path(file) %}
   {% if file and file.parent %}
     {{ print_path(file.parent) }}
-    <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
+    <a href="{{ url("sas:album", album_id=file.id) }}">{{ file.name }}</a> /
   {% endif %}
 {% endmacro %}
 

sas/templates/sas/picture.jinja

@@ -1,9 +1,9 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-  <link defer rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
+  <link rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
-  <link defer rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
+  <link rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
-  <link defer rel="stylesheet" href="{{ static('sas/css/picture.scss') }}">
+  <link rel="stylesheet" href="{{ static('sas/css/picture.scss') }}">
 {%- endblock -%}
 
 {%- block additional_js -%}
@@ -104,7 +104,7 @@
                 <span
                   x-text="Intl.DateTimeFormat(
                           '{{ LANGUAGE_CODE }}', {dateStyle: 'long'}
-                          ).format(new Date(currentPicture.date))"
+                          ).format(new Date(currentPicture.created_at))"
                 >
                 </span>
               </div>

sas/tests/test_api.py

@@ -27,8 +27,8 @@ class TestSas(TestCase):
         cls.user_b, cls.user_c = subscriber_user.make(_quantity=2)
 
         picture = picture_recipe.extend(owner=owner)
-        cls.album_a = baker.make(Album, is_in_sas=True, parent=sas)
+        cls.album_a = baker.make(Album)
-        cls.album_b = baker.make(Album, is_in_sas=True, parent=sas)
+        cls.album_b = baker.make(Album)
         relation_recipe = Recipe(PeoplePictureRelation)
         relations = []
         for album in cls.album_a, cls.album_b:
@@ -61,7 +61,7 @@ class TestPictureSearch(TestSas):
         self.client.force_login(self.user_b)
         res = self.client.get(self.url + f"?album_id={self.album_a.id}")
         assert res.status_code == 200
-        expected = list(self.album_a.children_pictures.values_list("id", flat=True))
+        expected = list(self.album_a.pictures.values_list("id", flat=True))
         assert [i["id"] for i in res.json()["results"]] == expected
 
     def test_filter_by_user(self):
@@ -70,7 +70,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.order_by(
-                "-picture__parent__date", "picture__date"
+                "-picture__parent__event_date", "picture__created_at"
             ).values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -84,7 +84,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.union(self.user_b.pictures.all())
-            .order_by("-picture__parent__date", "picture__date")
+            .order_by("-picture__parent__event_date", "picture__created_at")
             .values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -97,7 +97,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.order_by(
-                "-picture__parent__date", "picture__date"
+                "-picture__parent__event_date", "picture__created_at"
             ).values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -123,7 +123,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_b.pictures.intersection(self.user_a.pictures.all())
-            .order_by("-picture__parent__date", "picture__date")
+            .order_by("-picture__parent__event_date", "picture__created_at")
             .values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected

sas/tests/test_model.py

@@ -4,8 +4,8 @@ from model_bakery import baker
 
 from core.baker_recipes import old_subscriber_user, subscriber_user
 from core.models import User
-from sas.baker_recipes import picture_recipe
+from sas.baker_recipes import album_recipe, picture_recipe
-from sas.models import PeoplePictureRelation, Picture
+from sas.models import Album, PeoplePictureRelation, Picture
 
 
 class TestPictureQuerySet(TestCase):
@@ -67,3 +67,22 @@ def test_identifications_viewable_by_user():
     assert list(picture.people.viewable_by(identifications[1].user)) == [
         identifications[1]
     ]
+
+
+class TestDeleteAlbum(TestCase):
+    def setUp(cls):
+        cls.album: Album = album_recipe.make()
+        cls.album_pictures = picture_recipe.make(parent=cls.album, _quantity=5)
+        cls.sub_album = album_recipe.make(parent=cls.album)
+        cls.sub_album_pictures = picture_recipe.make(parent=cls.sub_album, _quantity=5)
+
+    def test_delete(self):
+        album_ids = [self.album.id, self.sub_album.id]
+        picture_ids = [
+            *[p.id for p in self.album_pictures],
+            *[p.id for p in self.sub_album_pictures],
+        ]
+        self.album.delete()
+        # assert not p.exists()
+        assert not Album.objects.filter(id__in=album_ids).exists()
+        assert not Picture.objects.filter(id__in=picture_ids).exists()

sas/tests/test_views.py

@@ -136,9 +136,7 @@ class TestAlbumUpload:
 class TestSasModeration(TestCase):
     @classmethod
     def setUpTestData(cls):
-        album = baker.make(
+        album = baker.make(Album)
-            Album, parent_id=settings.SITH_SAS_ROOT_DIR_ID, is_moderated=True
-        )
         cls.pictures = picture_recipe.make(
             parent=album, _quantity=10, _bulk_create=True
         )

sas/views.py

@@ -12,6 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
+from pathlib import Path
 from typing import Any
 
 from django.conf import settings
@@ -22,12 +23,12 @@ from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.safestring import SafeString
 from django.views.generic import CreateView, DetailView, TemplateView
-from django.views.generic.edit import FormView, UpdateView
+from django.views.generic.edit import FormMixin, FormView, UpdateView
 
 from core.auth.mixins import CanEditMixin, CanViewMixin
 from core.models import SithFile, User
-from core.views import UseFragmentsMixin
+from core.views import FileView, UseFragmentsMixin
-from core.views.files import FileView, send_file
+from core.views.files import send_raw_file
 from core.views.mixins import FragmentMixin, FragmentRenderer
 from core.views.user import UserTabsMixin
 from sas.forms import (
@@ -63,6 +64,7 @@ class AlbumCreateFragment(FragmentMixin, CreateView):
 
 
 class SASMainView(UseFragmentsMixin, TemplateView):
+    form_class = AlbumCreateForm
     template_name = "sas/main.jinja"
 
     def get_fragments(self) -> dict[str, FragmentRenderer]:
@@ -79,12 +81,26 @@ class SASMainView(UseFragmentsMixin, TemplateView):
         root_user = User.objects.get(pk=settings.SITH_ROOT_USER_ID)
         return {"album_create_fragment": {"owner": root_user}}
 
+    def dispatch(self, request, *args, **kwargs):
+        if request.method == "POST" and not self.request.user.has_perm("sas.add_album"):
+            raise PermissionDenied
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_form(self, form_class=None):
+        if not self.request.user.has_perm("sas.add_album"):
+            return None
+        return super().get_form(form_class)
+
+    def get_form_kwargs(self):
+        return super().get_form_kwargs() | {
+            "owner": User.objects.get(pk=settings.SITH_ROOT_USER_ID),
+            "parent": None,
+        }
+
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
         albums_qs = Album.objects.viewable_by(self.request.user)
-        kwargs["categories"] = list(
+        kwargs["categories"] = list(albums_qs.filter(parent=None).order_by("id"))
-            albums_qs.filter(parent_id=settings.SITH_SAS_ROOT_DIR_ID).order_by("id")
-        )
         kwargs["latest"] = list(albums_qs.order_by("-id")[:5])
         return kwargs
 
@@ -94,6 +110,9 @@ class PictureView(CanViewMixin, DetailView):
     pk_url_kwarg = "picture_id"
     template_name = "sas/picture.jinja"
 
+    def get_queryset(self):
+        return super().get_queryset().select_related("parent")
+
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         if "rotate_right" in request.GET:
@@ -103,31 +122,42 @@ class PictureView(CanViewMixin, DetailView):
         return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {
+        return super().get_context_data(**kwargs) | {"album": self.object.parent}
-            "album": Album.objects.get(children=self.object)
-        }
 
 
 def send_album(request, album_id):
-    return send_file(request, album_id, Album)
+    album = get_object_or_404(Album, id=album_id)
+    if not album.can_be_viewed_by(request.user):
+        raise PermissionDenied
+    return send_raw_file(Path(album.thumbnail.path))
 
 
 def send_pict(request, picture_id):
-    return send_file(request, picture_id, Picture)
+    picture = get_object_or_404(Picture, id=picture_id)
+    if not picture.can_be_viewed_by(request.user):
+        raise PermissionDenied
+    return send_raw_file(Path(picture.original.path))
 
 
 def send_compressed(request, picture_id):
-    return send_file(request, picture_id, Picture, "compressed")
+    picture = get_object_or_404(Picture, id=picture_id)
+    if not picture.can_be_viewed_by(request.user):
+        raise PermissionDenied
+    return send_raw_file(Path(picture.compressed.path))
 
 
 def send_thumb(request, picture_id):
-    return send_file(request, picture_id, Picture, "thumbnail")
+    picture = get_object_or_404(Picture, id=picture_id)
+    if not picture.can_be_viewed_by(request.user):
+        raise PermissionDenied
+    return send_raw_file(Path(picture.thumbnail.path))
 
 
-class AlbumView(CanViewMixin, UseFragmentsMixin, DetailView):
+class AlbumView(CanViewMixin, UseFragmentsMixin, FormMixin, DetailView):
     model = Album
     pk_url_kwarg = "album_id"
     template_name = "sas/album.jinja"
+    form_class = PictureUploadForm
 
     def get_fragments(self) -> dict[str, FragmentRenderer]:
         return {
@@ -142,27 +172,32 @@ class AlbumView(CanViewMixin, UseFragmentsMixin, DetailView):
         except ValueError as e:
             raise Http404 from e
         if "clipboard" not in request.session:
-            request.session["clipboard"] = []
+            request.session["clipboard"] = {"albums": [], "pictures": []}
         return super().dispatch(request, *args, **kwargs)
 
+    def get_form(self, *args, **kwargs):
+        if not self.request.user.can_edit(self.object):
+            return None
+        return super().get_form(*args, **kwargs)
+
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
-        if not self.object.file:
+        form = self.get_form()
-            self.object.generate_thumbnail()
+        if not form:
-        if request.user.can_edit(self.object):  # Handle the copy-paste functions
+            # the form is reserved for users that can edit this album.
-            FileView.handle_clipboard(request, self.object)
+            # If there is no form, it means the user has no right to do a POST
-        return HttpResponseRedirect(self.request.path)
+            raise PermissionDenied
+        FileView.handle_clipboard(self.request, self.object)
+        if not form.is_valid():
+            return self.form_invalid(form)
+        return self.form_valid(form)
 
     def get_fragment_data(self) -> dict[str, dict[str, Any]]:
         return {"album_create_fragment": {"owner": self.request.user}}
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
-        if ids := self.request.session.get("clipboard", None):
+        kwargs["clipboard"] = {}
-            kwargs["clipboard"] = SithFile.objects.filter(id__in=ids)
-        kwargs["upload_form"] = PictureUploadForm()
-        # if True, the albums will be fetched with a request to the API
-        # if False, the section won't be displayed at all
         kwargs["show_albums"] = (
             Album.objects.viewable_by(self.request.user)
             .filter(parent_id=self.object.id)
@@ -215,7 +250,7 @@ class ModerationView(TemplateView):
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
         kwargs["albums_to_moderate"] = Album.objects.filter(
-            is_moderated=False, is_in_sas=True, is_folder=True
+            is_moderated=False
         ).order_by("id")
         pictures = Picture.objects.filter(is_moderated=False).select_related("parent")
         kwargs["pictures"] = pictures

sith/settings.py

@@ -177,7 +177,6 @@ TEMPLATES = [
             "filters": {
                 "markdown": "core.templatetags.renderer.markdown",
                 "phonenumber": "core.templatetags.renderer.phonenumber",
-                "truncate_time": "core.templatetags.renderer.truncate_time",
                 "format_timedelta": "core.templatetags.renderer.format_timedelta",
                 "add_attr": "core.templatetags.renderer.add_attr",
             },
@@ -216,7 +215,7 @@ TEMPLATES = [
         },
     },
 ]
-FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer"
+
 
 HAYSTACK_CONNECTIONS = {
     "default": {
@@ -440,19 +439,6 @@ SITH_SUBSCRIPTION_LOCATIONS = [
 
 SITH_COUNTER_BARS = [(1, "MDE"), (2, "Foyer"), (35, "La Gommette")]
 
-SITH_COUNTER_BANK = [
-    ("OTHER", "Autre"),
-    ("SOCIETE-GENERALE", "Société générale"),
-    ("BANQUE-POPULAIRE", "Banque populaire"),
-    ("BNP", "BNP"),
-    ("CAISSE-EPARGNE", "Caisse d'épargne"),
-    ("CIC", "CIC"),
-    ("CREDIT-AGRICOLE", "Crédit Agricole"),
-    ("CREDIT-MUTUEL", "Credit Mutuel"),
-    ("CREDIT-LYONNAIS", "Credit Lyonnais"),
-    ("LA-POSTE", "La Poste"),
-]
-
 SITH_PEDAGOGY_UV_TYPE = [
     ("FREE", _("Free")),
     ("CS", _("CS")),

staticfiles/processors.py

@@ -182,13 +182,12 @@ class OpenApi:
                 path[action]["operationId"] = "_".join(
                     desc["operationId"].split("_")[:-1]
                 )
+
         schema = str(schema)
 
         if old_hash == sha1(schema.encode("utf-8")).hexdigest():
             logging.getLogger("django").info("✨ Api did not change, nothing to do ✨")
             return
 
-        with open(out, "w") as f:
+        out.write_text(schema)
-            _ = f.write(schema)
-
         return subprocess.Popen(["npm", "run", "openapi"])

subscription/views.py

@@ -24,7 +24,6 @@ from django.views.generic import CreateView, DetailView, TemplateView
 from django.views.generic.edit import FormView
 
 from core.views.group import PermissionGroupsUpdateView
-from counter.apps import PAYMENT_METHOD
 from subscription.forms import (
     SelectionDateForm,
     SubscriptionExistingUserForm,
@@ -129,6 +128,6 @@ class SubscriptionsStatsView(FormView):
             subscription_end__gte=self.end_date, subscription_start__lte=self.start_date
         )
         kwargs["subscriptions_types"] = settings.SITH_SUBSCRIPTIONS
-        kwargs["payment_types"] = PAYMENT_METHOD
+        kwargs["payment_types"] = settings.SITH_SUBSCRIPTION_PAYMENT_METHOD
         kwargs["locations"] = settings.SITH_SUBSCRIPTION_LOCATIONS
         return kwargs