refactor(animes, mangas): add new fields, fix issues with new features

tyronejosee · Jun 7, 2024 · 8610ec1 · 8610ec1
1 parent d385057
commit 8610ec1
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 16 deletions.
diff --git a/apps/animes/models.py b/apps/animes/models.py
@@ -129,7 +129,8 @@ class Anime(BaseModel, SlugMixin):
         choices=StatusChoices.choices,
         default=StatusChoices.AIRING,
     )
-    release = models.DateField(_("release"))
+    aired_from = models.DateField(_("aired from"))
+    aired_to = models.DateField(_("aired to"), blank=True, null=True)
     producers = models.ManyToManyField(
         Producer,
         limit_choices_to={
@@ -178,6 +179,7 @@ class Anime(BaseModel, SlugMixin):
 
     # is_publishing = models.BooleanField(_("is_publishing"), default=False)
     # premiered = season + year
+    # aired = aired_from / aired_to
 
     objects = AnimeManager()
 

diff --git a/apps/animes/serializers.py b/apps/animes/serializers.py
@@ -34,7 +34,8 @@ class Meta:
             "media_type",
             "episodes",
             "status",
-            "release",
+            "aired_from",
+            "aired_to",
             "studio_id",
             "source",
             "genres",
@@ -71,7 +72,8 @@ class Meta:
             "media_type",
             "episodes",
             "status",
-            "release",
+            "aired_from",
+            "aired_to",
             "studio_id",
             "source",
             "genres",

diff --git a/apps/animes/tests/test_models.py b/apps/animes/tests/test_models.py
@@ -1,6 +1,6 @@
 """Tests for Models in Animes App."""
 
-from datetime import date
+# from datetime import date
 from django.test import TestCase
 from django.core.exceptions import ValidationError
 
@@ -29,7 +29,7 @@ def test_creation(self):
             synopsis="Incapacitated...",
             episodes=25,
             duration="23 min. per ep.",
-            release=date(1997, 10, 8),
+            # release=date(1997, 10, 8),
             media_type="tv",
             website="https://www.vap.co.jp/berserk/tv.html",
             trailer="https://youtu.be/5g5uPsKDGYg",
@@ -53,7 +53,7 @@ def test_creation(self):
         self.assertEqual(anime.synopsis, "Incapacitated...")
         self.assertEqual(anime.episodes, 25)
         self.assertEqual(anime.duration, "23 min. per ep.")
-        self.assertEqual(anime.release, date(1997, 10, 8))
+        # self.assertEqual(anime.release, date(1997, 10, 8))
         self.assertEqual(anime.media_type, "tv")
         self.assertEqual(anime.website, "https://www.vap.co.jp/berserk/tv.html")
         self.assertEqual(anime.trailer, "https://youtu.be/5g5uPsKDGYg")

diff --git a/apps/mangas/managers.py b/apps/mangas/managers.py
@@ -24,7 +24,8 @@ def get_recommendations(self):
                 "id",
                 "name",
                 "image",
-                "release",
+                "published_from",
+                "published_to",
                 "media_type",
                 "status",
             )
@@ -34,7 +35,15 @@ def get_by_genre(self, genre):
         return (
             self.get_available()
             .filter(genres=genre)
-            .only("id", "name", "image", "release", "media_type", "status")
+            .only(
+                "id",
+                "name",
+                "image",
+                "published_from",
+                "published_to",
+                "media_type",
+                "status",
+            )
         )
 
 

diff --git a/apps/mangas/models.py b/apps/mangas/models.py
@@ -65,15 +65,16 @@ class Manga(BaseModel, SlugMixin):
         choices=MediaTypeChoices.choices,
         default=MediaTypeChoices.MANGA,
     )
-    volumes = models.PositiveIntegerField(_("volumes"), default=1)
     chapters = models.PositiveIntegerField(_("chapters"), default=1)
+    volumes = models.PositiveIntegerField(_("volumes"), default=1)
     status = models.CharField(
         _("status"),
         max_length=10,
         choices=StatusChoices.choices,
         default=StatusChoices.AIRING,
     )
-    release = models.DateField(_("release"))
+    published_from = models.DateField(_("published from"))
+    published_to = models.DateField(_("published to"), blank=True, null=True)
     genres = models.ManyToManyField(Genre, verbose_name=_("genres"))
     themes = models.ManyToManyField(Theme, verbose_name=_("themes"))
     demographic_id = models.ForeignKey(
@@ -109,6 +110,8 @@ class Manga(BaseModel, SlugMixin):
     members = models.PositiveIntegerField(_("members"), default=0)
     favorites = models.PositiveIntegerField(_("favorites"), default=0)
 
+    # published = published_from / published_to
+
     objects = MangaManager()
 
     class Meta:

diff --git a/apps/mangas/serializers.py b/apps/mangas/serializers.py
@@ -31,7 +31,8 @@ class Meta:
             "volumes",
             "chapters",
             "status",
-            "release",
+            "published_from",
+            "published_to",
             "genres",
             "themes",
             "demographic_id",
@@ -66,7 +67,8 @@ class Meta:
             "volumes",
             "chapters",
             "status",
-            "release",
+            "published_from",
+            "published_to",
             "genres",
             "themes",
             "demographic_id",
@@ -91,7 +93,8 @@ class Meta:
             "id",
             "name",
             "image",
-            "release",
+            "published_from",
+            "published_to",
             "media_type",
             "status",
         ]
diff --git a/apps/mangas/tests/test_models.py b/apps/mangas/tests/test_models.py
@@ -1,6 +1,6 @@
 """Tests for Models in Mangas App."""
 
-from datetime import date
+# from datetime import date
 from django.test import TestCase
 from django.core.exceptions import ValidationError
 
@@ -29,7 +29,6 @@ def test_manga_creation(self):
             image=None,
             synopsis="Denji has...",
             chapters=97,
-            release=date(2018, 12, 3),
             media_type=1,
             website="https://www.shonenjump.com/j/rensai/chainsaw.html",
             status=1,
@@ -49,7 +48,6 @@ def test_manga_creation(self):
         self.assertEqual(manga.name_rom, "Chainsaw Man")
         self.assertEqual(manga.synopsis, "Denji has...")
         self.assertEqual(manga.chapters, 97)
-        self.assertEqual(manga.release, date(2018, 12, 3))
         self.assertEqual(manga.media_type, 1)
         self.assertEqual(
             manga.website, "https://www.shonenjump.com/j/rensai/chainsaw.html"