From 6f642abf025e363d764a2a784f536be564c2d231 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Tue, 20 Feb 2018 23:58:21 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20valeur=20par=20d=C3=A9faut=20du=20search?= =?UTF-8?q?=5Ftime.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- re2o/utils.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/re2o/utils.py b/re2o/utils.py index ebf3d186..5abe0c33 100644 --- a/re2o/utils.py +++ b/re2o/utils.py @@ -49,11 +49,13 @@ from users.models import Adherent, User, Ban, Whitelist from preferences.models import Service -def all_adherent(search_time=timezone.now()): +def all_adherent(search_time=None): """ Fonction renvoyant tous les users adherents. Optimisee pour n'est qu'une seule requete sql Inspecte les factures de l'user et ses cotisation, regarde si elles sont posterieur à now (end_time)""" + if search_time is None: + search_time = timezone.now() return User.objects.filter( facture__in=Facture.objects.filter( vente__in=Vente.objects.filter( @@ -68,8 +70,10 @@ def all_adherent(search_time=timezone.now()): ).distinct() -def all_baned(search_time=timezone.now()): +def all_baned(search_time=None): """ Fonction renvoyant tous les users bannis """ + if search_time is None: + search_time = timezone.now() return User.objects.filter( ban__in=Ban.objects.filter( date_end__gt=search_time @@ -77,8 +81,10 @@ def all_baned(search_time=timezone.now()): ).distinct() -def all_whitelisted(search_time=timezone.now()): +def all_whitelisted(search_time=None): """ Fonction renvoyant tous les users whitelistes """ + if search_time is None: + search_time = timezone.now() return User.objects.filter( whitelist__in=Whitelist.objects.filter( date_end__gt=search_time @@ -86,9 +92,11 @@ def all_whitelisted(search_time=timezone.now()): ).distinct() -def all_has_access(search_time=timezone.now()): +def all_has_access(search_time=None): """ Renvoie tous les users beneficiant d'une connexion : user adherent ou whiteliste et non banni """ + if search_time is None: + search_time = timezone.now() return User.objects.filter( Q(state=User.STATE_ACTIVE) & ~Q(ban__in=Ban.objects.filter(date_end__gt=search_time)) &