Fix formatting and add some clarifying comments

1 files changed, 67 insertions, 62 deletions

diff --git a/src/main/java/com/stileeducation/markr/controller/TestResultsController.java b/src/main/java/com/stileeducation/markr/controller/TestResultsController.java
index c69492d..1376ecb 100644
--- a/src/main/java/com/stileeducation/markr/controller/TestResultsController.java
+++ b/src/main/java/com/stileeducation/markr/controller/TestResultsController.java
@@ -20,70 +20,75 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/")
 public class TestResultsController {
 
-  public static final String IMPORT_ENDPOINT = "/import";
-  public static final String AGGREGATE_ENDPOINT = "/results/{test-id}/aggregate";
-
-  @Autowired
-  private StudentService studentService;
-
-  @Autowired
-  private TestService testService;
-
-  @Autowired
-  private TestResultsService testResultsService;
-
-  @Autowired
-  private TestRepository testRepository;
-
-  @Autowired
-  private TestResultRepository testResultRepository;
-
-  public TestResultsController(TestResultsService testResultsService) {
-    this.testResultsService = testResultsService;
-  }
-
-  // TODO consider return value
-  @PostMapping(value = IMPORT_ENDPOINT, consumes = "text/xml+markr", produces = "application/json")
-  public ResponseEntity<Void> handleXmlRequest(@RequestBody MCQTestResultsDTO testResults) {
-
-    for (MCQTestResultDTO mcqTestResult : testResults.getMcqTestResults()) {
-      Student student = studentService
-          .findOrCreateStudent(
-              mcqTestResult.getFirstName(),
-              mcqTestResult.getLastName(),
-              mcqTestResult.getStudentNumber());
-
-      Test test = testService
-          .findOrCreateTest(
-              mcqTestResult.getTestId(),
-              mcqTestResult.getSummaryMarks().getAvailable());
-
-      if (test.getMarksAvailable() < mcqTestResult.getSummaryMarks().getAvailable()) {
-        test.setMarksAvailable(mcqTestResult.getSummaryMarks().getAvailable());
-        testRepository.save(test);
-      }
-
-      // Some edge cases to consider
-      // obtained is higher than available (assumption?)
-
-      TestResult testResult = testResultsService
-          .findOrCreateTestResult(
-              student.getId(),
-              test.getId(),
-              mcqTestResult.getSummaryMarks().getObtained());
-
-      if (testResult.getMarksAwarded() < mcqTestResult.getSummaryMarks().getObtained()) {
-        testResult.setMarksAwarded(mcqTestResult.getSummaryMarks().getObtained());
-        testResultRepository.save(testResult);
-      }
+    public static final String IMPORT_ENDPOINT = "/import";
+    public static final String AGGREGATE_ENDPOINT = "/results/{test-id}/aggregate";
+
+    @Autowired
+    private StudentService studentService;
+
+    @Autowired
+    private TestService testService;
+
+    @Autowired
+    private TestResultsService testResultsService;
+
+    @Autowired
+    private TestRepository testRepository;
+
+    @Autowired
+    private TestResultRepository testResultRepository;
+
+    public TestResultsController(TestResultsService testResultsService) {
+        this.testResultsService = testResultsService;
     }
 
-    return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-  }
+    // TODO consider return value
+    @PostMapping(
+            value = IMPORT_ENDPOINT,
+            consumes = "text/xml+markr",
+            produces = "application/json")
+    public ResponseEntity<Void> handleXmlRequest(@RequestBody MCQTestResultsDTO testResults) {
+
+        for (MCQTestResultDTO mcqTestResult : testResults.getMcqTestResults()) {
+            Student student = studentService
+                    .findOrCreateStudent(
+                            mcqTestResult.getFirstName(),
+                            mcqTestResult.getLastName(),
+                            mcqTestResult.getStudentNumber());
+
+            Test test = testService
+                    .findOrCreateTest(
+                            mcqTestResult.getTestId(),
+                            mcqTestResult.getSummaryMarks().getAvailable());
+
+            if (test.getMarksAvailable() < mcqTestResult.getSummaryMarks().getAvailable()) {
+                test.setMarksAvailable(mcqTestResult.getSummaryMarks().getAvailable());
+                testRepository.save(test);
+            }
+
+            // Some edge cases to consider
+            // obtained is higher than available (assumption?)
+
+            TestResult testResult = testResultsService
+                    .findOrCreateTestResult(
+                            student.getId(),
+                            test.getId(),
+                            mcqTestResult.getSummaryMarks().getObtained());
+
+            if (testResult.getMarksAwarded() < mcqTestResult.getSummaryMarks().getObtained()) {
+                testResult.setMarksAwarded(mcqTestResult.getSummaryMarks().getObtained());
+                testResultRepository.save(testResult);
+            }
+        }
+
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
 
-  @GetMapping(value = AGGREGATE_ENDPOINT, produces = "application/json")
-  public AggregatedTestResultsDTO getAggregatedResults(@PathVariable("test-id") String testId) {
-    return testResultsService.aggregateTestResults(testId);
-  }
+    @GetMapping(
+            value = AGGREGATE_ENDPOINT,
+            produces = "application/json")
+    public AggregatedTestResultsDTO getAggregatedResults(@PathVariable("test-id") String testId) {
+        return testResultsService.aggregateTestResults(testId);
+    }
 
 }