Optimize galaxy generation

En réorganisant les requêtes à la db, on diminue par 100 le temps d'exécution de la commande `rule_galaxy` (~6h => ~2min)

core/management/commands/install_xapian.sh

@@ -4,13 +4,13 @@
 VERSION="$1"
 
 # Cleanup env vars for auto discovery mechanism
-unset CPATH
-unset LIBRARY_PATH
-unset CFLAGS
-unset LDFLAGS
-unset CCFLAGS
-unset CXXFLAGS
-unset CPPFLAGS
+export CPATH=
+export LIBRARY_PATH=
+export CFLAGS=
+export LDFLAGS=
+export CCFLAGS=
+export CXXFLAGS=
+export CPPFLAGS=
 
 # prepare
 rm -rf "$VIRTUAL_ENV/packages"

core/management/commands/populate.py

@@ -59,7 +59,6 @@ class PopulatedGroups(NamedTuple):
     counter_admin: Group
     accounting_admin: Group
     pedagogy_admin: Group
-    campus_admin: Group
 
 
 class Command(BaseCommand):
@@ -785,13 +784,13 @@ class Command(BaseCommand):
         # public has no permission.
         # Its purpose is not to link users to permissions,
         # but to other objects (like products)
-        public_group = Group.objects.create(name="Publique")
+        public_group = Group.objects.create(name="Public")
 
-        subscribers = Group.objects.create(name="Cotisants")
+        subscribers = Group.objects.create(name="Subscribers")
         subscribers.permissions.add(
             *list(perms.filter(codename__in=["add_news", "add_uvcomment"]))
         )
-        old_subscribers = Group.objects.create(name="Anciens cotisants")
+        old_subscribers = Group.objects.create(name="Old subscribers")
         old_subscribers.permissions.add(
             *list(
                 perms.filter(
@@ -813,7 +812,7 @@ class Command(BaseCommand):
             )
         )
         accounting_admin = Group.objects.create(
-            name="Admin comptabilité", is_manually_manageable=True
+            name="Accounting admin", is_manually_manageable=True
         )
         accounting_admin.permissions.add(
             *list(
@@ -834,7 +833,7 @@ class Command(BaseCommand):
             )
         )
         com_admin = Group.objects.create(
-            name="Admin communication", is_manually_manageable=True
+            name="Communication admin", is_manually_manageable=True
         )
         com_admin.permissions.add(
             *list(
@@ -842,7 +841,7 @@ class Command(BaseCommand):
             )
         )
         counter_admin = Group.objects.create(
-            name="Admin comptoirs", is_manually_manageable=True
+            name="Counter admin", is_manually_manageable=True
         )
         counter_admin.permissions.add(
             *list(
@@ -852,14 +851,14 @@ class Command(BaseCommand):
                 )
             )
         )
-        sas_admin = Group.objects.create(name="Admin SAS", is_manually_manageable=True)
+        sas_admin = Group.objects.create(name="SAS admin", is_manually_manageable=True)
         sas_admin.permissions.add(
             *list(
                 perms.filter(content_type__app_label="sas").values_list("pk", flat=True)
             )
         )
         forum_admin = Group.objects.create(
-            name="Admin forum", is_manually_manageable=True
+            name="Forum admin", is_manually_manageable=True
         )
         forum_admin.permissions.add(
             *list(
@@ -869,7 +868,7 @@ class Command(BaseCommand):
             )
         )
         pedagogy_admin = Group.objects.create(
-            name="Admin pédagogie", is_manually_manageable=True
+            name="Pedagogy admin", is_manually_manageable=True
         )
         pedagogy_admin.permissions.add(
             *list(
@@ -878,16 +877,6 @@ class Command(BaseCommand):
                 .values_list("pk", flat=True)
             )
         )
-        campus_admin = Group.objects.create(
-            name="Respo site", is_manually_manageable=True
-        )
-        campus_admin.permissions.add(
-            *counter_admin.permissions.values_list("pk", flat=True),
-            *perms.filter(content_type__app_label="reservation").values_list(
-                "pk", flat=True
-            ),
-        )
-
         self.reset_index("core", "auth")
 
         return PopulatedGroups(
@@ -900,7 +889,6 @@ class Command(BaseCommand):
             accounting_admin=accounting_admin,
             sas_admin=sas_admin,
             pedagogy_admin=pedagogy_admin,
-            campus_admin=campus_admin,
         )
 
     def _create_ban_groups(self):

core/management/commands/populate_more.py

@@ -238,13 +238,7 @@ class Command(BaseCommand):
         ae = Club.objects.get(id=settings.SITH_MAIN_CLUB_ID)
         other_clubs = random.sample(list(Club.objects.all()), k=3)
         groups = list(
-            Group.objects.filter(
-                id__in=[
-                    settings.SITH_GROUP_SUBSCRIBERS_ID,
-                    settings.SITH_GROUP_OLD_SUBSCRIBERS_ID,
-                    settings.SITH_GROUP_PUBLIC_ID,
-                ]
-            )
+            Group.objects.filter(name__in=["Subscribers", "Old subscribers", "Public"])
         )
         counters = list(
             Counter.objects.filter(name__in=["Foyer", "MDE", "La Gommette", "Eboutic"])

core/static/bundled/user/family-graph-index.js

@@ -0,0 +1,274 @@
+import { History, initialUrlParams, updateQueryString } from "#core:utils/history";
+import cytoscape from "cytoscape";
+import cxtmenu from "cytoscape-cxtmenu";
+import klay from "cytoscape-klay";
+import { familyGetFamilyGraph } from "#openapi";
+
+cytoscape.use(klay);
+cytoscape.use(cxtmenu);
+
+async function getGraphData(userId, godfathersDepth, godchildrenDepth) {
+  const data = (
+    await familyGetFamilyGraph({
+      path: {
+        // biome-ignore lint/style/useNamingConvention: api is snake_case
+        user_id: userId,
+      },
+      query: {
+        // biome-ignore lint/style/useNamingConvention: api is snake_case
+        godfathers_depth: godfathersDepth,
+        // biome-ignore lint/style/useNamingConvention: api is snake_case
+        godchildren_depth: godchildrenDepth,
+      },
+    })
+  ).data;
+  return [
+    ...data.users.map((user) => {
+      return { data: user };
+    }),
+    ...data.relationships.map((rel) => {
+      return {
+        data: { source: rel.godfather, target: rel.godchild },
+      };
+    }),
+  ];
+}
+
+function createGraph(container, data, activeUserId) {
+  const cy = cytoscape({
+    boxSelectionEnabled: false,
+    autounselectify: true,
+
+    container,
+    elements: data,
+    minZoom: 0.5,
+
+    style: [
+      // the stylesheet for the graph
+      {
+        selector: "node",
+        style: {
+          label: "data(display_name)",
+          "background-image": "data(profile_pict)",
+          width: "100%",
+          height: "100%",
+          "background-fit": "cover",
+          "background-repeat": "no-repeat",
+          shape: "ellipse",
+        },
+      },
+
+      {
+        selector: "edge",
+        style: {
+          width: 5,
+          "line-color": "#ccc",
+          "target-arrow-color": "#ccc",
+          "target-arrow-shape": "triangle",
+          "curve-style": "bezier",
+        },
+      },
+
+      {
+        selector: ".traversed",
+        style: {
+          "border-width": "5px",
+          "border-style": "solid",
+          "border-color": "red",
+          "target-arrow-color": "red",
+          "line-color": "red",
+        },
+      },
+
+      {
+        selector: ".not-traversed",
+        style: {
+          "line-opacity": "0.5",
+          "background-opacity": "0.5",
+          "background-image-opacity": "0.5",
+        },
+      },
+    ],
+    layout: {
+      name: "klay",
+      nodeDimensionsIncludeLabels: true,
+      fit: true,
+      klay: {
+        addUnnecessaryBendpoints: true,
+        direction: "DOWN",
+        nodePlacement: "INTERACTIVE",
+        layoutHierarchy: true,
+      },
+    },
+  });
+  const activeUser = cy.getElementById(activeUserId).style("shape", "rectangle");
+  /* Reset graph */
+  const resetGraph = () => {
+    cy.elements((element) => {
+      if (element.hasClass("traversed")) {
+        element.removeClass("traversed");
+      }
+      if (element.hasClass("not-traversed")) {
+        element.removeClass("not-traversed");
+      }
+    });
+  };
+
+  const onNodeTap = (el) => {
+    resetGraph();
+    /* Create path on graph if selected isn't the targeted user */
+    if (el === activeUser) {
+      return;
+    }
+    cy.elements((element) => {
+      element.addClass("not-traversed");
+    });
+
+    for (const traversed of cy.elements().aStar({
+      root: el,
+      goal: activeUser,
+    }).path) {
+      traversed.removeClass("not-traversed");
+      traversed.addClass("traversed");
+    }
+  };
+
+  cy.on("tap", "node", (tapped) => {
+    onNodeTap(tapped.target);
+  });
+  cy.zoomingEnabled(false);
+
+  /* Add context menu */
+  cy.cxtmenu({
+    selector: "node",
+
+    commands: [
+      {
+        content: '<i class="fa fa-external-link fa-2x"></i>',
+        select: (el) => {
+          window.open(el.data().profile_url, "_blank").focus();
+        },
+      },
+
+      {
+        content: '<span class="fa fa-mouse-pointer fa-2x"></span>',
+        select: (el) => {
+          onNodeTap(el);
+        },
+      },
+
+      {
+        content: '<i class="fa fa-eraser fa-2x"></i>',
+        select: (_) => {
+          resetGraph();
+        },
+      },
+    ],
+  });
+
+  return cy;
+}
+
+/**
+ * @typedef FamilyGraphConfig
+ * @property {number} activeUser Id of the user to fetch the tree from
+ * @property {number} depthMin Minimum tree depth for godfathers and godchildren
+ * @property {number} depthMax Maximum tree depth for godfathers and godchildren
+ **/
+
+/**
+ * Create a family graph of an user
+ * @param {FamilyGraphConfig} config
+ **/
+window.loadFamilyGraph = (config) => {
+  document.addEventListener("alpine:init", () => {
+    const defaultDepth = 2;
+
+    function getInitialDepth(prop) {
+      const value = Number.parseInt(initialUrlParams.get(prop));
+      if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
+        return defaultDepth;
+      }
+      return value;
+    }
+
+    Alpine.data("graph", () => ({
+      loading: false,
+      godfathersDepth: getInitialDepth("godfathersDepth"),
+      godchildrenDepth: getInitialDepth("godchildrenDepth"),
+      reverse: initialUrlParams.get("reverse")?.toLowerCase?.() === "true",
+      graph: undefined,
+      graphData: {},
+
+      async init() {
+        const delayedFetch = Alpine.debounce(async () => {
+          await this.fetchGraphData();
+        }, 100);
+        for (const param of ["godfathersDepth", "godchildrenDepth"]) {
+          this.$watch(param, async (value) => {
+            if (value < config.depthMin || value > config.depthMax) {
+              return;
+            }
+            updateQueryString(param, value, History.Replace);
+            await delayedFetch();
+          });
+        }
+        this.$watch("reverse", async (value) => {
+          updateQueryString("reverse", value, History.Replace);
+          await this.reverseGraph();
+        });
+        this.$watch("graphData", async () => {
+          this.generateGraph();
+          if (this.reverse) {
+            await this.reverseGraph();
+          }
+        });
+        await this.fetchGraphData();
+      },
+
+      screenshot() {
+        const link = document.createElement("a");
+        link.href = this.graph.jpg();
+        link.download = interpolate(
+          gettext("family_tree.%(extension)s"),
+          { extension: "jpg" },
+          true,
+        );
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      },
+
+      reset() {
+        this.reverse = false;
+        this.godfathersDepth = defaultDepth;
+        this.godchildrenDepth = defaultDepth;
+      },
+
+      async reverseGraph() {
+        this.graph.elements((el) => {
+          el.position({ x: -el.position().x, y: -el.position().y });
+        });
+        this.graph.center(this.graph.elements());
+      },
+
+      async fetchGraphData() {
+        this.graphData = await getGraphData(
+          config.activeUser,
+          this.godfathersDepth,
+          this.godchildrenDepth,
+        );
+      },
+
+      generateGraph() {
+        this.loading = true;
+        this.graph = createGraph(
+          $(this.$refs.graph),
+          this.graphData,
+          config.activeUser,
+        );
+        this.loading = false;
+      },
+    }));
+  });
+};

