add start date to movies

Author: FuzzyGrim

src/app/forms.py

@@ -145,6 +145,7 @@ def __init__(self: "MovieForm", *args: dict, **kwargs: dict) -> None:
             "media_type",
             "score",
             "status",
+            "start_date",
             "end_date",
             "notes",
         )
@@ -153,7 +154,7 @@ class Meta(MediaForm.Meta):
         """Bind form to model."""
 
         model = Movie
-        exclude = ("progress", "start_date")
+        exclude = ("progress",)
 
 
 class TVForm(MediaForm):

src/app/migrations/0004_movie_start_date.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2024-02-02 14:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("app", "0003_alter_anime_status_alter_manga_status_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="movie",
+            name="start_date",
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

src/app/models.py

@@ -132,8 +132,6 @@ class Anime(Media):
 class Movie(Media):
     """Model for movies."""
 
-    start_date = None
-
     @property
     def progress(self: "Movie") -> int:
         """Return 1 if the movie is completed."""

src/app/tests/test_media.py

@@ -101,6 +101,7 @@ def test_edit_movie_score(self):
             status="Completed",
             user=self.user,
             notes="Nice",
+            start_date=date(2023, 6, 1),
             end_date=date(2023, 6, 1),
         )
 
@@ -250,6 +251,7 @@ def test_delete_movie(self):
             status="Completed",
             user=self.user,
             notes="Nice",
+            start_date=date(2023, 6, 1),
             end_date=date(2023, 6, 1),
         )
 

src/app/utils/helpers.py

@@ -83,9 +83,9 @@ def media_type_mapper(media_type: str) -> dict:
             "form": MangaForm,
             "list_layout": "app/media_table.html",
             "sort_choices": [
-                ("-score", "Score"),
+                ("score", "Score"),
                 ("title", "Title"),
-                ("-progress", "Progress"),
+                ("progress", "Progress"),
                 ("start_date", "Start Date"),
                 ("end_date", "End Date"),
             ],
@@ -95,9 +95,9 @@ def media_type_mapper(media_type: str) -> dict:
             "form": AnimeForm,
             "list_layout": "app/media_table.html",
             "sort_choices": [
-                ("-score", "Score"),
+                ("score", "Score"),
                 ("title", "Title"),
-                ("-progress", "Progress"),
+                ("progress", "Progress"),
                 ("start_date", "Start Date"),
                 ("end_date", "End Date"),
             ],
@@ -107,8 +107,9 @@ def media_type_mapper(media_type: str) -> dict:
             "form": MovieForm,
             "list_layout": "app/media_grid.html",
             "sort_choices": [
-                ("-score", "Score"),
+                ("score", "Score"),
                 ("title", "Title"),
+                ("start_date", "Start Date"),
                 ("end_date", "End Date"),
             ],
         },
@@ -117,7 +118,7 @@ def media_type_mapper(media_type: str) -> dict:
             "form": TVForm,
             "list_layout": "app/media_grid.html",
             "sort_choices": [
-                ("-score", "Score"),
+                ("score", "Score"),
                 ("title", "Title"),
             ],
         },
@@ -126,9 +127,9 @@ def media_type_mapper(media_type: str) -> dict:
             "form": SeasonForm,
             "list_layout": "app/media_grid.html",
             "sort_choices": [
-                ("-score", "Score"),
+                ("score", "Score"),
                 ("title", "Title"),
-                ("-progress", "Progress"),
+                ("progress", "Progress"),
                 ("start_date", "Start Date"),
                 ("end_date", "End Date"),
             ],

src/app/views.py

@@ -1,8 +1,8 @@
 import datetime
 import logging
-from itertools import chain
 
 from django.conf import settings
+from django.db.models import F
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, render
 
@@ -19,7 +19,8 @@ def home(request: HttpRequest) -> HttpResponse:
     in_progress = {}
 
     seasons = Season.objects.filter(
-        user_id=request.user, status="In progress",
+        user_id=request.user,
+        status="In progress",
     ).prefetch_related("episodes")
 
     if seasons.exists():
@@ -138,7 +139,7 @@ def media_list(request: HttpRequest, media_type: str) -> HttpResponse:
         filter_params["status"] = status_filter.capitalize()
 
     # default sort by descending score
-    sort_filter = request.GET.get("sort", "-score")
+    sort_filter = request.GET.get("sort", "score")
 
     media_mapping = helpers.media_type_mapper(media_type)
     filter_form = FilterForm(
@@ -150,11 +151,21 @@ def media_list(request: HttpRequest, media_type: str) -> HttpResponse:
 
     # if form valid or no form submitted
     if filter_form.is_valid() or not request.GET:
-        media_list = (
-            media_mapping["model"]
-            .objects.filter(**filter_params)
-            .order_by(sort_filter)
-        )
+
+        # asc order
+        if sort_filter == "title":
+            media_list = (
+                media_mapping["model"]
+                .objects.filter(**filter_params)
+                .order_by(F(sort_filter).asc(nulls_last=True))
+            )
+        # desc order
+        else:
+            media_list = (
+                media_mapping["model"]
+                .objects.filter(**filter_params)
+                .order_by(F(sort_filter).desc(nulls_last=True))
+            )
 
         return render(
             request,

src/integrations/tests/test_exports.py

@@ -34,6 +34,7 @@ def setUp(self: "ExportCSVTest") -> None:
             status="Completed",
             user=self.user,
             notes="Nice",
+            start_date=date(2023, 6, 1),
             end_date=date(2023, 6, 1),
         )