Skip to content

Commit 942d9ab

Browse files
sudip-khanalsusilnem
authored andcommitted
feat(api): add related appeal id on emergency api endpoint
1 parent 6e58c5f commit 942d9ab

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

api/drf_views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,5 +1598,6 @@ def get_queryset(self):
15981598
)
15991599
.values("id")[:1]
16001600
),
1601+
appeal_id=Subquery(Appeal.objects.filter(event=OuterRef("pk")).order_by("-created_at").values("id")[:1]),
16011602
)
16021603
)

api/serializers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2694,6 +2694,7 @@ class DetailEmergencySerializer(serializers.ModelSerializer):
26942694
# NOTE: Populated from Queryset using Annotate
26952695
first_field_report_id = serializers.IntegerField(read_only=True)
26962696
latest_field_report_id = serializers.IntegerField(read_only=True)
2697+
appeal_id = serializers.IntegerField(read_only=True)
26972698

26982699
class Meta:
26992700
model = Event
@@ -2731,4 +2732,5 @@ class Meta:
27312732
"previous_update",
27322733
"first_field_report_id",
27332734
"latest_field_report_id",
2735+
"appeal_id",
27342736
)

api/test_views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ def setUp(self):
11031103
def test_get_emergency_list(self):
11041104
response = self.client.get(self.url)
11051105
self.assert_200(response)
1106-
self.assertEqual(response.data["count"], 2)
1106+
self.assertEqual(response.data["count"], 3)
11071107

11081108
def test_retrive_emergency_detail(self):
11091109
url = f"/api/v2/emergency/{self.event1.id}/"
@@ -1120,7 +1120,7 @@ def test_retrive_emergency_detail(self):
11201120
self.assertEqual(response.data["latest_field_report_id"], self.field_report1.id)
11211121

11221122
# Filter Tests
1123-
def test_filter_by_source(self):
1123+
def test_filter_by_who_source(self):
11241124
url = f"{self.url}?source=120"
11251125
response = self.client.get(url)
11261126
self.assert_200(response)

0 commit comments

Comments
 (0)