Merge branch 'master' into Kerl/drop_py2_compat

bda/admin.py

@@ -1,4 +1,3 @@
-import autocomplete_light
 from datetime import timedelta
 from custommail.shortcuts import send_mass_custom_mail
 
@@ -7,6 +6,9 @@ from django.db.models import Sum, Count
 from django.template.defaultfilters import pluralize
 from django.utils import timezone
 from django import forms
+
+from dal.autocomplete import ModelSelect2
+
 from bda.models import Spectacle, Salle, Participant, ChoixSpectacle,\
     Attribution, Tirage, Quote, CategorieSpectacle, SpectacleRevente
 
@@ -22,8 +24,17 @@ class ReadOnlyMixin(object):
             return readonly_fields + self.readonly_fields_update
 
 
+class ChoixSpectacleAdminForm(forms.ModelForm):
+    class Meta:
+        widgets = {
+            'participant': ModelSelect2(url='bda-participant-autocomplete'),
+            'spectacle': ModelSelect2(url='bda-spectacle-autocomplete'),
+        }
+
+
 class ChoixSpectacleInline(admin.TabularInline):
     model = ChoixSpectacle
+    form = ChoixSpectacleAdminForm
     sortable_field_name = "priority"
 
 
@@ -178,7 +189,7 @@ class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
 
 
 class ChoixSpectacleAdmin(admin.ModelAdmin):
-    form = autocomplete_light.modelform_factory(ChoixSpectacle, exclude=[])
+    form = ChoixSpectacleAdminForm
 
     def tirage(self, obj):
         return obj.participant.tirage

bda/autocomplete_light_registry.py

@@ -1,12 +0,0 @@
-import autocomplete_light
-
-from bda.models import Participant, Spectacle
-
-autocomplete_light.register(
-    Participant, search_fields=('user__username', 'user__first_name',
-                                'user__last_name'),
-    autocomplete_js_attributes={'placeholder': 'participant...'})
-
-autocomplete_light.register(
-    Spectacle, search_fields=('title', ),
-    autocomplete_js_attributes={'placeholder': 'spectacle...'})

bda/migrations/0001_initial.py

@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
                 ('price', models.FloatField(verbose_name=b"Prix d'une place", blank=True)),
                 ('slots', models.IntegerField(verbose_name=b'Places')),
                 ('priority', models.IntegerField(default=1000, verbose_name=b'Priorit\xc3\xa9')),
-                ('location', models.ForeignKey(to='bda.Salle')),
+                ('location', models.ForeignKey(to='bda.Salle', on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ('priority', 'date', 'title'),
@@ -79,27 +79,27 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='participant',
             name='user',
-            field=models.OneToOneField(to=settings.AUTH_USER_MODEL),
+            field=models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='choixspectacle',
             name='participant',
-            field=models.ForeignKey(to='bda.Participant'),
+            field=models.ForeignKey(to='bda.Participant', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='choixspectacle',
             name='spectacle',
-            field=models.ForeignKey(related_name='participants', to='bda.Spectacle'),
+            field=models.ForeignKey(related_name='participants', to='bda.Spectacle', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='attribution',
             name='participant',
-            field=models.ForeignKey(to='bda.Participant'),
+            field=models.ForeignKey(to='bda.Participant', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='attribution',
             name='spectacle',
-            field=models.ForeignKey(related_name='attribues', to='bda.Spectacle'),
+            field=models.ForeignKey(related_name='attribues', to='bda.Spectacle', on_delete=models.CASCADE),
         ),
         migrations.AlterUniqueTogether(
             name='choixspectacle',

bda/migrations/0002_add_tirage.py

@@ -55,7 +55,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='participant',
             name='user',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
         # Create fields `spectacle` for `Participant` and `Spectacle` models.
         # These fields are not nullable, but we first create them as nullable
@@ -63,22 +63,22 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='participant',
             name='tirage',
-            field=models.ForeignKey(to='bda.Tirage', null=True),
+            field=models.ForeignKey(to='bda.Tirage', null=True, on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='spectacle',
             name='tirage',
-            field=models.ForeignKey(to='bda.Tirage', null=True),
+            field=models.ForeignKey(to='bda.Tirage', null=True, on_delete=models.CASCADE),
         ),
         migrations.RunPython(fill_tirage_fields, migrations.RunPython.noop),
         migrations.AlterField(
             model_name='participant',
             name='tirage',
-            field=models.ForeignKey(to='bda.Tirage'),
+            field=models.ForeignKey(to='bda.Tirage', on_delete=models.CASCADE),
         ),
         migrations.AlterField(
             model_name='spectacle',
             name='tirage',
-            field=models.ForeignKey(to='bda.Tirage'),
+            field=models.ForeignKey(to='bda.Tirage', on_delete=models.CASCADE),
         ),
     ]

bda/migrations/0007_extends_spectacle.py

@@ -73,6 +73,7 @@ class Migration(migrations.Migration):
             model_name='spectacle',
             name='category',
             field=models.ForeignKey(blank=True, to='bda.CategorieSpectacle',
+                                    on_delete=models.CASCADE,
                                     null=True),
         ),
         migrations.AddField(
@@ -84,6 +85,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='quote',
             name='spectacle',
-            field=models.ForeignKey(to='bda.Spectacle'),
+            field=models.ForeignKey(to='bda.Spectacle',
+                                    on_delete=models.CASCADE),
         ),
     ]

bda/migrations/0009_revente.py

@@ -47,12 +47,14 @@ class Migration(migrations.Migration):
             model_name='spectaclerevente',
             name='attribution',
             field=models.OneToOneField(to='bda.Attribution',
+                                       on_delete=models.CASCADE,
                                        related_name='revente'),
         ),
         migrations.AddField(
             model_name='spectaclerevente',
             name='seller',
             field=models.ForeignKey(to='bda.Participant',
+                                    on_delete=models.CASCADE,
                                     verbose_name='Vendeur',
                                     related_name='original_shows'),
         ),
@@ -60,6 +62,7 @@ class Migration(migrations.Migration):
             model_name='spectaclerevente',
             name='soldTo',
             field=models.ForeignKey(to='bda.Participant',
+                                    on_delete=models.CASCADE,
                                     verbose_name='Vendue à', null=True,
                                     blank=True),
         ),

