Fix popular_tags query (#23)

Author: thanhdev

backend/articles/models.py

@@ -1,15 +1,18 @@
 from django.db import models
+from django.db.models import Count
 from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from django.utils.text import slugify
 
 
 class TagManager(models.Manager):
     def popular_tags(self):
-        return (
+        return list(
             self.get_queryset()
-            .annotate(count=models.Count("articles"))
+            .values("name")
+            .annotate(count=Count("articles"))
             .order_by("-count")[:10]
+            .values_list("name", flat=True)
         )
 
 

backend/articles/views.py

@@ -66,10 +66,7 @@ def favorite(self, request, *args, **kwargs):
 class TagListView(APIView):
     @staticmethod
     def get(request):
-        popular_tags = Tag.objects.popular_tags()
-        return Response(
-            {"tags": list(popular_tags.values_list("name", flat=True))}
-        )
+        return Response({"tags": Tag.objects.popular_tags()})
 
 
 class CommentViewSet(

frontend/src/app/shared/error-message/error-message.component.html

@@ -7,13 +7,12 @@
 
   <ng-container *ngIf="errors">
     <ng-container *ngFor="let error of errors | keyvalue">
-      <ng-container *ngIf="error.key">
+      <ng-container *ngIf="error.key && error.key != 'non_field_errors'; else noKeyError">
         <li>{{error.key | titlecase}}: {{error.value}}</li>
       </ng-container>
-
-      <ng-container *ngIf="!error.key">
+      <ng-template #noKeyError>
         <li>{{error.value}}</li>
-      </ng-container>
+      </ng-template>
     </ng-container>
   </ng-container>