Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,10 @@ class OrderDetailSerializer(serializers.ModelSerializer):
allow_null=True,
help_text="Order description",
)
bad_request = serializers.CharField(
required=False,
help_text="Message indicating the order has been cancelled",
)

class Meta:
model = Order
Expand Down Expand Up @@ -497,8 +501,16 @@ class Meta:
"longitude",
"chat_last_index",
"description",
"bad_request",
)

def to_representation(self, instance):
"""Add bad_request field only when order is cancelled"""
ret = super().to_representation(instance)
if instance.status in [Order.Status.UCA, Order.Status.CCA]:
ret["bad_request"] = "This order has been cancelled"
return ret


class ListNotificationSerializer(serializers.ModelSerializer):
status = serializers.SerializerMethodField(
Expand Down
11 changes: 3 additions & 8 deletions api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
InfoSerializer,
ListOrderSerializer,
MakeOrderSerializer,
OrderDetailSerializer,
OrderPublicSerializer,
PriceSerializer,
StealthSerializer,
Expand Down Expand Up @@ -560,14 +561,8 @@ def take_update_confirm_dispute_cancel(self, request, format=None):

order.refresh_from_db()
if order.status in [Order.Status.UCA, Order.Status.CCA]:
return Response(
{
"id": order.id,
"status": order.status,
"bad_request": "This order has been cancelled",
},
status.HTTP_200_OK,
)
data = OrderDetailSerializer(order, context={'request': request}).data
return Response(data, status.HTTP_200_OK)

# Any other action is only allowed if the user is a participant
elif not (order.maker == request.user or order.taker == request.user):
Expand Down
3 changes: 3 additions & 0 deletions docs/assets/schemas/api-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,9 @@ components:
type: string
nullable: true
description: Order description
bad_request:
type: string
description: Message indicating the order has been cancelled
required:
- expires_at
- id
Expand Down
33 changes: 32 additions & 1 deletion frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ djangorestframework==3.16.1
channels==4.2.2
channels-redis==4.2.1
celery==5.5.3
grpcio==1.67.0
grpcio==1.76.0
googleapis-common-protos==1.70.0
grpcio-tools==1.67.0
grpcio-tools==1.76.0
numpy==1.26.4
Pillow==11.3.0
python-decouple==3.8
Expand Down
Loading