Merge pull request #188 from sparcs-kaist/develop

2021/03/17 v1.1.10 update
sparcs-kaist · Mar 16, 2021 · 43d3dcf · 43d3dcf
2 parents 8251e8d + 01ce8a5
commit 43d3dcf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/apps/core/views/viewsets/article.py b/apps/core/views/viewsets/article.py
@@ -37,6 +37,7 @@ class ArticleViewSet(viewsets.ModelViewSet, ActionAPIViewSet):
         'partial_update': ArticleUpdateActionSerializer,
         'vote_positive': serializers.Serializer,
         'vote_negative': serializers.Serializer,
+        'recent': ArticleListActionSerializer,
     }
     permission_classes = (
         ArticlePermission,
@@ -79,6 +80,9 @@ def filter_queryset(self, queryset):
 
                 queryset = queryset.filter(
                     article_read_log_set__read_by=self.request.user,
+                ).select_related(
+                    'created_by',
+                    'created_by__profile',
                 ).annotate(
                     my_last_read_at=models.Subquery(last_read_log_of_the_article.filter(
                         read_by=self.request.user,

diff --git a/apps/user/views/viewsets/user.py b/apps/user/views/viewsets/user.py
@@ -195,9 +195,7 @@ def sso_login_callback(self, request, *args, **kwargs):
                 )
 
         if not user_profile.user.is_active:
-            return response.Response(
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            return redirect(to=reverse('core:InvalidSsoLoginView') + f'?code=not-kaist-and-not-manual&status_code=400')
 
         user_profile.user.last_login = timezone.now()
         user_profile.user.save()