user logic & timezone fix

backend/ohq/management/commands/course_stat.py

@@ -1,5 +1,6 @@
 from django.core.management.base import BaseCommand
 from django.utils import timezone
+import datetime
 
 from ohq.models import Course, Question
 from ohq.statistics import (

backend/ohq/management/commands/user_stat.py

@@ -1,6 +1,8 @@
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 from datetime import timedelta
+from django.conf import settings
+import datetime
 
 from ohq.models import Profile, Course, Question
 from ohq.statistics import (
@@ -12,54 +14,44 @@
 )
 from django.db.models import Q
 
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
+
 
 
 
 class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument("--hist", action="store_true", help="Calculate all historic statistics")
 
-    def calculate_statistics(self, profiles, courses, earliest_date):
-        yesterday = timezone.datetime.today().date() - timezone.timedelta(days=1)
-        active_users_today = set()
-
+    def calculate_statistics(self, courses, earliest_date):
         for course in courses:
-            if not earliest_date:
-                course_questions = Question.objects.filter(queue__course=course)
-                earliest_date = (
-                    timezone.template_localtime(
-                        course_questions.earliest("time_asked").time_asked
-                    ).date()
-                    if course_questions
-                    else yesterday
-                )
 
             questions_queryset = Question.objects.filter(queue__course=course, time_asked__gte=earliest_date)
             users_union = (
-                Profile.objects.filter(
+                User.objects.filter(
                     Q(id__in=questions_queryset.values_list("asked_by", flat=True)) |
                     Q(id__in=questions_queryset.values_list("responded_to_by", flat=True))
                 )
             )
 
             for user in users_union:
-                    user_calculate_questions_asked(user.user)
-                    user_calculate_questions_answered(user.user)
-                    user_calculate_time_helped(user.user)
-                    user_calculate_time_helping(user.user)
-                    user_calculate_students_helped(user.user)
+                    user_calculate_questions_asked(user)
+                    user_calculate_questions_answered(user)
+                    user_calculate_time_helped(user)
+                    user_calculate_time_helping(user)
+                    user_calculate_students_helped(user)
 
 
     def handle(self, *args, **kwargs):
         if kwargs["hist"]:
             courses = Course.objects.all()
-            profiles = Profile.objects.all()
-            earliest_date = None
+            earliest_date = timezone.make_aware(datetime.datetime.utcfromtimestamp(0))
         else: 
             courses = Course.objects.filter(archived=False)
-            profiles = Profile.objects.all()
             earliest_date = timezone.now().date() - timedelta(days=1)
 
-        self.calculate_statistics(profiles, courses, earliest_date)
+        self.calculate_statistics(courses, earliest_date)
 
 

k8s/main.ts

@@ -101,6 +101,13 @@ export class MyChart extends PennLabsChart {
       secret: secret,
       cmd: ['python', 'manage.py', 'course_stat'],
     });
+
+    new CronJob(this, 'calculate-user-stat', {
+      schedule: cronTime.everyDayAt(8),
+      image: backendImage,
+      secret: secret,
+      cmd: ['python', 'manage.py', 'user_stat'],
+    });
   }
 }