Sync queue updates

kolibri/core/public/api.py

@@ -219,7 +219,11 @@ def check_queue(self, request, pk=None):
             DELAYED_SYNC / 2,
         )
         last_activity = timezone.now() - datetime.timedelta(minutes=5)
-        queue_object = SyncQueue.objects.filter(id=pk).first()
+
+        if pk is not None:
+            queue_object = SyncQueue.objects.filter(id=pk).first()
+        else:
+            queue_object = SyncQueue.objects.filter(user_id=user).first()
 
         # Default the position to the total queue size, so that
         # if the id does not exist, send them to the back of the queue
@@ -234,7 +238,6 @@ def check_queue(self, request, pk=None):
             # that were made before this request. If pk is None or the queue
             # has expired (3 minutes), we will set the position to the length of the
             # queue.
-            queue_object = SyncQueue.objects.get(pk=pk)
             before_client = SyncQueue.objects.filter(datetime__lt=queue_object.datetime)
             pos = before_client.count()
 

kolibri/core/public/test/test_api.py

@@ -461,6 +461,33 @@ def test_create_full_queue_should_queue(self):
             SyncQueue.objects.filter(id=queue_id, user_id=self.learner.id).exists()
         )
 
+    def test_create_full_queue_user_already_queued_should_resume(self):
+        for i in range(0, MAX_CONCURRENT_SYNCS):
+            learner = FacilityUser.objects.create(
+                username="test{}".format(i),
+                password="***",
+                facility=self.facility,
+            )
+            SyncQueue.objects.create(
+                user_id=learner.id,
+                keep_alive=10,
+            )
+        queue = SyncQueue.objects.create(user_id=self.learner.id, keep_alive=10)
+        time.sleep(1)
+        response = self.client.post(
+            reverse("kolibri:core:syncqueue-list"),
+            data={"user": self.learner.id},
+            format="json",
+        )
+        data = response.json()
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(data["action"], QUEUED)
+        self.assertTrue(
+            UserSyncStatus.objects.filter(user=self.learner, queued=True).exists()
+        )
+        queue_id = data["id"]
+        self.assertEqual(queue_id, queue.id)
+
     def test_update_soud(self):
         settings = DeviceSettings.objects.get()
         settings.subset_of_users_device = True