bda/models.py

@@ -4,12 +4,15 @@ from datetime import timedelta
 from custommail.shortcuts import send_mass_custom_mail
 
 from django.contrib.sites.models import Site
+from django.core import mail
 from django.db import models
 from django.db.models import Count
 from django.contrib.auth.models import User
 from django.conf import settings
 from django.utils import timezone, formats
 
+from custommail.models import CustomMail
+
 
 def get_generic_user():
     generic, _ = User.objects.get_or_create(
@@ -57,9 +60,12 @@ class CategorieSpectacle(models.Model):
 
 class Spectacle(models.Model):
     title = models.CharField("Titre", max_length=300)
-    category = models.ForeignKey(CategorieSpectacle, blank=True, null=True)
+    category = models.ForeignKey(
+        CategorieSpectacle, on_delete=models.CASCADE,
+        blank=True, null=True,
+    )
     date = models.DateTimeField("Date & heure")
-    location = models.ForeignKey(Salle)
+    location = models.ForeignKey(Salle, on_delete=models.CASCADE)
     vips = models.TextField('Personnalités', blank=True)
     description = models.TextField("Description", blank=True)
     slots_description = models.TextField("Description des places", blank=True)
@@ -69,7 +75,7 @@ class Spectacle(models.Model):
                                 max_length=500)
     price = models.FloatField("Prix d'une place")
     slots = models.IntegerField("Places")
-    tirage = models.ForeignKey(Tirage)
+    tirage = models.ForeignKey(Tirage, on_delete=models.CASCADE)
     listing = models.BooleanField("Les places sont sur listing")
     rappel_sent = models.DateTimeField("Mail de rappel envoyé", blank=True,
                                        null=True)
@@ -133,7 +139,7 @@ class Spectacle(models.Model):
 
 
 class Quote(models.Model):
-    spectacle = models.ForeignKey(Spectacle)
+    spectacle = models.ForeignKey(Spectacle, on_delete=models.CASCADE)
     text = models.TextField('Citation')
     author = models.CharField('Auteur', max_length=200)
 
