Merge pull request #2 from atsanda/bug-complete-order

(bug) order complete twice
atsanda · Mar 24, 2021 · cc8ff42 · cc8ff42
2 parents 585674a + dc781ca
commit cc8ff42
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/candy_shop/apps/delivery/serializers.py b/candy_shop/apps/delivery/serializers.py
@@ -147,7 +147,8 @@ class CompleteOrderSerializer(serializers.Serializer):
     order_id = serializers.PrimaryKeyRelatedField(queryset=Order.objects.all())
 
     def validate_order_id(self, value):
-        if value.status != Order.OrderStatus.ASSIGNED:
+        if not (value.status in [Order.OrderStatus.ASSIGNED,
+                                 Order.OrderStatus.COMPLETE]):
             raise serializers.ValidationError("Order has invalid status")
         return value
 

diff --git a/candy_shop/apps/delivery/services.py b/candy_shop/apps/delivery/services.py
@@ -44,6 +44,9 @@ def assign_orders(courier):
 
 
 def complete_order(courier: Courier, order: Order):
+    if order.status == Order.OrderStatus.COMPLETE:
+        return order
+
     order.status = Order.OrderStatus.COMPLETE
     order.complete_time = timezone.now()
 

diff --git a/candy_shop/apps/delivery/tests/test_orders_complete.py b/candy_shop/apps/delivery/tests/test_orders_complete.py
@@ -1,6 +1,7 @@
 import pytest
 import json
 from rest_framework import status
+from candy_shop.apps.delivery.models import Order
 
 
 @pytest.fixture
@@ -77,3 +78,30 @@ def test_invalid_complete(simple_setup, client):
         json.dumps(complete),
         content_type="application/json")
     assert response.status_code == status.HTTP_400_BAD_REQUEST
+
+
+@pytest.mark.django_db
+@pytest.mark.integration
+def test_complete_twice(simple_setup, client):
+    complete = {
+        "courier_id": 1,
+        "order_id": 1,
+    }
+    response = client.post(
+        '/orders/complete',
+        json.dumps(complete),
+        content_type="application/json")
+    assert response.status_code == status.HTTP_200_OK
+    assert response.data['order_id'] == 1
+
+    complete_time = Order.objects.get(pk=1).complete_time
+
+    response = client.post(
+        '/orders/complete',
+        json.dumps(complete),
+        content_type="application/json")
+    assert response.status_code == status.HTTP_200_OK
+    assert response.data['order_id'] == 1
+
+    assert Order.objects.get(pk=1).complete_time == complete_time
+