feat: add support for multiple data sources in DatePeriod filters

Add support for comma-separated data source values in
DatePeriodFilter to allow filtering by multiple data sources in
a single API call.

Changes:
- Update data_source filter to use custom method supporting
  comma-separated values
- Update resource_data_source filter to support comma-separated
  values
- Both filters use OR logic to match any of the provided data
  sources
- Add tests for multiple data source filtering
- Maintain backward compatibility with single data source values

Filters now support values like "ds1,ds2,ds3" to filter date
periods that match any of the specified data sources.

Refs: HAUKI-757

Author: mhieta

hours/filters.py

@@ -121,7 +121,7 @@ def filter(self, qs, value):
 
 
 class DatePeriodFilter(filters.FilterSet):
-    data_source = filters.CharFilter(field_name="origins__data_source")
+    data_source = filters.CharFilter(method="data_source_filter")
     resource = filters.CharFilter(method="resource_filter")
     resource_data_source = filters.CharFilter(method="resource_data_source_filter")
 
@@ -144,6 +144,23 @@ class Meta:
         model = DatePeriod
         fields = ["resource"]
 
+    def data_source_filter(self, queryset, name, value):
+        if name != "data_source":
+            return queryset
+
+        data_sources = value.split(",")
+        q_objects = []
+        for data_source in data_sources:
+            q_objects.append(Q(origins__data_source=data_source))
+
+        query_q = Q()
+        for q in q_objects:
+            query_q |= q
+
+        queryset = queryset.filter(query_q)
+
+        return queryset
+
     def resource_filter(self, queryset, name, value):
         if name != "resource":
             return queryset
@@ -164,10 +181,19 @@ def resource_data_source_filter(self, queryset, name, value):
         if name != "resource_data_source":
             return queryset
 
-        queryset = queryset.filter(
-            Q(resource__data_sources=value)
-            | Q(resource__ancestry_data_source__contains=[value])
-        )
+        data_sources = value.split(",")
+        q_objects = []
+        for data_source in data_sources:
+            q_objects.append(
+                Q(resource__data_sources=data_source)
+                | Q(resource__ancestry_data_source__contains=[data_source])
+            )
+
+        query_q = Q()
+        for q in q_objects:
+            query_q |= q
+
+        queryset = queryset.filter(query_q)
 
         return queryset
 

hours/tests/test_dateperiod_api.py

@@ -134,6 +134,45 @@ def test_list_date_periods_filter_by_data_source(
     assert response.data[0]["id"] == expected_date_period.id
 
 
+@pytest.mark.django_db
+def test_list_date_periods_filter_by_multiple_data_sources(
+    admin_client, resource, data_source_factory, date_period_factory
+):
+    data_source_1 = data_source_factory()
+    data_source_2 = data_source_factory()
+
+    date_period_1 = date_period_factory(
+        resource=resource,
+        data_sources=[data_source_1],
+    )
+
+    date_period_2 = date_period_factory(
+        resource=resource,
+        data_sources=[data_source_2],
+    )
+
+    date_period_factory(
+        resource=resource,
+        data_sources=[data_source_factory()],
+    )
+
+    url = reverse("date_period-list")
+
+    response = admin_client.get(
+        url,
+        data={
+            "resource": resource.id,
+            "data_source": f"{data_source_1.id},{data_source_2.id}",
+        },
+    )
+
+    assert_response_status_code(response, 200)
+    assert len(response.data) == 2
+    returned_ids = [item["id"] for item in response.data]
+    assert date_period_1.id in returned_ids
+    assert date_period_2.id in returned_ids
+
+
 @pytest.mark.django_db
 def test_list_date_periods_filter_by_resource_direct_data_source(
     admin_client, resource, data_source_factory, date_period_factory, resource_factory
@@ -205,6 +244,55 @@ def test_list_date_periods_filter_by_resource_data_source_ancestor(
     assert response.data[0]["id"] == expected_date_period.id
 
 
+@pytest.mark.django_db
+def test_list_date_periods_filter_by_multiple_resource_data_sources(
+    admin_client,
+    resource,
+    data_source_factory,
+    date_period_factory,
+    resource_factory,
+):
+    data_source_1 = data_source_factory()
+    data_source_2 = data_source_factory()
+
+    resource_1 = resource
+    resource_1.data_sources.add(data_source_1)
+    date_period_1 = date_period_factory(
+        resource=resource_1,
+        start_date=datetime.date(year=2024, month=1, day=1),
+    )
+
+    resource_2 = resource_factory()
+    resource_2.data_sources.add(data_source_2)
+    date_period_2 = date_period_factory(
+        resource=resource_2,
+        start_date=datetime.date(year=2024, month=1, day=1),
+    )
+
+    resource_3 = resource_factory()
+    resource_3.data_sources.add(data_source_factory())
+    date_period_factory(
+        resource=resource_3,
+        start_date=datetime.date(year=2024, month=1, day=1),
+    )
+
+    url = reverse("date_period-list")
+
+    response = admin_client.get(
+        url,
+        data={
+            "resource_data_source": f"{data_source_1.id},{data_source_2.id}",
+            "start_date": "2024-01-01",
+        },
+    )
+
+    assert_response_status_code(response, 200)
+    assert len(response.data) == 2
+    returned_ids = [item["id"] for item in response.data]
+    assert date_period_1.id in returned_ids
+    assert date_period_2.id in returned_ids
+
+
 @pytest.mark.django_db
 def test_list_date_periods_filter_start_date_lte(
     admin_client, resource, date_period_factory