From 0b24d43fc4517e92025efc552ff7c1cc6ddaff2e Mon Sep 17 00:00:00 2001 From: Szymon Szukalski Date: Thu, 25 Jul 2024 22:57:41 +1000 Subject: Increment the correct variables --- .../stileeducation/markr/controller/TestResultsController.java | 3 +++ .../java/com/stileeducation/markr/service/TestResultsService.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/stileeducation/markr/controller/TestResultsController.java b/src/main/java/com/stileeducation/markr/controller/TestResultsController.java index 9b84e93..c713df6 100644 --- a/src/main/java/com/stileeducation/markr/controller/TestResultsController.java +++ b/src/main/java/com/stileeducation/markr/controller/TestResultsController.java @@ -35,6 +35,9 @@ public class TestResultsController { @GetMapping(value = AGGREGATE_ENDPOINT, produces = "application/json") public AggregateResponseDTO getAggregatedResults(@PathVariable("test-id") String testId) { + + // Should return 404 if test is not found. + return testResultsService.aggregateTestResults(testId); } diff --git a/src/main/java/com/stileeducation/markr/service/TestResultsService.java b/src/main/java/com/stileeducation/markr/service/TestResultsService.java index 118dc61..976687b 100644 --- a/src/main/java/com/stileeducation/markr/service/TestResultsService.java +++ b/src/main/java/com/stileeducation/markr/service/TestResultsService.java @@ -192,8 +192,8 @@ public class TestResultsService { mcqTestResult.getLastName(), mcqTestResult.getStudentNumber()); - incrementIfTrue(student.isCreated(), importData::incrementTestResultsCreated); - incrementIfTrue(student.isUpdated(), importData::incrementTestResultsUpdated); + incrementIfTrue(student.isCreated(), importData::incrementStudentsCreated); + incrementIfTrue(student.isUpdated(), importData::incrementStudentsUpdated); Test test = testService @@ -201,8 +201,8 @@ public class TestResultsService { mcqTestResult.getTestId(), mcqTestResult.getSummaryMarks().getAvailable()); - incrementIfTrue(test.isCreated(), importData::incrementTestResultsCreated); - incrementIfTrue(test.isUpdated(), importData::incrementTestResultsUpdated); + incrementIfTrue(test.isCreated(), importData::incrementTestsCreated); + incrementIfTrue(test.isUpdated(), importData::incrementTestsUpdated); TestResult testResult = findOrCreateTestResult( -- cgit v1.2.3