@@ -147,7 +153,7 @@ PAYMENT_TYPES = (
 
 
 class Participant(models.Model):
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     choices = models.ManyToManyField(Spectacle,
                                      through="ChoixSpectacle",
                                      related_name="chosen_by")
@@ -158,7 +164,7 @@ class Participant(models.Model):
     paymenttype = models.CharField("Moyen de paiement",
                                    max_length=6, choices=PAYMENT_TYPES,
                                    blank=True)
-    tirage = models.ForeignKey(Tirage)
+    tirage = models.ForeignKey(Tirage, on_delete=models.CASCADE)
     choicesrevente = models.ManyToManyField(Spectacle,
                                             related_name="subscribed",
                                             blank=True)
@@ -174,8 +180,11 @@ DOUBLE_CHOICES = (
 
 
 class ChoixSpectacle(models.Model):
-    participant = models.ForeignKey(Participant)
-    spectacle = models.ForeignKey(Spectacle, related_name="participants")
+    participant = models.ForeignKey(Participant, on_delete=models.CASCADE)
+    spectacle = models.ForeignKey(
+        Spectacle, on_delete=models.CASCADE,
+        related_name="participants",
+    )
     priority = models.PositiveIntegerField("Priorité")
     double_choice = models.CharField("Nombre de places",
                                      default="1", choices=DOUBLE_CHOICES,
@@ -202,8 +211,11 @@ class ChoixSpectacle(models.Model):
 
 
 class Attribution(models.Model):
-    participant = models.ForeignKey(Participant)
-    spectacle = models.ForeignKey(Spectacle, related_name="attribues")
+    participant = models.ForeignKey(Participant, on_delete=models.CASCADE)
+    spectacle = models.ForeignKey(
+        Spectacle, on_delete=models.CASCADE,
+        related_name="attribues",
+    )
     given = models.BooleanField("Donnée", default=False)
 
     def __str__(self):
@@ -212,18 +224,25 @@ class Attribution(models.Model):
 
 
 class SpectacleRevente(models.Model):
-    attribution = models.OneToOneField(Attribution,
-                                       related_name="revente")
+    attribution = models.OneToOneField(
+        Attribution, on_delete=models.CASCADE,
+        related_name="revente",
+    )
     date = models.DateTimeField("Date de mise en vente",
                                 default=timezone.now)
     answered_mail = models.ManyToManyField(Participant,
                                            related_name="wanted",
                                            blank=True)
-    seller = models.ForeignKey(Participant,
-                               related_name="original_shows",
-                               verbose_name="Vendeur")
-    soldTo = models.ForeignKey(Participant, blank=True, null=True,
-                               verbose_name="Vendue à")
+    seller = models.ForeignKey(
+        Participant, on_delete=models.CASCADE,
+        verbose_name="Vendeur",
+        related_name="original_shows",
+    )
+    soldTo = models.ForeignKey(
+        Participant, on_delete=models.CASCADE,
+        verbose_name="Vendue à",
+        blank=True, null=True,
+    )
 
     notif_sent = models.BooleanField("Notification envoyée",
                                      default=False)
@@ -310,37 +329,55 @@ class SpectacleRevente(models.Model):
             # Envoie un mail au gagnant et au vendeur
             winner = random.choice(inscrits)
             self.soldTo = winner
-            datatuple = []
+
+            mails = []
+
             context = {
                 'acheteur': winner.user,
                 'vendeur': seller.user,
                 'show': spectacle,
             }
-            datatuple.append((
-                'bda-revente-winner',
-                context,
-                settings.MAIL_DATA['revente']['FROM'],
-                [winner.user.email],
-            ))
-            datatuple.append((
+
+            c_mails_qs = CustomMail.objects.filter(shortname__in=[
+                'bda-revente-winner', 'bda-revente-loser',
                 'bda-revente-seller',
-                context,
-                settings.MAIL_DATA['revente']['FROM'],
-                [seller.user.email]
-            ))
+            ])
+
+            c_mails = {cm.shortname: cm for cm in c_mails_qs}
+
+            mails.append(
+                c_mails['bda-revente-winner'].get_message(
+                    context,
+                    from_email=settings.MAIL_DATA['revente']['FROM'],
+                    to=[winner.user.email],
+                )
+            )
+
+            mails.append(
+                c_mails['bda-revente-seller'].get_message(
+                    context,
+                    from_email=settings.MAIL_DATA['revente']['FROM'],
+                    to=[seller.user.email],
+                    reply_to=[winner.user.email],
+                )
+            )
 
             # Envoie un mail aux perdants
             for inscrit in inscrits:
                 if inscrit != winner:
                     new_context = dict(context)
                     new_context['acheteur'] = inscrit.user
-                    datatuple.append((
-                        'bda-revente-loser',
-                        new_context,
-                        settings.MAIL_DATA['revente']['FROM'],
-                        [inscrit.user.email]
-                    ))
-            send_mass_custom_mail(datatuple)
+
+                    mails.append(
+                        c_mails['bda-revente-loser'].get_message(
+                            new_context,
+                            from_email=settings.MAIL_DATA['revente']['FROM'],
+                            to=[inscrit.user.email],
+                        )
+                    )
+
+            mail_conn = mail.get_connection()
+            mail_conn.send_messages(mails)
         # Si personne ne veut de la place, elle part au shotgun
         else:
             self.shotgun = True

bda/tests/test_models.py

@@ -0,0 +1,100 @@
+from datetime import timedelta
+from unittest import mock
+
+from django.contrib.auth import get_user_model
+from django.core import mail
+from django.test import TestCase
+from django.utils import timezone
+
+from bda.models import (
+    Attribution, Participant, Salle, Spectacle, SpectacleRevente, Tirage,
+)
+
+User = get_user_model()
+
+
+class SpectacleReventeTests(TestCase):
+    fixtures = ['gestioncof/management/data/custommail.json']
+
+    def setUp(self):
+        now = timezone.now()
+
+        self.t = Tirage.objects.create(
+            title='Tirage',
+            ouverture=now - timedelta(days=7),
+            fermeture=now - timedelta(days=3),
+            active=True,
+        )
+        self.s = Spectacle.objects.create(
+            title='Spectacle',
+            date=now + timedelta(days=20),
+            location=Salle.objects.create(name='Salle', address='Address'),
+            price=10.5,
+            slots=5,
+            tirage=self.t,
+            listing=False,
+        )
+
+        self.seller = Participant.objects.create(
+            user=User.objects.create(
+                username='seller', email='seller@mail.net'),
+            tirage=self.t,
+        )
+        self.p1 = Participant.objects.create(
+            user=User.objects.create(username='part1', email='part1@mail.net'),
+            tirage=self.t,
+        )
+        self.p2 = Participant.objects.create(
+            user=User.objects.create(username='part2', email='part2@mail.net'),
+            tirage=self.t,
+        )
+        self.p3 = Participant.objects.create(
+            user=User.objects.create(username='part3', email='part3@mail.net'),
+            tirage=self.t,
+        )
+
+        self.attr = Attribution.objects.create(
+            participant=self.seller,
+            spectacle=self.s,
+        )
+
+        self.rev = SpectacleRevente.objects.create(
+            attribution=self.attr,
+            seller=self.seller,
+        )
+
+    def test_tirage(self):
+        revente = self.rev
+
+        wanted_by = [self.p1, self.p2, self.p3]
+        revente.answered_mail = wanted_by
+
+        with mock.patch('bda.models.random.choice') as mc:
+            # Set winner to self.p1.
+            mc.return_value = self.p1
+
+            revente.tirage()
+
+            # Call to random.choice used participants in wanted_by.
+            mc_args, _ = mc.call_args
+
+            self.assertEqual(set(mc_args[0]), set(wanted_by))
+
+        self.assertEqual(revente.soldTo, self.p1)
+        self.assertTrue(revente.tirage_done)
+
+        mails = {m.to[0]: m for m in mail.outbox}
+
+        self.assertEqual(len(mails), 4)
+
+        m_seller = mails['seller@mail.net']
+        self.assertListEqual(m_seller.to, ['seller@mail.net'])
+        self.assertListEqual(m_seller.reply_to, ['part1@mail.net'])
+
+        m_winner = mails['part1@mail.net']
+        self.assertListEqual(m_winner.to, ['part1@mail.net'])
+
+        self.assertCountEqual(
+            [mails['part2@mail.net'].to, mails['part3@mail.net'].to],
+            [['part2@mail.net'], ['part3@mail.net']],
+        )

bda/tests/test_views.py

@@ -4,7 +4,7 @@ from django.contrib.auth.models import User
 from django.test import TestCase, Client
 from django.utils import timezone
 
-from .models import Tirage, Spectacle, Salle, CategorieSpectacle
+from bda.models import Tirage, Spectacle, Salle, CategorieSpectacle
 
 
 class TestBdAViews(TestCase):

bda/urls.py

@@ -26,6 +26,12 @@ urlpatterns = [
     url(r'^spectacles/unpaid/(?P<tirage_id>\d+)$',
         views.unpaid,
         name="bda-unpaid"),
+    url(r'^spectacles/autocomplete$',
+        views.spectacle_autocomplete,
+        name="bda-spectacle-autocomplete"),
+    url(r'^participants/autocomplete$',
+        views.participant_autocomplete,
+        name="bda-participant-autocomplete"),
     url(r'^liste-revente/(?P<tirage_id>\d+)$',
         views.list_revente,
         name="bda-liste-revente"),

bda/views.py

@@ -31,6 +31,8 @@ from bda.forms import (
     InscriptionInlineFormSet,
 )
 
+from utils.views.autocomplete import Select2QuerySetView
+
 
 @cof_required
 def etat_places(request, tirage_id):
@@ -811,3 +813,26 @@ def catalogue(request, request_type):
         return JsonResponse(data_return, safe=False)
     # Si la requête n'est pas de la forme attendue, on quitte avec une erreur
     return HttpResponseBadRequest()
+
+
+##
+# Autocomplete views
+#
+# https://django-autocomplete-light.readthedocs.io/en/master/tutorial.html#create-an-autocomplete-view
+##
+
+
+class ParticipantAutocomplete(Select2QuerySetView):
+    model = Participant
+    search_fields = ('user__username', 'user__first_name', 'user__last_name')
+
+
+participant_autocomplete = buro_required(ParticipantAutocomplete.as_view())
+
+
+class SpectacleAutocomplete(Select2QuerySetView):
+    model = Spectacle
+    search_fields = ('title',)
+
+
+spectacle_autocomplete = buro_required(SpectacleAutocomplete.as_view())