From e74dbb11f1556a4ffb3cc42f83686a3a27cf5f45 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Mon, 23 Oct 2017 18:39:45 +0200
Subject: [PATCH] Organize revente files and function names

---
 .../revente/confirm-shotgun.html}             |  0
 .../revente/confirmed.html}                   |  0
 .../revente/mail-success.html}                |  0
 .../{reventes.html => revente/manage.html}    |  0
 .../revente/none.html}                        |  0
 .../revente/notpaid.html}                     |  0
 .../revente/shotgun.html}                     |  2 +-
 .../subscribe.html}                           |  0
 .../tirages.html}                             |  0
 .../revente/wrongtime.html}                   |  2 +-
 bda/urls.py                                   | 30 +++++++++++--------
 bda/views.py                                  | 30 +++++++++----------
 gestioncof/management/data/custommail.json    |  2 +-
 gestioncof/templates/home.html                |  6 ++--
 14 files changed, 38 insertions(+), 34 deletions(-)
 rename bda/templates/{revente-confirm.html => bda/revente/confirm-shotgun.html} (100%)
 rename bda/templates/{bda-interested.html => bda/revente/confirmed.html} (100%)
 rename bda/templates/{bda-success.html => bda/revente/mail-success.html} (100%)
 rename bda/templates/bda/{reventes.html => revente/manage.html} (100%)
 rename bda/templates/{bda-no-revente.html => bda/revente/none.html} (100%)
 rename bda/templates/{bda-notpaid.html => bda/revente/notpaid.html} (100%)
 rename bda/templates/{bda-shotgun.html => bda/revente/shotgun.html} (83%)
 rename bda/templates/bda/{liste-reventes.html => revente/subscribe.html} (100%)
 rename bda/templates/bda/{revente-tirages.html => revente/tirages.html} (100%)
 rename bda/templates/{bda-wrongtime.html => bda/revente/wrongtime.html} (86%)

diff --git a/bda/templates/revente-confirm.html b/bda/templates/bda/revente/confirm-shotgun.html
similarity index 100%
rename from bda/templates/revente-confirm.html
rename to bda/templates/bda/revente/confirm-shotgun.html
diff --git a/bda/templates/bda-interested.html b/bda/templates/bda/revente/confirmed.html
similarity index 100%
rename from bda/templates/bda-interested.html
rename to bda/templates/bda/revente/confirmed.html
diff --git a/bda/templates/bda-success.html b/bda/templates/bda/revente/mail-success.html
similarity index 100%
rename from bda/templates/bda-success.html
rename to bda/templates/bda/revente/mail-success.html
diff --git a/bda/templates/bda/reventes.html b/bda/templates/bda/revente/manage.html
similarity index 100%
rename from bda/templates/bda/reventes.html
rename to bda/templates/bda/revente/manage.html
diff --git a/bda/templates/bda-no-revente.html b/bda/templates/bda/revente/none.html
similarity index 100%
rename from bda/templates/bda-no-revente.html
rename to bda/templates/bda/revente/none.html
diff --git a/bda/templates/bda-notpaid.html b/bda/templates/bda/revente/notpaid.html
similarity index 100%
rename from bda/templates/bda-notpaid.html
rename to bda/templates/bda/revente/notpaid.html
diff --git a/bda/templates/bda-shotgun.html b/bda/templates/bda/revente/shotgun.html
similarity index 83%
rename from bda/templates/bda-shotgun.html
rename to bda/templates/bda/revente/shotgun.html
index e10fae00..fae36c04 100644
--- a/bda/templates/bda-shotgun.html
+++ b/bda/templates/bda/revente/shotgun.html
@@ -5,7 +5,7 @@
   {% if shotgun %}
     <ul class="list-unstyled">
     {% for spectacle in shotgun %}
-    <li><a href="{% url "bda-buy-revente" spectacle.id %}">{{spectacle}}</a></li>
+    <li><a href="{% url "bda-revente-buy" spectacle.id %}">{{spectacle}}</a></li>
     {% endfor %}
   {% else %}
     <p> Pas de places disponibles immédiatement, désolé !</p>
