Fix failing tests

Author: reppuli92

exercise/api/mixins.py

@@ -1,4 +1,4 @@
-from django.http import Http404
+from rest_framework.exceptions import NotFound
 
 from authorization.api.mixins import ApiResourceMixin
 from authorization.permissions import ACCESS
@@ -26,7 +26,7 @@ class ExerciseBaseResourceMixin(ExerciseRevealRuleMixin,
     def get_exercise_object(self):
         exercise = self.get_object_or_none(self.exercise_kw, LearningObject)
         if not exercise:
-            raise Http404("Learning object not found")
+            raise NotFound("Learning object not found")
         return exercise
 
     def get_course_module_object(self):
@@ -55,7 +55,7 @@ class SubmissionBaseResourceMixin(ExerciseBaseResourceMixin,
     def get_submission_object(self):
         submission = self.get_object_or_none(self.submission_kw, Submission)
         if not submission:
-            raise Http404("Submission not found")
+            raise NotFound("Submission not found")
         return submission
 
     def get_exercise_object(self):

exercise/tests.py

@@ -2,6 +2,7 @@
 import urllib
 from datetime import datetime, timedelta
 from io import BytesIO, StringIO
+from unittest.mock import patch
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -823,7 +824,7 @@ def test_uploading_and_viewing_file(self):
         py_file = StringIO('print("Tekijät ja Hyyppö")')
         py_file.name = 'test.py'
 
-        with png_file, py_file:
+        with png_file, py_file, patch('exercise.exercise_models.load_feedback_page'):
             response = self.client.post(exercise.get_absolute_url(), {
                 "key": "value",
                 "file1": png_file,

userprofile/api/views.py

@@ -4,6 +4,8 @@
 from rest_framework.settings import api_settings
 
 from lib.api.mixins import ListSerializerMixin, MeUserMixin
+from lib.api.filters import FieldValuesFilter
+
 from lib.api.constants import REGEX_INT_ME
 
 from ..models import UserProfile
@@ -37,7 +39,13 @@ class UserViewSet(ListSerializerMixin,
     filter_backends = (
         IsTeacherOrAdminOrSelf,
         filters.SearchFilter,
+        FieldValuesFilter,
     )
+    field_values_map = {
+        'id': 'user_id',
+        'student_id': 'student_id',
+        'email': 'user__email',
+    }
     search_fields = ['=user__email']
     lookup_field = 'user_id' # UserProfile.user.id
     lookup_url_kwarg = 'user_id'
@@ -54,8 +62,11 @@ def get_queryset(self):
         queryset = super().get_queryset()
 
         # Only restrict the list endpoint
-        if getattr(self, 'action', None) == 'list' and not self.request.query_params.get('search'):
-            return queryset.none()
+        if getattr(self, 'action', None) == 'list':
+            has_search = self.request.query_params.get('search')
+            has_field_filter = self.request.query_params.get('field')
+            if not (has_search or has_field_filter):
+                return queryset.none()
 
         return queryset