added metrics

Author: bodintsov

admin/base/settings/defaults.py

@@ -40,7 +40,8 @@
 CSRF_COOKIE_HTTPONLY = False
 
 ALLOWED_HOSTS = [
-    '.osf.io'
+    '.osf.io',
+    'localhost'
 ]
 
 AUTH_PASSWORD_VALIDATORS = [

api/metrics/views.py

@@ -273,6 +273,7 @@ def get(self, request, *args, **kwargs):
     'user_summary': reports.UserSummaryReport,
     'spam_summary': reports.SpamSummaryReport,
     'new_user_domains': reports.NewUserDomainReport,
+    'notification_summary': reports.NotificationSummaryReport
 }
 
 

osf/management/commands/metrics_backfill_summaries.py

@@ -12,6 +12,7 @@
   institution_summary
   user_summary
   node_summary
+  notification_summary
 
 """
 import csv
@@ -28,6 +29,7 @@
     PreprintSummaryReport,
     # StorageAddonUsage,
     UserSummaryReport,
+    NotificationSummaryReport
 )
 
 
@@ -361,6 +363,12 @@ def _map_user_summary(row):
         'unconfirmed': int(row['status.unconfirmed'] or 0),
     }
 
+def _map_notification_summary(row):
+    return {
+        'notifications_count': int(row['notification_subscriptions_count'] or 0),
+        'users_count': int(row['notification_subscriptions_users_count'] or 0),
+    }
+
 SUMMARIES = {
     'download_count': {
         'mapper': _map_download_count,
@@ -386,6 +394,10 @@ def _map_user_summary(row):
         'mapper': _map_user_summary,
         'class': UserSummaryReport,
     },
+    'notification_summary': {
+        'mapper': _map_notification_summary,
+        'class': NotificationSummaryReport,
+    }
 }
 
 def _timestamp_to_dt(timestamp):

osf/metrics/__init__.py

@@ -21,6 +21,7 @@
     PreprintSummaryReport,
     StorageAddonUsage,
     UserSummaryReport,
+    NotificationSummaryReport,
 )
 
 DAILY_REPORTS = (
@@ -43,4 +44,5 @@
     'PreprintDownload',
     'RegistriesModerationMetrics',
     'UserInstitutionProjectCounts',
+    'NotificationSummaryReport',
 )

osf/metrics/reporters/__init__.py

@@ -14,6 +14,7 @@
 from .user_count import UserCountReporter
 from .spam_count import SpamCountReporter
 from .private_spam_metrics import PrivateSpamMetricsReporter
+from .notification_count import NotificationCountReporter
 
 
 class AllDailyReporters(enum.Enum):
@@ -34,3 +35,4 @@ class AllMonthlyReporters(enum.Enum):
     INSTITUTIONAL_SUMMARY = InstitutionalSummaryMonthlyReporter
     ITEM_USAGE = PublicItemUsageReporter
     PRIVATE_SPAM_METRICS = PrivateSpamMetricsReporter
+    NOTIFICATIONS_COUNT = NotificationCountReporter

osf/metrics/reporters/notification_count.py

@@ -0,0 +1,23 @@
+from osf.metrics.reports import (
+    MonthlyReport,
+    NotificationSummaryReport,
+)
+from osf.models.notification_subscription import NotificationSubscription
+
+class NotificationCountReporter(MonthlyReport):
+    report_name = 'Notification Metrics'
+
+    def report(self):
+        target_month = self.yearmonth.month_start()
+        next_month = self.yearmonth.month_end()
+
+        report = NotificationSummaryReport(
+            report_yearmonth=str(self.yearmonth),
+            notification_subscriptions_count=NotificationSubscription.objects.filter(
+                created__gt=target_month, created__lt=next_month
+            ).distinct().count(),
+            notification_subscriptions_users_count=NotificationSubscription.objects.filter(
+                created__gt=target_month, created__lt=next_month
+            ).values('user').distinct().count(),
+        )
+        return [report]

osf/metrics/reports.py

@@ -345,3 +345,8 @@ class PrivateSpamMetricsReport(MonthlyReport):
     preprint_oopspam_hammed = metrics.Integer()
     preprint_akismet_flagged = metrics.Integer()
     preprint_akismet_hammed = metrics.Integer()
+
+
+class NotificationSummaryReport(MonthlyReport):
+    notification_subscriptions_count = metrics.Integer()
+    notification_subscriptions_users_count = metrics.Integer()