Added test, refactored function name improved update message #3466

Author: chrisala

grails-app/controllers/au/org/ala/merit/AdminController.groovy

@@ -418,7 +418,7 @@ class AdminController {
             session.status = status
             def fileIn = new FileInputStream(file)
             try {
-                def result = importService.gmsImport(fileIn, status.projects, preview, update)
+                def result = importService.projectImport(fileIn, status.projects, preview, update)
                 status.finished = true
                 status.error = result.error
             }

grails-app/services/au/org/ala/merit/ImportService.groovy

@@ -297,7 +297,7 @@ class ImportService {
         organisations += metadataService.organisationList()?.list
     }
 
-    Map gmsImport(InputStream csv, List status, Boolean preview, Boolean update, String charEncoding = 'Cp1252') {
+    Map projectImport(InputStream csv, List status, Boolean preview, Boolean update, String charEncoding = 'Cp1252') {
 
         Map programs = [:].withDefault{name ->
             programService.getByName(name)
@@ -379,7 +379,7 @@ class ImportService {
 
     void importAll(projectRows, List status, GmsMapper mapper, Boolean update) {
 
-        def projectDetails = mapper.mapProject(projectRows)
+        def projectDetails = mapper.mapProject(projectRows, update)
 
         def grantId = projectDetails.project.grantId?:'<not mapped>'
         def externalId = projectDetails.project.externalId?:'<not mapped>'
@@ -405,7 +405,7 @@ class ImportService {
                 }
             }
 
-            def result = importProject(projectDetails.project, update) // Do not overwrite existing projects because of the impacts to sites / activities etc.
+            def result = importProject(projectDetails.project, update)
 
             if (result.project == 'existing' && !update) {
                 status << [grantId:grantId, externalId:externalId, success:false, errors:['Project already exists in MERIT, skipping']]

src/integration-test/groovy/au/org/ala/fieldcapture/ImportProjectsSpec.groovy

@@ -49,6 +49,7 @@ class ImportProjectsSpec extends StubbedCasSpec {
         and:
         List rows2 = projectResults()
         rows2.size() == 2
+        rows2[1].success == 'Yes'
 
         when:
         to Organisation, 'test_organisation'
@@ -75,6 +76,8 @@ class ImportProjectsSpec extends StubbedCasSpec {
         and: "The data is relevant to the projects loaded"
         List rows = projectResults()
         rows.size() == 3
+        rows[1].success == 'Yes'
+        rows[2].success == 'Yes'
 
         when:
         importProjects()
@@ -125,6 +128,7 @@ class ImportProjectsSpec extends StubbedCasSpec {
         and:
         List rows2 = projectResults()
         rows2.size() == 2
+        rows2[1].success == 'Yes'
 
         when: "We navigate to the program page to find the new imported project, then open it"
         to ProgramPage, 'configurable_meri_plan'
@@ -152,4 +156,59 @@ class ImportProjectsSpec extends StubbedCasSpec {
         adminContent.meriPlan.budget[0].budgetAmounts()*.value() == ["20000", "10000"]
 
     }
+
+    def "Projects can be updated via import with only the fields provided in the spreadsheet being updated"() {
+
+        setup:
+        File csv = new File(getClass().getResource("/grants-hub-update-data.csv").toURI())
+        loginAsMeritAdmin(browser)
+
+        when:
+        to ProjectImport
+        checkUpdateCheckbox()
+        attachFile(csv)
+
+        then: "The projects are validated and the validation results are displayed"
+        waitFor{validateComplete()}
+
+        and: "The data is relevant to the projects loaded"
+        projectResults().size() == 2
+
+        when:
+        importProjects()
+
+        then:
+        waitFor{loadComplete()}
+        and:
+        List rows2 = projectResults()
+        rows2.size() == 2
+        rows2[1].success == 'Yes'
+
+        when: "We navigate to the program page to find the new imported project, then open it"
+        to ProgramPage, 'configurable_meri_plan'
+        openProjectByGrantId('cep-1')
+
+        then:
+        at RlpProjectPage
+
+        when:
+        displayOverview()
+
+        then:
+        overview.program.text() == "Configurable MERI Plan Program"
+        overview.projectId.text() == "cep-1"
+        overview.status.text().equalsIgnoreCase("Active")
+        overview.externalIds*.text() == ["1234"]
+        overview.description.text() == "Grants project description - updated"
+
+        when:
+        openMeriPlanEditTab()
+
+        then:
+        adminContent.meriPlan.budget.size() == 1
+        adminContent.meriPlan.budget[0].description.value() == "Project funding"
+        adminContent.meriPlan.budget[0].budgetAmounts()*.value() == ["1", "2"]
+
+    }
+
 }

src/integration-test/groovy/pages/ProjectImport.groovy

@@ -1,6 +1,7 @@
 package pages
 
 import geb.Page
+import geb.module.Checkbox
 
 class ProjectImport extends Page {
 
@@ -12,6 +13,7 @@ class ProjectImport extends Page {
         fileInput { $('#fileUpload') }
         importButton { $('button[data-bind*=doImport]')}
         progressSummary { $('span[data-bind*=progressSummary]') }
+        updateCheckbox { $('#update').module(Checkbox) }
     }
 
     def attachFile(File file) {
@@ -22,15 +24,25 @@ class ProjectImport extends Page {
         importButton.click()
     }
 
+    def checkUpdateCheckbox() {
+        updateCheckbox.check()
+    }
+
     List<List> projectResults() {
+
+        List columns = ["grantId", "externalId", "success", "errors", "messages"]
         List rows = []
         def progressTable = $('table.table')
         progressTable.find("tbody tr").each {
             List cols = []
             it.find("td").each { col ->
                 cols << col.text()
             }
-            rows << cols
+            Map row = [:]
+            columns.eachWithIndex{ col, index ->
+                row[col] = cols[index]
+            }
+            rows << row
         }
 
         rows

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

@@ -267,15 +267,30 @@ class GmsMapper {
         }
 
         if (update) {
-            Set propertiesToUpdate = new HashSet(project.keySet())
+            Map flatProperties = flattenMap(project)
+            Set propertiesToUpdate = flatProperties.keySet()
             propertiesToUpdate.remove('grantId') // This identifies the project and won't be updated.
             messages << "Update: ${propertiesToUpdate}"
+
         }
 
         [project:project, sites:sites, activities:activities, errors:errors, messages:messages, organisation:organisation]
 
     }
 
+    private Map flattenMap(Map map, String separator = '.') {
+        map.collectEntries { k, v ->
+            if (v instanceof Map) {
+                flattenMap(v, separator).collectEntries { k1, v1 ->
+                    String newKey = k+separator+k1
+                    [(newKey): v1]
+                }
+            } else {
+                [(k): v]
+            }
+        }
+    }
+
     private Map mapProgram(LinkedHashMap<Object, Object> project, boolean update, ArrayList errors) {
         String programName = project.associatedSubProgram ?: project.associatedProgram
         if (!programName) {

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

@@ -165,7 +165,7 @@ class ImportServiceSpec extends Specification implements ServiceUnitTest<ImportS
 
         when:
         List status = []
-        Map result = service.gmsImport(csv, status, true, false)
+        Map result = service.projectImport(csv, status, true, false)
 
         then:
         1 * metadataService.organisationList() >> [list:[[name:"Test Organisation 2", organisationId:'org2Id', abn:'12345678901']]]
@@ -190,7 +190,7 @@ class ImportServiceSpec extends Specification implements ServiceUnitTest<ImportS
 
         when:
         List status = []
-        Map result = service.gmsImport(csv, status, false, false)
+        Map result = service.projectImport(csv, status, false, false)
 
         then:
         1 * metadataService.organisationList() >> [list:[[name:"Test Organisation 2", organisationId:'org2Id', abn:'12345678901']]]