borg backup

Remove useless tee, use "mkdir -p" and use .sql.gz.

.gitignore

@@ -33,6 +33,7 @@ coverage
 
 # Local data
 secrets.py
+*/.env_borg
 *.log
 
 # Virtualenv

apps.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.apps import AppConfig
-from django.core.signals import got_request_exception
 
 
 class ScriptsConfig(AppConfig):

management/commands/_import_utils.py

@@ -5,10 +5,9 @@ import json
 import time
 from collections import defaultdict
 
-from django.core.management.base import BaseCommand
 from django.apps import apps
+from django.core.management.base import BaseCommand
 from django.db import transaction
-
 from polymorphic.models import PolymorphicModel
 
 
@@ -16,6 +15,7 @@ def timed(method):
     """"
     A simple decorator to measure time elapsed in class function (hence the args[0])
     """
+
     def _timed(*args, **kw):
         ts = time.time()
         result = method(*args, **kw)

management/commands/compilejsmessages.py

@@ -13,6 +13,7 @@ class Command(BaseCommand):
     """
     Generate Javascript translation files
     """
+
     def handle(self, *args, **kwargs):
         for code, _ in settings.LANGUAGES:
             if code == settings.LANGUAGE_CODE:

management/commands/extract_ml_registrations.py

@@ -1,18 +1,16 @@
-# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import date
 
 from django.contrib.auth.models import User
 from django.core.management import BaseCommand
-from django.db.models import Q
-from member.models import Membership, Club
-from wei.models import WEIClub
+from member.models import Club, Membership
 
 
 class Command(BaseCommand):
     help = "Get mailing list registrations from the last wei. " \
-           "Usage: manage.py extract_ml_registrations -t {events,art,sport} -t {fr, en}. " \
+           "Usage: manage.py extract_ml_registrations -t {events,art,sport} -l {fr, en} -y {0, 1, ...}. " \
            "You can write this into a file with a pipe, then paste the document into your mail manager."
 
     def add_arguments(self, parser):
@@ -21,6 +19,8 @@ class Command(BaseCommand):
         parser.add_argument('--lang', '-l', type=str, choices=['fr', 'en'], default='fr',
                             help='Select the registred users of the ML of the given language. Useful only for the '
                                  'events mailing list.')
+        parser.add_argument('--years', '-y', type=int, default=0, 
+                            help='Select the cumulative registred users of a membership from years ago. 0 means the current users')
 
     def handle(self, *args, **options):
         # TODO: Improve the mailing list extraction system, and link it automatically with Mailman.
@@ -30,10 +30,12 @@ class Command(BaseCommand):
             return
 
         if options["type"] == "members":
+            today_date = date.today()
+            selected_date = date(today_date.year - options["years"], today_date.month, today_date.day)
             for membership in Membership.objects.filter(
                 club__name="BDE",
-                date_start__lte=date.today(),
-                date_end__gte=date.today(),
+                date_start__lte=today_date,
+                date_end__gte=selected_date,
             ).all():
                 self.stdout.write(membership.user.email)
             return
@@ -51,8 +53,11 @@ class Command(BaseCommand):
             return
 
         if options["type"] == "art":
+            nb=0
             for user in User.objects.filter(profile__ml_art_registration=True).all():
                 self.stdout.write(user.email)
+                nb+=1
+            self.stdout.write(str(nb))
             return
 
         if options["type"] == "sport":

management/commands/force_delete_user.py

@@ -11,7 +11,6 @@ from django.core.management.base import BaseCommand
 from django.db import transaction
 from django.db.models import Q
 from django.test import override_settings
-
 from note.models import Alias, Transaction
 
 

management/commands/import_account.py

@@ -1,23 +1,19 @@
 # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import psycopg2 as pg
-import psycopg2.extras as pge
 import datetime
 import json
 
-from django.template.loader import render_to_string
-from django.utils.timezone import make_aware, now
+import psycopg2 as pg
+import psycopg2.extras as pge
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-
 from django.db import transaction
-
-from note.models import Note, NoteUser, NoteClub
-from note.models import Alias
+from django.utils.timezone import make_aware
 from member.models import Club, Profile
+from note.models import Alias, Note, NoteClub, NoteUser
 
-from ._import_utils import ImportCommand, BulkCreateManager, timed
+from ._import_utils import BulkCreateManager, ImportCommand, timed
 
 M_DURATION = 396
 M_START = datetime.date(2019, 8, 1)

management/commands/import_activities.py

@@ -3,32 +3,30 @@
 
 import psycopg2 as pg
 import psycopg2.extras as pge
-import datetime
-import copy
-
-from django.utils.timezone import make_aware
+from activity.models import Activity, ActivityType, Entry, Guest
 from django.db import transaction
-
-from activity.models import ActivityType, Activity, Guest, Entry
+from django.utils.timezone import make_aware
 from member.models import Club
 from note.models import Note, NoteUser
-from ._import_utils import ImportCommand, BulkCreateManager, timed
+
+from ._import_utils import BulkCreateManager, ImportCommand, timed
 
 MAP_ACTIVITY = dict()
 
 CLUB_RELOU = [
-    0,    # BDE
-    4771, # Kataclist
-    5162, # Assurance BDE ?!
-    5164, # S & L
+    0,  # BDE
+    4771,  # Kataclist
+    5162,  # Assurance BDE ?!
+    5164,  # S & L
     625,  # Aspique
-    5154, # Frekens
-    3944, # DiskJok[ENS]
-    5153, # Monopo[list]
-    2351, # JdRM
-    2365, # Pot Vieux
+    5154,  # Frekens
+    3944,  # DiskJok[ENS]
+    5153,  # Monopo[list]
+    2351,  # JdRM
+    2365,  # Pot Vieux
 ]
 
