Changeset 360 for trunk/grails-app/services

Timestamp:

Feb 16, 2010, 10:02:34 AM (15 years ago)

Author:

gav

Message:

Configure cascade deletion of Site -> Section -> Asset -> SubItems.

Location:

trunk/grails-app/services

Files:

• AssetService.groovy (modified) (2 diffs)
• AssetSubItemService.groovy (modified) (1 diff)
• SectionService.groovy (added)
• SiteService.groovy (added)

trunk/grails-app/services/AssetService.groovy

@@ -47 +47 @@
                     r = assetSubItemService.delete(id: assetSubItem.id)
                     if(r.error) {
+                        log.debug r.error
                         fail(code:"asset.subItems.delete.failure")
                         break
@@ -56 +57 @@
                 return result
 
-            try {
-                result.assetInstance.delete(flush:true)
-                return result //Success.
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                return fail(code:"default.delete.failure")
-            }
+            // Success.
+            // We have handled all the foreign keys so the delete should go forward.
+            // Can't flush here due to cascading from Section and Site.
+            // And without flush there is no point it trying to catch the dao.DataIntegrityViolationException
+            // since that will only happen after leaving the transaction.
+            result.assetInstance.delete()
+            return result
 
         } // end withTransaction

trunk/grails-app/services/AssetSubItemService.groovy

@@ -21 +21 @@
 
     def delete(params) {
-        def result = [:]
-        def fail = { Map m ->
-            result.error = [ code: m.code, args: ["AssetSubItem", params.id] ]
-            return result
-        }
+        AssetSubItem.withTransaction { status ->
+            def result = [:]
 
-        result.assetSubItemInstance = AssetSubItem.get(params.id)
+            def fail = { Map m ->
+                status.setRollbackOnly()
+                if(result.assetSubItemInstance && m.field)
+                    result.assetSubItemInstance.errors.rejectValue(m.field, m.code)
+                result.error = [ code: m.code, args: ["AssetSubItem", params.id] ]
+                return result
+            }
 
-        if(!result.assetSubItemInstance)
-            return fail(code:"default.not.found")
+            result.assetSubItemInstance = AssetSubItem.get(params.id)
 
-        if(result.assetSubItemInstance.assets)
-            return fail(code:"assetSubItem.assets.associated")
+            if(!result.assetSubItemInstance)
+                return fail(code:"default.not.found")
 
-        if(result.assetSubItemInstance.maintenanceActions)
-            return fail(code:"maintenanceActions.still.associated")
+            for(subItem in result.assetSubItemInstance.subItems) {
+                if(subItem.maintenanceActions)
+                    fail(code:"maintenanceActions.still.associated.subItem")
+            }
 
-        try {
-            result.assetSubItemInstance.delete(flush:true)
+            if(result.error)
+                return result
+
+            if(result.assetSubItemInstance.maintenanceActions)
+                return fail(code:"maintenanceActions.still.associated")
+
+            if(result.assetSubItemInstance.assets)
+                return fail(code:"assetSubItem.assets.associated")
+
+            // We have handled all the foreign keys so the delete should go forward.
+            // Can't flush here due to cascading from Section and Site.
+            // And without flush there is no point it trying to catch the dao.DataIntegrityViolationException
+            // since that will only happen after leaving the transaction.
+            result.assetSubItemInstance.delete()
             return result //Success.
-        }
-        catch(org.springframework.dao.DataIntegrityViolationException e) {
-            return fail(code:"default.delete.failure")
-        }
 
+        } // withTransaction
     }