diff --git a/bda/templates/bda/liste-reventes.html b/bda/templates/bda/revente/subscribe.html
similarity index 100%
rename from bda/templates/bda/liste-reventes.html
rename to bda/templates/bda/revente/subscribe.html
diff --git a/bda/templates/bda/revente-tirages.html b/bda/templates/bda/revente/tirages.html
similarity index 100%
rename from bda/templates/bda/revente-tirages.html
rename to bda/templates/bda/revente/tirages.html
diff --git a/bda/templates/bda-wrongtime.html b/bda/templates/bda/revente/wrongtime.html
similarity index 86%
rename from bda/templates/bda-wrongtime.html
rename to bda/templates/bda/revente/wrongtime.html
index dfafb05f..18c417a2 100644
--- a/bda/templates/bda-wrongtime.html
+++ b/bda/templates/bda/revente/wrongtime.html
@@ -6,7 +6,7 @@
     <p>Le tirage au sort de cette revente a déjà été effectué !</p>
 
     <p>Si personne n'était intéressé, elle est maintenant disponible 
-    <a href="{% url "bda-buy-revente" revente.attribution.spectacle.id %}">ici</a>.</p>
+    <a href="{% url "bda-revente-buy" revente.attribution.spectacle.id %}">ici</a>.</p>
     {% else %}
     <p> Il n'est pas encore possible de s'inscrire à cette revente, réessaie dans quelque temps !</p>
     {% endif %}
