Matched error handling to design doc.

src/main/java/au/org/democracydevelopers/raireservice/controller/AssertionController.java

@@ -1,9 +1,9 @@
 package au.org.democracydevelopers.raireservice.controller;
 
 import au.org.democracydevelopers.raire.RaireSolution;
-import au.org.democracydevelopers.raireservice.request.ContestRequestByIDs;
+import au.org.democracydevelopers.raireservice.request.GenerateAssertionsRequest;
 import au.org.democracydevelopers.raireservice.request.DirectContestRequest;
-import au.org.democracydevelopers.raireservice.request.RequestByContestName;
+import au.org.democracydevelopers.raireservice.request.GetAssertionsRequest;
 import au.org.democracydevelopers.raireservice.response.*;
 import au.org.democracydevelopers.raireservice.service.GenerateAssertionsService;
 import au.org.democracydevelopers.raireservice.service.GetAssertionsService;
@@ -25,7 +25,7 @@ public class AssertionController {
   private final GenerateAssertionsService generateAssertionsService;
 
   @PostMapping(path = "/generate-assertions", produces = MediaType.APPLICATION_JSON_VALUE)
-  public GenerateAssertionsResponse serve(@RequestBody ContestRequestByIDs request) {
+  public GenerateAssertionsResponse serve(@RequestBody GenerateAssertionsRequest request) {
     log.info("Received request to get assertions for contest:  {}", request.getContestName());
     try {
       DirectContestRequest contest = generateAssertionsService.getVotesFromDatabase(request);
@@ -38,7 +38,7 @@ public GenerateAssertionsResponse serve(@RequestBody ContestRequestByIDs request
 
 
   @PostMapping(path = "/get-assertions", produces = MediaType.APPLICATION_JSON_VALUE)
-  public GetAssertionsResponse serve(@RequestBody RequestByContestName contest) {
+  public GetAssertionsResponse serve(@RequestBody GetAssertionsRequest contest) {
     log.info("Received request to get assertions for contest:  {}", contest.getContestName());
     return getAssertionsService.getAssertions(contest);
   }

src/main/java/au/org/democracydevelopers/raireservice/request/DirectContestRequest.java

@@ -58,7 +58,7 @@ public boolean votesAreValid() {
    * @param request A slightly different form of contest request, for which we want to keep the metadata
    * @param votesByName Votes in colorado-rla style, as ordered lists of candidate names.
    */
-  public DirectContestRequest(ContestRequestByIDs request, List<String[]> votesByName) {
+  public DirectContestRequest(GenerateAssertionsRequest request, List<String[]> votesByName) {
     candidates = request.getCandidates().toArray(new String[0]);
     contestName = request.getContestName();
     totalAuditableBallots = request.getTotalAuditableBallots();

src/main/java/au/org/democracydevelopers/raireservice/request/ContestRequestByIDs.java → src/main/java/au/org/democracydevelopers/raireservice/request/GenerateAssertionsRequest.java

@@ -9,7 +9,7 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ContestRequestByIDs {
+public class GenerateAssertionsRequest {
   private String contestName;
   private int totalAuditableBallots;
   private Integer timeProvisionForResult;

src/main/java/au/org/democracydevelopers/raireservice/request/RequestByContestName.java → src/main/java/au/org/democracydevelopers/raireservice/request/GetAssertionsRequest.java

@@ -10,7 +10,7 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class RequestByContestName {
+public class GetAssertionsRequest {
   private String contestName;
   private List<String> candidates;
   private BigDecimal riskLimit;

src/main/java/au/org/democracydevelopers/raireservice/response/Metadata.java

@@ -1,9 +1,9 @@
 package au.org.democracydevelopers.raireservice.response;
 
 import au.org.democracydevelopers.raireservice.repository.entity.Assertion;
-import au.org.democracydevelopers.raireservice.request.ContestRequestByIDs;
+import au.org.democracydevelopers.raireservice.request.GenerateAssertionsRequest;
 import au.org.democracydevelopers.raireservice.request.DirectContestRequest;
-import au.org.democracydevelopers.raireservice.request.RequestByContestName;
+import au.org.democracydevelopers.raireservice.request.GetAssertionsRequest;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -33,13 +33,13 @@ public void AddRisks(List<Assertion> assertions) {
             metadata.put("assertionRisks", risks);
         }
     }
-    public Metadata(RequestByContestName request) {
+    public Metadata(GetAssertionsRequest request) {
             metadata.put("candidates", request.getCandidates());
             metadata.put("contest", request.getContestName());
             metadata.put("riskLimit", request.getRiskLimit());
     }
 
-    public Metadata(ContestRequestByIDs request) {
+    public Metadata(GenerateAssertionsRequest request) {
         metadata.put("candidates", request.getCandidates());
         metadata.put("contest", request.getContestName());
         metadata.put("totalAuditableBallots", request.getTotalAuditableBallots());

src/main/java/au/org/democracydevelopers/raireservice/response/RaireServiceError.java

@@ -29,8 +29,8 @@
 import java.util.stream.StreamSupport;
 
 /**
- * Everything that could go wrong in RaireService. Typically this will be returned as a thrown RaireServiceException with this as its argument.
- *
+ * Everything that could go wrong in RaireService. Typically this will be returned as a thrown RaireServiceException
+ * with this as its argument.
  * It is implemented as a class rather than an Exception hierarchy to facilitate detailed error serialization.
  **/
 @JsonSerialize(using= RaireServiceError.RaireServiceErrorSerializer.class)

src/main/java/au/org/democracydevelopers/raireservice/service/GenerateAssertionsService.java

@@ -8,7 +8,7 @@
 import au.org.democracydevelopers.raireservice.repository.AssertionRepository;
 import au.org.democracydevelopers.raireservice.repository.CVRRepository;
 import au.org.democracydevelopers.raireservice.repository.converters.StringArrayConverter;
-import au.org.democracydevelopers.raireservice.request.ContestRequestByIDs;
+import au.org.democracydevelopers.raireservice.request.GenerateAssertionsRequest;
 import au.org.democracydevelopers.raireservice.request.DirectContestRequest;
 import au.org.democracydevelopers.raireservice.response.*;
 import lombok.RequiredArgsConstructor;
@@ -34,7 +34,7 @@ public class GenerateAssertionsService {
      *                the relevant CVRs.
      * @return        The vote data for the requested contest.
      */
-    public DirectContestRequest getVotesFromDatabase(ContestRequestByIDs request) throws RaireServiceException {
+    public DirectContestRequest getVotesFromDatabase(GenerateAssertionsRequest request) throws RaireServiceException {
         StringArrayConverter conv = new StringArrayConverter();
 
         validateContestRequestByIDs(request);
@@ -142,7 +142,7 @@ public GenerateAssertionsResponse storeAssertions(RaireSolution.RaireResultOrErr
      * @param request
      * TODO Implement all necessary checks. This will require some database interaction.
      */
-    private void validateContestRequestByIDs(ContestRequestByIDs request) throws RaireServiceException {
+    private void validateContestRequestByIDs(GenerateAssertionsRequest request) throws RaireServiceException {
         if (request.getCountyAndContestIDs().isEmpty()) {
             throw new RaireServiceException(new RaireServiceError.InvalidRequest("No IDs"));
         } else if (request.getCandidates().isEmpty()) {

src/main/java/au/org/democracydevelopers/raireservice/service/GetAssertionsService.java

@@ -3,7 +3,7 @@
 import au.org.democracydevelopers.raire.assertions.AssertionAndDifficulty;
 import au.org.democracydevelopers.raireservice.repository.entity.Assertion;
 import au.org.democracydevelopers.raireservice.repository.AssertionRepository;
-import au.org.democracydevelopers.raireservice.request.RequestByContestName;
+import au.org.democracydevelopers.raireservice.request.GetAssertionsRequest;
 import au.org.democracydevelopers.raireservice.response.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,7 @@ public class GetAssertionsService {
      * @return a RaireSolution - the resulting collection of assertions, with metadata, or an error.
      * Database interactions: retrieves assertions from the database.
      */
-    public GetAssertionsResponse getAssertions(RequestByContestName request) {
+    public GetAssertionsResponse getAssertions(GetAssertionsRequest request) {
 
         // TODO: Validate the request, e.g. check that the contest name exists.
         // Return INVALID_REQUEST error if not.

src/test/java/au/org/democracydevelopers/raireservice/service/GenerateAssertionsServiceTests.java

@@ -7,9 +7,7 @@
 import au.org.democracydevelopers.raireservice.repository.CVRRepository;
 import au.org.democracydevelopers.raireservice.repository.entity.Assertion;
 import au.org.democracydevelopers.raireservice.repository.entity.CVRContestInfo;
-import au.org.democracydevelopers.raireservice.repository.entity.NEBAssertion;
-import au.org.democracydevelopers.raireservice.repository.entity.NENAssertion;
-import au.org.democracydevelopers.raireservice.request.ContestRequestByIDs;
+import au.org.democracydevelopers.raireservice.request.GenerateAssertionsRequest;
 import au.org.democracydevelopers.raireservice.request.CountyAndContestID;
 import au.org.democracydevelopers.raireservice.request.DirectContestRequest;
 import au.org.democracydevelopers.raireservice.response.GenerateAssertionsResponse;
@@ -178,7 +176,7 @@ void generateTrivialAssertionFromDatabase() throws RaireServiceException {
         CVRContestInfo cvr1 = new CVRContestInfo(1L,1L,1L,aliceOnly);
         cvrRepository.save(cvr1);
 
-        ContestRequestByIDs request = new ContestRequestByIDs("testContestName5", 1,
+        GenerateAssertionsRequest request = new GenerateAssertionsRequest("testContestName5", 1,
                 100, List.of(aliceBeforeBob), List.of(new CountyAndContestID(1L,1L)) );
 
         DirectContestRequest contestRequest = generateAssertionsService.getVotesFromDatabase(request);
@@ -212,7 +210,7 @@ void generateTrivialAssertionFromDatabase() throws RaireServiceException {
     @Test
     void emptyCandidatesInContestRequestThrowsException() {
 
-        ContestRequestByIDs request = new ContestRequestByIDs("testContestName5", 1,
+        GenerateAssertionsRequest request = new GenerateAssertionsRequest("testContestName5", 1,
                 100, new ArrayList<String>(), List.of(new CountyAndContestID(1L,1L)) );
 
         Exception e = assertThrows(RaireServiceException.class, () -> {
@@ -231,7 +229,7 @@ void emtpyIDsInContestRequestThrowsException() {
 
         List<CountyAndContestID> nothing = new ArrayList<>();
 
-        ContestRequestByIDs request = new ContestRequestByIDs("testContestName5", 1,
+        GenerateAssertionsRequest request = new GenerateAssertionsRequest("testContestName5", 1,
                 100, List.of(aliceBeforeBob), nothing);
 
         Exception e = assertThrows(RaireServiceException.class, () -> {