feat(orders): add action for delivered order, fix details in paths

Author: tyronejosee

apps/deliveries/admin.py

@@ -14,5 +14,5 @@ class DeliveryAdmin(BaseAdmin):
     list_display = ["pk", "order_id", "is_completed", "is_available"]
     list_filter = ["status"]
     list_editable = ["is_completed", "is_available"]
-    readonly_fields = ["pk", "created_at", "updated_at"]
+    readonly_fields = ["pk", "picked_up_at", "delivered_at", "created_at", "updated_at"]
     autocomplete_fields = ["order_id", "driver_id"]

apps/orders/viewsets.py

@@ -60,10 +60,10 @@ def perform_create(self, serializer):
         serializer.save(user_id=self.request.user)
 
     @action(
-        detail=True,
         methods=["post"],
-        permission_classes=[IsClient],
+        detail=True,
         url_path="report",
+        permission_classes=[IsClient],
     )
     def report_order(self, request, *args, **kwargs):
         """
@@ -90,10 +90,10 @@ def report_order(self, request, *args, **kwargs):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @action(
-        detail=True,
         methods=["patch"],
-        permission_classes=[IsDispatcher],
+        detail=True,
         url_path="asign_driver",
+        permission_classes=[IsDispatcher],
     )
     def assign_driver(self, request, *args, **kwargs):
         """
@@ -123,10 +123,10 @@ def assign_driver(self, request, *args, **kwargs):
         )
 
     @action(
-        detail=True,
-        permission_classes=[IsDriver],
         methods=["patch"],
+        detail=True,
         url_path="accept",
+        permission_classes=[IsDriver],
     )
     def accept_order(self, request, *args, **kwargs):
         """
@@ -171,10 +171,10 @@ def accept_order(self, request, *args, **kwargs):
             )
 
     @action(
+        methods=["patch"],
         detail=True,
-        methods=["post"],
-        permission_classes=[IsDriver],
         url_path="reject",
+        permission_classes=[IsDriver],
     )
     def reject_order(self, request, *args, **kwargs):
         """
@@ -205,10 +205,10 @@ def reject_order(self, request, *args, **kwargs):
             )
 
     @action(
-        detail=True,
         methods=["patch"],
-        permission_classes=[IsDriver],
+        detail=True,
         url_path="picked_up",
+        permission_classes=[IsDriver],
     )
     def picked_up_order(self, request, *args, **kwargs):
         """
@@ -243,6 +243,51 @@ def picked_up_order(self, request, *args, **kwargs):
             status=status.HTTP_400_BAD_REQUEST,
         )
 
+    @action(
+        methods=["post"],
+        detail=True,
+        url_path="delivered",
+        permission_classes=[IsDriver],
+    )
+    def delivered_order(self, request, *args, **kwargs):
+        """
+        Action to mark a delivery status to delivered.
+
+        Endpoints:
+        - PATCH api/v1/orders/{id}/delivered/
+        """
+        order = self.get_object()
+        driver = request.user.driver
+        signature = request.data.get("signature")
+
+        # The driver is required to submit the user's signature to change the status.
+        if not signature:
+            return Response(
+                {"detail": "Signature is required to mark the delivery as delivered."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        delivery = Delivery.objects.get(
+            order_id=order,
+            driver_id=driver,
+        )
+
+        if delivery.status == StatusChoices.PICKED_UP:
+            # TODO: Add verification code
+            delivery.signature = signature
+            delivery.status = StatusChoices.DELIVERED
+            delivery.delivered_at = timezone.now()
+            delivery.is_completed = True
+            delivery.save()
+            return Response(
+                {"detail": "Order successfully delivered."},
+                status=status.HTTP_200_OK,
+            )
+        return Response(
+            {"detail": "The status could not be changed, please try again."},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
 
 class OrderItemViewSet(ModelViewSet):
     """

apps/utilities/paths.py

@@ -1,7 +1,6 @@
 """Paths for Utilities App."""
 
 import os
-from django.utils import timezone
 from django.utils.text import slugify
 
 
@@ -44,9 +43,9 @@ def docs_path(instance, filename):
 
 def signature_path(instance, filename):
     """Generate the upload path for the signature."""
-    timestamp = timezone.now().strftime("%Y%m%d_%H%M%S")
+    extension = filename.split(".")[-1]
     return os.path.join(
         "deliveries",
         "signatures",
-        f"order_{instance.order_id.id}_driver_{instance.driver_id.id}_{timestamp}",
+        f"order_{instance.order_id.id}.{extension}",
     )