Fix list activity notifications

kolibri/core/logger/api.py

@@ -823,8 +823,7 @@ def _update_summary_log(
         summarylog = ContentSummaryLog.objects.get(
             content_id=sessionlog.content_id, user=user
         )
-        was_complete = summarylog.progress >= 1
-
+        was_complete = summarylog.completion_timestamp is not None
         update_fields = self._update_content_log(
             summarylog, end_timestamp, validated_data
         )

kolibri/core/notifications/api.py

@@ -310,7 +310,7 @@ def finish_lesson_resource(summarylog, contentnode_id, lesson_id):
         notifications = []
         # Now let's check completed resources and lessons:
         notification_completed = check_and_created_completed_resource(
-            lesson, summarylog.user_id, contentnode_id, summarylog.end_timestamp
+            lesson, summarylog.user_id, contentnode_id, summarylog.completion_timestamp
         )
         if notification_completed:
             notifications.append(notification_completed)
@@ -328,7 +328,7 @@ def finish_lesson_resource(summarylog, contentnode_id, lesson_id):
         ).count()
         if user_completed_resources == len(lesson_content_ids):
             notification_completed = check_and_created_completed_lesson(
-                lesson, summarylog.user_id, summarylog.end_timestamp
+                lesson, summarylog.user_id, summarylog.completion_timestamp
             )
             if notification_completed:
                 notifications.append(notification_completed)
@@ -424,7 +424,7 @@ def parse_summarylog(summarylog):
     for lesson, contentnode_id in lessons:
         # Now let's check completed resources and lessons:
         notification_completed = check_and_created_completed_resource(
-            lesson, summarylog.user_id, contentnode_id, summarylog.end_timestamp
+            lesson, summarylog.user_id, contentnode_id, summarylog.completion_timestamp
         )
         if notification_completed:
             notifications.append(notification_completed)
@@ -440,7 +440,7 @@ def parse_summarylog(summarylog):
         ).count()
         if user_completed == len(lesson_content_ids):
             notification_completed = check_and_created_completed_lesson(
-                lesson, summarylog.user_id, summarylog.end_timestamp
+                lesson, summarylog.user_id, summarylog.completion_timestamp
             )
             if notification_completed:
                 notifications.append(notification_completed)

kolibri/plugins/coach/api.py

@@ -192,14 +192,18 @@ def get_queryset(self):
         notifications_query = self.apply_group_filter(notifications_query)
         after = self.check_after()
         if after:
-            notifications_query = notifications_query.filter(id__gt=after)
+            # after is an id, so we need to get the notiication with that id, and filter by timestamp
+            after_timestamp = notifications_query.get(id=after).timestamp
+            notifications_query = notifications_query.filter(
+                timestamp__gt=after_timestamp
+            )
         before = self.check_before()
 
         if not after and not before:
             try:
-                last_id_record = notifications_query.latest("id")
+                last_record = notifications_query.latest("timestamp")
                 # returns all the notifications 24 hours older than the latest
-                last_24h = last_id_record.timestamp - datetime.timedelta(days=1)
+                last_24h = last_record.timestamp - datetime.timedelta(days=1)
                 notifications_query = notifications_query.filter(
                     timestamp__gte=last_24h
                 )
@@ -212,12 +216,15 @@ def get_queryset(self):
         limit = self.check_limit()
         if before and limit:
             # Don't allow arbitrary backwards lookups
-            notifications_query = notifications_query.filter(id__lt=before)
+            before_timestamp = notifications_query.get(id=before).timestamp
+            notifications_query = notifications_query.filter(
+                timestamp__lt=before_timestamp
+            )
 
         return notifications_query
 
     def annotate_queryset(self, queryset):
-        queryset = queryset.order_by("-id")
+        queryset = queryset.order_by("-timestamp")
         limit = self.check_limit()
         if limit:
             return queryset[:limit]
@@ -257,7 +264,7 @@ def list(self, request, *args, **kwargs):
         limit = self.check_limit()
         if limit:
             # If we are limiting responses, check if more results are available
-            more_results = queryset.order_by("-id")[limit:].exists()
+            more_results = queryset.order_by("-timestamp")[limit:].exists()
 
         return Response(
             {

kolibri/plugins/coach/assets/src/modules/coachNotifications/index.js

@@ -1,4 +1,5 @@
 import maxBy from 'lodash/maxBy';
+import minBy from 'lodash/minBy';
 import sortBy from 'lodash/sortBy';
 import uniqBy from 'lodash/uniqBy';
 import notificationsResource from '../../apiResources/notifications';
@@ -12,10 +13,13 @@ export default {
   },
   mutations: {
     SET_NOTIFICATIONS(state, notifications) {
-      state.notifications = sortBy([...notifications], '-id');
+      state.notifications = sortBy([...notifications], '-timestamp');
     },
     INSERT_NOTIFICATIONS(state, notifications) {
-      state.notifications = uniqBy(sortBy([...state.notifications, ...notifications], '-id'), 'id');
+      state.notifications = uniqBy(
+        sortBy([...state.notifications, ...notifications], '-timestamp'),
+        'id',
+      );
     },
     SET_CURRENT_CLASSROOM_ID(state, classroomId) {
       state.currentClassroomId = classroomId;
@@ -26,8 +30,7 @@ export default {
     summarizedNotifications,
     maxNotificationIndex(state) {
       if (state.notifications.length > 0) {
-        // IDs are being converted to strings for some reason
-        return maxBy(state.notifications, n => Number(n.id)).id;
+        return maxBy(state.notifications, n => new Date(n.timestamp)).id;
       }
       return 0;
     },
@@ -54,6 +57,7 @@ export default {
           if (!store.state.poller) {
             store.dispatch('startingPolling', { coachesPolling: data.coaches_polling });
           }
+          store.dispatch('checkEmptySummarizedNotifications');
         })
         .catch(() => {
           if (!store.state.poller) {
@@ -87,7 +91,7 @@ export default {
     },
     moreNotificationsForClass(store, params) {
       const classroomId = store.state.currentClassroomId;
-      const lastNotification = store.state.notifications.slice(-1)[0];
+      const lastNotification = minBy(store.state.notifications, n => new Date(n.timestamp));
       // don't fetch if no current classroom
       if (!classroomId || !lastNotification || lastNotification.id <= 1) {
         return Promise.resolve(false);
@@ -106,6 +110,9 @@ export default {
         .then(data => {
           if (data.results.length > 0) {
             store.commit('INSERT_NOTIFICATIONS', data.results);
+            if (data.more_results) {
+              store.dispatch('checkEmptySummarizedNotifications');
+            }
             return data.more_results;
           }
           return false;
@@ -123,5 +130,10 @@ export default {
         });
       }, timeout);
     },
+    checkEmptySummarizedNotifications(store) {
+      if (store.getters.summarizedNotifications.length === 0) {
+        store.dispatch('moreNotificationsForClass');
+      }
+    },
   },
 };

kolibri/plugins/coach/assets/src/views/common/notifications/ActivityList.vue

@@ -154,9 +154,6 @@
           const params = {
             ...this.filterParam,
           };
-          if (this.notifications.length) {
-            params.before = this.notifications.slice(-1)[0].id;
-          }
           this.moreNotificationsForClass(params).then(moreResults => {
             this.moreResults = moreResults;
             this.loading = false;