Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions api/controllers/problem/get_all_problems_by_account.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,30 @@ def get_all_problems_by_account(account:Account,request):

start = int(request.query_params.get("start",0))
end = int(request.query_params.get("end",-1))
query = request.query_params.get("query","")
if end == -1: end = None

personalProblems = Problem.objects.filter(creator=account).order_by('-updated_date')
personalProblems = Problem.objects.filter(creator=account, title__icontains=query).order_by('-updated_date')
maxPersonal = len(personalProblems)
if start < maxPersonal and start < maxPersonal:
personalProblems = personalProblems[start:end]
for problem in personalProblems:
problem.testcases = Testcase.objects.filter(problem=problem,deprecated=False)

manageableProblems = Problem.objects.filter(problemgrouppermission__permission_manage_problems=True,problemgrouppermission__group__in=GroupMember.objects.filter(account=account).values_list("group",flat=True)).order_by('-updated_date')
manageableProblems = Problem.objects.filter(
problemgrouppermission__permission_manage_problems=True,
problemgrouppermission__group__in=GroupMember.objects.filter(account=account).values_list("group",flat=True),
title__icontains=query
).order_by('-updated_date')
maxManageable = len(manageableProblems)
if start < maxManageable and start < maxManageable:
manageableProblems = manageableProblems[start:end]
for problem in manageableProblems:
problem.testcases = Testcase.objects.filter(problem=problem,deprecated=False)

# problem_ser = ProblemPopulateTestcaseSerializer(problems,many=True)
personalSerialize = ProblemPopulateTestcaseSerializer(personalProblems,many=True)
manageableSerialize = ProblemPopulateTestcaseSerializer(manageableProblems,many=True)
personalSerialize = ProblemPopulatePartialTestcaseSerializer(personalProblems,many=True)
manageableSerialize = ProblemPopulatePartialTestcaseSerializer(manageableProblems,many=True)

return Response({
"start":start,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,22 @@
from django.forms.models import model_to_dict
from ...serializers import *

def get_all_submissions_by_creator_problem(problem:Problem):
def get_all_submissions_by_creator_problem(problem:Problem, request):

start = int(request.query_params.get("start",0))
end = int(request.query_params.get("end",-1))
# query = request.query_params.get("query","")
if end == -1: end = None

submissions = Submission.objects.filter(problem=problem)
total = submissions.count()


if submissions.count() == 0:
return Response({"submissions": []},status=status.HTTP_204_NO_CONTENT)

submissions = submissions.order_by('-date')
submissions = submissions[start:end]

result = []

Expand All @@ -23,6 +32,15 @@ def get_all_submissions_by_creator_problem(problem:Problem):
submission.runtime_output = submission_testcases
result.append(submission)

problem.testcases = Testcase.objects.filter(problem=problem,deprecated=False)

submissions_serializer = SubmissionPopulateSubmissionTestcaseAndAccountSerializer(result,many=True)
problem_serializer = ProblemPopulateTestcaseSerializer(problem)

return Response({"submissions": submissions_serializer.data},status=status.HTTP_200_OK)
return Response({
"problem": problem_serializer.data,
"submissions": submissions_serializer.data,
"start": start,
"end": end,
"total": total,
},status=status.HTTP_200_OK)
12 changes: 12 additions & 0 deletions api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,18 @@ class Meta:
model = Testcase
fields = "__all__"

class TestcasePartialSerializer(serializers.ModelSerializer):
class Meta:
model = Testcase
fields = ['testcase_id','runtime_status']
class ProblemPopulatePartialTestcaseSerializer(serializers.ModelSerializer):
creator = AccountSecureSerializer()
testcases = TestcasePartialSerializer(many=True)
class Meta:
model = Problem
fields = "__all__"
# fields = ['problem_id','title','creator','testcases']
include = ['testcases']
class ProblemPopulateTestcaseSerializer(serializers.ModelSerializer):
creator = AccountSecureSerializer()
testcases = TestcaseSerializer(many=True)
Expand Down
2 changes: 1 addition & 1 deletion api/views/submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def account_problem_submission_view(request,problem_id,account_id):
@api_view([GET])
def creator_problem_submissions_view(request,account_id,problem_id):
problem = Problem.objects.get(problem_id=problem_id)
return get_all_submissions_by_creator_problem(problem)
return get_all_submissions_by_creator_problem(problem, request)

@api_view([GET])
def all_submission_view(request):
Expand Down