From 6fed97f62ca7866c22d5682fde92ee720e9d1b85 Mon Sep 17 00:00:00 2001
From: Daan Sprenkels <hello@dsprenkels.com>
Date: Wed, 20 Mar 2019 10:56:44 +0100
Subject: [PATCH] Remove executed field from QueueCommand

---
 marietje/playerapi/views.py | 12 +++++-------
 marietje/queues/models.py   |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/marietje/playerapi/views.py b/marietje/playerapi/views.py
index 0db6ed9..8f6aa72 100644
--- a/marietje/playerapi/views.py
+++ b/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.filter(executed=False)
-    for command in commands:
-        command.executed = True
-        command.save()
-
-    return JsonResponse({
+    commands = current_queue.queuecommand_set
+    response = 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
diff --git a/marietje/queues/models.py b/marietje/queues/models.py
index a5d567b..ca07298 100644
--- a/marietje/queues/models.py
+++ b/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