#579 Formatter applying (#580)

* eslint /frontend/src 내부만 적용

* eslint 설정 수정(플러그인, rule-set변경 etc)

* prettier 규칙 추가

* eslint 호환 버전 수정

* vetur 설정파일 삭제

* eslint-loader 삭제 및 formatter적용

* apply prettier to entire frontend files

* apply yapf to /backend dir

Author: banchan01

.style.yapf

@@ -1,3 +1,6 @@
 [style]
-based_on_style = google
+based_on_style = yapf
 column_limit = 120
+spaces_before_comment = 4
+split_before_logical_operator = true
+indent_width = 4

backend/account/migrations/0001_initial.py

@@ -48,10 +48,9 @@ class Migration(migrations.Migration):
             name='UserScore',
             fields=[
                 ('user',
-                 models.OneToOneField(on_delete=django.db.models.deletion.CASCADE,
-                                      primary_key=True,
-                                      serialize=False,
-                                      to='account.user')),
+                 models.OneToOneField(
+                     on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False,
+                     to='account.user')),
                 ('yesterday_score', models.IntegerField(default=0)),
                 ('total_score', models.IntegerField(default=0)),
                 ('fluctuation', models.IntegerField(default=0)),
@@ -77,10 +76,9 @@ class Migration(migrations.Migration):
             name='UserSolved',
             fields=[
                 ('user',
-                 models.OneToOneField(on_delete=django.db.models.deletion.CASCADE,
-                                      primary_key=True,
-                                      serialize=False,
-                                      to='account.user')),
+                 models.OneToOneField(
+                     on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False,
+                     to='account.user')),
                 ('math_solved', models.BigIntegerField(default=0)),
                 ('implementation_solved', models.BigIntegerField(default=0)),
                 ('datastructure_solved', models.BigIntegerField(default=0)),
@@ -105,13 +103,13 @@ class Migration(migrations.Migration):
                 ('oi_problems_status', models.JSONField(default=dict)),
                 ('real_name', models.TextField(null=True)),
                 ('student_id',
-                 models.CharField(max_length=9,
-                                  null=True,
-                                  validators=[
-                                      django.core.validators.RegexValidator(code='invalid_student_id',
-                                                                            message='학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.',
-                                                                            regex='^\\d{6,9}$')
-                                  ])),
+                 models.CharField(
+                     max_length=9,
+                     null=True,
+                     validators=[
+                         django.core.validators.RegexValidator(
+                             code='invalid_student_id', message='학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.', regex='^\\d{6,9}$')
+                     ])),
                 ('avatar', models.TextField(default='/public/avatar/default.png')),
                 ('blog', models.URLField(null=True)),
                 ('mood', models.TextField(null=True)),

backend/account/models.py

@@ -73,11 +73,11 @@ class Meta:
 
 def get_default_field_score():
     return {
-        "0": 0,  # "Math"
-        "1": 0,  # "Implementation"
-        "2": 0,  # "Datastructure"
-        "3": 0,  # "Search"
-        "4": 0,  # "Sorting"
+        "0": 0,    # "Math"
+        "1": 0,    # "Implementation"
+        "2": 0,    # "Datastructure"
+        "3": 0,    # "Search"
+        "4": 0,    # "Sorting"
     }
 
 
@@ -121,13 +121,12 @@ class UserProfile(models.Model):
     oi_problems_status = JSONField(default=dict)
 
     real_name = models.TextField(null=True)
-    student_id = models.CharField(max_length=9,
-                                  null=True,
-                                  validators=[
-                                      RegexValidator(regex=r'^\d{6,9}$',
-                                                     message='학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.',
-                                                     code='invalid_student_id'),
-                                  ])
+    student_id = models.CharField(
+        max_length=9,
+        null=True,
+        validators=[
+            RegexValidator(regex=r'^\d{6,9}$', message='학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.', code='invalid_student_id'),
+        ])
     avatar = models.TextField(default=f"{settings.AVATAR_URI_PREFIX}/default.png")
     blog = models.URLField(null=True)
     mood = models.TextField(null=True)

backend/account/serializers.py

@@ -23,22 +23,22 @@ class UserRegisterSerializer(serializers.Serializer):
     username = serializers.CharField(min_length=3, max_length=8)
     real_name = serializers.CharField(max_length=13)
     email = serializers.EmailField(max_length=64)
-    password = serializers.RegexField(regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
-                                      min_length=8,
-                                      error_messages={'invalid': '비밀번호는 8글자 이상이어야 하며, 영문, 숫자, 특수문자를 모두 포함해야 합니다.'})
-    student_id = serializers.RegexField(regex=r'^\d{6,9}$',
-                                        min_length=6,
-                                        max_length=9,
-                                        error_messages={'invalid': '학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.'})
+    password = serializers.RegexField(
+        regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
+        min_length=8,
+        error_messages={'invalid': '비밀번호는 8글자 이상이어야 하며, 영문, 숫자, 특수문자를 모두 포함해야 합니다.'})
+    student_id = serializers.RegexField(
+        regex=r'^\d{6,9}$', min_length=6, max_length=9, error_messages={'invalid': '학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.'})
     collegeId = serializers.IntegerField()
     departmentId = serializers.IntegerField()
 
 
 class UserChangePasswordSerializer(serializers.Serializer):
     old_password = serializers.CharField()
