Merge branch 'Aufinal/clean_code' into Kerl/clean_code_amend

bda/forms.py

@@ -68,9 +68,8 @@ class AnnulForm(forms.Form):
         self.fields['attributions'].queryset = participant.attribution_set\
             .filter(spectacle__date__gte=timezone.now(),
                     revente__isnull=False,
-                    revente__date__gt=timezone.now()-timedelta(hours=1))\
-            .filter(Q(revente__soldTo__isnull=True) |
-                    Q(revente__soldTo=participant))
+                    revente__date__gt=timezone.now()-timedelta(hours=1),
+                    revente__soldTo__isnull=True)
 
 
 class InscriptionReventeForm(forms.Form):

bda/migrations/0010_spectaclerevente_shotgun.py

@@ -2,6 +2,19 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+from django.utils import timezone
+from datetime import timedelta
+
+
+def forwards_func(apps, schema_editor):
+    SpectacleRevente = apps.get_model("bda", "SpectacleRevente")
+
+    for revente in SpectacleRevente.objects.all():
+        is_expired = timezone.now() > revente.date_tirage()
+        is_direct = (revente.attribution.spectacle.date >= revente.date and
+                     timezone.now() > revente.date + timedelta(minutes=15))
+        revente.shotgun = is_expired or is_direct
+        revente.save()
 
 
 class Migration(migrations.Migration):
@@ -16,4 +29,5 @@ class Migration(migrations.Migration):
             name='shotgun',
             field=models.BooleanField(default=False, verbose_name='Disponible imm\xe9diatement'),
         ),
+        migrations.RunPython(forwards_func, migrations.RunPython.noop),
     ]

bda/templates/liste-reventes.html

@@ -8,7 +8,10 @@
   {% endif %}
   {% if deja_revente %}
     <p class="success">Des reventes existent déjà pour certains de ces spectacles ; vérifie les places disponibles sans tirage !</p>
+  {% elif inscrit_revente %}
+    <p class="success">Tu as été inscrit à une revente en cours pour ce spectacle !</p>
   {% endif %}
+    
   <form action="" class="form-horizontal" method="post">
     {% csrf_token %}
     <div class="form-group">

bda/views.py

@@ -287,6 +287,7 @@ def revente(request, tirage_id):
                         if not created:
                             revente.seller = participant
                             revente.date = timezone.now()
+                            revente.soldTo = None
                             revente.notif_sent = False
                             revente.tirage_done = False
                             revente.shotgun = False
@@ -346,6 +347,7 @@ def revente(request, tirage_id):
                     revente.soldTo = None
                     revente.notif_sent = False
                     revente.tirage_done = False
+                    revente.shotgun = False
                     if revente.answered_mail:
                         revente.answered_mail.clear()
                     revente.save()
@@ -366,8 +368,7 @@ def revente(request, tirage_id):
     sold = participant.attribution_set.filter(
             spectacle__date__gte=timezone.now(),
             revente__isnull=False,
-            revente__soldTo__isnull=False).exclude(
-            revente__soldTo=participant)
+            revente__soldTo__isnull=False)
 
     return render(request, "bda-revente.html",
                   {'tirage': tirage, 'overdue': overdue, "sold": sold,
@@ -396,6 +397,7 @@ def list_revente(request, tirage_id):
             user=request.user, tirage=tirage)
     deja_revente = False
     success = False
+    inscrit_revente = False
     if request.method == 'POST':
         form = InscriptionReventeForm(tirage, request.POST)
         if form.is_valid():
@@ -422,6 +424,7 @@ def list_revente(request, tirage_id):
                     if min_resell is not None:
                         min_resell.answered_mail.add(participant)
                         min_resell.save()
+                        inscrit_revente = True
             success = True
     else:
         form = InscriptionReventeForm(
@@ -430,7 +433,8 @@ def list_revente(request, tirage_id):
 
     return render(request, "liste-reventes.html",
                   {"form": form,
-                      "deja_revente": deja_revente, "success": success})
+                      "deja_revente": deja_revente, "success": success,
+                      "inscrit_revente": inscrit_revente})
 
 
 @login_required
@@ -485,14 +489,11 @@ def revente_shotgun(request, tirage_id):
             date__gte=timezone.now())
     shotgun = []
     for spectacle in spectacles:
-        revente_objects = SpectacleRevente.objects.filter(
+        reventes = SpectacleRevente.objects.filter(
                 attribution__spectacle=spectacle,
+                shotgun=True,
                 soldTo__isnull=True)
-        revente_count = 0
-        for revente in revente_objects:
-            if revente.shotgun:
-                revente_count += 1
-        if revente_count:
+        if reventes.exists():
             shotgun.append(spectacle)
 
     return render(request, "bda-shotgun.html",