.env_example

@@ -10,6 +10,7 @@ DJANGO_SECRET_KEY=CHANGE_ME
 DJANGO_SETTINGS_MODULE=note_kfet.settings
 CONTACT_EMAIL=tresorerie.bde@localhost
 NOTE_URL=localhost
+DOMAIN=localhost
 
 # Config for mails. Only used in production
 NOTE_MAIL=notekfet@localhost

.gitignore

@@ -42,15 +42,8 @@ map.json
 backups/
 /static/
 /media/
-/tmp/
 
 # Virtualenv
 env/
 venv/
 db.sqlite3
-shell.nix
-
-# ansibles customs host
-ansible/host_vars/*.yaml
-!ansible/host_vars/bde*
-ansible/hosts

.gitlab-ci.yml

@@ -1,16 +1,30 @@
 stages:
   - test
   - quality-assurance
-  - docs
 
 # Also fetch submodules
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
-# Ubuntu 22.04
+# Debian Buster
-py310-django42:
+py37-django22:
   stage: test
-  image: ubuntu:22.04
+  image: debian:buster-backports
+  before_script:
+    - >
+        apt-get update &&
+        apt-get install --no-install-recommends -t buster-backports -y
+        python3-django python3-django-crispy-forms
+        python3-django-extensions python3-django-filters python3-django-polymorphic
+        python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
+        python3-babel python3-lockfile python3-pip python3-phonenumbers
+        python3-bs4 python3-setuptools tox texlive-xetex
+  script: tox -e py37-django22
+
+# Ubuntu 20.04
+py38-django22:
+  stage: test
+  image: ubuntu:20.04
   before_script:
     # Fix tzdata prompt
     - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
@@ -19,46 +33,17 @@ py310-django42:
         apt-get install --no-install-recommends -y
         python3-django python3-django-crispy-forms
         python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
+        python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
+        python3-babel python3-lockfile python3-pip python3-phonenumbers
         python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py310-django42
+  script: tox -e py38-django22
-
-# Debian Bookworm
-py311-django42:
-  stage: test
-  image: debian:bookworm
-  before_script:
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py311-django42
 
 linters:
   stage: quality-assurance
-  image: debian:bookworm
+  image: debian:buster-backports
   before_script:
     - apt-get update && apt-get install -y tox
   script: tox -e linters
 
   # Be nice to new contributors, but please use `tox`
   allow_failure: true
-
-# Compile documentation
-documentation:
-  stage: docs
-  image: sphinxdoc/sphinx
-  before_script:
-    - pip install sphinx-rtd-theme
-    - cd docs
-  script:
-    - make dirhtml
-  artifacts:
-    paths:
-      - docs/_build
-    expire_in: 1 day

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "apps/scripts"]
 	path = apps/scripts
-	url = https://gitlab.crans.org/bde/nk20-scripts
+	url = https://gitlab.crans.org/bde/nk20-scripts.git

Dockerfile

@@ -8,8 +8,8 @@ RUN apt-get update && \
     apt-get install --no-install-recommends -t buster-backports -y \
     python3-django python3-django-crispy-forms \
     python3-django-extensions python3-django-filters python3-django-polymorphic \
-    python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil \
+    python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil \
-    python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache ipython3 \
+    python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
     python3-bs4 python3-setuptools \
     uwsgi uwsgi-plugin-python3 \
     texlive-xetex gettext libjs-bootstrap4 fonts-font-awesome && \

README.md

@@ -1,8 +1,8 @@
 # NoteKfet 2020
 
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.txt)
-[![pipeline status](https://gitlab.crans.org/bde/nk20/badges/main/pipeline.svg)](https://gitlab.crans.org/bde/nk20/commits/main)
+[![pipeline status](https://gitlab.crans.org/bde/nk20/badges/master/pipeline.svg)](https://gitlab.crans.org/bde/nk20/commits/master)
-[![coverage report](https://gitlab.crans.org/bde/nk20/badges/main/coverage.svg)](https://gitlab.crans.org/bde/nk20/commits/main)
+[![coverage report](https://gitlab.crans.org/bde/nk20/badges/master/coverage.svg)](https://gitlab.crans.org/bde/nk20/commits/master)
 
 ## Table des matières
 
@@ -55,7 +55,7 @@ Bien que cela permette de créer une instance sur toutes les distributions,
     (env)$ ./manage.py makemigrations
     (env)$ ./manage.py migrate
     (env)$ ./manage.py loaddata initial
-    (env)$ ./manage.py createsuperuser  # Création d'un⋅e utilisateur⋅rice initial
+    (env)$ ./manage.py createsuperuser  # Création d'un utilisateur initial
     ```
 
 6.  Enjoy :
@@ -69,31 +69,13 @@ accessible depuis l'ensemble de votre réseau, pratique pour tester le rendu
 de la note sur un téléphone !
 
 ## Installation d'une instance de production
-Pour déployer facilement la note il est possible d'utiliser le playbook Ansible (sinon vous pouvez toujours le faire a la main, voir plus bas).
-### Avec ansible
-Il vous faudra un serveur sous debian ou ubuntu connecté à internet et que vous souhaiterez accéder à cette instance de la note sur `note.nomdedomaine.tld`.
-
-0. Installer Ansible sur votre machine personnelle.
-
-0. (bis) cloner le dépot sur votre machine personelle.
-
-1.  Copier le fichier `ansible/host_example`
-``` bash
-$ cp ansible/hosts_example ansible/hosts
-```
-et ajouter sous [dev] et/ou [prod] les serveurs sur lesquels vous souhaitez installer la note.
-2.  Créer un fichier `ansible/host_vars/<note.nomdedomaine.tld.yaml>` sur le modèle des fichiers existants dans `ansible/hosts` et compléter les variables nécessaires.
-
-3. lancer `ansible/base.yaml -l <nomdedomaine.tld.yaml>`
-4. Aller vous faire un café, ca peux durer un moment.
-
-### Installation manuelle
 
 **En production on souhaite absolument utiliser les modules Python packagées dans le gestionnaire de paquet.**
 Cela permet de mettre à jour facilement les dépendances critiques telles que Django.
 
 L'installation d'une instance de production néccessite **une installation de Debian Buster ou d'Ubuntu 20.04**.
 
+Pour aller vite vous pouvez lancer le Playbook Ansible fournit dans ce dépôt en l'adaptant.
 Sinon vous pouvez suivre les étapes décrites ci-dessous.
 
 0.  Sous Debian Buster, **activer Debian Backports.** En effet Django 2.2 LTS n'est que disponible dans les backports.
@@ -111,10 +93,10 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
     $ sudo apt install --no-install-recommends -t buster-backports -y \
         python3-django python3-django-crispy-forms \
         python3-django-extensions python3-django-filters python3-django-polymorphic \
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil \
+        python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil \
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache ipython3 \
+        python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
-        python3-bs4 python3-setuptools python3-docutils \
+        python3-bs4 python3-setuptools \
-        memcached uwsgi uwsgi-plugin-python3 \
+        uwsgi uwsgi-plugin-python3 \
         texlive-xetex gettext libjs-bootstrap4 fonts-font-awesome \
         nginx python3-venv git acl
     ```
@@ -279,25 +261,20 @@ Le cahier des charges initial est disponible [sur le Wiki Crans](https://wiki.cr
 La documentation des classes et fonctions est directement dans le code et est explorable à partir de la partie documentation de l'interface d'administration de Django.
 **Commentez votre code !**
 
-La documentation plus haut niveau sur le développement et sur l'utilisation
+La documentation plus haut niveau sur le développement est disponible sur [le Wiki associé au dépôt Git](https://gitlab.crans.org/bde/nk20/-/wikis/home).
-est disponible sur <https://note.crans.org/doc> et également dans le dossier `docs`.
 
 ## FAQ
 
 ### Regénérer les fichiers de traduction
 
-Pour regénérer les traductions vous pouvez vous placer à la racine du projet et lancer le script `makemessages`.
+Pour regénérer les traductions vous pouvez vous placer à la racine du projet et lancer le script `makemessages`. Il faut penser à ignorer les dossiers ne contenant pas notre code, dont le virtualenv.
-Il faut penser à ignorer les dossiers ne contenant pas notre code, dont le virtualenv.
-De plus, il faut aussi extraire les variables des fichiers JavaScript.
 
 ```bash
-python3 manage.py makemessages -i env
+django-admin makemessages -i env
-python3 manage.py makemessages -i env -e js -d djangojs
 ```
 
 Une fois les fichiers édités, vous pouvez compiler les nouvelles traductions avec
 
 ```bash
-python3 manage.py compilemessages
+django-admin compilemessages
-python3 manage.py compilejsmessages
 ```

ansible/base.yml

@@ -7,7 +7,7 @@
       prompt: "Password of the database (leave it blank to skip database init)"
       private: yes
   vars:
-    mirror: eclats.crans.org
+    mirror: deb.debian.org
   roles:
     - 1-apt-basic
     - 2-nk20
@@ -16,4 +16,3 @@
     - 5-nginx
     - 6-psql
     - 7-postinstall
-    - 8-docs

ansible/host_vars/bde-nk20-beta.adh.crans.org.yml

@@ -0,0 +1,5 @@
+---
+note:
+  server_name: note-beta.crans.org
+  git_branch: beta
+  cron_enabled: false

ansible/host_vars/bde-note.adh.crans.org.yml

@@ -1,7 +1,5 @@
 ---
 note:
   server_name: note.crans.org
-  git_branch: main
+  git_branch: master
-  serve_static: true
   cron_enabled: true
-  email: notekfet2020@lists.crans.org

ansible/host_vars/bde3-virt.adh.crans.org.yml

@@ -2,6 +2,4 @@
 note:
   server_name: note-dev.crans.org
   git_branch: beta
-  serve_static: false
   cron_enabled: false
-  email: notekfet2020@lists.crans.org

ansible/hosts

@@ -1,5 +1,6 @@
 [dev]
-bde-note-dev.adh.crans.org
+bde3-virt.adh.crans.org
+bde-nk20-beta.adh.crans.org
 
 [prod]
 bde-note.adh.crans.org

ansible/roles/1-apt-basic/tasks/main.yml

@@ -1,15 +1,13 @@
 ---
-- name: Add buster-backports to apt sources if needed
+- name: Add buster-backports to apt sources
   apt_repository:
     repo: deb http://{{ mirror }}/debian buster-backports main
     state: present
-  when:
-    - ansible_distribution == "Debian"
-    - ansible_distribution_major_version | int == 10
 
 - name: Install note_kfet APT dependencies
   apt:
     update_cache: true
+    default_release: buster-backports
     install_recommends: false
     name:
       # Common tools
@@ -25,14 +23,13 @@
       - python3-babel
       - python3-bs4
       - python3-django
+      - python3-django-cas-server
       - python3-django-crispy-forms
       - python3-django-extensions
       - python3-django-filters
-      - python3-django-oauth-toolkit
       - python3-django-polymorphic
       - python3-djangorestframework
       - python3-lockfile
-      - python3-memcache
       - python3-phonenumbers
       - python3-pil
       - python3-pip
@@ -43,9 +40,6 @@
       # LaTeX (PDF generation)
       - texlive-xetex
 
-      # Cache server
-      - memcached
-
       # WSGI server
       - uwsgi
       - uwsgi-plugin-python3

ansible/roles/2-nk20/tasks/main.yml

@@ -16,7 +16,7 @@
 
 - name: Use default env vars (should be updated!)
   template:
-    src: "env.j2"
+    src: "env_example"
     dest: "/var/www/note_kfet/.env"
     mode: 0644
     force: false
@@ -36,13 +36,3 @@
     dest: /etc/cron.d/note
     owner: root
     group: root
-
-- name: Set default directory to /var/www/note_kfet
-  lineinfile:
-    path: /etc/skel/.bashrc
-    line: 'cd /var/www/note_kfet'
-
-- name: Automatically source Python virtual environment
-  lineinfile:
-    path: /etc/skel/.bashrc
-    line: 'source /var/www/note_kfet/env/bin/activate'

ansible/roles/2-nk20/templates/env.j2

@@ -1,23 +0,0 @@
-DJANGO_APP_STAGE=prod
-# Only used in dev mode, change to "postgresql" if you want to use PostgreSQL in dev
-DJANGO_DEV_STORE_METHOD=sqlite
-DJANGO_DB_HOST=localhost
-DJANGO_DB_NAME=note_db
-DJANGO_DB_USER=note
-DJANGO_DB_PASSWORD={{ DB_PASSWORD }}
-DJANGO_DB_PORT=
-DJANGO_SECRET_KEY=CHANGE_ME
-DJANGO_SETTINGS_MODULE=note_kfet.settings
-CONTACT_EMAIL=tresorerie.bde@localhost
-NOTE_URL= {{note.server_name}}
-
-# Config for mails. Only used in production
-NOTE_MAIL=notekfet@localhost
-EMAIL_HOST=smtp.localhost
-EMAIL_PORT=25
-EMAIL_USER=notekfet@localhost
-EMAIL_PASSWORD=CHANGE_ME
-
-# Wiki configuration
-WIKI_USER=NoteKfet2020
-WIKI_PASSWORD=

ansible/roles/4-certbot/tasks/main.yml

@@ -9,11 +9,6 @@
   retries: 3
   until: pkg_result is succeeded
 
-- name: Check if certificate already exists.
-  stat:
-    path: /etc/letsencrypt/live/{{note.server_name}}/cert.pem
-  register: letsencrypt_cert
-
 - name: Create /etc/letsencrypt/conf.d
   file:
     path: /etc/letsencrypt/conf.d
@@ -24,17 +19,3 @@
     src: "letsencrypt/conf.d/nk20.ini.j2"
     dest: "/etc/letsencrypt/conf.d/nk20.ini"
     mode: 0644
-
-- name: Stop services to allow certbot to generate a cert.
-  service:
-    name: nginx
-    state: stopped
-
-- name: Generate new certificate if one doesn't exist.
-  shell: "certbot certonly --non-interactive --agree-tos --config /etc/letsencrypt/conf.d/nk20.ini -d {{note.server_name}}"
-  when: letsencrypt_cert.stat.exists == False
-
-- name: Restart services to allow certbot to generate a cert.
-  service:
-    name: nginx
-    state: started

ansible/roles/4-certbot/templates/letsencrypt/conf.d/nk20.ini.j2

@@ -10,7 +10,7 @@ rsa-key-size = 4096
 # server = https://acme-staging.api.letsencrypt.org/directory
 
 # Uncomment and update to register with the specified e-mail address
-email = {{ note.email }}
+email = notekfet2020@lists.crans.org
 
 # Uncomment to use a text interface instead of ncurses
 text = True

ansible/roles/5-nginx/templates/nginx_note.conf

@@ -1,5 +1,5 @@
 # the upstream component nginx needs to connect to
-upstream note {
+upstream note{
     server unix:///var/www/note_kfet/note_kfet.sock; # file socket
 }
 
@@ -41,7 +41,6 @@ server {
     # max upload size
     client_max_body_size 75M;   # adjust to taste
 
-{% if note.serve_static %}
     # Django media
     location /media  {
         alias /var/www/note_kfet/media;  # your Django project's media files - amend as required
@@ -51,11 +50,6 @@ server {
         alias /var/www/note_kfet/static; # your Django project's static files - amend as required
     }
 
-{% endif %}
-    location /doc {
-        alias /var/www/documentation;    # The documentation of the project
-    }
-
     # Finally, send all non-media requests to the Django server.
     location / {
         uwsgi_pass note;

ansible/roles/6-psql/tasks/main.yml

@@ -11,14 +11,14 @@
   until: pkg_result is succeeded
 
 - name: Create role note
-  when: DB_PASSWORD|length > 0 # If the password is not defined, skip the installation
+  when: "DB_PASSWORD|bool"    # If the password is not defined, skip the installation
   postgresql_user:
     name: note
     password: "{{ DB_PASSWORD }}"
   become_user: postgres
 
 - name: Create NK20 database
-  when: DB_PASSWORD|length >0
+  when: "DB_PASSWORD|bool"
   postgresql_db:
     name: note_db
     owner: note

ansible/roles/7-postinstall/tasks/main.yml

@@ -1,10 +1,4 @@
 ---
-- name: Collect static files
-  command: /var/www/note_kfet/env/bin/python manage.py collectstatic --noinput
-  args:
-    chdir: /var/www/note_kfet
-  become_user: www-data
-
 - name: Migrate Django database
   command: /var/www/note_kfet/env/bin/python manage.py migrate
   args:
@@ -17,14 +11,14 @@
     chdir: /var/www/note_kfet
   become_user: www-data
 
-- name: Compile JavaScript messages
-  command: /var/www/note_kfet/env/bin/python manage.py compilejsmessages
-  args:
-    chdir: /var/www/note_kfet
-  become_user: www-data
-
 - name: Install initial fixtures
   command: /var/www/note_kfet/env/bin/python manage.py loaddata initial
   args:
     chdir: /var/www/note_kfet
   become_user: postgres
+
+- name: Collect static files
+  command: /var/www/note_kfet/env/bin/python manage.py collectstatic --noinput
+  args:
+    chdir: /var/www/note_kfet
+  become_user: www-data

ansible/roles/8-docs/tasks/main.yml

@@ -1,20 +0,0 @@
----
-- name: Install Sphinx and RTD theme
-  pip:
-    requirements: /var/www/note_kfet/docs/requirements.txt
-    virtualenv: /var/www/note_kfet/env
-    virtualenv_command: /usr/bin/python3 -m venv
-    virtualenv_site_packages: true
-  become_user: www-data
-
-- name: Create documentation directory with good permissions
-  file:
-    path: /var/www/documentation
-    state: directory
-    owner: www-data
-    group: www-data
-    mode: u=rwx,g=rwxs,o=rx
-
-- name: Build HTML documentation
-  command: /var/www/note_kfet/env/bin/sphinx-build -b dirhtml /var/www/note_kfet/docs/ /var/www/documentation/
-  become_user: www-data

apps/activity/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 default_app_config = 'activity.apps.ActivityConfig'

apps/activity/admin.py

@@ -1,11 +1,11 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.contrib import admin
 from note_kfet.admin import admin_site
 
 from .forms import GuestForm
-from .models import Activity, ActivityType, Entry, Guest, Opener
+from .models import Activity, ActivityType, Entry, Guest
 
 
 @admin.register(Activity, site=admin_site)
@@ -45,11 +45,3 @@ class EntryAdmin(admin.ModelAdmin):
     Admin customisation for Entry
     """
     list_display = ('note', 'activity', 'time', 'guest')
-
-
-@admin.register(Opener, site=admin_site)
-class OpenerAdmin(admin.ModelAdmin):
-    """
-    Admin customisation for Opener
-    """
-    list_display = ('activity', 'opener')

apps/activity/api/serializers.py

@@ -1,11 +1,9 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
-from rest_framework.validators import UniqueTogetherValidator
 
-from ..models import Activity, ActivityType, Entry, Guest, GuestTransaction, Opener
+from ..models import Activity, ActivityType, Entry, Guest, GuestTransaction
 
 
 class ActivityTypeSerializer(serializers.ModelSerializer):
@@ -61,17 +59,3 @@ class GuestTransactionSerializer(serializers.ModelSerializer):
     class Meta:
         model = GuestTransaction
         fields = '__all__'
-
-
-class OpenerSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Openers.
-    The djangorestframework plugin will analyse the model `Opener` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = Opener
-        fields = '__all__'
-        validators = [UniqueTogetherValidator(
-            queryset=Opener.objects.all(), fields=("opener", "activity"),
-            message=_("This opener already exists"))]

apps/activity/api/urls.py

@@ -1,7 +1,7 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet, OpenerViewSet
+from .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet
 
 
 def register_activity_urls(router, path):
@@ -12,4 +12,3 @@ def register_activity_urls(router, path):
     router.register(path + '/type', ActivityTypeViewSet)
     router.register(path + '/guest', GuestViewSet)
     router.register(path + '/entry', EntryViewSet)
-    router.register(path + '/opener', OpenerViewSet)

apps/activity/api/views.py

@@ -1,15 +1,12 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from api.filters import RegexSafeSearchFilter
 from api.viewsets import ReadProtectedModelViewSet
-from django.core.exceptions import ValidationError
 from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.response import Response
+from rest_framework.filters import SearchFilter
-from rest_framework import status
 
-from .serializers import ActivitySerializer, ActivityTypeSerializer, EntrySerializer, GuestSerializer, OpenerSerializer
+from .serializers import ActivitySerializer, ActivityTypeSerializer, EntrySerializer, GuestSerializer
-from ..models import Activity, ActivityType, Entry, Guest, Opener
+from ..models import Activity, ActivityType, Entry, Guest
 
 
 class ActivityTypeViewSet(ReadProtectedModelViewSet):
@@ -18,10 +15,10 @@ class ActivityTypeViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `ActivityType` objects, serialize it to JSON with the given serializer,
     then render it on /api/activity/type/
     """
-    queryset = ActivityType.objects.order_by('id')
+    queryset = ActivityType.objects.all()
     serializer_class = ActivityTypeSerializer
     filter_backends = [DjangoFilterBackend]
-    filterset_fields = ['name', 'manage_entries', 'can_invite', 'guest_entry_fee', ]
+    filterset_fields = ['name', 'can_invite', ]
 
 
 class ActivityViewSet(ReadProtectedModelViewSet):
@@ -30,16 +27,10 @@ class ActivityViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Activity` objects, serialize it to JSON with the given serializer,
     then render it on /api/activity/activity/
     """
-    queryset = Activity.objects.order_by('id')
+    queryset = Activity.objects.all()
     serializer_class = ActivitySerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend]
-    filterset_fields = ['name', 'description', 'activity_type', 'location', 'creater', 'organizer', 'attendees_club',
+    filterset_fields = ['name', 'description', 'activity_type', ]
-                        'date_start', 'date_end', 'valid', 'open', ]
-    search_fields = ['$name', '$description', '$location', '$creater__last_name', '$creater__first_name',
-                     '$creater__email', '$creater__note__alias__name', '$creater__note__alias__normalized_name',
-                     '$organizer__name', '$organizer__email', '$organizer__note__alias__name',
-                     '$organizer__note__alias__normalized_name', '$attendees_club__name', '$attendees_club__email',
-                     '$attendees_club__note__alias__name', '$attendees_club__note__alias__normalized_name', ]
 
 
 class GuestViewSet(ReadProtectedModelViewSet):
@@ -48,13 +39,10 @@ class GuestViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Guest` objects, serialize it to JSON with the given serializer,
     then render it on /api/activity/guest/
     """
-    queryset = Guest.objects.order_by('id')
+    queryset = Guest.objects.all()
     serializer_class = GuestSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [SearchFilter]
-    filterset_fields = ['activity', 'activity__name', 'last_name', 'first_name', 'inviter', 'inviter__alias__name',
+    search_fields = ['$last_name', '$first_name', '$inviter__alias__name', '$inviter__alias__normalized_name', ]
-                        'inviter__alias__normalized_name', ]
-    search_fields = ['$activity__name', '$last_name', '$first_name', '$inviter__user__email', '$inviter__alias__name',
-                     '$inviter__alias__normalized_name', ]
 
 
 class EntryViewSet(ReadProtectedModelViewSet):
@@ -63,38 +51,7 @@ class EntryViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Entry` objects, serialize it to JSON with the given serializer,
     then render it on /api/activity/entry/
     """
-    queryset = Entry.objects.order_by('id')
+    queryset = Entry.objects.all()
     serializer_class = EntrySerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [SearchFilter]
-    filterset_fields = ['activity', 'time', 'note', 'guest', ]
+    search_fields = ['$last_name', '$first_name', '$inviter__alias__name', '$inviter__alias__normalized_name', ]
-    search_fields = ['$activity__name', '$note__user__email', '$note__alias__name', '$note__alias__normalized_name',
-                     '$guest__last_name', '$guest__first_name', ]
-
-
-class OpenerViewSet(ReadProtectedModelViewSet):
-    """
-    REST Opener View set.
-    The djangorestframework plugin will get all `Opener` objects, serialize it to JSON with the given serializer,
-    then render it on /api/activity/opener/
-    """
-    queryset = Opener.objects
-    serializer_class = OpenerSerializer
-    filter_backends = [RegexSafeSearchFilter, DjangoFilterBackend]
-    search_fields = ['$opener__alias__name', '$opener__alias__normalized_name',
-                     '$activity__name']
-    filterset_fields = ['opener', 'opener__noteuser__user', 'activity']
-
-    def get_serializer_class(self):
-        serializer_class = self.serializer_class
-        if self.request.method in ['PUT', 'PATCH']:
-            # opener-activity can't change
-            serializer_class.Meta.read_only_fields = ('opener', 'acitivity',)
-        return serializer_class
-
-    def destroy(self, request, *args, **kwargs):
-        instance = self.get_object()
-        try:
-            self.perform_destroy(instance)
-        except ValidationError as e:
-            return Response({e.code: str(e)}, status.HTTP_400_BAD_REQUEST)
-        return Response(status=status.HTTP_204_NO_CONTENT)

apps/activity/apps.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.apps import AppConfig

apps/activity/fixtures/initial.json

@@ -6,7 +6,7 @@
             "name": "Pot",
             "manage_entries": true,
             "can_invite": true,
-            "guest_entry_fee": 1000
+            "guest_entry_fee": 500
         }
     },
     {
@@ -28,25 +28,5 @@
             "can_invite": false,
             "guest_entry_fee": 0
         }
-    },
-    {
-        "model": "activity.activitytype",
-        "pk": 5,
-        "fields": {
-            "name": "Soir\u00e9e avec entrées",
-            "manage_entries": true,
-            "can_invite": false,
-            "guest_entry_fee": 0
-        }
-    },
-    {
-        "model": "activity.activitytype",
-        "pk": 7,
-        "fields": {
-            "name": "Soir\u00e9e avec invitations",
-            "manage_entries": true,
-            "can_invite": true,
-            "guest_entry_fee": 0
-        }
     }
 ]

apps/activity/forms.py

@@ -1,18 +1,17 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import timedelta
 from random import shuffle
 
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from member.models import Club
 from note.models import Note, NoteUser
-from note_kfet.inputs import Autocomplete
+from note_kfet.inputs import Autocomplete, DateTimePickerInput
-from note_kfet.middlewares import get_current_request
+from note_kfet.middlewares import get_current_authenticated_user
 from permission.backends import PermissionBackend
 
 from .models import Activity, Guest
@@ -25,16 +24,10 @@ class ActivityForm(forms.ModelForm):
         self.fields["attendees_club"].initial = Club.objects.get(name="Kfet")
         self.fields["attendees_club"].widget.attrs["placeholder"] = "Kfet"
         clubs = list(Club.objects.filter(PermissionBackend
-                                         .filter_queryset(get_current_request(), Club, "view")).all())
+                                         .filter_queryset(get_current_authenticated_user(), Club, "view")).all())
         shuffle(clubs)
         self.fields["organizer"].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
 
-    def clean_organizer(self):
-        organizer = self.cleaned_data['organizer']
-        if not organizer.note.is_active:
-            self.add_error('organiser', _('The note of this club is inactive.'))
-        return organizer
-
     def clean_date_end(self):
         date_end = self.cleaned_data["date_end"]
         date_start = self.cleaned_data["date_start"]
@@ -44,7 +37,7 @@ class ActivityForm(forms.ModelForm):
 
     class Meta:
         model = Activity
-        exclude = ('creater', 'valid', 'open', 'opener', )
+        exclude = ('creater', 'valid', 'open', )
         widgets = {
             "organizer": Autocomplete(
                 model=Club,

apps/activity/migrations/0003_auto_20240323_1422.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2024-03-23 13:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('activity', '0002_auto_20200904_2341'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='activity',
-            name='description',
-            field=models.TextField(blank=True, default='', verbose_name='description'),
-        ),
-    ]

apps/activity/migrations/0004_opener.py

@@ -1,28 +0,0 @@
-# Generated by Django 2.2.28 on 2024-08-01 12:36
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0006_trust'),
-        ('activity', '0003_auto_20240323_1422'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Opener',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opener', to='activity.Activity', verbose_name='activity')),
-                ('opener', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activity_responsible', to='note.Note', verbose_name='opener')),
-            ],
-            options={
-                'verbose_name': 'opener',
-                'verbose_name_plural': 'openers',
-                'unique_together': {('opener', 'activity')},
-            },
-        ),
-    ]

apps/activity/migrations/0005_alter_opener_options_alter_opener_opener.py

@@ -1,24 +0,0 @@
-# Generated by Django 4.2.15 on 2024-08-28 08:00
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0006_trust'),
-        ('activity', '0004_opener'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='opener',
-            options={'verbose_name': 'Opener', 'verbose_name_plural': 'Openers'},
-        ),
-        migrations.AlterField(
-            model_name='opener',
-            name='opener',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activity_responsible', to='note.note', verbose_name='Opener'),
-        ),
-    ]

apps/activity/models.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
@@ -11,7 +11,7 @@ from django.db import models, transaction
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from note.models import NoteUser, Transaction, Note
+from note.models import NoteUser, Transaction
 from rest_framework.exceptions import ValidationError
 
 
@@ -66,8 +66,6 @@ class Activity(models.Model):
 
     description = models.TextField(
         verbose_name=_('description'),
-        blank=True,
-        default="",
     )
 
     location = models.CharField(
@@ -125,14 +123,6 @@ class Activity(models.Model):
         verbose_name=_('open'),
     )
 
-    class Meta:
-        verbose_name = _("activity")
-        verbose_name_plural = _("activities")
-        unique_together = ("name", "date_start", "date_end",)
-
-    def __str__(self):
-        return self.name
-
     @transaction.atomic
     def save(self, *args, **kwargs):
         """
@@ -154,6 +144,14 @@ class Activity(models.Model):
                 if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else refresh_activities()
         return ret
 
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = _("activity")
+        verbose_name_plural = _("activities")
+        unique_together = ("name", "date_start", "date_end",)
+
 
 class Entry(models.Model):
     """
@@ -254,13 +252,14 @@ class Guest(models.Model):
         verbose_name=_("inviter"),
     )
 
-    class Meta:
+    @property
-        verbose_name = _("guest")
+    def has_entry(self):
-        verbose_name_plural = _("guests")
+        try:
-        unique_together = ("activity", "last_name", "first_name", )
+            if self.entry:
-
+                return True
-    def __str__(self):
+            return False
-        return self.first_name + " " + self.last_name
+        except AttributeError:
+            return False
 
     @transaction.atomic
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
@@ -291,14 +290,13 @@ class Guest(models.Model):
 
         return super().save(force_insert, force_update, using, update_fields)
 
-    @property
+    def __str__(self):
-    def has_entry(self):
+        return self.first_name + " " + self.last_name
-        try:
+
-            if self.entry:
+    class Meta:
-                return True
+        verbose_name = _("guest")
-            return False
+        verbose_name_plural = _("guests")
-        except AttributeError:
+        unique_together = ("activity", "last_name", "first_name", )
-            return False
 
 
 class GuestTransaction(Transaction):
@@ -310,31 +308,3 @@ class GuestTransaction(Transaction):
     @property
     def type(self):
         return _('Invitation')
-
-
-class Opener(models.Model):
-    """
-    Allow the user to make activity entries without more rights
-    """
-    activity = models.ForeignKey(
-        Activity,
-        on_delete=models.CASCADE,
-        related_name='opener',
-        verbose_name=_('activity')
-    )
-
-    opener = models.ForeignKey(
-        Note,
-        on_delete=models.CASCADE,
-        related_name='activity_responsible',
-        verbose_name=_('Opener')
-    )
-
-    class Meta:
-        verbose_name = _("Opener")
-        verbose_name_plural = _("Openers")
-        unique_together = ("opener", "activity")
-
-    def __str__(self):
-        return _("{opener} is opener of activity {acivity}").format(
-            opener=str(self.opener), acivity=str(self.activity))

apps/activity/static/activity/js/opener.js

@@ -1,57 +0,0 @@
-/**
- * On form submit, add a new opener
- */
-function form_create_opener (e) {
-  // Do not submit HTML form
-  e.preventDefault()
-
-  // Get data and send to API
-  const formData = new FormData(e.target)
-  $.getJSON('/api/note/alias/'+formData.get('opener') + '/',
-    function (opener_alias) {
-      create_opener(formData.get('activity'), opener_alias.note)
-    }).fail(function (xhr, _textStatus, _error) {
-        errMsg(xhr.responseJSON)
-    })
-}
-
-/**
- * Add an opener between an activity and a user
- * @param activity:Integer activity id
- * @param opener:Integer user note id
- */
-function create_opener(activity, opener) {
-  $.post('/api/activity/opener/', {
-      activity: activity,
-      opener: opener,
-      csrfmiddlewaretoken: CSRF_TOKEN
-  }).done(function () {
-  // Reload tables
-  $('#opener_table').load(location.pathname + ' #opener_table')
-    addMsg(gettext('Opener successfully added'), 'success')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-/**
- * On click of "delete", delete the opener
- * @param button_id:Integer Opener id to remove
- */
-function delete_button (button_id) {
-  $.ajax({
-    url: '/api/activity/opener/' + button_id + '/',
-    method: 'DELETE',
-    headers: { 'X-CSRFTOKEN': CSRF_TOKEN }
-  }).done(function () {
-    addMsg(gettext('Opener successfully deleted'), 'success')
-    $('#opener_table').load(location.pathname + ' #opener_table')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-$(document).ready(function () {
-  // Attach event
-  document.getElementById('form_opener').addEventListener('submit', form_create_opener)
-})

apps/activity/tables.py

@@ -1,17 +1,13 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from django.utils import timezone
-from django.utils.html import escape
+from django.utils.html import format_html
-from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
-from note_kfet.middlewares import get_current_request
 import django_tables2 as tables
 from django_tables2 import A
-from permission.backends import PermissionBackend
 from note.templatetags.pretty_money import pretty_money
 
-from .models import Activity, Entry, Guest, Opener
+from .models import Activity, Entry, Guest
 
 
 class ActivityTable(tables.Table):
@@ -56,8 +52,8 @@ class GuestTable(tables.Table):
     def render_entry(self, record):
         if record.has_entry:
             return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
-        return mark_safe('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
+        return format_html('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
-                         '{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
+                           '{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
 
 
 def get_row_class(record):
@@ -95,7 +91,7 @@ class EntryTable(tables.Table):
         if hasattr(record, 'username'):
             username = record.username
             if username != value:
-                return mark_safe(escape(value) + " <em>aka.</em> " + escape(username))
+                return format_html(value + " <em>aka.</em> " + username)
         return value
 
     def render_balance(self, value):
@@ -115,34 +111,3 @@ class EntryTable(tables.Table):
             'data-last-name': lambda record: record.last_name,
             'data-first-name': lambda record: record.first_name,
         }
-
-
-# function delete_button(id) provided in template file
-DELETE_TEMPLATE = """
-    <button id="{{ record.pk }}" class="btn btn-danger btn-sm" onclick="delete_button(this.id)"> {{ delete_trans }}</button>
-"""
-
-
-class OpenerTable(tables.Table):
-    class Meta:
-        attrs = {
-            'class': 'table table condensed table-striped',
-            'id': "opener_table"
-        }
-        model = Opener
-        fields = ("opener",)
-        template_name = 'django_tables2/bootstrap4.html'
-
-    show_header = False
-    opener = tables.Column(attrs={'td': {'class': 'text-center'}})
-
-    delete_col = tables.TemplateColumn(
-        template_code=DELETE_TEMPLATE,
-        extra_context={"delete_trans": _('Delete')},
-        attrs={
-            'td': {
-                'class': lambda record: 'col-sm-1'
-                + (' d-none' if not PermissionBackend.check_perm(
-                    get_current_request(), "activity.delete_opener", record)
-                   else '')}},
-        verbose_name=_("Delete"),)

apps/activity/templates/activity/activity_detail.html

@@ -4,31 +4,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n perms %}
 {% load render_table from django_tables2 %}
-{% load static django_tables2 i18n %}
 
 {% block content %}
 <h1 class="text-white">{{ title }}</h1>
 {% include "activity/includes/activity_info.html" %}
 
-{% if activity.activity_type.manage_entries and ".change__opener"|has_perm:activity %}
-    <div class="card bg-white mb-3">
-        <h3 class="card-header text-center">
-            {% trans "Openers" %}
-        </h3>
-        <div class="card-body">
-            <form class="input-group" method="POST" id="form_opener">
-                {% csrf_token %}
-                <input type="hidden" name="activity" value="{{ object.pk }}">
-                {%include "autocomplete_model.html" %}
-                <div class="input-group-append">
-                    <input type="submit" class="btn btn-success" value="{% trans "Add" %}">
-                </div>
-            </form>
-        </div>
-        {% render_table opener %}
-    </div>
-{% endif %}
-
 {% if guests.data %}
 <div class="card bg-white mb-3">
     <h3 class="card-header text-center">
@@ -42,8 +22,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endblock %}
 
 {% block extrajavascript %}
-<script src="{% static "activity/js/opener.js" %}"></script>
-<script src="{% static "js/autocomplete_model.js" %}"></script>
 <script>
     function remove_guest(guest_id) {
         $.ajax({
@@ -52,7 +30,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
          headers: {"X-CSRFTOKEN": CSRF_TOKEN}
      })
       .done(function() {
-          addMsg('{% trans "Guest deleted" %}', 'success');
+          addMsg('Invité supprimé','success');
           $("#guests_table").load(location.pathname + " #guests_table");
       })
       .fail(function(xhr, textStatus, error) {

apps/activity/templates/activity/activity_entry.html

@@ -63,12 +63,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
         refreshBalance();
     }
 
-    alias_obj.keyup(function(event) {
+    alias_obj.keyup(reloadTable);
-        let code = event.originalEvent.keyCode
-        if (65 <= code <= 122 || code === 13) {
-            debounce(reloadTable)()
-        }
-    });
 
     $(document).ready(init);
 
@@ -91,10 +86,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 }).done(function () {
                     if (target.hasClass("table-info"))
                         addMsg(
-                            "{% trans "Entry done, but caution: the user is not a Kfet member." %}",
+                            "Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.",
                             "warning", 10000);
                     else
-                        addMsg("Entry made!", "success", 4000);
+                        addMsg("Entrée effectuée !", "success", 4000);
                     reloadTable(true);
                 }).fail(function (xhr) {
                     errMsg(xhr.responseJSON, 4000);
@@ -126,10 +121,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     }).done(function () {
                         if (target.hasClass("table-info"))
                             addMsg(
-                                "{% trans "Entry done, but caution: the user is not a Kfet member." %}",
+                                "Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.",
                                 "warning", 10000);
                         else
-                            addMsg("{% trans "Entry done!" %}", "success", 4000);
+                            addMsg("Entrée effectuée !", "success", 4000);
                         reloadTable(true);
                     }).fail(function (xhr) {
                         errMsg(xhr.responseJSON, 4000);

apps/activity/templates/activity/activity_form.html

@@ -17,27 +17,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </form>
   </div>
 </div>
-{% endblock %}
+{% endblock %}
-
-{% block extrajavascript %}
-<script>
-  var date_end = document.getElementById("id_date_end");
-  var date_start = document.getElementById("id_date_start");
-
-  function update_date_end (){
-    if(date_end.value=="" || date_end.value<date_start.value){
-      date_end.value = date_start.value;
-    };
-  };
-
-  function update_date_start (){
-    if(date_start.value=="" || date_end.value<date_start.value){
-      date_start.value = date_end.value;
-    };
-  };
-
-  date_start.addEventListener('focusout', update_date_end);
-  date_end.addEventListener('focusout', update_date_start);
-  
-</script>
-{% endblock %}

apps/activity/templates/activity/activity_list.html

@@ -46,4 +46,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </h3>
     {% render_table table %}
 </div>
-{% endblock %}
+{% endblock %}

apps/activity/tests/test_activities.py

@@ -1,18 +1,15 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import timedelta
 
-from api.tests import TestAPI
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse
 from django.utils import timezone
+from activity.models import Activity, ActivityType, Guest, Entry
 from member.models import Club
 
-from ..api.views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet
-from ..models import Activity, ActivityType, Guest, Entry
-
 
 class TestActivities(TestCase):
     """
@@ -176,58 +173,3 @@ class TestActivities(TestCase):
         """
         response = self.client.get(reverse("activity:calendar_ics"))
         self.assertEqual(response.status_code, 200)
-
-
-class TestActivityAPI(TestAPI):
-    def setUp(self) -> None:
-        super().setUp()
-
-        self.activity = Activity.objects.create(
-            name="Activity",
-            description="This is a test activity\non two very very long lines\nbecause this is very important.",
-            location="Earth",
-            activity_type=ActivityType.objects.get(name="Pot"),
-            creater=self.user,
-            organizer=Club.objects.get(name="Kfet"),
-            attendees_club=Club.objects.get(name="Kfet"),
-            date_start=timezone.now(),
-            date_end=timezone.now() + timedelta(days=2),
-            valid=True,
-        )
-
-        self.guest = Guest.objects.create(
-            activity=self.activity,
-            inviter=self.user.note,
-            last_name="GUEST",
-            first_name="Guest",
-        )
-
-        self.entry = Entry.objects.create(
-            activity=self.activity,
-            note=self.user.note,
-            guest=self.guest,
-        )
-
-    def test_activity_api(self):
-        """
-        Load Activity API page and test all filters and permissions
-        """
-        self.check_viewset(ActivityViewSet, "/api/activity/activity/")
-
-    def test_activity_type_api(self):
-        """
-        Load ActivityType API page and test all filters and permissions
-        """
-        self.check_viewset(ActivityTypeViewSet, "/api/activity/type/")
-
-    def test_entry_api(self):
-        """
-        Load Entry API page and test all filters and permissions
-        """
-        self.check_viewset(EntryViewSet, "/api/activity/entry/")
-
-    def test_guest_api(self):
-        """
-        Load Guest API page and test all filters and permissions
-        """
-        self.check_viewset(GuestViewSet, "/api/activity/guest/")

apps/activity/urls.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.urls import path

apps/activity/views.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from hashlib import md5
@@ -12,21 +12,17 @@ from django.db.models import F, Q
 from django.http import HttpResponse
 from django.urls import reverse_lazy
 from django.utils import timezone
-from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
 from django.views import View
-from django.views.decorators.cache import cache_page
 from django.views.generic import DetailView, TemplateView, UpdateView
-from django.views.generic.list import ListView
+from django_tables2.views import SingleTableView
-from django_tables2.views import MultiTableMixin, SingleTableMixin
-from api.viewsets import is_regex
 from note.models import Alias, NoteSpecial, NoteUser
 from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
 
 from .forms import ActivityForm, GuestForm
-from .models import Activity, Entry, Guest, Opener
+from .models import Activity, Entry, Guest
-from .tables import ActivityTable, EntryTable, GuestTable, OpenerTable
+from .tables import ActivityTable, EntryTable, GuestTable
 
 
 class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
@@ -59,44 +55,36 @@ class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk})
 
 
-class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     """
     Displays all Activities, and classify if they are on-going or upcoming ones.
     """
     model = Activity
-    tables = [
+    table_class = ActivityTable
-        lambda data: ActivityTable(data, prefix="all-"),
+    ordering = ('-date_start',)
-        lambda data: ActivityTable(data, prefix="upcoming-"),
-    ]
     extra_context = {"title": _("Activities")}
 
-    def get_queryset(self, **kwargs):
+    def get_queryset(self):
-        return super().get_queryset(**kwargs).distinct()
+        return super().get_queryset().distinct()
-
-    def get_tables_data(self):
-        # first table = all activities, second table = upcoming
-        return [
-            self.get_queryset().order_by("-date_start"),
-            Activity.objects.filter(date_end__gt=timezone.now())
-                            .filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))
-                            .distinct()
-                            .order_by("date_start")
-        ]
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        tables = context["tables"]
+        upcoming_activities = Activity.objects.filter(date_end__gt=timezone.now())
-        for name, table in zip(["table", "upcoming"], tables):
+        context['upcoming'] = ActivityTable(
-            context[name] = table
+            data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")),
+            prefix='upcoming-',
+        )
 
-        started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
+        started_activities = Activity.objects\
+            .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\
+            .filter(open=True, valid=True).all()
         context["started_activities"] = started_activities
 
         return context
 
 
-class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, DetailView):
+class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
     Shows details about one activity. Add guest to context
     """
@@ -104,40 +92,15 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix
     context_object_name = "activity"
     extra_context = {"title": _("Activity detail")}
 
-    tables = [
-        lambda data: GuestTable(data, prefix="guests-"),
-        lambda data: OpenerTable(data, prefix="opener-"),
-    ]
-
-    def get_tables_data(self):
-        return [
-            Guest.objects.filter(activity=self.object)
-                         .filter(PermissionBackend.filter_queryset(self.request, Guest, "view")),
-            self.object.opener.filter(activity=self.object)
-                              .filter(PermissionBackend.filter_queryset(self.request, Opener, "view")),
-        ]
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data()
 
-        tables = context["tables"]
+        table = GuestTable(data=Guest.objects.filter(activity=self.object)
-        for name, table in zip(["guests", "opener"], tables):
+                           .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view")))
-            context[name] = table
+        context["guests"] = table
 
         context["activity_started"] = timezone.now() > timezone.localtime(self.object.date_start)
 
-        context["widget"] = {
-            "name": "opener",
-            "resetable": True,
-            "attrs": {
-                "class": "autocomplete form-control",
-                "id": "opener",
-                "api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser",
-                "name_field": "name",
-                "placeholder": ""
-            }
-        }
-
         return context
 
 
@@ -179,41 +142,36 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
-        form.activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
+        form.activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\
-            .filter(pk=self.kwargs["pk"]).first()
+            .get(pk=self.kwargs["pk"])
         form.fields["inviter"].initial = self.request.user.note
         return form
 
     @transaction.atomic
     def form_valid(self, form):
         form.instance.activity = Activity.objects\
-            .filter(PermissionBackend.filter_queryset(self.request, Activity, "view")).get(pk=self.kwargs["pk"])
+            .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")).get(pk=self.kwargs["pk"])
         return super().form_valid(form)
 
     def get_success_url(self, **kwargs):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
 
 
-class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
+class ActivityEntryView(LoginRequiredMixin, TemplateView):
     """
     Manages entry to an activity
     """
     template_name = "activity/activity_entry.html"
 
-    table_class = EntryTable
-
     def dispatch(self, request, *args, **kwargs):
         """
         Don't display the entry interface if the user has no right to see it (no right to add an entry for itself),
         it is closed or doesn't manage entries.
         """
-        if not self.request.user.is_authenticated:
-            return self.handle_no_permission()
-
         activity = Activity.objects.get(pk=self.kwargs["pk"])
 
         sample_entry = Entry(activity=activity, note=self.request.user.note)
-        if not PermissionBackend.check_perm(self.request, "activity.add_entry", sample_entry):
+        if not PermissionBackend.check_perm(self.request.user, "activity.add_entry", sample_entry):
             raise PermissionDenied(_("You are not allowed to display the entry interface for this activity."))
 
         if not activity.activity_type.manage_entries:
@@ -231,25 +189,22 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         guest_qs = Guest.objects\
             .annotate(balance=F("inviter__balance"), note_name=F("inviter__user__username"))\
             .filter(activity=activity)\
-            .filter(PermissionBackend.filter_queryset(self.request, Guest, "view"))\
+            .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))\
-            .order_by('last_name', 'first_name')
+            .order_by('last_name', 'first_name').distinct()
 
         if "search" in self.request.GET and self.request.GET["search"]:
             pattern = self.request.GET["search"]
-
+            if pattern[0] != "^":
-            # Check if this is a valid regex. If not, we won't check regex
+                pattern = "^" + pattern
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__istartswith"
-            pattern = "^" + pattern if valid_regex and pattern[0] != "^" else pattern
             guest_qs = guest_qs.filter(
-                Q(**{f"first_name{suffix}": pattern})
+                Q(first_name__iregex=pattern)
-                | Q(**{f"last_name{suffix}": pattern})
+                | Q(last_name__iregex=pattern)
-                | Q(**{f"inviter__alias__name{suffix}": pattern})
+                | Q(inviter__alias__name__iregex=pattern)
-                | Q(**{f"inviter__alias__normalized_name{suffix}": Alias.normalize(pattern)})
+                | Q(inviter__alias__normalized_name__iregex=Alias.normalize(pattern))
             )
         else:
             guest_qs = guest_qs.none()
-        return guest_qs.distinct()
+        return guest_qs
 
     def get_invited_note(self, activity):
         """
@@ -265,26 +220,23 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         # Keep only users that have a note
         note_qs = note_qs.filter(note__noteuser__isnull=False)
 
-        # Keep only valid members
+        # Keep only members
         note_qs = note_qs.filter(
             note__noteuser__user__memberships__club=activity.attendees_club,
             note__noteuser__user__memberships__date_start__lte=timezone.now(),
-            note__noteuser__user__memberships__date_end__gte=timezone.now()).exclude(note__inactivity_reason='forced')
+            note__noteuser__user__memberships__date_end__gte=timezone.now(),
+        )
 
         # Filter with permission backend
-        note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))
+        note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))
 
         if "search" in self.request.GET and self.request.GET["search"]:
             pattern = self.request.GET["search"]
