fixing some code conflicts with szkopul patches part2

Author: twalen

oioioi/contests/utils.py

@@ -401,6 +401,32 @@ def used_controllers():
 
 def visible_contests_query(request):
     """Returns materialized set of contests visible to the logged in user."""
+    if request.GET.get('living', 'safely') == 'dangerously':
+        visible_query = Contest.objects.none()
+        for controller_name in used_controllers():
+            controller_class = import_string(controller_name)
+            # HACK: we pass None contest just to call visible_contests_query.
+            # This is a workaround for mixins not taking classmethods very well.
+            controller = controller_class(None)
+            subquery = Contest.objects.filter(controller_name=controller_name).filter(
+                controller.registration_controller().visible_contests_query(request)
+            )
+            visible_query = visible_query.union(subquery, all=False)
+        return set(visible_query)
+    visible_query = Q_always_false()
+    for controller_name in used_controllers():
+        controller_class = import_string(controller_name)
+        # HACK: we pass None contest just to call visible_contests_query.
+        # This is a workaround for mixins not taking classmethods very well.
+        controller = controller_class(None)
+        visible_query |= Q(
+            controller_name=controller_name
+        ) & controller.registration_controller().visible_contests_query(request)
+    return Contest.objects.filter(visible_query).distinct()
+
+
+def visible_contests_as_django_queryset(request):
+    """Returns query set of contests visible to the logged in user."""
     if request.GET.get('living', 'safely') == 'dangerously':
         visible_query = Contest.objects.none()
         for controller_name in used_controllers():
@@ -424,23 +450,25 @@ def visible_contests_query(request):
         ) & controller.registration_controller().visible_contests_query(request)
     return Contest.objects.filter(visible_query).distinct()
 
+
 @request_cached
 def visible_contests(request):
-    contests = visible_contests_query(request)
+    contests = visible_contests_as_django_queryset(request)
     return set(contests)
 
+
 @request_cached_complex
 def visible_contests_queryset(request, filter_value=None):
-    contests = visible_contests_query(request)
+    contests = visible_contests_as_django_queryset(request)
     if filter_value is not None:
         contests = contests.filter(Q(name__icontains=filter_value) | Q(id__icontains=filter_value) | Q(school_year=filter_value))
     return set(contests)
 
 
 @request_cached_complex
-def visible_contests_as_django_queryset(request, filter_value=None):
+def visible_filtered_contests_as_django_queryset(request, filter_value=None):
     """TODO: remove code duplication visible_contests_queryset/visible_contests_query"""
-    contests = visible_contests_query(request)
+    contests = visible_contests_as_django_queryset(request)
     if filter_value is not None:
         contests = contests.filter(Q(name__icontains=filter_value) | Q(id__icontains=filter_value) | Q(school_year=filter_value))
     return contests

oioioi/contests/views.py

@@ -54,7 +54,7 @@
     is_contest_observer,
     visible_contests,
     visible_contests_queryset,
-    visible_contests_as_django_queryset,
+    visible_filtered_contests_as_django_queryset,
     visible_problem_instances,
     visible_rounds,
     get_files_message,
@@ -856,7 +856,7 @@ def filter_contests_view(request, filter_value=""):
     )
 
 def get_contest_hints(request, query):
-    contests = visible_contests_as_django_queryset(request, query)
+    contests = visible_filtered_contests_as_django_queryset(request, query)
     contests = contests.filter(Q(is_archived=False)).distinct()
     return [
         {