tests improve

Author: bodintsov

osf/metrics/reporters/institution_summary_monthly.py

@@ -22,8 +22,7 @@ def iter_report_kwargs(self, continue_after: dict | None = None):
     def report(self, **report_kwargs):
         _institution = Institution.objects.get(pk=report_kwargs['institution_pk'])
         reports = self.generate_report(_institution)
-        _report = next(r for r in reports if isinstance(r, InstitutionMonthlySummaryReport))
-        return _report
+        return reports
 
     def generate_report(self, institution):
         node_queryset = institution.nodes.filter(

osf/metrics/reporters/private_spam_metrics.py

@@ -4,7 +4,6 @@
 from ._base import MonthlyReporter
 from osf.metrics.es8_metrics import PrivateSpamMetricsReportEs8
 
-
 class PrivateSpamMetricsReporter(MonthlyReporter):
     report_name = 'Private Spam Metrics'
 

osf/metrics/reporters/public_item_usage.py

@@ -65,16 +65,16 @@ def report(self, **report_kwargs):
                 raise _SkipItem
             _obj = _guid.referent
             _reports = self._init_report(_obj)
-            _report = next(r for r in _reports if isinstance(r, PublicItemUsageReport))
-            self._fill_report_counts(_report, _obj)
-            if not any((
-                _report.view_count,
-                _report.view_session_count,
-                _report.download_count,
-                _report.download_session_count,
-            )):
-                raise _SkipItem
-            return _report
+            for _report in _reports:
+                self._fill_report_counts(_report, _obj)
+                if not any((
+                    _report.view_count,
+                    _report.view_session_count,
+                    _report.download_count,
+                    _report.download_session_count,
+                )):
+                    raise _SkipItem
+            return _reports
         except _SkipItem:
             return None
 

osf_tests/metrics/reporters/test_institutional_summary_reporter.py

@@ -3,6 +3,7 @@
 import logging
 from django.test import TestCase
 from osf.metrics.reporters import InstitutionalSummaryMonthlyReporter
+from osf.metrics.reports import InstitutionMonthlySummaryReport
 from osf.metrics.utils import YearMonth
 from osf_tests.factories import (
     InstitutionFactory,
@@ -79,10 +80,10 @@ def _create_active_user(cls, institution, date_confirmed):
 
     def test_report_generation(self):
         reporter = InstitutionalSummaryMonthlyReporter(self._yearmonth)
-        reports = list_monthly_reports(reporter)
-        self.assertEqual(len(reports), 1)
+        reports_raw = list_monthly_reports(reporter)
+        self.assertEqual(len(reports_raw[0]), 2)
 
-        report = reports[0]
+        report = next(r for r in reports_raw[0] if isinstance(r, InstitutionMonthlySummaryReport))
         self.assertEqual(report.institution_id, self._institution._id)
         self.assertEqual(report.user_count, 2)  # _logged_in_user and _active_user
         self.assertEqual(report.public_project_count, 1)
@@ -115,7 +116,8 @@ def test_report_generation_multiple_institutions(self):
 
         # Run the reporter for the current month (February 2018)
         reporter = InstitutionalSummaryMonthlyReporter(self._yearmonth)
-        reports = list_monthly_reports(reporter)
+        reports_raw= list_monthly_reports(reporter)
+        reports = [item for sublist in reports_raw for item in sublist if isinstance(item, InstitutionMonthlySummaryReport)]
         self.assertEqual(len(reports), 3)  # Reports for self._institution, institution2, institution3
 
         # Extract reports by institution
@@ -264,7 +266,8 @@ def test_high_counts_multiple_institutions(self):
         if enable_benchmarking:
             reporter_start_time = time.time()
         reporter = InstitutionalSummaryMonthlyReporter(self._yearmonth)
-        reports = list_monthly_reports(reporter)
+        reports_raw = list_monthly_reports(reporter)
+        reports = [item for sublist in reports_raw for item in sublist if isinstance(item, InstitutionMonthlySummaryReport)]
         assert len(reports) == additional_institution_count + 1
 
         if enable_benchmarking:

osf_tests/metrics/reporters/test_public_item_usage_reporter.py

@@ -174,8 +174,10 @@ def test_no_data(self, ym_empty):
 
     def test_reporter(self, ym_empty, ym_sparse, ym_busy, sparse_month_usage, busy_month_item0, busy_month_item1, busy_month_item2, item0):
         _empty = list_monthly_reports(PublicItemUsageReporter(ym_empty))
-        _sparse = list_monthly_reports(PublicItemUsageReporter(ym_sparse))
-        _busy = list_monthly_reports(PublicItemUsageReporter(ym_busy))
+        _sparse_raw = list_monthly_reports(PublicItemUsageReporter(ym_sparse))
+        _sparse = [item for sublist in _sparse_raw for item in sublist if isinstance(item, PublicItemUsageReport)]
+        _busy_raw = list_monthly_reports(PublicItemUsageReporter(ym_busy))
+        _busy = [item for sublist in _busy_raw for item in sublist if isinstance(item, PublicItemUsageReport)]
 
         # empty month:
         assert _empty == []

osf_tests/metrics/test_spam_count_reporter.py

@@ -1,6 +1,7 @@
 import pytest
 from datetime import datetime
 from osf.metrics.reporters.private_spam_metrics import PrivateSpamMetricsReporter
+from osf.metrics.reports import PrivateSpamMetricsReport
 from osf.metrics.utils import YearMonth
 from osf_tests.factories import NodeLogFactory, NodeFactory
 from unittest.mock import patch
@@ -30,7 +31,8 @@ def test_private_spam_metrics_reporter():
         mock_akismet_get_hammed_count.return_value = 10
 
         reporter = PrivateSpamMetricsReporter(report_yearmonth)
-        report = reporter.report()
+        reports_raw = reporter.report()
+        report = next(r for r in reports_raw if isinstance(r, PrivateSpamMetricsReport))
 
         assert report.node_oopspam_flagged == 10, f"Expected 10, got {report.node_oopspam_flagged}"
         assert report.node_oopspam_hammed == 5, f"Expected 5, got {report.node_oopspam_hammed}"