-
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__icontains"
             note_qs = note_qs.filter(
-                Q(**{f"note__noteuser__user__first_name{suffix}": pattern})
+                Q(note__noteuser__user__first_name__iregex=pattern)
-                | Q(**{f"note__noteuser__user__last_name{suffix}": pattern})
+                | Q(note__noteuser__user__last_name__iregex=pattern)
-                | Q(**{f"name{suffix}": pattern})
+                | Q(name__iregex=pattern)
-                | Q(**{f"normalized_name{suffix}": Alias.normalize(pattern)})
+                | Q(normalized_name__iregex=Alias.normalize(pattern))
             )
         else:
             note_qs = note_qs.none()
@@ -296,9 +248,15 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
             if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql' else note_qs.distinct()[:20]
         return note_qs
 
-    def get_table_data(self):
+    def get_context_data(self, **kwargs):
-        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
+        """
+        Query the list of Guest and Note to the activity and add information to makes entry with JS.
+        """
+        context = super().get_context_data(**kwargs)
+
+        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\
             .distinct().get(pk=self.kwargs["pk"])
+        context["activity"] = activity
 
         matched = []
 
@@ -311,17 +269,8 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
             note.activity = activity
             matched.append(note)
 
-        return matched
+        table = EntryTable(data=matched)
-
+        context["table"] = table
-    def get_context_data(self, **kwargs):
-        """
-        Query the list of Guest and Note to the activity and add information to makes entry with JS.
-        """
-        context = super().get_context_data(**kwargs)
-
-        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
-            .distinct().get(pk=self.kwargs["pk"])
-        context["activity"] = activity
 
         context["entries"] = Entry.objects.filter(activity=activity)
 
