#251 (fix) Transactional issues and local mysql username

Author: qifeng-bai

grails-app/conf/application.yml

@@ -312,7 +312,7 @@ environments:
             dbCreate: update
             driverClassName: com.mysql.jdbc.Driver
             url: jdbc:mysql://localhost/alerts
-            username: root
+            username: alerts_user
             password: password
     test:
         dataSource:

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

@@ -135,7 +135,7 @@ class DiffService {
             String previous = "{}"
             // If previous result is null, assign an empty Json object
             if ( queryResult.previousResult != null) {
-                revious = decompressZipped(queryResult.previousResult)
+                previous = decompressZipped(queryResult.previousResult)
             }
 
             try {

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

@@ -813,7 +813,7 @@ class NotificationService {
         }
     }
 
-    @Transactional
+
     def addAlertForUser(User user, Long queryId) {
         log.debug('add my alert :  ' + queryId + ' for user : ' + user)
         def notificationInstance = new Notification()
@@ -823,25 +823,28 @@ class NotificationService {
         def exists = Notification.findByQueryAndUser(notificationInstance.query, notificationInstance.user)
         if (!exists) {
             log.info("Adding alert for user: " + notificationInstance.user + ", query id: " + queryId)
-            if (!notificationInstance.save(validate: true, flush: true)) {
-                notificationInstance.errors.allErrors.each {
-                    log.error(it)
+            Notification.withTransaction {
+                if (!notificationInstance.save(validate: true, flush: true)) {
+                    notificationInstance.errors.allErrors.each {
+                        log.error(it)
+                    }
                 }
             }
         } else {
             log.info("NOT Adding alert for user: " + notificationInstance.user + ", query id: " + queryId + ", already exists...")
         }
     }
 
-    @Transactional
-    def deleteAlertForUser(User user, Long queryId) {
+        def deleteAlertForUser(User user, Long queryId) {
         log.debug('Deleting my alert :  ' + queryId + ' for user : ' + user)
         def query = Query.findById(queryId)
 
         def notificationInstance = Notification.findByUserAndQuery(user, query)
         if (notificationInstance) {
             log.debug('Deleting my notification :  ' + queryId)
-            notificationInstance.each { it.delete(flush: true) }
+            Notification.withTransaction {
+                notificationInstance.each { it.delete(flush: true) }
+            }
         } else {
             log.error('*** Unable to find  my notification - no delete :  ' + queryId)
         }
@@ -906,17 +909,21 @@ class NotificationService {
             QueryResult qr = QueryResult.findByQueryAndFrequency(query, oldFrequency)
             if (qr) {
                 qr.frequency = user.frequency
-                if (!qr.save(validate: true, flush: true)) {
-                    qr.errors.allErrors.each {
-                        log.error(it)
+                QueryResult.withTransaction {
+                    if (!qr.save(validate: true, flush: true)) {
+                        qr.errors.allErrors.each {
+                            log.error(it)
+                        }
                     }
                 }
             }
         }
 
-        if (!user.save(validate: true, flush: true)) {
-            user.errors.allErrors.each {
-                log.error(it)
+        User.withTransaction {
+            if (!user.save(validate: true, flush: true)) {
+                user.errors.allErrors.each {
+                    log.error(it)
+                }
             }
         }
     }

grails-app/views/admin/biosecurity.gsp

@@ -6,7 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="layout" content="${grailsApplication.config.skin.layout}"/>
     <meta name="breadcrumb" content="BioSecurity alerts"/>
-    <meta name="breadcrumbParent" content="${request.contextPath}/admin,Alerts admin"/>
+    <meta name="breadcrumbParent" content="${request.contextPath}/admin, Admin"/>
 
     <title>Admin - Manage BioSecurity alerts</title>
     <asset:stylesheet href="alerts.css"/>