Merge branch 'develop' of https://github.com/AtlasOfLivingAustralia/alerts into develop

Author: qifeng-bai

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

@@ -372,8 +372,6 @@ class AdminController {
         qr.previousCheck = qr.lastChecked
         qr.lastChecked = since
         query.lastChecked = since
-
-
         def records = notificationService.retrieveRecordForQuery(qr.query, qr)
 
         String urlPrefix = "${grailsApplication.config.getProperty("grails.serverURL")}${grailsApplication.config.getProperty('security.cas.contextPath', '')}"
@@ -383,7 +381,7 @@ class AdminController {
         def unsubscribeOneUrl
 
         def alaUser = authService.userDetails()
-        def user = userService.getUserByEmail(alaUser?.email)
+        def user =  User.findByEmail(alaUser?.email)
         def unsubscribeToken = notificationService.getUnsubscribeToken(user, query)
         if (user && unsubscribeToken) {
             unsubscribeOneUrl = urlPrefix + "/unsubscribe?token=${unsubscribeToken}"

grails-app/domain/au/org/ala/alerts/Query.groovy

@@ -23,7 +23,10 @@ class Query {
     String recordJsonPath
 
     transient String listId //species list id
-    transient Date lastChecked // Date when the last execution performed
+    // Date when the last execution performed.
+    // NOTE: Except Biosecurity, other queries may have 4 lastChecked dates, matching the 4 frequencies
+    // Only used for passing the checked date to the Email template
+    transient Date lastChecked
 
     static hasMany = [notifications: Notification, queryResults: QueryResult, propertyPaths: PropertyPath]
 

grails-app/services/au/org/ala/alerts/BiosecurityService.groovy

@@ -54,7 +54,7 @@ class BiosecurityService {
      */
     def triggerBiosecuritySubscription(Query query) {
         //If has not been checked before, then set the lastChecked to 7 days before
-        Date lastChecked = query.lastChecked ?: DateUtils.addDays(new Date(), -1 * grailsApplication.config.getProperty("biosecurity.legacy.firstLoadedDateAge", Integer, 7))
+        Date lastChecked = queryService.getLastCheckedDate(query) ?: DateUtils.addDays(new Date(), -1 * grailsApplication.config.getProperty("biosecurity.legacy.firstLoadedDateAge", Integer, 7))
         triggerBiosecuritySubscription(query, lastChecked)
     }
 

grails-app/services/au/org/ala/alerts/NotificationService.groovy

@@ -25,7 +25,6 @@ class NotificationService {
     def grailsApplication
     def dateFormatter = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")
 
-    @Transactional
     QueryResult getQueryResult(Query query, Frequency frequency) {
         QueryResult qr = QueryResult.findByQueryAndFrequency(query, frequency)
         if (qr == null) {