Changeset 360 for trunk

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

Files:

• controllers/SiteDetailedController.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/AssetService.groovy (modified) (2 diffs)
• services/AssetSubItemService.groovy (modified) (1 diff)
• services/SectionService.groovy (added)
• services/SiteService.groovy (added)

trunk/grails-app/controllers/SiteDetailedController.groovy

@@ -3 +3 @@
 @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager'])
 class SiteDetailedController extends BaseController {
+
+    def siteService
 
     // the delete, save and update actions only accept POST requests
@@ -29 +31 @@
     @Secured(['ROLE_AppAdmin'])
     def delete = {
-        def siteInstance = Site.get( params.id )
-        if(siteInstance) {
-            try {
-                siteInstance.delete(flush:true)
-                flash.message = "Site ${params.id} deleted"
-                redirect(action:list)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "Site ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
+        def result = siteService.delete(params)
+
+        if(!result.error) {
+            flash.message = g.message(code: "default.delete.success", args: ["Site", params.id])
+            redirect(action:list)
+            return
         }
-        else {
-            flash.message = "Site not found with id ${params.id}"
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+
+        if(result.error.code == "default.not.found") {
             redirect(action:list)
+            return
         }
+
+        redirect(action:show, id: params.id)
     }
 

trunk/grails-app/i18n/messages.properties

@@ -11 +11 @@
 asset.copy.asset.required=Please select an asset to copy.
 
-maintenanceActions.still.associated=Could not complete operation as maintenance actions are still associated with this item.
-
+maintenanceActions.still.associated=Could not complete operation as maintenance actions are still associated \
+    with this item.
+maintenanceActions.still.associated.subItem=Could not complete operation as maintenance actions are still associated \
+    with a sub item.
+inventoryStores.still.associated=Could not complete operation as inventory stores are still associated with this item.
+
+site.section.delete.failure=Could not complete operation as sections failed to delete.
+section.asset.delete.failure=Could not complete operation as assets failed to delete.
 asset.subItems.delete.failure=Could not complete operation as orphan sub items failed to delete.
 

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
     }