@@ -330,17 +279,15 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
 
         activities_open = Activity.objects.filter(open=True).filter(
-            PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
+            PermissionBackend.filter_queryset(self.request.user, Activity, "view")).distinct().all()
         context["activities_open"] = [a for a in activities_open
-                                      if PermissionBackend.check_perm(self.request,
+                                      if PermissionBackend.check_perm(self.request.user,
                                                                       "activity.add_entry",
                                                                       Entry(activity=a, note=self.request.user.note,))]
 
         return context
 
 
-# Cache for 1 hour
-@method_decorator(cache_page(60 * 60), name='dispatch')
 class CalendarView(View):
     """
     Render an ICS calendar with all valid activities.
@@ -363,8 +310,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Paris
+TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Paris
+X-LIC-LOCATION:Europe/Berlin
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
@@ -386,10 +333,10 @@ END:VTIMEZONE
 DTSTAMP:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}Z
 UID:{md5((activity.name + "$" + str(activity.id) + str(activity.date_start)).encode("UTF-8")).hexdigest()}
 SUMMARY;CHARSET=UTF-8:{self.multilines(activity.name, 75, 22)}
-DTSTART:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_start)}
+DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
-DTEND:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_end)}
+DTEND;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_end)}
 LOCATION:{self.multilines(activity.location, 75, 9) if activity.location else "Kfet"}
-DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + f"""
+DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + """
  -- {activity.organizer.name}
 END:VEVENT
 """

apps/api/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 default_app_config = 'api.apps.APIConfig'

apps/api/apps.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.apps import AppConfig

apps/api/filters.py

@@ -1,42 +0,0 @@
-import re
-from functools import lru_cache
-
-from rest_framework.filters import SearchFilter
-
-
-class RegexSafeSearchFilter(SearchFilter):
-    @lru_cache
-    def validate_regex(self, search_term) -> bool:
-        try:
-            re.compile(search_term)
-            return True
-        except re.error:
-            return False
-
-    def get_search_fields(self, view, request):
-        """
-        Ensure that given regex are valid.
-        If not, we consider that the user is trying to search by substring.
-        """
-        search_fields = super().get_search_fields(view, request)
-        search_terms = self.get_search_terms(request)
-
-        for search_term in search_terms:
-            if not self.validate_regex(search_term):
-                # Invalid regex. We assume we don't query by regex but by substring.
-                search_fields = [f.replace('$', '') for f in search_fields]
-                break
-
-        return search_fields
-
-    def get_search_terms(self, request):
-        """
-        Ensure that search field is a valid regex query. If not, we remove extra characters.
-        """
-        terms = super().get_search_terms(request)
-        if not all(self.validate_regex(term) for term in terms):
-            # Invalid regex. If a ^ is prefixed to the search term, we remove it.
-            terms = [term[1:] if term[0] == '^' else term for term in terms]
-            # Same for dollars.
-            terms = [term[:-1] if term[-1] == '$' else term for term in terms]
-        return terms

apps/api/pagination.py

@@ -1,5 +0,0 @@
-from rest_framework.pagination import PageNumberPagination
-
-
-class CustomPagination(PageNumberPagination):
-    page_size_query_param = 'page_size'

apps/api/serializers.py

@@ -1,20 +1,13 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import User
-from django.utils import timezone
+from rest_framework.serializers import ModelSerializer
-from rest_framework import serializers
-from member.api.serializers import ProfileSerializer, MembershipSerializer
-from member.models import Membership
-from note.api.serializers import NoteSerializer
-from note.models import Alias
-from note_kfet.middlewares import get_current_request
-from permission.backends import PermissionBackend
 
 
-class UserSerializer(serializers.ModelSerializer):
+class UserSerializer(ModelSerializer):
     """
     REST API Serializer for Users.
     The djangorestframework plugin will analyse the model `User` and parse all fields in the API.
@@ -29,7 +22,7 @@ class UserSerializer(serializers.ModelSerializer):
         )
 
 
-class ContentTypeSerializer(serializers.ModelSerializer):
+class ContentTypeSerializer(ModelSerializer):
     """
     REST API Serializer for Users.
     The djangorestframework plugin will analyse the model `User` and parse all fields in the API.
@@ -38,54 +31,3 @@ class ContentTypeSerializer(serializers.ModelSerializer):
     class Meta:
         model = ContentType
         fields = '__all__'
-
-
-class OAuthSerializer(serializers.ModelSerializer):
-    """
-    Informations that are transmitted by OAuth.
-    For now, this includes user, profile and valid memberships.
-    This should be better managed later.
-    """
-    normalized_name = serializers.SerializerMethodField()
-
-    profile = serializers.SerializerMethodField()
-
-    note = serializers.SerializerMethodField()
-
-    memberships = serializers.SerializerMethodField()
-
-    def get_normalized_name(self, obj):
-        return Alias.normalize(obj.username)
-
-    def get_profile(self, obj):
-        # Display the profile of the user only if we have rights to see it.
-        return ProfileSerializer().to_representation(obj.profile) \
-            if PermissionBackend.check_perm(get_current_request(), 'member.view_profile', obj.profile) else None
-
-    def get_note(self, obj):
-        # Display the note of the user only if we have rights to see it.
-        return NoteSerializer().to_representation(obj.note) \
-            if PermissionBackend.check_perm(get_current_request(), 'note.view_note', obj.note) else None
-
-    def get_memberships(self, obj):
-        # Display only memberships that we are allowed to see.
-        return serializers.ListSerializer(child=MembershipSerializer()).to_representation(
-            obj.memberships.filter(date_start__lte=timezone.now(), date_end__gte=timezone.now())
-                           .filter(PermissionBackend.filter_queryset(get_current_request(), Membership, 'view')))
-
-    class Meta:
-        model = User
-        fields = (
-            'id',
-            'username',
-            'normalized_name',
-            'first_name',
-            'last_name',
-            'email',
-            'is_superuser',
-            'is_active',
-            'is_staff',
-            'profile',
-            'note',
-            'memberships',
-        )

apps/api/tests.py

@@ -1,241 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import json
-from datetime import datetime, date
-from decimal import Decimal
-from urllib.parse import quote_plus
-from warnings import warn
-
-from django.contrib.auth.models import User
-from django.contrib.contenttypes.models import ContentType
-from django.db.models.fields.files import ImageFieldFile
-from django.test import TestCase
-from django_filters.rest_framework import DjangoFilterBackend
-from phonenumbers import PhoneNumber
-from rest_framework.filters import OrderingFilter
-from api.filters import RegexSafeSearchFilter
-from member.models import Membership, Club
-from note.models import NoteClub, NoteUser, Alias, Note
-from permission.models import PermissionMask, Permission, Role
-
-from .viewsets import ContentTypeViewSet, UserViewSet
-
-
-class TestAPI(TestCase):
-    """
-    Load API pages and check that filters are working.
-    """
-    fixtures = ('initial', )
-
-    def setUp(self) -> None:
-        self.user = User.objects.create_superuser(
-            username="adminapi",
-            password="adminapi",
-            email="adminapi@example.com",
-            last_name="Admin",
-            first_name="Admin",
-        )
-        self.client.force_login(self.user)
-
-        sess = self.client.session
-        sess["permission_mask"] = 42
-        sess.save()
-
-    def check_viewset(self, viewset, url):
-        """
-        This function should be called inside a unit test.
-        This loads the viewset and for each filter entry, it checks that the filter is running good.
-        """
-        resp = self.client.get(url + "?format=json")
-        self.assertEqual(resp.status_code, 200)
-
-        model = viewset.serializer_class.Meta.model
-
-        if not model.objects.exists():  # pragma: no cover
-            warn(f"Warning: unable to test API filters for the model {model._meta.verbose_name} "
-                 "since there is no instance of it.")
-            return
-
-        if hasattr(viewset, "filter_backends"):
-            backends = viewset.filter_backends
-            obj = model.objects.last()
-
-            if DjangoFilterBackend in backends:
-                # Specific search
-                for field in viewset.filterset_fields:
-                    obj = self.fix_note_object(obj, field)
-
-                    value = self.get_value(obj, field)
-                    if value is None:  # pragma: no cover
-                        warn(f"Warning: the filter {field} for the model {model._meta.verbose_name} "
-                             "has not been tested.")
-                        continue
-                    resp = self.client.get(url + f"?format=json&{field}={quote_plus(str(value))}")
-                    self.assertEqual(resp.status_code, 200, f"The filter {field} for the model "
-                                                            f"{model._meta.verbose_name} does not work. "
-                                                            f"Given parameter: {value}")
-                    content = json.loads(resp.content)
-                    self.assertGreater(content["count"], 0, f"The filter {field} for the model "
-                                                            f"{model._meta.verbose_name} does not work. "
-                                                            f"Given parameter: {value}")
-
-            if OrderingFilter in backends:
-                # Ensure that ordering is working well
-                for field in viewset.ordering_fields:
-                    resp = self.client.get(url + f"?ordering={field}")
-                    self.assertEqual(resp.status_code, 200)
-                    resp = self.client.get(url + f"?ordering=-{field}")
-                    self.assertEqual(resp.status_code, 200)
-
-            if RegexSafeSearchFilter in backends:
-                # Basic search
-                for field in viewset.search_fields:
-                    obj = self.fix_note_object(obj, field)
-
-                    if field[0] == '$' or field[0] == '=':
-                        field = field[1:]
-                    value = self.get_value(obj, field)
-                    if value is None:  # pragma: no cover
-                        warn(f"Warning: the filter {field} for the model {model._meta.verbose_name} "
-                             "has not been tested.")
-                        continue
-                    resp = self.client.get(url + f"?format=json&search={quote_plus(str(value))}")
-                    self.assertEqual(resp.status_code, 200, f"The filter {field} for the model "
-                                                            f"{model._meta.verbose_name} does not work. "
-                                                            f"Given parameter: {value}")
-                    content = json.loads(resp.content)
-                    self.assertGreater(content["count"], 0, f"The filter {field} for the model "
-                                                            f"{model._meta.verbose_name} does not work. "
-                                                            f"Given parameter: {value}")
-
-            self.check_permissions(url, obj)
-
-    def check_permissions(self, url, obj):
-        """
-        Check that permissions are working
-        """
-        # Drop rights
-        self.user.is_superuser = False
-        self.user.save()
-        sess = self.client.session
-        sess["permission_mask"] = 0
-        sess.save()
-
-        # Delete user permissions
-        for m in Membership.objects.filter(user=self.user).all():
-            m.roles.clear()
-            m.save()
-
-        # Create a new role, which will have the checking permission
-        role = Role.objects.get_or_create(name="β-tester")[0]
-        role.permissions.clear()
-        role.save()
-        membership = Membership.objects.get_or_create(user=self.user, club=Club.objects.get(name="BDE"))[0]
-        membership.roles.set([role])
-        membership.save()
-
-        # Ensure that the access to the object is forbidden without permission
-        resp = self.client.get(url + f"{obj.pk}/")
-        self.assertEqual(resp.status_code, 404, f"Mysterious access to {url}{obj.pk}/ for {obj}")
-
-        obj.refresh_from_db()
-
-        # There are problems with polymorphism
-        if isinstance(obj, Note) and hasattr(obj, "note_ptr"):
-            obj = obj.note_ptr
-
-        mask = PermissionMask.objects.get(rank=0)
-
-        for field in obj._meta.fields:
-            # Build permission query
-            value = self.get_value(obj, field.name)
-            if isinstance(value, date) or isinstance(value, datetime):
-                value = value.isoformat()
-            elif isinstance(value, ImageFieldFile):
-                value = value.name
-            elif isinstance(value, Decimal):
-                value = str(value)
-            query = json.dumps({field.name: value})
-
-            # Create sample permission
-            permission = Permission.objects.get_or_create(
-                model=ContentType.objects.get_for_model(obj._meta.model),
-                query=query,
-                mask=mask,
-                type="view",
-                permanent=False,
-                description=f"Can view {obj._meta.verbose_name}",
-            )[0]
-            role.permissions.set([permission])
-            role.save()
-
-            # Check that the access is possible
-            resp = self.client.get(url + f"{obj.pk}/")
-            self.assertEqual(resp.status_code, 200, f"Permission {permission.query} is not working "
-                                                    f"for the model {obj._meta.verbose_name}")
-
-        # Restore rights
-        self.user.is_superuser = True
-        self.user.save()
-        sess = self.client.session
-        sess["permission_mask"] = 42
-        sess.save()
-
-    @staticmethod
-    def get_value(obj, key: str):
-        """
-        Resolve the queryset filter to get the Python value of an object.
-        """
-        if hasattr(obj, "all"):
-            # obj is a RelatedManager
-            obj = obj.last()
-
-        if obj is None:  # pragma: no cover
-            return None
-
-        if '__' not in key:
-            obj = getattr(obj, key)
-            if hasattr(obj, "pk"):
-                return obj.pk
-            elif hasattr(obj, "all"):
-                if not obj.exists():  # pragma: no cover
-                    return None
-                return obj.last().pk
-            elif isinstance(obj, bool):
-                return int(obj)
-            elif isinstance(obj, datetime):
-                return obj.isoformat()
-            elif isinstance(obj, PhoneNumber):
-                return obj.raw_input
-            return obj
-
-        key, remaining = key.split('__', 1)
-        return TestAPI.get_value(getattr(obj, key), remaining)
-
-    @staticmethod
-    def fix_note_object(obj, field):
-        """
-        When querying an object that has a noteclub or a noteuser field,
-        ensure that the object has a good value.
-        """
-        if isinstance(obj, Alias):
-            if "noteuser" in field:
-                return NoteUser.objects.last().alias.last()
-            elif "noteclub" in field:
-                return NoteClub.objects.last().alias.last()
-        elif isinstance(obj, Note):
-            if "noteuser" in field:
-                return NoteUser.objects.last()
-            elif "noteclub" in field:
-                return NoteClub.objects.last()
-        return obj
-
-
-class TestBasicAPI(TestAPI):
-    def test_user_api(self):
-        """
-        Load the user page.
-        """
-        self.check_viewset(ContentTypeViewSet, "/api/models/")
-        self.check_viewset(UserViewSet, "/api/user/")

apps/api/urls.py

@@ -1,12 +1,10 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.conf import settings
-from django.conf.urls import include
+from django.conf.urls import url, include
-from django.urls import re_path
 from rest_framework import routers
 
-from .views import UserInformationView
 from .viewsets import ContentTypeViewSet, UserViewSet
 
 # Routers provide an easy way of automatically determining the URL conf.
@@ -15,33 +13,29 @@ router = routers.DefaultRouter()
 router.register('models', ContentTypeViewSet)
 router.register('user', UserViewSet)
 
-if "activity" in settings.INSTALLED_APPS:
-    from activity.api.urls import register_activity_urls
-    register_activity_urls(router, 'activity')
-
-if "food" in settings.INSTALLED_APPS:
-    from food.api.urls import register_food_urls
-    register_food_urls(router, 'food')
-
-if "logs" in settings.INSTALLED_APPS:
-    from logs.api.urls import register_logs_urls
-    register_logs_urls(router, 'logs')
-
 if "member" in settings.INSTALLED_APPS:
     from member.api.urls import register_members_urls
     register_members_urls(router, 'members')
 
+if "member" in settings.INSTALLED_APPS:
+    from activity.api.urls import register_activity_urls
+    register_activity_urls(router, 'activity')
+
 if "note" in settings.INSTALLED_APPS:
     from note.api.urls import register_note_urls
     register_note_urls(router, 'note')
 
+if "treasury" in settings.INSTALLED_APPS:
+    from treasury.api.urls import register_treasury_urls
+    register_treasury_urls(router, 'treasury')
+
 if "permission" in settings.INSTALLED_APPS:
     from permission.api.urls import register_permission_urls
     register_permission_urls(router, 'permission')
 
-if "treasury" in settings.INSTALLED_APPS:
+if "logs" in settings.INSTALLED_APPS:
-    from treasury.api.urls import register_treasury_urls
+    from logs.api.urls import register_logs_urls
-    register_treasury_urls(router, 'treasury')
+    register_logs_urls(router, 'logs')
 
 if "wei" in settings.INSTALLED_APPS:
     from wei.api.urls import register_wei_urls
@@ -52,7 +46,6 @@ app_name = 'api'
 # Wire up our API using automatic URL routing.
 # Additionally, we include login URLs for the browsable API.
 urlpatterns = [
-    re_path('^', include(router.urls)),
+    url('^', include(router.urls)),
-    re_path('^me/', UserInformationView.as_view()),
+    url('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
-    re_path('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 ]

apps/api/views.py

@@ -1,20 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.contrib.auth.models import User
-from rest_framework.generics import RetrieveAPIView
-
-from .serializers import OAuthSerializer
-
-
-class UserInformationView(RetrieveAPIView):
-    """
-    These fields are give to OAuth authenticators.
-    """
-    serializer_class = OAuthSerializer
-
-    def get_queryset(self):
-        return User.objects.filter(pk=self.request.user.pk)
-
-    def get_object(self):
-        return self.request.user

apps/api/viewsets.py

@@ -1,8 +1,6 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import re
-
 from django.contrib.contenttypes.models import ContentType
 from django_filters.rest_framework import DjangoFilterBackend
 from django.db.models import Q
@@ -10,20 +8,12 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from rest_framework.viewsets import ReadOnlyModelViewSet, ModelViewSet
 from permission.backends import PermissionBackend
+from note_kfet.middlewares import get_current_session
 from note.models import Alias
 
-from .filters import RegexSafeSearchFilter
 from .serializers import UserSerializer, ContentTypeSerializer
 
 
-def is_regex(pattern):
-    try:
-        re.compile(pattern)
-        return True
-    except (re.error, TypeError):
-        return False
-
-
 class ReadProtectedModelViewSet(ModelViewSet):
     """
     Protect a ModelViewSet by filtering the objects that the user cannot see.
@@ -34,7 +24,9 @@ class ReadProtectedModelViewSet(ModelViewSet):
         self.model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class()
 
     def get_queryset(self):
-        return self.queryset.filter(PermissionBackend.filter_queryset(self.request, self.model, "view")).distinct()
+        user = self.request.user
+        get_current_session().setdefault("permission_mask", 42)
+        return self.queryset.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
 
 
 class ReadOnlyProtectedModelViewSet(ReadOnlyModelViewSet):
@@ -47,20 +39,21 @@ class ReadOnlyProtectedModelViewSet(ReadOnlyModelViewSet):
         self.model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class()
 
     def get_queryset(self):
-        return self.queryset.filter(PermissionBackend.filter_queryset(self.request, self.model, "view")).distinct()
+        user = self.request.user
+        get_current_session().setdefault("permission_mask", 42)
+        return self.queryset.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
 
 
 class UserViewSet(ReadProtectedModelViewSet):
     """
     REST API View set.
     The djangorestframework plugin will get all `User` objects, serialize it to JSON with the given serializer,
-    then render it on /api/user/
+    then render it on /api/users/
     """
-    queryset = User.objects
+    queryset = User.objects.all()
     serializer_class = UserSerializer
     filter_backends = [DjangoFilterBackend]
-    filterset_fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_superuser', 'is_staff', 'is_active',
+    filterset_fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_superuser', 'is_staff', 'is_active', ]
-                        'note__alias__name', 'note__alias__normalized_name', ]
 
     def get_queryset(self):
         queryset = super().get_queryset()
@@ -70,38 +63,34 @@ class UserViewSet(ReadProtectedModelViewSet):
 
         if "search" in self.request.GET:
             pattern = self.request.GET["search"]
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__istartswith"
-            prefix = "^" if valid_regex else ""
 
             # Filter with different rules
             # We use union-all to keep each filter rule sorted in result
             queryset = queryset.filter(
                 # Match without normalization
-                Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                note__alias__name__iregex="^" + pattern
             ).union(
                 queryset.filter(
                     # Match with normalization
-                    Q(**{f"note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                    Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                    & ~Q(note__alias__name__iregex="^" + pattern)
                 ),
                 all=True,
             ).union(
                 queryset.filter(
                     # Match on lower pattern
-                    Q(**{f"note__alias__normalized_name{suffix}": prefix + pattern.lower()})
+                    Q(note__alias__normalized_name__iregex="^" + pattern.lower())
-                    & ~Q(**{f"note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                    & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                    & ~Q(note__alias__name__iregex="^" + pattern)
                 ),
                 all=True,
             ).union(
                 queryset.filter(
                     # Match on firstname or lastname
-                    (Q(**{f"last_name{suffix}": prefix + pattern}) | Q(**{f"first_name{suffix}": prefix + pattern}))
+                    (Q(last_name__iregex="^" + pattern) | Q(first_name__iregex="^" + pattern))
-                    & ~Q(**{f"note__alias__normalized_name{suffix}": prefix + pattern.lower()})
+                    & ~Q(note__alias__normalized_name__iregex="^" + pattern.lower())
-                    & ~Q(**{f"note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                    & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                    & ~Q(note__alias__name__iregex="^" + pattern)
                 ),
                 all=True,
             )
@@ -117,10 +106,7 @@ class ContentTypeViewSet(ReadOnlyModelViewSet):
     """
     REST API View set.
     The djangorestframework plugin will get all `User` objects, serialize it to JSON with the given serializer,
-    then render it on /api/models/
+    then render it on /api/users/
     """
-    queryset = ContentType.objects.order_by('id')
+    queryset = ContentType.objects.all()
     serializer_class = ContentTypeSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
-    filterset_fields = ['id', 'app_label', 'model', ]
-    search_fields = ['$app_label', '$model', ]

apps/food/admin.py

@@ -1,37 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.contrib import admin
-from django.db import transaction
-from note_kfet.admin import admin_site
-
-from .models import Allergen, BasicFood, QRCode, TransformedFood
-
-
-@admin.register(QRCode, site=admin_site)
-class QRCodeAdmin(admin.ModelAdmin):
-    pass
-
-
-@admin.register(BasicFood, site=admin_site)
-class BasicFoodAdmin(admin.ModelAdmin):
-    @transaction.atomic
-    def save_related(self, *args, **kwargs):
-        ans = super().save_related(*args, **kwargs)
-        args[1].instance.update()
-        return ans
-
-
-@admin.register(TransformedFood, site=admin_site)
-class TransformedFoodAdmin(admin.ModelAdmin):
-    exclude = ["allergens", "expiry_date"]
-
-    @transaction.atomic
-    def save_related(self, request, form, *args, **kwargs):
-        super().save_related(request, form, *args, **kwargs)
-        form.instance.update()
-
-
-@admin.register(Allergen, site=admin_site)
-class AllergenAdmin(admin.ModelAdmin):
-    pass

apps/food/api/serializers.py

@@ -1,50 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from rest_framework import serializers
-
-from ..models import Allergen, BasicFood, QRCode, TransformedFood
-
-
-class AllergenSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Allergen.
-    The djangorestframework plugin will analyse the model `Allergen` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = Allergen
-        fields = '__all__'
-
-
-class BasicFoodSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for BasicFood.
-    The djangorestframework plugin will analyse the model `BasicFood` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = BasicFood
-        fields = '__all__'
-
-
-class QRCodeSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for QRCode.
-    The djangorestframework plugin will analyse the model `QRCode` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = QRCode
-        fields = '__all__'
-
-
-class TransformedFoodSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for TransformedFood.
-    The djangorestframework plugin will analyse the model `TransformedFood` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = TransformedFood
-        fields = '__all__'

apps/food/api/urls.py

@@ -1,14 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from .views import AllergenViewSet, BasicFoodViewSet, QRCodeViewSet, TransformedFoodViewSet
-
-
-def register_food_urls(router, path):
-    """
-    Configure router for Food REST API.
-    """
-    router.register(path + '/allergen', AllergenViewSet)
-    router.register(path + '/basic_food', BasicFoodViewSet)
-    router.register(path + '/qrcode', QRCodeViewSet)
-    router.register(path + '/transformed_food', TransformedFoodViewSet)

apps/food/api/views.py

@@ -1,61 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from api.viewsets import ReadProtectedModelViewSet
-from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.filters import SearchFilter
-
-from .serializers import AllergenSerializer, BasicFoodSerializer, QRCodeSerializer, TransformedFoodSerializer
-from ..models import Allergen, BasicFood, QRCode, TransformedFood
-
-
-class AllergenViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `Allergen` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/allergen/
-    """
-    queryset = Allergen.objects.order_by('id')
-    serializer_class = AllergenSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-class BasicFoodViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `BasicFood` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/basic_food/
-    """
-    queryset = BasicFood.objects.order_by('id')
-    serializer_class = BasicFoodSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-class QRCodeViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `QRCode` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/qrcode/
-    """
-    queryset = QRCode.objects.order_by('id')
-    serializer_class = QRCodeSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['qr_code_number', ]
-    search_fields = ['$qr_code_number', ]
-
-
-class TransformedFoodViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `TransformedFood` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/transformed_food/
-    """
-    queryset = TransformedFood.objects.order_by('id')
-    serializer_class = TransformedFoodSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]

apps/food/apps.py

@@ -1,11 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-from django.utils.translation import gettext_lazy as _
-from django.apps import AppConfig
-
-
-class FoodkfetConfig(AppConfig):
-    name = 'food'
-    verbose_name = _('food')

apps/food/forms.py

@@ -1,114 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from random import shuffle
-
-from django import forms
-from django.utils.translation import gettext_lazy as _
-from django.utils import timezone
-from member.models import Club
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
-from note_kfet.inputs import Autocomplete
-from note_kfet.middlewares import get_current_request
-from permission.backends import PermissionBackend
-
-from .models import BasicFood, QRCode, TransformedFood
-
-
-class AddIngredientForms(forms.ModelForm):
-    """
-    Form for add an ingredient
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['ingredient'].queryset = self.fields['ingredient'].queryset.filter(
-            polymorphic_ctype__model='transformedfood',
-            is_ready=False,
-            is_active=True,
-            was_eaten=False,
-        )
-        # Caution, the logic is inverted here, we flip the logic on saving in AddIngredientView
-        self.fields['is_active'].initial = True
-        self.fields['is_active'].label = _("Fully used")
-
-    class Meta:
-        model = TransformedFood
-        fields = ('ingredient', 'is_active')
-
-
-class BasicFoodForms(forms.ModelForm):
-    """
-    Form for add non-transformed food
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
-        self.fields['name'].required = True
-        self.fields['owner'].required = True
-
-        # Some example
-        self.fields['name'].widget.attrs.update({"placeholder": _("Pasta METRO 5kg")})
-        clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
-        shuffle(clubs)
-        self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
-
-    class Meta:
-        model = BasicFood
-        fields = ('name', 'owner', 'date_type', 'expiry_date', 'is_active', 'was_eaten', 'allergens',)
-        widgets = {
-            "owner": Autocomplete(
-                model=Club,
-                attrs={"api_url": "/api/members/club/"},
-            ),
-            'expiry_date': DateTimePickerInput(),
-        }
-
-
-class QRCodeForms(forms.ModelForm):
-    """
-    Form for create QRCode
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['food_container'].queryset = self.fields['food_container'].queryset.filter(
-            is_active=True,
-            was_eaten=False,
-            polymorphic_ctype__model='transformedfood',
-        )
-
-    class Meta:
-        model = QRCode
-        fields = ('food_container',)
-
-
-class TransformedFoodForms(forms.ModelForm):
-    """
-    Form for add transformed food
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
-        self.fields['name'].required = True
-        self.fields['owner'].required = True
-        self.fields['creation_date'].required = True
-        self.fields['creation_date'].initial = timezone.now
-        self.fields['is_active'].initial = True
-        self.fields['is_ready'].initial = False
-        self.fields['was_eaten'].initial = False
-
-        # Some example
-        self.fields['name'].widget.attrs.update({"placeholder": _("Lasagna")})
-        clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
-        shuffle(clubs)
-        self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
-
-    class Meta:
-        model = TransformedFood
-        fields = ('name', 'creation_date', 'owner', 'is_active', 'is_ready', 'was_eaten', 'shelf_life')
-        widgets = {
-            "owner": Autocomplete(
-                model=Club,
-                attrs={"api_url": "/api/members/club/"},
-            ),
-            'creation_date': DateTimePickerInput(),
-        }

apps/food/migrations/0001_initial.py

@@ -1,84 +0,0 @@
-# Generated by Django 2.2.28 on 2024-07-05 08:57
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('member', '0011_profile_vss_charter_read'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Allergen',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-            ],
-            options={
-                'verbose_name': 'Allergen',
-                'verbose_name_plural': 'Allergens',
-            },
-        ),
-        migrations.CreateModel(
-            name='Food',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-                ('expiry_date', models.DateTimeField(verbose_name='expiry date')),
-                ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
-                ('is_ready', models.BooleanField(default=False, verbose_name='is ready')),
-                ('allergens', models.ManyToManyField(blank=True, to='food.Allergen', verbose_name='allergen')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')),
-                ('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_food.food_set+', to='contenttypes.ContentType')),
-            ],
-            options={
-                'verbose_name': 'foods',
-            },
-        ),
-        migrations.CreateModel(
-            name='BasicFood',
-            fields=[
-                ('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')),
-                ('date_type', models.CharField(choices=[('DLC', 'DLC'), ('DDM', 'DDM')], max_length=255)),
-                ('arrival_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='arrival date')),
-            ],
-            options={
-                'verbose_name': 'Basic food',
-                'verbose_name_plural': 'Basic foods',
-            },
-            bases=('food.food',),
-        ),
-        migrations.CreateModel(
-            name='QRCode',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('qr_code_number', models.PositiveIntegerField(unique=True, verbose_name='QR-code number')),
-                ('food_container', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.Food', verbose_name='food container')),
-            ],
-            options={
-                'verbose_name': 'QR-code',
-                'verbose_name_plural': 'QR-codes',
-            },
-        ),
-        migrations.CreateModel(
-            name='TransformedFood',
-            fields=[
-                ('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')),
-                ('creation_date', models.DateTimeField(verbose_name='creation date')),
-                ('is_active', models.BooleanField(default=True, verbose_name='is active')),
-                ('ingredient', models.ManyToManyField(blank=True, related_name='transformed_ingredient_inv', to='food.Food', verbose_name='transformed ingredient')),
-            ],
-            options={
-                'verbose_name': 'Transformed food',
-                'verbose_name_plural': 'Transformed foods',
-            },
-            bases=('food.food',),
-        ),
-    ]

apps/food/migrations/0002_transformedfood_shelf_life.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.28 on 2024-07-06 20:37
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='transformedfood',
-            name='shelf_life',
-            field=models.DurationField(default=datetime.timedelta(days=3), verbose_name='shelf life'),
-        ),
-    ]

apps/food/migrations/0003_create_14_allergens_mandatory.py

@@ -1,62 +0,0 @@
-from django.db import migrations
-
-def create_14_mandatory_allergens(apps, schema_editor):
-    """
-    There are 14 mandatory allergens, they are pre-injected
-    """
-
-    Allergen = apps.get_model("food", "allergen")
-    
-    Allergen.objects.get_or_create(
-        name="Gluten",
-    ) 
-    Allergen.objects.get_or_create(
-        name="Fruits à coques",
-    )
-    Allergen.objects.get_or_create(
-        name="Crustacés",
-    )
-    Allergen.objects.get_or_create(
-        name="Céléri",
-    )
-    Allergen.objects.get_or_create(
-        name="Oeufs",
-    )
-    Allergen.objects.get_or_create(
-        name="Moutarde",
-    )
-    Allergen.objects.get_or_create(
-        name="Poissons",
-    )
-    Allergen.objects.get_or_create(
-        name="Soja",
-    )
-    Allergen.objects.get_or_create(
-        name="Lait",
-    )
-    Allergen.objects.get_or_create(
-        name="Sulfites",
-    )
-    Allergen.objects.get_or_create(
-        name="Sésame",
-    )
-    Allergen.objects.get_or_create(
-        name="Lupin",
-    )
-    Allergen.objects.get_or_create(
-        name="Arachides",
-    )
-    Allergen.objects.get_or_create(
-        name="Mollusques",
-    )
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('food', '0002_transformedfood_shelf_life'),
-    ]
-
-    operations = [
-        migrations.RunPython(create_14_mandatory_allergens),
-    ]
-    
-    

apps/food/migrations/0004_auto_20240813_2358.py

@@ -1,28 +0,0 @@
-# Generated by Django 2.2.28 on 2024-08-13 21:58
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0003_create_14_allergens_mandatory'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='transformedfood',
-            name='is_active',
-        ),
-        migrations.AddField(
-            model_name='food',
-            name='is_active',
-            field=models.BooleanField(default=True, verbose_name='is active'),
-        ),
-        migrations.AlterField(
-            model_name='qrcode',
-            name='food_container',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='QR_code', to='food.Food', verbose_name='food container'),
-        ),
-    ]

apps/food/migrations/0005_alter_food_polymorphic_ctype.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.15 on 2024-08-28 08:00
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('food', '0004_auto_20240813_2358'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='food',
-            name='polymorphic_ctype',
-            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
-        ),
-    ]

apps/food/models.py

@@ -1,226 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import timedelta
-
-from django.db import models, transaction
-from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
-from member.models import Club
-from polymorphic.models import PolymorphicModel
-
-
-class QRCode(models.Model):
-    """
-    An QRCode model
-    """
-    qr_code_number = models.PositiveIntegerField(
-        verbose_name=_("QR-code number"),
-        unique=True,
-    )
-
-    food_container = models.ForeignKey(
-        'Food',
-        on_delete=models.CASCADE,
-        related_name='QR_code',
-        verbose_name=_('food container'),
-    )
-
-    class Meta:
-        verbose_name = _("QR-code")
-        verbose_name_plural = _("QR-codes")
-
-    def __str__(self):
-        return _("QR-code number {qr_code_number}").format(qr_code_number=self.qr_code_number)
-
-
-class Allergen(models.Model):
-    """
-    A list of allergen and alimentary restrictions
-    """
-    name = models.CharField(
-        verbose_name=_('name'),
-        max_length=255,
-    )
-
-    class Meta:
-        verbose_name = _('Allergen')
-        verbose_name_plural = _('Allergens')
-
-    def __str__(self):
-        return self.name
-
-
-class Food(PolymorphicModel):
-    name = models.CharField(
-        verbose_name=_('name'),
-        max_length=255,
-    )
-
-    owner = models.ForeignKey(
-        Club,
-        on_delete=models.PROTECT,
-        related_name='+',
-        verbose_name=_('owner'),
-    )
-
-    allergens = models.ManyToManyField(
-        Allergen,
-        blank=True,
-        verbose_name=_('allergen'),
-    )
-
-    expiry_date = models.DateTimeField(
-        verbose_name=_('expiry date'),
-        null=False,
-    )
-
-    was_eaten = models.BooleanField(
-        default=False,
-        verbose_name=_('was eaten'),
-    )
-
-    # is_ready != is_active : is_ready signifie que la nourriture est prête à être manger,
-    #                         is_active signifie que la nourriture n'est pas encore archivé
-    # il sert dans les cas où il est plus intéressant que de l'open soit conservé (confiture par ex)
-
-    is_ready = models.BooleanField(
-        default=False,
-        verbose_name=_('is ready'),
-    )
-
-    is_active = models.BooleanField(
-        default=True,
-        verbose_name=_('is active'),
-    )
-
-    def __str__(self):
-        return self.name
-
-    @transaction.atomic
-    def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
-        return super().save(force_insert, force_update, using, update_fields)
-
-    class Meta:
-        verbose_name = _('food')
-        verbose_name = _('foods')
-
-
-class BasicFood(Food):
-    """
-    Food which has been directly buy on supermarket
-    """
-    date_type = models.CharField(
-        max_length=255,
-        choices=(
-            ("DLC", "DLC"),
-            ("DDM", "DDM"),
-        )
-    )
-
-    arrival_date = models.DateTimeField(
-        verbose_name=_('arrival date'),
-        default=timezone.now,
-    )
-
-    # label = models.ImageField(
-    #     verbose_name=_('food label'),
-    #     max_length=255,
-    #     blank=False,
-    #     null=False,
-    #     upload_to='label/',
-    # )
-
-    @transaction.atomic
-    def update_allergens(self):
-        # update parents
-        for parent in self.transformed_ingredient_inv.iterator():
-            parent.update_allergens()
-
-    @transaction.atomic
-    def update_expiry_date(self):
-        # update parents
-        for parent in self.transformed_ingredient_inv.iterator():
-            parent.update_expiry_date()
-
-    @transaction.atomic
-    def update(self):
-        self.update_allergens()
-        self.update_expiry_date()
-
-    class Meta:
-        verbose_name = _('Basic food')
-        verbose_name_plural = _('Basic foods')
-
-
-class TransformedFood(Food):
-    """
-    Transformed food  are a mix between basic food and meal
-    """
-    creation_date = models.DateTimeField(
-        verbose_name=_('creation date'),
-    )
-
-    ingredient = models.ManyToManyField(
-        Food,
-        blank=True,
-        symmetrical=False,
-        related_name='transformed_ingredient_inv',
-        verbose_name=_('transformed ingredient'),
-    )
-
-    # Without microbiological analyzes, the storage time is 3 days
-    shelf_life = models.DurationField(
-        verbose_name=_("shelf life"),
-        default=timedelta(days=3),
-    )
-
-    @transaction.atomic
-    def archive(self):
-        # When a meal are archived, if it was eaten, update ingredient fully used for this meal
-        raise NotImplementedError
-
-    @transaction.atomic
-    def update_allergens(self):
-        # When allergens are changed, simply update the parents' allergens
-        old_allergens = list(self.allergens.all())
-        self.allergens.clear()
-        for ingredient in self.ingredient.iterator():
-            self.allergens.set(self.allergens.union(ingredient.allergens.all()))
-
-        if old_allergens == list(self.allergens.all()):
-            return
-        super().save()
-
-        # update parents
-        for parent in self.transformed_ingredient_inv.iterator():
-            parent.update_allergens()
-
-    @transaction.atomic
-    def update_expiry_date(self):
-        # When expiry_date is changed, simply update the parents' expiry_date
-        old_expiry_date = self.expiry_date
-        self.expiry_date = self.creation_date + self.shelf_life
-        for ingredient in self.ingredient.iterator():
-            self.expiry_date = min(self.expiry_date, ingredient.expiry_date)
-
-        if old_expiry_date == self.expiry_date:
-            return
-        super().save()
-
-        # update parents
-        for parent in self.transformed_ingredient_inv.iterator():
-            parent.update_expiry_date()
-
-    @transaction.atomic
-    def update(self):
-        self.update_allergens()
-        self.update_expiry_date()
-
-    @transaction.atomic
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-
-    class Meta:
-        verbose_name = _('Transformed food')
-        verbose_name_plural = _('Transformed foods')

apps/food/tables.py

@@ -1,19 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import django_tables2 as tables
-from django_tables2 import A
-
-from .models import TransformedFood
-
-
-class TransformedFoodTable(tables.Table):
-    name = tables.LinkColumn(
-        'food:food_view',
-        args=[A('pk'), ],
-    )
-
-    class Meta:
-        model = TransformedFood
-        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('name', "owner", "allergens", "expiry_date")

apps/food/templates/food/add_ingredient_form.html

@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {%  csrf_token %}
-      {{ form|crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/basicfood_detail.html

@@ -1,37 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }} {{ food.name }}
-  </h3>
-  <div class="card-body">
-    <ul>
-      <li><p>{% trans 'Owner' %} : {{ food.owner }}</p></li>
-      <li><p>{% trans 'Arrival date' %} : {{ food.arrival_date }}</p></li>
-      <li><p>{% trans 'Expiry date' %} : {{ food.expiry_date }} ({{ food.date_type }})</p></li>
-      <li>{% trans 'Allergens' %} :</li>
-      <ul>
-      {% for allergen in food.allergens.iterator %}
-        <li>{{ allergen.name }}</li>
-      {% endfor %}
-      </ul>
-	<p>
-	<li><p>{% trans 'Active' %} : {{ food.is_active }}<p></li>
-	<li><p>{% trans 'Eaten' %} : {{ food.was_eaten }}<p></li>
-    </ul>
-    {% if can_update %}
-	<a class="btn btn-sm btn-warning" href="{% url "food:basic_update" pk=food.pk %}">{% trans 'Update' %}</a>
-    {% endif %}
-    {% if can_add_ingredient %}
-    	<a class="btn btn-sm btn-success" href="{% url "food:add_ingredient" pk=food.pk %}">
-		{% trans 'Add to a meal' %}
-	</a>
-    {% endif %}
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/basicfood_form.html

@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/create_qrcode_form.html

@@ -1,55 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load render_table from django_tables2 %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <a class="btn btn-sm btn-success" href="{% url "food:qrcode_basic_create" slug=slug %}">
-      {% trans 'New basic food' %}
-    </a>
-    <form method="post">
-      {%  csrf_token %}
-      {{ form|crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
-    </form>
-    <div class="card-body" id="profile_infos">
-      <h4>{% trans "Copy constructor" %}</h4>
-      <table class="table">
-        <thead>
-          <tr>
-            <th class="orderable">
-              {% trans "Name" %}
-            </th>
-            <th class="orderable">
-              {% trans "Owner" %}
-            </th>
-            <th class="orderable">
-              {% trans "Arrival date" %}
-            </th>
-            <th class="orderable">
-              {% trans "Expiry date" %}
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for basic in last_basic %}
-            <tr>
-              <td><a href="{% url "food:qrcode_basic_create" slug=slug %}?copy={{ basic.pk }}">{{ basic.name }}</a></td>
-              <td>{{ basic.owner }}</td>
-              <td>{{ basic.arrival_date }}</td>
-              <td>{{ basic.expiry_date }}</td>
-            </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/qrcode_detail.html

@@ -1,39 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-    <h3 class="card-header text-center">
-	{{ title }} {% trans 'number' %} {{ qrcode.qr_code_number }}
-    </h3>
-	<div class="card-body">
-	    <ul>
-		<li><p>{% trans 'Name' %} : {{ qrcode.food_container.name }}</p></li>
-		<li><p>{% trans 'Owner' %} : {{ qrcode.food_container.owner }}</p></li>
-		<li><p>{% trans 'Expiry date' %} : {{ qrcode.food_container.expiry_date  }}</p></li>
-	    </ul>
-	{% if qrcode.food_container.polymorphic_ctype.model == 'basicfood' and can_update_basic %}
-	    <a class="btn btn-sm btn-warning" href="{% url "food:basic_update" pk=qrcode.food_container.pk %}" data-turbolinks="false">
-		{% trans 'Update' %}
-	    </a>
-	{% elif can_update_transformed %}
-	    <a class="btn btn-sm btn-warning" href="{% url "food:transformed_update" pk=qrcode.food_container.pk %}">
-		{% trans 'Update' %}
-	    </a>
-	{% endif %}
-	{% if can_view_detail %}
-	    <a class="btn btn-sm btn-primary" href="{% url "food:food_view" pk=qrcode.food_container.pk %}">
-		{% trans 'View details' %}
-	    </a>
-	{% endif %}
-	{% if can_add_ingredient %}
-	    <a class="btn btn-sm btn-success" href="{% url "food:add_ingredient" pk=qrcode.food_container.pk %}">
-		{% trans 'Add to a meal' %}
-	    </a>
-	{% endif %}
-	</div>
-</div>
-{% endblock %}

apps/food/templates/food/transformedfood_detail.html

@@ -1,51 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-    <h3 class="card-header text-center">
-	{{ title }} {{ food.name }}
-    </h3>
-	<div class="card-body">
-	    <ul>
-		<li><p>{% trans 'Owner' %} : {{ food.owner }}</p></li>
-		{% if can_see_ready %}
-		<li><p>{% trans 'Ready' %} : {{ food.is_ready }}</p></li>
-		{% endif %}
-		<li><p>{% trans 'Creation date' %} : {{ food.creation_date }}</p></li>
-		<li><p>{% trans 'Expiry date' %} : {{ food.expiry_date }}</p></li>
-		<li>{% trans 'Allergens' %} :</li>
-		<ul>
-		    {% for allergen in food.allergens.iterator %}
-		    <li>{{ allergen.name }}</li>
-		    {% endfor %}
-	        </ul>
-		<p>
-		<li>{% trans 'Ingredients' %} :</li>
-		<ul>
-		    {% for ingredient in food.ingredient.iterator %}
-		    <li><a href="{% url "food:food_view" pk=ingredient.pk %}">{{ ingredient.name }}</a></li>
-		    {% endfor %}
-		</ul>
-		<p>
-		<li><p>{% trans 'Shelf life' %} : {{ food.shelf_life }}</p></li>
-		<li><p>{% trans 'Ready' %} : {{ food.is_ready }}</p></li>
-		<li><p>{% trans 'Active' %} : {{ food.is_active }}</p></li>
-		<li><p>{% trans 'Eaten' %} : {{ food.was_eaten }}</p></li>
-	    </ul>
-	    {% if can_update %}
-	        <a class="btn btn-sm btn-warning" href="{% url "food:transformed_update" pk=food.pk %}">
-		    {% trans 'Update' %}
-		</a>
-	    {% endif %}
-	    {% if can_add_ingredient %}
-	        <a class="btn btn-sm btn-success" href="{% url "food:add_ingredient" pk=food.pk %}">
-		    {% trans 'Add to a meal' %}
-		</a>
-	    {% endif %}
-    </div>
-</div>
-{% endblock %}

apps/food/templates/food/transformedfood_form.html

@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {%  csrf_token %}
-      {{ form|crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/transformedfood_list.html

@@ -1,60 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load render_table from django_tables2 %}
-{% load i18n %}
-
-{% block content %}
-<div class="card bg-light mb-3">
-    <h3 class="card-header text-center">
-	{% trans "Meal served" %}
-    </h3>
-    {% if can_create_meal %}
-    <div class="card-footer">
-	<a class="btn btn-sm btn-success" href="{% url 'food:transformed_create' %}" data-turbolinks="false">
-	    {% trans 'New meal' %}
-	</a>
-    </div>
-    {% endif %}
-    {% if served.data %}
-    {% render_table served %}
-    {% else %}
-    <div class="card-body">
-	<div class="alert alert-warning">
-	    {% trans "There is no meal served." %}
-	</div>
-    </div>
-    {% endif %}
-</div>
-
-<div class="card bg-light mb-3">
-    <h3 class="card-header text-center">
-	{% trans "Open" %}
-    </h3>
-    {% if open.data %}
-    {% render_table open %}
-    {% else %}
-    <div class="card-body">
-	<div class="alert alert-warning">
-	    {% trans "There is no free meal." %}
-	</div>
-    </div>
-    {% endif %}
-</div>
-
-<div class="card bg-light mb-3">
-    <h3 class="card-header text-center">
-        {% trans "All meals" %}
-    </h3>
-    {% if table.data %}
-    {% render_table table %}
-    {% else %}
-    <div class="card-body">
-        <div class="alert alert-warning">
-            {% trans "There is no meal." %}
-        </div>
-    </div>
-    {% endif %}
-</div>
-{% endblock %}

apps/food/tests.py

@@ -1,3 +0,0 @@
-# from django.test import TestCase
-
-# Create your tests here.

apps/food/urls.py

@@ -1,21 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.urls import path
-
-from . import views
-
-app_name = 'food'
-
-urlpatterns = [
-    path('', views.TransformedListView.as_view(), name='food_list'),
-    path('<int:slug>', views.QRCodeView.as_view(), name='qrcode_view'),
-    path('detail/<int:pk>', views.FoodView.as_view(), name='food_view'),
-
-    path('<int:slug>/create_qrcode', views.QRCodeCreateView.as_view(), name='qrcode_create'),
-    path('<int:slug>/create_qrcode/basic', views.QRCodeBasicFoodCreateView.as_view(), name='qrcode_basic_create'),
-    path('create/transformed', views.TransformedFoodCreateView.as_view(), name='transformed_create'),
-    path('update/basic/<int:pk>', views.BasicFoodUpdateView.as_view(), name='basic_update'),
-    path('update/transformed/<int:pk>', views.TransformedFoodUpdateView.as_view(), name='transformed_update'),
-    path('add/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
-]

apps/food/views.py

@@ -1,421 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.db import transaction
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponseRedirect
-from django_tables2.views import MultiTableMixin
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from django.utils import timezone
-from django.views.generic import DetailView, UpdateView
-from django.views.generic.list import ListView
-from django.forms import HiddenInput
-from permission.backends import PermissionBackend
-from permission.views import ProtectQuerysetMixin, ProtectedCreateView
-
-from .forms import AddIngredientForms, BasicFoodForms, QRCodeForms, TransformedFoodForms
-from .models import BasicFood, Food, QRCode, TransformedFood
-from .tables import TransformedFoodTable
-
-
-class AddIngredientView(ProtectQuerysetMixin, UpdateView):
-    """
-    A view to add an ingredient
-    """
-    model = Food
-    template_name = 'food/add_ingredient_form.html'
-    extra_context = {"title": _("Add the ingredient")}
-    form_class = AddIngredientForms
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["pk"] = self.kwargs["pk"]
-        return context
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        food = Food.objects.get(pk=self.kwargs['pk'])
-        add_ingredient_form = AddIngredientForms(data=self.request.POST)
-        if food.is_ready:
-            form.add_error(None, _("The product is already prepared"))
-            return self.form_invalid(form)
-        if not add_ingredient_form.is_valid():
-            return self.form_invalid(form)
-
-        # We flip logic ""fully used = not is_active""
-        food.is_active = not food.is_active
-        # Save the aliment and the allergens associed
-        for transformed_pk in self.request.POST.getlist('ingredient'):
-            transformed = TransformedFood.objects.get(pk=transformed_pk)
-            if not transformed.is_ready:
-                transformed.ingredient.add(food)
-                transformed.update()
-        food.save()
-
-        return HttpResponseRedirect(self.get_success_url())
-
-    def get_success_url(self, **kwargs):
-        return reverse('food:food_list')
-
-
-class BasicFoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    A view to update a basic food
-    """
-    model = BasicFood
-    form_class = BasicFoodForms
-    template_name = 'food/basicfood_form.html'
-    extra_context = {"title": _("Update an aliment")}
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        basic_food_form = BasicFoodForms(data=self.request.POST)
-        if not basic_food_form.is_valid():
-            return self.form_invalid(form)
-
-        ans = super().form_valid(form)
-        form.instance.update()
-        return ans
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse('food:food_view', kwargs={"pk": self.object.pk})
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        return context
-
-
-class FoodView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-    """
-    A view to see a food
-    """
-    model = Food
-    extra_context = {"title": _("Details of:")}
-    context_object_name = "food"
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        context["can_update"] = PermissionBackend.check_perm(self.request, "food.change_food")
-        context["can_add_ingredient"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood")
-        return context
-
-
-class QRCodeBasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-    #####################################################################
-    # TO DO
-    # - this feature is very pratical for meat or fish, nevertheless we can implement this later
-    # - fix picture save
-    # - implement solution crop and convert image (reuse or recode ImageForm from members apps)
-    #####################################################################
-    """
-    A view to add a basic food with a qrcode
-    """
-    model = BasicFood
-    form_class = BasicFoodForms
-    template_name = 'food/basicfood_form.html'
-    extra_context = {"title": _("Add a new basic food with QRCode")}
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        basic_food_form = BasicFoodForms(data=self.request.POST)
-        if not basic_food_form.is_valid():
-            return self.form_invalid(form)
-
-        # Save the aliment and the allergens associed
-        basic_food = form.save(commit=False)
-        # We assume the date of labeling and the same as the date of arrival
-        basic_food.arrival_date = timezone.now()
-        basic_food.is_ready = False
-        basic_food.is_active = True
-        basic_food.was_eaten = False
-        basic_food._force_save = True
-        basic_food.save()
-        basic_food.refresh_from_db()
-
-        qrcode = QRCode()
-        qrcode.qr_code_number = self.kwargs['slug']
-        qrcode.food_container = basic_food
-        qrcode.save()
-
-        return super().form_valid(form)
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse('food:qrcode_view', kwargs={"slug": self.kwargs['slug']})
-
-    def get_sample_object(self):
-
-        # We choose a club which may work or BDE else
-        owner_id = 1
-        for membership in self.request.user.memberships.all():
-            club_id = membership.club.id
-            food = BasicFood(name="", expiry_date=timezone.now(), owner_id=club_id)
-            if PermissionBackend.check_perm(self.request, "food.add_basicfood", food):
-                owner_id = club_id
-
-        return BasicFood(
-            name="",
-            expiry_date=timezone.now(),
-            owner_id=owner_id,
-        )
-
-    def get_context_data(self, **kwargs):
-        # Some field are hidden on create
-        context = super().get_context_data(**kwargs)
-
-        form = context['form']
-        form.fields['is_active'].widget = HiddenInput()
-        form.fields['was_eaten'].widget = HiddenInput()
-
-        copy = self.request.GET.get('copy', None)
-        if copy is not None:
-            basic = BasicFood.objects.get(pk=copy)
-            for field in ['date_type', 'expiry_date', 'name', 'owner']:
-                form.fields[field].initial = getattr(basic, field)
-            for field in ['allergens']:
-                form.fields[field].initial = getattr(basic, field).all()
-
-        return context
-
-
-class QRCodeCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-    """
-    A view to add a new qrcode
-    """
-    model = QRCode
-    template_name = 'food/create_qrcode_form.html'
-    form_class = QRCodeForms
-    extra_context = {"title": _("Add a new QRCode")}
-
-    def get(self, *args, **kwargs):
-        qrcode = kwargs["slug"]
-        if self.model.objects.filter(qr_code_number=qrcode).count() > 0:
-            return HttpResponseRedirect(reverse("food:qrcode_view", kwargs=kwargs))
-        else:
-            return super().get(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["slug"] = self.kwargs["slug"]
-
-        context["last_basic"] = BasicFood.objects.order_by('-pk').all()[:10]
-
-        return context
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        qrcode_food_form = QRCodeForms(data=self.request.POST)
-        if not qrcode_food_form.is_valid():
-            return self.form_invalid(form)
-
-        # Save the qrcode
-        qrcode = form.save(commit=False)
-        qrcode.qr_code_number = self.kwargs["slug"]
-        qrcode._force_save = True
-        qrcode.save()
-        qrcode.refresh_from_db()
-
-        qrcode.food_container.save()
-
-        return super().form_valid(form)
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse('food:qrcode_view', kwargs={"slug": self.kwargs['slug']})
-
-    def get_sample_object(self):
-        return QRCode(
-            qr_code_number=self.kwargs["slug"],
-            food_container_id=1
-        )
-
-
-class QRCodeView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-    """
-    A view to see a qrcode
-    """
-    model = QRCode
-    extra_context = {"title": _("QRCode")}
-    context_object_name = "qrcode"
-    slug_field = "qr_code_number"
-
-    def get(self, *args, **kwargs):
-        qrcode = kwargs["slug"]
-        if self.model.objects.filter(qr_code_number=qrcode).count() > 0:
-            return super().get(*args, **kwargs)
-        else:
-            return HttpResponseRedirect(reverse("food:qrcode_create", kwargs=kwargs))
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        qr_code_number = self.kwargs['slug']
-        qrcode = self.model.objects.get(qr_code_number=qr_code_number)
-
-        model = qrcode.food_container.polymorphic_ctype.model
-
-        if model == "basicfood":
-            context["can_update_basic"] = PermissionBackend.check_perm(self.request, "food.change_basicfood")
-            context["can_view_detail"] = PermissionBackend.check_perm(self.request, "food.view_basicfood")
-        if model == "transformedfood":
-            context["can_update_transformed"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood")
-            context["can_view_detail"] = PermissionBackend.check_perm(self.request, "food.view_transformedfood")
-        context["can_add_ingredient"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood")
-        return context
-
-
-class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-    """
-    A view to add a tranformed food
-    """
-    model = TransformedFood
-    template_name = 'food/transformedfood_form.html'
-    form_class = TransformedFoodForms
-    extra_context = {"title": _("Add a new meal")}
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        transformed_food_form = TransformedFoodForms(data=self.request.POST)
-        if not transformed_food_form.is_valid():
-            return self.form_invalid(form)
-
-        # Save the aliment and allergens associated
-        transformed_food = form.save(commit=False)
-        transformed_food.expiry_date = transformed_food.creation_date
-        transformed_food.is_active = True
-        transformed_food.is_ready = False
-        transformed_food.was_eaten = False
-        transformed_food._force_save = True
-        transformed_food.save()
-        transformed_food.refresh_from_db()
-        ans = super().form_valid(form)
-        transformed_food.update()
-        return ans
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse('food:food_view', kwargs={"pk": self.object.pk})
-
-    def get_sample_object(self):
-        # We choose a club which may work or BDE else
-        owner_id = 1
-        for membership in self.request.user.memberships.all():
-            club_id = membership.club.id
-            food = TransformedFood(name="",
-                                   creation_date=timezone.now(),
-                                   expiry_date=timezone.now(),
-                                   owner_id=club_id)
-            if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food):
-                owner_id = club_id
-                break
-
-        return TransformedFood(
-            name="",
-            owner_id=owner_id,
-            creation_date=timezone.now(),
-            expiry_date=timezone.now(),
-        )
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        # Some field are hidden on create
-        form = context['form']
-        form.fields['is_active'].widget = HiddenInput()
-        form.fields['is_ready'].widget = HiddenInput()
-        form.fields['was_eaten'].widget = HiddenInput()
-        form.fields['shelf_life'].widget = HiddenInput()
-
-        return context
-
-
-class TransformedFoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    A view to update transformed product
-    """
-    model = TransformedFood
-    template_name = 'food/transformedfood_form.html'
-    form_class = TransformedFoodForms
-    extra_context = {'title': _('Update a meal')}
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.creater = self.request.user
-        transformedfood_form = TransformedFoodForms(data=self.request.POST)
-        if not transformedfood_form.is_valid():
-            return self.form_invalid(form)
-
-        ans = super().form_valid(form)
-        form.instance.update()
-        return ans
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse('food:food_view', kwargs={"pk": self.object.pk})
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        return context
-
-
-class TransformedListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
-    """
-    Displays ready TransformedFood
-    """
-    model = TransformedFood
-    tables = [TransformedFoodTable, TransformedFoodTable, TransformedFoodTable]
-    extra_context = {"title": _("Transformed food")}
-
-    def get_queryset(self, **kwargs):
-        return super().get_queryset(**kwargs).distinct()
-
-    def get_tables(self):
-        tables = super().get_tables()
-
-        tables[0].prefix = "all-"
-        tables[1].prefix = "open-"
-        tables[2].prefix = "served-"
-        return tables
-
-    def get_tables_data(self):
-        # first table = all transformed food, second table = free, third = served
-        return [
-            self.get_queryset().order_by("-creation_date"),
-            TransformedFood.objects.filter(is_ready=True, is_active=True, was_eaten=False, expiry_date__lt=timezone.now())
-                                   .filter(PermissionBackend.filter_queryset(self.request, TransformedFood, "view"))
-                                   .distinct()
-                                   .order_by("-creation_date"),
-            TransformedFood.objects.filter(is_ready=True, is_active=True, was_eaten=False, expiry_date__gte=timezone.now())
-                                   .filter(PermissionBackend.filter_queryset(self.request, TransformedFood, "view"))
-                                   .distinct()
-                                   .order_by("-creation_date")
-        ]
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        # We choose a club which should work
-        for membership in self.request.user.memberships.all():
-            club_id = membership.club.id
-            food = TransformedFood(
-                name="",
-                owner_id=club_id,
-                creation_date=timezone.now(),
-                expiry_date=timezone.now(),
-            )
-            if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food):
-                context['can_create_meal'] = True
-                break
-
-        tables = context["tables"]
-        for name, table in zip(["table", "open", "served"], tables):
-            context[name] = table
-        return context

apps/logs/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 default_app_config = 'logs.apps.LogsConfig'

apps/logs/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework import serializers

apps/logs/api/urls.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from .views import ChangelogViewSet

apps/logs/api/views.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django_filters.rest_framework import DjangoFilterBackend
@@ -15,7 +15,7 @@ class ChangelogViewSet(ReadOnlyProtectedModelViewSet):
     The djangorestframework plugin will get all `Changelog` objects, serialize it to JSON with the given serializer,
     then render it on /api/logs/
     """
-    queryset = Changelog.objects.order_by('id')
+    queryset = Changelog.objects.all()
     serializer_class = ChangelogSerializer
     filter_backends = [DjangoFilterBackend, OrderingFilter]
     filterset_fields = ['model', 'action', "instance_pk", 'user', 'ip', ]

apps/logs/apps.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.apps import AppConfig

apps/logs/models.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.conf import settings
@@ -76,6 +76,9 @@ class Changelog(models.Model):
         verbose_name=_('timestamp'),
     )
 
+    def delete(self, using=None, keep_parents=False):
+        raise ValidationError(_("Logs cannot be destroyed."))
+
     class Meta:
         verbose_name = _("changelog")
         verbose_name_plural = _("changelogs")
@@ -83,6 +86,3 @@ class Changelog(models.Model):
     def __str__(self):
         return _("Changelog of type \"{action}\" for model {model} at {timestamp}").format(
             action=self.get_action_display(), model=str(self.model), timestamp=str(self.timestamp))
-
-    def delete(self, using=None, keep_parents=False):
-        raise ValidationError(_("Logs cannot be destroyed."))

apps/logs/signals.py

@@ -1,11 +1,11 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.contrib.contenttypes.models import ContentType
 from rest_framework.renderers import JSONRenderer
 from rest_framework.serializers import ModelSerializer
 from note.models import NoteUser, Alias
-from note_kfet.middlewares import get_current_request
+from note_kfet.middlewares import get_current_authenticated_user, get_current_ip
 
 from .models import Changelog
 
@@ -56,13 +56,13 @@ def save_object(sender, instance, **kwargs):
     # noinspection PyProtectedMember
     previous = instance._previous
 
-    # Si un⋅e utilisateur⋅rice est connecté⋅e, on récupère l'utilisateur⋅rice courant⋅e ainsi que son adresse IP
+    # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP
-    request = get_current_request()
+    user, ip = get_current_authenticated_user(), get_current_ip()
 
-    if request is None:
+    if user is None:
         # Si la modification n'a pas été faite via le client Web, on suppose que c'est du à `manage.py`
         # On récupère alors l'utilisateur·trice connecté·e à la VM, et on récupère la note associée
-        # IMPORTANT : l'utilisateur⋅rice dans la VM doit être un des alias note du respo info
+        # IMPORTANT : l'utilisateur dans la VM doit être un des alias note du respo info
         ip = "127.0.0.1"
         username = Alias.normalize(getpass.getuser())
         note = NoteUser.objects.filter(alias__normalized_name=username)
@@ -71,23 +71,9 @@ def save_object(sender, instance, **kwargs):
         # else:
         if note.exists():
             user = note.get().user
-        else:
-            user = None
-    else:
-        user = request.user
-        if 'HTTP_X_REAL_IP' in request.META:
-            ip = request.META.get('HTTP_X_REAL_IP')
-        elif 'HTTP_X_FORWARDED_FOR' in request.META:
-            ip = request.META.get('HTTP_X_FORWARDED_FOR').split(', ')[0]
-        else:
-            ip = request.META.get('REMOTE_ADDR')
-
-        if not user.is_authenticated:
-            # For registration and OAuth2 purposes
-            user = None
 
     # noinspection PyProtectedMember
-    if request is not None and instance._meta.label_lower == "auth.user" and previous:
+    if user is not None and instance._meta.label_lower == "auth.user" and previous:
         # On n'enregistre pas les connexions
         if instance.last_login != previous.last_login:
             return
@@ -134,13 +120,13 @@ def delete_object(sender, instance, **kwargs):
     if instance._meta.label_lower in EXCLUDED or hasattr(instance, "_no_signal"):
         return
 
-    # Si un⋅e utilisateur⋅rice est connecté⋅e, on récupère l'utilisateur⋅rice courant⋅e ainsi que son adresse IP
+    # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP
-    request = get_current_request()
+    user, ip = get_current_authenticated_user(), get_current_ip()
 
-    if request is None:
+    if user is None:
         # Si la modification n'a pas été faite via le client Web, on suppose que c'est du à `manage.py`
         # On récupère alors l'utilisateur·trice connecté·e à la VM, et on récupère la note associée
-        # IMPORTANT : l'utilisateur⋅rice dans la VM doit être un des alias note du respo info
+        # IMPORTANT : l'utilisateur dans la VM doit être un des alias note du respo info
         ip = "127.0.0.1"
         username = Alias.normalize(getpass.getuser())
         note = NoteUser.objects.filter(alias__normalized_name=username)
@@ -149,20 +135,6 @@ def delete_object(sender, instance, **kwargs):
         # else:
         if note.exists():
             user = note.get().user
-        else:
-            user = None
-    else:
-        user = request.user
-        if 'HTTP_X_REAL_IP' in request.META:
-            ip = request.META.get('HTTP_X_REAL_IP')
-        elif 'HTTP_X_FORWARDED_FOR' in request.META:
-            ip = request.META.get('HTTP_X_FORWARDED_FOR').split(', ')[0]
-        else:
-            ip = request.META.get('REMOTE_ADDR')
-
-        if not user.is_authenticated:
-            # For registration and OAuth2 purposes
-            user = None
 
     # On crée notre propre sérialiseur JSON pour pouvoir sauvegarder les modèles
     class CustomSerializer(ModelSerializer):

apps/member/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 default_app_config = 'member.apps.MemberConfig'

apps/member/admin.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.contrib import admin

apps/member/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework import serializers

apps/member/api/urls.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from .views import ProfileViewSet, ClubViewSet, MembershipViewSet

apps/member/api/views.py

@@ -1,9 +1,7 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter
-from rest_framework.filters import OrderingFilter
-from api.filters import RegexSafeSearchFilter
 from api.viewsets import ReadProtectedModelViewSet
 
 from .serializers import ProfileSerializer, ClubSerializer, MembershipSerializer
@@ -16,15 +14,8 @@ class ProfileViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Profile` objects, serialize it to JSON with the given serializer,
     then render it on /api/members/profile/
     """
-    queryset = Profile.objects.order_by('id')
+    queryset = Profile.objects.all()
     serializer_class = ProfileSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
-    filterset_fields = ['user', 'user__first_name', 'user__last_name', 'user__username', 'user__email',
-                        'user__note__alias__name', 'user__note__alias__normalized_name', 'phone_number', "section",
-                        'department', 'promotion', 'address', 'paid', 'ml_events_registration', 'ml_sport_registration',
-                        'ml_art_registration', 'report_frequency', 'email_confirmed', 'registration_valid', ]
-    search_fields = ['$user__first_name', '$user__last_name', '$user__username', '$user__email',
-                     '$user__note__alias__name', '$user__note__alias__normalized_name', ]
 
 
 class ClubViewSet(ReadProtectedModelViewSet):
@@ -33,13 +24,10 @@ class ClubViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Club` objects, serialize it to JSON with the given serializer,
     then render it on /api/members/club/
     """
-    queryset = Club.objects.order_by('id')
+    queryset = Club.objects.all()
     serializer_class = ClubSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [SearchFilter]
-    filterset_fields = ['name', 'email', 'note__alias__name', 'note__alias__normalized_name', 'parent_club',
+    search_fields = ['$name', ]
-                        'parent_club__name', 'require_memberships', 'membership_fee_paid', 'membership_fee_unpaid',
-                        'membership_duration', 'membership_start', 'membership_end', ]
-    search_fields = ['$name', '$email', '$note__alias__name', '$note__alias__normalized_name', ]
 
 
 class MembershipViewSet(ReadProtectedModelViewSet):
@@ -48,14 +36,5 @@ class MembershipViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Membership` objects, serialize it to JSON with the given serializer,
     then render it on /api/members/membership/
     """
-    queryset = Membership.objects.order_by('id')
+    queryset = Membership.objects.all()
     serializer_class = MembershipSerializer
-    filter_backends = [DjangoFilterBackend, OrderingFilter, RegexSafeSearchFilter]
-    filterset_fields = ['club__name', 'club__email', 'club__note__alias__name', 'club__note__alias__normalized_name',
-                        'user__username', 'user__last_name', 'user__first_name', 'user__email',
-                        'user__note__alias__name', 'user__note__alias__normalized_name',
-                        'date_start', 'date_end', 'fee', 'roles', ]
-    ordering_fields = ['id', 'date_start', 'date_end', ]
-    search_fields = ['$club__name', '$club__email', '$club__note__alias__name', '$club__note__alias__normalized_name',
-                     '$user__username', '$user__last_name', '$user__first_name', '$user__email',
-                     '$user__note__alias__name', '$user__note__alias__normalized_name', '$roles__name', ]

apps/member/apps.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.apps import AppConfig

apps/member/auth.py

@@ -1,17 +0,0 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from cas_server.auth import DjangoAuthUser  # pragma: no cover
-from note.models import Alias
-
-
-class CustomAuthUser(DjangoAuthUser):  # pragma: no cover
-    """
-    Override Django Auth User model to define a custom Matrix username.
-    """
-
-    def attributs(self):
-        d = super().attributs()
-        if self.user:
-            d["normalized_name"] = Alias.normalize(self.user.username)
-        return d

apps/member/forms.py

@@ -1,9 +1,9 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import io
 
-from bootstrap_datepicker_plus.widgets import DatePickerInput
+from PIL import Image, ImageSequence
 from django import forms
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
@@ -13,9 +13,8 @@ from django.forms import CheckboxSelectMultiple
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, Alias
-from note_kfet.inputs import Autocomplete, AmountInput
+from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
 from permission.models import PermissionMask, Role
-from PIL import Image, ImageSequence
 
 from .models import Profile, Club, Membership
 
@@ -33,7 +32,7 @@ class UserForm(forms.ModelForm):
         # Django usernames can only contain letters, numbers, @, ., +, - and _.
         # We want to allow users to have uncommon and unpractical usernames:
         # That is their problem, and we have normalized aliases for us.
-        return super()._get_validation_exclusions() | {"username"}
+        return super()._get_validation_exclusions() + ["username"]
 
     class Meta:
         model = User
@@ -48,13 +47,6 @@ class ProfileForm(forms.ModelForm):
 
     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
 
-    VSS_charter_read = forms.BooleanField(
-        required=True,
-        label=_("Anti-VSS (<em>Violences Sexistes et Sexuelles</em>) charter read and approved"),
-        help_text=_("Tick after having read and accepted the anti-VSS charter \
-        <a href=https://perso.crans.org/club-bde/Charte-anti-VSS.pdf target=_blank> available here in pdf</a>")
-    )
-
     def clean_promotion(self):
         promotion = self.cleaned_data["promotion"]
         if promotion > timezone.now().year:
@@ -122,7 +114,7 @@ class ImageForm(forms.Form):
                 frame = frame.crop((x, y, x + w, y + h))
                 frame = frame.resize(
                     (settings.PIC_WIDTH, settings.PIC_RATIO * settings.PIC_WIDTH),
-                    Image.LANCZOS,
+                    Image.ANTIALIAS,
                 )
                 frames.append(frame)
 
@@ -139,9 +131,6 @@ class ImageForm(forms.Form):
 
         return cleaned_data
 
-    def is_valid(self):
-        return super().is_valid() or super().clean().get('image') is None
-
 
 class ClubForm(forms.ModelForm):
     def clean(self):
@@ -155,13 +144,12 @@ class ClubForm(forms.ModelForm):
 
     class Meta:
         model = Club
-        exclude = ("add_registration_form",)
+        fields = '__all__'
         widgets = {
             "membership_fee_paid": AmountInput(),
             "membership_fee_unpaid": AmountInput(),
             "parent_club": Autocomplete(
                 Club,
-                resetable=True,
                 attrs={
                     'api_url': '/api/members/club/',
                 }
@@ -211,9 +199,9 @@ class MembershipForm(forms.ModelForm):
     class Meta:
         model = Membership
         fields = ('user', 'date_start')
-        # Le champ d'utilisateur⋅rice est remplacé par un champ d'auto-complétion.
+        # Le champ d'utilisateur est remplacé par un champ d'auto-complétion.
         # Quand des lettres sont tapées, une requête est envoyée sur l'API d'auto-complétion
-        # et récupère les noms d'utilisateur⋅rices valides
+        # et récupère les noms d'utilisateur valides
         widgets = {
             'user':
                 Autocomplete(

apps/member/hashers.py

@@ -1,14 +1,12 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import hashlib
-from collections import OrderedDict
 
 from django.conf import settings
-from django.contrib.auth.hashers import PBKDF2PasswordHasher, mask_hash
+from django.contrib.auth.hashers import PBKDF2PasswordHasher
 from django.utils.crypto import constant_time_compare
-from django.utils.translation import gettext_lazy as _
+from note_kfet.middlewares import get_current_authenticated_user, get_current_session
-from note_kfet.middlewares import get_current_request
 
 
 class CustomNK15Hasher(PBKDF2PasswordHasher):
@@ -26,22 +24,16 @@ class CustomNK15Hasher(PBKDF2PasswordHasher):
 
     def must_update(self, encoded):
         if settings.DEBUG:
-            # Small hack to let superusers to impersonate people.
+            current_user = get_current_authenticated_user()
-            # Don't change their password.
-            request = get_current_request()
-            current_user = request.user
             if current_user is not None and current_user.is_superuser:
                 return False
         return True
 
     def verify(self, password, encoded):
         if settings.DEBUG:
-            # Small hack to let superusers to impersonate people.
+            current_user = get_current_authenticated_user()
-            # If a superuser is already connected, let him/her log in as another person.
-            request = get_current_request()
-            current_user = request.user
             if current_user is not None and current_user.is_superuser\
-                    and request.session.get("permission_mask", -1) >= 42:
+                    and get_current_session().get("permission_mask", -1) >= 42:
                 return True
 
         if '|' in encoded:
@@ -49,18 +41,6 @@ class CustomNK15Hasher(PBKDF2PasswordHasher):
             return constant_time_compare(hashlib.sha256((salt + password).encode("utf-8")).hexdigest(), db_hashed_pass)
         return super().verify(password, encoded)
 
-    def safe_summary(self, encoded):
-        # Displayed information in Django Admin.
-        if '|' in encoded:
-            salt, db_hashed_pass = encoded.split('$')[2].split('|')
-            return OrderedDict([
-                (_('algorithm'), 'custom_nk15'),
-                (_('iterations'), '1'),
-                (_('salt'), mask_hash(salt)),
-                (_('hash'), mask_hash(db_hashed_pass)),
-            ])
-        return super().safe_summary(encoded)
-
 
 class DebugSuperuserBackdoor(PBKDF2PasswordHasher):
     """
@@ -71,11 +51,8 @@ class DebugSuperuserBackdoor(PBKDF2PasswordHasher):
 
     def verify(self, password, encoded):
         if settings.DEBUG:
-            # Small hack to let superusers to impersonate people.
+            current_user = get_current_authenticated_user()
-            # If a superuser is already connected, let him/her log in as another person.
-            request = get_current_request()
-            current_user = request.user
             if current_user is not None and current_user.is_superuser\
-                    and request.session.get("permission_mask", -1) >= 42:
+                    and get_current_session().get("permission_mask", -1) >= 42:
                 return True
         return super().verify(password, encoded)

apps/member/migrations/0003_create_bde_and_kfet.py

@@ -7,7 +7,6 @@ def create_bde_and_kfet(apps, schema_editor):
     """
     Club = apps.get_model("member", "club")
     NoteClub = apps.get_model("note", "noteclub")
-    Alias = apps.get_model("note", "alias")
     ContentType = apps.get_model('contenttypes', 'ContentType')
     polymorphic_ctype_id = ContentType.objects.get_for_model(NoteClub).id
 
@@ -19,8 +18,8 @@ def create_bde_and_kfet(apps, schema_editor):
         membership_fee_paid=500,
         membership_fee_unpaid=500,
         membership_duration=396,
-        membership_start="2021-08-01",
+        membership_start="2020-08-01",
-        membership_end="2022-09-30",
+        membership_end="2021-09-30",
     )
     Club.objects.get_or_create(
         id=2,
@@ -31,8 +30,8 @@ def create_bde_and_kfet(apps, schema_editor):
         membership_fee_paid=3500,
         membership_fee_unpaid=3500,
         membership_duration=396,
-        membership_start="2021-08-01",
+        membership_start="2020-08-01",
-        membership_end="2022-09-30",
+        membership_end="2021-09-30",
     )
 
     NoteClub.objects.get_or_create(
@@ -46,19 +45,6 @@ def create_bde_and_kfet(apps, schema_editor):
         polymorphic_ctype_id=polymorphic_ctype_id,
     )
 
-    Alias.objects.get_or_create(
-        id=5,
-        note_id=5,
-        name="BDE",
-        normalized_name="bde",
-    )
-    Alias.objects.get_or_create(
-        id=6,
-        note_id=6,
-        name="Kfet",
-        normalized_name="kfet",
-    )
-
 
 class Migration(migrations.Migration):
     dependencies = [

apps/member/migrations/0006_create_note_account_bde_membership.py

@@ -1,50 +0,0 @@
-import sys
-
-from django.db import migrations
-
-
-def give_note_account_permissions(apps, schema_editor):
-    """
-    Automatically manage the membership of the Note account.
-    """
-    User = apps.get_model("auth", "user")
-    Membership = apps.get_model("member", "membership")
-    Role = apps.get_model("permission", "role")
-
-    note = User.objects.filter(username="note")
-    if not note.exists():
-        # We are in a test environment, don't log error message
-        if len(sys.argv) > 1 and sys.argv[1] == 'test':
-            return
-        print("Warning: Note account was not found. The note account was not imported.")
-        print("Make sure you have imported the NK15 database. The new import script handles correctly the permissions.")
-        print("This migration will be ignored, you can re-run it if you forgot the note account or ignore it if you "
-              "don't want this account.")
-        return
-
-    note = note.get()
-
-    # Set for the two clubs a large expiration date and the correct role.
-    for m in Membership.objects.filter(user_id=note.id).all():
-        m.date_end = "3142-12-12"
-        m.roles.set(Role.objects.filter(name="PC Kfet").all())
-        m.save()
-    # By default, the note account is only authorized to be logged from localhost.
-    note.password = "ipbased$127.0.0.1"
-    note.is_active = True
-    note.save()
-    # Ensure that the note of the account is disabled
-    note.note.inactivity_reason = 'forced'
-    note.note.is_active = False
-    note.save()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('member', '0005_remove_null_tag_on_charfields'),
-        ('permission', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RunPython(give_note_account_permissions),
-    ]

apps/member/migrations/0007_auto_20210313_1235.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.19 on 2021-03-13 11:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0006_create_note_account_bde_membership'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='membership',
-            name='roles',
-            field=models.ManyToManyField(related_name='memberships', to='permission.Role', verbose_name='roles'),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='promotion',
-            field=models.PositiveSmallIntegerField(default=2021, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
-        ),
-    ]

apps/member/migrations/0008_auto_20211005_1544.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-05 13:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0007_auto_20210313_1235'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='department',
-            field=models.CharField(choices=[('A0', 'Informatics (A0)'), ('A1', 'Mathematics (A1)'), ('A2', 'Physics (A2)'), ("A'2", "Applied physics (A'2)"), ("A''2", "Chemistry (A''2)"), ('A3', 'Biology (A3)'), ('B1234', 'SAPHIRE (B1234)'), ('B1', 'Mechanics (B1)'), ('B2', 'Civil engineering (B2)'), ('B3', 'Mechanical engineering (B3)'), ('B4', 'EEA (B4)'), ('C', 'Design (C)'), ('D2', 'Economy-management (D2)'), ('D3', 'Social sciences (D3)'), ('E', 'English (E)'), ('EXT', 'External (EXT)')], max_length=8, verbose_name='department'),
-        ),
-    ]

apps/member/migrations/0009_auto_20220904_2325.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.26 on 2022-09-04 21:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0008_auto_20211005_1544'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='promotion',
-            field=models.PositiveSmallIntegerField(default=2022, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
-        ),
-    ]

apps/member/migrations/0010_new_default_year.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2023-08-23 21:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0009_auto_20220904_2325'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='promotion',
-            field=models.PositiveSmallIntegerField(default=2023, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
-        ),
-    ]

apps/member/migrations/0011_profile_vss_charter_read.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2023-08-31 09:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0010_new_default_year'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='VSS_charter_read',
-            field=models.BooleanField(default=False, verbose_name='VSS charter read'),
-        ),
-    ]