diff options
Diffstat (limited to 'src/main/java/com')
3 files changed, 23 insertions, 11 deletions
diff --git a/src/main/java/com/stileeducation/markr/controller/TestResultsController.java b/src/main/java/com/stileeducation/markr/controller/TestResultsController.java index c713df6..c741e5c 100644 --- a/src/main/java/com/stileeducation/markr/controller/TestResultsController.java +++ b/src/main/java/com/stileeducation/markr/controller/TestResultsController.java @@ -3,6 +3,7 @@ package com.stileeducation.markr.controller; import com.stileeducation.markr.dto.AggregateResponseDTO; import com.stileeducation.markr.dto.ImportResponseDTO; import com.stileeducation.markr.dto.MCQTestResultsDTO; +import com.stileeducation.markr.exception.TestNotFoundException; import com.stileeducation.markr.service.TestResultsService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -34,11 +35,13 @@ 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); + public ResponseEntity<AggregateResponseDTO> getAggregatedResults(@PathVariable("test-id") String testId) { + try { + AggregateResponseDTO response = testResultsService.aggregateTestResults(testId); + return ResponseEntity.ok(response); + } catch (TestNotFoundException e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); + } } @ExceptionHandler(MethodArgumentNotValidException.class) diff --git a/src/main/java/com/stileeducation/markr/exception/TestNotFoundException.java b/src/main/java/com/stileeducation/markr/exception/TestNotFoundException.java new file mode 100644 index 0000000..d4822de --- /dev/null +++ b/src/main/java/com/stileeducation/markr/exception/TestNotFoundException.java @@ -0,0 +1,7 @@ +package com.stileeducation.markr.exception; + +public class TestNotFoundException extends RuntimeException { + public TestNotFoundException(String message) { + super(message); + } +}
\ No newline at end of file diff --git a/src/main/java/com/stileeducation/markr/service/TestResultsService.java b/src/main/java/com/stileeducation/markr/service/TestResultsService.java index 8dba13f..a06400e 100644 --- a/src/main/java/com/stileeducation/markr/service/TestResultsService.java +++ b/src/main/java/com/stileeducation/markr/service/TestResultsService.java @@ -7,6 +7,7 @@ import com.stileeducation.markr.dto.MCQTestResultsDTO; import com.stileeducation.markr.entity.Student; import com.stileeducation.markr.entity.Test; import com.stileeducation.markr.entity.TestResult; +import com.stileeducation.markr.exception.TestNotFoundException; import com.stileeducation.markr.repository.TestResultRepository; import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation; import org.apache.commons.math3.stat.descriptive.rank.Percentile; @@ -43,12 +44,13 @@ public class TestResultsService { public AggregateResponseDTO aggregateTestResults(String testId) { AggregateResponseDTO aggregateResponseDTO = new AggregateResponseDTO(); - testService.findTest(testId).ifPresent(test -> { - List<TestResult> testResults = findAllByTestId(testId); - if (!testResults.isEmpty()) { - populateAggregateResponse(aggregateResponseDTO, test, testResults); - } - }); + Test test = testService.findTest(testId) + .orElseThrow(() -> new TestNotFoundException("Test with ID " + testId + " not found")); + + List<TestResult> testResults = findAllByTestId(testId); + if (!testResults.isEmpty()) { + populateAggregateResponse(aggregateResponseDTO, test, testResults); + } return aggregateResponseDTO; } |