delete batch entity when deleting batch contents

Author: dmeidlin

src/main/java/org/brapi/test/BrAPITestServer/controller/core/BatchesApiController.java

@@ -179,9 +179,11 @@ public ResponseEntity<BatchesSingleResponse> batchesBatchDbIdDelete(
 		BrAPIComponent component = componentFactory.getComponent(batchType);
 		if (hardDelete) {
 			component.deleteBatchData(batch.getData());
-			return responseOK(new BatchesSingleResponse(), null);
+			batchService.deleteBatch(batchDbId);
+			return responseNoContent();
 		}
 		component.softDeleteBatchData(batch.getData());
-		return responseOK(new BatchesSingleResponse(), null);
+		batchService.deleteBatch(batchDbId);
+		return responseNoContent();
 	}
 }

src/main/java/org/brapi/test/BrAPITestServer/exceptions/BatchDeleteWrongTypeException.java

@@ -9,5 +9,6 @@ public class BatchDeleteWrongTypeException extends BrAPIServerException {
     public BatchDeleteWrongTypeException(BatchTypes requiredType, BatchTypes suppliedType, String batchDeleteDbId, HttpStatus status) {
         super(status, "");
         String msg = "The " + suppliedType.toString() + " batch delete " + batchDeleteDbId + " must be of type " + requiredType.toString();
+        this.setResponseMessage(msg);
     }
 }

src/main/java/org/brapi/test/BrAPITestServer/service/core/BatchService.java

@@ -103,8 +103,7 @@ public List<BatchSummary> saveNewBatch(@Valid List<BatchNewRequest> requests) th
 	}
 
 	public void deleteBatch(String batchDbId) throws BrAPIServerException {
-		BatchDetails batch = getBatch(batchDbId);
-		batchRepository.deleteAllByIdInBatch(batch.getData());
+		batchRepository.deleteAllByIdInBatch(Arrays.asList(batchDbId));
 	}
 
 	private BatchDetails convertToDetails(BatchEntity entity) {

src/main/java/org/brapi/test/BrAPITestServer/service/core/ListService.java

@@ -45,6 +45,11 @@ public List<ListSummary> findBatchDeleteLists(String batchDeleteDbId, Metadata m
 			throw new BatchDeleteWrongTypeException(BatchTypes.LISTS, details.getBatchType(), batchDeleteDbId, HttpStatus.BAD_REQUEST);
 		}
 
+		// Check if the batch is empty
+		if (details.getData().isEmpty()) {
+			return new ArrayList<>();
+		}
+
 		// Get the list summaries referenced in the batch delete
 		ListSearchRequest request = new ListSearchRequest();
 		details.getData().forEach(request::addListDbIdsItem);

src/main/java/org/brapi/test/BrAPITestServer/service/core/TrialService.java

@@ -56,6 +56,11 @@ public List<Trial> findBatchDeleteTrials(String batchDeleteDbId, Metadata metada
 			throw new BatchDeleteWrongTypeException(BatchTypes.TRIALS, details.getBatchType(), batchDeleteDbId, HttpStatus.BAD_REQUEST);
 		}
 
+		// Check if the batch is empty
+		if (details.getData().isEmpty()) {
+			return new ArrayList<>();
+		}
+
 		// Get the trials referenced in the batch delete
 		TrialSearchRequest request = new TrialSearchRequest();
 		details.getData().forEach(request::addTrialDbIdsItem);

src/main/java/org/brapi/test/BrAPITestServer/service/geno/SampleService.java

@@ -73,6 +73,11 @@ public List<Sample> findBatchDeleteSamples(String batchDeleteDbId, Metadata meta
 			throw new BatchDeleteWrongTypeException(BatchTypes.SAMPLES, details.getBatchType(), batchDeleteDbId, HttpStatus.BAD_REQUEST);
 		}
 
+		// Check if the batch is empty
+		if (details.getData().isEmpty()) {
+			return new ArrayList<>();
+		}
+		
 		// Get the list summaries referenced in the batch delete
 		SampleSearchRequest request = new SampleSearchRequest();
 		details.getData().forEach(request::addSampleDbIdsItem);