#251 (fix) transaction issues

Author: qifeng-bai

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

@@ -134,7 +134,7 @@ class NotificationController {
         notificationService.refreshProperties(queryResult, lastResult)
         boolean hasChanged = notificationService.hasChanged(queryResult)
         def records = notificationService.collectUpdatedRecords(queryResult)
-        def results = ["hasChanged": hasChanged, "brief": queryResult.brief(),  "records": records]
+        def results = ["hasChanged": hasChanged, "brief": queryResult.details(),  "records": records]
         render results as JSON
     }
 

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

@@ -862,25 +862,29 @@ class NotificationService {
         }
     }
 
+
     def unsubscribeMyAnnotation(User user) {
         String myAnnotationQueryPath = queryService.constructMyAnnotationQueryPath(user?.userId)
         Query retrievedQuery = Query.findByQueryPath(myAnnotationQueryPath)
 
-        if (retrievedQuery != null) {
-            // delete the notification
-            def notification = Notification.findByQueryAndUser(retrievedQuery, user)
-            if (notification) {
-                notification.delete(flush: true)
-            }
 
-            // delete the query result
-            QueryResult qr = QueryResult.findByQueryAndFrequency(retrievedQuery, user?.frequency)
-            if (qr) {
-                qr.delete(flush: true)
-            }
+        Query.withTransaction {
+            if (retrievedQuery != null) {
+                // delete the notification
+                def notification = Notification.findByQueryAndUser(retrievedQuery, user)
+                if (notification) {
+                    notification.delete(flush: true)
+                }
+
+                // delete the query result
+                QueryResult qr = QueryResult.findByQueryAndFrequency(retrievedQuery, user?.frequency)
+                if (qr) {
+                    qr.delete(flush: true)
+                }
 
-            // delete query
-            retrievedQuery.delete(flush: true)
+                // delete query
+                retrievedQuery.delete(flush: true)
+            }
         }
     }