Allow specific problems to be selected

Author: truell20

backend/main.py

@@ -187,17 +187,24 @@ def get(self, problemID):
 
 class EntryListAPI(Resource):
 	def __init__(self):
-		self.parser = reqparse.RequestParser()
-		self.parser.add_argument("problemID", type=str, required=True, location="json")
-		self.parser.add_argument("userID", type=str, required=True, location="json")
-		self.parser.add_argument("file", type=FileStorage, required=True, location="files")
 		super(EntryListAPI, self).__init__()
 
 	def get(self):
-		return jsonify([a for a in db.entry.find({})])
+		parser = reqparse.RequestParser()
+		parser.add_argument("problemID", type=str, required=False, location="args")
+
+		args = parser.parse_args()
+		if args["problemID"] is not None:
+			return jsonify([a for a in db.entry.find({"problemID": args["problemID"]})])
+		else:
+			return jsonify([a for a in db.entry.find({})])
 
 	def post(self):
-		entry = self.parser.parse_args()
+		parser = reqparse.RequestParser()
+		parser.add_argument("problemID", type=str, required=True, location="json")
+		parser.add_argument("userID", type=str, required=True, location="json")
+		parser.add_argument("file", type=FileStorage, required=True, location="files")
+		entry = parser.parse_args()
 
 		try:
 			if db.problem.find_one({"_id": ObjectId(entry['problemID'])}) == None:
@@ -223,7 +230,6 @@ def post(self):
 			status_code = 400
 
 		return jsonify(structuredGradingOutput, status=status_code)
-
 class EntryAPI(Resource):
 	def get(self, entryID):
 		try:

backend/tests.py

@@ -181,9 +181,9 @@ def testGet(self):
 
 INVALID_EXAMPLE_ENTRY = {"problemID": "incorrectproblemid", "userID": "incorrectuserid", "score": 12}
 
-def generateExampleEntry(db):
-	exampleUser = copy.deepcopy(EXAMPLE_USER)
-	exampleProblem = copy.deepcopy(EXAMPLE_PROBLEM)
+def generateExampleEntry(db, exampleProblem=EXAMPLE_PROBLEM, exampleUser=EXAMPLE_USER):
+	exampleUser = copy.deepcopy(exampleUser)
+	exampleProblem = copy.deepcopy(exampleProblem)
 
 	db.user.insert_one(exampleUser)
 	db.problem.insert_one(exampleProblem)
@@ -199,6 +199,22 @@ def testGetAll(self):
 		newEntry = json.loads(self.app.get("/entries").data.decode("utf-8"))[0]
 		assert areDicsEqual(exampleEntry, newEntry)
 
+	def testGetProblem(self):
+		assert b'[]' in self.app.get("/entries").data
+
+		exampleEntry1 = generateExampleEntry(self.db)
+
+		exampleProblem2 = copy.deepcopy(EXAMPLE_PROBLEM)
+		exampleProblem2["name"] = "Other Problem"
+		exampleEntry2 = generateExampleEntry(self.db, exampleProblem=exampleProblem2)
+
+		self.db.entry.insert_one(exampleEntry1)
+		self.db.entry.insert_one(exampleEntry2)
+
+		returnedEntries = json.loads(self.app.get("/entries", query_string={"problemID": exampleEntry1["problemID"]}).data.decode("utf-8"))
+		assert areDicsEqual(exampleEntry1, returnedEntries[0])
+		assert len(returnedEntries) == 1
+
 	def testGet(self):
 		assert self.app.get("/entries/1").status_code == 404