CONDD-1085 User activity report (#2705)

* CONCD-1083 disable activity report for lower envs

* CONCD-1084 Only count transcriptions for *different* assets in user activity report

* CONCD-1083 use CONCORDIA_ENVIRONMENT setting (instead of looking at the domain

* CONCD-1084 refactoring code

* CONCD-1084 updated unit test

* CONCD-1084 slight code cleanup

* CONCD-1083 added an arg to enable testing

* CONCD-1045 let's go with 12px, instead of 8

Author: rasarkar

concordia/models.py

@@ -30,7 +30,7 @@
 ONE_MINUTE = datetime.timedelta(minutes=1)
 ONE_DAY = datetime.timedelta(days=1)
 ONE_DAY_AGO = timezone.now() - ONE_DAY
-THRESHOLD = 3
+THRESHOLD = 2
 
 
 def resource_file_upload_path(instance, filename):
@@ -96,20 +96,19 @@ def review_incidents(self, recent_accepts, recent_rejects, threshold=THRESHOLD):
                     break
         return incidents
 
-    def transcribe_incidents(self, transcriptions, threshold=THRESHOLD):
-        recent_transcriptions = transcriptions.filter(user=self).order_by("submitted")
-        timestamps = recent_transcriptions.values_list("submitted", flat=True)
+    def transcribe_incidents(self, transcriptions):
+        transcriptions = transcriptions.filter(user=self).order_by("submitted")
         incidents = 0
-        for i in range(len(timestamps)):
-            count = 1
-            for j in range(i + 1, len(timestamps)):
-                if (timestamps[j] - timestamps[i]).seconds <= 60:
-                    count += 1
-                    if count == threshold:
-                        incidents += 1
-                        break
-                else:
-                    break
+        for transcription in transcriptions:
+            start = transcription.submitted
+            end = transcription.submitted + datetime.timedelta(minutes=1)
+            if (
+                transcriptions.filter(submitted__lte=end, submitted__gt=start)
+                .exclude(asset=transcription.asset)
+                .count()
+                > 0
+            ):
+                incidents += 1
         return incidents
 
 
@@ -907,11 +906,14 @@ def review_incidents(self, start=ONE_DAY_AGO):
 
         return user_incident_count
 
-    def transcribe_incidents(self, start=ONE_DAY_AGO):
-        user_incident_count = []
-        transcriptions = self.get_queryset().filter(
+    def recent_transcriptions(self, start=ONE_DAY_AGO):
+        return self.get_queryset().filter(
             submitted__gte=start, user__is_superuser=False, user__is_staff=False
         )
+
+    def transcribe_incidents(self, start=ONE_DAY_AGO):
+        user_incident_count = []
+        transcriptions = self.recent_transcriptions(start)
         user_ids = (
             transcriptions.order_by("user")
             .distinct("user")

concordia/static/scss/base.scss

@@ -1198,6 +1198,10 @@ body .disabled > .page-link {
     }
 }
 
+#banner-inner {
+    margin-right: 0.75rem;
+}
+
 #homepage-contribute-activities {
     img {
         @include media-breakpoint-down(sm) {

concordia/tasks.py

@@ -1050,36 +1050,38 @@ def clear_sessions():
 
 
 @celery_app.task(ignore_result=True)
-def unusual_activity():
+def unusual_activity(ignore_env=False):
     """
     Locate pages that were improperly transcribed or reviewed.
     """
-    now = timezone.now()
-    site = Site.objects.get_current()
-    ONE_DAY_AGO = now - datetime.timedelta(days=1)
-    context = {
-        "title": "Unusual User Activity Report for "
-        + now.strftime("%b %d %Y, %I:%M %p"),
-        "domain": "https://" + site.domain,
-        "transcriptions": Transcription.objects.transcribe_incidents(ONE_DAY_AGO),
-        "reviews": Transcription.objects.review_incidents(ONE_DAY_AGO),
-    }
-
-    text_body_template = loader.get_template("emails/unusual_activity.txt")
-    text_body_message = text_body_template.render(context)
-
-    html_body_template = loader.get_template("emails/unusual_activity.html")
-    html_body_message = html_body_template.render(context)
-
-    to_email = ["[email protected]"]
-    if settings.DEFAULT_TO_EMAIL:
-        to_email.append(settings.DEFAULT_TO_EMAIL)
-    message = EmailMultiAlternatives(
-        subject=context["title"],
-        body=text_body_message,
-        from_email=settings.DEFAULT_FROM_EMAIL,
-        to=to_email,
-        reply_to=[settings.DEFAULT_FROM_EMAIL],
-    )
-    message.attach_alternative(html_body_message, "text/html")
-    message.send()
+    # Don't bother running unless we're in the prod env
+    if settings.CONCORDIA_ENVIRONMENT == "production" or ignore_env:
+        site = Site.objects.get_current()
+        now = timezone.now()
+        ONE_DAY_AGO = now - datetime.timedelta(days=1)
+        context = {
+            "title": "Unusual User Activity Report for "
+            + now.strftime("%b %d %Y, %I:%M %p"),
+            "domain": "https://" + site.domain,
+            "transcriptions": Transcription.objects.transcribe_incidents(ONE_DAY_AGO),
+            "reviews": Transcription.objects.review_incidents(ONE_DAY_AGO),
+        }
+
+        text_body_template = loader.get_template("emails/unusual_activity.txt")
+        text_body_message = text_body_template.render(context)
+
+        html_body_template = loader.get_template("emails/unusual_activity.html")
+        html_body_message = html_body_template.render(context)
+
+        to_email = ["[email protected]"]
+        if settings.DEFAULT_TO_EMAIL:
+            to_email.append(settings.DEFAULT_TO_EMAIL)
+        message = EmailMultiAlternatives(
+            subject=context["title"],
+            body=text_body_message,
+            from_email=settings.DEFAULT_FROM_EMAIL,
+            to=to_email,
+            reply_to=[settings.DEFAULT_FROM_EMAIL],
+        )
+        message.attach_alternative(html_body_message, "text/html")
+        message.send()

concordia/templates/home.html

@@ -16,7 +16,7 @@
         <div id="homepage-contribute-container" class="container my-4">
             <div class="px-default ms-md-3 mb-5">
                 <div class="alert {{ banner.alert_class }} alert-dismissible w-100 d-flex" id="banner-{{ banner.slug }}" role="alert">
-                    <div class="d-flex flex-1 justify-content-center me-2">
+                    <div id="banner-inner" class="d-flex flex-1 justify-content-center">
                         <a class="btn {{ banner.btn_class }}" href="{{ banner.link }}"{% if banner.open_in_new_window_tab %} target="_blank"{% endif %}>
                             {{ banner.text }}
                         </a>

concordia/tests/test_models.py

@@ -205,7 +205,7 @@ def test_review_incidents(self):
             (
                 self.transcription1.reviewed_by.id,
                 self.transcription1.reviewed_by.username,
-                1,
+                2,
                 4,
             ),
         )
@@ -229,7 +229,7 @@ def test_review_incidents(self):
             (
                 self.transcription1.reviewed_by.id,
                 self.transcription1.reviewed_by.username,
-                2,
+                4,
                 6,
             ),
         )
@@ -247,37 +247,37 @@ def test_transcribe_incidents(self):
         self.assertNotIn(self.transcription1.user.id, users)
 
         transcription3 = create_transcription(
-            asset=self.transcription1.asset,
+            asset=create_asset(slug="asset-two", item=self.transcription1.asset.item),
             user=self.transcription1.user,
             submitted=self.transcription1.submitted + timedelta(seconds=58),
         )
         transcription4 = create_transcription(
-            asset=self.transcription1.asset,
+            asset=create_asset(slug="asset-three", item=self.transcription1.asset.item),
             user=self.transcription1.user,
             submitted=transcription3.submitted + timedelta(minutes=1, seconds=1),
         )
         create_transcription(
-            asset=self.transcription1.asset,
+            asset=transcription4.asset,
             user=self.transcription1.user,
             submitted=transcription4.submitted + timedelta(seconds=59),
         )
         users = Transcription.objects.transcribe_incidents()
         self.assertEqual(len(users), 1)
         self.assertEqual(
             users[0],
-            (self.transcription1.user.id, self.transcription1.user.username, 1, 5),
+            (self.transcription1.user.id, self.transcription1.user.username, 2, 5),
         )
 
         create_transcription(
-            asset=self.transcription1.asset,
+            asset=create_asset(slug="asset-five", item=self.transcription1.asset.item),
             user=self.transcription1.user,
             submitted=self.transcription1.submitted + timedelta(minutes=1, seconds=59),
         )
         users = Transcription.objects.transcribe_incidents()
         self.assertEqual(len(users), 1)
         self.assertEqual(
             users[0],
-            (self.transcription1.user.id, self.transcription1.user.username, 2, 6),
+            (self.transcription1.user.id, self.transcription1.user.username, 3, 6),
         )