Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jkmarx/limit events api response #2944

Merged
merged 6 commits into from
Aug 13, 2018
Merged

Jkmarx/limit events api response #2944

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
480de66
Update API to return last 50 items.
jkmarx Aug 10, 2018
6c54a40
Fix unit test and fix bug in serializer.
jkmarx Aug 10, 2018
4937ef9
Update ui for avoid performance costing sort.
jkmarx Aug 10, 2018
ea47e6d
Fix comments.
jkmarx Aug 10, 2018
63e0b94
Fix text.
jkmarx Aug 10, 2018
2b65c5b
Refactor to save lines.
jkmarx Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions refinery/core/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,17 @@ def get_is_owner(self, data_set):
logger.error("Request is missing a user: %s", e)
return False
return user_request == owner
else:
Copy link
Member Author

@jkmarx jkmarx Aug 10, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

left out else, fixes null response from API

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just return in the first try? And you could do the same thing in the except:

     def get_is_owner(self, data_set):
         try:
             return data_set.is_owner
         except:
             owner = data_set.get_owner()
             try:
                 return owner == self.context.get('request').user
             except AttributeError as e:
                logger.error("Request is missing a user: %s", e)
                return False

return data_set.is_owner

def get_public(self, data_set):
try:
data_set.public
except:
is_public = data_set.is_public()
return is_public
else:
return data_set.public
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto: You don't want to do too much in a try, but just returning isn't going cause a different exception


def get_is_clean(self, data_set):
return data_set.is_clean()
Expand Down
43 changes: 22 additions & 21 deletions refinery/core/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ class EventApiV2Tests(APIV2TestCase):
def setUp(self):
super(EventApiV2Tests, self).setUp(
api_base_name="events/",
view=EventViewSet.as_view({"get": "list"})
view=EventViewSet.as_view()
)

def test_get_event_list_provides_access_control_between_users(self):
Expand Down Expand Up @@ -952,16 +952,28 @@ def test_get_event_list(self):

get_request = self.factory.get(urljoin(self.url_root, '/'))
get_request.user = self.user
get_response = self.view(get_request).render()

force_authenticate(get_request, user=self.user)
get_response = self.view(get_request)
self.assertEqual(
json.loads(get_response.content),
get_response.data,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reorder response (api now handles it)

[
{
'date_time': date_times[0],
'message': messages[0],
'date_time': date_times[3],
'message': messages[3],
'data_set': DataSetSerializer(
data_sets[0], context={'request': get_request}
data_sets[3], context={'request': get_request}
).data,
'group': None,
'user': UserSerializer(self.user).data,
'type': 'UPDATE',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Originally the type was one of the CRUD verbs, so I'm surprised this isn't CREATE?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... but it looks like it's just being copied from below, so not a new issue...

'sub_type': 'ANALYSIS_CREATION',
'details': {'display_name': display_names[3]}
},
{
'date_time': date_times[2],
'message': messages[2],
'data_set': DataSetSerializer(
data_sets[2], context={'request': get_request}
).data,
'group': None,
'user': UserSerializer(self.user).data,
Expand All @@ -982,27 +994,16 @@ def test_get_event_list(self):
'details': {'display_name': display_names[1]}
},
{
'date_time': date_times[2],
'message': messages[2],
'date_time': date_times[0],
'message': messages[0],
'data_set': DataSetSerializer(
data_sets[2], context={'request': get_request}
data_sets[0], context={'request': get_request}
).data,
'group': None,
'user': UserSerializer(self.user).data,
'type': 'CREATE',
'sub_type': '',
'details': {}
},
{
'date_time': date_times[3],
'message': messages[3],
'data_set': DataSetSerializer(
data_sets[3], context={'request': get_request}).data,
'group': None,
'user': UserSerializer(self.user).data,
'type': 'UPDATE',
'sub_type': 'ANALYSIS_CREATION',
'details': {'display_name': display_names[3]}
}
]
)
2 changes: 1 addition & 1 deletion refinery/core/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
# DRF url routing
core_router = DefaultRouter()
core_router.register(r'workflows', WorkflowViewSet)
core_router.register(r'events', EventViewSet)
core_router.urls.extend([
url(r'^data_sets/$', DataSetsViewSet.as_view()),
url(r'^events/$', EventViewSet.as_view()),
url(r'^user_profile/(?P<uuid>' + UUID_RE + r')/$',
UserProfileViewSet.as_view()),
url(r'^data_sets/(?P<uuid>' + UUID_RE + r')/$',
Expand Down
23 changes: 13 additions & 10 deletions refinery/core/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,21 +626,24 @@ def graph(self, request, *args, **kwargs):
)


class EventViewSet(viewsets.ModelViewSet):
class EventViewSet(APIView):
"""API endpoint that allows Events to be viewed"""
queryset = Event.objects.all()
serializer_class = EventSerializer
http_method_names = ['get']

def list(self, request, *args, **kwargs):
def get(self, request):
"""Overrides ModelViewSet.list to create an updated queryset based
on DataSets that the requesting User has permission to access
"""
data_sets_for_user = get_objects_for_user(
request.user, 'core.read_meta_dataset'
request.user,
'core.read_meta_dataset',
accept_global_perms=False
)
self.queryset = self.queryset.filter(data_set__in=data_sets_for_user)
return super(EventViewSet, self).list(request, *args, **kwargs)

user_events = Event.objects.filter(
data_set__in=data_sets_for_user
).order_by('-date_time')[0:50]
serializer = EventSerializer(user_events, many=True,
context={'request': request})
return Response(serializer.data)


class DataSetsViewSet(APIView):
Expand Down Expand Up @@ -671,7 +674,7 @@ def get(self, request):

filtered_data_sets = []
check_own = filters.get('is_owner')
all_owner_perms = ObjectPermissionChecker(self.request.user)
all_owner_perms = ObjectPermissionChecker(request.user)
all_owner_perms.prefetch_perms(user_data_sets)

check_public = filters.get('is_public')
Expand Down
2 changes: 1 addition & 1 deletion refinery/ui/source/js/dashboard/partials/history-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h4 class="emphasized text-align-center m-t-1-5">
</h4>
</div>
<ul class="list-unstyled scrollable-list main-content-list">
<li ng-repeat="event in $ctrl.events | orderBy: '-date_time'" class="event-item">
<li ng-repeat="event in $ctrl.events" class="event-item">
<span class="history-col-date">
{{ event.date_time | date:"MM/dd/yyyy" }}
</span>
Expand Down