fix: es6 usage count to migrate

aaxelb · aaxelb · commit ceb9409c31a7 · 2026-04-30T09:31:56.000-04:00
diff --git a/osf/management/commands/migrate_osfmetrics_6to8.py b/osf/management/commands/migrate_osfmetrics_6to8.py
@@ -669,9 +669,14 @@ def _handle_usage_events(self, *, start: bool, no_counts: bool):
                     }
                 }
             }
+            _es6_usage_count_q = {
+                'bool': {
+                    'filter': [_range_q, {'exists': {'field': 'item_guid'}}],
+                },
+            }
             _es6_pview_count = PreprintView.search().filter(_range_q).count()
             _es6_pdownload_count = PreprintDownload.search().filter(_range_q).count()
-            _es6_usage_event_count = CountedUsageEs6.search().filter(_range_q).count()
+            _es6_usage_event_count = CountedUsageEs6.search().filter(_es6_usage_count_q).count()
             _es6_count = (
                 _es6_pview_count + _es6_pdownload_count + _es6_usage_event_count
             )
@@ -720,7 +725,7 @@ def _handle_usage_reports(self, *, start: bool, no_counts: bool):
             self._write_tabbed(
                 'es8',
                 es8_metrics.MonthlyPublicItemUsageReportEs8,
-                '(items)',
+                'osfid count:',
                 _es8_item_count,
                 style=self._eq_style(_es8_item_count, _es6_item_count),
             )

Original file line number	Diff line number	Diff line change
`@@ -669,9 +669,14 @@ def _handle_usage_events(self, *, start: bool, no_counts: bool):`
`669`	`669`	`}`
`670`	`670`	`}`
`671`	`671`	`}`
	`672`	`+ _es6_usage_count_q = {`
	`673`	`+ 'bool': {`
	`674`	`+ 'filter': [_range_q, {'exists': {'field': 'item_guid'}}],`
	`675`	`+ },`
	`676`	`+ }`
`672`	`677`	`_es6_pview_count = PreprintView.search().filter(_range_q).count()`
`673`	`678`	`_es6_pdownload_count = PreprintDownload.search().filter(_range_q).count()`
`674`		`- _es6_usage_event_count = CountedUsageEs6.search().filter(_range_q).count()`
	`679`	`+ _es6_usage_event_count = CountedUsageEs6.search().filter(_es6_usage_count_q).count()`
`675`	`680`	`_es6_count = (`
`676`	`681`	`_es6_pview_count + _es6_pdownload_count + _es6_usage_event_count`
`677`	`682`	`)`
`@@ -720,7 +725,7 @@ def _handle_usage_reports(self, *, start: bool, no_counts: bool):`
`720`	`725`	`self._write_tabbed(`
`721`	`726`	`'es8',`
`722`	`727`	`es8_metrics.MonthlyPublicItemUsageReportEs8,`
`723`		`- '(items)',`
	`728`	`+ 'osfid count:',`
`724`	`729`	`_es8_item_count,`
`725`	`730`	`style=self._eq_style(_es8_item_count, _es6_item_count),`
`726`	`731`	`)`