Skip to content

Commit

Permalink
Merge pull request #550 from dandi/revert-pagination
Browse files Browse the repository at this point in the history
  • Loading branch information
mvandenburgh committed Oct 4, 2021
2 parents f0a7bbf + 63e77b4 commit 3c050a3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 4 additions & 4 deletions dandiapi/api/tests/test_asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def test_asset_rest_path(

# Do folder assertions
for folder_path in expected['folders']:
assert folder_path in paths['results']['folders']
assert folder_path in paths['folders']

folder_entry = paths['results']['folders'][folder_path]
folder_entry = paths['folders'][folder_path]
folder_assets = list(
Asset.objects.all().filter(path__startswith=f'{query_prefix}{folder_path}')
)
Expand All @@ -81,10 +81,10 @@ def test_asset_rest_path(

# Do file assertions
for file_path in expected['files']:
assert file_path in paths['results']['files']
assert file_path in paths['files']

asset: Asset = Asset.objects.get(path=f'{query_prefix}{file_path}')
assert paths['results']['files'][file_path] == AssetSerializer(asset).data
assert paths['files'][file_path] == AssetSerializer(asset).data


@pytest.mark.django_db
Expand Down
6 changes: 2 additions & 4 deletions dandiapi/api/views/asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,7 @@ def paths(self, request, versions__dandiset__pk: str, versions__version: str, **
(to refer to the root folder) must be the empty string.
"""
path_prefix: str = self.request.query_params.get('path_prefix') or ''
qs = self.paginate_queryset(
self.get_queryset().select_related('blob').filter(path__startswith=path_prefix)
)
qs = self.get_queryset().select_related('blob').filter(path__startswith=path_prefix)

folders = {}
files = {}
Expand Down Expand Up @@ -387,6 +385,6 @@ def paths(self, request, versions__dandiset__pk: str, versions__version: str, **
entry['modified'] = max(entry['modified'], asset.modified) # latest

paths = AssetPathsSerializer({'folders': folders, 'files': files})
return self.get_paginated_response(paths.data)
return Response(paths.data)

# TODO: add create to forge an asset from a validation

0 comments on commit 3c050a3

Please sign in to comment.