diff --git a/bda/urls.py b/bda/urls.py
index 51dd4235..7588187c 100644
--- a/bda/urls.py
+++ b/bda/urls.py
@@ -16,9 +16,6 @@ urlpatterns = [
     url(r'^places/(?P<tirage_id>\d+)$',
         views.places,
         name="bda-places-attribuees"),
-    url(r'^revente/(?P<tirage_id>\d+)$',
-        views.revente,
-        name='bda-revente'),
     url(r'^etat-places/(?P<tirage_id>\d+)$',
         views.etat_places,
         name='bda-etat-places'),
@@ -32,21 +29,28 @@ urlpatterns = [
     url(r'^spectacles/unpaid/(?P<tirage_id>\d+)$',
         views.unpaid,
         name="bda-unpaid"),
-    url(r'^revente/(?P<tirage_id>\d+)/list$',
-        views.list_revente,
-        name="bda-liste-revente"),
+
+    # Urls BdA-Revente
+
+    url(r'^revente/(?P<tirage_id>\d+)/manage$',
+        views.revente_manage,
+        name='bda-revente-manage'),
+    url(r'^revente/(?P<tirage_id>\d+)/subscribe$',
+        views.revente_subscribe,
+        name="bda-revente-subscribe"),
     url(r'^revente/(?P<tirage_id>\d+)/tirages$',
         views.revente_tirages,
         name="bda-revente-tirages"),
     url(r'^revente/(?P<spectacle_id>\d+)/buy$',
-        views.buy_revente,
-        name="bda-buy-revente"),
-    url(r'^revente/(?P<revente_id>\d+)/interested$',
-        views.revente_interested,
-        name='bda-revente-interested'),
-    url(r'^revente/(?P<tirage_id>\d+)/immediat$',
+        views.revente_buy,
+        name="bda-revente-buy"),
+    url(r'^revente/(?P<revente_id>\d+)/confirm$',
+        views.revente_confirm,
+        name='bda-revente-confirm'),
+    url(r'^revente/(?P<tirage_id>\d+)/shotgun$',
         views.revente_shotgun,
-        name="bda-shotgun"),
+        name="bda-revente-shotgun"),
+
     url(r'^mails-rappel/(?P<spectacle_id>\d+)$',
         views.send_rappel,
         name="bda-rappels"
diff --git a/bda/views.py b/bda/views.py
index 4b75c116..c0e64230 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -349,13 +349,13 @@ def tirage(request, tirage_id):
 
 
 @login_required
-def revente(request, tirage_id):
+def revente_manage(request, tirage_id):
     tirage = get_object_or_404(Tirage, id=tirage_id)
     participant, created = Participant.objects.get_or_create(
         user=request.user, tirage=tirage)
 
     if not participant.paid:
-        return render(request, "bda-notpaid.html", {})
+        return render(request, "bda/revente/notpaid.html", {})
 
     resellform = ResellForm(participant, prefix='resell')
     annulform = AnnulForm(participant, prefix='annul')
@@ -438,7 +438,7 @@ def revente(request, tirage_id):
         .filter(
             Q(revente__soldTo__isnull=True) | Q(revente__soldTo=participant))
 
-    return render(request, "bda/reventes.html",
+    return render(request, "bda/revente/manage.html",
                   {'tirage': tirage, 'overdue': overdue, "soldform": soldform,
                    "annulform": annulform, "resellform": resellform})
 
@@ -486,27 +486,27 @@ def revente_tirages(request, tirage_id):
                             .format(unsub, plural)
                     )
 
-    return render(request, "bda/revente-tirages.html",
+    return render(request, "bda/revente/tirages.html",
                   {"annulform": annulform, "subform": subform})
 
 
 @login_required
-def revente_interested(request, revente_id):
+def revente_confirm(request, revente_id):
     revente = get_object_or_404(SpectacleRevente, id=revente_id)
     participant, _ = Participant.objects.get_or_create(
         user=request.user, tirage=revente.attribution.spectacle.tirage)
     if (timezone.now() < revente.date + timedelta(hours=1)) or revente.shotgun:
-        return render(request, "bda-wrongtime.html",
+        return render(request, "bda/revente/wrongtime.html",
                       {"revente": revente})
 
     revente.answered_mail.add(participant)
-    return render(request, "bda-interested.html",
+    return render(request, "bda/revente/confirmed.html",
                   {"spectacle": revente.attribution.spectacle,
                    "date": revente.date_tirage})
 
 
 @login_required
-def list_revente(request, tirage_id):
+def revente_subscribe(request, tirage_id):
     tirage = get_object_or_404(Tirage, id=tirage_id)
     participant, _ = Participant.objects.get_or_create(
         user=request.user, tirage=tirage)
@@ -560,11 +560,11 @@ def list_revente(request, tirage_id):
         )
         messages.info(request, msg, extra_tags="safe")
 
-    return render(request, "bda/liste-reventes.html", {"form": form})
+    return render(request, "bda/revente/subscribe.html", {"form": form})
 
 
 @login_required
-def buy_revente(request, spectacle_id):
+def revente_buy(request, spectacle_id):
     spectacle = get_object_or_404(Spectacle, id=spectacle_id)
     tirage = spectacle.tirage
     participant, _ = Participant.objects.get_or_create(
@@ -578,13 +578,13 @@ def buy_revente(request, spectacle_id):
     own_reventes = reventes.filter(seller=participant)
     if len(own_reventes) > 0:
         own_reventes[0].delete()
-        return HttpResponseRedirect(reverse("bda-shotgun",
+        return HttpResponseRedirect(reverse("bda-revente-shotgun",
                                             args=[tirage.id]))
 
     reventes_shotgun = reventes.filter(shotgun=True)
 
     if not reventes_shotgun:
-        return render(request, "bda-no-revente.html", {})
+        return render(request, "bda/revente/none.html", {})
 
     if request.POST:
         revente = random.choice(reventes_shotgun)
@@ -601,11 +601,11 @@ def buy_revente(request, spectacle_id):
             [revente.seller.user.email],
             context=context,
         )
-        return render(request, "bda-success.html",
+        return render(request, "bda/revente/mail-success.html",
                       {"seller": revente.attribution.participant.user,
                        "spectacle": spectacle})
 
-    return render(request, "revente-confirm.html",
+    return render(request, "bda/revente/confirm-shotgun.html",
                   {"spectacle": spectacle,
                    "user": request.user})
 
@@ -629,7 +629,7 @@ def revente_shotgun(request, tirage_id):
     )
     shotgun = [sp for sp in spectacles if len(sp.shotguns) > 0]
 
-    return render(request, "bda-shotgun.html",
+    return render(request, "bda/revente/shotgun.html",
                   {"shotgun": shotgun})
 
 
diff --git a/gestioncof/management/data/custommail.json b/gestioncof/management/data/custommail.json
index 9ee9b1ea..bf59e5f6 100644
--- a/gestioncof/management/data/custommail.json
+++ b/gestioncof/management/data/custommail.json
@@ -151,7 +151,7 @@
         "shortname": "bda-revente",
         "subject": "{{ show }}",
         "description": "Notification envoy\u00e9e \u00e0 toutes les personnes int\u00e9ress\u00e9es par un spectacle pour le signaler qu'une place vient d'\u00eatre mise en vente.",
-        "body": "Bonjour {{ member.first_name }}\r\n\r\nUne place pour le spectacle {{ show.title }} ({{ show.date }})\r\na \u00e9t\u00e9 post\u00e9e sur BdA-Revente.\r\n\r\nSi ce spectacle t'int\u00e9resse toujours, merci de nous le signaler en cliquant\r\nsur ce lien : http://{{ site }}{% url \"bda-revente-interested\" revente.id %}.\r\nDans le cas o\u00f9 plusieurs personnes seraient int\u00e9ress\u00e9es, nous proc\u00e8derons \u00e0\r\nun tirage au sort le {{ revente.date_tirage|date:\"DATE_FORMAT\" }}.\r\n\r\nChaleureusement,\r\nLe BdA"
+        "body": "Bonjour {{ member.first_name }}\r\n\r\nUne place pour le spectacle {{ show.title }} ({{ show.date }})\r\na \u00e9t\u00e9 post\u00e9e sur BdA-Revente.\r\n\r\nSi ce spectacle t'int\u00e9resse toujours, merci de nous le signaler en cliquant\r\nsur ce lien : http://{{ site }}{% url \"bda-revente-confirm\" revente.id %}.\r\nDans le cas o\u00f9 plusieurs personnes seraient int\u00e9ress\u00e9es, nous proc\u00e8derons \u00e0\r\nun tirage au sort le {{ revente.date_tirage|date:\"DATE_FORMAT\" }}.\r\n\r\nChaleureusement,\r\nLe BdA"
     }
 },
 {
diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html
index f7ca57b5..943ef780 100644
--- a/gestioncof/templates/home.html
+++ b/gestioncof/templates/home.html
@@ -43,10 +43,10 @@
                             <li><a href="{% url "bda-etat-places" tirage.id %}">État des demandes</a></li>
                         {% else %}
                             <li><a href="{% url "bda-places-attribuees" tirage.id %}">Mes places</a></li> 
-                            <li><a href="{% url "bda-revente" tirage.id %}">Gestion de mes reventes</a></li> 
+                            <li><a href="{% url "bda-revente-manage" tirage.id %}">Gestion de mes reventes</a></li> 
                             <li><a href="{% url "bda-revente-tirages" tirage.id %}">Reventes en cours</a></li> 
-                            <li><a href="{% url "bda-liste-revente" tirage.id %}">S'inscrire à BdA-Revente</a></li>
-                            <li><a href="{% url "bda-shotgun" tirage.id %}">Places disponibles immédiatement</a></li>
+                            <li><a href="{% url "bda-revente-subscribe" tirage.id %}">S'inscrire à BdA-Revente</a></li>
+                            <li><a href="{% url "bda-revente-shotgun" tirage.id %}">Places disponibles immédiatement</a></li>
                         {% endif %}
                     </ul> 
                 {% endfor %}