Merge pull request #1506 from RoboSats/revert-1429-store-status-notif…

…ications Revert "Store status notifications"
RoboSats · Oct 1, 2024 · 9fc7087 · 9fc7087
2 parents 0749d31 + 7d7a3a3
commit 9fc7087
Show file tree

Hide file tree

Showing 15 changed files with 139 additions and 181 deletions.
diff --git a/api/admin.py b/api/admin.py
@@ -11,6 +11,7 @@
 from api.logics import Logics
 from api.models import Currency, LNPayment, MarketTick, OnchainPayment, Order, Robot
 from api.utils import objects_to_hyperlinks
+from api.tasks import send_notification
 
 admin.site.unregister(Group)
 admin.site.unregister(User)
@@ -163,6 +164,9 @@ def cancel_public_order(self, request, queryset):
                         f"Order {order.id} successfully closed",
                         messages.SUCCESS,
                     )
+                    send_notification.delay(
+                        order_id=order.id, message="coordinator_cancelled"
+                    )
                 else:
                     self.message_user(
                         request,
@@ -206,6 +210,7 @@ def maker_wins(self, request, queryset):
                     f"Dispute of order {order.id} solved successfully on favor of the maker",
                     messages.SUCCESS,
                 )
+                send_notification.delay(order_id=order.id, message="dispute_closed")
 
             else:
                 self.message_user(
@@ -244,6 +249,7 @@ def taker_wins(self, request, queryset):
                     f"Dispute of order {order.id} solved successfully on favor of the taker",
                     messages.SUCCESS,
                 )
+                send_notification.delay(order_id=order.id, message="dispute_closed")
 
             else:
                 self.message_user(

diff --git a/api/lightning/cln.py b/api/lightning/cln.py
@@ -617,10 +617,10 @@ def handle_response():
                         ]
                     )
 
+                    order.update_status(Order.Status.FAI)
                     order.expires_at = timezone.now() + timedelta(
                         seconds=order.t_to_expire(Order.Status.FAI)
                     )
-                    order.update_status(Order.Status.FAI)
                     order.save(update_fields=["expires_at"])
 
                     print(
@@ -646,10 +646,10 @@ def handle_response():
                     )
                     lnpayment.preimage = response.payment_preimage.hex()
                     lnpayment.save(update_fields=["status", "fee", "preimage"])
+                    order.update_status(Order.Status.SUC)
                     order.expires_at = timezone.now() + timedelta(
                         seconds=order.t_to_expire(Order.Status.SUC)
                     )
-                    order.update_status(Order.Status.SUC)
                     order.save(update_fields=["expires_at"])
 
                     order.log(
@@ -697,10 +697,10 @@ def handle_response():
                             ]
                         )
 
+                        order.update_status(Order.Status.FAI)
                         order.expires_at = timezone.now() + timedelta(
                             seconds=order.t_to_expire(Order.Status.FAI)
                         )
-                        order.update_status(Order.Status.FAI)
                         order.save(update_fields=["expires_at"])
 
                         print(
@@ -737,10 +737,10 @@ def handle_response():
                                     "in_flight",
                                 ]
                             )
+                            order.update_status(Order.Status.FAI)
                             order.expires_at = timezone.now() + timedelta(
                                 seconds=order.t_to_expire(Order.Status.FAI)
                             )
-                            order.update_status(Order.Status.FAI)
                             order.save(update_fields=["expires_at"])
 
                             order.log(

diff --git a/api/lightning/lnd.py b/api/lightning/lnd.py
@@ -594,10 +594,11 @@ def handle_response(response, was_in_transit=False):
                     ]
                 )
 
+                order.update_status(Order.Status.FAI)
+
                 order.expires_at = timezone.now() + timedelta(
                     seconds=order.t_to_expire(Order.Status.FAI)
                 )
-                order.update_status(Order.Status.FAI)
                 order.save(update_fields=["expires_at"])
 
                 str_failure_reason = cls.payment_failure_context[
@@ -624,10 +625,10 @@ def handle_response(response, was_in_transit=False):
                 lnpayment.preimage = response.payment_preimage
                 lnpayment.save(update_fields=["status", "fee", "preimage"])
 
+                order.update_status(Order.Status.SUC)
                 order.expires_at = timezone.now() + timedelta(
                     seconds=order.t_to_expire(Order.Status.SUC)
                 )
-                order.update_status(Order.Status.SUC)
                 order.save(update_fields=["expires_at"])
 
                 order.log(
@@ -670,10 +671,10 @@ def handle_response(response, was_in_transit=False):
                             update_fields=["status", "last_routing_time", "in_flight"]
                         )
 
+                        order.update_status(Order.Status.FAI)
                         order.expires_at = timezone.now() + timedelta(
                             seconds=order.t_to_expire(Order.Status.FAI)
                         )
-                        order.update_status(Order.Status.FAI)
                         order.save(update_fields=["expires_at"])
 
                         order.log(