Add minor checks and example configuration comment for processComplet…

…eNoInteraction (#274)
hbz · Aug 11, 2020 · 023d5e1 · 023d5e1
1 parent 8b52d7e
commit 023d5e1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/grails-app/controllers/ygor/EnrichmentController.groovy b/grails-app/controllers/ygor/EnrichmentController.groovy
@@ -252,6 +252,33 @@ class EnrichmentController implements ControllersHelper{
   }
 
 
+  /**
+   * Current Test configuration via Postman:
+   *
+   * POST /ygor/enrichment/processCompleteNoInteraction?
+   * formatDelimiter=null&
+   * formatQuote=null&
+   * formatQuoteMode=null&
+   * recordSeparator=null&
+   * addOnly=false&
+   * processOption=kbart,zdb,ezb&
+   * gokbUsername=<aValidGokbUser>&
+   * gokbPassword=<theUser'sPassword>&
+   * pkgTitle=<yourPackageTitle>&
+   * pkgIsil&
+   * pkgCuratoryGroup=<yourCuratoryGroupName>&
+   * pkgNominalProvider=Organisation for Economic Co-operation and Development&
+   * pkgNominalPlatform=org.gokb.cred.Platform:408671;OECD UN iLibrary
+   *
+   * (examples given for pkgNominalProvider and pkgNominalPlatform)
+   *
+   * HTTP/1.1
+   * Host: localhost:8092
+   * cache-control: no-cache
+   * Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
+   *
+   * Content-Disposition: form-data; name="uploadFile"; filename="yourKBartTestFile.tsv"
+   */
   def processCompleteNoInteraction = {
     CommonsMultipartFile file = request.getFile('uploadFile')
     if (file == null){

diff --git a/grails-app/services/ygor/EnrichmentService.groovy b/grails-app/services/ygor/EnrichmentService.groovy
@@ -76,7 +76,9 @@ class EnrichmentService{
       enrichment.dataContainer.pkgIdNamespace = (pm['pkgIdNamespace'][0])
     }
     def platform = getPlatform(pm)
-    applyPlatformToPackageHeader(platform, ph)
+    if (platform != null){
+      applyPlatformToPackageHeader(platform, ph)
+    }
     if (pm['pkgNominalProvider']){
       ph.nominalProvider = pm['pkgNominalProvider'][0]
     }
@@ -90,7 +92,7 @@ class EnrichmentService{
   private def getPlatform(Map pm){
     log.debug("Getting platforms for: ${pm['pkgNominalPlatform'][0]}")
     def platformSplit = splitPlatformString(pm['pkgNominalPlatform'][0])
-    if (platformSplit == null){
+    if (platformSplit == null || platformSplit.size() != 2){
       log.error("Could not split platform string.")
       return
     }