Update implementation and add more tests

Author: kmazi

api/tests/test_asset_api.py

@@ -65,22 +65,24 @@ def test_authenticated_user_get_single_asset_via_asset_code(
     ):
         mock_verify_id_token.return_value = {"email": self.user.email}
         response = client.get(
-            "{}?search={}".format(self.asset_urls, self.asset.asset_code),
+            "{}?asset_code={}".format(self.asset_urls, self.asset.asset_code),
             HTTP_AUTHORIZATION="Token {}".format(self.token_user),
         )
-        self.assertIn(self.asset.asset_code, response.data["results"][0]["asset_code"])
         self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn(self.asset.asset_code, response.data["results"][0]["asset_code"])
 
     @patch("api.authentication.auth.verify_id_token")
-    def test_authenticated_securityuser_get_single_asset_via_asset_code(
+    def test_securityuser_filtering_asset_via_asset_code(
         self, mock_verify_id_token
     ):
         mock_verify_id_token.return_value = {"email": self.security_user.email}
         response = client.get(
-            "{}?search={}".format(self.asset_urls, self.asset.asset_code),
+            f"{self.asset_urls}?asset_code={self.asset.asset_code}",
             HTTP_AUTHORIZATION="Token {}".format(self.token_checked_by),
         )
+        filtered_assets = Asset.objects.filter(asset_code=self.asset.asset_code)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(filtered_assets), len(response.data["results"]))
         self.assertIn(self.asset.asset_code, response.data["results"][0]["asset_code"])
 
     @patch("api.authentication.auth.verify_id_token")
@@ -89,7 +91,7 @@ def test_authenticated_user_get_single_asset_via_serial_number(
     ):
         mock_verify_id_token.return_value = {"email": self.user.email}
         response = client.get(
-            "{}?search={}".format(self.asset_urls, self.asset.serial_number),
+            "{}?serial_number={}".format(self.asset_urls, self.asset.serial_number),
             HTTP_AUTHORIZATION="Token {}".format(self.token_user),
         )
         self.assertIn(
@@ -103,7 +105,7 @@ def test_authenticated_securityuser_get_single_asset_via_serial_number(
     ):
         mock_verify_id_token.return_value = {"email": self.security_user.email}
         response = client.get(
-            "{}?search={}".format(self.asset_urls, self.asset.serial_number),
+            "{}?serial_number={}".format(self.asset_urls, self.asset.serial_number),
             HTTP_AUTHORIZATION="Token {}".format(self.token_checked_by),
         )
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -470,10 +472,9 @@ def test_fetching_assets_assigned_to_a_random_user_by_non_admin(
             str(response.data["detail"]),
             "Operation not permitted. You are not authorised.",
         )
-        self.assertEqual(response.status_code, 200)
 
     @patch("api.authentication.auth.verify_id_token")
-    def test_asset_search_endpoint(self, mock_verify_id_token):
+    def test_search_fnx_on_asset_endpoint(self, mock_verify_id_token):
         mock_verify_id_token.return_value = {"email": self.admin_user.email}
         self.admin_user.is_securityuser = True
         self.admin_user.save()
@@ -506,17 +507,18 @@ def test_asset_search_endpoint(self, mock_verify_id_token):
             asset_location=self.centre,
             department=self.department,
         )
+
         response = client.get(
             "{}?search={}".format(self.asset_urls, "ANDELA"),
             HTTP_AUTHORIZATION="Token {}".format(self.token_admin),
         )
         # return only assets with ANDELA match which is just asset_one and asset_two
         self.assertEqual(response.data["count"], 2)
         self.assertEqual(
-            response.data.get('results')[1].get('uuid'), str(asset_one.uuid)
+            response.data.get("results")[1].get("uuid"), str(asset_one.uuid)
         )
         self.assertEqual(
-            response.data.get('results')[0].get('uuid'), str(asset_two.uuid)
+            response.data.get("results")[0].get("uuid"), str(asset_two.uuid)
         )
 
         response = client.get(
@@ -526,8 +528,9 @@ def test_asset_search_endpoint(self, mock_verify_id_token):
         # return only assets with SN_ART match which is just asset_one and asset_three
         self.assertEqual(response.data["count"], 2)
         self.assertEqual(
-            response.data.get('results')[1].get('uuid'), str(asset_one.uuid)
+            response.data.get("results")[1].get("uuid"), str(asset_one.uuid)
         )
         self.assertEqual(
-            response.data.get('results')[0].get('uuid'), str(asset_three.uuid)
+            response.data.get("results")[0].get("uuid"), str(asset_three.uuid)
         )
+

api/views/assets.py

@@ -14,6 +14,7 @@
 from django.db.models import Q
 from django.db.utils import IntegrityError
 from django.http import FileResponse
+from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import serializers, status
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.filters import OrderingFilter, SearchFilter
@@ -127,7 +128,7 @@ class AssetViewSet(ModelViewSet):
     filterset_class = AssetFilter
     authentication_classes = (FirebaseTokenAuthentication,)
     http_method_names = ["get"]
-    filter_backends = (SearchFilter,)
+    filter_backends = (SearchFilter, DjangoFilterBackend)
     search_fields = ['asset_code', 'serial_number']
 
     def get_queryset(self):