Fixed updating of multi columns values #3466

Author: chrisala

src/main/groovy/au/org/ala/merit/GmsMapper.groovy

@@ -642,10 +642,10 @@ class GmsMapper {
                 String propertyName = columnMapping.name
                 if (columnMapping.multipleColumnsSupported) {
                     List values = findMultiValue(mappingColumnName, rowMap)
-                    if (!result[propertyName] && !update) {
+                    values = values.findAll{it}
+                    if (!result[propertyName] && (values || !update)) {
                         result[propertyName] = []
                     }
-                    values = values.findAll{it}
                     if (values || !update) {
                         result[propertyName].addAll(values.collect{convertByType(it, columnMapping, update)}.findAll{it})
                     }

src/test/groovy/au/org/ala/merit/GmsMapperSpec.groovy

@@ -412,4 +412,19 @@ class GmsMapperSpec extends Specification{
                                        [idType:'GRANT_AWARD', externalId: 'g1'], [idType:'GRANT_AWARD', externalId: 'g2']]
         !result.errors
     }
+
+    def "The GMSMapper can update multi-column values such as the externalIds"() {
+        when:
+        Map project = [APP_ID:'g1', PROGRAM_NM:"Green Army", ORG_TRADING_NAME:'Test org 1', ABN:'12345678901', FUNDING_TYPE:"RLP", START_DT:'2019/07/01', FINISH_DT:'2020/07/01']
+        Map idData = [ORDER_NO:'o1', ORDER_NO_2:'o2', WORK_ORDER_ID:'w1', GRANT_AWARD_ID:'g1', GRANT_AWARD_ID_2:'g2', TECH_ONE_ID:'t1', TECH_ONE_ID_2:'t2']
+        project += idData
+        Map result = gmsMapper.mapProject([project], true)
+
+        then:
+        result.project.externalIds == [[idType:'INTERNAL_ORDER_NUMBER', externalId: 'o1'], [idType:'INTERNAL_ORDER_NUMBER', externalId: 'o2'],
+                                       [idType:'TECH_ONE_CODE', externalId: 't1'], [idType:'TECH_ONE_CODE', externalId: 't2'],
+                                       [idType:'WORK_ORDER', externalId: 'w1'],
+                                       [idType:'GRANT_AWARD', externalId: 'g1'], [idType:'GRANT_AWARD', externalId: 'g2']]
+        !result.errors
+    }
 }