Alias binding: bugfixes (#158)

mariodavid · Jun 10, 2020 · a6db457 · a6db457
1 parent bd31578
commit a6db457
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Table of Contents
 
 | Platform Version | Add-on Version |
 | ---------------- | -------------- |
-| 7.2.x            | 0.12.x - 0.13.x|
+| 7.2.x            | 0.12.x - 0.14.x|
 | 7.1.x            | 0.10.x - 0.11.x|
 | 7.0.x            | 0.8.x - 0.9.x  |
 | 6.10.x           | 0.7.x          |

diff --git a/build.gradle b/build.gradle
@@ -46,7 +46,7 @@ apply(plugin: 'cuba')
 cuba {
     artifact {
         group = 'de.diedavids.cuba.dataimport'
-version = project.properties['version'].replaceAll('-SNAPSHOT', '')
+        version = project.properties['version'].replaceAll('-SNAPSHOT', '')
         isSnapshot = project.properties['version'].contains('-SNAPSHOT')
     }
     tomcat {
@@ -133,7 +133,6 @@ test.finalizedBy(project.tasks.cobertura)
 test.finalizedBy(project.tasks.coberturaCheck)
 
 
-
 configure([globalModule, coreModule, guiModule, webModule]) {
     apply(plugin: 'java')
     apply(plugin: 'maven')
@@ -304,15 +303,15 @@ configure(coreModule) {
         host = 'localhost'
         dbUser = 'sa'
         dbPassword = ''
-        }
+    }
 
     task updateDb(dependsOn: assembleDbScripts, description: 'Updates local database', type: CubaDbUpdate) {
         dbName = 'ddcdi4'
         dbms = 'hsql'
         host = 'localhost'
         dbUser = 'sa'
         dbPassword = ''
-        }
+    }
 
 
     task createTestDb(dependsOn: assembleDbScripts, description: 'Creates local HSQL database', type: CubaDbCreation) {
@@ -383,9 +382,6 @@ configure(webModule) {
 }
 
 
-
-
-
 task undeploy(type: Delete, dependsOn: ":${modulePrefix}-web:cleanConf") {
     delete("$cuba.tomcat.dir/shared")
     delete("$cuba.tomcat.dir/webapps/${modulePrefix}-core")

diff --git a/modules/core/src/de/diedavids/cuba/dataimport/binding/AttributeBindRequest.groovy b/modules/core/src/de/diedavids/cuba/dataimport/binding/AttributeBindRequest.groovy
@@ -29,10 +29,12 @@ class AttributeBindRequest {
 
     String getRawValue() {
         def alias = importAttributeMapper.fileColumnAlias
-        if (importAttributeMapper.isRequiredColumn && !dataRow.hasProperty(alias))
+        if (importAttributeMapper.isRequiredColumn && !dataRow.hasProperty(alias)) {
             throw new MissingPropertyException(alias)
+        }
 
-        ((String) dataRow[alias]).trim()
+        def columnValue = dataRow[alias] ?: ''
+        ((String) columnValue).trim()
     }
 
     String getImportEntityClassName() {

diff --git a/.../core/test/de/diedavids/cuba/dataimport/integration/ImportExecutionIntegrationTest.groovy b/.../core/test/de/diedavids/cuba/dataimport/integration/ImportExecutionIntegrationTest.groovy
@@ -46,8 +46,8 @@ class ImportExecutionIntegrationTest extends AbstractImportIntegrationTest {
         importConfiguration = new ImportConfiguration(
                 entityClass: 'ddcdi$MlbTeam',
                 importAttributeMappers: [
-                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0),
-                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 1),
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0, 'isRequiredColumn': true),
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 1, 'isRequiredColumn': true),
                 ],
                 transactionStrategy: ImportTransactionStrategy.SINGLE_TRANSACTION
         )
@@ -77,8 +77,8 @@ class ImportExecutionIntegrationTest extends AbstractImportIntegrationTest {
         importConfiguration = new ImportConfiguration(
                 entityClass: 'ddcdi$MlbTeam',
                 importAttributeMappers: [
-                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0),
-                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 1),
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0, 'isRequiredColumn': true),
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 1, 'isRequiredColumn': true),
                 ],
                 transactionStrategy: ImportTransactionStrategy.SINGLE_TRANSACTION
         )
@@ -100,15 +100,16 @@ class ImportExecutionIntegrationTest extends AbstractImportIntegrationTest {
         ImportExecutionDetail importExecutionDetail = persistedImportExecution.details[0]
         assertThat(importExecutionDetail.category).isEqualTo(ImportExecutionDetailCategory.DATA_BINDING)
     }
