Update CONTRIBUTORS list

* use pytest for tests

Eh ouais, il y a que la config qui change. Pytest est implémentable par étapes. Et ça c'est beau.

* rework tests with pytest

* remove unittest custom TestRunner

* Edit doc and CI

.envrc

@@ -1 +1,14 @@
-source ./env/bin/activate
+if [[ ! -f pyproject.toml ]]; then
+  log_error 'No pyproject.toml found. Use `poetry new` or `poetry init` to create one first.'
+  exit 2
+fi
+
+local VENV=$(poetry env list --full-path | cut -d' ' -f1)
+if [[ -z $VENV || ! -d $VENV/bin ]]; then
+  log_error 'No poetry virtual environment found. Use `poetry install` to create one first.'
+  exit 2
+fi
+
+export VIRTUAL_ENV=$VENV
+export POETRY_ACTIVE=1
+PATH_add "$VENV/bin"

.github/actions/compile_messages/action.yml

@@ -0,0 +1,8 @@
+name: "Compile messages"
+description: "Compile the gettext translation messages"
+runs:
+  using: composite
+  steps:
+      - name: Setup project
+        run: poetry run ./manage.py compilemessages
+        shell: bash

.github/actions/setup_project/action.yml

@@ -0,0 +1,57 @@
+name: "Setup project"
+description: "Setup Python and Poetry"
+runs:
+  using: composite
+  steps:
+    - name: Install apt packages
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: gettext libgraphviz-dev
+        version: 1.0  # increment to reset cache
+
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt install gettext libgraphviz-dev
+      shell: bash
+
+    - name: Set up python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.10"
+
+    - name: Load cached Poetry installation
+      id: cached-poetry
+      uses: actions/cache@v3
+      with:
+        path: ~/.local
+        key: poetry-0  # increment to reset cache
+
+    - name: Install Poetry
+      if: steps.cached-poetry.outputs.cache-hit != 'true'
+      shell: bash
+      run: curl -sSL https://install.python-poetry.org | python3 -
+
+    - name: Check pyproject.toml syntax
+      shell: bash
+      run: poetry check
+
+    - name: Load cached dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pypoetry
+        key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-poetry-
+
+    - name: Install dependencies
+      run: poetry install --with docs,tests
+      shell: bash
+
+    - name: Install xapian
+      run: poetry run ./manage.py install_xapian
+      shell: bash
+
+    - name: Compile gettext messages
+      run: poetry run ./manage.py compilemessages
+      shell: bash

.github/actions/setup_xapian/action.yml

@@ -0,0 +1,10 @@
+name: "Setup xapian"
+description: "Setup the xapian indexes"
+runs:
+  using: composite
+  steps:
+    - name: Setup xapian index
+      run: |
+        mkdir -p /dev/shm/search_indexes
+        ln -s /dev/shm/search_indexes sith/search_indexes
+      shell: bash

.github/auto_assign.yml

@@ -0,0 +1,13 @@
+# Set to true to add reviewers to pull requests
+addReviewers: true
+
+# Set to true to add assignees to pull requests
+addAssignees: author
+
+# A list of team reviewers to be added to pull requests (GitHub team slug)
+reviewers:
+  - ae-utbm/sith-3-developers
+
+# Number of reviewers has no impact on GitHub teams
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 0

.github/dependabot.yml

@@ -0,0 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    # Raise pull requests for version updates
+    # to pip against the `develop` branch
+    target-branch: "taiste"
+    reviewers:
+      - "ae-utbm/developpers-v3"
+    commit-message:
+      prefix: "[UPDATE] "

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: Sith 3 CI
+
+on:
+  push:
+    branches: [master, taiste]
+  pull_request:
+    branches: [master, taiste]
+  workflow_dispatch:
+
+jobs:
+  ruff:
+    name: Ruff lint & format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: ruff format
+        uses: chartboost/ruff-action@v1  # format
+        with:
+          args: format --diff
+      - name: ruff check
+        uses: chartboost/ruff-action@v1  # lint
+
+  tests:
+    name: Run tests and generate coverage report
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - uses: ./.github/actions/setup_project
+      - uses: ./.github/actions/setup_xapian
+      - uses: ./.github/actions/compile_messages
+      - name: Run tests
+        run: poetry run coverage run -m pytest
+      - name: Generate coverage report
+        run: |
+          poetry run coverage report
+          poetry run coverage html
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-report
+          path: coverage_report

.github/workflows/deploy.yml

@@ -0,0 +1,64 @@
+name: Deploy to production
+concurrency: production
+
+on:
+  push:
+    branches: [master]
+  workflow_dispatch:
+
+jobs:
+  deployment:
+    runs-on: ubuntu-latest
+    environment: production
+    timeout-minutes: 30
+  
+    steps:
+    - name: SSH Remote Commands
+      uses: appleboy/ssh-action@dce9d565de8d876c11d93fa4fe677c0285a66d78
+      with:
+        # Proxy
+        proxy_host : ${{secrets.PROXY_HOST}}
+        proxy_port : ${{secrets.PROXY_PORT}}
+        proxy_username : ${{secrets.PROXY_USER}}
+        proxy_passphrase: ${{secrets.PROXY_PASSPHRASE}}
+        proxy_key: ${{secrets.PROXY_KEY}}
+        
+        # Serveur web
+        host: ${{secrets.HOST}}
+        port : ${{secrets.PORT}}
+        username : ${{secrets.USER}}
+        key: ${{secrets.KEY}}
+
+        script_stop: true
+
+        # See https://github.com/ae-utbm/sith3/wiki/GitHub-Actions#deployment-action
+        script: |
+          export PATH="/home/sith/.local/bin:$PATH"
+          pushd ${{secrets.SITH_PATH}}
+
+          git pull
+          poetry install
+          poetry run ./manage.py migrate
+          echo "yes" | poetry run ./manage.py collectstatic
+          poetry run ./manage.py compilestatic
+          poetry run ./manage.py compilemessages
+
+          sudo systemctl restart uwsgi
+  
+  sentry:
+    runs-on: ubuntu-latest
+    environment: production
+    timeout-minutes: 30
+    needs: deployment
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Sentry Release
+        uses: getsentry/action-release@v1.2.0
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+        with:
+          environment: production

.github/workflows/taiste.yml

@@ -0,0 +1,63 @@
+name: Sith3 taiste
+
+on:
+  push:
+    branches: [taiste]
+  workflow_dispatch:
+
+jobs:
+  deployment:
+    runs-on: ubuntu-latest
+    environment: taiste
+    timeout-minutes: 30
+
+    steps:
+    - name: SSH Remote Commands
+      uses: appleboy/ssh-action@dce9d565de8d876c11d93fa4fe677c0285a66d78
+      with:
+        # Proxy
+        proxy_host : ${{secrets.PROXY_HOST}}
+        proxy_port : ${{secrets.PROXY_PORT}}
+        proxy_username : ${{secrets.PROXY_USER}}
+        proxy_passphrase: ${{secrets.PROXY_PASSPHRASE}}
+        proxy_key: ${{secrets.PROXY_KEY}}
+
+        # Serveur web
+        host: ${{secrets.HOST}}
+        port : ${{secrets.PORT}}
+        username : ${{secrets.USER}}
+        key: ${{secrets.KEY}}
+
+        script_stop: true
+
+        # See https://github.com/ae-utbm/sith3/wiki/GitHub-Actions#deployment-action
+        script: |
+          export PATH="$HOME/.poetry/bin:$PATH"
+          pushd ${{secrets.SITH_PATH}}
+
+          git pull
+          poetry install
+          poetry run ./manage.py migrate
+          echo "yes" | poetry run ./manage.py collectstatic
+          poetry run ./manage.py compilestatic
+          poetry run ./manage.py compilemessages
+
+          sudo systemctl restart uwsgi
+
+  sentry:
+    runs-on: ubuntu-latest
+    environment: taiste
+    timeout-minutes: 30
+    needs: deployment
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Sentry Release
+        uses: getsentry/action-release@v1.2.0
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+        with:
+          environment: taiste

.gitignore

@@ -4,10 +4,14 @@ db.sqlite3
 *.mo
 *__pycache__*
 .DS_Store
+pyrightconfig.json
+dist/
 .vscode/
+.idea/
 env/
 doc/html
 data/
+galaxy/test_galaxy_state.json
 /static/
 sith/settings_custom.py
 sith/search_indexes/

.gitlab-ci.yml

@@ -1,28 +0,0 @@
-stages:
-  - test
-
-test:
-  stage: test
-  script:
-  - apt-get update
-  - apt-get install -y gettext python3-xapian libgraphviz-dev
-  - pushd /usr/lib/python3/dist-packages/xapian && ln -s _xapian* _xapian.so && popd
-  - export PYTHONPATH="/usr/lib/python3/dist-packages:$PYTHONPATH"
-  - python -c 'import xapian' # Fail immediately if there is a problem with xapian
-  - pip install -r requirements.txt
-  - pip install coverage
-  - ./manage.py compilemessages
-  - coverage run ./manage.py test
-  - coverage html
-  - coverage report
-  - cd doc
-  - make html # Make documentation
-  artifacts:
-    paths:
-      - coverage_report/
-
-black:
-  stage: test
-  script:
-    - pip install black
-    - black --check .

.mailmap

@@ -0,0 +1,19 @@
+Code <gregoire.duvauchelle@utbm.fr>
+Cyl <labetowiez@aol.fr>
+Juste <maaxleblanc@gmail.com>
+Krophil <pierre.brunet@krophil.fr>
+Lo-J <renaudg779@gmail.com>
+Nabos <gnikwo@hotmail.com>
+Och <francescowitz68@gmail.com>
+Partoo <joqaste@gmail.com>
+Skia <skia@hya.sk> <lordbanana25@mailoo.org>
+Skia <skia@hya.sk> <skia@libskia.so>
+Sli <klmp200@klmp200.net> <antoine@bartuccio.fr>
+Soldat <ryan-68@live.fr>
+Terre <jbaptiste.lenglet+git@gmail.com>
+Vial <robin.trioux@utbm.fr>
+Zar <antoine.charmeau@utbm.fr> <antoine.charmeau@laposte.net>
+root <root@localhost.localdomain>
+tleb <tleb@openmailbox.org> <theo.lebrun@live.fr>
+tleb <tleb@openmailbox.org> <theo.lebrun@utbm.fr>
+Maréchal <thgirod@hotmail.com>

.readthedocs.yml

@@ -4,6 +4,11 @@
 # Required
 version: 2
 
+# Allow installing xapian-bindings in pip
+build:
+  apt_packages:
+    - libxapian-dev
+
 # Build documentation in the doc/ directory with Sphinx
 sphinx:
   configuration: doc/conf.py
@@ -13,6 +18,9 @@ formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.6
+  version: "3.8"
   install:
-    - requirements: requirements.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

CONTRIBUTORS.md

