Fix tests

This commit is contained in:
koalasat
2025-03-10 18:11:42 +01:00
parent 1998dae3a4
commit 3a34bdf4ea
4 changed files with 14 additions and 22 deletions

View File

@ -85,7 +85,6 @@ class OrderViewSchema:
- `total_secs_exp` - `total_secs_exp`
- `penalty` - `penalty`
- `is_maker` - `is_maker`
- `is_pretaker`
- `is_taker` - `is_taker`
- `is_participant` - `is_participant`
- `maker_status` - `maker_status`

View File

@ -199,9 +199,6 @@ class OrderDetailSerializer(serializers.ModelSerializer):
is_maker = serializers.BooleanField( is_maker = serializers.BooleanField(
required=False, help_text="Whether you are the maker or not" 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( is_taker = serializers.BooleanField(
required=False, help_text="Whether you are the taker or not" required=False, help_text="Whether you are the taker or not"
) )
@ -432,7 +429,6 @@ class OrderDetailSerializer(serializers.ModelSerializer):
"total_secs_exp", "total_secs_exp",
"penalty", "penalty",
"is_maker", "is_maker",
"is_pretaker",
"is_taker", "is_taker",
"is_participant", "is_participant",
"maker_status", "maker_status",

View File

@ -253,8 +253,8 @@ class OrderView(viewsets.ViewSet):
# 3.a) If not a participant and order is not public, forbid. # 3.a) If not a participant and order is not public, forbid.
if ( if (
not data["is_maker"] order.maker != request.user
and not data["is_taker"] and order.taker != request.user
and order.status != Order.Status.PUB and order.status != Order.Status.PUB
): ):
return Response( return Response(
@ -364,7 +364,11 @@ class OrderView(viewsets.ViewSet):
return Response(context, status.HTTP_400_BAD_REQUEST) return Response(context, status.HTTP_400_BAD_REQUEST)
# 6) If status is 'Public' and user is PRETAKER, reply with a TAKER hold invoice. # 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["status"] = Order.Status.TAK
data["total_secs_exp"] = order.t_to_expire(Order.Status.TAK) data["total_secs_exp"] = order.t_to_expire(Order.Status.TAK)

View File

@ -437,9 +437,8 @@ class TradeTest(BaseAPITestCase):
self.assertFalse(data["is_maker"]) self.assertFalse(data["is_maker"])
self.assertFalse(data["is_buyer"]) self.assertFalse(data["is_buyer"])
self.assertFalse(data["is_seller"]) self.assertFalse(data["is_seller"])
self.assertFalse(data["is_taker"]) self.assertTrue(data["is_taker"])
self.assertTrue(data["is_participant"]) self.assertTrue(data["is_participant"])
self.assertTrue(data["is_pretaker"])
self.assertTrue(data["maker_locked"]) self.assertTrue(data["maker_locked"])
self.assertFalse(data["taker_locked"]) self.assertFalse(data["taker_locked"])
self.assertFalse(data["escrow_locked"]) self.assertFalse(data["escrow_locked"])
@ -485,9 +484,8 @@ class TradeTest(BaseAPITestCase):
self.assertFalse(data["is_maker"]) self.assertFalse(data["is_maker"])
self.assertFalse(data["is_buyer"]) self.assertFalse(data["is_buyer"])
self.assertFalse(data["is_seller"]) self.assertFalse(data["is_seller"])
self.assertFalse(data["is_taker"]) self.assertTrue(data["is_taker"])
self.assertTrue(data["is_participant"]) self.assertTrue(data["is_participant"])
self.assertTrue(data["is_pretaker"])
self.assertTrue(data["maker_locked"]) self.assertTrue(data["maker_locked"])
self.assertFalse(data["taker_locked"]) self.assertFalse(data["taker_locked"])
self.assertFalse(data["escrow_locked"]) self.assertFalse(data["escrow_locked"])
@ -524,9 +522,8 @@ class TradeTest(BaseAPITestCase):
self.assertFalse(data["is_maker"]) self.assertFalse(data["is_maker"])
self.assertFalse(data["is_buyer"]) self.assertFalse(data["is_buyer"])
self.assertFalse(data["is_seller"]) self.assertFalse(data["is_seller"])
self.assertFalse(data["is_taker"]) self.assertTrue(data["is_taker"])
self.assertTrue(data["is_participant"]) self.assertTrue(data["is_participant"])
self.assertTrue(data["is_pretaker"])
self.assertTrue(data["maker_locked"]) self.assertTrue(data["maker_locked"])
self.assertFalse(data["taker_locked"]) self.assertFalse(data["taker_locked"])
self.assertFalse(data["escrow_locked"]) self.assertFalse(data["escrow_locked"])
@ -984,14 +981,12 @@ class TradeTest(BaseAPITestCase):
data = trade.response.json() data = trade.response.json()
self.assertEqual(trade.response.status_code, 200) self.assertEqual(trade.response.status_code, 200)
self.assertResponse(trade.response) self.assertResponse(trade.response)
self.assertTrue(data["is_pretaker"]) self.assertTrue(data["is_taker"])
self.assertFalse(data["is_taker"])
trade.cancel_order(trade.taker_index) trade.cancel_order(trade.taker_index)
data = trade.response.json() data = trade.response.json()
self.assertEqual(trade.response.status_code, 200) self.assertEqual(trade.response.status_code, 200)
self.assertFalse(data["is_participant"]) self.assertFalse(data["is_participant"])
self.assertFalse(data["is_pretaker"])
self.assertFalse(data["is_taker"]) self.assertFalse(data["is_taker"])
self.assertFalse(data["is_maker"]) self.assertFalse(data["is_maker"])
self.assertTrue( self.assertTrue(
@ -1020,19 +1015,18 @@ class TradeTest(BaseAPITestCase):
data = trade.response.json() data = trade.response.json()
self.assertEqual(trade.response.status_code, 200) self.assertEqual(trade.response.status_code, 200)
self.assertResponse(trade.response) self.assertResponse(trade.response)
self.assertTrue(data["is_pretaker"]) self.assertTrue(data["is_taker"])
trade.take_order_third() trade.take_order_third()
data = trade.response.json() data = trade.response.json()
self.assertEqual(trade.response.status_code, 200) self.assertEqual(trade.response.status_code, 200)
self.assertResponse(trade.response) self.assertResponse(trade.response)
self.assertTrue(data["is_pretaker"]) self.assertTrue(data["is_taker"])
trade.cancel_order(trade.third_index) trade.cancel_order(trade.third_index)
data = trade.response.json() data = trade.response.json()
self.assertFalse(data["is_participant"]) self.assertFalse(data["is_participant"])
self.assertFalse(data["is_pretaker"])
self.assertFalse(data["is_taker"]) self.assertFalse(data["is_taker"])
self.assertFalse(data["is_maker"]) self.assertFalse(data["is_maker"])
self.assertTrue( self.assertTrue(
@ -1055,8 +1049,7 @@ class TradeTest(BaseAPITestCase):
self.assertEqual(trade.response.status_code, 200) self.assertEqual(trade.response.status_code, 200)
self.assertResponse(trade.response) self.assertResponse(trade.response)
self.assertTrue(data["is_participant"]) self.assertTrue(data["is_participant"])
self.assertTrue(data["is_pretaker"]) self.assertTrue(data["is_taker"])
self.assertFalse(data["is_taker"])
def test_cancel_pretaken_order_by_maker(self): def test_cancel_pretaken_order_by_maker(self):
""" """