Resolve some TODOs

Author: ObserverOfTime

MangAdventure/templates/footer.html

@@ -19,7 +19,7 @@
           <i class="mi mi-discord"></i><span>Discord</span>
         </a>
       {% endif %}
-      {% if rss_url %}{# TODO: maybe clean this up? #}
+      {% if rss_url %}
         <a {% if arg %}href="{% url rss_url arg %}"
            {% elif token %}href="{% url rss_url %}?token={{ token }}"
            {% else %}href="{% url rss_url %}"{% endif %} class="link"

MangAdventure/tests/test_views.py

@@ -100,26 +100,26 @@ class TestOpenSearch(MangadvViewTestBase):
 
     def test_get(self):
         r = self.client.get(self.URL)
-        # TODO: test contents
         assert r.status_code == 200
         assert r['Content-Type'] == 'application/opesearchdescription+xml'
+        assert '<ShortName>MangAdventure' in str(r.content)
 
 
 class TestContribute(MangadvViewTestBase):
     URL = reverse('contribute')
 
     def test_get(self):
         r = self.client.get(self.URL)
-        # TODO: test contents
         assert r.status_code == 200
         assert r['Content-Type'] == 'application/json'
+        assert r.json()['name'] == 'MangAdventure'
 
 
 class TestManifest(MangadvViewTestBase):
     URL = reverse('manifest')
 
     def test_get(self):
         r = self.client.get(self.URL)
-        # TODO: test contents
         assert r.status_code == 200
         assert r['Content-Type'] == 'application/manifest+json'
+        assert r.json()['name'] == 'MangAdventure'

reader/admin.py

@@ -187,7 +187,7 @@ def has_delete_permission(self, request: HttpRequest, obj:
         return obj.series.manager_id == request.user.id
 
 
-# TODO: find a cleaner way to adapt the help_text
+# HACK: use a factory to adapt the help_text
 def alias_inline(model: str) -> Type[GenericStackedInline]:
     """
     Get an inline admin model for :class:`~reader.models.Alias`.

reader/api.py

@@ -154,13 +154,6 @@ class SeriesViewSet(CORSMixin, ModelViewSet):
     ordering = ('title',)
     lookup_field = 'slug'
 
-    def retrieve(self, request: Request, *args, **kwargs) -> Response:
-        instance = self.get_object()
-        if instance.licensed:
-            raise _LegalException()
-        serializer = self.get_serializer(instance)
-        return Response(serializer.data)
-
     def get_queryset(self) -> QuerySet:
         q = Q(chapters__published__lte=tz.now())
         return models.Series.objects.annotate(

reader/models.py

@@ -67,7 +67,8 @@ def names(self) -> List[str]:
 
         :return: The values of the ``alias`` field.
         """
-        return list(self.get_queryset().values_list('name', flat=True))
+        qs = self.get_queryset().order_by('name')
+        return list(qs.values_list('name', flat=True))
 
 
 class Alias(models.Model):

reader/serializers.py

@@ -260,8 +260,7 @@ def _get_aliases(self, obj: Series) -> List[str]:
     def _get_metadata(self, obj: Series) -> List[List[str]]:
         return [
             ['Author', self._get_author(obj)],
-            ['Artist', self._get_artist(obj)],
-            # TODO: Views & Last Updated
+            ['Artist', self._get_artist(obj)]
         ]
 
     def _get_chapters(self, obj: Series) -> Dict[str, Dict]:

reader/tests/test_admin.py

@@ -1,11 +1,7 @@
-from os import getenv
-
 from django.contrib.admin import AdminSite
 from django.contrib.auth.models import User
 from django.http import HttpRequest
 
-from pytest import mark
-
 from MangAdventure.tests.utils import get_test_image
 
 from reader.admin import (
@@ -57,7 +53,6 @@ def test_pages(self):
         page = self.chapter.pages.create(number=1, image=get_test_image())
         inline = self.admin.get_inline_instances(self.request, self.chapter)
         assert inline[0].preview(page).startswith('<img src="')
-        # TODO: validate formset
 
     def test_permissions(self):
         assert self.admin.has_change_permission(self.request)
@@ -130,10 +125,6 @@ def setup_method(self):
         self.artist.aliases.create(name='artist1')
         self.artist.aliases.create(name='artist2')
 
-    @mark.xfail(
-        getenv('DB_TYPE') == 'postgresql',
-        reason='PostgreSQL still hates us'
-    )  # TODO: appease PostgreSQL
     def test_aliases(self):
         assert self.author_admin.aliases(self.author) == 'author1, author2'
         assert self.artist_admin.aliases(self.artist) == 'artist1, artist2'