comment AllowAny & comment author_username / author_info

sharkle/article/serializers.py

@@ -1,5 +1,6 @@
 from rest_framework import serializers
 from article.models import Article
+from user.serializers import UserViewSerializer
 
 
 class ArticleCreateSerializer(serializers.ModelSerializer):
@@ -15,6 +16,7 @@ class Meta:
 class ArticleSerializer(serializers.ModelSerializer):
     author_id = serializers.SerializerMethodField()
     author_username = serializers.SerializerMethodField()
+    author_info = serializers.SerializerMethodField()
     comments_counts = serializers.SerializerMethodField()
 
     class Meta:
@@ -23,6 +25,7 @@ class Meta:
             "id",
             "author_id",
             "author_username",
+            "author_info",
             "is_private",
             "title",
             "content",
@@ -38,6 +41,9 @@ def get_author_id(self, obj):
     def get_author_username(self, obj):
         return obj.author.username
 
+    def get_author_info(self, obj):
+        return UserViewSerializer(obj.author).data
+
     def get_comments_counts(self, obj):
         print(type(obj.comments))
         return obj.comments.count()

sharkle/comment/serializers.py

@@ -1,8 +1,10 @@
 from rest_framework import serializers
 from comment.models import Comment
+from user.serializers import UserViewSerializer
 
 
 class CommentCreateSerializer(serializers.ModelSerializer):
+
     class Meta:
         model = Comment
         fields = "__all__"
@@ -13,6 +15,19 @@ class Meta:
 
 
 class CommentSerializer(serializers.ModelSerializer):
+    author_id = serializers.SerializerMethodField()
+    author_username = serializers.SerializerMethodField()
+    author_info = serializers.SerializerMethodField()
+
     class Meta:
         model = Comment
         fields = "__all__"
+
+    def get_author_id(self, obj):
+        return obj.author.id
+
+    def get_author_username(self, obj):
+        return obj.author.username
+
+    def get_author_info(self, obj):
+        return UserViewSerializer(obj.author).data

sharkle/comment/views.py

@@ -10,7 +10,8 @@
 class CommentViewSet(viewsets.GenericViewSet):
     queryset = Comment.objects.all()
     serializer_class = CommentSerializer
-    permission_classes = (permissions.IsAuthenticated,)  # TODO
+    #permission_classes = (permissions.IsAuthenticated,)
+    permission_classes = (permissions.AllowAny,) # TODO
 
     def dfs_comment(self, article_id):
         comments = self.get_queryset().filter(article=article_id)

sharkle/user_circle/views.py

@@ -82,8 +82,8 @@ def get_recruitment_alarm(cls, circle, user):
     def get_alarm_dict(cls, circle, user):
         data = dict()
         data["alarm"] = user_status(circle, user)["alarm"]
-        data["live_recruitment_alarm"] = cls.get_recruitment_alarm(circle, user)
         if data["alarm"]:
+            data["live_recruitment_alarm"] = cls.get_recruitment_alarm(circle, user)
             board_alarm = cls.get_board_alarm_list(circle, user)
             data["board_alarm"] = board_alarm
             data["board_alarm_count"] = len(board_alarm)