Merge from BI server

.github/pull.yml

@@ -0,0 +1,11 @@
+version: "1"
+rules:
+  - base: develop
+    upstream: plantbreeding:brapi-server-v2
+    mergeMethod: merge
+    assignees:
+      - nickpalladino
+      - mlm483
+      - dmeidlin
+      - davedrp
+label: "upstream-merge"

README.md

@@ -34,9 +34,11 @@ Use [/calls](https://test-server.brapi.org/brapi/v1/call) (V1) or [/serverinfo](
 
 ## DataBase
 
-The database is created automatically at run time thanks to Java Spring Data and Hibernate. All dummy data is loaded from the SQL files in the `/resources/sql` directory. Additional SQL files may be added, but they must be explicitly listed in the `application.properties` file to be loaded automatically.
+The database is created automatically at run time by [flyway](https://documentation.red-gate.com/flyway).
+SQL-based migrations under `src/main/resources/db/migration` or `src/main/resources/db/sql`, and Java-based migrations under `src/main/java/org/brapi/test/BrAPITestServer/db/migration` will be run.
+The `src/main/resources/db/migration` directory is for schema changes, while `src/main/resources/db/sql` is for seed data. Modify `spring.flyway.locations` in `application.properties` to change what flyway runs.
 
-When running in Docker, you can edit or add dummy data by adding the volume `-v /<Local_Path_To_SQL>/:/home/brapi/sql` to your docker command. 
+When running in Docker, you can edit or add seed data by adding the volume `-v /<Local_Path_To_SQL>/:/home/brapi/sql` to your docker command. 
 
 Below is a UML diagram of the whole database schema:
 

src/main/java/io/swagger/api/core/BatchDeletesApi.java

@@ -0,0 +1,129 @@
+/**
+ * NOTE: This class is auto generated by the swagger code generator program (3.0.18).
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+package io.swagger.api.core;
+
+import io.swagger.model.BrAPIResponse;
+import io.swagger.model.Model202AcceptedSearchResponse;
+import io.swagger.model.core.*;
+import io.swagger.annotations.*;
+
+import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import jakarta.validation.Valid;
+
+import java.util.ArrayList;
+
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@Api(value = "batchDeletes", description = "the batch deletes API")
+public interface BatchDeletesApi {
+
+    @ApiOperation(value = "Get the details of a specific Batch Delete", nickname = "batchDeletesBatchDbIdGet", notes = "Get a specific generic batch delete", response = BatchDeletesSingleResponse.class, authorizations = {
+            @Authorization(value = "AuthorizationToken") }, tags = { "BatchDeletes", })
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = BatchDeletesSingleResponse.class),
+            @ApiResponse(code = 400, message = "Bad Request", response = String.class),
+            @ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+            @ApiResponse(code = 403, message = "Forbidden", response = String.class),
+            @ApiResponse(code = 404, message = "Not Found", response = String.class) })
+    @RequestMapping(value = "/batchDeletes/{batchDeleteDbId}", produces = { "application/json" }, method = RequestMethod.GET)
+    ResponseEntity<BatchDeletesSingleResponse> batchDeletesBatchDbIdGet(
+            @ApiParam(value = "The unique ID of this generic batch", required = true) @PathVariable("batchDeletDbId") String batchDbId,
+            @ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+            throws BrAPIServerException;
+
+    @ApiOperation(value = "Add Items to a specific Batch Delete", nickname = "batchDeletesBatchDbIdItemsPost", notes = "Add new data to a specific generic batch delete", response = BatchDeleteResponse.class, authorizations = {
+            @Authorization(value = "AuthorizationToken") }, tags = { "BatchDeletes", })
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = BatchDeleteResponse.class),
+            @ApiResponse(code = 400, message = "Bad Request", response = String.class),
+            @ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+            @ApiResponse(code = 403, message = "Forbidden", response = String.class),
+            @ApiResponse(code = 404, message = "Not Found", response = String.class) })
+    @RequestMapping(value = "/batchDeletes/{batchDeleteDbId}/items", produces = { "application/json" }, consumes = {
+            "application/json" }, method = RequestMethod.POST)
+    ResponseEntity<BatchDeleteResponse> batchDeletesBatchDbIdItemsPost(
+            @ApiParam(value = "The unique ID of this generic batch", required = true) @PathVariable("batchDeleteDbId") String batchDeleteDbId,
+            @ApiParam(value = "") @Valid @RequestBody ArrayList<String> body,
+            @ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+            throws BrAPIServerException;
+
+    @ApiOperation(value = "Add Items to a specific Batch Delete", nickname = "batchDeletesBatchDbIdDataPost", notes = "Add new data to a specific generic batch delete", response = BatchDeleteResponse.class, authorizations = {
+            @Authorization(value = "AuthorizationToken") }, tags = { "BatchDeletes", })
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = BatchDeleteResponse.class),
+            @ApiResponse(code = 400, message = "Bad Request", response = String.class),
+            @ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+            @ApiResponse(code = 403, message = "Forbidden", response = String.class),
+            @ApiResponse(code = 404, message = "Not Found", response = String.class) })
+    @RequestMapping(value = "/batchDeletes/{batchDeleteDbId}/data", produces = { "application/json" }, consumes = {
+            "application/json" }, method = RequestMethod.POST)
+    ResponseEntity<BatchDeleteResponse> batchDeletesBatchDbIdDataPost(
+            @ApiParam(value = "The unique ID of this generic batch", required = true) @PathVariable("batchDeleteDbId") String batchDbId,
+            @ApiParam(value = "") @Valid @RequestBody ArrayList<String> body,
+            @ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+            throws BrAPIServerException;
+
+    @ApiOperation(value = "Update an existing generic batch delete", nickname = "batchDeletesBatchDbIdPut", notes = "Update an existing generic batch delete", response = BatchDeletesSingleResponse.class, authorizations = {
+            @Authorization(value = "AuthorizationToken") }, tags = { "BatchDeletes", })
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = BatchDeletesSingleResponse.class),
+            @ApiResponse(code = 400, message = "Bad Request", response = String.class),
+            @ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+            @ApiResponse(code = 403, message = "Forbidden", response = String.class),
+            @ApiResponse(code = 404, message = "Not Found", response = String.class) })
+    @RequestMapping(value = "/batchDeletes/{batchDeleteDbId}", produces = { "application/json" }, consumes = {
+            "application/json" }, method = RequestMethod.PUT)
+    ResponseEntity<BatchDeletesSingleResponse> batchDeletesBatchDbIdPut(
+            @ApiParam(value = "The unique ID of this generic batch", required = true) @PathVariable("batchDeleteDbId") String batchDbId,
+            @ApiParam(value = "") @Valid @RequestBody BatchDeleteNewRequest body,
+            @ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+            throws BrAPIServerException;
+
+    @ApiOperation(value = "Create a New Batch Delete", nickname = "batchDeletesPost", notes = "Create a new batch delete", response = BatchDeletesListResponse.class, authorizations = {
+            @Authorization(value = "AuthorizationToken") }, tags = { "BatchDeletes", })
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = BatchDeletesListResponse.class),
+            @ApiResponse(code = 400, message = "Bad Request", response = String.class),
+            @ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+            @ApiResponse(code = 403, message = "Forbidden", response = String.class) })
+    @RequestMapping(value = "/batchDeletes", produces = { "application/json" }, consumes = {
+            "application/json" }, method = RequestMethod.POST)
+    ResponseEntity<? extends BrAPIResponse> batchDeletesPost(@ApiParam(value = "") @Valid @RequestBody BatchDeleteSearchRequest body,
+                                                             @ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+            throws BrAPIServerException;
+
+    @ApiOperation(value = "Get the results of a Batch Delete search request", nickname = "searchBatchDeletesSearchResultsDbIdGet", notes = "Advanced searching for the batch delete resource. See Search Services for additional implementation details.", response = BatchDeletesListResponse.class, authorizations = {
+            @Authorization(value = "AuthorizationToken") }, tags = { "BatchDeletes", })
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = BatchDeletesListResponse.class),
+            @ApiResponse(code = 202, message = "Accepted", response = Model202AcceptedSearchResponse.class),
+            @ApiResponse(code = 400, message = "Bad Request", response = String.class),
+            @ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+            @ApiResponse(code = 403, message = "Forbidden", response = String.class) })
+    @RequestMapping(value = "/search/batchDeletes/{searchResultsDbId}", produces = {
+            "application/json" }, method = RequestMethod.GET)
+    ResponseEntity<? extends BrAPIResponse> searchBatchDeletesSearchResultsDbIdGet(
+            @ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
+            @ApiParam(value = "page") @Valid @RequestParam(value = "page", required = false) Integer page,
+            @ApiParam(value = "pageSize") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,
+            @ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
+
+    @ApiOperation(value = "Delete a specific Batch Delete", nickname = "batchDeletesBatchDbIdDelete", notes = "Delete a specific generic batch delete", response = BatchDeletesSingleResponse.class, authorizations = {
+            @Authorization(value = "AuthorizationToken") }, tags = { "BatchDeletes", })
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = BatchDeletesSingleResponse.class),
+            @ApiResponse(code = 400, message = "Bad Request", response = String.class),
+            @ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+            @ApiResponse(code = 403, message = "Forbidden", response = String.class),
+            @ApiResponse(code = 404, message = "Not Found", response = String.class) })
+    @RequestMapping(value = "/batchDeletes/{batchDeleteDbId}", produces = { "application/json" }, method = RequestMethod.DELETE)
+    ResponseEntity<BatchDeletesSingleResponse> batchDeletesBatchDbIdDelete(
+            @ApiParam(value = "The unique ID of this generic batch", required = true) @PathVariable("batchDeleteDbId") String batchDbId,
+            @ApiParam(value = "hard") @Valid @RequestParam(value = "hardDelete", defaultValue = "false", required = false) boolean hardDelete,
+            @ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+            throws BrAPIServerException;
+
+}

src/main/java/io/swagger/api/core/ListsApi.java

@@ -40,6 +40,7 @@ public interface ListsApi {
 			@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
 	@RequestMapping(value = "/lists", produces = { "application/json" }, method = RequestMethod.GET)
 	ResponseEntity<ListsListResponse> listsGet(
+			@ApiParam(value = "batchDeleteDbId") @Valid @RequestParam(value = "batchDeleteDbId", required = false) String batchDelete,
 			@ApiParam(value = "listType") @Valid @RequestParam(value = "listType", required = false) String listType,
 			@ApiParam(value = "listName") @Valid @RequestParam(value = "listName", required = false) String listName,
 			@ApiParam(value = "listDbId") @Valid @RequestParam(value = "listDbId", required = false) String listDbId,
@@ -67,6 +68,20 @@ ResponseEntity<ListsSingleResponse> listsListDbIdGet(
 			@ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
 			throws BrAPIServerException;
 
+	@ApiOperation(value = "Delete an existing generic list", nickname = "listsListDbIdDelete", notes = "Delete an existing generic list", response = ListsListResponse.class, authorizations = {
+			@Authorization(value = "AuthorizationToken") }, tags = { "Lists", })
+	@ApiResponses(value = { @ApiResponse(code = 204, message = "OK", response = ListsSingleResponse.class),
+			@ApiResponse(code = 400, message = "Bad Request", response = String.class),
+			@ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+			@ApiResponse(code = 403, message = "Forbidden", response = String.class),
+			@ApiResponse(code = 404, message = "Not Found", response = String.class) })
+	@RequestMapping(value = "/lists/{listDbId}", produces = { "application/json" }, method = RequestMethod.DELETE)
+	ResponseEntity<ListsSingleResponse> listsListDbIdDelete(
+			@ApiParam(value = "The unique ID of this generic list", required = true) @PathVariable("listDbId") String listDbId,
+			@ApiParam(value = "hardDelete") @Valid @RequestParam(value = "hardDelete", defaultValue = "false", required = false) boolean hardDelete,
+			@ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+			throws BrAPIServerException;
+
 	@ApiOperation(value = "Add Items to a specific List", nickname = "listsListDbIdItemsPost", notes = "Add new data to a specific generic lists", response = ListResponse.class, authorizations = {
 			@Authorization(value = "AuthorizationToken") }, tags = { "Lists", })
 	@ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = ListResponse.class),

src/main/java/io/swagger/api/core/TrialsApi.java

@@ -7,10 +7,7 @@
 
 import io.swagger.model.BrAPIResponse;
 import io.swagger.model.Model202AcceptedSearchResponse;
-import io.swagger.model.core.TrialListResponse;
-import io.swagger.model.core.TrialNewRequest;
-import io.swagger.model.core.TrialSearchRequest;
-import io.swagger.model.core.TrialSingleResponse;
+import io.swagger.model.core.*;
 import io.swagger.annotations.*;
 
 import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
@@ -37,6 +34,7 @@ public interface TrialsApi {
 			@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
 	@RequestMapping(value = "/trials", produces = { "application/json" }, method = RequestMethod.GET)
 	ResponseEntity<TrialListResponse> trialsGet(
+			@ApiParam(value = "batchDeleteDbId") @Valid @RequestParam(value = "batchDeleteDbId", required = false) String batchDelete,
 			@ApiParam(value = "active") @Valid @RequestParam(value = "active", required = false) Boolean active,
 			@ApiParam(value = "commonCropName") @Valid @RequestParam(value = "commonCropName", required = false) String commonCropName,
 			@ApiParam(value = "contactDbId") @Valid @RequestParam(value = "contactDbId", required = false) String contactDbId,
@@ -83,6 +81,20 @@ ResponseEntity<TrialSingleResponse> trialsTrialDbIdGet(
 			@ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
 			throws BrAPIServerException;
 
+	@ApiOperation(value = "Delete a specific Trial", nickname = "trialsTrialDbIdDelete", notes = "Delete a specific Trial", response = TrialSingleResponse.class, authorizations = {
+			@Authorization(value = "AuthorizationToken") }, tags = { "Trials", })
+	@ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = TrialSingleResponse.class),
+			@ApiResponse(code = 400, message = "Bad Request", response = String.class),
+			@ApiResponse(code = 401, message = "Unauthorized", response = String.class),
+			@ApiResponse(code = 403, message = "Forbidden", response = String.class),
+			@ApiResponse(code = 404, message = "Not Found", response = String.class) })
+	@RequestMapping(value = "/trials/{trialDbId}", produces = { "application/json" }, method = RequestMethod.DELETE)
+	ResponseEntity<TrialSingleResponse> trialsTrialDbIdDelete(
+			@ApiParam(value = "The internal trialDbId", required = true) @PathVariable("trialDbId") String trialDbId,
+			@ApiParam(value = "hardDelete") @Valid @RequestParam(value = "hardDelete", defaultValue = "false", required = false) boolean hardDelete,
+			@ApiParam(value = "HTTP HEADER - Token used for Authorization   <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
+			throws BrAPIServerException;
+
 	@ApiOperation(value = "Update the details of an existing Trial", nickname = "trialsTrialDbIdPut", notes = "Update the details of an existing Trial", response = TrialSingleResponse.class, authorizations = {
 			@Authorization(value = "AuthorizationToken") }, tags = { "Trials", })
 	@ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = TrialSingleResponse.class),