Skip to content

Commit

Permalink
EYB lead sort by modified feature
Browse files Browse the repository at this point in the history
  • Loading branch information
stuart-mindt committed Feb 13, 2025
1 parent 06fa5af commit b104985
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
20 changes: 20 additions & 0 deletions datahub/investment_lead/test/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,26 @@ def test_pagination(self, test_user_with_view_permissions):
assert response.data['next'] is not None
assert len(response.data['results']) == pagination_limit

def test_sorting_by_triage_modified(self, test_user_with_view_permissions):
"""Test the EYB leads can be sorted by triage_modified field."""
now = datetime.now(tz=timezone.utc)
yesterday = now - timedelta(days=1)
EYBLeadFactory(triage_modified=now)
EYBLeadFactory(triage_modified=yesterday)
api_client = self.create_api_client(user=test_user_with_view_permissions)

# Descending
response = api_client.get(EYB_LEAD_COLLECTION_URL, data={'sortby': '-triage_modified'})
assert response.status_code == status.HTTP_200_OK
assert response.data['results'][0]['triage_modified'] == now.strftime(DATE_FORMAT)
assert response.data['results'][1]['triage_modified'] == yesterday.strftime(DATE_FORMAT)

# Ascending
response = api_client.get(EYB_LEAD_COLLECTION_URL, data={'sortby': 'triage_modified'})
assert response.status_code == status.HTTP_200_OK
assert response.data['results'][0]['triage_modified'] == yesterday.strftime(DATE_FORMAT)
assert response.data['results'][1]['triage_modified'] == now.strftime(DATE_FORMAT)

def test_sorting_by_triage_created(self, test_user_with_view_permissions):
"""Test the EYB leads can be sorted by triage_created field."""
now = datetime.now(tz=timezone.utc)
Expand Down
4 changes: 2 additions & 2 deletions datahub/investment_lead/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
class EYBLeadViewSet(SoftDeleteCoreViewSet):
serializer_class = RetrieveEYBLeadSerializer
filter_backends = [filters.OrderingFilter]
ordering = ['-triage_created']
ordering_fields = ['triage_created', 'company__name']
ordering = ['-triage_modified']
ordering_fields = ['triage_modified','triage_created', 'company__name']

def _filter_by_overseas_regions(self, queryset):
overseas_region_ids = self.request.query_params.getlist('overseas_region')
Expand Down

0 comments on commit b104985

Please sign in to comment.