Add order_by parameter to series/movies view

Author: DerouineauNicolas

backend/StreamServerApp/migrations/0023_auto_20210130_1254.py

@@ -0,0 +1,36 @@
+# Generated by Django 2.2.8 on 2021-01-30 12:54
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('StreamServerApp', '0022_auto_20201208_0859'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='movie',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='series',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='movie',
+            name='title',
+            field=models.CharField(max_length=300),
+        ),
+        migrations.AlterField(
+            model_name='series',
+            name='title',
+            field=models.CharField(max_length=300),
+        ),
+    ]

backend/StreamServerApp/models.py

@@ -17,23 +17,24 @@ def search_trigramm(self, model_field, query):
         return queryset
 
 
-class Movie(models.Model):
-    title = models.CharField(max_length=200)
+class CommonInfo(models.Model):
+    title = models.CharField(max_length=300)
+    created_at = models.DateTimeField(auto_now_add=True)
+    objects = SearchManager()
+
+    class Meta:
+        abstract = True
 
     def __str__(self):
         return self.title
 
-    objects = SearchManager()
-
 
-class Series(models.Model):
-    title = models.CharField(max_length=200)
-    thumbnail = models.CharField(max_length=300, default="")
+class Movie(CommonInfo):
+    pass
 
-    def __str__(self):
-        return self.title
 
-    objects = SearchManager()
+class Series(CommonInfo):
+    thumbnail = models.CharField(max_length=300, default="")
 
     @property
     def season_list(self):

backend/StreamServerApp/tests/tests_videos.py

@@ -208,7 +208,10 @@ def test_list_movies(self):
         newsub2 = Subtitle()
         newsub2.video_id = video2
         newsub2.save()
-        response = self.client.get(reverse('movies-list'))
+        data = {
+            'order_query': 'created_at'
+        }
+        response = self.client.get(reverse('movies-list'), data)
         decoded_content = json.loads(str(response.content, encoding='utf8'))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(decoded_content['results'][0]['title'], 'The best test title ever')

backend/StreamServerApp/views/videos.py

@@ -70,10 +70,11 @@ def get_queryset(self):
         query parameter in the URL.
         """
         search_query = self.request.query_params.get('search_query', None)
+        order_query = self.request.query_params.get('order_query', "-created_at")
         if search_query:
-            queryset = Series.objects.search_trigramm('title', search_query)
+            queryset = Series.objects.search_trigramm('title', search_query).order_by(order_query)
         else:
-            queryset = Series.objects.all()
+            queryset = Series.objects.all().order_by(order_query)
         return queryset
 
 
@@ -109,10 +110,11 @@ def get_queryset(self):
         """
 
         search_query = self.request.query_params.get('search_query', None)
+        order_query = self.request.query_params.get('order_query', "-created_at")
         if search_query:
-            queryset = Movie.objects.search_trigramm('title', search_query).prefetch_related('video_set')
+            queryset = Movie.objects.search_trigramm('title', search_query).prefetch_related('video_set').order_by(order_query)
         else:
-            queryset = Movie.objects.prefetch_related('video_set').all()
+            queryset = Movie.objects.prefetch_related('video_set').all().order_by(order_query)
         return queryset