From d950936f4b5e888a36bb1bd4f280038313461504 Mon Sep 17 00:00:00 2001
From: Heekyeong Park <qkrgmlrud00@gmail.com>
Date: Tue, 11 Jul 2023 15:11:21 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20date,=20user=5Fid=20=ED=95=84=ED=84=B0?=
 =?UTF-8?q?=EB=A7=81=20=EB=90=9C=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gdiary/views.py | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/gdiary/views.py b/gdiary/views.py
index 8af0aec..a0a99b9 100644
--- a/gdiary/views.py
+++ b/gdiary/views.py
@@ -197,37 +197,40 @@ class DiaryViewset(viewsets.ModelViewSet):
         type=openapi.FORMAT_DATE
     )
 
+    param_user = openapi.Parameter(
+        'user_id',
+        openapi.IN_QUERY,
+        description='user_id',
+        type=openapi.TYPE_INTEGER
+    )
+
     # get_queryset에 데코레이터 인식 못하기 때문에 list 상속 받아 구현
-    @swagger_auto_schema(manual_parameters=[param_date])
+    @swagger_auto_schema(manual_parameters=[param_date, param_user])
     def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
 
 
-    # api/v1/diaries/?date=2023-01-26
+    # 일기 리스트 조회 및 날짜 별 일기 조회
     def get_queryset(self):
         diaries = Diary.objects.filter(is_deleted = False)
-
-        date = self.request.query_params.get('date', '')
-        if date:
-            diaries = diaries.filter(diary_date=date)
+        
+        user_id = self.request.query_params.get('user_id', '')
+        date = self.request.query_params.get('diary_date', '')
+
+        # api/v1/diaries/?user_id=1&date=2023-01-26
+        if date and user_id:
+            diaries = diaries.filter(diary_date = date, user_id = user_id)
+        # api/v1/diaries/?user_id=1&
+        if user_id:
+            diaries = diaries.filter(user_id = user_id)
         return diaries
 
     def destroy(self, request, *args, **kwarg):
         diary = self.get_object()   # 삭제할 개체
         diary.is_deleted = True
         diary.save() 
-
-        response_data = {
-            "message": "SUCCESS",
-            "result": "change is_deleted = True"
-        }
         
-        return Response(response_data, status = status.HTTP_204_NO_CONTENT)
-
-
-# class ResultViewset(viewsets.ModelViewSet):
-#     queryset = Result.objects.all()
-#     serializer_class = ResultSerializer
+        return Response(status = status.HTTP_204_NO_CONTENT)
 
 class KeywordViewset(viewsets.ModelViewSet):
     queryset = Keyword.objects.all()