core/static/bundled/user/family-graph-index.ts

@@ -1,287 +0,0 @@
-import { History, initialUrlParams, updateQueryString } from "#core:utils/history";
-import cytoscape, {
-  type ElementDefinition,
-  type NodeSingular,
-  type Singular,
-} from "cytoscape";
-import cxtmenu from "cytoscape-cxtmenu";
-import klay, { type KlayLayoutOptions } from "cytoscape-klay";
-import { type UserProfileSchema, familyGetFamilyGraph } from "#openapi";
-
-cytoscape.use(klay);
-cytoscape.use(cxtmenu);
-
-type GraphData = (
-  | { data: UserProfileSchema }
-  | { data: { source: number; target: number } }
-)[];
-
-function isMobile() {
-  return window.innerWidth < 500;
-}
-
-async function getGraphData(
-  userId: number,
-  godfathersDepth: number,
-  godchildrenDepth: number,
-): Promise<GraphData> {
-  const data = (
-    await familyGetFamilyGraph({
-      path: {
-        // biome-ignore lint/style/useNamingConvention: api is snake_case
-        user_id: userId,
-      },
-      query: {
-        // biome-ignore lint/style/useNamingConvention: api is snake_case
-        godfathers_depth: godfathersDepth,
-        // biome-ignore lint/style/useNamingConvention: api is snake_case
-        godchildren_depth: godchildrenDepth,
-      },
-    })
-  ).data;
-  return [
-    ...data.users.map((user) => {
-      return { data: user };
-    }),
-    ...data.relationships.map((rel) => {
-      return {
-        data: { source: rel.godfather, target: rel.godchild },
-      };
-    }),
-  ];
-}
-
-function createGraph(container: HTMLDivElement, data: GraphData, activeUserId: number) {
-  const cy = cytoscape({
-    boxSelectionEnabled: false,
-    autounselectify: true,
-
-    container,
-    elements: data as ElementDefinition[],
-    minZoom: 0.5,
-
-    style: [
-      // the stylesheet for the graph
-      {
-        selector: "node",
-        style: {
-          label: "data(display_name)",
-          "background-image": "data(profile_pict)",
-          width: "100%",
-          height: "100%",
-          "background-fit": "cover",
-          "background-repeat": "no-repeat",
-          shape: "ellipse",
-        },
-      },
-
-      {
-        selector: "edge",
-        style: {
-          width: 5,
-          "line-color": "#ccc",
-          "target-arrow-color": "#ccc",
-          "target-arrow-shape": "triangle",
-          "curve-style": "bezier",
-        },
-      },
-
-      {
-        selector: ".traversed",
-        style: {
-          "border-width": "5px",
-          "border-style": "solid",
-          "border-color": "red",
-          "target-arrow-color": "red",
-          "line-color": "red",
-        },
-      },
-
-      {
-        selector: ".not-traversed",
-        style: {
-          "line-opacity": 0.5,
-          "background-opacity": 0.5,
-          "background-image-opacity": 0.5,
-        },
-      },
-    ],
-    layout: {
-      name: "klay",
-      nodeDimensionsIncludeLabels: true,
-      fit: true,
-      klay: {
-        addUnnecessaryBendpoints: true,
-        direction: "DOWN",
-        nodePlacement: "INTERACTIVE",
-        layoutHierarchy: true,
-      },
-    } as KlayLayoutOptions,
-  });
-  const activeUser = cy
-    .getElementById(activeUserId.toString())
-    .style("shape", "rectangle");
-  /* Reset graph */
-  const resetGraph = () => {
-    cy.elements().removeClass("traversed not-traversed");
-  };
-
-  const onNodeTap = (el: Singular) => {
-    resetGraph();
-    /* Create path on graph if selected isn't the targeted user */
-    if (el === activeUser) {
-      return;
-    }
-    cy.elements().addClass("not-traversed");
-
-    for (const traversed of cy.elements().aStar({
-      root: el,
-      goal: activeUser,
-    }).path) {
-      traversed.removeClass("not-traversed");
-      traversed.addClass("traversed");
-    }
-  };
-
-  cy.on("tap", "node", (tapped) => {
-    onNodeTap(tapped.target);
-  });
-
-  /* Add context menu */
-  cy.cxtmenu({
-    selector: "node",
-
-    commands: [
-      {
-        content: '<i class="fa fa-external-link fa-2x"></i>',
-        select: (el) => {
-          window.open(el.data().profile_url, "_blank").focus();
-        },
-      },
-
-      {
-        content: '<span class="fa fa-mouse-pointer fa-2x"></span>',
-        select: (el) => {
-          onNodeTap(el);
-        },
-      },
-
-      {
-        content: '<i class="fa fa-eraser fa-2x"></i>',
-        select: (_) => {
-          resetGraph();
-        },
-      },
-    ],
-  });
-
-  return cy;
-}
-
-interface FamilyGraphConfig {
-  /**Id of the user to fetch the tree from*/
-  activeUser: number;
-  /**Minimum tree depth for godfathers and godchildren*/
-  depthMin: number;
-  /**Maximum tree depth for godfathers and godchildren*/
-  depthMax: number;
-}
-
-document.addEventListener("alpine:init", () => {
-  const defaultDepth = 2;
-
-  Alpine.data("graph", (config: FamilyGraphConfig) => ({
-    loading: false,
-    godfathersDepth: 0,
-    godchildrenDepth: 0,
-    reverse: initialUrlParams.get("reverse")?.toLowerCase?.() === "true",
-    graph: undefined as cytoscape.Core,
-    graphData: {},
-    isZoomEnabled: !isMobile(),
-
-    getInitialDepth(prop: string) {
-      const value = Number.parseInt(initialUrlParams.get(prop));
-      if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
-        return defaultDepth;
-      }
-      return value;
-    },
-
-    async init() {
-      this.godfathersDepth = this.getInitialDepth("godfathersDepth");
-      this.godchildrenDepth = this.getInitialDepth("godchildrenDepth");
-
-      const delayedFetch = Alpine.debounce(async () => {
-        await this.fetchGraphData();
-      }, 100);
-      for (const param of ["godfathersDepth", "godchildrenDepth"]) {
-        this.$watch(param, async (value: number) => {
-          if (value < config.depthMin || value > config.depthMax) {
-            return;
-          }
-          updateQueryString(param, value.toString(), History.Replace);
-          await delayedFetch();
-        });
-      }
-      this.$watch("reverse", async (value: number) => {
-        updateQueryString("reverse", value.toString(), History.Replace);
-        await this.reverseGraph();
-      });
-      this.$watch("graphData", async () => {
-        this.generateGraph();
-        if (this.reverse) {
-          await this.reverseGraph();
-        }
-      });
-      this.$watch("isZoomEnabled", () => {
-        this.graph.userZoomingEnabled(this.isZoomEnabled);
-      });
-      await this.fetchGraphData();
-    },
-
-    screenshot() {
-      const link = document.createElement("a");
-      link.href = this.graph.jpg();
-      link.download = interpolate(
-        gettext("family_tree.%(extension)s"),
-        { extension: "jpg" },
-        true,
-      );
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-
-    reset() {
-      this.reverse = false;
-      this.godfathersDepth = defaultDepth;
-      this.godchildrenDepth = defaultDepth;
-    },
-
-    async reverseGraph() {
-      this.graph.elements((el: NodeSingular) => {
-        el.position({ x: -el.position().x, y: -el.position().y });
-      });
-      this.graph.center(this.graph.elements());
-    },
-
-    async fetchGraphData() {
-      this.graphData = await getGraphData(
-        config.activeUser,
-        this.godfathersDepth,
-        this.godchildrenDepth,
-      );
-    },
-
-    generateGraph() {
-      this.loading = true;
-      this.graph = createGraph(
-        this.$refs.graph as HTMLDivElement,
-        this.graphData,
-        config.activeUser,
-      );
-      this.graph.userZoomingEnabled(this.isZoomEnabled);
-      this.loading = false;
-    },
-  }));
-});

core/static/bundled/utils/alert-message.ts