+
     @Test
     void "doDataImport stores an exception in the execution due to a type mismatch between import mappers and import data"() {
 
         // given:
         importConfiguration = new ImportConfiguration(
                 entityClass: 'ddcdi$MlbTeam',
                 importAttributeMappers: [
-                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0),
-                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 1),
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0, 'isRequiredColumn': true),
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 1, 'isRequiredColumn': true),
                 ],
                 transactionStrategy: ImportTransactionStrategy.SINGLE_TRANSACTION
         )
@@ -131,4 +132,32 @@ class ImportExecutionIntegrationTest extends AbstractImportIntegrationTest {
         assertThat(importExecutionDetail.category).isEqualTo(ImportExecutionDetailCategory.DATA_BINDING)
     }
 
+
+    @Test
+    void "doDataImport passes the execution when import mappers contains optional columns and import data is missing columns"() {
+
+        // given:
+        importConfiguration = new ImportConfiguration(
+                entityClass: 'ddcdi$MlbTeam',
+                importAttributeMappers: [
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'name', fileColumnAlias: 'name', fileColumnNumber: 0, 'isRequiredColumn': true),
+                        new ImportAttributeMapper(attributeType: AttributeType.DIRECT_ATTRIBUTE, entityAttribute: 'code', fileColumnAlias: 'code', fileColumnNumber: 1, 'isRequiredColumn': false),
+                ],
+                transactionStrategy: ImportTransactionStrategy.SINGLE_TRANSACTION
+        )
+
+        // and:
+        ImportData importData = createData([
+                [name: 1],
+                [name: 2]
+        ])
+
+        // when:
+        ImportExecution importExecution = sut.doDataImport(importConfiguration, importData)
+
+        // then:
+        ImportExecution persistedImportExecution = simpleDataLoader.load(ImportExecution, importExecution.getId(), "importExecution-with-details-view")
+        assertThat(persistedImportExecution.entitiesImportSuccess).isEqualTo(2)
+    }
+
 }
diff --git a/modules/global/src/de/diedavids/cuba/dataimport/dto/ImportDataImpl.groovy b/modules/global/src/de/diedavids/cuba/dataimport/dto/ImportDataImpl.groovy
@@ -9,8 +9,8 @@ class ImportDataImpl implements ImportData {
     @Override
     ColumnValidationResult isCompatibleWith(List<ImportAttributeMapper> attributeMappers) {
         List<String> invalidColumns = attributeMappers
-                .findAll { attributeMapper -> isInvalidColumn(attributeMapper)}
-                .collect { it.fileColumnAlias }
+                .findAll { attributeMapper -> isInvalidColumn(attributeMapper) }
+                *.fileColumnAlias
 
         new ColumnValidationResult(invalidColumns.isEmpty(), invalidColumns)
     }

diff --git a/...edavids/cuba/dataimport/web/importfile/ImportDataImportConfigurationMatchException.groovy b/...edavids/cuba/dataimport/web/importfile/ImportDataImportConfigurationMatchException.groovy
@@ -4,15 +4,16 @@ import de.diedavids.cuba.dataimport.dto.ColumnValidationResult
 
 class ImportDataImportConfigurationMatchException extends RuntimeException {
 
-    private ColumnValidationResult result
+    public static final String DELIMITER = ', '
+    final private ColumnValidationResult result
 
     ImportDataImportConfigurationMatchException(ColumnValidationResult result) {
         super('Import File does not match import configuration. Please check required columns: '
-                + result.getColumns().join(", "))
+                + result.columns.join(DELIMITER))
         this.result = result
     }
 
     String getResult() {
-        return result.getColumns().join(", ")
+        result.columns.join(DELIMITER)
     }
 }
diff --git a/.../de/diedavids/cuba/dataimport/web/importwizard/ImportWithImportConfigurationWizard.groovy b/.../de/diedavids/cuba/dataimport/web/importwizard/ImportWithImportConfigurationWizard.groovy
@@ -159,7 +159,7 @@ class ImportWithImportConfigurationWizard extends AbstractEditor<ImportConfigura
             log.error(e.message, e)
 
             startImport.enabled = false
-            showNotification(formatMessage('uploadFileDoesNotMatchExpectedStructure', e.getResult()),
+            showNotification(formatMessage('uploadFileDoesNotMatchExpectedStructure', e.result),
                     Frame.NotificationType.ERROR)
 
             toStep1()