Pas besoin de ws pour les suppressions

kfet/views.py

@@ -1364,7 +1364,11 @@ def cancel_operations(request):
         .filter(pk__in=opegroups_pk)
         .order_by("pk")
     )
-    opes = sorted(opes)
+    opes = (
+        Operation.objects.values("id", "canceled_at", "canceled_by__trigramme")
+        .filter(pk__in=opes)
+        .order_by("pk")
+    )
     checkouts_pk = [checkout.pk for checkout in to_checkouts_balances]
     checkouts = (
         Checkout.objects.values("id", "balance")
@@ -1375,27 +1379,7 @@ def cancel_operations(request):
     articles = Article.objects.values("id", "stock").filter(pk__in=articles_pk)
 
     # Websocket data
-    websocket_data = {"opegroups": [], "opes": [], "checkouts": [], "articles": []}
-
-    for opegroup in opegroups:
-        websocket_data["opegroups"].append(
-            {
-                "cancellation": True,
-                "id": opegroup["id"],
-                "amount": opegroup["amount"],
-                "is_cof": opegroup["is_cof"],
-            }
-        )
-    canceled_by__trigramme = canceled_by and canceled_by.trigramme or None
-    for ope in opes:
-        websocket_data["opes"].append(
-            {
-                "cancellation": True,
-                "id": ope,
-                "canceled_by__trigramme": canceled_by__trigramme,
-                "canceled_at": canceled_at,
-            }
-        )
+    websocket_data = {"checkouts": [], "articles": []}
     for checkout in checkouts:
         websocket_data["checkouts"].append(
             {"id": checkout["id"], "balance": checkout["balance"]}
@@ -1406,7 +1390,8 @@ def cancel_operations(request):
         )
     consumers.KPsul.group_send("kfet.kpsul", websocket_data)
 
-    data["canceled"] = opes
+    data["canceled"] = list(opes)
+    data["opegroups_to_update"] = list(opegroups)
     if opes_already_canceled:
         data["warnings"]["already_canceled"] = opes_already_canceled
     return JsonResponse(data)
@@ -1483,7 +1468,7 @@ def history_json(request):
     opegroups_list = []
     for opegroup in opegroups:
         opegroup_dict = {
-            "type": "opegroup",
+            "type": "operation",
             "id": opegroup.id,
             "amount": opegroup.amount,
             "at": opegroup.at,
@@ -1519,7 +1504,7 @@ def history_json(request):
     for transfergroup in transfergroups:
         if transfergroup.filtered_transfers:
             transfergroup_dict = {
-                "type": "transfergroup",
+                "type": "transfer",
                 "id": transfergroup.id,
                 "at": transfergroup.at,
                 "comment": transfergroup.comment,
@@ -1809,6 +1794,11 @@ def cancel_transfers(request):
             elif hasattr(account, "negative") and not account.negative.balance_offset:
                 account.negative.delete()
 
+    transfers = (
+        Transfer.objects.values("id", "canceled_at", "canceled_by__trigramme")
+        .filter(pk__in=transfers)
+        .order_by("pk")
+    )
     data["canceled"] = transfers
     if transfers_already_canceled:
         data["warnings"]["already_canceled"] = transfers_already_canceled