-    new_password = serializers.RegexField(regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
-                                          min_length=8,
-                                          error_messages={'invalid': '비밀번호는 8글자 이상이어야 하며, 영문, 숫자, 특수문자를 모두 포함해야 합니다.'})
+    new_password = serializers.RegexField(
+        regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
+        min_length=8,
+        error_messages={'invalid': '비밀번호는 8글자 이상이어야 하며, 영문, 숫자, 특수문자를 모두 포함해야 합니다.'})
 
 
 class GenerateUserSerializer(serializers.Serializer):
@@ -130,25 +130,25 @@ class EditUserSerializer(serializers.Serializer):
     id = serializers.IntegerField()
     username = serializers.CharField(min_length=3, max_length=8)
     real_name = serializers.CharField(max_length=13)
-    password = serializers.RegexField(allow_null=True,
-                                      allow_blank=True,
-                                      regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
-                                      min_length=8,
-                                      error_messages={'invalid': '비밀번호는 8글자 이상이어야 하며, 영문, 숫자, 특수문자를 모두 포함해야 합니다.'})
+    password = serializers.RegexField(
+        allow_null=True,
+        allow_blank=True,
+        regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
+        min_length=8,
+        error_messages={'invalid': '비밀번호는 8글자 이상이어야 하며, 영문, 숫자, 특수문자를 모두 포함해야 합니다.'})
     # email = serializers.EmailField(max_length=64)
     admin_type = serializers.ChoiceField(choices=(AdminType.REGULAR_USER, AdminType.ADMIN, AdminType.SUPER_ADMIN))
-    problem_permission = serializers.ChoiceField(choices=(ProblemPermission.NONE, ProblemPermission.OWN,
-                                                          ProblemPermission.ALL))
+    problem_permission = serializers.ChoiceField(
+        choices=(ProblemPermission.NONE, ProblemPermission.OWN, ProblemPermission.ALL))
     college = serializers.IntegerField(allow_null=True)
     department = serializers.IntegerField(allow_null=True)
-    student_id = serializers.CharField(max_length=9,
-                                       allow_null=True,
-                                       allow_blank=True,
-                                       validators=[
-                                           RegexValidator(regex=r'^\d{6,9}$',
-                                                          message='학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.',
-                                                          code='invalid_student_id'),
-                                       ])
+    student_id = serializers.CharField(
+        max_length=9,
+        allow_null=True,
+        allow_blank=True,
+        validators=[
+            RegexValidator(regex=r'^\d{6,9}$', message='학번은 6자리 이상 9자리 이하의 숫자만 입력 가능합니다.', code='invalid_student_id'),
+        ])
     open_api = serializers.BooleanField()
     two_factor_auth = serializers.BooleanField()
     is_disabled = serializers.BooleanField()
@@ -161,8 +161,8 @@ class ApplyResetPasswordSerializer(serializers.Serializer):
 
 class ResetPasswordSerializer(serializers.Serializer):
     token = serializers.CharField()
-    password = serializers.RegexField(regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
-                                      min_length=8)
+    password = serializers.RegexField(
+        regex=r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$', min_length=8)
     captcha = serializers.CharField()
 
 

backend/account/tasks.py

@@ -15,12 +15,13 @@ def send_email_async(from_name, to_email, to_name, subject, content):
     if not SysOptions.smtp_config:
         return
     try:
-        send_email(smtp_config=SysOptions.smtp_config,
-                   from_name=from_name,
-                   to_email=to_email,
-                   to_name=to_name,
-                   subject=subject,
-                   content=content)
+        send_email(
+            smtp_config=SysOptions.smtp_config,
+            from_name=from_name,
+            to_email=to_email,
+            to_name=to_name,
+            subject=subject,
+            content=content)
     except Exception as e:
         logger.exception(e)
 

backend/account/tests.py

@@ -448,7 +448,7 @@ def test_successful_calculate_user_score_fluctuation(self):
 
         user_score.refresh_from_db()
 
-        self.assertEqual(user_score.fluctuation, 200)  # 300 - 100 = 200
+        self.assertEqual(user_score.fluctuation, 200)    # 300 - 100 = 200
 
     def test_database_error_calculate_user_score_fluctuation(self):
         user_score = self.user.userscore
@@ -460,7 +460,7 @@ def test_database_error_calculate_user_score_fluctuation(self):
         with mock.patch('account.models.UserScore.objects.update', side_effect=DatabaseError("Test Database Error")):
             with self.assertRaises(DatabaseError):
                 calculate_user_score_fluctuation()
-        self.assertEqual(user_score.fluctuation, 0)  # Fluctuation should not change if error occurs
+        self.assertEqual(user_score.fluctuation, 0)    # Fluctuation should not change if error occurs
 
 
 # class UserChangePasswordAPITest(APITestCase):

backend/account/views/admin.py

@@ -40,8 +40,9 @@ def get(self, request):
         }
 
         # 학과별 사용자 수 통계
