diff --git a/apps.py b/apps.py index 77cb9c5..b373917 100644 --- a/apps.py +++ b/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): diff --git a/management/commands/_import_utils.py b/management/commands/_import_utils.py index 601ba49..f3257c7 100644 --- a/management/commands/_import_utils.py +++ b/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) diff --git a/management/commands/compilejsmessages.py b/management/commands/compilejsmessages.py index 6348d78..fa99225 100644 --- a/management/commands/compilejsmessages.py +++ b/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: diff --git a/management/commands/extract_ml_registrations.py b/management/commands/extract_ml_registrations.py index afcd7cc..515aa18 100644 --- a/management/commands/extract_ml_registrations.py +++ b/management/commands/extract_ml_registrations.py @@ -5,9 +5,7 @@ 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): diff --git a/management/commands/force_delete_user.py b/management/commands/force_delete_user.py index 870cef1..9b7c531 100644 --- a/management/commands/force_delete_user.py +++ b/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 diff --git a/management/commands/import_account.py b/management/commands/import_account.py index 0eab0a4..1a3fbc0 100644 --- a/management/commands/import_account.py +++ b/management/commands/import_account.py @@ -1,23 +1,19 @@ # Copyright (C) 2018-2020 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) diff --git a/management/commands/import_activities.py b/management/commands/import_activities.py index d3ffd99..fd23023 100644 --- a/management/commands/import_activities.py +++ b/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"]) diff --git a/management/commands/import_nk15.py b/management/commands/import_nk15.py index ea8e4a9..015cf8d 100644 --- a/management/commands/import_nk15.py +++ b/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): diff --git a/management/commands/import_transaction.py b/management/commands/import_transaction.py index 3af945b..6b3514c 100644 --- a/management/commands/import_transaction.py +++ b/management/commands/import_transaction.py @@ -1,31 +1,25 @@ # Copyright (C) 2018-2020 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() diff --git a/management/commands/refresh_activities.py b/management/commands/refresh_activities.py index afc4e3c..a59796e 100644 --- a/management/commands/refresh_activities.py +++ b/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): diff --git a/management/commands/refresh_highlighted_buttons.py b/management/commands/refresh_highlighted_buttons.py index fa73cb6..8c80d26 100644 --- a/management/commands/refresh_highlighted_buttons.py +++ b/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 diff --git a/management/commands/send_mail_to_negative_balances.py b/management/commands/send_mail_to_negative_balances.py index 68ced88..caf44cf 100644 --- a/management/commands/send_mail_to_negative_balances.py +++ b/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): diff --git a/management/commands/send_reports.py b/management/commands/send_reports.py index 2070b17..d2dc2d9 100644 --- a/management/commands/send_reports.py +++ b/management/commands/send_reports.py @@ -1,14 +1,11 @@ # Copyright (C) 2018-2020 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 diff --git a/management/commands/syncsql.py b/management/commands/syncsql.py index 3bd24ba..a70275e 100644 --- a/management/commands/syncsql.py +++ b/management/commands/syncsql.py @@ -1,11 +1,9 @@ # Copyright (C) 2018-2020 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.