Fix tests

RoboSats · Mar 10, 2025 · 3a34bdf · 3a34bdf
1 parent 1998dae
commit 3a34bdf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/api/oas_schemas.py b/api/oas_schemas.py
@@ -85,7 +85,6 @@ class OrderViewSchema:
             - `total_secs_exp`
             - `penalty`
             - `is_maker`
-            - `is_pretaker`
             - `is_taker`
             - `is_participant`
             - `maker_status`

diff --git a/api/serializers.py b/api/serializers.py
@@ -199,9 +199,6 @@ class OrderDetailSerializer(serializers.ModelSerializer):
     is_maker = serializers.BooleanField(
         required=False, help_text="Whether you are the maker or not"
     )
-    is_pretaker = serializers.BooleanField(
-        required=False, help_text="Whether you are a pre-taker or not"
-    )
     is_taker = serializers.BooleanField(
         required=False, help_text="Whether you are the taker or not"
     )
@@ -432,7 +429,6 @@ class Meta:
             "total_secs_exp",
             "penalty",
             "is_maker",
-            "is_pretaker",
             "is_taker",
             "is_participant",
             "maker_status",

diff --git a/api/views.py b/api/views.py
@@ -253,8 +253,8 @@ def get(self, request, format=None):
 
         # 3.a) If not a participant and order is not public, forbid.
         if (
-            not data["is_maker"]
-            and not data["is_taker"]
+            order.maker != request.user
+            and order.taker != request.user
             and order.status != Order.Status.PUB
         ):
             return Response(
@@ -364,7 +364,11 @@ def get(self, request, format=None):
                 return Response(context, status.HTTP_400_BAD_REQUEST)
 
         # 6)  If status is 'Public' and user is PRETAKER, reply with a TAKER hold invoice.
-        elif order.status == Order.Status.PUB and is_pretaker and not data["is_taker"]:
+        elif (
+            order.status == Order.Status.PUB
+            and is_pretaker
+            and order.taker != request.user
+        ):
             data["status"] = Order.Status.TAK
             data["total_secs_exp"] = order.t_to_expire(Order.Status.TAK)
 

diff --git a/tests/test_trade_pipeline.py b/tests/test_trade_pipeline.py
@@ -437,9 +437,8 @@ def test_make_and_take_order(self):
         self.assertFalse(data["is_maker"])
         self.assertFalse(data["is_buyer"])
         self.assertFalse(data["is_seller"])
-        self.assertFalse(data["is_taker"])
+        self.assertTrue(data["is_taker"])
         self.assertTrue(data["is_participant"])
-        self.assertTrue(data["is_pretaker"])
         self.assertTrue(data["maker_locked"])
         self.assertFalse(data["taker_locked"])
         self.assertFalse(data["escrow_locked"])
@@ -485,9 +484,8 @@ def test_make_and_take_order_multiple_takers(self):
         self.assertFalse(data["is_maker"])
         self.assertFalse(data["is_buyer"])
         self.assertFalse(data["is_seller"])
-        self.assertFalse(data["is_taker"])
+        self.assertTrue(data["is_taker"])
         self.assertTrue(data["is_participant"])
-        self.assertTrue(data["is_pretaker"])
         self.assertTrue(data["maker_locked"])
         self.assertFalse(data["taker_locked"])
         self.assertFalse(data["escrow_locked"])
@@ -524,9 +522,8 @@ def test_make_and_take_order_multiple_takers(self):
         self.assertFalse(data["is_maker"])
         self.assertFalse(data["is_buyer"])
         self.assertFalse(data["is_seller"])
-        self.assertFalse(data["is_taker"])
+        self.assertTrue(data["is_taker"])
         self.assertTrue(data["is_participant"])
-        self.assertTrue(data["is_pretaker"])
         self.assertTrue(data["maker_locked"])
         self.assertFalse(data["taker_locked"])
         self.assertFalse(data["escrow_locked"])
@@ -984,14 +981,12 @@ def test_cancel_public_order_by_taker(self):
         data = trade.response.json()
         self.assertEqual(trade.response.status_code, 200)
         self.assertResponse(trade.response)
-        self.assertTrue(data["is_pretaker"])
-        self.assertFalse(data["is_taker"])
+        self.assertTrue(data["is_taker"])
 
         trade.cancel_order(trade.taker_index)
         data = trade.response.json()
         self.assertEqual(trade.response.status_code, 200)
         self.assertFalse(data["is_participant"])
-        self.assertFalse(data["is_pretaker"])
         self.assertFalse(data["is_taker"])
         self.assertFalse(data["is_maker"])
         self.assertTrue(
@@ -1020,19 +1015,18 @@ def test_cancel_public_order_by_third(self):
         data = trade.response.json()
         self.assertEqual(trade.response.status_code, 200)
         self.assertResponse(trade.response)
-        self.assertTrue(data["is_pretaker"])
+        self.assertTrue(data["is_taker"])
 
         trade.take_order_third()
         data = trade.response.json()
         self.assertEqual(trade.response.status_code, 200)
         self.assertResponse(trade.response)
-        self.assertTrue(data["is_pretaker"])
+        self.assertTrue(data["is_taker"])
 
         trade.cancel_order(trade.third_index)
 
         data = trade.response.json()
         self.assertFalse(data["is_participant"])
-        self.assertFalse(data["is_pretaker"])
         self.assertFalse(data["is_taker"])
         self.assertFalse(data["is_maker"])
         self.assertTrue(
@@ -1055,8 +1049,7 @@ def test_cancel_public_order_by_third(self):
         self.assertEqual(trade.response.status_code, 200)
         self.assertResponse(trade.response)
         self.assertTrue(data["is_participant"])
-        self.assertTrue(data["is_pretaker"])
-        self.assertFalse(data["is_taker"])
+        self.assertTrue(data["is_taker"])
 
     def test_cancel_pretaken_order_by_maker(self):
         """