Add: add logger

apps/graduation/views.py

@@ -15,4 +15,4 @@ def get(self, request):
             'major': [gt.to_json() for gt in MajorTrack.objects.all().order_by('department__code', 'start_year', 'end_year')],
             'additional': [gt.to_json() for gt in AdditionalTrack.objects.all().order_by(Length('type'), 'department__code', 'start_year', 'end_year')],
         }
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})

apps/main/views.py

@@ -64,4 +64,4 @@ def get(self, request, user_id):
         feeds = [f for f in feeds if f is not None]
         feeds = sorted(feeds, key=(lambda f: f.priority))
         result = [f.to_json(user=request.user) for f in feeds]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})

apps/planner/views.py

@@ -38,7 +38,7 @@ def get(self, request, user_id):
         planners = apply_order(planners, order, DEFAULT_ORDER)
         planners = apply_offset_and_limit(planners, offset, limit, MAX_LIMIT)
         result = [p.to_json() for p in planners]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
     def post(self, request, user_id):
         BODY_STRUCTURE = [
@@ -107,7 +107,7 @@ def post(self, request, user_id):
                                                 type=target_item.type, type_en=target_item.type_en,
                                                 credit=target_item.credit, credit_au=target_item.credit_au)
 
-        return JsonResponse(planner.to_json())
+        return JsonResponse(planner.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -122,7 +122,7 @@ def get(self, request, user_id, planner_id):
         except Planner.DoesNotExist:
             return HttpResponseNotFound()
 
-        return JsonResponse(planner.to_json())
+        return JsonResponse(planner.to_json(),json_dumps_params={'ensure_ascii': False})
 
     def patch(self, request, user_id, planner_id):
         BODY_STRUCTURE = [
@@ -162,7 +162,7 @@ def patch(self, request, user_id, planner_id):
         planner.taken_items.exclude(lecture__year__gte=start_year, lecture__year__lte=end_year).delete()
         planner.future_items.exclude(year__gte=start_year, year__lte=end_year).delete()
         planner.arbitrary_items.exclude(year__gte=start_year, year__lte=end_year).delete()
-        return JsonResponse(planner.to_json(), safe=False)
+        return JsonResponse(planner.to_json(), safe=False,json_dumps_params={'ensure_ascii': False})
 
     def delete(self, request, user_id, planner_id):
         userprofile = request.user.userprofile
@@ -207,7 +207,7 @@ def post(self, request, user_id, planner_id):
             return HttpResponseBadRequest("Wrong field 'course' in request data")
         item = FuturePlannerItem.objects.create(planner=planner, year=year, semester=semester,
                                                 course=course)
-        return JsonResponse(item.to_json())
+        return JsonResponse(item.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -242,7 +242,7 @@ def post(self, request, user_id, planner_id):
         item = ArbitraryPlannerItem.objects.create(planner=planner, year=year, semester=semester,
                                                    department=department, type=type_, type_en=type_en,
                                                    credit=credit, credit_au=credit_au)
-        return JsonResponse(item.to_json())
+        return JsonResponse(item.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -286,7 +286,7 @@ def post(self, request, user_id, planner_id):
         if is_excluded is not None:
             target_item.is_excluded = is_excluded
         target_item.save()
-        return JsonResponse(target_item.to_json())
+        return JsonResponse(target_item.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -321,7 +321,7 @@ def post(self, request, user_id, planner_id):
             except ArbitraryPlannerItem.DoesNotExist:
                 HttpResponseBadRequest("No such planner item")
         target_item.delete()
-        return JsonResponse(planner.to_json())
+        return JsonResponse(planner.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -343,4 +343,4 @@ def post(self, request, user_id, planner_id):
         arrange_order, = parse_body(request.body, BODY_STRUCTURE)
 
         reorder_planner(planner, arrange_order)
-        return JsonResponse(planner.to_json())
+        return JsonResponse(planner.to_json(),json_dumps_params={'ensure_ascii': False})

apps/review/views.py

@@ -45,7 +45,7 @@ def get(self, request):
         reviews = apply_order(reviews, order, DEFAULT_ORDER)
         reviews = apply_offset_and_limit(reviews, offset, limit, MAX_LIMIT)
         result = [r.to_json(user=request.user) for r in reviews]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
     def post(self, request):
         BODY_STRUCTURE = [
@@ -75,14 +75,14 @@ def post(self, request):
             speech=speech,
             writer=user_profile,
         )
-        return JsonResponse(review.to_json(user=request.user), safe=False)
+        return JsonResponse(review.to_json(user=request.user), safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 class ReviewInstanceView(View):
     def get(self, request, review_id):
         review = get_object_or_404(Review, id=review_id)
         result = review.to_json(user=request.user)
-        return JsonResponse(result)
+        return JsonResponse(result,json_dumps_params={'ensure_ascii': False})
 
     def patch(self, request, review_id):
         BODY_STRUCTURE = [
@@ -114,7 +114,7 @@ def patch(self, request, review_id):
                 "speech": speech,
             },
         )
-        return JsonResponse(review.to_json(user=request.user), safe=False)
+        return JsonResponse(review.to_json(user=request.user), safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -161,4 +161,4 @@ def get(self, request, user_id):
         reviews = apply_order(reviews, order, DEFAULT_ORDER)
         reviews = apply_offset_and_limit(reviews, offset, limit, MAX_LIMIT)
         result = [r.to_json(user=request.user) for r in reviews]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})

apps/session/views.py

@@ -94,9 +94,10 @@ def login_callback(request):
     code = request.GET.get("code")
     sso_profile = sso_client.get_user_info(code)
     username = sso_profile["sid"]
+    email = sso_profile["email"]
 
     try:
-        user = User.objects.get(username=username)
+        user = User.objects.filter(email=email).order_by('-last_login').first()
     except User.DoesNotExist:
         user = None
 
@@ -176,7 +177,7 @@ def department_options(request):
         json_encode_list(deps_other),
     ]
 
-    return JsonResponse(result, safe=False)
+    return JsonResponse(result, safe=False, json_dumps_params={'ensure_ascii': False})
 
 
 @login_required_ajax
@@ -217,7 +218,7 @@ def unregister(request):
     user.delete()
     logout(request)
 
-    return JsonResponse(status=200, data={})
+    return JsonResponse(status=200, data={},json_dumps_params={'ensure_ascii': False})
 
 
 @login_required_ajax
@@ -237,4 +238,4 @@ def info(request):
         "my_timetable_lectures": json_encode_list(profile.taken_lectures.exclude(Lecture.get_query_for_research())),
         "reviews": json_encode_list(profile.reviews.all()),
     }
-    return JsonResponse(ctx, safe=False)
+    return JsonResponse(ctx, safe=False,json_dumps_params={'ensure_ascii': False})

apps/subject/views.py

@@ -25,7 +25,7 @@ def get(self, request):
 
         semesters = apply_order(semesters, order, DEFAULT_ORDER)
         result = [semester.to_json() for semester in semesters]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 class CourseListView(View):
@@ -67,15 +67,15 @@ def get(self, request):
         courses = apply_order(courses, order, DEFAULT_ORDER)
         courses = apply_offset_and_limit(courses, offset, limit, MAX_LIMIT)
         result = [c.to_json(user=request.user) for c in courses]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False, json_dumps_params={'ensure_ascii': False})
 
 
 class CourseInstanceView(View):
     def get(self, request, course_id):
         course = get_object_or_404(Course, id=course_id)
 
         result = course.to_json(user=request.user)
-        return JsonResponse(result)
+        return JsonResponse(result,json_dumps_params={'ensure_ascii': False})
 
 
 class CourseListAutocompleteView(View):
@@ -92,7 +92,7 @@ def get(self, request):
         match = services.match_autocomplete(keyword, courses, professors)
         if not match:
             return JsonResponse(keyword, safe=False)
-        return JsonResponse(match, safe=False)
+        return JsonResponse(match, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 class CourseInstanceReviewsView(View):
@@ -114,7 +114,7 @@ def get(self, request, course_id):
         reviews = apply_order(reviews, order, DEFAULT_ORDER)
         reviews = apply_offset_and_limit(reviews, offset, limit, MAX_LIMIT)
         result = [review.to_json(user=request.user) for review in reviews]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 class CourseInstanceLecturesView(View):
@@ -131,7 +131,7 @@ def get(self, request, course_id):
 
         lectures = apply_order(lectures, order, DEFAULT_ORDER)
         result = [lecture.to_json() for lecture in lectures]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -190,15 +190,15 @@ def get(self, request):
         lectures = apply_order(lectures, order, DEFAULT_ORDER)
         lectures = apply_offset_and_limit(lectures, offset, limit, MAX_LIMIT)
         result = [lecture.to_json(nested=False) for lecture in lectures]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 class LectureInstanceView(View):
     def get(self, request, lecture_id):
         lecture = get_object_or_404(Lecture, id=lecture_id)
 
         result = lecture.to_json()
-        return JsonResponse(result)
+        return JsonResponse(result,json_dumps_params={'ensure_ascii': False})
 
 
 class LectureListAutocompleteView(View):
@@ -219,7 +219,7 @@ def get(self, request):
         match = services.match_autocomplete(keyword, lectures, professors)
         if not match:
             return JsonResponse(keyword, safe=False)
-        return JsonResponse(match, safe=False)
+        return JsonResponse(match, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 class LectureInstanceReviewsView(View):
@@ -240,7 +240,7 @@ def get(self, request, lecture_id):
         reviews = apply_order(reviews, order, DEFAULT_ORDER)
         reviews = apply_offset_and_limit(reviews, offset, limit, MAX_LIMIT)
         result = [review.to_json() for review in reviews]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 class LectureInstanceRelatedReviewsView(View):
@@ -264,7 +264,7 @@ def get(self, request, lecture_id):
         reviews = apply_order(reviews, order, DEFAULT_ORDER)
         reviews = apply_offset_and_limit(reviews, offset, limit, MAX_LIMIT)
         result = [review.to_json() for review in reviews]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -284,4 +284,4 @@ def get(self, request, user_id):
 
         courses = apply_order(courses, order, DEFAULT_ORDER)
         result = [course.to_json(user=request.user) for course in courses]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})

apps/support/views.py

@@ -29,7 +29,7 @@ def get(self, request):
 
         notices = apply_order(notices, order, DEFAULT_ORDER)
         result = [n.to_json() for n in notices]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")

apps/timetable/views.py

@@ -49,7 +49,7 @@ def get(self, request, user_id):
         timetables = apply_order(timetables, order, DEFAULT_ORDER)
         timetables = apply_offset_and_limit(timetables, offset, limit, MAX_LIMIT)
         result = [t.to_json() for t in timetables]
-        return JsonResponse(result, safe=False)
+        return JsonResponse(result, safe=False,json_dumps_params={'ensure_ascii': False})
 
     def post(self, request, user_id):
         BODY_STRUCTURE = [
@@ -82,7 +82,7 @@ def post(self, request, user_id):
                 return HttpResponseBadRequest("Wrong field 'lectures' in request data")
             timetable.lectures.add(lecture)
 
-        return JsonResponse(timetable.to_json())
+        return JsonResponse(timetable.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -97,7 +97,7 @@ def get(self, request, user_id, timetable_id):
         except Timetable.DoesNotExist:
             return HttpResponseNotFound()
 
-        return JsonResponse(timetable.to_json())
+        return JsonResponse(timetable.to_json(),json_dumps_params={'ensure_ascii': False})
 
     def delete(self, request, user_id, timetable_id):
         userprofile = request.user.userprofile
@@ -147,7 +147,7 @@ def post(self, request, user_id, timetable_id):
                 return HttpResponseBadRequest('Wrong field \'lecture\' in request data')
 
             timetable.lectures.add(lecture)
-            return JsonResponse(timetable.to_json())
+            return JsonResponse(timetable.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -174,7 +174,7 @@ def post(self, request, user_id, timetable_id):
         lecture = Lecture.objects.get(id=lecture_id)
 
         timetable.lectures.remove(lecture)
-        return JsonResponse(timetable.to_json())
+        return JsonResponse(timetable.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -196,7 +196,7 @@ def post(self, request, user_id, timetable_id):
         arrange_order, = parse_body(request.body, BODY_STRUCTURE)
 
         reorder_timetable(timetable, arrange_order)
-        return JsonResponse(timetable.to_json())
+        return JsonResponse(timetable.to_json(),json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -209,7 +209,7 @@ def get(self, request, user_id):
         wishlist = Wishlist.objects.get_or_create(user=userprofile)[0]
 
         result = wishlist.to_json()
-        return JsonResponse(result)
+        return JsonResponse(result,json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -235,7 +235,7 @@ def post(self, request, user_id):
         wishlist.lectures.add(lecture)
 
         result = wishlist.to_json()
-        return JsonResponse(result)
+        return JsonResponse(result,json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")
@@ -261,7 +261,7 @@ def post(self, request, user_id):
         wishlist.lectures.remove(lecture)
 
         result = wishlist.to_json()
-        return JsonResponse(result)
+        return JsonResponse(result,json_dumps_params={'ensure_ascii': False})
 
 
 @method_decorator(login_required_ajax, name="dispatch")

docker-compose.yml

@@ -32,7 +32,7 @@ services:
     ports:
       - "58000:8000"
     volumes:
-      - .:/var/www/otlplus:ro
+      - .:/var/www/otlplus
     working_dir: /var/www/otlplus
   wait-for-db:
     image: atkrad/wait4x

docker/Dockerfile.back

@@ -17,9 +17,9 @@ ADD . .
 
 EXPOSE 8000
 
-ADD ./volumes/config /root/.ssh/config
-ADD ./volumes/key.pem /root/key.pem
-ADD ./volumes/wheel-2021.pem /root/wheel-2021.pem
-RUN chown -R root:root /root && chmod 400 /root/key.pem && chmod 400 /root/wheel-2021.pem && echo "StrictHostKeyChecking no" >> /etc/ssh_config
+#ADD ./volumes/config /root/.ssh/config
+#ADD ./volumes/key.pem /root/key.pem
+#ADD ./volumes/wheel-2021.pem /root/wheel-2021.pem
+#RUN chown -R root:root /root && chmod 400 /root/key.pem && chmod 400 /root/wheel-2021.pem && echo "StrictHostKeyChecking no" >> /etc/ssh_config
 
 CMD ["gunicorn", "otlplus.wsgi", "--bind", "0.0.0.0:8000", "--log-file", "-", "--workers", "6", "--threads", "12", "--worker-class", "gevent"]

logs/__init__.py

@@ -0,0 +1,3 @@
+import logging
+
+log = logging.getLogger("otlplus_logger")