Robosats/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-07-19 17:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include more order info when there is a password

Browse Source
This commit is contained in:
koalasat
2025-06-22 19:27:53 +02:00
parent 0d310355c4
commit e2ace7c0f7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/views.py
View File

@ -257,10 +257,6 @@ class OrderView(viewsets.ViewSet):
if is_penalized: if is_penalized:
data["penalty"] = request.user.robot.penalty_expiration data["penalty"] = request.user.robot.penalty_expiration
# 2.1) If order has a password
if not data["is_participant"] and data["has_password"]:
return Response(data, status.HTTP_200_OK)
# 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 (
order.maker != request.user order.maker != request.user
@ -310,6 +306,12 @@ class OrderView(viewsets.ViewSet):
) )
) )
data["satoshis_now"] = order.last_satoshis
# 4.b) If order has a password
if not data["is_participant"] and data["has_password"]:
return Response(data, status.HTTP_200_OK)
# For participants add positions, nicks and status as a message and hold invoices status # For participants add positions, nicks and status as a message and hold invoices status
data["is_buyer"] = Logics.is_buyer(order, request.user) data["is_buyer"] = Logics.is_buyer(order, request.user)
data["is_seller"] = Logics.is_seller(order, request.user) data["is_seller"] = Logics.is_seller(order, request.user)
@ -323,7 +325,6 @@ class OrderView(viewsets.ViewSet):
data["longitude"] = order.longitude data["longitude"] = order.longitude
data["is_disputed"] = order.is_disputed data["is_disputed"] = order.is_disputed
data["ur_nick"] = request.user.username data["ur_nick"] = request.user.username
data["satoshis_now"] = order.last_satoshis
# Add whether hold invoices are LOCKED (ACCEPTED) # Add whether hold invoices are LOCKED (ACCEPTED)
# Is there a maker bond? If so, True if locked, False otherwise # Is there a maker bond? If so, True if locked, False otherwise

3
tests/test_trade_pipeline.py
View File

@ -508,7 +508,8 @@ 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.assertTrue(data["has_password"]) self.assertTrue(data["has_password"])
self.assertNotIn("maker_nick", data) self.assertIsInstance(data["satoshis_now"], int)
self.assertNotIn("is_buyer", data)
# Take with no password # Take with no password
trade.take_order() trade.take_order()