@@ -0,0 +1,31 @@
+# Contributors
+
+Thanks to everyone who has contributed to this project! We appreciate your time and effort.
+
+## Copyright
+
+> All contributions to this project are subject to the copyright owned by the Association des Étudiants de l'Université de Technologie de Belfort-Montbéliard (AE UTBM), for both past and future years. By making a contribution to this project, you acknowledge and agree that AE UTBM has the exclusive right to use, distribute, and modify your contribution, as well as to license others to do the same, in any way they see fit.
+
+## License
+
+This project was previously released under the MIT license, but it has since been changed to the GPL v3 license. Any contributions made to this project before the switch to GPL v3 are still subject to the MIT license, while contributions made after the switch are subject to the GPL v3 license.
+
+## List of Contributors
+
+- [@Hyask](https://github.com/Hyask) — Florent "Skia" Jacquet <skia@hya.sk>
+- [@klmp200](https://github.com/klmp200) — Antoine "Sli" Bartuccio <antoine@bartuccio.fr>
+- [@nab-os](https://github.com/nab-os) (AKA Gnikwo) — Sasha "Nabos" Ballet <nabos@glargh.fr>
+- [@Krophil](https://github.com/Krophil) — Pierre "Krophil'" Brunet <pierre.brunet@krophil.fr>
+- [@guillaume-renaud](https://github.com/guillaume-renaud) — Guillaume "Lo-J" RENAUD <renaudg779@gmail.com>
+- [@imperosol](https://github.com/imperosol) — Thomas "Maréchal" Girod <thgirod@hotmail.com>
+- [@TheoDurr](https://github.com/TheoDurr) — Théo "Ailé" Durr <git@theodurr.fr>
+- [@RTrioux](https://github.com/RTrioux) — Robin "Vial" Trioux
+- [@TheRolfFR](https://github.com/TheRolfFR) — Yann "Réseau" Le Vaguerès
+- [@Magador](https://github.com/Magador) — Lucie "Magador" Lenglet
+- [@lsacienne](https://github.com/lsacienne) — Alexandre "L'Sacienne" Viala
+- [@Juknum](https://github.com/Juknum) — Julien "Tinople" Constant
+- [@Tartofraise](https://github.com/Tartofraise) — Ryan "Soldat" Hadj-Mebarek
+- [@FrancescoWitz](https://github.com/FrancescoWitz) — Francesco "Och" WITZ
+- [@maxence-leblanc](https://github.com/maxence-leblanc) — Maxence "Juste" LEBLANC
+
+_If you've contributed to this project and your name isn't on the list, please let us know so we can add you. And if you've contributed anonymously, thank you! We appreciate your contributions just as much as those from named contributors._

LICENSE.old

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -0,0 +1,40 @@
+<p align="center">
+  <a href="#">
+    <img src="https://img.shields.io/badge/Code%20Style-Black-000000?style=for-the-badge">
+  </a>
+  <a href="#">
+    <img src="https://img.shields.io/github/checks-status/ae-utbm/sith3/master?logo=github&style=for-the-badge&label=BUILD">
+  </a>
+  <a href="https://sith-ae.readthedocs.io/">
+    <img src="https://img.shields.io/readthedocs/sith-ae?logo=readthedocs&style=for-the-badge">
+  </a>
+  <a href="https://discord.gg/XK9WfPsUFm">
+    <img src="https://img.shields.io/discord/971448179075731476?label=Discord&logo=discord&style=for-the-badge">
+  </a>
+</p>
+
+<h3 align="center">This is the source code of the UTBM's student association available at https://ae.utbm.fr/.</h3>
+
+<p align="justify">All documentation is in the <code>docs</code> directory and online at https://sith-ae.readthedocs.io/. This documentation is written in French because it targets a French audience and it's too much work to maintain two versions. The code and code comments are strictly written in English.</p>
+
+<h4>If you want to contribute, here's how we recommend to read the docs:</h4>
+
+<ul>
+  <li>
+    <p align="justify">
+      First, it's advised to read the about part of the project to understand the goals and the mindset of the current and previous maintainers and know what to expect to learn.
+    </p>
+  </li>
+  <li>
+    <p align="justify">
+      If in the first part you realize that you need more background about what we use, we provide some links to tutorials and documentation at the end of our documentation. Feel free to use it and complete it with what you found helpful.
+    </p>
+  </li>
+  <li>
+    <p align="justify">
+      Keep in mind that this documentation is thought to be read in order.
+    </p>
+  </li>
+</ul>
+
+> This project is licensed under GNU GPL, see the LICENSE file at the top of the repository for more details.

README.rst

@@ -1,37 +0,0 @@
-.. image:: https://ae-dev.utbm.fr/ae/Sith/badges/master/pipeline.svg
-  :target: https://ae-dev.utbm.fr/ae/Sith/commits/master
-  :alt: pipeline status
-
-.. image:: https://readthedocs.org/projects/sith-ae/badge/?version=latest
-  :target: https://sith-ae.readthedocs.io/?badge=latest
-  :alt: documentation Status
-
-.. image:: https://ae-dev.utbm.fr/ae/Sith/badges/master/coverage.svg
-  :target: https://ae-dev.utbm.fr/ae/Sith/commits/master
-  :alt: coverage report
-
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-  :target: https://github.com/ambv/black
-  :alt: code style: black
-
-.. image:: https://img.shields.io/badge/zulip-join_chat-brightgreen.svg
-  :target: https://ae-dev.zulipchat.com
-  :alt: project chat
-
-This is the source code of the UTBM's student association available at https://ae.utbm.fr/.
-
-All documentation is in the ``docs`` directory and online at https://sith-ae.readthedocs.io/. This documentation is written in French because it targets a French audience and it's too much work to maintain two versions. The code and code comments are strictly written in English.
-
-If you want to contribute, here's how we recommend to read the docs:
-
-* First, it's advised to read the about part of the project to understand the goals and the mindset of the current and previous maintainers and know what to expect to learn.
-* If in the first part you find you need more background about what we use, we provide some links to tutorials and documentation at the end of our documentation. Feel free to use it and complete it with what you found helpful.
-* Keep in mind that this documentation is thought to be read in order.
-
-To join our team :
-
-* Send a mail at mailto:ae.utbm.fr
-* Join our group chat at https://ae-dev.zulipchat.com
-* See and join our Trello at https://trello.com/b/YQOaF33m/site-ae.
-
-This project is licenced under GNU GPL, see the LICENSE file at the top of the repository for more details.

accounting/__init__.py

@@ -1,23 +1,19 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #

accounting/admin.py

@@ -1,32 +1,27 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
 from django.contrib import admin
 
 from accounting.models import *
 
-
 admin.site.register(BankAccount)
 admin.site.register(ClubAccount)
 admin.site.register(GeneralJournal)

accounting/migrations/0001_initial.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.core.validators
-import accounting.models
 import django.db.models.deletion
+from django.db import migrations, models
+
+import accounting.models
 
 
 class Migration(migrations.Migration):
-
     dependencies = []
 
     operations = [

accounting/migrations/0002_auto_20160824_2152.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("club", "0001_initial"),
         ("accounting", "0001_initial"),

accounting/migrations/0003_auto_20160824_2203.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import phonenumber_field.modelfields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("accounting", "0002_auto_20160824_2152")]
 
     operations = [

accounting/migrations/0004_auto_20161005_1505.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("accounting", "0003_auto_20160824_2203")]
 
     operations = [

accounting/migrations/0005_auto_20170324_0917.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("accounting", "0004_auto_20161005_1505")]
 
     operations = [

accounting/models.py

@@ -1,40 +1,36 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
-
-from django.urls import reverse
-from django.core.exceptions import ValidationError
-from django.core import validators
-from django.db import models
-from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
-from django.template import defaultfilters
-
-from phonenumber_field.modelfields import PhoneNumberField
 
 from decimal import Decimal
-from core.models import User, SithFile
+
+from django.conf import settings
+from django.core import validators
+from django.core.exceptions import ValidationError
+from django.db import models
+from django.template import defaultfilters
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+from phonenumber_field.modelfields import PhoneNumberField
+
 from club.models import Club
+from core.models import SithFile, User
 
 
 class CurrencyField(models.DecimalField):
@@ -74,7 +70,7 @@ class Company(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         return False
 
@@ -125,7 +121,9 @@ class BankAccount(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_anonymous:
+            return False
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         m = self.club.get_membership_for(user)
         if m is not None and m.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]:
@@ -162,7 +160,9 @@ class ClubAccount(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_anonymous:
+            return False
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         return False
 
@@ -233,7 +233,9 @@ class GeneralJournal(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_anonymous:
+            return False
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         if self.club_account.can_be_edited_by(user):
             return True
@@ -243,7 +245,7 @@ class GeneralJournal(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         if self.club_account.can_be_edited_by(user):
             return True
@@ -422,7 +424,9 @@ class Operation(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_anonymous:
+            return False
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         if self.journal.closed:
             return False
@@ -435,7 +439,7 @@ class Operation(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         if self.journal.closed:
             return False
@@ -491,7 +495,9 @@ class AccountingType(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_anonymous:
+            return False
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         return False
 
@@ -562,6 +568,8 @@ class Label(models.Model):
         )
 
     def is_owned_by(self, user):
+        if user.is_anonymous:
+            return False
         return self.club_account.is_owned_by(user)
 
     def can_be_edited_by(self, user):

accounting/templates/accounting/bank_account_details.jinja

@@ -12,7 +12,7 @@
         </p>
         <hr>
         <h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
-        {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %}
         <a href="{{ url('accounting:bank_delete', b_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
         {% endif %}
         <h4>{% trans %}Infos{% endtrans %}</h4>

accounting/templates/accounting/bank_account_list.jinja

@@ -9,7 +9,7 @@
         <h4>
         {% trans %}Accounting{% endtrans %}
         </h4>
-        {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
         <p><a href="{{ url('accounting:simple_type_list') }}">{% trans %}Manage simplified types{% endtrans %}</a></p>
         <p><a href="{{ url('accounting:type_list') }}">{% trans %}Manage accounting types{% endtrans %}</a></p>
         <p><a href="{{ url('accounting:bank_new') }}">{% trans %}New bank account{% endtrans %}</a></p>

accounting/templates/accounting/club_account_details.jinja

@@ -16,7 +16,7 @@
         {% if user.is_root and not object.journals.exists() %}
         <a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
         {% endif %}
-        {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
         <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
         {% endif %}
         <p><a href="{{ url('accounting:label_list', clubaccount_id=object.id) }}">{% trans %}Label list{% endtrans %}</a></p>
@@ -56,7 +56,7 @@
                 {% endif %}
                 <td> <a href="{{ url('accounting:journal_details', j_id=j.id) }}">{% trans %}View{% endtrans %}</a>
                     <a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a>
-                    {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %}
+                    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %}
                         <a href="{{ url('accounting:journal_delete', j_id=j.id) }}">{% trans %}Delete{% endtrans %}</a>
                     {% endif %}
                     </td>

accounting/templates/accounting/co_list.jinja

@@ -6,11 +6,12 @@
 
 {% block content %}
     <div id="accounting">
-        {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) or user.is_root %}
+        {% if user.is_root
+           or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+        %}
         <p><a href="{{ url('accounting:co_new') }}">{% trans %}Create new company{% endtrans %}</a></p>
         {% endif %}
-
+        <br/>
-        </br>
         <table>
             <thead>
             <tr>

accounting/templates/accounting/journal_details.jinja

@@ -84,10 +84,13 @@
                 <td>-</td>
                 {% endif %}
                 <td>
-                    {% if o.journal.club_account.bank_account.name != "AE TI" and o.journal.club_account.bank_account.name != "TI" or user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+                    {%
-                    {% if not o.journal.closed %}
+                        if o.journal.club_account.bank_account.name not in ["AE TI", "TI"]
-                    <a href="{{ url('accounting:op_edit', op_id=o.id) }}">{% trans %}Edit{% endtrans %}</a>
+                        or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-                    {% endif %}
+                    %}
+                        {% if not o.journal.closed %}
+                            <a href="{{ url('accounting:op_edit', op_id=o.id) }}">{% trans %}Edit{% endtrans %}</a>
+                        {% endif %}
                     {% endif %}
                 </td>
                 <td><a href="{{ url('accounting:op_pdf', op_id=o.id) }}">{% trans %}Generate{% endtrans %}</a></td>

accounting/templates/accounting/label_list.jinja

@@ -13,7 +13,7 @@
         </p>
         <hr>
         <p><a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{% trans %}Back to club account{% endtrans %}</a></p>
-        {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
         <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
         {% endif %}
         {% if object.labels.all() %}
@@ -21,7 +21,7 @@
         <ul>
             {% for l in object.labels.all()  %}
             <li><a href="{{ url('accounting:label_edit', label_id=l.id) }}">{{ l }}</a>
-            {% if user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+            {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
              -
                 <a href="{{ url('accounting:label_delete', label_id=l.id) }}">{% trans %}Delete{% endtrans %}</a>
             {% endif %}

accounting/tests.py

@@ -1,124 +1,114 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
+from datetime import date, timedelta
+
 from django.test import TestCase
 from django.urls import reverse
-from django.core.management import call_command
-from datetime import date
 
-from core.models import User
 from accounting.models import (
-    GeneralJournal,
-    Operation,
-    Label,
     AccountingType,
+    GeneralJournal,
+    Label,
+    Operation,
     SimplifiedAccountingType,
 )
+from core.models import User
 
 
 class RefoundAccountTest(TestCase):
-    def setUp(self):
+    @classmethod
-        call_command("populate")
+    def setUpTestData(cls):
-        self.skia = User.objects.filter(username="skia").first()
+        cls.skia = User.objects.get(username="skia")
         # reffil skia's account
-        self.skia.customer.amount = 800
+        cls.skia.customer.amount = 800
-        self.skia.customer.save()
+        cls.skia.customer.save()
+        cls.refound_account_url = reverse("accounting:refound_account")
 
     def test_permission_denied(self):
-        self.client.login(username="guy", password="plop")
+        self.client.force_login(User.objects.get(username="guy"))
         response_post = self.client.post(
-            reverse("accounting:refound_account"), {"user": self.skia.id}
+            self.refound_account_url, {"user": self.skia.id}
         )
-        response_get = self.client.get(reverse("accounting:refound_account"))
+        response_get = self.client.get(self.refound_account_url)
-        self.assertTrue(response_get.status_code == 403)
+        assert response_get.status_code == 403
-        self.assertTrue(response_post.status_code == 403)
+        assert response_post.status_code == 403
 
     def test_root_granteed(self):
-        self.client.login(username="root", password="plop")
+        self.client.force_login(User.objects.get(username="root"))
-        response_post = self.client.post(
+        response = self.client.post(self.refound_account_url, {"user": self.skia.id})
-            reverse("accounting:refound_account"), {"user": self.skia.id}
+        self.assertRedirects(response, self.refound_account_url)
-        )
+        self.skia.refresh_from_db()
-        self.skia = User.objects.filter(username="skia").first()
+        response = self.client.get(self.refound_account_url)
-        response_get = self.client.get(reverse("accounting:refound_account"))
+        assert response.status_code == 200
-        self.assertFalse(response_get.status_code == 403)
+        assert '<form action="" method="post">' in str(response.content)
-        self.assertTrue('<form action="" method="post">' in str(response_get.content))
+        assert self.skia.customer.amount == 0
-        self.assertFalse(response_post.status_code == 403)
-        self.assertTrue(self.skia.customer.amount == 0)
 
     def test_comptable_granteed(self):
-        self.client.login(username="comptable", password="plop")
+        self.client.force_login(User.objects.get(username="comptable"))
-        response_post = self.client.post(
+        response = self.client.post(self.refound_account_url, {"user": self.skia.id})
-            reverse("accounting:refound_account"), {"user": self.skia.id}
+        self.assertRedirects(response, self.refound_account_url)
-        )
+        self.skia.refresh_from_db()
-        self.skia = User.objects.filter(username="skia").first()
+        response = self.client.get(self.refound_account_url)
-        response_get = self.client.get(reverse("accounting:refound_account"))
+        assert response.status_code == 200
-        self.assertFalse(response_get.status_code == 403)
+        assert '<form action="" method="post">' in str(response.content)
-        self.assertTrue('<form action="" method="post">' in str(response_get.content))
+        assert self.skia.customer.amount == 0
-        self.assertFalse(response_post.status_code == 403)
-        self.assertTrue(self.skia.customer.amount == 0)
 
 
 class JournalTest(TestCase):
-    def setUp(self):
+    @classmethod
-        call_command("populate")
+    def setUpTestData(cls):
-        self.journal = GeneralJournal.objects.filter(id=1).first()
+        cls.journal = GeneralJournal.objects.get(id=1)
 
     def test_permission_granted(self):
-        self.client.login(username="comptable", password="plop")
+        self.client.force_login(User.objects.get(username="comptable"))
         response_get = self.client.get(
             reverse("accounting:journal_details", args=[self.journal.id])
         )
 
-        self.assertTrue(response_get.status_code == 200)
+        assert response_get.status_code == 200
-        self.assertTrue(
+        assert "<td>M\\xc3\\xa9thode de paiement</td>" in str(response_get.content)
-            "<td>M\\xc3\\xa9thode de paiement</td>" in str(response_get.content)
-        )
 
     def test_permission_not_granted(self):
-        self.client.login(username="skia", password="plop")
+        self.client.force_login(User.objects.get(username="skia"))
         response_get = self.client.get(
             reverse("accounting:journal_details", args=[self.journal.id])
         )
 
-        self.assertTrue(response_get.status_code == 403)
+        assert response_get.status_code == 403
-        self.assertFalse(
+        assert "<td>M\xc3\xa9thode de paiement</td>" not in str(response_get.content)
-            "<td>M\xc3\xa9thode de paiement</td>" in str(response_get.content)
-        )
 
 
 class OperationTest(TestCase):
     def setUp(self):
-        call_command("populate")
+        self.tomorrow_formatted = (date.today() + timedelta(days=1)).strftime(
+            "%d/%m/%Y"
+        )
         self.journal = GeneralJournal.objects.filter(id=1).first()
         self.skia = User.objects.filter(username="skia").first()
         at = AccountingType(
             code="443", label="Ce code n'existe pas", movement_type="CREDIT"
         )
         at.save()
-        l = Label(club_account=self.journal.club_account, name="bob")
+        l = Label.objects.create(club_account=self.journal.club_account, name="bob")
-        l.save()
+        self.client.force_login(User.objects.get(username="comptable"))
-        self.client.login(username="comptable", password="plop")
         self.op1 = Operation(
             journal=self.journal,
             date=date.today(),
@@ -147,8 +137,7 @@ class OperationTest(TestCase):
         self.op2.save()
 
     def test_new_operation(self):
-        self.client.login(username="comptable", password="plop")
+        at = AccountingType.objects.get(code="604")
-        at = AccountingType.objects.filter(code="604").first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
             {
@@ -158,7 +147,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome de la nuit",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -180,8 +169,7 @@ class OperationTest(TestCase):
         self.assertTrue("<td>Le fantome de la nuit</td>" in str(response_get.content))
 
     def test_bad_new_operation(self):
-        self.client.login(username="comptable", password="plop")
+        AccountingType.objects.get(code="604")
-        AccountingType.objects.filter(code="604").first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
             {
@@ -191,7 +179,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome de la nuit",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -207,7 +195,7 @@ class OperationTest(TestCase):
         )
 
     def test_new_operation_not_authorized(self):
-        self.client.login(username="skia", password="plop")
+        self.client.force_login(self.skia)
         at = AccountingType.objects.filter(code="604").first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
@@ -218,7 +206,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome du jour",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -234,7 +222,6 @@ class OperationTest(TestCase):
         )
 
     def test__operation_simple_accounting(self):
-        self.client.login(username="comptable", password="plop")
         sat = SimplifiedAccountingType.objects.all().first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
@@ -245,7 +232,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome de l'aurore",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -271,14 +258,12 @@ class OperationTest(TestCase):
         )
 
     def test_nature_statement(self):
-        self.client.login(username="comptable", password="plop")
         response = self.client.get(
             reverse("accounting:journal_nature_statement", args=[self.journal.id])
         )
         self.assertContains(response, "bob (Troll Penché) : 3.00", status_code=200)
 
     def test_person_statement(self):
-        self.client.login(username="comptable", password="plop")
         response = self.client.get(
             reverse("accounting:journal_person_statement", args=[self.journal.id])
         )
@@ -300,7 +285,6 @@ class OperationTest(TestCase):
         )
 
     def test_accounting_statement(self):
-        self.client.login(username="comptable", password="plop")
         response = self.client.get(
             reverse("accounting:journal_accounting_statement", args=[self.journal.id])
         )

accounting/urls.py

@@ -1,154 +1,144 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.urls import re_path
+from django.urls import path
 
 from accounting.views import *
 
 urlpatterns = [
     # Accounting types
-    re_path(
+    path(
-        r"^simple_type$",
+        "simple_type/",
         SimplifiedAccountingTypeListView.as_view(),
         name="simple_type_list",
     ),
-    re_path(
+    path(
-        r"^simple_type/create$",
+        "simple_type/create/",
         SimplifiedAccountingTypeCreateView.as_view(),
         name="simple_type_new",
     ),
-    re_path(
+    path(
-        r"^simple_type/(?P<type_id>[0-9]+)/edit$",
+        "simple_type/<int:type_id>/edit/",
         SimplifiedAccountingTypeEditView.as_view(),
         name="simple_type_edit",
     ),
     # Accounting types
-    re_path(r"^type$", AccountingTypeListView.as_view(), name="type_list"),
+    path("type/", AccountingTypeListView.as_view(), name="type_list"),
-    re_path(r"^type/create$", AccountingTypeCreateView.as_view(), name="type_new"),
+    path("type/create/", AccountingTypeCreateView.as_view(), name="type_new"),
-    re_path(
+    path(
-        r"^type/(?P<type_id>[0-9]+)/edit$",
+        "type/<int:type_id>/edit/",
         AccountingTypeEditView.as_view(),
         name="type_edit",
     ),
     # Bank accounts
-    re_path(r"^$", BankAccountListView.as_view(), name="bank_list"),
+    path("", BankAccountListView.as_view(), name="bank_list"),
-    re_path(r"^bank/create$", BankAccountCreateView.as_view(), name="bank_new"),
+    path("bank/create", BankAccountCreateView.as_view(), name="bank_new"),
-    re_path(
+    path(
-        r"^bank/(?P<b_account_id>[0-9]+)$",
+        "bank/<int:b_account_id>/",
         BankAccountDetailView.as_view(),
         name="bank_details",
     ),
-    re_path(
+    path(
-        r"^bank/(?P<b_account_id>[0-9]+)/edit$",
+        "bank/<int:b_account_id>/edit/",
         BankAccountEditView.as_view(),
         name="bank_edit",
     ),
-    re_path(
+    path(
-        r"^bank/(?P<b_account_id>[0-9]+)/delete$",
+        "bank/<int:b_account_id>/delete/",
         BankAccountDeleteView.as_view(),
         name="bank_delete",
     ),
     # Club accounts
-    re_path(r"^club/create$", ClubAccountCreateView.as_view(), name="club_new"),
+    path("club/create/", ClubAccountCreateView.as_view(), name="club_new"),
-    re_path(
+    path(
-        r"^club/(?P<c_account_id>[0-9]+)$",
+        "club/<int:c_account_id>/",
         ClubAccountDetailView.as_view(),
         name="club_details",
     ),
-    re_path(
+    path(
-        r"^club/(?P<c_account_id>[0-9]+)/edit$",
+        "club/<int:c_account_id>/edit/",
         ClubAccountEditView.as_view(),
         name="club_edit",
     ),
-    re_path(
+    path(
-        r"^club/(?P<c_account_id>[0-9]+)/delete$",
+        "club/<int:c_account_id>/delete/",
         ClubAccountDeleteView.as_view(),
         name="club_delete",
     ),
     # Journals
-    re_path(r"^journal/create$", JournalCreateView.as_view(), name="journal_new"),
+    path("journal/create/", JournalCreateView.as_view(), name="journal_new"),
-    re_path(
+    path(
-        r"^journal/(?P<j_id>[0-9]+)$",
+        "journal/<int:j_id>/",
         JournalDetailView.as_view(),
         name="journal_details",
     ),
-    re_path(
+    path(
-        r"^journal/(?P<j_id>[0-9]+)/edit$",
+        "journal/<int:j_id>/edit/",
         JournalEditView.as_view(),
         name="journal_edit",
     ),
-    re_path(
+    path(
-        r"^journal/(?P<j_id>[0-9]+)/delete$",
+        "journal/<int:j_id>/delete/",
         JournalDeleteView.as_view(),
         name="journal_delete",
     ),
-    re_path(
+    path(
-        r"^journal/(?P<j_id>[0-9]+)/statement/nature$",
+        "journal/<int:j_id>/statement/nature/",
         JournalNatureStatementView.as_view(),
         name="journal_nature_statement",
     ),
-    re_path(
+    path(
-        r"^journal/(?P<j_id>[0-9]+)/statement/person$",
+        "journal/<int:j_id>/statement/person/",
         JournalPersonStatementView.as_view(),
         name="journal_person_statement",
     ),
-    re_path(
+    path(
-        r"^journal/(?P<j_id>[0-9]+)/statement/accounting$",
+        "journal/<int:j_id>/statement/accounting/",
         JournalAccountingStatementView.as_view(),
         name="journal_accounting_statement",
     ),
     # Operations
-    re_path(
+    path(
-        r"^operation/create/(?P<j_id>[0-9]+)$",
+        "operation/create/<int:j_id>/",
         OperationCreateView.as_view(),
         name="op_new",
     ),
-    re_path(
+    path("operation/<int:op_id>/", OperationEditView.as_view(), name="op_edit"),
-        r"^operation/(?P<op_id>[0-9]+)$", OperationEditView.as_view(), name="op_edit"
+    path("operation/<int:op_id>/pdf/", OperationPDFView.as_view(), name="op_pdf"),
-    ),
-    re_path(
-        r"^operation/(?P<op_id>[0-9]+)/pdf$", OperationPDFView.as_view(), name="op_pdf"
-    ),
     # Companies
-    re_path(r"^company/list$", CompanyListView.as_view(), name="co_list"),
+    path("company/list/", CompanyListView.as_view(), name="co_list"),
-    re_path(r"^company/create$", CompanyCreateView.as_view(), name="co_new"),
+    path("company/create/", CompanyCreateView.as_view(), name="co_new"),
-    re_path(r"^company/(?P<co_id>[0-9]+)$", CompanyEditView.as_view(), name="co_edit"),
+    path("company/<int:co_id>/", CompanyEditView.as_view(), name="co_edit"),
     # Labels
-    re_path(r"^label/new$", LabelCreateView.as_view(), name="label_new"),
+    path("label/new/", LabelCreateView.as_view(), name="label_new"),
-    re_path(
+    path(
-        r"^label/(?P<clubaccount_id>[0-9]+)$",
+        "label/<int:clubaccount_id>/",
         LabelListView.as_view(),
         name="label_list",
     ),
-    re_path(
+    path("label/<int:label_id>/edit/", LabelEditView.as_view(), name="label_edit"),
-        r"^label/(?P<label_id>[0-9]+)/edit$", LabelEditView.as_view(), name="label_edit"
+    path(
-    ),
+        "label/<int:label_id>/delete/",
-    re_path(
-        r"^label/(?P<label_id>[0-9]+)/delete$",
         LabelDeleteView.as_view(),
         name="label_delete",
     ),
     # User account
-    re_path(r"^refound/account$", RefoundAccountView.as_view(), name="refound_account"),
+    path("refound/account/", RefoundAccountView.as_view(), name="refound_account"),
 ]

accounting/views.py

@@ -1,62 +1,58 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.views.generic import ListView, DetailView
-from django.views.generic.edit import UpdateView, CreateView, DeleteView, FormView
-from django.urls import reverse_lazy, reverse
-from django.utils.translation import ugettext_lazy as _
-from django.forms.models import modelform_factory
-from django.core.exceptions import PermissionDenied, ValidationError
-from django.forms import HiddenInput
-from django.db import transaction
-from django.db.models import Sum
-from django.conf import settings
-from django import forms
-from django.http import HttpResponse
 import collections
 
 from ajax_select.fields import AutoCompleteSelectField
+from django import forms
+from django.conf import settings
+from django.core.exceptions import PermissionDenied, ValidationError
+from django.db import transaction
+from django.db.models import Sum
+from django.forms import HiddenInput
+from django.forms.models import modelform_factory
+from django.http import HttpResponse
+from django.urls import reverse, reverse_lazy
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import DetailView, ListView
+from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateView
 
-from core.views import (
-    CanViewMixin,
-    CanEditMixin,
-    CanEditPropMixin,
-    CanCreateMixin,
-    TabedViewMixin,
-)
-from core.views.forms import SelectFile, SelectDate
 from accounting.models import (
+    AccountingType,
     BankAccount,
     ClubAccount,
-    GeneralJournal,
-    Operation,
-    AccountingType,
     Company,
-    SimplifiedAccountingType,
+    GeneralJournal,
     Label,
+    Operation,
+    SimplifiedAccountingType,
 )
-from counter.models import Counter, Selling, Product
+from core.views import (
+    CanCreateMixin,
+    CanEditMixin,
+    CanEditPropMixin,
+    CanViewMixin,
+    TabedViewMixin,
+)
+from core.views.forms import SelectDate, SelectFile
+from counter.models import Counter, Product, Selling
 
 # Main accounting view
 
@@ -496,7 +492,7 @@ class OperationCreateView(CanCreateMixin, CreateView):
         return ret
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(OperationCreateView, self).get_context_data(**kwargs)
         if self.journal:
             kwargs["object"] = self.journal
@@ -514,7 +510,7 @@ class OperationEditView(CanEditMixin, UpdateView):
     template_name = "accounting/operation_edit.jinja"
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(OperationEditView, self).get_context_data(**kwargs)
         kwargs["object"] = self.object.journal
         return kwargs
@@ -529,14 +525,14 @@ class OperationPDFView(CanViewMixin, DetailView):
     pk_url_kwarg = "op_id"
 
     def get(self, request, *args, **kwargs):
-        from reportlab.pdfgen import canvas
-        from reportlab.lib.units import cm
-        from reportlab.platypus import Table, TableStyle
         from reportlab.lib import colors
         from reportlab.lib.pagesizes import letter
+        from reportlab.lib.units import cm
         from reportlab.lib.utils import ImageReader
-        from reportlab.pdfbase.ttfonts import TTFont
         from reportlab.pdfbase import pdfmetrics
+        from reportlab.pdfbase.ttfonts import TTFont
+        from reportlab.pdfgen import canvas
+        from reportlab.platypus import Table, TableStyle
 
         pdfmetrics.registerFont(TTFont("DejaVu", "DejaVuSerif.ttf"))
 
@@ -607,7 +603,7 @@ class OperationPDFView(CanViewMixin, DetailView):
         payment_mode = ""
         for m in settings.SITH_ACCOUNTING_PAYMENT_METHOD:
             if m[0] == mode:
-                payment_mode += "[\u00D7]"
+                payment_mode += "[\u00d7]"
             else:
                 payment_mode += "[  ]"
             payment_mode += " %s\n" % (m[1])
@@ -735,7 +731,7 @@ class JournalNatureStatementView(JournalTabsMixin, CanViewMixin, DetailView):
         return statement
 
     def get_context_data(self, **kwargs):
-        """ Add infos to the context """
+        """Add infos to the context"""
         kwargs = super(JournalNatureStatementView, self).get_context_data(**kwargs)
         kwargs["statement"] = self.big_statement()
         return kwargs
@@ -774,7 +770,7 @@ class JournalPersonStatementView(JournalTabsMixin, CanViewMixin, DetailView):
         return sum(self.statement(movement_type).values())
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(JournalPersonStatementView, self).get_context_data(**kwargs)
         kwargs["credit_statement"] = self.statement("CREDIT")
         kwargs["debit_statement"] = self.statement("DEBIT")
@@ -804,7 +800,7 @@ class JournalAccountingStatementView(JournalTabsMixin, CanViewMixin, DetailView)
         return statement
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(JournalAccountingStatementView, self).get_context_data(**kwargs)
         kwargs["statement"] = self.statement()
         return kwargs
@@ -899,7 +895,7 @@ class RefoundAccountView(FormView):
     form_class = CloseCustomerAccountForm
 
     def permission(self, user):
-        if user.is_root or user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+        if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         else:
             raise PermissionDenied

api/__init__.py

@@ -1,23 +1,19 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #

api/admin.py

@@ -1,27 +1,21 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
-
-from django.contrib import admin
 
 # Register your models here.

api/models.py

@@ -1,27 +1,21 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
-
-from django.db import models
 
 # Create your models here.

api/tests.py

@@ -1,27 +1,21 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
-
-from django.test import TestCase
 
 # Create your tests here.

api/urls.py

@@ -1,31 +1,27 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.urls import re_path, include
+from django.urls import include, path, re_path
+from rest_framework import routers
 
 from api.views import *
-from rest_framework import routers
 
 # Router config
 router = routers.DefaultRouter()
@@ -54,4 +50,5 @@ urlpatterns = [
     re_path(r"^markdown$", RenderMarkdown, name="api_markdown"),
     re_path(r"^mailings$", FetchMailingLists, name="mailings_fetch"),
     re_path(r"^uv$", uv_endpoint, name="uv_endpoint"),
+    path("sas/<int:user>", all_pictures_of_user_endpoint, name="all_pictures_of_user"),
 ]

api/views/__init__.py

@@ -1,40 +1,36 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from rest_framework.response import Response
-from rest_framework import viewsets
 from django.core.exceptions import PermissionDenied
-from rest_framework.decorators import action
 from django.db.models.query import QuerySet
+from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
 
-from core.views import can_view, can_edit
+from core.views import can_edit, can_view
 
 
 def check_if(obj, user, test):
     """
-        Detect if it's a single object or a queryset
+    Detect if it's a single object or a queryset
-        aply a given test on individual object and return global permission
+    aply a given test on individual object and return global permission
     """
     if isinstance(obj, QuerySet):
         for o in obj:
@@ -49,7 +45,7 @@ class ManageModelMixin:
     @action(detail=True)
     def id(self, request, pk=None):
         """
-            Get by id (api/v1/router/{pk}/id/)
+        Get by id (api/v1/router/{pk}/id/)
         """
         self.queryset = get_object_or_404(self.queryset.filter(id=pk))
         serializer = self.get_serializer(self.queryset)
@@ -72,9 +68,10 @@ class RightModelViewSet(ManageModelMixin, viewsets.ModelViewSet):
 
 
 from .api import *
-from .counter import *
-from .user import *
 from .club import *
+from .counter import *
 from .group import *
 from .launderette import *
+from .sas import *
+from .user import *
 from .uv import *

api/views/api.py

@@ -1,30 +1,26 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from rest_framework.response import Response
 from rest_framework.decorators import api_view, renderer_classes
 from rest_framework.renderers import StaticHTMLRenderer
+from rest_framework.response import Response
 
 from core.templatetags.renderer import markdown
 
@@ -33,7 +29,7 @@ from core.templatetags.renderer import markdown
 @renderer_classes((StaticHTMLRenderer,))
 def RenderMarkdown(request):
     """
-        Render Markdown
+    Render Markdown
     """
     try:
         data = markdown(request.POST["text"])

api/views/club.py

@@ -1,38 +1,32 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
-
-from rest_framework.response import Response
-from rest_framework import serializers
-from rest_framework.decorators import api_view, renderer_classes
-from rest_framework.renderers import StaticHTMLRenderer
 
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-
+from rest_framework import serializers
-from club.models import Club, Mailing
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.renderers import StaticHTMLRenderer
+from rest_framework.response import Response
 
 from api.views import RightModelViewSet
+from club.models import Club, Mailing
 
 
 class ClubSerializer(serializers.ModelSerializer):
@@ -43,7 +37,7 @@ class ClubSerializer(serializers.ModelSerializer):
 
 class ClubViewSet(RightModelViewSet):
     """
-        Manage Clubs (api/v1/club/)
+    Manage Clubs (api/v1/club/)
     """
 
     serializer_class = ClubSerializer

api/views/counter.py

@@ -1,38 +1,32 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
 from rest_framework import serializers
-from rest_framework.response import Response
 from rest_framework.decorators import action
-
+from rest_framework.response import Response
-from counter.models import Counter
 
 from api.views import RightModelViewSet
+from counter.models import Counter
 
 
 class CounterSerializer(serializers.ModelSerializer):
-
     is_open = serializers.BooleanField(read_only=True)
     barman_list = serializers.ListField(
         child=serializers.IntegerField(), read_only=True
@@ -45,7 +39,7 @@ class CounterSerializer(serializers.ModelSerializer):
 
 class CounterViewSet(RightModelViewSet):
     """
-        Manage Counters (api/v1/counter/)
+    Manage Counters (api/v1/counter/)
     """
 
     serializer_class = CounterSerializer
@@ -54,7 +48,7 @@ class CounterViewSet(RightModelViewSet):
     @action(detail=False)
     def bar(self, request):
         """
-            Return all bars (api/v1/counter/bar/)
+        Return all bars (api/v1/counter/bar/)
         """
         self.queryset = self.queryset.filter(type="BAR")
         serializer = self.get_serializer(self.queryset, many=True)

api/views/group.py

@@ -1,32 +1,27 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
 from rest_framework import serializers
 
-from core.models import RealGroup
-
 from api.views import RightModelViewSet
+from core.models import RealGroup
 
 
 class GroupSerializer(serializers.ModelSerializer):
@@ -36,7 +31,7 @@ class GroupSerializer(serializers.ModelSerializer):
 
 class GroupViewSet(RightModelViewSet):
     """
-        Manage Groups (api/v1/group/)
+    Manage Groups (api/v1/group/)
     """
 
     serializer_class = GroupSerializer

api/views/launderette.py

@@ -1,38 +1,32 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
 from rest_framework import serializers
-from rest_framework.response import Response
 from rest_framework.decorators import action
-
+from rest_framework.response import Response
-from launderette.models import Launderette, Machine, Token
 
 from api.views import RightModelViewSet
+from launderette.models import Launderette, Machine, Token
 
 
 class LaunderettePlaceSerializer(serializers.ModelSerializer):
-
     machine_list = serializers.ListField(
         child=serializers.IntegerField(), read_only=True
     )
@@ -72,7 +66,7 @@ class LaunderetteTokenSerializer(serializers.ModelSerializer):
 
 class LaunderettePlaceViewSet(RightModelViewSet):
     """
-        Manage Launderette (api/v1/launderette/place/)
+    Manage Launderette (api/v1/launderette/place/)
     """
 
     serializer_class = LaunderettePlaceSerializer
@@ -81,7 +75,7 @@ class LaunderettePlaceViewSet(RightModelViewSet):
 
 class LaunderetteMachineViewSet(RightModelViewSet):
     """
-        Manage Washing Machines (api/v1/launderette/machine/)
+    Manage Washing Machines (api/v1/launderette/machine/)
     """
 
     serializer_class = LaunderetteMachineSerializer
@@ -90,7 +84,7 @@ class LaunderetteMachineViewSet(RightModelViewSet):
 
 class LaunderetteTokenViewSet(RightModelViewSet):
     """
-        Manage Launderette's tokens (api/v1/launderette/token/)
+    Manage Launderette's tokens (api/v1/launderette/token/)
     """
 
     serializer_class = LaunderetteTokenSerializer
@@ -99,7 +93,7 @@ class LaunderetteTokenViewSet(RightModelViewSet):
     @action(detail=False)
     def washing(self, request):
         """
-            Return all washing tokens (api/v1/launderette/token/washing)
+        Return all washing tokens (api/v1/launderette/token/washing)
         """
         self.queryset = self.queryset.filter(type="WASHING")
         serializer = self.get_serializer(self.queryset, many=True)
@@ -108,7 +102,7 @@ class LaunderetteTokenViewSet(RightModelViewSet):
     @action(detail=False)
     def drying(self, request):
         """
-            Return all drying tokens (api/v1/launderette/token/drying)
+        Return all drying tokens (api/v1/launderette/token/drying)
         """
         self.queryset = self.queryset.filter(type="DRYING")
         serializer = self.get_serializer(self.queryset, many=True)
@@ -117,7 +111,7 @@ class LaunderetteTokenViewSet(RightModelViewSet):
     @action(detail=False)
     def avaliable(self, request):
         """
-            Return all avaliable tokens (api/v1/launderette/token/avaliable)
+        Return all avaliable tokens (api/v1/launderette/token/avaliable)
         """
         self.queryset = self.queryset.filter(
             borrow_date__isnull=True, user__isnull=True
@@ -128,7 +122,7 @@ class LaunderetteTokenViewSet(RightModelViewSet):
     @action(detail=False)
     def unavaliable(self, request):
         """
-            Return all unavaliable tokens (api/v1/launderette/token/unavaliable)
+        Return all unavaliable tokens (api/v1/launderette/token/unavaliable)
         """
         self.queryset = self.queryset.filter(
             borrow_date__isnull=False, user__isnull=False

api/views/sas.py

@@ -0,0 +1,43 @@
+from typing import List
+
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.generics import get_object_or_404
+from rest_framework.renderers import JSONRenderer
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from core.models import User
+from core.views import can_edit
+from sas.models import Picture
+
+
+def all_pictures_of_user(user: User) -> List[Picture]:
+    return [
+        relation.picture
+        for relation in user.pictures.exclude(picture=None)
+        .order_by("-picture__parent__date", "id")
+        .select_related("picture__parent")
+    ]
+
+
+@api_view(["GET"])
+@renderer_classes((JSONRenderer,))
+def all_pictures_of_user_endpoint(request: Request, user: int):
+    requested_user: User = get_object_or_404(User, pk=user)
+    if not can_edit(requested_user, request.user):
+        raise PermissionDenied
+
+    return Response(
+        [
+            {
+                "name": f"{picture.parent.name} - {picture.name}",
+                "date": picture.date,
+                "author": str(picture.owner),
+                "full_size_url": picture.get_download_url(),
+                "compressed_url": picture.get_download_compressed_url(),
+                "thumb_url": picture.get_download_thumb_url(),
+            }
+            for picture in all_pictures_of_user(requested_user)
+        ]
+    )

api/views/user.py

@@ -1,36 +1,31 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
 import datetime
 
 from rest_framework import serializers
-from rest_framework.response import Response
 from rest_framework.decorators import action
-
+from rest_framework.response import Response
-from core.models import User
 
 from api.views import RightModelViewSet
+from core.models import User
 
 
 class UserSerializer(serializers.ModelSerializer):
@@ -50,8 +45,8 @@ class UserSerializer(serializers.ModelSerializer):
 
 class UserViewSet(RightModelViewSet):
     """
-        Manage Users (api/v1/user/)
+    Manage Users (api/v1/user/)
-        Only show active users
+    Only show active users
     """
 
     serializer_class = UserSerializer
@@ -60,7 +55,7 @@ class UserViewSet(RightModelViewSet):
     @action(detail=False)
     def birthday(self, request):
         """
-            Return all users born today (api/v1/user/birstdays)
+        Return all users born today (api/v1/user/birstdays)
         """
         date = datetime.datetime.today()
         self.queryset = self.queryset.filter(date_of_birth=date)

api/views/uv.py

@@ -1,11 +1,12 @@
-from rest_framework.response import Response
+import json
+import urllib.request
+
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
+from rest_framework import serializers
 from rest_framework.decorators import api_view, renderer_classes
 from rest_framework.renderers import JSONRenderer
-from django.core.exceptions import PermissionDenied
+from rest_framework.response import Response
-from django.conf import settings
-from rest_framework import serializers
-import urllib.request
-import json
 
 from pedagogy.views import CanCreateUVFunctionMixin
 
@@ -29,10 +30,10 @@ def uv_endpoint(request):
 
 def find_uv(lang, year, code):
     """
-        Uses the UTBM API to find an UV.
+    Uses the UTBM API to find an UV.
-        short_uv is the UV entry in the UV list. It is returned as it contains
+    short_uv is the UV entry in the UV list. It is returned as it contains
-        information which are not in full_uv.
+    information which are not in full_uv.
-        full_uv is the detailed representation of an UV.
+    full_uv is the detailed representation of an UV.
     """
     # query the UV list
     uvs_url = settings.SITH_PEDAGOGY_UTBM_API + "/uvs/{}/{}".format(lang, year)
@@ -57,7 +58,7 @@ def find_uv(lang, year, code):
 
 def make_clean_uv(short_uv, full_uv):
     """
-        Cleans the data up so that it corresponds to our data representation.
+    Cleans the data up so that it corresponds to our data representation.
     """
     res = {}
 

club/__init__.py

@@ -1,23 +1,19 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #

club/admin.py

@@ -1,31 +1,40 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
+from ajax_select import make_ajax_form
-
 from django.contrib import admin
 
 from club.models import Club, Membership
 
 
-admin.site.register(Club)
+@admin.register(Club)
-admin.site.register(Membership)
+class ClubAdmin(admin.ModelAdmin):
+    list_display = ("name", "unix_name", "parent", "is_active")
+
+
+@admin.register(Membership)
+class MembershipAdmin(admin.ModelAdmin):
+    list_display = ("user", "club", "role", "start_date", "end_date")
+    search_fields = (
+        "user__username",
+        "user__first_name",
+        "user__last_name",
+        "club__name",
+    )
+    form = make_ajax_form(Membership, {"user": "users"})

club/forms.py

@@ -1,38 +1,31 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
-# - Sli <antoine@bartuccio.fr>
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.conf import settings
+from ajax_select.fields import AutoCompleteSelectMultipleField
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
-
+from django.utils.translation import gettext_lazy as _
-from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultipleField
-
-from club.models import Mailing, MailingSubscription, Club, Membership
 
+from club.models import Club, Mailing, MailingSubscription, Membership
 from core.models import User
-from core.views.forms import SelectDate, SelectDateTime
+from core.views.forms import SelectDate, TzAwareDateTimeField
 from counter.models import Counter
 
 
@@ -157,23 +150,27 @@ class MailingForm(forms.Form):
         return cleaned_data
 
 
-class SellingsFormBase(forms.Form):
+class SellingsForm(forms.Form):
-    begin_date = forms.DateTimeField(
+    begin_date = TzAwareDateTimeField(label=_("Begin date"), required=False)
-        input_formats=["%Y-%m-%d %H:%M:%S"],
+    end_date = TzAwareDateTimeField(label=_("End date"), required=False)
-        label=_("Begin date"),
+
-        required=False,
+    counters = forms.ModelMultipleChoiceField(
-        widget=SelectDateTime,
-    )
-    end_date = forms.DateTimeField(
-        input_formats=["%Y-%m-%d %H:%M:%S"],
-        label=_("End date"),
-        required=False,
-        widget=SelectDateTime,
-    )
-    counter = forms.ModelChoiceField(
         Counter.objects.order_by("name").all(), label=_("Counter"), required=False
     )
 
+    def __init__(self, club, *args, **kwargs):
+        super(SellingsForm, self).__init__(*args, **kwargs)
+        self.fields["products"] = forms.ModelMultipleChoiceField(
+            club.products.order_by("name").filter(archived=False).all(),
+            label=_("Products"),
+            required=False,
+        )
+        self.fields["archived_products"] = forms.ModelMultipleChoiceField(
+            club.products.order_by("name").filter(archived=True).all(),
+            label=_("Archived products"),
+            required=False,
+        )
+
 
 class ClubMemberForm(forms.Form):
     """
@@ -224,9 +221,7 @@ class ClubMemberForm(forms.Form):
                 id__in=[
                     ms.user.id
                     for ms in self.club_members
-                    if ms.can_be_edited_by(
+                    if ms.can_be_edited_by(self.request_user)
-                        self.request_user, self.request_user_membership
-                    )
                 ]
             ).all(),
             label=_("Mark as old"),
@@ -238,8 +233,8 @@ class ClubMemberForm(forms.Form):
 
     def clean_users(self):
         """
-            Check that the user is not trying to add an user already in the club
+        Check that the user is not trying to add an user already in the club
-            Also check that the user is valid and has a valid subscription
+        Also check that the user is valid and has a valid subscription
         """
         cleaned_data = super(ClubMemberForm, self).clean()
         users = []
@@ -262,7 +257,7 @@ class ClubMemberForm(forms.Form):
 
     def clean(self):
         """
-            Check user rights for adding an user
+        Check user rights for adding an user
         """
         cleaned_data = super(ClubMemberForm, self).clean()
 

club/migrations/0001_initial.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.core.validators
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = []
 
     operations = [

club/migrations/0002_auto_20160824_2152.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-from django.conf import settings
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("club", "0001_initial"),

club/migrations/0003_auto_20160902_2042.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0002_auto_20160824_2152")]
 
     operations = [

club/migrations/0004_auto_20160915_1057.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-from django.conf import settings
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0003_auto_20160902_2042")]
 
     operations = [

club/migrations/0005_auto_20161120_1149.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0004_auto_20160915_1057")]
 
     operations = [

club/migrations/0006_auto_20161229_0040.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0005_auto_20161120_1149")]
 
     operations = [

club/migrations/0007_auto_20170324_0917.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0006_auto_20161229_0040")]
 
     operations = [

club/migrations/0008_auto_20170515_2214.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0007_auto_20170324_0917")]
 
     operations = [

club/migrations/0009_auto_20170822_2232.py

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-from django.conf import settings
 import re
+
 import django.core.validators
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("club", "0008_auto_20170515_2214"),

club/migrations/0010_auto_20170912_2028.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import django.db.models.deletion
 from django.db import migrations, models
 
 from club.models import Club
 from core.operations import PsqlRunOnly
-import django.db.models.deletion
 
 
 def generate_club_pages(apps, schema_editor):
@@ -19,7 +19,6 @@ def generate_club_pages(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("core", "0024_auto_20170906_1317"), ("club", "0010_club_logo")]
 
     operations = [

club/migrations/0010_club_logo.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0009_auto_20170822_2232")]
 
     operations = [

club/migrations/0011_auto_20180426_2013.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import club.models
 import django.db.models.deletion
+from django.db import migrations, models
+
+import club.models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("club", "0010_auto_20170912_2028")]
 
     operations = [

club/models.py

@@ -1,40 +1,37 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
-# - Sli <antoine@bartuccio.fr>
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
+from typing import Optional
 
-from django.db import models
-from django.core import validators
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.core import validators
-from django.core.exceptions import ValidationError, ObjectDoesNotExist
+from django.core.cache import cache
-from django.db import transaction
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.validators import RegexValidator, validate_email
+from django.db import models, transaction
+from django.db.models import Q
 from django.urls import reverse
 from django.utils import timezone
-from django.core.validators import RegexValidator, validate_email
 from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
 
-from core.models import User, MetaGroup, Group, SithFile, RealGroup, Notification, Page
+from core.models import Group, MetaGroup, Notification, Page, RealGroup, SithFile, User
 
 # Create your models here.
 
@@ -72,6 +69,7 @@ class Club(models.Model):
         _("short description"), max_length=1000, default="", blank=True, null=True
     )
     address = models.CharField(_("address"), max_length=254)
+
     # This function prevents generating migration upon settings change
     def get_default_owner_group():
         return settings.SITH_GROUP_ROOT_ID
@@ -122,12 +120,22 @@ class Club(models.Model):
     def clean(self):
         self.check_loop()
 
-    def _change_unixname(self, new_name):
+    def _change_unixname(self, old_name, new_name):
         c = Club.objects.filter(unix_name=new_name).first()
         if c is None:
+            # Update all the groups names
+            Group.objects.filter(name=old_name).update(name=new_name)
+            Group.objects.filter(name=old_name + settings.SITH_BOARD_SUFFIX).update(
+                name=new_name + settings.SITH_BOARD_SUFFIX
+            )
+            Group.objects.filter(name=old_name + settings.SITH_MEMBER_SUFFIX).update(
+                name=new_name + settings.SITH_MEMBER_SUFFIX
+            )
+
             if self.home:
                 self.home.name = new_name
                 self.home.save()
+
         else:
             raise ValidationError(_("A club with that unix_name already exists"))
 
@@ -171,29 +179,34 @@ class Club(models.Model):
             self.page.parent = self.parent.page
             self.page.save(force_lock=True)
 
+    @transaction.atomic()
     def save(self, *args, **kwargs):
-        with transaction.atomic():
+        old = Club.objects.filter(id=self.id).first()
-            creation = False
+        creation = old is None
-            old = Club.objects.filter(id=self.id).first()
+        if not creation and old.unix_name != self.unix_name:
-            if not old:
+            self._change_unixname(self.unix_name)
-                creation = True
+        super(Club, self).save(*args, **kwargs)
-            else:
+        if creation:
-                if old.unix_name != self.unix_name:
+            board = MetaGroup(name=self.unix_name + settings.SITH_BOARD_SUFFIX)
-                    self._change_unixname(self.unix_name)
+            board.save()
-            super(Club, self).save(*args, **kwargs)
+            member = MetaGroup(name=self.unix_name + settings.SITH_MEMBER_SUFFIX)
-            if creation:
+            member.save()
-                board = MetaGroup(name=self.unix_name + settings.SITH_BOARD_SUFFIX)
+            subscribers = Group.objects.filter(
-                board.save()
+                name=settings.SITH_MAIN_MEMBERS_GROUP
-                member = MetaGroup(name=self.unix_name + settings.SITH_MEMBER_SUFFIX)
+            ).first()
-                member.save()
+            self.make_home()
-                subscribers = Group.objects.filter(
+            self.home.edit_groups.set([board])
-                    name=settings.SITH_MAIN_MEMBERS_GROUP
+            self.home.view_groups.set([member, subscribers])
-                ).first()
+            self.home.save()
-                self.make_home()
+        self.make_page()
-                self.home.edit_groups.set([board])
+        cache.set(f"sith_club_{self.unix_name}", self)
-                self.home.view_groups.set([member, subscribers])
+
-                self.home.save()
+    def delete(self, *args, **kwargs):
-            self.make_page()
+        super().delete(*args, **kwargs)
+        # Invalidate the cache of this club and of its memberships
+        for membership in self.members.ongoing().select_related("user"):
+            cache.delete(f"membership_{self.id}_{membership.user.id}")
+        cache.delete(f"sith_club_{self.unix_name}")
 
     def __str__(self):
         return self.name
@@ -208,7 +221,9 @@ class Club(models.Model):
         """
         Method to see if that object can be super edited by the given user
         """
-        return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP)
+        if user.is_anonymous:
+            return False
+        return user.is_board_member
 
     def get_full_logo_url(self):
         return "https://%s%s" % (settings.SITH_URL, self.logo.url)
@@ -228,28 +243,89 @@ class Club(models.Model):
             return False
         return sub.was_subscribed
 
-    _memberships = {}
+    def get_membership_for(self, user: User) -> Optional["Membership"]:
-
-    def get_membership_for(self, user):
         """
-        Returns the current membership the given user
+        Return the current membership the given user.
+        The result is cached.
         """
-        try:
+        if user.is_anonymous:
-            return Club._memberships[self.id][user.id]
+            return None
-        except:
+        membership = cache.get(f"membership_{self.id}_{user.id}")
-            m = self.members.filter(user=user.id).filter(end_date=None).first()
+        if membership == "not_member":
-            try:
+            return None
-                Club._memberships[self.id][user.id] = m
+        if membership is None:
-            except:
+            membership = self.members.filter(user=user, end_date=None).first()
-                Club._memberships[self.id] = {}
+            if membership is None:
-                Club._memberships[self.id][user.id] = m
+                cache.set(f"membership_{self.id}_{user.id}", "not_member")
-            return m
+            else:
+                cache.set(f"membership_{self.id}_{user.id}", membership)
+        return membership
 
     def has_rights_in_club(self, user):
         m = self.get_membership_for(user)
         return m is not None and m.role > settings.SITH_MAXIMUM_FREE_ROLE
 
 
+class MembershipQuerySet(models.QuerySet):
+    def ongoing(self) -> "MembershipQuerySet":
+        """
+        Filter all memberships which are not finished yet
+        """
+        # noinspection PyTypeChecker
+        return self.filter(Q(end_date=None) | Q(end_date__gte=timezone.now()))
+
+    def board(self) -> "MembershipQuerySet":
+        """
+        Filter all memberships where the user is/was in the board.
+
+        Be aware that users who were in the board in the past
+        are included, even if there are no more members.
+
+        If you want to get the users who are currently in the board,
+        mind combining this with the :meth:`ongoing` queryset method
+        """
+        # noinspection PyTypeChecker
+        return self.filter(role__gt=settings.SITH_MAXIMUM_FREE_ROLE)
+
+    def update(self, **kwargs):
+        """
+        Work just like the default Django's update() method,
+        but add a cache refresh for the elements of the queryset.
+
+        Be aware that this adds a db query to retrieve the updated objects
+        """
+        nb_rows = super().update(**kwargs)
+        if nb_rows > 0:
+            # if at least a row was affected, refresh the cache
+            for membership in self.all():
+                if membership.end_date is not None:
+                    cache.set(
+                        f"membership_{membership.club_id}_{membership.user_id}",
+                        "not_member",
+                    )
+                else:
+                    cache.set(
+                        f"membership_{membership.club_id}_{membership.user_id}",
+                        membership,
+                    )
+
+    def delete(self):
+        """
+        Work just like the default Django's delete() method,
+        but add a cache invalidation for the elements of the queryset
+        before the deletion.
+
+        Be aware that this adds a db query to retrieve the deleted element.
+        As this first query take place before the deletion operation,
+        it will be performed even if the deletion fails.
+        """
+        ids = list(self.values_list("club_id", "user_id"))
+        nb_rows, _ = super().delete()
+        if nb_rows > 0:
+            for club_id, user_id in ids:
+                cache.set(f"membership_{club_id}_{user_id}", "not_member")
+
+
 class Membership(models.Model):
     """
     The Membership class makes the connection between User and Clubs
@@ -289,6 +365,8 @@ class Membership(models.Model):
         _("description"), max_length=128, null=False, blank=True
     )
 
+    objects = MembershipQuerySet.as_manager()
+
     def __str__(self):
         return (
             self.club.name
@@ -303,24 +381,34 @@ class Membership(models.Model):
         """
         Method to see if that object can be super edited by the given user
         """
-        return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP)
+        if user.is_anonymous:
+            return False
+        return user.is_board_member
 
-    def can_be_edited_by(self, user, membership=None):
+    def can_be_edited_by(self, user: User) -> bool:
         """
-        Method to see if that object can be edited by the given user
+        Check if that object can be edited by the given user
         """
-        if user.memberships:
+        if user.is_root or user.is_board_member:
-            if membership:  # This is for optimisation purpose
+            return True
-                ms = membership
+        membership = self.club.get_membership_for(user)
-            else:
+        if membership is not None and membership.role >= self.role:
-                ms = user.memberships.filter(club=self.club, end_date=None).first()
+            return True
-            return (ms and ms.role >= self.role) or user.is_in_group(
+        return False
-                settings.SITH_MAIN_BOARD_GROUP
-            )
-        return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP)
 
     def get_absolute_url(self):
-        return reverse("club:club_members", kwargs={"club_id": self.club.id})
+        return reverse("club:club_members", kwargs={"club_id": self.club_id})
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        if self.end_date is None:
+            cache.set(f"membership_{self.club_id}_{self.user_id}", self)
+        else:
+            cache.set(f"membership_{self.club_id}_{self.user_id}", "not_member")
+
+    def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
+        cache.delete(f"membership_{self.club_id}_{self.user_id}")
 
 
 class Mailing(models.Model):
@@ -373,14 +461,12 @@ class Mailing(models.Model):
         return self.email + "@" + settings.SITH_MAILING_DOMAIN
 
     def can_moderate(self, user):
-        return user.is_root or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        return user.is_root or user.is_com_admin
 
     def is_owned_by(self, user):
-        return (
+        if user.is_anonymous:
-            user.is_in_group(self)
+            return False
-            or user.is_root
+        return user.is_root or user.is_com_admin
-            or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
-        )
 
     def can_view(self, user):
         return self.club.has_rights_in_club(user)
@@ -388,9 +474,8 @@ class Mailing(models.Model):
     def can_be_edited_by(self, user):
         return self.club.has_rights_in_club(user)
 
-    def delete(self):
+    def delete(self, *args, **kwargs):
-        for sub in self.subscriptions.all():
+        self.subscriptions.all().delete()
-            sub.delete()
         super(Mailing, self).delete()
 
     def fetch_format(self):
@@ -463,10 +548,12 @@ class MailingSubscription(models.Model):
         super(MailingSubscription, self).clean()
 
     def is_owned_by(self, user):
+        if user.is_anonymous:
+            return False
         return (
             self.mailing.club.has_rights_in_club(user)
             or user.is_root
-            or self.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+            or self.user.is_com_admin
         )
 
     def can_be_edited_by(self, user):

club/templates/club/club_members.jinja

@@ -13,13 +13,15 @@
         {% endif %}
         <table>
             <thead>
-                <td>{% trans %}User{% endtrans %}</td>
+                <tr>
-                <td>{% trans %}Role{% endtrans %}</td>
+                    <td>{% trans %}User{% endtrans %}</td>
-                <td>{% trans %}Description{% endtrans %}</td>
+                    <td>{% trans %}Role{% endtrans %}</td>
-                <td>{% trans %}Since{% endtrans %}</td>
+                    <td>{% trans %}Description{% endtrans %}</td>
-                {% if users_old %}
+                    <td>{% trans %}Since{% endtrans %}</td>
-                    <td>{% trans %}Mark as old{% endtrans %}</td>
+                    {% if users_old %}
-                {% endif %}
+                        <td>{% trans %}Mark as old{% endtrans %}</td>
+                    {% endif %}
+                </tr>
             </thead>
             <tbody>
             {% for m in members %}

club/templates/club/club_sellings.jinja

@@ -1,9 +1,9 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import user_profile_link %}
+{% from 'core/macros.jinja' import user_profile_link, paginate %}
 
 {% block content %}
-<h3>{% trans %}Sellings{% endtrans %}</h3>
+<h3>{% trans %}Sales{% endtrans %}</h3>
-<form action="" method="get">
+<form id="form" action="?page=1" method="post">
     {% csrf_token %}
     {{ form }}
     <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
@@ -28,7 +28,7 @@
         </tr>
     </thead>
     <tbody>
-    {% for s in result %}
+    {% for s in paginated_result %}
         <tr>
             <td>{{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}</td>
             <td>{{ s.counter }}</td>
@@ -53,6 +53,14 @@
     {% endfor %}
     </tbody>
 </table>
+<script type="text/javascript">
+    function formPagination(link){
+        $("form").attr("action", link.href);
+        link.href = "javascript:void(0)"; // block link action
+        $("form").submit();
+    }
+</script>
+{{ paginate(paginated_result, paginator, "formPagination(this)") }}
 {% endblock %}
 
 

club/templates/club/club_tools.jinja

@@ -30,7 +30,7 @@
     {% endif %}
     </ul>
     {% if object.club_account.exists() %}
-        <h4>{% trans %}Accouting: {% endtrans %}</h4>
+        <h4>{% trans %}Accounting: {% endtrans %}</h4>
         <ul>
         {% for ca in object.club_account.all() %}
             <li><a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca.get_display_name() }}</a></li>

club/templates/club/mailing.jinja

@@ -45,7 +45,7 @@
             </thead>
             <tbody>
                 {% for widget in form_mailing_removal.subwidgets %}
-                {% set user = ms[widget.data.value][0] %}
+                {% set user = ms[widget.data.value.value][0] %}
                 <tr>
                     <td>{{ user.get_username }}</td>
                     <td>{{ user.get_email }}</td>

club/urls.py

@@ -1,111 +1,101 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
-# - Sli <antoine@bartuccio.fr>
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.urls import re_path
+from django.urls import path
 
 from club.views import *
 
 urlpatterns = [
-    re_path(r"^$", ClubListView.as_view(), name="club_list"),
+    path("", ClubListView.as_view(), name="club_list"),
-    re_path(r"^new$", ClubCreateView.as_view(), name="club_new"),
+    path("new/", ClubCreateView.as_view(), name="club_new"),
-    re_path(r"^stats$", ClubStatView.as_view(), name="club_stats"),
+    path("stats/", ClubStatView.as_view(), name="club_stats"),
-    re_path(r"^(?P<club_id>[0-9]+)/$", ClubView.as_view(), name="club_view"),
+    path("<int:club_id>/", ClubView.as_view(), name="club_view"),
-    re_path(
+    path(
-        r"^(?P<club_id>[0-9]+)/rev/(?P<rev_id>[0-9]+)/$",
+        "<int:club_id>/rev/<int:rev_id>/",
         ClubRevView.as_view(),
         name="club_view_rev",
     ),
-    re_path(
+    path("<int:club_id>/hist/", ClubPageHistView.as_view(), name="club_hist"),
-        r"^(?P<club_id>[0-9]+)/hist$", ClubPageHistView.as_view(), name="club_hist"
+    path("<int:club_id>/edit/", ClubEditView.as_view(), name="club_edit"),
-    ),
+    path(
-    re_path(r"^(?P<club_id>[0-9]+)/edit$", ClubEditView.as_view(), name="club_edit"),
+        "<int:club_id>/edit/page/",
-    re_path(
-        r"^(?P<club_id>[0-9]+)/edit/page$",
         ClubPageEditView.as_view(),
         name="club_edit_page",
     ),
-    re_path(
+    path("<int:club_id>/members/", ClubMembersView.as_view(), name="club_members"),
-        r"^(?P<club_id>[0-9]+)/members$", ClubMembersView.as_view(), name="club_members"
+    path(
-    ),
+        "<int:club_id>/elderlies/",
-    re_path(
-        r"^(?P<club_id>[0-9]+)/elderlies$",
         ClubOldMembersView.as_view(),
         name="club_old_members",
     ),
-    re_path(
+    path(
-        r"^(?P<club_id>[0-9]+)/sellings$",
+        "<int:club_id>/sellings/",
         ClubSellingView.as_view(),
         name="club_sellings",
     ),
-    re_path(
+    path(
-        r"^(?P<club_id>[0-9]+)/sellings/csv$",
+        "<int:club_id>/sellings/csv/",
         ClubSellingCSVView.as_view(),
         name="sellings_csv",
     ),
-    re_path(
+    path("<int:club_id>/prop/", ClubEditPropView.as_view(), name="club_prop"),
-        r"^(?P<club_id>[0-9]+)/prop$", ClubEditPropView.as_view(), name="club_prop"
+    path("<int:club_id>/tools/", ClubToolsView.as_view(), name="tools"),
-    ),
+    path("<int:club_id>/mailing/", ClubMailingView.as_view(), name="mailing"),
-    re_path(r"^(?P<club_id>[0-9]+)/tools$", ClubToolsView.as_view(), name="tools"),
+    path(
-    re_path(
+        "<int:mailing_id>/mailing/generate/",
-        r"^(?P<club_id>[0-9]+)/mailing$", ClubMailingView.as_view(), name="mailing"
-    ),
-    re_path(
-        r"^(?P<mailing_id>[0-9]+)/mailing/generate$",
         MailingAutoGenerationView.as_view(),
         name="mailing_generate",
     ),
-    re_path(
+    path(
-        r"^(?P<mailing_id>[0-9]+)/mailing/delete$",
+        "<int:mailing_id>/mailing/delete/",
         MailingDeleteView.as_view(),
         name="mailing_delete",
     ),
-    re_path(
+    path(
-        r"^(?P<mailing_subscription_id>[0-9]+)/mailing/delete/subscription$",
+        "<int:mailing_subscription_id>/mailing/delete/subscription/",
         MailingSubscriptionDeleteView.as_view(),
         name="mailing_subscription_delete",
     ),
-    re_path(
+    path(
-        r"^membership/(?P<membership_id>[0-9]+)/set_old$",
+        "membership/<int:membership_id>/set_old/",
         MembershipSetOldView.as_view(),
         name="membership_set_old",
     ),
-    re_path(
+    path(
-        r"^(?P<club_id>[0-9]+)/poster$", PosterListView.as_view(), name="poster_list"
+        "membership/<int:membership_id>/delete/",
+        MembershipDeleteView.as_view(),
+        name="membership_delete",
     ),
-    re_path(
+    path("<int:club_id>/poster/", PosterListView.as_view(), name="poster_list"),
-        r"^(?P<club_id>[0-9]+)/poster/create$",
+    path(
+        "<int:club_id>/poster/create/",
         PosterCreateView.as_view(),
         name="poster_create",
     ),
-    re_path(
+    path(
-        r"^(?P<club_id>[0-9]+)/poster/(?P<poster_id>[0-9]+)/edit$",
+        "<int:club_id>/poster/<int:poster_id>/edit/",
         PosterEditView.as_view(),
         name="poster_edit",
     ),
-    re_path(
+    path(
-        r"^(?P<club_id>[0-9]+)/poster/(?P<poster_id>[0-9]+)/delete$",
+        "<int:club_id>/poster/<int:poster_id>/delete/",
         PosterDeleteView.as_view(),
         name="poster_delete",
     ),

club/views.py

@@ -1,65 +1,62 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
-# - Sli <antoine@bartuccio.fr>
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
+import csv
 
 from django.conf import settings
-from django import forms
+from django.core.exceptions import NON_FIELD_ERRORS, PermissionDenied, ValidationError
-from django.views.generic import ListView, DetailView, TemplateView, View
+from django.core.paginator import InvalidPage, Paginator
-from django.views.generic.edit import DeleteView
+from django.db.models import Sum
-from django.views.generic.detail import SingleObjectMixin
+from django.http import (
-from django.views.generic.edit import UpdateView, CreateView
+    Http404,
-from django.http import HttpResponseRedirect, HttpResponse, Http404
+    HttpResponseRedirect,
+    StreamingHttpResponse,
+)
+from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _t
-from django.utils.translation import ugettext as _t
+from django.utils.translation import gettext_lazy as _
-from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS
+from django.views.generic import DetailView, ListView, TemplateView, View
-from django.shortcuts import get_object_or_404, redirect
+from django.views.generic.edit import CreateView, DeleteView, UpdateView
 
-from core.views import (
+from club.forms import ClubEditForm, ClubMemberForm, MailingForm, SellingsForm
-    CanCreateMixin,
+from club.models import Club, Mailing, MailingSubscription, Membership
-    CanViewMixin,
+from com.views import (
-    CanEditMixin,
+    PosterCreateBaseView,
-    CanEditPropMixin,
+    PosterDeleteBaseView,
-    TabedViewMixin,
+    PosterEditBaseView,
-    PageEditViewBase,
+    PosterListBaseView,
-    DetailFormView,
 )
 from core.models import PageRev
-
+from core.views import (
-from counter.models import Selling
+    CanCreateMixin,
-
+    CanEditMixin,
-from com.views import (
+    CanEditPropMixin,
-    PosterListBaseView,
+    CanViewMixin,
-    PosterCreateBaseView,
+    DetailFormView,
-    PosterEditBaseView,
+    PageEditViewBase,
-    PosterDeleteBaseView,
+    TabedViewMixin,
+    UserIsRootMixin,
 )
-
+from counter.models import Selling
-from club.models import Club, Membership, Mailing, MailingSubscription
-from club.forms import MailingForm, ClubEditForm, ClubMemberForm, SellingsFormBase
 
 
 class ClubTabsMixin(TabedViewMixin):
@@ -280,7 +277,7 @@ class ClubMembersView(ClubTabsMixin, CanViewMixin, DetailFormView):
 
     def form_valid(self, form):
         """
-            Check user rights
+        Check user rights
         """
         resp = super(ClubMembersView, self).form_valid(form)
 
@@ -296,9 +293,7 @@ class ClubMembersView(ClubTabsMixin, CanViewMixin, DetailFormView):
         return resp
 
     def dispatch(self, request, *args, **kwargs):
-        self.members = (
+        self.members = self.get_object().members.ongoing().order_by("-role")
-            self.get_object().members.filter(end_date=None).order_by("-role").all()
-        )
         return super(ClubMembersView, self).dispatch(request, *args, **kwargs)
 
     def get_success_url(self, **kwargs):
@@ -318,7 +313,7 @@ class ClubOldMembersView(ClubTabsMixin, CanViewMixin, DetailView):
     current_tab = "elderlies"
 
 
-class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailView):
+class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
     """
     Sellings of a club
     """
@@ -327,21 +322,35 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailView):
     pk_url_kwarg = "club_id"
     template_name = "club/club_sellings.jinja"
     current_tab = "sellings"
+    form_class = SellingsForm
+    paginate_by = 70
 
-    def get_form_class(self):
+    def dispatch(self, request, *args, **kwargs):
-        kwargs = {
+        try:
-            "product": forms.ModelChoiceField(
+            self.asked_page = int(request.GET.get("page", 1))
-                self.object.products.order_by("name").all(),
+        except ValueError:
-                label=_("Product"),
+            raise Http404
-                required=False,
+        return super(ClubSellingView, self).dispatch(request, *args, **kwargs)
-            )
+
-        }
+    def get_form_kwargs(self):
-        return type("SellingsForm", (SellingsFormBase,), kwargs)
+        kwargs = super(ClubSellingView, self).get_form_kwargs()
+        kwargs["club"] = self.object
+        return kwargs
+
+    def post(self, request, *args, **kwargs):
+        return self.get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         kwargs = super(ClubSellingView, self).get_context_data(**kwargs)
-        form = self.get_form_class()(self.request.GET)
         qs = Selling.objects.filter(club=self.object)
+
+        kwargs["result"] = qs[:0]
+        kwargs["paginated_result"] = kwargs["result"]
+        kwargs["total"] = 0
+        kwargs["total_quantity"] = 0
+        kwargs["benefit"] = 0
+
+        form = self.get_form()
         if form.is_valid():
             if not len([v for v in form.cleaned_data.values() if v is not None]):
                 qs = Selling.objects.filter(id=-1)
@@ -349,19 +358,36 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailView):
                 qs = qs.filter(date__gte=form.cleaned_data["begin_date"])
             if form.cleaned_data["end_date"]:
                 qs = qs.filter(date__lte=form.cleaned_data["end_date"])
-            if form.cleaned_data["counter"]:
+
-                qs = qs.filter(counter=form.cleaned_data["counter"])
+            if form.cleaned_data["counters"]:
-            if form.cleaned_data["product"]:
+                qs = qs.filter(counter__in=form.cleaned_data["counters"])
-                qs = qs.filter(product__id=form.cleaned_data["product"].id)
+
+            selected_products = []
+            if form.cleaned_data["products"]:
+                selected_products.extend(form.cleaned_data["products"])
+            if form.cleaned_data["archived_products"]:
+                selected_products.extend(form.cleaned_data["archived_products"])
+
+            if len(selected_products) > 0:
+                qs = qs.filter(product__in=selected_products)
+
             kwargs["result"] = qs.all().order_by("-id")
-            kwargs["total"] = sum([s.quantity * s.unit_price for s in qs.all()])
+            kwargs["total"] = sum([s.quantity * s.unit_price for s in kwargs["result"]])
-            kwargs["total_quantity"] = sum([s.quantity for s in qs.all()])
+            total_quantity = qs.all().aggregate(Sum("quantity"))
-            kwargs["benefit"] = kwargs["total"] - sum(
+            if total_quantity["quantity__sum"]:
-                [s.product.purchase_price for s in qs.exclude(product=None)]
+                kwargs["total_quantity"] = total_quantity["quantity__sum"]
+            benefit = (
+                qs.exclude(product=None).all().aggregate(Sum("product__purchase_price"))
             )
-        else:
+            if benefit["product__purchase_price__sum"]:
-            kwargs["result"] = qs[:0]
+                kwargs["benefit"] = benefit["product__purchase_price__sum"]
-        kwargs["form"] = form
+
+        kwargs["paginator"] = Paginator(kwargs["result"], self.paginate_by)
+        try:
+            kwargs["paginated_result"] = kwargs["paginator"].page(self.asked_page)
+        except InvalidPage:
+            raise Http404
+
         return kwargs
 
 
@@ -370,16 +396,45 @@ class ClubSellingCSVView(ClubSellingView):
     Generate sellings in csv for a given period
     """
 
-    def get(self, request, *args, **kwargs):
+    class StreamWriter:
-        import csv
+        """Implements a file-like interface for streaming the CSV"""
 
-        response = HttpResponse(content_type="text/csv")
+        def write(self, value):
+            """Write the value by returning it, instead of storing in a buffer."""
+            return value
+
+    def write_selling(self, selling):
+        row = [selling.date, selling.counter]
+        if selling.seller:
+            row.append(selling.seller.get_display_name())
+        else:
+            row.append("")
+        if selling.customer:
+            row.append(selling.customer.user.get_display_name())
+        else:
+            row.append("")
+        row = row + [
+            selling.label,
+            selling.quantity,
+            selling.quantity * selling.unit_price,
+            selling.get_payment_method_display(),
+        ]
+        if selling.product:
+            row.append(selling.product.selling_price)
+            row.append(selling.product.purchase_price)
+            row.append(selling.product.selling_price - selling.product.purchase_price)
+        else:
+            row = row + ["", "", ""]
+        return row
+
+    def get(self, request, *args, **kwargs):
         self.object = self.get_object()
-        name = _("Sellings") + "_" + self.object.name + ".csv"
-        response["Content-Disposition"] = "filename=" + name
         kwargs = self.get_context_data(**kwargs)
+
+        # Use the StreamWriter class instead of request for streaming
+        pseudo_buffer = self.StreamWriter()
         writer = csv.writer(
-            response, delimiter=";", lineterminator="\n", quoting=csv.QUOTE_ALL
+            pseudo_buffer, delimiter=";", lineterminator="\n", quoting=csv.QUOTE_ALL
         )
 
         writer.writerow([_t("Quantity"), kwargs["total_quantity"]])
@@ -400,29 +455,17 @@ class ClubSellingCSVView(ClubSellingView):
                 _t("Benefit"),
             ]
         )
-        for o in kwargs["result"]:
+
-            row = [o.date, o.counter]
+        # Stream response
-            if o.seller:
+        response = StreamingHttpResponse(
-                row.append(o.seller.get_display_name())
+            (
-            else:
+                writer.writerow(self.write_selling(selling))
-                row.append("")
+                for selling in kwargs["result"]
-            if o.customer:
+            ),
-                row.append(o.customer.user.get_display_name())
+            content_type="text/csv",
-            else:
+        )
-                row.append("")
+        name = _("Sellings") + "_" + self.object.name + ".csv"
-            row = row + [
+        response["Content-Disposition"] = "filename=" + name
-                o.label,
-                o.quantity,
-                o.quantity * o.unit_price,
-                o.get_payment_method_display(),
-            ]
-            if o.product:
-                row.append(o.product.selling_price)
-                row.append(o.product.purchase_price)
-                row.append(o.product.selling_price - o.product.purchase_price)
-            else:
-                row = row + ["", "", ""]
-            writer.writerow(row)
 
         return response
 
@@ -493,6 +536,19 @@ class MembershipSetOldView(CanEditMixin, DetailView):
         )
 
 
+class MembershipDeleteView(UserIsRootMixin, DeleteView):
+    """
+    Delete a membership (for admins only)
+    """
+
+    model = Membership
+    pk_url_kwarg = "membership_id"
+    template_name = "core/delete_confirm.jinja"
+
+    def get_success_url(self):
+        return reverse_lazy("core:user_clubs", kwargs={"user_id": self.object.user.id})
+
+
 class ClubStatView(TemplateView):
     template_name = "club/stats.jinja"
 
@@ -542,7 +598,7 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
         }
         return kwargs
 
-    def add_new_mailing(self, cleaned_data) -> ValidationError:
+    def add_new_mailing(self, cleaned_data) -> ValidationError | None:
         """
         Create a new mailing list from the form
         """
@@ -559,7 +615,7 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
         mailing.save()
         return None
 
-    def add_new_subscription(self, cleaned_data) -> ValidationError:
+    def add_new_subscription(self, cleaned_data) -> ValidationError | None:
         """
         Add mailing subscriptions for each user given and/or for the specified email in form
         """
@@ -634,7 +690,6 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
 
 
 class MailingDeleteView(CanEditMixin, DeleteView):
-
     model = Mailing
     template_name = "core/delete_confirm.jinja"
     pk_url_kwarg = "mailing_id"
@@ -652,7 +707,6 @@ class MailingDeleteView(CanEditMixin, DeleteView):
 
 
 class MailingSubscriptionDeleteView(CanEditMixin, DeleteView):
-
     model = MailingSubscription
     template_name = "core/delete_confirm.jinja"
     pk_url_kwarg = "mailing_subscription_id"

com/__init__.py

@@ -1,23 +1,19 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #

com/admin.py

@@ -1,43 +1,53 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
+from ajax_select import make_ajax_form
-
 from django.contrib import admin
 from haystack.admin import SearchModelAdmin
 
 from com.models import *
 
 
+@admin.register(News)
 class NewsAdmin(SearchModelAdmin):
-    search_fields = ["title", "summary", "content"]
+    list_display = ("title", "type", "club", "author")
+    search_fields = ("title", "summary", "content")
+    form = make_ajax_form(
+        News,
+        {
+            "author": "users",
+            "moderator": "users",
+        },
+    )
 
 
+@admin.register(Poster)
+class PosterAdmin(SearchModelAdmin):
+    list_display = ("name", "club", "date_begin", "date_end", "moderator")
+    form = make_ajax_form(Poster, {"moderator": "users"})
+
+
+@admin.register(Weekmail)
 class WeekmailAdmin(SearchModelAdmin):
-    search_fields = ["title"]
+    list_display = ("title", "sent")
+    search_fields = ("title",)
 
 
 admin.site.register(Sith)
-admin.site.register(News, NewsAdmin)
-admin.site.register(Weekmail, WeekmailAdmin)
 admin.site.register(Screen)
-admin.site.register(Poster)

com/migrations/0001_initial.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = []
 
     operations = [

com/migrations/0002_news_newsdate.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-from django.conf import settings
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("club", "0005_auto_20161120_1149"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

com/migrations/0003_auto_20170115_2300.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-from django.conf import settings
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("club", "0006_auto_20161229_0040"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

com/migrations/0004_auto_20171221_1614.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+import django.db.models.deletion
 import django.utils.timezone
 from django.conf import settings
-import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("club", "0010_auto_20170912_2028"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

com/migrations/0005_auto_20180318_2227.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("com", "0004_auto_20171221_1614")]
 
     operations = [

com/migrations/0006_remove_sith_index_page.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("com", "0005_auto_20180318_2227")]
 
     operations = [migrations.RemoveField(model_name="sith", name="index_page")]

com/models.py

@@ -1,43 +1,37 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
-# - Sli <antoine@bartuccio.fr>
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.shortcuts import render
+from django.conf import settings
+from django.core.exceptions import ValidationError
+from django.core.mail import EmailMultiAlternatives
 from django.db import models, transaction
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.shortcuts import render
-from django.utils import timezone
+from django.templatetags.static import static
 from django.urls import reverse
-from django.conf import settings
-from django.contrib.staticfiles.templatetags.staticfiles import static
-from django.core.mail import EmailMultiAlternatives
-from django.core.exceptions import ValidationError
-
 from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 
-from core.models import User, Preferences, RealGroup, Notification, SithFile
 from club.models import Club
+from core import utils
+from core.models import Notification, Preferences, RealGroup, User
 
 
 class Sith(models.Model):
@@ -46,9 +40,12 @@ class Sith(models.Model):
     alert_msg = models.TextField(_("alert message"), default="", blank=True)
     info_msg = models.TextField(_("info message"), default="", blank=True)
     weekmail_destinations = models.TextField(_("weekmail destinations"), default="")
+    version = utils.get_git_revision_short_hash()
 
     def is_owned_by(self, user):
-        return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        if user.is_anonymous:
+            return False
+        return user.is_com_admin
 
     def __str__(self):
         return "⛩ Sith ⛩"
@@ -90,13 +87,15 @@ class News(models.Model):
     )
 
     def is_owned_by(self, user):
-        return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) or user == self.author
+        if user.is_anonymous:
+            return False
+        return user.is_com_admin or user == self.author
 
     def can_be_edited_by(self, user):
-        return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        return user.is_com_admin
 
     def can_be_viewed_by(self, user):
-        return self.is_moderated or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        return self.is_moderated or user.is_com_admin
 
     def get_absolute_url(self):
         return reverse("com:news_detail", kwargs={"news_id": self.id})
@@ -227,19 +226,23 @@ class Weekmail(models.Model):
         """
         Return an absolute link to the banner.
         """
-        return "http://" + settings.SITH_URL + static("com/img/weekmail_bannerA19.jpg")
+        return (
+            "http://" + settings.SITH_URL + static("com/img/weekmail_bannerV2P22.png")
+        )
 
     def get_footer(self):
         """
         Return an absolute link to the footer.
         """
-        return "http://" + settings.SITH_URL + static("com/img/weekmail_footerA19.jpg")
+        return "http://" + settings.SITH_URL + static("com/img/weekmail_footerP22.png")
 
     def __str__(self):
         return "Weekmail %s (sent: %s) - %s" % (self.id, self.sent, self.title)
 
     def is_owned_by(self, user):
-        return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        if user.is_anonymous:
+            return False
+        return user.is_com_admin
 
 
 class WeekmailArticle(models.Model):
@@ -267,7 +270,9 @@ class WeekmailArticle(models.Model):
     rank = models.IntegerField(_("rank"), default=-1)
 
     def is_owned_by(self, user):
-        return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        if user.is_anonymous:
+            return False
+        return user.is_com_admin
 
     def __str__(self):
         return "%s - %s (%s)" % (self.title, self.author, self.club)
@@ -283,7 +288,9 @@ class Screen(models.Model):
         )
 
     def is_owned_by(self, user):
-        return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        if user.is_anonymous:
+            return False
+        return user.is_com_admin
 
     def __str__(self):
         return "%s" % (self.name)
@@ -336,12 +343,12 @@ class Poster(models.Model):
             raise ValidationError(_("Begin date should be before end date"))
 
     def is_owned_by(self, user):
-        return user.is_in_group(
+        if user.is_anonymous:
-            settings.SITH_GROUP_COM_ADMIN_ID
+            return False
-        ) or Club.objects.filter(id__in=user.clubs_with_rights)
+        return user.is_com_admin or len(user.clubs_with_rights) > 0
 
     def can_be_moderated_by(self, user):
-        return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
+        return user.is_com_admin
 
     def get_display_name(self):
         return self.club.get_display_name()

com/templates/com/news_detail.jinja

@@ -35,11 +35,11 @@
         <p>{% trans %}Author: {% endtrans %}{{ user_profile_link(news.author) }}</p>
         {% if news.moderator %}
         <p>{% trans %}Moderator: {% endtrans %}{{ user_profile_link(news.moderator) }}</p>
-        {% elif user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
+        {% elif user.is_com_admin %}
         <p> <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
         {% endif %}
         {% if user.can_edit(news) %}
-        <p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be remoderated){% endtrans %}</a></p>
+        <p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be moderated again){% endtrans %}</a></p>
         {% endif %}
         </div>
         </div>

com/templates/com/news_edit.jinja

@@ -49,7 +49,7 @@
     <p>{{ form.club.errors }}<label for="{{ form.club.name }}">{{ form.club.label }}</label> {{ form.club }}</p>
     <p>{{ form.summary.errors }}<label for="{{ form.summary.name }}">{{ form.summary.label }}</label> {{ form.summary }}</p>
     <p>{{ form.content.errors }}<label for="{{ form.content.name }}">{{ form.content.label }}</label> {{ form.content }}</p>
-    {% if user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
+    {% if user.is_com_admin %}
     <p>{{ form.automoderation.errors }}<label for="{{ form.automoderation.name }}">{{ form.automoderation.label }}</label>
         {{ form.automoderation }}</p>
     {% endif %}

com/templates/com/news_list.jinja

@@ -6,152 +6,159 @@
 {% endblock %}
 
 {% block content %}
+{% if user.is_com_admin %}
+<div id="news_admin">
+  <a class="button" href="{{ url('com:news_admin_list') }}">{% trans %}Administrate news{% endtrans %}</a>
+</div>
+<br>
+{% endif  %}
+
 <div id="news">
-    {% if user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
+    <div id="left_column" class="news_column">
-    <div id="news_admin">
+        {% for news in object_list.filter(type="NOTICE") %}
-      <a href="{{ url('com:news_admin_list') }}">{% trans %}Administrate news{% endtrans %}</a>
+            <section class="news_notice">
+                <h4><a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                <div class="news_content">{{ news.summary|markdown }}</div>
+            </section>
+        {% endfor %}
+
+        {% for news in object_list.filter(dates__start_date__lte=timezone.now(), dates__end_date__gte=timezone.now(), type="CALL") %}
+            <section class="news_call">
+                <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                <div class="news_date">
+                    <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                    <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                </div>
+                <div class="news_content">{{ news.summary|markdown }}</div>
+            </section>
+        {% endfor %}
+
+        {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5), news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %}
+        <h3>{% trans %}Events today and the next few days{% endtrans %}</h3>
+        {% if events_dates %}
+            {% for d in events_dates %}
+                <div class="news_events_group">
+                    <div class="news_events_group_date">
+                        <div>
+                            <div>{{ d|localtime|date('D') }}</div>
+                            <div class="day">{{ d|localtime|date('d') }}</div>
+                            <div>{{ d|localtime|date('b') }}</div>
+                        </div>
+                    </div>
+                    <div class="news_events_group_items">
+                        {% for news in object_list.filter(dates__start_date__gte=d,
+                        dates__start_date__lte=d+timedelta(days=1),
+                        type="EVENT").exclude(dates__end_date__lt=timezone.now())
+                        .order_by('dates__start_date') %}
+                        <section class="news_event">
+                            <div class="club_logo">
+                                {% if news.club.logo %}
+                                    <img src="{{ news.club.logo.url }}" alt="{{ news.club }}" />
+                                {% else %}
+                                    <img src="{{ static("com/img/news.png") }}" alt="{{ news.club }}" />
+                                {% endif %}
+                            </div>
+                            <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                            <div><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></div>
+                            <div class="news_date">
+                                <span>{{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                                <span>{{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                            </div>
+                            <div class="news_content">{{ news.summary|markdown }}
+                                <div class="button_bar">
+                                    {{ fb_quick(news) }}
+                                    {{ tweet_quick(news) }}
+                                </div>
+                            </div>
+                        </section>
+                    {% endfor %}
+                    </div>
+                </div>
+            {% endfor %}
+        {% else %}
+            <div class="news_empty">
+                <em>{% trans %}Nothing to come...{% endtrans %}</em>
+            </div>
+        {% endif %}
+
+        {% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5),
+        type="EVENT").order_by('dates__start_date') %}
+        {% if coming_soon %}
+            <h3>{% trans %}Coming soon... don't miss!{% endtrans %}</h3>
+            {% for news in coming_soon %}
+                <section class="news_coming_soon">
+                    <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a>
+                    <span class="news_date">{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} -
+                        {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                </section>
+            {% endfor %}
+        {% endif %}
+
+        <h3>{% trans %}All coming events{% endtrans %}</h3>
+        <iframe 
+            src="https://embed.styledcalendar.com/#2mF2is8CEXhr4ADcX6qN" 
+            title="Styled Calendar"
+            class="styled-calendar-container" 
+            style="width: 100%; border: none; height: 1060px" 
+            data-cy="calendar-embed-iframe">
+        </iframe>
     </div>
-    {% endif  %}
 
     <div id="right_column" class="news_column">
-      <div id="agenda">
+        <div id="agenda">
-          <div id="agenda_title">{% trans %}Agenda{% endtrans %}</div>
+            <div id="agenda_title">{% trans %}Agenda{% endtrans %}</div>
-          <div id="agenda_content">
+            <div id="agenda_content">
-          {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(),
+                {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(),
-                  news__is_moderated=True, news__type__in=["WEEKLY",
+                news__is_moderated=True, news__type__in=["WEEKLY",
-                  "EVENT"]).order_by('start_date', 'end_date') %}
+                "EVENT"]).order_by('start_date', 'end_date') %}
-              <div class="agenda_item">
+                <div class="agenda_item">
-                  <div class="agenda_date">
+                    <div class="agenda_date">
-                      <strong>{{ d.start_date|localtime|date('D d M Y') }}</strong>
+                        <strong>{{ d.start_date|localtime|date('D d M Y') }}</strong>
-                  </div>
+                    </div>
-                  <div class="agenda_time">
+                    <div class="agenda_time">
-                      <span>{{ d.start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                        <span>{{ d.start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-                      <span>{{ d.end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                        <span>{{ d.end_date|localtime|time(DATETIME_FORMAT) }}</span>
-                  </div>
+                    </div>
-                  <div>
+                    <div>
-                      <strong><a href="{{ url('com:news_detail', news_id=d.news.id) }}">{{ d.news.title }}</a></strong>
+                        <strong><a href="{{ url('com:news_detail', news_id=d.news.id) }}">{{ d.news.title }}</a></strong>
-                      <a href="{{ d.news.club.get_absolute_url() }}">{{ d.news.club }}</a>
+                        <a href="{{ d.news.club.get_absolute_url() }}">{{ d.news.club }}</a>
-                  </div>
+                    </div>
-                  <div class="agenda_item_content">{{ d.news.summary|markdown }}</div>
+                    <div class="agenda_item_content">{{ d.news.summary|markdown }}</div>
-              </div>
+                </div>
-          {% endfor %}
+            {% endfor %}
-          </div>
+            </div>
-      </div>
-
-      <div id="birthdays">
-        <div id="birthdays_title">{% trans %}Birthdays{% endtrans %}</div>
-          <div id="birthdays_content">
-            {% if user.is_subscribed %}
-              {# Cache request for 1 hour #}
-              {% cache 3600 birthdays %}
-              <ul class="birthdays_year">
-                {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
-                  <li>
-                    {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
-                    <ul>
-                      {% for u in birthdays.filter(date_of_birth__year=d.year) %}
-                        <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
-                      {% endfor %}
-                    </ul>
-                  </li>
-                {% endfor %}
-              </ul>
-              {% endcache %}
-            {% else %}
-              <p>{% trans %}You need an up to date subscription to access this content{% endtrans %}</p>
-            {% endif %}
-          </div>
         </div>
-      </div>
 
-
+        <div id="birthdays">
-    <div id="left_column" class="news_column">
+            <div id="birthdays_title">{% trans %}Birthdays{% endtrans %}</div>
-
+            <div id="birthdays_content">
-      {% for news in object_list.filter(type="NOTICE") %}
+                {% if user.is_subscribed %}
-      <section class="news_notice">
+                    {# Cache request for 1 hour #}
-          <h4><a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                    {% cache 3600 "birthdays" %}
-          <div class="news_content">{{ news.summary|markdown }}</div>
+                    <ul class="birthdays_year">
-      </section>
+                        {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
-      {% endfor %}
+                            <li>
-
+                                {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
-      {% for news in object_list.filter(dates__start_date__lte=timezone.now(),
+                                <ul>
-          dates__end_date__gte=timezone.now(), type="CALL") %}
+                                    {% for u in birthdays.filter(date_of_birth__year=d.year) %}
-      <section class="news_call">
+                                        <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
-          <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                                    {% endfor %}
-          <div class="news_date">
+                                </ul>
-              <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+                            </li>
-                  {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                        {% endfor %}
-              <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+                    </ul>
-                  {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                    {% endcache %}
-          </div>
+                {% else %}
-          <div class="news_content">{{ news.summary|markdown }}</div>
+                    <p>{% trans %}You need an up to date subscription to access this content{% endtrans %}</p>
-      </section>
+                {% endif %}
-      {% endfor %}
+            </div>
-
+        </div>
-      {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5),
-                                          news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %}
-      <h3>{% trans %}Events today and the next few days{% endtrans %}</h3>
-      {% if events_dates %}
-      {% for d in events_dates %}
-      <div class="news_events_group">
-          <div class="news_events_group_date">
-              <div>
-                  <div>{{ d|localtime|date('D') }}</div>
-                  <div class="day">{{ d|localtime|date('d') }}</div>
-                  <div>{{ d|localtime|date('b') }}</div>
-              </div>
-          </div>
-          <div class="news_events_group_items">
-              {% for news in object_list.filter(dates__start_date__gte=d,
-                    dates__start_date__lte=d+timedelta(days=1),
-                    type="EVENT").exclude(dates__end_date__lt=timezone.now())
-                    .order_by('dates__start_date') %}
-              <section class="news_event">
-                  <div class="club_logo">
-                    {% if news.club.logo %}
-                    <img src="{{ news.club.logo.url }}" alt="{{ news.club }}" />
-                    {% else %}
-                    <img src="{{ static("com/img/news.png") }}" alt="{{ news.club }}" />
-                    {% endif %}
-                  </div>
-                  <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
-                  <div><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></div>
-                  <div class="news_date">
-                      <span>{{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-                      <span>{{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-                  </div>
-                  <div class="news_content">{{ news.summary|markdown }}
-                  <div class="button_bar">
-                    {{ fb_quick(news) }}
-                    {{ tweet_quick(news) }}
-                  </div>
-                  </div>
-              </section>
-              {% endfor %}
-          </div>
-      </div>
-      {% endfor %}
-      {% else %}
-      <div class="news_empty">
-        <em>{% trans %}Nothing to come...{% endtrans %}</em>
-      </div>
-      {% endif %}
-
-      {% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5),
-          type="EVENT").order_by('dates__start_date') %}
-      {% if coming_soon %}
-      <h3>{% trans %}Coming soon... don't miss!{% endtrans %}</h3>
-      {% for news in coming_soon %}
-      <section class="news_coming_soon">
-          <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a>
-          <span class="news_date">{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-              {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} -
-          {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-          {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-      </section>
-      {% endfor %}
-      {% endif %}
     </div>
+
 </div>
 {% endblock %}
 

com/templates/com/poster_list.jinja

@@ -36,8 +36,8 @@
                     <div class="name">{{ poster.name }}</div>
                     <div class="image"><img src="{{ poster.file.url }}"></img></div>
                     <div class="dates">
-                        <div class="begin">{{ poster.date_begin | date("d/M/Y H:m") }}</div>
+                        <div class="begin">{{ poster.date_begin | localtime | date("d/M/Y H:m") }}</div>
-                        <div class="end">{{ poster.date_end | date("d/M/Y H:m") }}</div>
+                        <div class="end">{{ poster.date_end | localtime | date("d/M/Y H:m") }}</div>
                     </div>
                     {% if app == "com" %}
                         <a class="edit" href="{{ url(app + ":poster_edit", poster.id) }}">{% trans %}Edit{% endtrans %}</a>

com/templates/com/screen_slideshow.jinja

@@ -24,7 +24,7 @@
         <div id="progress_bar"></div>
 
     </div>
-    <script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>
+    <script src="{{ static('core/js/jquery-3.6.2.min.js') }}"></script>
     <script src="{{ static('com/js/slideshow.js') }}"></script>
 </body>
 </html>

com/templates/com/weekmail_preview.jinja

@@ -7,15 +7,33 @@
 
 {% block content %}
 <a href="{{ url('com:weekmail') }}">{% trans %}Back{% endtrans %}</a>
-{% if request.GET['send'] %}
+{% if bad_recipients %}
-<p>{% trans %}Are you sure you want to send this weekmail?{% endtrans %}</p>
+    <p>
-{% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %}
+    <span class="important">
-<p><strong>{% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}</strong></p>
+        {% trans %}The following recipients were refused by the SMTP:{% endtrans %}
-{% endif %}
+    </span>
-<form method="post" action="">
+    <ul>
-    {% csrf_token %}
+    {% for r in bad_recipients.keys() %}
-    <button type="submit" name="send" value="validate">{% trans %}Send{% endtrans %}</button>
+        <li>{{ r }}</li>
-</form>
+    {% endfor %}
+    </ul>
+    </p>
+
+    <form method="post" action="">
+        {% csrf_token %}
+        <button type="submit" name="send" value="clean">{% trans %}Clean subscribers{% endtrans %}</button>
+    </form>
+{% else %}
+    {% if request.GET['send'] %}
+        <p>{% trans %}Are you sure you want to send this weekmail?{% endtrans %}</p>
+        {% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %}
+            <p><strong>{% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}</strong></p>
+        {% endif %}
+        <form method="post" action="">
+            {% csrf_token %}
+            <button type="submit" name="send" value="validate">{% trans %}Send{% endtrans %}</button>
+        </form>
+    {% endif %}
 {% endif %}
 <hr>
 {{ weekmail_rendered|safe }}

com/tests.py

@@ -1,73 +1,69 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
+import pytest
-
-from django.test import TestCase
 from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
 from django.urls import reverse
-from django.core.management import call_command
 from django.utils import html
-from django.utils.translation import ugettext as _
+from django.utils.timezone import localtime, now
+from django.utils.translation import gettext as _
+
+from club.models import Club, Membership
+from com.models import News, Poster, Sith, Weekmail, WeekmailArticle
+from core.models import AnonymousUser, RealGroup, User
 
 
-from core.models import User, RealGroup
+@pytest.fixture()
+def user_community():
+    return User.objects.get(username="comunity")
 
 
-class ComAlertTest(TestCase):
+@pytest.mark.django_db
-    def setUp(self):
+@pytest.mark.parametrize(
-        call_command("populate")
+    "url",
-
+    [
-    def test_page_is_working(self):
+        reverse("com:alert_edit"),
-        self.client.login(username="comunity", password="plop")
+        reverse("com:info_edit"),
-        response = self.client.get(reverse("com:alert_edit"))
+    ],
-        self.assertNotEquals(response.status_code, 500)
+)
-        self.assertEquals(response.status_code, 200)
+def test_com_page_is_working(client, url, user_community):
-
+    client.force_login(user_community)
-
+    response = client.get(url)
-class ComInfoTest(TestCase):
+    assert response.status_code == 200
-    def setUp(self):
-        call_command("populate")
-
-    def test_page_is_working(self):
-        self.client.login(username="comunity", password="plop")
-        response = self.client.get(reverse("com:info_edit"))
-        self.assertNotEquals(response.status_code, 500)
-        self.assertEquals(response.status_code, 200)
 
 
 class ComTest(TestCase):
-    def setUp(self):
+    @classmethod
-        call_command("populate")
+    def setUpTestData(cls):
-        self.skia = User.objects.filter(username="skia").first()
+        cls.skia = User.objects.get(username="skia")
-        self.com_group = RealGroup.objects.filter(
+        cls.com_group = RealGroup.objects.filter(
             id=settings.SITH_GROUP_COM_ADMIN_ID
         ).first()
-        self.skia.groups.set([self.com_group])
+        cls.skia.groups.set([cls.com_group])
-        self.skia.save()
+
-        self.client.login(username=self.skia.username, password="plop")
+    def setUp(self):
+        self.client.force_login(self.skia)
 
     def test_alert_msg(self):
-        response = self.client.post(
+        self.client.post(
             reverse("com:alert_edit"),
             {
                 "alert_msg": """
@@ -78,14 +74,15 @@ class ComTest(TestCase):
             },
         )
         r = self.client.get(reverse("core:index"))
-        self.assertTrue(r.status_code == 200)
+        self.assertContains(
-        self.assertTrue(
+            r,
-            """<div id="alert_box">\\n                <div class="markdown"><h3>ALERTE!</h3>\\n<p><strong>Caaaataaaapuuuulte!!!!</strong></p>"""
+            """<div id="alert_box">
-            in str(r.content)
+                            <div class="markdown"><h3>ALERTE!</h3>
+<p><strong>Caaaataaaapuuuulte!!!!</strong></p>""",
         )
 
     def test_info_msg(self):
-        response = self.client.post(
+        self.client.post(
             reverse("com:info_edit"),
             {
                 "info_msg": """
@@ -94,14 +91,14 @@ class ComTest(TestCase):
             },
         )
         r = self.client.get(reverse("core:index"))
-        self.assertTrue(r.status_code == 200)
+        self.assertContains(
-        self.assertTrue(
+            r,
-            """<div id="info_box">\\n                <div class="markdown"><h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>"""
+            """<div id="info_box">
-            in str(r.content)
+                            <div class="markdown"><h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>""",
         )
 
     def test_birthday_non_subscribed_user(self):
-        self.client.login(username="guy", password="plop")
+        self.client.force_login(User.objects.get(username="guy"))
         response = self.client.get(reverse("core:index"))
         self.assertContains(
             response,
@@ -119,3 +116,129 @@ class ComTest(TestCase):
                 _("You need an up to date subscription to access this content")
             ),
         )
+
+
+class SithTest(TestCase):
+    def test_sith_owner(self):
+        """
+        Test that the sith instance is owned by com admins
+        and nobody else
+        """
+        sith: Sith = Sith.objects.first()
+
+        com_admin = User.objects.get(username="comunity")
+        assert sith.is_owned_by(com_admin)
+
+        anonymous = AnonymousUser()
+        assert not sith.is_owned_by(anonymous)
+
+        sli = User.objects.get(username="sli")
+        assert not sith.is_owned_by(sli)
+
+
+class NewsTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.com_admin = User.objects.get(username="comunity")
+        new = News.objects.create(
+            title="dummy new",
+            summary="This is a dummy new",
+            content="Look at that beautiful dummy new",
+            author=User.objects.get(username="subscriber"),
+            club=Club.objects.first(),
+        )
+        cls.new = new
+        cls.author = new.author
+        cls.sli = User.objects.get(username="sli")
+        cls.anonymous = AnonymousUser()
+
+    def test_news_owner(self):
+        """
+        Test that news are owned by com admins
+        or by their author but nobody else
+        """
+
+        assert self.new.is_owned_by(self.com_admin)
+        assert self.new.is_owned_by(self.author)
+        assert not self.new.is_owned_by(self.anonymous)
+        assert not self.new.is_owned_by(self.sli)
+
+    def test_news_viewer(self):
+        """
+        Test that moderated news can be viewed by anyone
+        and not moderated news only by com admins
+        """
+        # by default a news isn't moderated
+        assert self.new.can_be_viewed_by(self.com_admin)
+        assert not self.new.can_be_viewed_by(self.sli)
+        assert not self.new.can_be_viewed_by(self.anonymous)
+        assert not self.new.can_be_viewed_by(self.author)
+
+        self.new.is_moderated = True
+        self.new.save()
+        assert self.new.can_be_viewed_by(self.com_admin)
+        assert self.new.can_be_viewed_by(self.sli)
+        assert self.new.can_be_viewed_by(self.anonymous)
+        assert self.new.can_be_viewed_by(self.author)
+
+    def test_news_editor(self):
+        """
+        Test that only com admins can edit news
+        """
+        assert self.new.can_be_edited_by(self.com_admin)
+        assert not self.new.can_be_edited_by(self.sli)
+        assert not self.new.can_be_edited_by(self.anonymous)
+        assert not self.new.can_be_edited_by(self.author)
+
+
+class WeekmailArticleTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.com_admin = User.objects.get(username="comunity")
+        author = User.objects.get(username="subscriber")
+        cls.article = WeekmailArticle.objects.create(
+            weekmail=Weekmail.objects.create(),
+            author=author,
+            title="title",
+            content="Some content",
+            club=Club.objects.first(),
+        )
+        cls.author = author
+        cls.sli = User.objects.get(username="sli")
+        cls.anonymous = AnonymousUser()
+
+    def test_weekmail_owner(self):
+        """
+        Test that weekmails are owned only by com admins
+        """
+        assert self.article.is_owned_by(self.com_admin)
+        assert not self.article.is_owned_by(self.author)
+        assert not self.article.is_owned_by(self.anonymous)
+        assert not self.article.is_owned_by(self.sli)
+
+
+class PosterTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.com_admin = User.objects.get(username="comunity")
+        cls.poster = Poster.objects.create(
+            name="dummy",
+            file=SimpleUploadedFile("dummy.jpg", b"azertyuiop"),
+            club=Club.objects.first(),
+            date_begin=localtime(now()),
+        )
+        cls.sli = User.objects.get(username="sli")
+        cls.sli.memberships.all().delete()
+        Membership(user=cls.sli, club=Club.objects.first(), role=5).save()
+        cls.susbcriber = User.objects.get(username="subscriber")
+        cls.anonymous = AnonymousUser()
+
+    def test_poster_owner(self):
+        """
+        Test that poster are owned by com admins and board members in clubs
+        """
+        assert self.poster.is_owned_by(self.com_admin)
+        assert not self.poster.is_owned_by(self.anonymous)
+
+        assert not self.poster.is_owned_by(self.susbcriber)
+        assert self.poster.is_owned_by(self.sli)

com/urls.py

@@ -1,125 +1,115 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.urls import re_path
+from django.urls import path
 
-from com.views import *
 from club.views import MailingDeleteView
+from com.views import *
 
 urlpatterns = [
-    re_path(r"^sith/edit/alert$", AlertMsgEditView.as_view(), name="alert_edit"),
+    path("sith/edit/alert/", AlertMsgEditView.as_view(), name="alert_edit"),
-    re_path(r"^sith/edit/info$", InfoMsgEditView.as_view(), name="info_edit"),
+    path("sith/edit/info/", InfoMsgEditView.as_view(), name="info_edit"),
-    re_path(
+    path(
-        r"^sith/edit/weekmail_destinations$",
+        "sith/edit/weekmail_destinations/",
         WeekmailDestinationEditView.as_view(),
         name="weekmail_destinations",
     ),
-    re_path(r"^weekmail$", WeekmailEditView.as_view(), name="weekmail"),
+    path("weekmail/", WeekmailEditView.as_view(), name="weekmail"),
-    re_path(
+    path("weekmail/preview/", WeekmailPreviewView.as_view(), name="weekmail_preview"),
-        r"^weekmail/preview$", WeekmailPreviewView.as_view(), name="weekmail_preview"
+    path(
-    ),
+        "weekmail/new_article/",
-    re_path(
-        r"^weekmail/new_article$",
         WeekmailArticleCreateView.as_view(),
         name="weekmail_article",
     ),
-    re_path(
+    path(
-        r"^weekmail/article/(?P<article_id>[0-9]+)/delete$",
+        "weekmail/article/<int:article_id>/delete/",
         WeekmailArticleDeleteView.as_view(),
         name="weekmail_article_delete",
     ),
-    re_path(
+    path(
-        r"^weekmail/article/(?P<article_id>[0-9]+)/edit$",
+        "weekmail/article/<int:article_id>/edit/",
         WeekmailArticleEditView.as_view(),
         name="weekmail_article_edit",
     ),
-    re_path(r"^news$", NewsListView.as_view(), name="news_list"),
+    path("news/", NewsListView.as_view(), name="news_list"),
-    re_path(r"^news/admin$", NewsAdminListView.as_view(), name="news_admin_list"),
+    path("news/admin/", NewsAdminListView.as_view(), name="news_admin_list"),
-    re_path(r"^news/create$", NewsCreateView.as_view(), name="news_new"),
+    path("news/create/", NewsCreateView.as_view(), name="news_new"),
-    re_path(
+    path(
-        r"^news/(?P<news_id>[0-9]+)/delete$",
+        "news/<int:news_id>/delete/",
         NewsDeleteView.as_view(),
         name="news_delete",
     ),
-    re_path(
+    path(
-        r"^news/(?P<news_id>[0-9]+)/moderate$",
+        "news/<int:news_id>/moderate/",
         NewsModerateView.as_view(),
         name="news_moderate",
     ),
-    re_path(
+    path("news/<int:news_id>/edit/", NewsEditView.as_view(), name="news_edit"),
-        r"^news/(?P<news_id>[0-9]+)/edit$", NewsEditView.as_view(), name="news_edit"
+    path("news/<int:news_id>/", NewsDetailView.as_view(), name="news_detail"),
-    ),
+    path("mailings/", MailingListAdminView.as_view(), name="mailing_admin"),
-    re_path(
+    path(
-        r"^news/(?P<news_id>[0-9]+)$", NewsDetailView.as_view(), name="news_detail"
+        "mailings/<int:mailing_id>/moderate/",
-    ),
-    re_path(r"^mailings$", MailingListAdminView.as_view(), name="mailing_admin"),
-    re_path(
-        r"^mailings/(?P<mailing_id>[0-9]+)/moderate$",
         MailingModerateView.as_view(),
         name="mailing_moderate",
     ),
-    re_path(
+    path(
-        r"^mailings/(?P<mailing_id>[0-9]+)/delete$",
+        "mailings/<int:mailing_id>/delete/",
         MailingDeleteView.as_view(redirect_page="com:mailing_admin"),
         name="mailing_delete",
     ),
-    re_path(r"^poster$", PosterListView.as_view(), name="poster_list"),
+    path("poster/", PosterListView.as_view(), name="poster_list"),
-    re_path(r"^poster/create$", PosterCreateView.as_view(), name="poster_create"),
+    path("poster/create/", PosterCreateView.as_view(), name="poster_create"),
-    re_path(
+    path(
-        r"^poster/(?P<poster_id>[0-9]+)/edit$",
+        "poster/<int:poster_id>/edit/",
         PosterEditView.as_view(),
         name="poster_edit",
     ),
-    re_path(
+    path(
-        r"^poster/(?P<poster_id>[0-9]+)/delete$",
+        "poster/<int:poster_id>/delete/",
         PosterDeleteView.as_view(),
         name="poster_delete",
     ),
-    re_path(
+    path(
-        r"^poster/moderate$",
+        "poster/moderate/",
         PosterModerateListView.as_view(),
         name="poster_moderate_list",
     ),
-    re_path(
+    path(
-        r"^poster/(?P<object_id>[0-9]+)/moderate$",
+        "poster/<int:object_id>/moderate/",
         PosterModerateView.as_view(),
         name="poster_moderate",
     ),
-    re_path(r"^screen$", ScreenListView.as_view(), name="screen_list"),
+    path("screen/", ScreenListView.as_view(), name="screen_list"),
-    re_path(r"^screen/create$", ScreenCreateView.as_view(), name="screen_create"),
+    path("screen/create/", ScreenCreateView.as_view(), name="screen_create"),
-    re_path(
+    path(
-        r"^screen/(?P<screen_id>[0-9]+)/slideshow$",
+        "screen/<int:screen_id>/slideshow/",
         ScreenSlideshowView.as_view(),
         name="screen_slideshow",
     ),
-    re_path(
+    path(
-        r"^screen/(?P<screen_id>[0-9]+)/edit$",
+        "screen/<int:screen_id>/edit/",
         ScreenEditView.as_view(),
         name="screen_edit",
     ),
-    re_path(
+    path(
-        r"^screen/(?P<screen_id>[0-9]+)/delete$",
+        "screen/<int:screen_id>/delete/",
         ScreenDeleteView.as_view(),
         name="screen_delete",
     ),

com/views.py

@@ -1,58 +1,52 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
-# - Sli <antoine@bartuccio.fr>
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
-
-from django.shortcuts import redirect, get_object_or_404
-from django.http import HttpResponseRedirect
-from django.views.generic import ListView, DetailView, View
-from django.views.generic.edit import UpdateView, CreateView, DeleteView
-from django.views.generic.detail import SingleObjectMixin
-from django.utils.translation import ugettext_lazy as _
-from django.urls import reverse, reverse_lazy
-from django.core.exceptions import ValidationError
-from django.utils import timezone
-from django.conf import settings
-from django.db.models import Max
-from django.forms.models import modelform_factory
-from django.core.exceptions import PermissionDenied
-from django import forms
 
 from datetime import timedelta
+from smtplib import SMTPRecipientsRefused
 
-from com.models import Sith, News, NewsDate, Weekmail, WeekmailArticle, Screen, Poster
+from django import forms
+from django.conf import settings
+from django.core.exceptions import PermissionDenied, ValidationError
+from django.db.models import Max
+from django.forms.models import modelform_factory
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404, redirect
+from django.urls import reverse, reverse_lazy
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import DetailView, ListView, View
+from django.views.generic.detail import SingleObjectMixin
+from django.views.generic.edit import CreateView, DeleteView, UpdateView
+
+from club.models import Club, Mailing
+from com.models import News, NewsDate, Poster, Screen, Sith, Weekmail, WeekmailArticle
+from core.models import Notification, RealGroup, User
 from core.views import (
-    CanViewMixin,
+    CanCreateMixin,
     CanEditMixin,
     CanEditPropMixin,
-    TabedViewMixin,
+    CanViewMixin,
-    CanCreateMixin,
     QuickNotifMixin,
+    TabedViewMixin,
 )
-from core.views.forms import SelectDateTime, MarkdownInput
+from core.views.forms import MarkdownInput, TzAwareDateTimeField
-from core.models import Notification, RealGroup, User
-from club.models import Club, Mailing
-
 
 # Sith object
 
@@ -72,20 +66,14 @@ class PosterForm(forms.ModelForm):
             "display_time",
         ]
         widgets = {"screens": forms.CheckboxSelectMultiple}
+        help_texts = {"file": _("Format: 16:9 | Resolution: 1920x1080")}
 
-    date_begin = forms.DateTimeField(
+    date_begin = TzAwareDateTimeField(
-        input_formats=["%Y-%m-%d %H:%M:%S"],
         label=_("Start date"),
-        widget=SelectDateTime,
         required=True,
         initial=timezone.now().strftime("%Y-%m-%d %H:%M:%S"),
     )
-    date_end = forms.DateTimeField(
+    date_end = TzAwareDateTimeField(label=_("End date"), required=False)
-        input_formats=["%Y-%m-%d %H:%M:%S"],
-        label=_("End date"),
-        widget=SelectDateTime,
-        required=False,
-    )
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user", None)
@@ -150,7 +138,7 @@ class ComTabsMixin(TabedViewMixin):
 
 class IsComAdminMixin(View):
     def dispatch(self, request, *args, **kwargs):
-        if not (request.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)):
+        if not request.user.is_com_admin:
             raise PermissionDenied
         return super(IsComAdminMixin, self).dispatch(request, *args, **kwargs)
 
@@ -199,24 +187,10 @@ class NewsForm(forms.ModelForm):
             "content": MarkdownInput,
         }
 
-    start_date = forms.DateTimeField(
+    start_date = TzAwareDateTimeField(label=_("Start date"), required=False)
-        input_formats=["%Y-%m-%d %H:%M:%S"],
+    end_date = TzAwareDateTimeField(label=_("End date"), required=False)
-        label=_("Start date"),
+    until = TzAwareDateTimeField(label=_("Until"), required=False)
-        widget=SelectDateTime,
+
-        required=False,
-    )
-    end_date = forms.DateTimeField(
-        input_formats=["%Y-%m-%d %H:%M:%S"],
-        label=_("End date"),
-        widget=SelectDateTime,
-        required=False,
-    )
-    until = forms.DateTimeField(
-        input_formats=["%Y-%m-%d %H:%M:%S"],
-        label=_("Until"),
-        widget=SelectDateTime,
-        required=False,
-    )
     automoderation = forms.BooleanField(label=_("Automoderation"), required=False)
 
     def clean(self):
@@ -301,9 +275,7 @@ class NewsEditView(CanEditMixin, UpdateView):
 
     def form_valid(self, form):
         self.object = form.save()
-        if form.cleaned_data["automoderation"] and self.request.user.is_in_group(
+        if form.cleaned_data["automoderation"] and self.request.user.is_com_admin:
-            settings.SITH_GROUP_COM_ADMIN_ID
-        ):
             self.object.moderator = self.request.user
             self.object.is_moderated = True
             self.object.save()
@@ -351,9 +323,7 @@ class NewsCreateView(CanCreateMixin, CreateView):
 
     def form_valid(self, form):
         self.object = form.save()
-        if form.cleaned_data["automoderation"] and self.request.user.is_in_group(
+        if form.cleaned_data["automoderation"] and self.request.user.is_com_admin:
-            settings.SITH_GROUP_COM_ADMIN_ID
-        ):
             self.object.moderator = self.request.user
             self.object.is_moderated = True
             self.object.save()
@@ -433,23 +403,36 @@ class NewsDetailView(CanViewMixin, DetailView):
 # Weekmail
 
 
-class WeekmailPreviewView(ComTabsMixin, CanEditPropMixin, DetailView):
+class WeekmailPreviewView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, DetailView):
     model = Weekmail
     template_name = "com/weekmail_preview.jinja"
     success_url = reverse_lazy("com:weekmail")
     current_tab = "weekmail"
 
+    def dispatch(self, request, *args, **kwargs):
+        self.bad_recipients = []
+        return super(WeekmailPreviewView, self).dispatch(request, *args, **kwargs)
+
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
-        try:
+        if request.POST["send"] == "validate":
-            if request.POST["send"] == "validate":
+            try:
                 self.object.send()
                 return HttpResponseRedirect(
                     reverse("com:weekmail") + "?qn_weekmail_send_success"
                 )
-        except:
+            except SMTPRecipientsRefused as e:
-            pass
+                self.bad_recipients = e.recipients
-        return super(WeekmailEditView, self).get(request, *args, **kwargs)
+        elif request.POST["send"] == "clean":
+            try:
+                self.object.send()  # This should fail
+            except SMTPRecipientsRefused as e:
+                users = User.objects.filter(email__in=e.recipients.keys())
+                for u in users:
+                    u.preferences.receive_weekmail = False
+                    u.preferences.save()
+                self.quick_notif_list += ["qn_success"]
+        return super(WeekmailPreviewView, self).get(request, *args, **kwargs)
 
     def get_object(self, queryset=None):
         return self.model.objects.filter(sent=False).order_by("-id").first()
@@ -458,6 +441,7 @@ class WeekmailPreviewView(ComTabsMixin, CanEditPropMixin, DetailView):
         """Add rendered weekmail"""
         kwargs = super(WeekmailPreviewView, self).get_context_data(**kwargs)
         kwargs["weekmail_rendered"] = self.object.render_html()
+        kwargs["bad_recipients"] = self.bad_recipients
         return kwargs
 
 
@@ -534,7 +518,7 @@ class WeekmailEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, UpdateVi
         return super(WeekmailEditView, self).get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        """Add orphan articles """
+        """Add orphan articles"""
         kwargs = super(WeekmailEditView, self).get_context_data(**kwargs)
         kwargs["orphans"] = WeekmailArticle.objects.filter(weekmail=None)
         return kwargs
@@ -621,10 +605,7 @@ class MailingListAdminView(ComTabsMixin, ListView):
     current_tab = "mailings"
 
     def dispatch(self, request, *args, **kwargs):
-        if not (
+        if not (request.user.is_com_admin or request.user.is_root):
-            request.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
-            or request.user.is_root
-        ):
             raise PermissionDenied
         return super(MailingListAdminView, self).dispatch(request, *args, **kwargs)
 

conftest.py

@@ -0,0 +1,14 @@
+import pytest
+from django.core.management import call_command
+from django.utils.translation import activate
+
+
+@pytest.fixture(scope="session")
+def django_db_setup(django_db_setup, django_db_blocker):
+    with django_db_blocker.unblock():
+        call_command("setup")
+
+
+@pytest.fixture(scope="session", autouse=True)
+def set_default_language():
+    activate("fr")

core/__init__.py

@@ -1,25 +1,19 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
 #
-# You should have received a copy of the GNU General Public License along with
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
-# Place - Suite 330, Boston, MA 02111-1307, USA.
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
-#
-
-default_app_config = "core.apps.SithConfig"

core/admin.py

@@ -1,40 +1,38 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2016,2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
-from django.contrib import admin
 from ajax_select import make_ajax_form
-from core.models import User, Page, RealGroup, SithFile
+from django.contrib import admin
 from django.contrib.auth.models import Group as AuthGroup
 from haystack.admin import SearchModelAdmin
 
+from core.models import MetaGroup, Page, RealGroup, SithFile, User
 
 admin.site.unregister(AuthGroup)
+admin.site.register(MetaGroup)
 admin.site.register(RealGroup)
 
 
+@admin.register(User)
 class UserAdmin(SearchModelAdmin):
-    list_display = ["first_name", "last_name", "username", "email", "nick_name"]
+    list_display = ("first_name", "last_name", "username", "email", "nick_name")
     form = make_ajax_form(
         User,
         {
@@ -48,11 +46,9 @@ class UserAdmin(SearchModelAdmin):
     search_fields = ["first_name", "last_name", "username"]
 
 
-admin.site.register(User, UserAdmin)
-
-
 @admin.register(Page)
 class PageAdmin(admin.ModelAdmin):
+    list_display = ("name", "_full_name", "owner_group")
     form = make_ajax_form(
         Page,
         {
@@ -66,4 +62,12 @@ class PageAdmin(admin.ModelAdmin):
 
 @admin.register(SithFile)
 class SithFileAdmin(admin.ModelAdmin):
-    form = make_ajax_form(SithFile, {"parent": "files"})  # ManyToManyField
+    list_display = ("name", "owner", "size", "date", "is_in_sas")
+    form = make_ajax_form(
+        SithFile,
+        {
+            "parent": "files",
+            "owner": "users",
+            "moderator": "users",
+        },
+    )  # ManyToManyField

core/apps.py

@@ -1,30 +1,27 @@
-# -*- coding:utf-8 -*
+# -*- coding:utf-8 -*-
 #
-# Copyright 2017
+# Copyright 2023 © AE UTBM
-# - Skia <skia@libskia.so>
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
 #
-# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# This file is part of the website of the UTBM Student Association (AE UTBM),
-# http://ae.utbm.fr.
+# https://ae.utbm.fr.
 #
-# This program is free software; you can redistribute it and/or modify it under
+# You can find the whole source code at https://github.com/ae-utbm/sith3
-# the terms of the GNU General Public License a published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# OR WITHIN THE LOCAL FILE "LICENSE"
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
 #
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
 #
 
 import sys
 
 from django.apps import AppConfig
+from django.core.cache import cache
 from django.core.signals import request_started
 
 
@@ -33,26 +30,17 @@ class SithConfig(AppConfig):
     verbose_name = "Core app of the Sith"
 
     def ready(self):
-        from core.models import User
+        import core.signals  # noqa F401
-        from club.models import Club
         from forum.models import Forum
 
-        def clear_cached_groups(**kwargs):
+        cache.clear()
-            User._group_ids = {}
-            User._group_name = {}
 
         def clear_cached_memberships(**kwargs):
-            User._club_memberships = {}
-            Club._memberships = {}
             Forum._club_memberships = {}
 
         print("Connecting signals!", file=sys.stderr)
-        request_started.connect(
-            clear_cached_groups, weak=False, dispatch_uid="clear_cached_groups"
-        )
         request_started.connect(
             clear_cached_memberships,
             weak=False,
             dispatch_uid="clear_cached_memberships",
         )
-        # TODO: there may be a need to add more cache clearing

core/converters.py

@@ -0,0 +1,55 @@
+# -*- coding:utf-8 -*-
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+# All contributors are listed in the CONTRIBUTORS file.
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the whole source code at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+# PREVIOUSLY LICENSED UNDER THE MIT LICENSE,
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE.old
+# OR WITHIN THE LOCAL FILE "LICENSE.old"
+#
+
+from core.models import Page
+
+
+class FourDigitYearConverter:
+    regex = "[0-9]{4}"
+
+    def to_python(self, value):
+        return int(value)
+
+    def to_url(self, value):
+        return str(value).zfill(4)
+
+
+class TwoDigitMonthConverter:
+    regex = "[0-9]{2}"
+
+    def to_python(self, value):
+        return int(value)
+
+    def to_url(self, value):
+        return str(value).zfill(2)
+
+
+class BooleanStringConverter:
+    """
+    Converter whose regex match either True or False
+    """
+
+    regex = r"(True)|(False)"
+
+    def to_python(self, value):
+        return str(value) == "True"
+
+    def to_url(self, value):
+        return str(value)