From 1abae6d1e41659ebe3230352c58e0cf0550f19eb Mon Sep 17 00:00:00 2001 From: Szymon Szukalski Date: Fri, 26 Jul 2024 11:43:56 +1000 Subject: Add test not found handling to /aggregate endpoint --- .../markr/controller/TestResultsController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/stileeducation/markr/controller') 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 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) -- cgit v1.2.3