fix: monthly institution reporter

Author: aaxelb

osf/management/commands/monthly_reporters_go.py

@@ -3,12 +3,14 @@
 
 from django.core.management.base import BaseCommand
 from django.db import OperationalError as DjangoOperationalError
-from elasticsearch6.exceptions import ConnectionError as ElasticConnectionError
+from elasticsearch6.exceptions import ConnectionError as Elastic6ConnectionError
+from elasticsearch8.exceptions import ConnectionError as Elastic8ConnectionError
 from psycopg2 import OperationalError as PostgresOperationalError
 
 from framework.celery_tasks import app as celery_app
 import framework.sentry
 from osf.metrics.reporters import AllMonthlyReporters
+from osf.metrics.reports import MonthlyReport
 from osf.metrics.utils import YearMonth
 
 
@@ -17,7 +19,8 @@
 
 _CONTINUE_AFTER_ERRORS = (
     DjangoOperationalError,
-    ElasticConnectionError,
+    Elastic6ConnectionError,
+    Elastic8ConnectionError,
     PostgresOperationalError,
 )
 
@@ -70,11 +73,7 @@ def schedule_monthly_reporter(
 
 @celery_app.task(
     name='management.commands.monthly_reporter_do',
-    autoretry_for=(
-        DjangoOperationalError,
-        ElasticConnectionError,
-        PostgresOperationalError,
-    ),
+    autoretry_for=_CONTINUE_AFTER_ERRORS,
     max_retries=5,
     retry_backoff=True,
 )
@@ -87,7 +86,8 @@ def monthly_reporter_do(reporter_key: str, yearmonth: str, report_kwargs: dict):
 
     _reports = _reporter.report(**report_kwargs)
     for _report in _reports:
-        _report.report_yearmonth = _reporter.yearmonth
+        if isinstance(_report, MonthlyReport) and (_report.report_yearmonth is None):
+            _report.report_yearmonth = _reporter.yearmonth
         _report.save()
         _followup_task = _reporter.followup_task(_report)
         if _followup_task is not None: