Merge branch 'marietje-zuid' into dsprenkels/remove_executed

marietje/playerapi/views.py

@@ -15,18 +15,16 @@ from .decorators import token_required
 @token_required
 def queue(request):
     current_queue = get_object_or_404(Queue, id=request.POST.get('queue'))
-
+    commands = current_queue.queuecommand_set
-    commands = current_queue.queuecommand_set.filter(executed=False)
+    response = JsonResponse({
-    for command in commands:
-        command.executed = True
-        command.save()
-
-    return JsonResponse({
         'current_song': playlist_song_to_dict(current_queue.current_song(), include_hash=True, include_replaygain=True),
         'queue': [playlist_song_to_dict(playlist_song, include_hash=True, include_replaygain=True) for playlist_song in current_queue.queue()[:1]],
         'commands': [command.command for command in commands]
     })
+    for command in commands:
+        command.delete()
 
+    return response
 
 @csrf_exempt
 @token_required

marietje/queues/models.py

@@ -157,9 +157,9 @@ class QueueCommand(models.Model):
     queue = models.ForeignKey(
         Queue,
         on_delete=models.CASCADE,
+        db_index=True,
     )
     command = models.TextField()
-    executed = models.BooleanField(default=False)
 
     def __str__(self):
         return self.command