Allow multiple values in job.state filter (#480)

* allow multiple filters in jobs view #479

* add tests for job state filter #90 #91

Author: fqrious

obstracts/server/values/values.py

@@ -1,10 +1,6 @@
-from stix2 import IPv4Address
-from stix2extensions import BankAccount
-from datetime import datetime
-from typing import List, Dict, Tuple, Callable
+from typing import Callable
 import logging
 
-from dogesec_commons.objects.helpers import TLP_VISIBLE_TO_ALL
 from stix2arango.stix2arango.stix2arango import post_upload_hook
 from obstracts.server.models import ObjectValue
 
@@ -215,22 +211,6 @@ def guess_kb_data(obj: dict) -> str | None:
     return kb_name, extra
 
 
-def get_visibility(obj: dict) -> str:
-    """
-    Determine the visibility of a STIX object based on its properties.
-
-    Returns:
-        - "public" if the object is marked as public
-        - "private" if the object is marked as private
-        - "unknown" if visibility cannot be determined
-    """
-    if not obj.get("created_by_ref") or set(obj.get("object_marking_refs", [])).intersection(
-        TLP_VISIBLE_TO_ALL
-    ):
-        return "public"
-    return "private"
-
-
 def extract_object_metadata(obj: dict) -> dict:
     """
     Extract key metadata from a STIX object.

obstracts/server/views.py

@@ -1213,8 +1213,9 @@ class filterset_class(FilterSet):
             label="Filter by Feed ID (e.g. `6c6e6448-04d4-42a3-9214-4f0f7d02694e`.",
             lookup_expr="in",
         )
-        state = Filter(
+        state = BaseCSVFilter(
             label="Filter by state.",
+            lookup_expr="in",
         )
         post_id = UUIDFilter(
             label="Filter by Post ID",

tests/src/views/test_views.py

@@ -1,5 +1,6 @@
 from unittest.mock import patch
 import uuid
+import pytest
 from tests.utils import Transport
 
 
@@ -34,3 +35,45 @@ def test_update_vulnerabilities_action(client, monkeypatch, db, celery_always_ea
         assert job.type == ob_models.JobType.SYNC_VULNERABILITIES
         assert job.state == ob_models.JobState.PROCESSING
         mock_update_vulnerabilities.assert_called_once_with(uuid.UUID(job_id)) 
+
+@pytest.mark.parametrize(
+    "states,expected_ids",
+    [
+        (["in-queue"], {"9e0d79ed-94d9-42a3-aa41-4772ae922176"}),
+        (["processing"], {"2583d09b-6535-4f15-9fd1-5dcb55230f08"}),
+        (["in-queue", "processing"], {"9e0d79ed-94d9-42a3-aa41-4772ae922176", "2583d09b-6535-4f15-9fd1-5dcb55230f08"}),
+        (["cancelled"], {"0014c5a1-7a5e-408f-88ea-83ec5a1b8af1"}),
+        (["processed"], set()),
+        ([], {"9e0d79ed-94d9-42a3-aa41-4772ae922176", "2583d09b-6535-4f15-9fd1-5dcb55230f08", "0014c5a1-7a5e-408f-88ea-83ec5a1b8af1"}),
+    ]
+)
+@pytest.mark.django_db
+def test_jobs_filter_by_multiple_states(client, api_schema, states, expected_ids):
+    from obstracts.server import models as ob_models
+
+    keep_1 = ob_models.Job.objects.create(
+        id='9e0d79ed-94d9-42a3-aa41-4772ae922176',
+        type=ob_models.JobType.FEED_INDEX,
+        state=ob_models.JobState.QUEUED,
+    )
+    keep_2 = ob_models.Job.objects.create(
+        id='2583d09b-6535-4f15-9fd1-5dcb55230f08',
+        type=ob_models.JobType.PDF_INDEX,
+        state=ob_models.JobState.PROCESSING,
+    )
+    ob_models.Job.objects.create(
+        id='0014c5a1-7a5e-408f-88ea-83ec5a1b8af1',
+        type=ob_models.JobType.REPROCESS_POSTS,
+        state=ob_models.JobState.CANCELLED,
+    )
+
+    resp = client.get(
+        f"/api/v1/jobs/?state={','.join(states)}"
+    )
+    assert resp.status_code == 200
+    assert resp.data["total_results_count"] == len(expected_ids)
+
+    returned = {item["id"] for item in resp.data["jobs"]}
+    assert returned == expected_ids
+
+    api_schema["/api/v1/jobs/"]["GET"].validate_response(Transport.get_st_response(resp))