[FIX] 출석 관련 api 기수 12->13으로 수정

Author: only4wxx

.DS_Store

@@ -180,7 +180,7 @@ def put(self, request):
                 # user.is_active = True
                 user.save()
 
-                if user.is_admin == False and user.generation == 12:
+                if user.is_admin == False and user.generation == 13: # 13기 아기사자
                     # mypage 모델 생성
                     new_cumulative_attendance = CumulativeAttendance.objects.create(
                         user = user,

accounts/views.py

@@ -50,7 +50,7 @@ def post(self, request):
         }
 
         # user별 출석부 create
-        users = User.objects.filter(generation=12, is_admin=False)
+        users = User.objects.filter(generation=13, is_admin=False) # 13기 아기사자의 출석부 생성
 
         for user in users:
             new_user_attendance = UserAttendance.objects.create(
@@ -85,12 +85,14 @@ def get(self, request):
         try:
             attendance = Attendance.objects.get(date=date_result)
 
+            # 운영진
             if user.is_admin == True:
                 return Response(data={
                     "message" : "운영진 입니다."
                 }, status=status.HTTP_405_METHOD_NOT_ALLOWED)
             else:
-                if user.generation == 12:
+                # 13기 아기사자
+                if user.generation == 13:
                     user_attendance = UserAttendance.objects.get(user=user, attendance=attendance)
                     user_attendance_json = {
                         "name" : user.name,
@@ -138,11 +140,11 @@ def post(self, request):
 
 
         # 6분부터 지각
-        if time.seconds < 68760:
+        if time.seconds < 68760: # 정상 출석
             user_attendance.attendance_result = 1
             user_attendance.save()
 
-        else:
+        else: # 지각
             user_attendance.attendance_result = 2
             user_attendance.save()
 

attendances/views.py

@@ -10,7 +10,8 @@
 from attendances.serializers import AttendanceSerializer, UserAttendanceSerializer
 
 # Create your views here.
-CURRENT_GENERATION = 12
+CURRENT_GENERATION = 13 # 현재 기수
+
 # '/attendance' : get - 누적 출석 조회, post - 출석 수정
 class MypageAttendanceView(APIView):
     def get(self, request):
@@ -53,7 +54,7 @@ def get(self, request):
         if user.generation == CURRENT_GENERATION:
             # 운영진 -> 아기사자 전체 누적 출석
             if user.is_admin == True:
-                members = User.objects.filter(generation=CURRENT_GENERATION, is_admin=False)
+                members = User.objects.filter(generation=CURRENT_GENERATION, is_admin=False) # 현재 기수 아기사자
             # generation 현재 - 2012 
                 total_attendances = []
 
@@ -119,7 +120,7 @@ def post(self, request):
             }, status=status.HTTP_400_BAD_REQUEST)
 
 
-        if user.is_admin == True:
+        if user.is_admin == True: # 운영진인 경우
             cumulative_attendance = CumulativeAttendance.objects.get(user=member)
             cumulative_attendance.tardiness = tardiness
             cumulative_attendance.absence = absence
@@ -137,7 +138,7 @@ def post(self, request):
                 "message" : "success",
                 "data" : cumulative_attendance_json
             }, status=status.HTTP_200_OK)
-        else:
+        else: # 운영진이 아닌 경우
             return Response(data={
                 "message" : "You don't have permission."
             }, status=status.HTTP_405_METHOD_NOT_ALLOWED)