Skip to content
Merged
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
4 changes: 2 additions & 2 deletions assignment/tests/test_assignment_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions assignment/tests/test_assignment_complete.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion assignment/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
2 changes: 1 addition & 1 deletion logistics_core/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
]