Merge remote-tracking branch 'origin/main' into code-review

Author: TaeHyoungKwon

v2/src/config/settings/base.py

@@ -160,9 +160,7 @@
 
 REST_FRAMEWORK = {
     "EXCEPTION_HANDLER": "common.exceptions.custom_exception_handler",
-    "DEFAULT_AUTHENTICATION_CLASSES": [
-        "ctrlf_auth.authentication.CtrlfAuthentication",
-    ],
+    "DEFAULT_AUTHENTICATION_CLASSES": [],
 }
 
 JWT_AUTH = {

v2/src/ctrlfbe/admin.py

@@ -1,4 +1,9 @@
-from ctrlfbe.models import Note
+from ctrlfbe.models import ContentRequest, Issue, Note, Page, PageComment, Topic
 from django.contrib import admin
 
 admin.site.register(Note)
+admin.site.register(ContentRequest)
+admin.site.register(Topic)
+admin.site.register(Page)
+admin.site.register(PageComment)
+admin.site.register(Issue)

v2/src/ctrlfbe/mixins.py

@@ -0,0 +1,11 @@
+from ctrlf_auth.authentication import CtrlfAuthentication
+
+
+class CtrlfAuthenticationMixin:
+    def __init__(self):
+        self.auth = CtrlfAuthentication()
+
+    def _ctrlf_authentication(self, request):
+        self.authentication_classes = [CtrlfAuthentication]
+        user, _ = self.auth.authenticate(request)
+        return user

v2/src/ctrlfbe/swagger.py

@@ -1,4 +1,5 @@
 from ctrlfbe.serializers import (
+    NoteCreateRequestBodySerializer,
     NoteListQuerySerializer,
     NoteSerializer,
     PageSerializer,
@@ -33,6 +34,13 @@
     "tags": ["메인 화면"],
 }
 
+SWAGGER_NOTE_CREATE_VIEW = {
+    "operation_summary": "Note Create API",
+    "operation_description": "비활성화된 Note와 이슈를 생성 합니다.",
+    "request_body": NoteCreateRequestBodySerializer,
+    "tags": ["메인 화면"],
+}
+
 SWAGGER_TOPIC_DETAIL_VIEW = {
     "responses": {200: TopicSerializer()},
     "operation_summary": "Topic Detail API",

v2/src/ctrlfbe/views.py

@@ -1,7 +1,8 @@
-from typing import List, Optional
+from typing import Optional
 
-from ctrlf_auth.authentication import CtrlfAuthentication
+from ctrlfbe.mixins import CtrlfAuthenticationMixin
 from ctrlfbe.swagger import (
+    SWAGGER_NOTE_CREATE_VIEW,
     SWAGGER_NOTE_DETAIL_VIEW,
     SWAGGER_NOTE_LIST_VIEW,
     SWAGGER_PAGE_DETAIL_VIEW,
@@ -19,15 +20,13 @@
 from .models import CtrlfIssueStatus, Note, Page, Topic
 from .serializers import (
     IssueCreateSerializer,
-    NoteCreateRequestBodySerializer,
     NoteSerializer,
     PageSerializer,
     TopicSerializer,
 )
 
 
 class BaseContentView(APIView):
-    authentication_classes: List[str] = []
     child_model: Optional[Model] = None
     many = False
 
@@ -52,11 +51,7 @@ def get(self, request, *args, **kwargs):
         return Response(data=serializer.data, status=status.HTTP_200_OK)
 
 
-class NoteListCreateView(APIView):
-    authentication_classes = [
-        CtrlfAuthentication,
-    ]
-
+class NoteListCreateView(CtrlfAuthenticationMixin, APIView):
     @swagger_auto_schema(**SWAGGER_NOTE_LIST_VIEW)
     def get(self, request):
         current_cursor = int(request.query_params["cursor"])
@@ -68,16 +63,17 @@ def get(self, request):
             status=status.HTTP_200_OK,
         )
 
-    @swagger_auto_schema(request_body=NoteCreateRequestBodySerializer)
+    @swagger_auto_schema(**SWAGGER_NOTE_CREATE_VIEW)
     def post(self, request, *args, **kwargs):
+        ctrlf_user = self._ctrlf_authentication(request)
         note_data = {
             "title": request.data["title"],
-            "owners": [request.user.id],
+            "owners": [ctrlf_user.id],
         }
         issue_data = {
             "title": request.data["title"],
             "content": request.data["content"],
-            "owner": request.user.id,
+            "owner": ctrlf_user.id,
             "status": CtrlfIssueStatus.REQUESTED,
         }
         note_serializer = NoteSerializer(data=note_data)