From 023d5e175e55b138707953b277ee96daffefcbc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20von=20B=C3=B6selager?= <philipp.boeselager@web.de>
Date: Tue, 11 Aug 2020 12:15:37 +0200
Subject: [PATCH] Add minor checks and example configuration comment for
 processCompleteNoInteraction (#274)

---
 .../ygor/EnrichmentController.groovy          | 27 +++++++++++++++++++
 .../services/ygor/EnrichmentService.groovy    |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/grails-app/controllers/ygor/EnrichmentController.groovy b/grails-app/controllers/ygor/EnrichmentController.groovy
index 90842936..b5a824aa 100644
--- 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
index e0b72380..083cf534 100644
--- 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
     }