From 1109391838f52f8835f38f4746f812e58dab6339 Mon Sep 17 00:00:00 2001 From: Ke-vin-S Date: Fri, 9 May 2025 11:02:52 +0530 Subject: [PATCH] Moved assignment endpoints to /api/assignments --- assignment/tests/test_assignment_api.py | 4 ++-- assignment/tests/test_assignment_complete.py | 8 ++++---- assignment/urls.py | 2 +- logistics_core/urls.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assignment/tests/test_assignment_api.py b/assignment/tests/test_assignment_api.py index 14e8dda..f91c89e 100644 --- a/assignment/tests/test_assignment_api.py +++ b/assignment/tests/test_assignment_api.py @@ -102,7 +102,7 @@ def test_arrival_at_sequence_returns_correct_actions(self): ) # arrive_url = reverse("assignment-arrive-sequence", kwargs={"pk": assignment.pk, "sequence": 2}) - arrive_url = f"/api/assignment/assignments/{assignment.pk}/arrive/sequence/2/" + arrive_url = f"/api/assignments/{assignment.pk}/arrive/sequence/2/" response = self.client.post(arrive_url, format="json") self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -147,7 +147,7 @@ def test_arrival_with_multiple_actions_at_same_location(self): ) # Call the arrival endpoint at sequence 2 (first of the two) - arrive_url = f"/api/assignment/assignments/{assignment.pk}/arrive/sequence/2/" + arrive_url = f"/api/assignments/{assignment.pk}/arrive/sequence/2/" response = self.client.post(arrive_url, format="json") self.assertEqual(response.status_code, status.HTTP_200_OK) diff --git a/assignment/tests/test_assignment_complete.py b/assignment/tests/test_assignment_complete.py index fcbe86c..a36821a 100644 --- a/assignment/tests/test_assignment_complete.py +++ b/assignment/tests/test_assignment_complete.py @@ -54,7 +54,7 @@ def setUp(self): ) def test_confirm_delivery_action_successfully(self): - url = f"/api/assignment/assignments/{self.assignment.id}/actions/{self.delivery_item.id}/complete/" + url = f"/api/assignments/{self.assignment.id}/actions/{self.delivery_item.id}/complete/" response = self.client.post(url, format="json") self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -66,7 +66,7 @@ def test_confirm_pickup_action_successfully(self): self.shipment.status = "scheduled" self.shipment.save() - url = f"/api/assignment/assignments/{self.assignment.id}/actions/{self.pickup_item.id}/complete/" + url = f"/api/assignments/{self.assignment.id}/actions/{self.pickup_item.id}/complete/" response = self.client.post(url, format="json") self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -75,7 +75,7 @@ def test_confirm_pickup_action_successfully(self): self.assertEqual(response.data["new_status"], "in_transit") def test_confirm_action_invalid_assignment_item(self): - url = f"/api/assignment/assignments/{self.assignment.id}/actions/9999/complete/" + url = f"/api/assignments/{self.assignment.id}/actions/9999/complete/" response = self.client.post(url, format="json") self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) @@ -84,7 +84,7 @@ def test_confirm_already_completed_action(self): self.delivery_item.delivered_at = timezone.now() self.delivery_item.save() - url = f"/api/assignment/assignments/{self.assignment.id}/actions/{self.delivery_item.id}/complete/" + url = f"/api/assignments/{self.assignment.id}/actions/{self.delivery_item.id}/complete/" response = self.client.post(url, format="json") self.assertEqual(response.status_code, status.HTTP_200_OK) diff --git a/assignment/urls.py b/assignment/urls.py index 8c4dd67..fe581a8 100644 --- a/assignment/urls.py +++ b/assignment/urls.py @@ -3,7 +3,7 @@ from .views import AssignmentViewSet router = DefaultRouter() -router.register(r'assignments', AssignmentViewSet, basename='assignment') +router.register(r'', AssignmentViewSet, basename='assignment') urlpatterns = [ path('', include(router.urls)), diff --git a/logistics_core/urls.py b/logistics_core/urls.py index e80e3f6..1dcb2ee 100644 --- a/logistics_core/urls.py +++ b/logistics_core/urls.py @@ -33,7 +33,7 @@ urlpatterns = [ path('admin/', admin.site.urls), path('api/fleet/', include('fleet.urls')), - path('api/assignment/', include('assignment.urls')), + path('api/assignments/', include('assignment.urls')), path('swagger/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), path('api/shipments/', include('shipments.urls')), ]