+
 class Command(ImportCommand):
     """
     Import command for Activities Base Data (Comptes, and Aliases)
@@ -50,7 +48,7 @@ class Command(ImportCommand):
                 row["responsable"] = 3508
             note = self.MAP_IDBDE[row["responsable"]]
             if note == 6244:
-                 # Licorne magique ne doit pas utiliser son compte club pour proposer des activités
+                # Licorne magique ne doit pas utiliser son compte club pour proposer des activités
                 note = Note.objects.get(pk=self.MAP_IDBDE[6524])
                 note = note.id
             organizer = Club.objects.filter(name=row["signature"])

management/commands/import_nk15.py

@@ -3,15 +3,15 @@
 
 import subprocess
 
-from django.core.management.base import BaseCommand
 from django.core.management import call_command
 
 from ._import_utils import ImportCommand
 
+
 class Command(ImportCommand):
     """
     Command for importing the database of NK15.
-    Need to be run by a user with a registered role in postgres for the database nk15. 
+    Need to be run by a user with a registered role in postgres for the database nk15.
     """
 
     def handle(self, *args, **kwargs):

management/commands/import_transaction.py

@@ -1,31 +1,25 @@
 # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import copy
+import datetime
 import re
+
+import pytz
 import psycopg2 as pg
 import psycopg2.extras as pge
-import pytz
-import datetime
-import copy
-
+from activity.models import Entry, GuestTransaction
 from django.contrib.auth.models import User
-from django.utils.timezone import make_aware
-from django.db import transaction
 from django.contrib.contenttypes.models import ContentType
-
-from note.models import (TemplateCategory,
-                         TransactionTemplate,
-                         Transaction,
-                         RecurrentTransaction,
-                         SpecialTransaction,
-                         MembershipTransaction,
-                         )
-from note.models import Note, NoteClub
-from activity.models import Guest, GuestTransaction, Entry
-
+from django.db import transaction
+from django.utils.timezone import make_aware
 from member.models import Membership
-from treasury.models import Remittance, SpecialTransactionProxy, SogeCredit
-from ._import_utils import ImportCommand, BulkCreateManager, timed
+from note.models import (MembershipTransaction, Note, NoteClub,
+                         RecurrentTransaction, SpecialTransaction,
+                         TemplateCategory, Transaction, TransactionTemplate)
+from treasury.models import Remittance, SogeCredit, SpecialTransactionProxy
+
+from ._import_utils import BulkCreateManager, ImportCommand, timed
 
 MAP_TRANSACTION = dict()
 MAP_REMITTANCE = dict()

management/commands/refresh_activities.py

@@ -2,14 +2,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
-from bs4 import BeautifulSoup
-from django.core.management import BaseCommand
-from django.urls import reverse
-from django.utils import timezone
 from urllib.parse import urlencode
 from urllib.request import Request, urlopen
 
+from bs4 import BeautifulSoup
 from activity.models import Activity
+from django.core.management import BaseCommand
+from django.urls import reverse
+from django.utils import timezone
 
 
 class Command(BaseCommand):

management/commands/refresh_highlighted_buttons.py

@@ -6,7 +6,6 @@ from datetime import timedelta
 from django.core.management.base import BaseCommand
 from django.db.models import Count
 from django.utils import timezone
-
 from note.models import RecurrentTransaction, TransactionTemplate
 
 

management/commands/send_mail_to_negative_balances.py

@@ -8,8 +8,7 @@ from django.core.management import BaseCommand
 from django.db.models import Q
 from django.template.loader import render_to_string
 from django.utils.translation import activate
-
-from note.models import NoteUser, Note
+from note.models import Note
 
 
 class Command(BaseCommand):

management/commands/send_reports.py

@@ -1,14 +1,11 @@
 # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import timedelta
-
 from django.core.management import BaseCommand
 from django.db.models import Q
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import activate
-
 from note.models import NoteUser, Transaction
 from note.tables import HistoryTable
 

management/commands/syncsql.py

@@ -1,11 +1,9 @@
 # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.core.management.base import BaseCommand
 from django.apps import apps
+from django.core.management.base import BaseCommand
 from django.db import connection
-
-
 from polymorphic.models import PolymorphicModel
 
 NO_SEQ = [
@@ -14,6 +12,7 @@ NO_SEQ = [
     "WEIRole",  # dirty fix
 ]
 
+
 class Command(BaseCommand):
     """
     Command to synchronise primary sequence of postgres after bulk insert of django.

shell/.env_borg_example

@@ -0,0 +1,3 @@
+BORG_PASSPHRASE='CHANGE_ME'
+BORG_REPO='USER@SERVER:PATH'
+BACKUP_FILE='PATH'

shell/backup_db

@@ -1,9 +1,14 @@
 #!/bin/bash
+export $(cat .env_borg | xargs)
+
 # Create temporary backups directory
-[[ -d /tmp/note-backups ]] || mkdir /tmp/note-backups
-date=$(date +%Y-%m-%d)
-# Backup database and save it as tar archive
-su postgres -c "pg_dump -F t note_db" | tee "/tmp/note-backups/$date.tar" > /dev/null
-# Compress backup as gzip
-gzip "/tmp/note-backups/$date.tar"
-scp "/tmp/note-backups/$date.tar.gz" "club-bde@zamok.crans.org:backup/$date.tar.gz"
+mkdir -p /tmp/note-backups
+
+# Backup database
+sudo -u postgres pg_dump -F t note_db > $BACKUP_FILE
+
+# Keep the last 30 backups
+borg prune --keep-last 30
+
+# Save backup
+borg create --compression lz4 ::backup-{now} $BACKUP_FILE