Merge pull request #43 from 2023-Summer-Bootcamp-Team-K/(#42)Feat/Mon…

…thData

[#42]Feat: Month API 구현

backend/data/urls.py

@@ -13,4 +13,5 @@
     path('recent/', views.get_most_recent_data),
     path('<int:month>-<int:day>/<int:pet_id>/', views.get_one_day_data),
     path('<int:start_month>-<int:start_day>/<int:end_month>-<int:end_day>/<int:pet_id>/', views.get_interval_data),
+    path('<int:month>/<int:pet_id>/', views.get_month_data),
 ]

backend/data/views.py

@@ -8,6 +8,7 @@
 from django.http import JsonResponse
 from django.db import connection
 from datetime import datetime, timedelta
+from django.db.models import Q
 
 from .models import Data
 from codeNumber.models import codeNumber
@@ -273,6 +274,24 @@ def get_interval_data(request, start_month, start_day, end_month, end_day, pet_i
         timestamp__date__range=[start_date, end_date]
     ).order_by('timestamp')
 
+    for data in queryset:
+        serializer = ChartSerializer(data)
+        data_list.append(serializer.data)
+
+    response_data = {'data_list': data_list}
+    return Response(response_data)
+
+
+@api_view(['GET'])
+def get_month_data(request, month, pet_id):
+    data_list = []
+    code_number = codeNumber.objects.get(pet_id=pet_id)
+    queryset = Data.objects.filter(
+        code=code_number.device_num,
+        timestamp__year=2023,
+        timestamp__month=month
+    ).order_by('timestamp')  # 해당 월의 데이터만 가져오고 날짜 기준으로 정렬
+
     for data in queryset:
         serializer = ChartSerializer(data)
         data_list.append(serializer.data)