@@ -1,38 +0,0 @@
-interface AlertParams {
-  success?: boolean;
-  duration?: number;
-}
-
-export class AlertMessage {
-  public open: boolean;
-  public success: boolean;
-  public content: string;
-  private timeoutId?: number;
-  private readonly defaultDuration: number;
-
-  constructor(params?: { defaultDuration: number }) {
-    this.open = false;
-    this.content = "";
-    this.timeoutId = null;
-    this.defaultDuration = params?.defaultDuration ?? 2000;
-  }
-
-  public display(message: string, params: AlertParams) {
-    this.clear();
-    this.open = true;
-    this.content = message;
-    this.success = params.success ?? true;
-    this.timeoutId = setTimeout(() => {
-      this.open = false;
-      this.timeoutId = null;
-    }, params.duration ?? this.defaultDuration);
-  }
-
-  public clear() {
-    if (this.timeoutId !== null) {
-      clearTimeout(this.timeoutId);
-      this.timeoutId = null;
-    }
-    this.open = false;
-  }
-}

core/static/bundled/utils/api.ts

@@ -1,5 +1,5 @@
-import type { Client, RequestResult, TDataShape } from "#openapi:client";
-import { type Options, client } from "#openapi";
+import type { Client, Options, RequestResult, TDataShape } from "@hey-api/client-fetch";
+import { client } from "#openapi";
 
 export interface PaginatedResponse<T> {
   count: number;

core/static/core/footer.scss

@@ -1,89 +0,0 @@
-@import "colors";
-@import "devices";
-
-footer.bottom-links {
-  @media (max-width: $small-devices) {
-    margin-top: 0.6em;
-    padding: 1.25em;
-    background-color: $primary-neutral-dark-color;
-
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    gap: 1.25em;
-
-    >section {
-
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: center;
-      gap: 0.8em;
-
-    }
-
-    a {
-      color: $white-color;
-      width: auto;
-
-      &:hover {
-        color: $white-color;
-        text-shadow: 0.5px 0.5px 0.5px $shadow-color;
-      }
-    }
-
-    .fa-github {
-      color: $white-color;
-    }
-
-    hr {
-      width: 100%;
-      height: 0px;
-      border: none;
-      border-top: 0.5px solid $white-color;
-    }
-  }
-
-  @media (min-width: $small-devices) {
-    width: 90%;
-    margin: 2em auto;
-
-    font-size: 90%;
-    text-align: center;
-    vertical-align: middle;
-
-    section:first-of-type {
-      margin: 0.6em 0;
-      color: $white-color;
-      border-radius: 5px;
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      background-color: $primary-neutral-dark-color;
-      box-shadow: $shadow-color 0 0 15px;
-
-      a {
-        color: $white-color;
-        width: auto;
-        padding: 0.8em;
-        flex: 1;
-        font-weight: bold;
-
-        &:hover {
-          color: $white-color;
-          text-shadow: 0.5px 0.5px 0.5px $shadow-color;
-        }
-      }
-    }
-
-    .fa-github {
-      color: $githubblack;
-    }
-
-    hr {
-      border: none;
-      height: 5px;
-    }
-  }
-}

core/static/core/style.scss

@@ -713,6 +713,47 @@ textarea {
   margin-top: 10px;
 }
 
+/*--------------------------------FOOTER-------------------------------*/
+
+footer {
+  width: 90%;
+  margin: 2em auto;
+
+  font-size: 90%;
+  text-align: center;
+  vertical-align: middle;
+
+  div {
+    margin: 0.6em 0;
+    color: $white-color;
+    border-radius: 5px;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    background-color: $primary-neutral-dark-color;
+    box-shadow: $shadow-color 0 0 15px;
+
+    a {
+      padding: 0.8em;
+      flex: 1;
+      font-weight: bold;
+      color: $white-color !important;
+
+      &:hover {
+        color: $primary-dark-color;
+      }
+    }
+  }
+
+  >.version {
+    margin-top: 3px;
+    color: rgba(0, 0, 0, 0.3);
+  }
+
+  .fa-github {
+    color: $githubblack;
+  }
+}
 
 
 .ui-dialog .ui-dialog-buttonpane {

core/static/user/user_godfathers.scss

@@ -4,12 +4,6 @@
   display: block;
 }
 
-.zoom-control {
-  margin-right: 10px;
-  display: flex;
-  justify-content: right;
-}
-
 .graph-toolbar {
   margin-top: 10px;
   margin-bottom: 10px;
@@ -18,7 +12,7 @@
   justify-content: space-around;
   gap: 30px;
 
-  .toolbar-column {
+  .toolbar-column{
     display: flex;
     flex-direction: column;
     gap: 20px;
@@ -40,38 +34,31 @@
 
     .depth-choice {
       white-space: nowrap;
-
       input[type="number"] {
         -webkit-appearance: textfield;
         -moz-appearance: textfield;
         appearance: textfield;
-
         &::-webkit-inner-spin-button,
         &::-webkit-outer-spin-button {
           -webkit-appearance: none;
         }
       }
-
       button {
         background: none;
-
-        &>.fa {
+        & > .fa {
           border-radius: 50%;
           font-size: 12px;
           padding: 5px;
         }
-
-        &:enabled>.fa {
+        &:enabled > .fa {
           background-color: #354a5f;
           color: white;
         }
-
-        &:enabled:hover>.fa {
+        &:enabled:hover > .fa {
           color: white;
           background-color: #35405f; // just a bit darker
         }
-
-        &:disabled>.fa {
+        &:disabled > .fa {
           background-color: gray;
           color: white;
         }
@@ -87,7 +74,6 @@
   @media screen and (max-width: 500px) {
     flex-direction: column;
     gap: 20px;
-
     .toolbar-column {
       min-width: 100%;
     }
@@ -101,16 +87,14 @@
   padding: 10px;
   box-sizing: border-box;
 
-  >form {
+  > form {
     margin: 0;
   }
 }
-
 #family-tree-link {
   display: inline-block;
   margin-top: 10px;
   text-align: center;
-
   @media (min-width: 450px) {
     margin-right: auto;
   }
@@ -138,10 +122,10 @@
     width: 100%;
   }
 
-  >div.mini_profile_link {
+  > div.mini_profile_link {
     position: relative;
 
-    >a {
+    > a {
       &.mini_profile_link {
         display: flex;
         flex-direction: column;
@@ -156,7 +140,7 @@
           max-height: 65px;
         }
 
-        >span {
+        > span {
           height: 150px;
           width: 100%;
 
@@ -165,7 +149,7 @@
             width: 80px;
           }
 
-          >img {
+          > img {
             width: 100%;
             max-width: 100%;
             max-height: 100%;
@@ -179,7 +163,7 @@
           }
         }
 
-        >em {
+        > em {
           box-sizing: border-box;
           padding: 0 5px;
           text-align: center;
@@ -211,7 +195,7 @@
     }
   }
 
-  >a.mini_profile_link {
+  > a.mini_profile_link {
     display: none;
   }
 }

core/templates/core/base.jinja

@@ -11,7 +11,6 @@
       <link rel="stylesheet" href="{{ static('core/markdown.scss') }}">
       <link rel="stylesheet" href="{{ static('core/header.scss') }}">
       <link rel="stylesheet" href="{{ static('core/navbar.scss') }}">
-      <link rel="stylesheet" href="{{ static('core/footer.scss') }}">
       <link rel="stylesheet" href="{{ static('core/pagination.scss') }}">
       <link rel="stylesheet" href="{{ static('core/accordion.scss') }}">
 
@@ -90,9 +89,22 @@
       </div>
     </div>
 
-    {% block footer %}
-      {% include "core/base/footer.jinja" %}
-    {% endblock %}
+    <footer>
+      {% block footer %}
+        <div>
+          <a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a>
+          <a href="{{ url('core:page', 'legals') }}">{% trans %}Legal notices{% endtrans %}</a>
+          <a href="{{ url('core:page', 'copyright_agent') }}">{% trans %}Intellectual property{% endtrans %}</a>
+          <a href="{{ url('core:page', 'docs') }}">{% trans %}Help & Documentation{% endtrans %}</a>
+          <a href="{{ url('core:page', 'rd') }}">{% trans %}R&D{% endtrans %}</a>
+        </div>
+        <a rel="nofollow" href="https://github.com/ae-utbm/sith" target="#">
+          <i class="fa-brands fa-github"></i>
+          {% trans %}Site created by the IT Department of the AE{% endtrans %}
+        </a>
+      {% endblock %}
+      <br>
+    </footer>
 
     {% block script %}
       <script>

core/templates/core/base/footer.jinja

@@ -1,16 +0,0 @@
-<footer class="bottom-links">
-  <section>
-    <a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a>
-    <a href="{{ url('core:page', 'legals') }}">{% trans %}Legal notices{% endtrans %}</a>
-    <a href="{{ url('core:page', 'copyright_agent') }}">{% trans %}Intellectual property{% endtrans %}</a>
-    <a href="{{ url('core:page', 'docs') }}">{% trans %}Help & Documentation{% endtrans %}</a>
-    <a href="{{ url('core:page', 'rd') }}">{% trans %}R&D{% endtrans %}</a>
-  </section>
-  <hr>
-  <section>
-    <a rel="nofollow" href="https://github.com/ae-utbm/sith" target="#">
-      <i class="fa-brands fa-github"></i>
-      {% trans %}Site created by the IT Department of the AE{% endtrans %}
-    </a>
-  </section>
-</footer>

core/templates/core/login.jinja

@@ -26,11 +26,9 @@
     {% endif %}
   {% endif %}
 
-  <form method="post" action="{{ url('core:login') }}" id="login-form">
+  <form method="post" action="{{ url('core:login') }}">
     {% if form.errors %}
-      <p class="alert alert-red">
-        {% trans %}Your credentials didn't match. Please try again.{% endtrans %}
-      </p>
+      <p class="alert alert-red">{% trans %}Your username and password didn't match. Please try again.{% endtrans %}</p>
     {% endif %}
 
     {% csrf_token %}

core/templates/core/user_godfathers_tree.jinja

@@ -7,7 +7,7 @@
 {%- endblock -%}
 
 {% block additional_js %}
-  <script type="module" src="{{ static("bundled/user/family-graph-index.ts") }}"></script>
+  <script type="module" src="{{ static("bundled/user/family-graph-index.js") }}"></script>
 {% endblock %}
 
 {% block title %}
@@ -15,14 +15,7 @@
 {% endblock %}
 
 {% block content %}
-  <div
-    x-data="graph({
-            activeUser: {{ object.id }},
-            depthMin: {{ depth_min }},
-            depthMax: {{ depth_max }},
-            })"
-    :aria-busy="loading"
-  >
+  <div x-data="graph" :aria-busy="loading">
     <div class="graph-toolbar">
       <div class="toolbar-column">
         <div class="toolbar-input">
@@ -93,36 +86,17 @@
         </button>
       </div>
     </div>
-
-    <div class="zoom-control" x-ref="zoomControl">
-      <button
-        @click="graph.zoom(graph.zoom() + 1)"
-        :disabled="!isZoomEnabled"
-      >
-        <i class="fa-solid fa-magnifying-glass-plus"></i>
-      </button>
-      <button
-        @click="graph.zoom(graph.zoom() - 1)"
-        :disabled="!isZoomEnabled"
-      >
-        <i class="fa-solid fa-magnifying-glass-minus"></i>
-      </button>
-      <button
-        x-show="isZoomEnabled"
-        @click="isZoomEnabled = false"
-      >
-        <i class="fa-solid fa-unlock"></i>
-      </button>
-      <button
-        x-show="!isZoomEnabled"
-        @click="isZoomEnabled = true"
-      >
-        <i class="fa-solid fa-lock"></i>
-      </button>
-    </div>
-
     <div x-ref="graph" class="graph"></div>
   </div>
 
+  <script>
+    window.addEventListener("DOMContentLoaded", () => {
+      loadFamilyGraph({
+        activeUser: {{ object.id }},
+        depthMin: {{ depth_min }},
+        depthMax: {{ depth_max }},
+      });
+    });
+  </script>
 {% endblock %}
 

core/tests/test_core.py

@@ -38,7 +38,6 @@ from core.markdown import markdown
 from core.models import AnonymousUser, Group, Page, User
 from core.utils import get_semester_code, get_start_of_semester
 from core.views import AllowFragment
-from counter.models import Customer
 from sith import settings
 
 
@@ -152,44 +151,24 @@ class TestUserLogin:
     def user(self) -> User:
         return baker.make(User, password=make_password("plop"))
 
-    @pytest.mark.parametrize(
-        "identifier_getter",
-        [
-            lambda user: user.username,
-            lambda user: user.email,
-            lambda user: Customer.get_or_create(user)[0].account_id,
-        ],
-    )
-    def test_login_fail(self, client, user, identifier_getter):
+    def test_login_fail(self, client, user):
         """Should not login a user correctly."""
-        identifier = identifier_getter(user)
         response = client.post(
             reverse("core:login"),
-            {"username": identifier, "password": "wrong-password"},
+            {"username": user.username, "password": "wrong-password"},
         )
         assert response.status_code == 200
-        assert response.wsgi_request.user.is_anonymous
-        soup = BeautifulSoup(response.text, "lxml")
-        form = soup.find(id="login-form")
         assert (
-            form.find(class_="alert alert-red").get_text(strip=True)
-            == "Vos identifiants ne correspondent pas. Veuillez réessayer."
-        )
-        assert form.find("input", attrs={"name": "username"}).get("value") == identifier
+            '<p class="alert alert-red">Votre nom d\'utilisateur '
+            "et votre mot de passe ne correspondent pas. Merci de réessayer.</p>"
+        ) in response.text
+        assert response.wsgi_request.user.is_anonymous
 
-    @pytest.mark.parametrize(
-        "identifier_getter",
-        [
-            lambda user: user.username,
-            lambda user: user.email,
-            lambda user: Customer.get_or_create(user)[0].account_id,
-        ],
-    )
-    def test_login_success(self, client, user, identifier_getter):
+    def test_login_success(self, client, user):
         """Should login a user correctly."""
         response = client.post(
             reverse("core:login"),
-            {"username": identifier_getter(user), "password": "plop"},
+            {"username": user.username, "password": "plop"},
         )
         assertRedirects(response, reverse("core:index"))
         assert response.wsgi_request.user == user
@@ -382,9 +361,17 @@ class TestUserIsInGroup(TestCase):
 
     @classmethod
     def setUpTestData(cls):
-        cls.public_group = Group.objects.get(id=settings.SITH_GROUP_PUBLIC_ID)
+        cls.root_group = Group.objects.get(name="Root")
+        cls.public_group = Group.objects.get(name="Public")
         cls.public_user = baker.make(User)
+        cls.subscribers = Group.objects.get(name="Subscribers")
+        cls.old_subscribers = Group.objects.get(name="Old subscribers")
+        cls.accounting_admin = Group.objects.get(name="Accounting admin")
+        cls.com_admin = Group.objects.get(name="Communication admin")
+        cls.counter_admin = Group.objects.get(name="Counter admin")
+        cls.sas_admin = Group.objects.get(name="SAS admin")
         cls.club = baker.make(Club)
+        cls.main_club = Club.objects.get(id=1)
 
     def assert_in_public_group(self, user):
         assert user.is_in_group(pk=self.public_group.id)
@@ -392,7 +379,15 @@ class TestUserIsInGroup(TestCase):
 
     def assert_only_in_public_group(self, user):
         self.assert_in_public_group(user)
-        for group in Group.objects.exclude(id=self.public_group.id):
+        for group in (
+            self.root_group,
+            self.accounting_admin,
+            self.sas_admin,
+            self.subscribers,
+            self.old_subscribers,
+            self.club.members_group,
+            self.club.board_group,
+        ):
             assert not user.is_in_group(pk=group.pk)
             assert not user.is_in_group(name=group.name)
 

core/views/forms.py

@@ -132,31 +132,29 @@ class FutureDateTimeField(forms.DateTimeField):
 
 class LoginForm(AuthenticationForm):
     def __init__(self, *arg, **kwargs):
+        if "data" in kwargs:
+            from counter.models import Customer
+
+            data = kwargs["data"].copy()
+            account_code = re.compile(r"^[0-9]+[A-Za-z]$")
+            try:
+                if account_code.match(data["username"]):
+                    user = (
+                        Customer.objects.filter(account_id__iexact=data["username"])
+                        .first()
+                        .user
+                    )
+                elif "@" in data["username"]:
+                    user = User.objects.filter(email__iexact=data["username"]).first()
+                else:
+                    user = User.objects.filter(username=data["username"]).first()
+                data["username"] = user.username
+            except:  # noqa E722 I don't know what error is supposed to be raised here
+                pass
+            kwargs["data"] = data
         super().__init__(*arg, **kwargs)
         self.fields["username"].label = _("Username, email, or account number")
 
-    def clean_username(self):
-        identifier: str = self.cleaned_data["username"]
-        account_code = re.compile(r"^[0-9]+[A-Za-z]$")
-        if account_code.match(identifier):
-            qs_filter = "customer__account_id__iexact"
-        elif identifier.count("@") == 1:
-            qs_filter = "email"
-        else:
-            qs_filter = None
-        if qs_filter:
-            # if the user gave an email or an account code instead of
-            # a username, retrieve and return the corresponding username.
-            # If there is no username, return an empty string, so that
-            # Django will properly handle the error when failing the authentication
-            identifier = (
-                User.objects.filter(**{qs_filter: identifier})
-                .values_list("username", flat=True)
-                .first()
-                or ""
-            )
-        return identifier
-
 
 class RegisteringForm(UserCreationForm):
     error_css_class = "error"

counter/admin.py

@@ -41,7 +41,6 @@ class ProductAdmin(SearchModelAdmin):
         "profit",
         "archived",
     )
-    list_select_related = ("product_type",)
     search_fields = ("name", "code")
 
 
@@ -82,13 +81,20 @@ class AccountDumpAdmin(admin.ModelAdmin):
         "customer",
         "warning_mail_sent_at",
         "warning_mail_error",
-        "dump_operation__date",
+        "dump_operation",
         "amount",
     )
-    list_select_related = ("customer", "customer__user", "dump_operation")
     autocomplete_fields = ("customer", "dump_operation")
     list_filter = ("warning_mail_error",)
 
+    def get_queryset(self, request):
+        # the `amount` property requires to know the customer and the dump_operation
+        return (
+            super()
+            .get_queryset(request)
+            .select_related("customer", "customer__user", "dump_operation")
+        )
+
 
 @admin.register(Counter)
 class CounterAdmin(admin.ModelAdmin):
@@ -107,14 +113,11 @@ class RefillingAdmin(SearchModelAdmin):
         "customer__account_id",
         "counter__name",
     )
-    list_filter = (("counter", admin.RelatedOnlyFieldListFilter),)
-    date_hierarchy = "date"
 
 
 @admin.register(Selling)
 class SellingAdmin(SearchModelAdmin):
     list_display = ("customer", "label", "unit_price", "quantity", "counter", "date")
-    list_select_related = ("customer", "customer__user", "counter")
     search_fields = (
         "customer__user__username",
         "customer__user__first_name",
@@ -123,8 +126,6 @@ class SellingAdmin(SearchModelAdmin):
         "counter__name",
     )
     autocomplete_fields = ("customer", "seller")
-    list_filter = (("counter", admin.RelatedOnlyFieldListFilter),)
-    date_hierarchy = "date"
 
 
 @admin.register(Permanency)

counter/static/bundled/counter/counter-click-index.ts

@@ -1,4 +1,3 @@
-import { AlertMessage } from "#core:utils/alert-message";
 import { BasketItem } from "#counter:counter/basket";
 import type { CounterConfig, ErrorMessage } from "#counter:counter/types";
 import type { CounterProductSelect } from "./components/counter-product-select-index.ts";
@@ -6,9 +5,14 @@ import type { CounterProductSelect } from "./components/counter-product-select-i
 document.addEventListener("alpine:init", () => {
   Alpine.data("counter", (config: CounterConfig) => ({
     basket: {} as Record<string, BasketItem>,
+    errors: [],
     customerBalance: config.customerBalance,
     codeField: null as CounterProductSelect | null,
-    alertMessage: new AlertMessage({ defaultDuration: 2000 }),
+    alertMessage: {
+      content: "",
+      show: false,
+      timeout: null,
+    },
 
     init() {
       // Fill the basket with the initial data
@@ -73,10 +77,22 @@ document.addEventListener("alpine:init", () => {
       return total;
     },
 
+    showAlertMessage(message: string) {
+      if (this.alertMessage.timeout !== null) {
+        clearTimeout(this.alertMessage.timeout);
+      }
+      this.alertMessage.content = message;
+      this.alertMessage.show = true;
+      this.alertMessage.timeout = setTimeout(() => {
+        this.alertMessage.show = false;
+        this.alertMessage.timeout = null;
+      }, 2000);
+    },
+
     addToBasketWithMessage(id: string, quantity: number) {
       const message = this.addToBasket(id, quantity);
       if (message.length > 0) {
-        this.alertMessage.display(message, { success: false });
+        this.showAlertMessage(message);
       }
     },
 
@@ -93,9 +109,7 @@ document.addEventListener("alpine:init", () => {
 
     finish() {
       if (this.getBasketSize() === 0) {
-        this.alertMessage.display(gettext("You can't send an empty basket."), {
-          success: false,
-        });
+        this.showAlertMessage(gettext("You can't send an empty basket."));
         return;
       }
       this.$refs.basketForm.submit();

counter/static/bundled/counter/product-list-index.ts

@@ -167,7 +167,7 @@ document.addEventListener("alpine:init", () => {
       });
       // if products to download are already in-memory, directly take them.
       // If not, fetch them.
-      const products: ProductSchema[] =
+      const products =
         this.nbPages > 1
           ? await paginated(productSearchProductsDetailed, this.getQueryParams())
           : Object.values<ProductSchema[]>(this.products).flat();

counter/static/bundled/counter/product-type-index.ts

@@ -1,11 +1,15 @@
-import { AlertMessage } from "#core:utils/alert-message";
 import Alpine from "alpinejs";
 import { producttypeReorder } from "#openapi";
 
 document.addEventListener("alpine:init", () => {
   Alpine.data("productTypesList", () => ({
     loading: false,
-    alertMessage: new AlertMessage({ defaultDuration: 2000 }),
+    alertMessage: {
+      open: false,
+      success: true,
+      content: "",
+      timeout: null,
+    },
 
     async reorder(itemId: number, newPosition: number) {
       // The sort plugin of Alpine doesn't manage dynamic lists with x-sort
@@ -37,14 +41,23 @@ document.addEventListener("alpine:init", () => {
     },
 
     openAlertMessage(response: Response) {
-      const success = response.ok;
-      const content = response.ok
-        ? gettext("Products types reordered!")
-        : interpolate(
-            gettext("Product type reorganisation failed with status code : %d"),
-            [response.status],
-          );
-      this.alertMessage.display(content, { success: success });
+      if (response.ok) {
+        this.alertMessage.success = true;
+        this.alertMessage.content = gettext("Products types reordered!");
+      } else {
+        this.alertMessage.success = false;
+        this.alertMessage.content = interpolate(
+          gettext("Product type reorganisation failed with status code : %d"),
+          [response.status],
+        );
+      }
+      this.alertMessage.open = true;
+      if (this.alertMessage.timeout !== null) {
+        clearTimeout(this.alertMessage.timeout);
+      }
+      this.alertMessage.timeout = setTimeout(() => {
+        this.alertMessage.open = false;
+      }, 2000);
       this.loading = false;
     },
   }));

counter/static/bundled/counter/types.d.ts

@@ -1,4 +1,4 @@
-export type ErrorMessage = string;
+type ErrorMessage = string;
 
 export interface InitialFormData {
   /* Used to refill the form when the backend raises an error */

counter/tests/test_counter.py

@@ -17,7 +17,6 @@ from datetime import timedelta
 from decimal import Decimal
 
 import pytest
-from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.auth.models import Permission, make_password
 from django.core.cache import cache
@@ -824,53 +823,3 @@ class TestClubCounterClickAccess(TestCase):
         self.client.force_login(self.user)
         res = self.client.get(self.click_url)
         assert res.status_code == 200
-
-
-@pytest.mark.django_db
-class TestCounterLogout:
-    def test_logout_simple(self, client: Client):
-        perm_counter = baker.make(Counter, type="BAR")
-        permanence = baker.make(
-            Permanency,
-            counter=perm_counter,
-            start=now() - timedelta(hours=1),
-            activity=now() - timedelta(minutes=10),
-        )
-        with freeze_time():
-            res = client.post(
-                reverse("counter:logout", kwargs={"counter_id": permanence.counter_id}),
-                data={"user_id": permanence.user_id},
-            )
-            assertRedirects(
-                res,
-                reverse(
-                    "counter:details", kwargs={"counter_id": permanence.counter_id}
-                ),
-            )
-            permanence.refresh_from_db()
-            assert permanence.end == now()
-
-    def test_logout_doesnt_change_old_permanences(self, client: Client):
-        perm_counter = baker.make(Counter, type="BAR")
-        permanence = baker.make(
-            Permanency,
-            counter=perm_counter,
-            start=now() - timedelta(hours=1),
-            activity=now() - timedelta(minutes=10),
-        )
-        old_end = now() - relativedelta(year=10)
-        old_permanence = baker.make(
-            Permanency,
-            counter=perm_counter,
-            end=old_end,
-            activity=now() - relativedelta(year=8),
-        )
-        with freeze_time():
-            client.post(
-                reverse("counter:logout", kwargs={"counter_id": permanence.counter_id}),
-                data={"user_id": permanence.user_id},
-            )
-            permanence.refresh_from_db()
-            assert permanence.end == now()
-            old_permanence.refresh_from_db()
-            assert old_permanence.end == old_end

counter/views/auth.py

@@ -13,10 +13,10 @@
 #
 #
 
+from django.db.models import F
 from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
 from django.utils import timezone
-from django.utils.timezone import now
 from django.views.decorators.http import require_POST
 
 from core.views.forms import LoginForm
@@ -47,7 +47,7 @@ def counter_login(request: HttpRequest, counter_id: int) -> HttpResponseRedirect
 @require_POST
 def counter_logout(request: HttpRequest, counter_id: int) -> HttpResponseRedirect:
     """End the permanency of a user in this counter."""
-    Permanency.objects.filter(
-        counter=counter_id, user=request.POST["user_id"], end=None
-    ).update(end=now())
+    Permanency.objects.filter(counter=counter_id, user=request.POST["user_id"]).update(
+        end=F("activity")
+    )
     return redirect("counter:details", counter_id=counter_id)

galaxy/models.py

@@ -23,20 +23,21 @@
 
 from __future__ import annotations
 
+import itertools
 import logging
 import math
 import time
+from collections import defaultdict
 from typing import NamedTuple, TypedDict
 
 from django.db import models
-from django.db.models import Case, Count, F, Q, Value, When
-from django.db.models.functions import Concat
+from django.db.models import Count, F, Q, QuerySet
 from django.utils.timezone import localdate
 from django.utils.translation import gettext_lazy as _
 
-from club.models import Club
+from club.models import Membership
 from core.models import User
-from sas.models import Picture
+from sas.models import PeoplePictureRelation, Picture
 
 
 class GalaxyStar(models.Model):
@@ -114,18 +115,9 @@ class GalaxyLane(models.Model):
         default=0,
         help_text=_("Distance separating star1 and star2"),
     )
-    family = models.PositiveIntegerField(
-        _("family score"),
-        default=0,
-    )
-    pictures = models.PositiveIntegerField(
-        _("pictures score"),
-        default=0,
-    )
-    clubs = models.PositiveIntegerField(
-        _("clubs score"),
-        default=0,
-    )
+    family = models.PositiveIntegerField(_("family score"), default=0)
+    pictures = models.PositiveIntegerField(_("pictures score"), default=0)
+    clubs = models.PositiveIntegerField(_("clubs score"), default=0)
 
     def __str__(self):
         return f"{self.star1} -> {self.star2} ({self.distance})"
@@ -174,6 +166,7 @@ class Galaxy(models.Model):
     logger = logging.getLogger("main")
 
     GALAXY_SCALE_FACTOR = 2_000
+    DEFAULT_PICTURE_COUNT_THRESHOLD = 10
     FAMILY_LINK_POINTS = 366  # Equivalent to a leap year together in a club, because.
     PICTURE_POINTS = 2  # Equivalent to two days as random members of a club.
     CLUBS_POINTS = 1  # One day together as random members in a club is one point.
@@ -187,15 +180,13 @@ class Galaxy(models.Model):
         stars_count = self.stars.count()
         s = f"GLX-ID{self.pk}-SC{stars_count}-"
         if self.state is None:
-            s += "CHS"  # CHAOS
+            s += "CHAOS"
         else:
-            s += "RLD"  # RULED
+            s += "RULED"
         return s
 
     @classmethod
-    def get_current_galaxy(
-        cls,
-    ) -> Galaxy:  # __future__.annotations is required for this
+    def get_current_galaxy(cls) -> Galaxy:
         return Galaxy.objects.filter(state__isnull=False).last()
 
     ###################
@@ -203,7 +194,18 @@ class Galaxy(models.Model):
     ###################
 
     @classmethod
-    def compute_user_score(cls, user: User) -> int:
+    def get_rulable_users(
+        cls, picture_count_threshold: int = DEFAULT_PICTURE_COUNT_THRESHOLD
+    ) -> QuerySet[User]:
+        return (
+            User.objects.exclude(subscriptions=None)
+            .annotate(pictures_count=Count("pictures"))
+            .filter(pictures_count__gt=picture_count_threshold)
+            .distinct()
+        )
+
+    @classmethod
+    def compute_individual_scores(cls) -> dict[int, int]:
         """Compute an individual score for each citizen.
 
         It will later be used by the graph algorithm to push
@@ -211,87 +213,50 @@ class Galaxy(models.Model):
 
         Idea: This could be added to the computation:
 
-        - Forum posts
         - Picture count
         - Counter consumption
         - Barman time
         - ...
         """
-        user_score = 1
-        user_score += cls.query_user_score(user)
-
+        users = (
+            User.objects.annotate(
+                score=(
+                    Count("godchildren", distinct=True) * cls.FAMILY_LINK_POINTS
+                    + Count("godfathers", distinct=True) * cls.FAMILY_LINK_POINTS
+                    + Count("pictures", distinct=True) * cls.PICTURE_POINTS
+                    + Count("memberships", distinct=True) * cls.CLUBS_POINTS
+                )
+            )
+            .filter(score__gt=0)
+            .values("id", "score")
+        )
         # TODO:
         # Scale that value with some magic number to accommodate to typical data
         # Really active galaxy citizen after 5 years typically have a score of about XXX
         # Citizen that were seen regularly without taking much part in organizations typically have a score of about XXX
         # Citizen that only went to a few events typically score about XXX
-        user_score = int(math.log2(user_score))
-
-        return user_score
-
-    @classmethod
-    def query_user_score(cls, user: User) -> int:
-        """Get the individual score of the given user in the galaxy."""
-        score_query = (
-            User.objects.filter(id=user.id)
-            .annotate(
-                godchildren_count=Count("godchildren", distinct=True)
-                * cls.FAMILY_LINK_POINTS,
-                godfathers_count=Count("godfathers", distinct=True)
-                * cls.FAMILY_LINK_POINTS,
-                pictures_score=Count("pictures", distinct=True) * cls.PICTURE_POINTS,
-                clubs_score=Count("memberships", distinct=True) * cls.CLUBS_POINTS,
-            )
-            .aggregate(
-                score=models.Sum(
-                    F("godchildren_count")
-                    + F("godfathers_count")
-                    + F("pictures_score")
-                    + F("clubs_score")
-                )
-            )
-        )
-        return score_query.get("score")
+        res = {u["id"]: int(math.log2(u["score"] + 1)) for u in users}
+        return res
 
     ####################
     # Inter-user score #
     ####################
 
     @classmethod
-    def compute_users_score(cls, user1: User, user2: User) -> RelationScore:
-        """Compute the relationship scores of the two given users.
-
-        The computation is done with the following fields :
-
-        - family: if they have some godfather/godchild relation
-        - pictures: in how many pictures are both tagged
-        - clubs: during how many days they were members of the same clubs
-        """
-        family = cls.compute_users_family_score(user1, user2)
-        pictures = cls.compute_users_pictures_score(user1, user2)
-        clubs = cls.compute_users_clubs_score(user1, user2)
-        return RelationScore(family=family, pictures=pictures, clubs=clubs)
-
-    @classmethod
-    def compute_users_family_score(cls, user1: User, user2: User) -> int:
+    def compute_user_family_score(cls, user: User) -> defaultdict[int, int]:
         """Compute the family score of the relation between the given users.
 
         This takes into account mutual godfathers.
-
-        Returns:
-             366 if user1 is the godfather of user2 (or vice versa) else 0
         """
-        link_count = User.objects.filter(
-            Q(id=user1.id, godfathers=user2) | Q(id=user2.id, godfathers=user1)
-        ).count()
-        if link_count > 0:
-            cls.logger.debug(
-                f"\t\t- '{user1}' and '{user2}' have {link_count} direct family link"
-            )
-        return link_count * cls.FAMILY_LINK_POINTS
+        godchildren = User.objects.filter(godchildren=user).values_list("id", flat=True)
+        godfathers = User.objects.filter(godfathers=user).values_list("id", flat=True)
+        result = defaultdict(int)
+        for parent in itertools.chain(godchildren, godfathers):
+            result[parent] += cls.FAMILY_LINK_POINTS
+        return result
 
     @classmethod
-    def compute_users_pictures_score(cls, user1: User, user2: User) -> int:
+    def compute_user_pictures_score(cls, user: User) -> defaultdict[int, int]:
         """Compute the pictures score of the relation between the given users.
 
         The pictures score is obtained by counting the number
@@ -301,19 +266,19 @@ class Galaxy(models.Model):
         Returns:
              The number of pictures both users have in common, times 2
         """
-        picture_count = (
-            Picture.objects.filter(people__user__in=(user1,))
-            .filter(people__user__in=(user2,))
-            .count()
-        )
-        if picture_count:
-            cls.logger.debug(
-                f"\t\t- '{user1}' was pictured with '{user2}' {picture_count} times"
+        common_photos = (
+            PeoplePictureRelation.objects.filter(
+                picture__in=Picture.objects.filter(people__user=user)
             )
-        return picture_count * cls.PICTURE_POINTS
+            .values("user")
+            .annotate(count=Count("user"))
+        )
+        return defaultdict(
+            int, {p["user"]: p["count"] * cls.PICTURE_POINTS for p in common_photos}
+        )
 
     @classmethod
-    def compute_users_clubs_score(cls, user1: User, user2: User) -> int:
+    def compute_user_clubs_score(cls, user: User) -> defaultdict[int, int]:
         """Compute the clubs score of the relation between the given users.
 
         The club score is obtained by counting the number of days
@@ -324,54 +289,36 @@ class Galaxy(models.Model):
         (two years) and user2 was a member of the same club from 01/01/2021 to
         31/12/2022 (also two years, but with an offset of one year), then their
         club score is 365.
-
-        Returns:
-            the number of days during which both users were in the same club
         """
-        common_clubs = Club.objects.filter(members__in=user1.memberships.all()).filter(
-            members__in=user2.memberships.all()
-        )
-        user1_memberships = user1.memberships.filter(club__in=common_clubs)
-        user2_memberships = user2.memberships.filter(club__in=common_clubs)
-
-        score = 0
-        for user1_membership in user1_memberships:
-            if user1_membership.end_date is None:
-                # user1_membership.save() is not called in this function, hence this is safe
-                user1_membership.end_date = localdate()
-            query = Q(  # start2 <= start1 <= end2
-                start_date__lte=user1_membership.start_date,
-                end_date__gte=user1_membership.start_date,
-            )
-            query |= Q(  # start2 <= start1 <= now
-                start_date__lte=user1_membership.start_date, end_date=None
-            )
-            query |= Q(  # start1 <= start2 <= end2
-                start_date__gte=user1_membership.start_date,
-                start_date__lte=user1_membership.end_date,
-            )
-            for user2_membership in user2_memberships.filter(
-                query, club=user1_membership.club
-            ):
-                if user2_membership.end_date is None:
-                    user2_membership.end_date = localdate()
-                latest_start = max(
-                    user1_membership.start_date, user2_membership.start_date
-                )
-                earliest_end = min(user1_membership.end_date, user2_membership.end_date)
-                cls.logger.debug(
-                    "\t\t- '%s' was with '%s' in %s starting on %s until %s (%s days)"
-                    % (
-                        user1,
-                        user2,
-                        user2_membership.club,
-                        latest_start,
-                        earliest_end,
-                        (earliest_end - latest_start).days,
+        memberships = user.memberships.only("start_date", "end_date", "club_id")
+        result = defaultdict(int)
+        now = localdate()
+        for membership in memberships:
+            # This is a N+1 query, but 92% of galaxy users have less than 10 memberships.
+            # Only 5 users have more than 30 memberships.
+            common_memberships = (
+                Membership.objects.exclude(user=user)
+                .filter(
+                    Q(  # start2 <= start1 <= end2
+                        start_date__lte=membership.start_date,
+                        end_date__gte=membership.start_date,
                     )
+                    | Q(  # start2 <= start1 <= now
+                        start_date__lte=membership.start_date, end_date=None
+                    )
+                    | Q(  # start1 <= start2 <= end2
+                        start_date__gte=membership.start_date,
+                        start_date__lte=membership.end_date or now,
+                    ),
+                    club_id=membership.club_id,
                 )
-                score += cls.CLUBS_POINTS * (earliest_end - latest_start).days
-        return score
+                .only("start_date", "end_date", "user_id")
+            )
+            for other in common_memberships:
+                start = max(membership.start_date, other.start_date)
+                end = min(membership.end_date or now, other.end_date or now)
+                result[other.user_id] += (end - start).days * cls.CLUBS_POINTS
+        return result
 
     ###################
     # Rule the galaxy #
@@ -406,7 +353,9 @@ class Galaxy(models.Model):
         cls.logger.debug(f"\t\t> Scaled distance: {value}")
         return int(value)
 
-    def rule(self, picture_count_threshold=10) -> None:
+    def rule(
+        self, picture_count_threshold: int = DEFAULT_PICTURE_COUNT_THRESHOLD
+    ) -> None:
         """Main function of the Galaxy.
 
         Iterate over all the rulable users to promote them to citizens.
@@ -427,41 +376,30 @@ class Galaxy(models.Model):
         """
         total_time = time.time()
         self.logger.info("Listing rulable citizen.")
-        rulable_users = (
-            User.objects.filter(subscriptions__isnull=False)
-            .annotate(pictures_count=Count("pictures"))
-            .filter(pictures_count__gt=picture_count_threshold)
-            .distinct()
-        )
 
         # force fetch of the whole query to make sure there won't
         # be any more db hits
         # this is memory expensive but prevents a lot of db hits, therefore
         # is far more time efficient
 
-        rulable_users = list(rulable_users)
+        rulable_users = list(self.get_rulable_users(picture_count_threshold))
         rulable_users_count = len(rulable_users)
         user1_count = 0
         self.logger.info(
             f"{rulable_users_count} citizen have been listed. Starting to rule."
         )
 
-        stars = []
         self.logger.info("Creating stars for all citizen")
-        for user in rulable_users:
-            star = GalaxyStar(
-                owner=user, galaxy=self, mass=self.compute_user_score(user)
-            )
-            stars.append(star)
-        GalaxyStar.objects.bulk_create(stars)
-
-        stars = {}
-        for star in GalaxyStar.objects.filter(galaxy=self):
-            stars[star.owner.id] = star
+        individual_scores = self.compute_individual_scores()
+        GalaxyStar.objects.bulk_create(
+            [
+                GalaxyStar(owner=user, galaxy=self, mass=individual_scores[user.id])
+                for user in rulable_users
+            ]
+        )
+        stars = {star.owner_id: star for star in self.stars.all()}
 
         self.logger.info("Creating lanes between stars")
-        # Display current speed every $speed_count_frequency users
-        speed_count_frequency = max(rulable_users_count // 10, 1)  # ten time at most
         global_avg_speed_accumulator = 0
         global_avg_speed_count = 0
         t_global_start = time.time()
@@ -472,20 +410,19 @@ class Galaxy(models.Model):
 
             star1 = stars[user1.id]
 
-            user_avg_speed = 0
-            user_avg_speed_count = 0
-
-            tstart = time.time()
             lanes = []
-            for user2_count, user2 in enumerate(rulable_users, start=1):
-                self.logger.debug("")
-                self.logger.debug(
-                    f"\t> Examining '{user1}' ({user1_count}/{rulable_users_count}) with '{user2}' ({user2_count}/{rulable_users_count2})"
-                )
+            family_scores = self.compute_user_family_score(user1)
+            picture_scores = self.compute_user_pictures_score(user1)
+            club_scores = self.compute_user_clubs_score(user1)
 
+            for user2 in rulable_users:
                 star2 = stars[user2.id]
 
-                score = Galaxy.compute_users_score(user1, user2)
+                score = RelationScore(
+                    family=family_scores.get(user2.id, 0),
+                    pictures=picture_scores.get(user2.id, 0),
+                    clubs=club_scores.get(user2.id, 0),
+                )
                 distance = self.scale_distance(sum(score))
                 if distance < 30:  # TODO: this needs tuning with real-world data
                     lanes.append(
@@ -498,22 +435,8 @@ class Galaxy(models.Model):
                             clubs=score.clubs,
                         )
                     )
-
-                if user2_count % speed_count_frequency == 0:
-                    tend = time.time()
-                    delta = tend - tstart
-                    speed = float(speed_count_frequency) / delta
-                    user_avg_speed += speed
-                    user_avg_speed_count += 1
-                    self.logger.debug(
-                        f"\tSpeed: {speed:.2f} users per second (time for last {speed_count_frequency} citizens: {delta:.2f} second)"
-                    )
-                    tstart = time.time()
-
             GalaxyLane.objects.bulk_create(lanes)
 
-            self.logger.info("")
-
             t_global_end = time.time()
             global_delta = t_global_end - t_global_start
             speed = 1.0 / global_delta
@@ -521,21 +444,19 @@ class Galaxy(models.Model):
             global_avg_speed_count += 1
             global_avg_speed = global_avg_speed_accumulator / global_avg_speed_count
 
-            self.logger.info(f" Ruling of {self} ".center(60, "#"))
-            self.logger.info(
-                f"Progression: {user1_count}/{rulable_users_count} citizen -- {rulable_users_count - user1_count} remaining"
-            )
-            self.logger.info(f"Speed: {60.0 * global_avg_speed:.2f} citizen per minute")
-
-            # We can divide the computed ETA by 2 because each loop, there is one citizen less to check, and maths tell
-            # us that this averages to a division by two
-            eta = rulable_users_count2 / global_avg_speed / 2
-            eta_hours = int(eta // 3600)
-            eta_minutes = int(eta // 60 % 60)
-            self.logger.info(
-                f"ETA: {eta_hours} hours {eta_minutes} minutes ({eta / 3600 / 24:.2f} days)"
-            )
-            self.logger.info("#" * 60)
+            if user1_count % 50 == 0:
+                self.logger.info("")
+                self.logger.info(f" Ruling of {self} ".center(60, "#"))
+                self.logger.info(
+                    f"Progression: {user1_count}/{rulable_users_count} "
+                    f"citizen -- {rulable_users_count - user1_count} remaining"
+                )
+                self.logger.info(f"Speed: {global_avg_speed:.2f} citizen per second")
+                eta = rulable_users_count2 // global_avg_speed
+                self.logger.info(
+                    f"ETA: {int(eta // 60 % 60)} minutes {int(eta % 60)} seconds"
+                )
+                self.logger.info("#" * 60)
             t_global_start = time.time()
 
         # Here, we get the IDs of the old galaxies that we'll need to delete. In normal operation, only one galaxy
@@ -556,11 +477,10 @@ class Galaxy(models.Model):
             Galaxy.objects.filter(pk__in=old_galaxies_pks).delete()
 
         total_time = time.time() - total_time
-        total_time_hours = int(total_time // 3600)
         total_time_minutes = int(total_time // 60 % 60)
         total_time_seconds = int(total_time % 60)
         self.logger.info(
-            f"{self} ruled in {total_time:.2f} seconds ({total_time_hours} hours, {total_time_minutes} minutes, {total_time_seconds} seconds)"
+            f"{self} ruled in {total_time_minutes} minutes, {total_time_seconds} seconds"
         )
 
     def make_state(self) -> None:
@@ -568,59 +488,34 @@ class Galaxy(models.Model):
         self.logger.info(
             "Caching current Galaxy state for a quicker display of the Empire's power."
         )
-
-        without_nickname = Concat(
-            F("owner__first_name"), Value(" "), F("owner__last_name")
-        )
-        with_nickname = Concat(
-            F("owner__first_name"),
-            Value(" "),
-            F("owner__last_name"),
-            Value(" ("),
-            F("owner__nick_name"),
-            Value(")"),
-        )
         stars = (
             GalaxyStar.objects.filter(galaxy=self)
-            .order_by(
-                "owner"
-            )  # This helps determinism for the tests and doesn't cost much
-            .annotate(
-                owner_name=Case(
-                    When(owner__nick_name=None, then=without_nickname),
-                    default=with_nickname,
-                )
-            )
+            .order_by("owner_id")
+            .select_related("owner")
         )
         lanes = (
             GalaxyLane.objects.filter(star1__galaxy=self)
-            .order_by(
-                "star1"
-            )  # This helps determinism for the tests and doesn't cost much
+            .order_by("star1")
             .annotate(
-                star1_owner=F("star1__owner__id"),
-                star2_owner=F("star2__owner__id"),
+                star1_owner=F("star1__owner_id"), star2_owner=F("star2__owner_id")
             )
         )
         json = GalaxyDict(
             nodes=[
                 StarDict(
-                    id=star.owner_id,
-                    name=star.owner_name,
-                    mass=star.mass,
+                    id=star.owner_id, name=star.owner.get_display_name(), mass=star.mass
                 )
                 for star in stars
             ],
-            links=[],
-        )
-        for path in lanes:
-            json["links"].append(
+            links=[
                 {
                     "source": path.star1_owner,
                     "target": path.star2_owner,
                     "value": path.distance,
                 }
-            )
+                for path in lanes
+            ],
+        )
         self.state = json
         self.save()
         self.logger.info(f"{self} is now ready!")

galaxy/tests.py

@@ -33,7 +33,7 @@ from core.models import User
 from galaxy.models import Galaxy
 
 
-@pytest.mark.skip(reason="Galaxy is disabled for now")
+# @pytest.mark.skip(reason="Galaxy is disabled for now")
 class TestGalaxyModel(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -48,15 +48,19 @@ class TestGalaxyModel(TestCase):
 
     def test_user_self_score(self):
         """Test that individual user scores are correct."""
-        with self.assertNumQueries(8):
-            assert Galaxy.compute_user_score(self.root) == 9
-            assert Galaxy.compute_user_score(self.skia) == 10
-            assert Galaxy.compute_user_score(self.sli) == 8
-            assert Galaxy.compute_user_score(self.krophil) == 2
-            assert Galaxy.compute_user_score(self.richard) == 10
-            assert Galaxy.compute_user_score(self.subscriber) == 8
-            assert Galaxy.compute_user_score(self.public) == 8
-            assert Galaxy.compute_user_score(self.com) == 1
+        with self.assertNumQueries(1):
+            scores = Galaxy.compute_individual_scores()
+            expected = {
+                self.root.id: 9,
+                self.skia.id: 10,
+                self.sli.id: 8,
+                self.krophil.id: 2,
+                self.richard.id: 10,
+                self.subscriber.id: 8,
+                self.public.id: 8,
+                self.com.id: 1,
+            }
+            assert scores.items() >= expected.items()
 
     def test_users_score(self):
         """Test on the default dataset generated by the `populate` command
@@ -118,17 +122,23 @@ class TestGalaxyModel(TestCase):
             self.com,
         ]
 
-        with self.assertNumQueries(100):
+        with self.assertNumQueries(44):
             while len(users) > 0:
                 user1 = users.pop(0)
+                family_scores = Galaxy.compute_user_family_score(user1)
+                picture_scores = Galaxy.compute_user_pictures_score(user1)
+                club_scores = Galaxy.compute_user_clubs_score(user1)
                 for user2 in users:
-                    score = Galaxy.compute_users_score(user1, user2)
                     u1 = computed_scores.get(user1.username, {})
                     u1[user2.username] = {
-                        "score": sum(score),
-                        "family": score.family,
-                        "pictures": score.pictures,
-                        "clubs": score.clubs,
+                        "score": (
+                            family_scores[user2.id]
+                            + picture_scores[user2.id]
+                            + club_scores[user2.id]
+                        ),
+                        "family": family_scores[user2.id],
+                        "pictures": picture_scores[user2.id],
+                        "clubs": club_scores[user2.id],
                     }
                     computed_scores[user1.username] = u1
 
@@ -140,12 +150,12 @@ class TestGalaxyModel(TestCase):
         that the number of queries to rule the galaxy is stable.
         """
         galaxy = Galaxy.objects.create()
-        with self.assertNumQueries(58):
+        with self.assertNumQueries(39):
             galaxy.rule(0)  # We want everybody here
 
 
 @pytest.mark.slow
-@pytest.mark.skip(reason="Galaxy is disabled for now")
+# @pytest.mark.skip(reason="Galaxy is disabled for now")
 class TestGalaxyView(TestCase):
     @classmethod
     def setUpTestData(cls):

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-25 16:29+0200\n"
+"POT-Creation-Date: 2025-06-16 14:54+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -2015,8 +2015,10 @@ msgid "Please login or create an account to see this page."
 msgstr "Merci de vous identifier ou de créer un compte pour voir cette page."
 
 #: core/templates/core/login.jinja
-msgid "Your credentials didn't match. Please try again."
-msgstr "Vos identifiants ne correspondent pas. Veuillez réessayer."
+msgid "Your username and password didn't match. Please try again."
+msgstr ""
+"Votre nom d'utilisateur et votre mot de passe ne correspondent pas. Merci de "
+"réessayer."
 
 #: core/templates/core/login.jinja
 msgid "Lost password?"

package-lock.json

@@ -45,11 +45,7 @@
         "@hey-api/openapi-ts": "^0.73.0",
         "@rollup/plugin-inject": "^5.0.5",
         "@types/alpinejs": "^3.13.10",
-        "@types/cytoscape-cxtmenu": "^3.4.4",
-        "@types/cytoscape-klay": "^3.1.4",
         "@types/jquery": "^3.5.31",
-        "@types/js-cookie": "^3.0.6",
-        "typescript": "^5.8.3",
         "vite": "^6.2.5",
         "vite-bundle-visualizer": "^1.2.1",
         "vite-plugin-static-copy": "^3.0.2"
@@ -2823,33 +2819,6 @@
         "@types/tern": "*"
       }
     },
-    "node_modules/@types/cytoscape": {
-      "version": "3.21.9",
-      "resolved": "https://registry.npmjs.org/@types/cytoscape/-/cytoscape-3.21.9.tgz",
-      "integrity": "sha512-JyrG4tllI6jvuISPjHK9j2Xv/LTbnLekLke5otGStjFluIyA9JjgnvgZrSBsp8cEDpiTjwgZUZwpPv8TSBcoLw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/cytoscape-cxtmenu": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/@types/cytoscape-cxtmenu/-/cytoscape-cxtmenu-3.4.4.tgz",
-      "integrity": "sha512-cuv+IdbKekswDRBIrHn97IYOzWS2/UjVr0kDIHCOYvqWy3iZkuGGM4qmHNPQ+63Dn7JgtmD0l3MKW1moyhoaKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/cytoscape": "*"
-      }
-    },
-    "node_modules/@types/cytoscape-klay": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/cytoscape-klay/-/cytoscape-klay-3.1.4.tgz",
-      "integrity": "sha512-H+tIadpcVjmDGWKFUfibwzIpH/kddfwAFsuhPparjiC+bWBm+MeNqIwwY+19ofkJZWcqWqZL6Jp8lkp+sP8Aig==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/cytoscape": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -2866,13 +2835,6 @@
         "@types/sizzle": "*"
       }
     },
-    "node_modules/@types/js-cookie": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-3.0.6.tgz",
-      "integrity": "sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -5596,6 +5558,7 @@
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"

package.json

@@ -10,7 +10,7 @@
     "openapi": "openapi-ts",
     "analyse-dev": "vite-bundle-visualizer --mode development",
     "analyse-prod": "vite-bundle-visualizer --mode production",
-    "check": "tsc && biome check --write"
+    "check": "biome check --write"
   },
   "keywords": [],
   "author": "",
@@ -30,11 +30,7 @@
     "@hey-api/openapi-ts": "^0.73.0",
     "@rollup/plugin-inject": "^5.0.5",
     "@types/alpinejs": "^3.13.10",
-    "@types/cytoscape-cxtmenu": "^3.4.4",
-    "@types/cytoscape-klay": "^3.1.4",
     "@types/jquery": "^3.5.31",
-    "@types/js-cookie": "^3.0.6",
-    "typescript": "^5.8.3",
     "vite": "^6.2.5",
     "vite-bundle-visualizer": "^1.2.1",
     "vite-plugin-static-copy": "^3.0.2"

pyproject.toml

@@ -92,7 +92,7 @@ docs = [
 default-groups = ["dev", "tests", "docs"]
 
 [tool.xapian]
-version = "1.4.29"
+version = "1.4.25"
 
 [tool.ruff]
 output-format = "concise" # makes ruff error logs easier to read

rootplace/tests/test_merge_users.py

@@ -53,9 +53,9 @@ class TestMergeUser(TestCase):
         self.to_keep.address = "Jerusalem"
         self.to_delete.parent_address = "Rome"
         self.to_delete.address = "Rome"
-        subscribers = Group.objects.get(id=settings.SITH_GROUP_SUBSCRIBERS_ID)
+        subscribers = Group.objects.get(name="Subscribers")
         mde_admin = Group.objects.get(name="MDE admin")
-        sas_admin = Group.objects.get(id=settings.SITH_GROUP_SAS_ADMIN_ID)
+        sas_admin = Group.objects.get(name="SAS admin")
         self.to_keep.groups.add(subscribers.id)
         self.to_delete.groups.add(mde_admin.id)
         self.to_keep.groups.add(sas_admin.id)

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

@@ -83,6 +83,7 @@ document.addEventListener("alpine:init", () => {
 
   Alpine.data("pictureUpload", (albumId: number) => ({
     errors: [] as string[],
+    pictures: [],
     sending: false,
     progress: null as HTMLProgressElement,
 

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

@@ -9,35 +9,28 @@ interface PagePictureConfig {
   userId: number;
 }
 
-interface Album {
-  id: number;
-  name: string;
-  pictures: PictureSchema[];
-}
-
 document.addEventListener("alpine:init", () => {
   Alpine.data("user_pictures", (config: PagePictureConfig) => ({
     loading: true,
-    albums: [] as Album[],
+    pictures: [] as PictureSchema[],
+    albums: {} as Record<string, PictureSchema[]>,
 
     async init() {
-      const pictures = await paginated(picturesFetchPictures, {
+      this.pictures = await paginated(picturesFetchPictures, {
         // biome-ignore lint/style/useNamingConvention: from python api
         query: { users_identified: [config.userId] },
       } as PicturesFetchPicturesData);
-      const groupedAlbums = Object.groupBy(pictures, (i: PictureSchema) => i.album.id);
-      this.albums = Object.values(groupedAlbums).map((pictures: PictureSchema[]) => {
-        return {
-          id: pictures[0].album.id,
-          name: pictures[0].album.name,
-          pictures: pictures,
-        };
-      });
-      this.albums.sort((a: Album, b: Album) => b.id - a.id);
-      const hash = document.location.hash.replace("#", "");
-      if (hash.startsWith("album-")) {
-        this.$nextTick(() => document.getElementById(hash)?.scrollIntoView()).then();
-      }
+
+      this.albums = this.pictures.reduce(
+        (acc: Record<number, PictureSchema[]>, picture: PictureSchema) => {
+          if (!acc[picture.album.id]) {
+            acc[picture.album.id] = [];
+          }
+          acc[picture.album.id].push(picture);
+          return acc;
+        },
+        {},
+      );
       this.loading = false;
     },
   }));

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

@@ -1,4 +1,3 @@
-import type { UserAjaxSelect } from "#core:core/components/ajax-select-index";
 import { paginated } from "#core:utils/api";
 import { exportToHtml } from "#core:utils/globals";
 import { History } from "#core:utils/history";
@@ -131,7 +130,7 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
       currentPicture: {
         // biome-ignore lint/style/useNamingConvention: api is in snake_case
         is_moderated: true,
-        id: null as number,
+        id: null,
         name: "",
         // biome-ignore lint/style/useNamingConvention: api is in snake_case
         display_name: "",
@@ -143,7 +142,7 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
         full_size_url: "",
         owner: "",
         date: new Date(),
-        identifications: [] as IdentifiedUserSchema[],
+        identifications: [],
       },
       /**
        * The picture which will be displayed next if the user press the "next" button
@@ -156,7 +155,7 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
       /**
        * The select2 component used to identify users
        **/
-      selector: undefined as UserAjaxSelect,
+      selector: undefined,
       /**
        * Error message when a moderation operation fails
        **/

sas/templates/sas/macros.jinja

@@ -50,7 +50,7 @@
  #}
 {% macro download_button(name) %}
   <div x-data="pictures_download">
-    <div x-show="albums.length > 0" x-cloak>
+    <div x-show="pictures.length > 0" x-cloak>
       <button
         :disabled="isDownloading"
         class="btn btn-blue {% if name == "" %}btn-no-text{% endif %}"

sas/templates/sas/user_pictures.jinja

@@ -20,17 +20,17 @@
       {{ download_button(_("Download all my pictures")) }}
     {% endif %}
 
-    <template x-for="album in albums" x-cloak>
+    <template x-for="[album_id, pictures] in Object.entries(albums)" x-cloak>
       <section>
         <br />
         <div class="row">
-          <h4 x-text="album.name" :id="`album-${album.id}`"></h4>
+          <h4 x-text="pictures[0].album.name" :id="`album-${album_id}`"></h4>
           {% if user.id == object.id %}
             &nbsp;{{ download_button("") }}
           {% endif %}
         </div>
         <div class="photos">
-          <template x-for="picture in album.pictures">
+          <template x-for="picture in pictures">
             <a :href="picture.sas_url">
               <div
                 class="photo"

sith/settings.py

@@ -381,10 +381,10 @@ SITH_GROUP_SAS_ADMIN_ID = env.int("SITH_GROUP_SAS_ADMIN_ID", default=8)
 SITH_GROUP_FORUM_ADMIN_ID = env.int("SITH_GROUP_FORUM_ADMIN_ID", default=9)
 SITH_GROUP_PEDAGOGY_ADMIN_ID = env.int("SITH_GROUP_PEDAGOGY_ADMIN_ID", default=10)
 
-SITH_GROUP_BANNED_ALCOHOL_ID = env.int("SITH_GROUP_BANNED_ALCOHOL_ID", default=12)
-SITH_GROUP_BANNED_COUNTER_ID = env.int("SITH_GROUP_BANNED_COUNTER_ID", default=13)
+SITH_GROUP_BANNED_ALCOHOL_ID = env.int("SITH_GROUP_BANNED_ALCOHOL_ID", default=11)
+SITH_GROUP_BANNED_COUNTER_ID = env.int("SITH_GROUP_BANNED_COUNTER_ID", default=12)
 SITH_GROUP_BANNED_SUBSCRIPTION_ID = env.int(
-    "SITH_GROUP_BANNED_SUBSCRIPTION_ID", default=14
+    "SITH_GROUP_BANNED_SUBSCRIPTION_ID", default=13
 )
 
 SITH_CLUB_REFOUND_ID = env.int("SITH_CLUB_REFOUND_ID", default=89)

tsconfig.json

@@ -4,7 +4,7 @@
     "sourceMap": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "target": "es2024",
+    "target": "es2022",
     "allowJs": true,
     "moduleResolution": "node",
     "experimentalDecorators": true,
@@ -14,7 +14,6 @@
     "types": ["jquery", "alpinejs"],
     "paths": {
       "#openapi": ["./staticfiles/generated/openapi/client/index.ts"],
-      "#openapi:*": ["./staticfiles/generated/openapi/client/*"],
       "#core:*": ["./core/static/bundled/*"],
       "#pedagogy:*": ["./pedagogy/static/bundled/*"],
       "#counter:*": ["./counter/static/bundled/*"],

uv.lock

@@ -1852,7 +1852,7 @@ dev = [
     { name = "ipython", specifier = ">=9.0.2,<10.0.0" },
     { name = "pre-commit", specifier = ">=4.1.0,<5.0.0" },
     { name = "rjsmin", specifier = ">=1.2.4,<2.0.0" },
-    { name = "ruff", specifier = ">=0.11.13,<1.0.0" },
+    { name = "ruff", specifier = ">=0.11.11,<1.0.0" },
 ]
 docs = [
     { name = "mkdocs", specifier = ">=1.6.1,<2.0.0" },