Merge pull request 'bot_refactor' (#5) from bot_refactor into master

Reviewed-on: #5

lottery/draw/admin.py

@@ -20,8 +20,6 @@ from bot.utils import create_bot_instance
 from .views import view_draw_results
 import os
 
-from django.db.models import Q
-
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 if not logger.handlers:
@@ -54,40 +52,33 @@ def add_participants_view(request):
         try:
             dt = parse_date(created_after)
             if dt:
-                qs = qs.filter(created_at__date__gte=dt)
+                qs = qs.filter(created_at__gte=dt)
         except ValueError:
             pass
     if created_before:
         try:
             dt = parse_date(created_before)
             if dt:
-                qs = qs.filter(created_at__date__lte=dt)
+                qs = qs.filter(created_at__lte=dt)
         except ValueError:
             pass
-    if request.GET.get("without_bonus"):
-        qs = qs.filter(Q(bonus__isnull=True) | Q(bonus=0))
-    if request.GET.get("without_fd"):
-        qs = qs.filter(Q(start_bonus__isnull=True) | Q(start_bonus=0))
 
     if request.method == "POST":
-        selected_ids = request.POST.getlist("invoices")
-        selected_invoices = qs.filter(id__in=selected_ids)
-        added_count = 0
-        for invoice in selected_invoices:
-            if not LotteryParticipant.objects.filter(lottery=lottery, invoice=invoice).exists():
+        form = AddParticipantsForm(request.POST)
+        form.fields["invoices"].queryset = qs
+        if form.is_valid():
+            selected_invoices = form.cleaned_data["invoices"]
+            for invoice in selected_invoices:
                 invoice.used = True
                 invoice.save()
                 LotteryParticipant.objects.create(lottery=lottery, invoice=invoice)
-                added_count += 1
-        messages.success(request, f"Добавлено {added_count} участников.")
-        return redirect("admin:draw_lotteryparticipant_changelist")
+            messages.success(request, "Участники успешно добавлены.")
+            return redirect("admin:draw_lotteryparticipant_changelist")
+    else:
+        form = AddParticipantsForm()
+        form.fields["invoices"].queryset = qs
 
-    context = {
-        "lottery": lottery,
-        "invoices": qs.order_by("-created_at"),
-        "invoice_count": qs.count(),
-        "request": request,
-    }
+    context = {"form": form, "lottery": lottery}
     return render(request, "admin/add_participants.html", context)
 
 
@@ -97,6 +88,85 @@ def get_client_by_invoice(invoice):
     except Client.DoesNotExist:
         return None
 
+
+# def start_draw(request, lottery_id):
+#     lottery = get_object_or_404(Lottery, id=lottery_id)
+#     logger.info("Запуск розыгрыша для лотереи: %s", lottery.name)
+
+#     if lottery.finished:
+#         messages.warning(request, "Розыгрыш уже завершён.")
+#         return redirect("..")
+
+#     notifier = NotificationService(bot=create_bot_instance())
+#     async_to_sync(notifier.notify_draw_start)(lottery)
+
+#     manually_assigned_invoice_ids = set()
+#     for prize in lottery.prizes.all():
+#         if prize.winner and prize.winner.invoice:
+#             manually_assigned_invoice_ids.add(prize.winner.invoice_id)
+#             prize.winner.used = True
+#             prize.winner.save()
+
+#     for prize in lottery.prizes.all():
+#         logger.info("Обработка приза: %s", prize.prize_place)
+
+#         if prize.winner:
+#             try:
+#                 draw_result = lottery.draw_results.get(prize=prize)
+#                 draw_result.participant = prize.winner
+#                 draw_result.drawn_at = timezone.now()
+#                 draw_result.confirmed = False
+#                 draw_result.save()
+#             except DrawResult.DoesNotExist:
+#                 DrawResult.objects.create(
+#                     lottery=lottery,
+#                     prize=prize,
+#                     participant=prize.winner,
+#                     confirmed=False,
+#                     drawn_at=timezone.now()
+#                 )
+#             continue
+
+#         try:
+#             draw_result = lottery.draw_results.get(prize=prize)
+#             if draw_result.confirmed:
+#                 continue
+#         except DrawResult.DoesNotExist:
+#             draw_result = None
+
+#         participants = list(
+#             lottery.participants.filter(used=False).exclude(invoice_id__in=manually_assigned_invoice_ids)
+#         )
+#         if not participants:
+#             continue
+
+#         winner_participant = random.choice(participants)
+#         winner_participant.used = True
+#         winner_participant.save()
+
+#         if draw_result:
+#             draw_result.participant = winner_participant
+#             draw_result.drawn_at = timezone.now()
+#             draw_result.confirmed = False
+#             draw_result.save()
+#         else:
+#             DrawResult.objects.create(
+#                 lottery=lottery,
+#                 prize=prize,
+#                 participant=winner_participant,
+#                 confirmed=False,
+#                 drawn_at=timezone.now()
+#             )
+
+#     draw_results = lottery.draw_results.all()
+#     async_to_sync(notifier.notify_draw_results)(lottery, draw_results)
+
+#     if not lottery.prizes.filter(winner__isnull=True).exists():
+#         lottery.finished = True
+#         lottery.save()
+
+#     return render(request, "admin/draw_result.html", {"lottery": lottery, "draw_results": draw_results})
+
 def start_draw(request, lottery_id):
     lottery = get_object_or_404(Lottery, id=lottery_id)
     logger.info("Запуск розыгрыша для лотереи: %s", lottery.name)

lottery/draw/forms.py

@@ -6,7 +6,7 @@ class AddParticipantsForm(forms.Form):
     deposit_min = forms.DecimalField(label="Минимальный депозит", required=False)
     deposit_max = forms.DecimalField(label="Максимальный депозит", required=False)
     invoices = forms.ModelMultipleChoiceField(
-        queryset=Invoice.objects.none(),  # устанавливается в представлении
+        queryset=Invoice.objects.none(),
         widget=forms.CheckboxSelectMultiple,
         required=False,
         label="Доступные счета"

lottery/templates/admin/add_participants.html

@@ -14,7 +14,7 @@
       const selectAllCheckbox = document.getElementById("select-all");
       if (selectAllCheckbox) {
         selectAllCheckbox.addEventListener("click", function(){
-          const checkboxes = document.querySelectorAll("input[name='invoices']");
+          const checkboxes = document.querySelectorAll("input[name='invoices[]']");
           checkboxes.forEach(chk => chk.checked = selectAllCheckbox.checked);
         });
       }
@@ -27,6 +27,7 @@
   <h1>Добавление участников лотереи: {{ lottery.name }}</h1>
   <p>{{ lottery.description }}</p>
 
+  <!-- Форма фильтрации -->
   <form method="get" class="mb-4">
     <input type="hidden" name="lottery_id" value="{{ lottery.id }}">
     <div class="row">
@@ -47,18 +48,6 @@
         <input type="date" name="created_before" value="{{ request.GET.created_before }}" class="form-control">
       </div>
     </div>
-
-    <div class="row mt-3">
-      <div class="col-md-3 form-check mt-2">
-        <input type="checkbox" class="form-check-input" name="without_bonus" id="without_bonus" {% if request.GET.without_bonus %}checked{% endif %}>
-        <label class="form-check-label" for="without_bonus">Только без бонуса</label>
-      </div>
-      <div class="col-md-3 form-check mt-2">
-        <input type="checkbox" class="form-check-input" name="without_fd" id="without_fd" {% if request.GET.without_fd %}checked{% endif %}>
-        <label class="form-check-label" for="without_fd">Только без ФД</label>
-      </div>
-    </div>
-
     <div class="mt-3">
       <button type="submit" class="btn btn-primary">Применить фильтр</button>
     </div>
@@ -66,48 +55,59 @@
 
   <p><strong>Найдено подходящих счетов: {{ invoice_count }}</strong></p>
 
-  <form method="post">
-    {% csrf_token %}
-    <div class="table-responsive">
-      <table class="table table-striped table-bordered table-sm align-middle">
-        <thead>
+<!-- Форма добавления участников -->
+<form method="post">
+  {% csrf_token %}
+  <div class="table-responsive">
+    <table class="table table-striped table-bordered table-sm">
+      <thead>
+        <tr>
+          <th><input type="checkbox" id="select-all" /></th>
+          <th>Создан</th>
+          <th>Закрыт</th>
+          <th>Счет</th>
+          <th>Клиент</th>
+          <th>Номер клиента</th>
+          <th>Сумма счета</th>
+          <th>Бонус</th>
+          <th>ФД</th>
+          <th>Депозит</th>
+          <th>Примечание</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for invoice in form.fields.invoices.queryset %}
           <tr>
-            <th><input type="checkbox" id="select-all" /></th>
-            <th>Создан</th>
-            <th>Закрыт</th>
-            <th>Счёт</th>
-            <th>Клиент</th>
-            <th>Номер клиента</th>
-            <th>Сумма счета</th>
-            <th>Бонус</th>
-            <th>ФД</th>
-            <th>Депозит</th>
-            <th>Примечание</th>
+            <input type="checkbox" name="invoices" value="{{ invoice.id }}">
+            <td>{{ invoice.created_at|date:"d.m.Y H:i" }}</td>
+            <td>
+              {% if invoice.closed_at %}
+                {{ invoice.closed_at|date:"d.m.Y H:i" }}
+              {% else %}
+                —
+              {% endif %}
+            </td>
+            <td>{{ invoice.ext_id|default:"—" }}</td>
+            <td>{{ invoice.client.name|default:"Не указан" }}</td>
+            <td>{{ invoice.client.club_card_number|default:"—" }}</td>
+            <td>{{ invoice.sum|default:"—" }}</td>
+            <td>{{ invoice.bonus|default:"—" }}</td>
+            <td>{{ invoice.start_bonus|default:"—" }}</td>
+            <td>{{ invoice.deposit_sum|default:"—" }}</td>
+            <td>{{ invoice.notes|default:"—" }}</td>
           </tr>
-        </thead>
-        <tbody>
-          {% for invoice in invoices %}
-            <tr>
-              <td><input type="checkbox" name="invoices" value="{{ invoice.id }}"></td>
-              <td>{{ invoice.created_at|date:"Y-m-d H:i" }}</td>
-              <td>{% if invoice.closed_at %}{{ invoice.closed_at|date:"Y-m-d H:i" }}{% else %}—{% endif %}</td>
-              <td>{{ invoice.ext_id|default:"—" }}</td>
-              <td>{{ invoice.client.name|default:"Не указан" }}</td>
-              <td>{{ invoice.client.club_card_number|default:"—" }}</td>
-              <td>{{ invoice.sum|floatformat:2|default:"—" }}</td>
-              <td>{{ invoice.bonus|floatformat:2|default:"—" }}</td>
-              <td>{{ invoice.start_bonus|floatformat:2|default:"—" }}</td>
-              <td>{{ invoice.deposit_sum|floatformat:2|default:"—" }}</td>
-              <td>{{ invoice.notes|default:"—" }}</td>
-            </tr>
-          {% empty %}
-            <tr><td colspan="11" class="text-center">Нет доступных счетов</td></tr>
-          {% endfor %}
-        </tbody>
-      </table>
-    </div>
-    <button type="submit" class="btn btn-success">Добавить выбранные счета</button>
-  </form>
+        {% empty %}
+          <tr>
+            <td colspan="11" class="text-center">Нет доступных счетов</td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  <button type="submit" class="btn btn-primary">Добавить выбранные счета</button>
+</form>
+
+
 
   <a href="{% url 'admin:draw_lotteryparticipant_changelist' %}" class="btn btn-secondary mt-3">Вернуться к списку участников</a>
 </div>

lottery/templates/admin/botconfig_change_form.html

@@ -4,35 +4,11 @@
 {% block object-tools %}
   {{ block.super }}
   {% if original %}
-    <div class="container-fluid">
-      <a class="btn btn-warning d-block w-100 text-center my-2"
+    <li>
+      <a class="button"
          href="{% url 'admin:botconfig-restart' original.pk %}">
-         Перезапустить бота
+        🔁 Перезапустить бота
       </a>
-    </div>
+    </li>
   {% endif %}
 {% endblock %}
-{% block extrahead %}
-  {{ block.super }}
-  <style>
-    .container-fluid {
-      margin-top: 20px;
-    }
-  </style>
-{% endblock %}
-
-{% block footer %}
-  {{ block.super }}
-  <script>
-    document.addEventListener("DOMContentLoaded", function() {
-      const restartButton = document.querySelector('.btn-warning');
-      if (restartButton) {
-        restartButton.addEventListener('click', function(event) {
-          if (!confirm('Вы уверены, что хотите перезапустить бота?')) {
-            event.preventDefault();
-          }
-        });
-      }
-    });
-  </script>
-{% endblock %}