AtlasOfLivingAustralia/biocollect#1586

- added method to handle temp file via multipart post
- refactored methods calling postMultipartWithOkhttp3

Author: temi

grails-app/services/au/org/ala/ecodata/forms/EcpWebService.groovy

@@ -651,6 +651,12 @@ class EcpWebService {
         postMultipart(url, params, fileBody, contentType, originalFilename, fileParamName, useToken, userToken)
     }
 
+    Map postMultipart(String url, Map params, File file, String contentType, String originalFilename, String fileParamName = 'files', boolean useToken = false, boolean userToken = false) {
+        RequestBody fileBody = RequestBody.create(okhttp3.MediaType.parse(contentType), file)
+        postMultipart(url, params, fileBody, contentType, originalFilename, fileParamName, useToken, userToken)
+    }
+
+
     private void addTokenHeader(conn, boolean requireUser = false) {
         if (useJWT()) {
             conn.setRequestProperty("Authorization", getToken(requireUser))

grails-app/services/au/org/ala/ecodata/forms/SpeciesListService.groovy

@@ -404,7 +404,7 @@ class SpeciesListService {
 
             try {
                 String url = grailsApplication.config.getProperty('lists.baseURL') + UPLOAD_V2
-                Map resp = ecpWebService.postMultipartWithOkhttp3(url, [:], file, "text/csv", "specieslist.csv", "file", true, true)
+                Map resp = ecpWebService.postMultipart(url, [:], file, "text/csv", "specieslist.csv", "file", true, true)
                 if (HttpStatus.resolve(resp.statusCode as int).is2xxSuccessful()) {
                     Map apiResp = resp.content
                     String tempFileName = apiResp.localFile

src/test/groovy/au/org/ala/ecodata/forms/SpeciesListServiceSpec.groovy

@@ -360,7 +360,7 @@ class SpeciesListServiceSpec extends Specification implements ServiceUnitTest<Sp
         ]
 
         and: "mock exception during upload"
-        webService.postMultipartWithOkhttp3(*_) >> { throw new IOException("Network error") }
+        webService.postMultipart(*_) >> { throw new IOException("Network error") }
 
         when:
         def result = service.uploadSpeciesListUsingV2(rows, "Test List", "Test Description", "CC-BY", "TEST_LIST")
@@ -381,7 +381,7 @@ class SpeciesListServiceSpec extends Specification implements ServiceUnitTest<Sp
         def dataResourceId = "dr-12345"
 
         and: "mock successful upload and ingest but failed completion"
-        webService.postMultipartWithOkhttp3(*_) >> [
+        webService.postMultipart(*_) >> [
                 statusCode: 200,
                 content: [localFile: tempFileName]
         ]
@@ -415,7 +415,7 @@ class SpeciesListServiceSpec extends Specification implements ServiceUnitTest<Sp
         def dataResourceId = "dr-12345"
 
         and: "mock upload responses"
-        webService.postMultipartWithOkhttp3(
+        webService.postMultipart(
                 {it.endsWith(service.UPLOAD_V2)},
                 [:],
                 _,