Add more filters

Author: hannaseithe

cats/api/filters.py

@@ -2,11 +2,23 @@
 
 from cats.models import SimulationRun
 
+
 class SimulationFilter(filters.FilterSet):
     status = filters.CharFilter(field_name="status")
     user = filters.CharFilter(field_name="user")
     created_after = filters.IsoDateTimeFilter(field_name="created_at", lookup_expr="gte")
     created_before = filters.IsoDateTimeFilter(field_name="created_at", lookup_expr="lte")
+    iterations = filters.NumberFilter(field_name="params__iterations", method="filter_int_params")
+    cat_amount = filters.NumberFilter(field_name="params__cat_amount", method="filter_int_params")
+    node_amount = filters.NumberFilter(field_name="params__node_amount", method="filter_int_params")
+
+    def filter_int_params(self, queryset, name, value):
+        value = int(value)
+        matching_filter = next((filter for filter in self.filters.values() if filter.field_name == name), None)
+        if not matching_filter:
+            return queryset
+        lookup = getattr(matching_filter, "lookup_expr", "exact")
+        return queryset.filter(**{f"{name}__{lookup}": value})
 
     class Meta:
         model = SimulationRun
@@ -15,4 +27,7 @@ class Meta:
             'user',
             'created_after',
             'created_before',
+            'iterations',
+            'cat_amount',
+            'node_amount',
         ]

cats/api/serializers.py

@@ -1,3 +1,4 @@
+from decimal import Decimal
 from rest_framework import serializers
 
 from cats.models import SimulationResults, SimulationRun
@@ -88,9 +89,23 @@ def validate(self, data):
 
 
 class SimulationStatusSerializer(serializers.ModelSerializer):
+    params = serializers.SerializerMethodField()
     class Meta:
         model = SimulationRun
         fields = ["id", "status", "created_at", "started_at", "finished_at", "params", "user"]
+    
+    def get_params(self, obj):
+        # Recursively convert any Decimal in JSON to float
+        def convert(value):
+            if isinstance(value, dict):
+                return {k: convert(v) for k, v in value.items()}
+            elif isinstance(value, list):
+                return [convert(v) for v in value]
+            elif isinstance(value, Decimal):
+                return float(value)
+            return value
+
+        return convert(obj.params)
 
 
 class SimulationErrorSerializer(serializers.ModelSerializer):

cats/api/views.py

@@ -24,7 +24,6 @@
 NOT_FAILED_RESPONSE = {"detail": "Simulation has not failed"}
 NOT_COMPLETED_RESPONSE = {"detail": "Simulation has not completed"}
 
-
 class SimulationStartView(APIView):
     permission_classes = [IsAuthenticated, IsOwnerOrAdmin]
 
@@ -100,3 +99,8 @@ def get_queryset(self):
         if user.is_staff:
             return SimulationRun.objects.all()
         return SimulationRun.objects.filter(user=user)
+    
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)

cats/tests/conftest.py

@@ -33,7 +33,7 @@ def create_simulation_list(db,create_user, create_simulation):
     def _create_simulation_list(user=None, number_of_lists=5):
         if not user:
             user = create_user()
-        return [create_simulation(user=user, params={"iterations":10*i}) for i in range(1,number_of_lists +1)]
+        return [create_simulation(user=user, params={"iterations":10*i, "cat_amount":3*i, "node_amount": 5*i}) for i in range(1,number_of_lists +1)]
     return _create_simulation_list
 
 @pytest.fixture

cats/tests/test_filters.py

@@ -112,3 +112,42 @@ def test_filter_by_user(auth_client_with_refresh, create_user, create_superuser,
     sims = response4.data
     assert len(sims) == 5, "Length of response list is not 5"
     assert sims[0] == SimulationStatusSerializer(sim_list2[0]).data, "First Simulation of List response is different from first simulation of list in memory"
+
+def test_filter_by_iterations(auth_client_with_refresh, create_user, create_simulation_list):
+    user = create_user(email="test1@email.com",password="test1password")
+    sim_list = create_simulation_list(user = user)
+
+    auth_client, _ = auth_client_with_refresh(user=user, password="test1password")
+    url = reverse("simulation-list")
+    response1 = auth_client.get(url, {"iterations": 10})
+    
+    assert response1.status_code == 200, "response status code not 200"
+    sims = response1.data
+    assert len(sims) == 1, "Length of response list is not 1"
+    assert sims[0] == SimulationStatusSerializer(sim_list[0]).data, "First Simulation of List response is different from first simulation of list in memory"
+
+def test_filter_by_cat_amounts(auth_client_with_refresh, create_user, create_simulation_list):
+    user = create_user(email="test1@email.com",password="test1password")
+    sim_list = create_simulation_list(user = user)
+
+    auth_client, _ = auth_client_with_refresh(user=user, password="test1password")
+    url = reverse("simulation-list")
+    response1 = auth_client.get(url, {"cat_amount": 6})
+    
+    assert response1.status_code == 200, "response status code not 200"
+    sims = response1.data
+    assert len(sims) == 1, "Length of response list is not 1"
+    assert sims[0] == SimulationStatusSerializer(sim_list[1]).data, "First Simulation of List response is different from first simulation of list in memory"
+
+def test_filter_by_node_amounts(auth_client_with_refresh, create_user, create_simulation_list):
+    user = create_user(email="test1@email.com",password="test1password")
+    sim_list = create_simulation_list(user = user)
+
+    auth_client, _ = auth_client_with_refresh(user=user, password="test1password")
+    url = reverse("simulation-list")
+    response1 = auth_client.get(url, {"node_amount": 10})
+    
+    assert response1.status_code == 200, "response status code not 200"
+    sims = response1.data
+    assert len(sims) == 1, "Length of response list is not 1"
+    assert sims[0] == SimulationStatusSerializer(sim_list[1]).data, "First Simulation of List response is different from first simulation of list in memory"