Merge branch 'hotfix/wedigbio'

Author: sbearcsiro

build.gradle

@@ -23,7 +23,7 @@ plugins {
     //    id "com.moowork.node" version "1.1.1"
 }
 
-version "5.2.3"
+version "5.2.3.1"
 group "au.org.ala"
 description "Digivol application"
 
@@ -164,8 +164,8 @@ dependencies {
     compile 'org.grails.plugins:grails-google-visualization:2.2'
     compile 'org.grails.plugins:external-config:1.1.2'
     // TODO ALA Plugins: image service (is it used anywhere?)
-    compile 'org.grails.plugins:ala-auth:3.0.3'
-    compile 'au.org.ala:userdetails-service-client:1.3.0' // override this to for external properties changes
+    compile 'org.grails.plugins:ala-auth:3.0.4'
+    compile 'au.org.ala:userdetails-service-client:1.4.0' // override this to for external properties changes
     compile 'org.grails.plugins:cache-ehcache:2.0.0.BUILD-SNAPSHOT'
     // TODO Collection Event Controller?
 
@@ -202,7 +202,7 @@ dependencies {
 }
 
 bootRun {
-    jvmArgs('-Dspring.output.ansi.enabled=always', '-Xmx8000m')
+    jvmArgs('-Dspring.output.ansi.enabled=always', '-Xmx6000m')
 //    addResources = true // enable for reloading src/main/resources when using gradle bootRun, disables processResources
 }
 

grails-app/controllers/au/org/ala/volunteer/AjaxController.groovy

@@ -504,29 +504,34 @@ class AjaxController {
             endTs = new Timestamp(System.currentTimeMillis())
         }
 
-        final count = Task.countByDateFullyTranscribedBetween(startTs, endTs)
-        final transcribers = []
-        final ids = []
+        final count = Transcription.countByDateFullyTranscribedBetween(startTs, endTs)
+        final transcribers = [] as Set
+        final taskIds = [] as Set
+        final ids = [] as Set
 
-        def items = Task.withCriteria {
+        def items = Transcription.withCriteria {
             between('dateFullyTranscribed', startTs, endTs)
-            join('project')
+            join('task')
+            join('task.project')
             maxResults(pageSize)
             firstResult(rowStart)
             order(sort, sortOrder)
-        }.collect { task ->
-            def id = task.id
-            def projectId = task.project.id
-            def projectName = task.project.name
-            def transcriber = task.fullyTranscribedBy
-            def timestamp = task.dateFullyTranscribed
-            def ipAddress = task.fullyTranscribedIpAddress
-            def uuid = task.transcribedUUID.toString()
+        }.collect { Transcription transcription ->
+            def id = transcription.id
+            def taskId = transcription.task.id
+            def projectId = transcription.task.project.id
+            def projectName = transcription.task.project.name
+            def transcriber = transcription.fullyTranscribedBy
+            def timestamp = transcription.dateFullyTranscribed
+            def ipAddress = transcription.fullyTranscribedIpAddress
+            def uuid = transcription.transcribedUUID.toString()
 
             transcribers << transcriber
+            taskIds << taskId
             ids << id
             [
                 id: id,
+                taskId: taskId,
                 projectId: projectId,
                 project: projectName,
                 guid: uuid,
@@ -552,30 +557,30 @@ class AjaxController {
         final mm
         if (ids) {
             allFields = Field.where {
-                task.id in ids && superceded == false
+                transcription.id in ids && superceded == false
             }.collect { field ->
-                [id: field.taskId, recordIdx: field.recordIdx, name: field.name, value: field.value]
+                [id: field.transcriptionId, recordIdx: field.recordIdx, name: field.name, value: field.value]
             }.groupBy { it.id }
             udsw.start()
-            usersDetails = authService.getUserDetailsById(transcribers, true) ?: [users:[:]]
+            usersDetails = authService.getUserDetailsById(transcribers.toList(), true) ?: [users:[:]]
             udsw.stop()
-            mm = Multimedia.where { task.id in ids }.collect { [id: it.taskId, thumbUrl: multimediaService.getImageThumbnailUrl(it), url: multimediaService.getImageUrl(it) ] }.groupBy { it.id }
+            mm = Multimedia.where { task.id in taskIds }.collect { [id: it.taskId, thumbUrl: multimediaService.getImageThumbnailUrl(it), url: multimediaService.getImageUrl(it) ] }.groupBy { it.id }
         } else {
             allFields = [:]
             usersDetails = [users:[]]
             mm = [:]
         }
 
-        final invalidState = 'N/A'
-        final defaultCountry = 'Australia' // we don't record country, so use this if we have a state, todo externalise
+        final defaultCountry = 'AU' // TODO externalise
 
         items.each {
             def id = it.id
             def transcriber = it.contributor.id
-            def itemMM = mm[id] ? mm[id][0] : null
+            def itemMM = mm[it.taskId] ? mm[it.taskId][0] : null
             def thumbnailUrl = itemMM?.thumbUrl ?: itemMM?.url
             def userDetails = usersDetails.users[transcriber]
             def displayName = userDetails?.displayName ?: User.findByUserId(transcriber)?.displayName ?: ''
+            def userCountry = userDetails?.country
             def userState = userDetails?.state
             def userCity = userDetails?.city
             def fields = allFields[id]
@@ -599,8 +604,8 @@ class AjaxController {
 
             if (thumbnailUrl) it.subject.thumbnailUrl = thumbnailUrl
             if (displayName) it.contributor.transcriber = displayName
-            if (userState && userState != invalidState) it.contributor.physicalLocation = [
-                    country: defaultCountry,
+            if (userCity || userState || userCountry) it.contributor.physicalLocation = [
+                    country: userCountry ?: defaultCountry,
                     state: userState,
                     municipality: userCity
             ]

src/test/groovy/au/org/ala/volunteer/AjaxControllerSpec.groovy

@@ -0,0 +1,44 @@
+package au.org.ala.volunteer
+
+import au.org.ala.userdetails.UserDetailsFromIdListResponse
+import au.org.ala.web.AuthService
+import au.org.ala.web.UserDetails
+import grails.test.hibernate.HibernateSpec
+import grails.test.mixin.TestFor
+import org.grails.web.json.JSONArray
+import org.grails.web.json.JSONObject
+
+import static au.org.ala.volunteer.helper.TaskDataHelper.setupProject
+import static au.org.ala.volunteer.helper.TaskDataHelper.setupTasks
+import static au.org.ala.volunteer.helper.TaskDataHelper.transcribe
+
+@TestFor(AjaxController)
+class AjaxControllerSpec extends HibernateSpec {
+
+    String userId = 'u1'
+    Project project
+    List<Task> tasks
+
+    void setup() {
+        project = setupProject()
+        tasks = setupTasks(project, 10)
+        tasks.take(5).collect { task -> transcribe(task, userId, [:]) }
+        controller.authService = Stub(AuthService)
+        controller.authService.getUserDetailsById(_, _) >> { List<String> ids, boolean includeProps -> new UserDetailsFromIdListResponse(true, '', ['ud1' : new UserDetails(1L, 'First', 'Second', 'ud1@ud1.com', 'ud1', false, '', '', 'organisation', 'Canberra', 'ACT', '', ['ROLE_USER'] as Set)], []) }
+    }
+
+    def "test transcription feed"() {
+        setup:
+
+        when:
+        controller.transcriptionFeed('','',0,'')
+
+        then:
+        def json = response.json
+        json instanceof JSONObject
+        json.numFound == 5
+        json.items instanceof JSONArray
+        json.items.size() == 5
+    }
+
+}

src/test/groovy/au/org/ala/volunteer/AuditServiceSpec.groovy

@@ -3,7 +3,7 @@ package au.org.ala.volunteer
 import grails.test.hibernate.HibernateSpec
 import grails.test.mixin.TestFor
 
-import static au.org.ala.volunteer.au.org.ala.volunteer.helper.TaskDataHelper.*
+import static au.org.ala.volunteer.helper.TaskDataHelper.*
 
 @TestFor(AuditService)
 class AuditServiceSpec extends HibernateSpec {

src/test/groovy/au/org/ala/volunteer/TaskServiceSpec.groovy

@@ -4,7 +4,7 @@ import grails.test.hibernate.HibernateSpec
 import grails.test.mixin.TestFor
 import org.grails.orm.hibernate.cfg.Settings
 
-import static au.org.ala.volunteer.au.org.ala.volunteer.helper.TaskDataHelper.*
+import static au.org.ala.volunteer.helper.TaskDataHelper.*
 
 @TestFor(TaskService)
 class TaskServiceSpec extends HibernateSpec {

src/test/groovy/au/org/ala/volunteer/ValidationServiceSpec.groovy

@@ -4,7 +4,7 @@ import grails.test.mixin.Mock
 import grails.test.mixin.TestFor
 import spock.lang.Specification
 
-import static au.org.ala.volunteer.au.org.ala.volunteer.helper.TaskDataHelper.*
+import static au.org.ala.volunteer.helper.TaskDataHelper.*
 
 /**
  * See the API for {@link grails.test.mixin.services.ServiceUnitTestMixin} for usage instructions

src/test/groovy/au/org/ala/volunteer/au/org/ala/volunteer/helper/TaskDataHelper.groovy src/test/groovy/au/org/ala/volunteer/helper/TaskDataHelper.groovy

@@ -1,17 +1,19 @@
-package au.org.ala.volunteer.au.org.ala.volunteer.helper
+package au.org.ala.volunteer.helper
 
 import au.org.ala.volunteer.Field
 import au.org.ala.volunteer.Project
 import au.org.ala.volunteer.Task
 import au.org.ala.volunteer.Template
 import au.org.ala.volunteer.Transcription
 import au.org.ala.volunteer.ViewedTask
+import groovy.util.logging.Slf4j
 
 
 /**
  * Helper class for creating Projects, Tasks, Transcriptions, ViewedTasks in the database to assist setting up
  * data for testing.
  */
+@Slf4j
 class TaskDataHelper {
 
     static Project setupProject() {
@@ -31,10 +33,8 @@ class TaskDataHelper {
         task
     }
 
-    static void setupTasks(Project project, int numberOfTasks) {
-        for (int i=0; i<numberOfTasks; i++) {
-            addTask(project, i)
-        }
+    static List<Task> setupTasks(Project project, int numberOfTasks) {
+        (0..numberOfTasks).collect { i -> addTask(project, i) }
     }
 
     static void transcribe(Task task, String userId, Map<String, String> fields = null) {
@@ -47,7 +47,7 @@ class TaskDataHelper {
             task.save(failOnError:true)
         }
 
-        println "Updating transcription with id="+transcription.id
+        log.info("Updating transcription with id={}", transcription.id)
         transcription.fullyTranscribedBy = userId
         transcription.dateFullyTranscribed = new Date()