-        department_stats = (User.objects.values('userprofile__major').annotate(value=Count('id')).values(
-            'value', name=F('userprofile__major')).order_by('-value'))
+        department_stats = (
+            User.objects.values('userprofile__major').annotate(value=Count('id')).values(
+                'value', name=F('userprofile__major')).order_by('-value'))
 
         # None 값 처리 (학과가 지정되지 않은 사용자)
         department_stats = list(department_stats)
@@ -56,8 +57,9 @@ def get(self, request):
         start_date = datetime(current_year, 1, 1)
         end_date = datetime(current_year, 12, 31)
 
-        monthly_stats = (User.objects.filter(create_time__range=(start_date, end_date)).annotate(
-            month=TruncMonth('create_time')).values('month').annotate(count=Count('id')).order_by('month'))
+        monthly_stats = (
+            User.objects.filter(create_time__range=(start_date, end_date)).annotate(
+                month=TruncMonth('create_time')).values('month').annotate(count=Count('id')).order_by('month'))
 
         months = ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']
         counts = [0] * 12
@@ -70,11 +72,13 @@ def get(self, request):
 
         # 주간 가입자 수 통계
         today = datetime.now().date()
-        start_of_week = today - timedelta(days=today.weekday())  # 이번 주 월요일
-        end_of_week = start_of_week + timedelta(days=6)  # 이번 주 일요일
+        start_of_week = today - timedelta(days=today.weekday())    # 이번 주 월요일
+        end_of_week = start_of_week + timedelta(days=6)    # 이번 주 일요일
 
-        weekly_stats = (User.objects.filter(create_time__date__range=(start_of_week, end_of_week)).annotate(
-            weekday=ExtractWeekDay('create_time')).values('weekday').annotate(count=Count('id')).order_by('weekday'))
+        weekly_stats = (
+            User.objects.filter(create_time__date__range=(start_of_week, end_of_week)).annotate(
+                weekday=ExtractWeekDay('create_time')).values('weekday').annotate(
+                    count=Count('id')).order_by('weekday'))
 
         weekdays = ['월', '화', '수', '목', '금', '토', '일']
         counts = [0] * 7
@@ -178,10 +182,8 @@ def put(self, request):
         if data["college"] and data["department"]:
             college = College.objects.get(id=data["college"])
             department = Department.objects.get(id=data["department"])
-            UserProfile.objects.filter(user=user).update(college=college,
-                                                         department=department,
-                                                         school=college.college_name,
-                                                         major=department.department_name)
+            UserProfile.objects.filter(user=user).update(
+                college=college, department=department, school=college.college_name, major=department.department_name)
 
         if data["student_id"]:
             UserProfile.objects.filter(user=user).update(student_id=data["student_id"])
@@ -231,15 +233,16 @@ def get(self, request):
             user = user.filter(admin_type=AdminType.REGULAR_USER)
         if admin_type == "Admin":
             user = user.exclude(admin_type=AdminType.REGULAR_USER).order_by(
-                Case(When(admin_type=AdminType.SUPER_ADMIN, then=Value(0)),
-                     default=Value(1),
-                     output_field=IntegerField()), 'id')
+                Case(
+                    When(admin_type=AdminType.SUPER_ADMIN, then=Value(0)),
+                    default=Value(1),
+                    output_field=IntegerField()), 'id')
 
         keyword = request.GET.get("keyword", None)
         if keyword:
             user = user.filter(
-                Q(username__icontains=keyword) | Q(userprofile__real_name__icontains=keyword) |
-                Q(email__icontains=keyword))
+                Q(username__icontains=keyword) | Q(userprofile__real_name__icontains=keyword)
+                | Q(email__icontains=keyword))
 
         college = request.GET.get("college", None)
         if college:

backend/account/views/oj.py

@@ -246,13 +246,14 @@ def post(self, request):
             user = User.objects.create(username=data["username"], email=data["email"])
             user.set_password(data["password"])
             user.save()
-            user_profile = UserProfile.objects.create(user=user,
-                                                      school=college.college_name,
-                                                      major=department.department_name,
-                                                      college=college,
-                                                      department=department,
-                                                      real_name=data["real_name"],
-                                                      student_id=data["student_id"])
+            user_profile = UserProfile.objects.create(
+                user=user,
+                school=college.college_name,
+                major=department.department_name,
+                college=college,
+                department=department,
+                real_name=data["real_name"],
+                student_id=data["student_id"])
             user_profile.save()
             user_score = UserScore.objects.create(user=user)
             user_score.save()

backend/announcement/models.py

@@ -16,4 +16,7 @@ class Announcement(models.Model):
 
     class Meta:
         db_table = "announcement"
-        ordering = ("-is_pinned", "-create_time",)
+        ordering = (
+            "-is_pinned",
+            "-create_time",
+        )