Changeset 809 for trunk/grails-app/services

Timestamp:

Feb 16, 2011, 8:10:39 PM (13 years ago)

Author:

gav

Message:

Domain change, first draft of TaskProcedureRevisions.

Location:

trunk/grails-app/services

Files:

• CreateDataService.groovy (modified) (1 diff)
• TaskProcedureService.groovy (modified) (8 diffs)
• TaskRecurringScheduleService.groovy (modified) (1 diff)
• TaskService.groovy (modified) (3 diffs)

trunk/grails-app/services/CreateDataService.groovy

@@ -140 +140 @@
         createDemoAssignedGroups()
         createDemoAssignedPersons()
-        createDemoTaskProcedure()
-        createDemoMaintenanceActions()
+//         createDemoTaskProcedure()
+//         createDemoMaintenanceActions()
         createDemoTaskRecurringSchedules()
 

trunk/grails-app/services/TaskProcedureService.groovy

@@ -7 +7 @@
 
     def authService
+    def dateUtilService
 
     /**
@@ -23 +24 @@
                 result.error = [ code: m.code, args: ["TaskProcedure", params.id] ]
                 // Fetch to prevent lazy initialization error.
-                result.taskProcedureInstance?.linkedTask.primaryAsset
-                result.taskProcedureInstance?.createdBy
+                result.taskProcedureInstance.revisions.each {it.createdBy.toString()}
                 return result
             }
@@ -40 +40 @@
 
             result.taskProcedureInstance.properties = params
-            result.taskProcedureInstance.lastUpdatedBy = authService.currentUser
-            result.taskProcedureInstance.lastUpdated = new Date() // Required to trigger version increment.
 
             // Gaps in the html index's can be created by adding 2 items and removing the first one.
@@ -80 +78 @@
             }
 
+            def r = createRevision(result.taskProcedureInstance)
+            if(r.error)
+                return fail(field:'id', code:"default.create.revision.failure")
+
+            // Also sets: taskInstance.taskProcedureRevision = taskProcedureRevision
+            r.taskProcedureRevision.addToTasks(result.taskProcedureInstance.linkedTask)
+
+            // Update tasks that are using previousRevision.
+            // Only those that are not started and due to be started today or in the future.
+            def previousRevision = result.taskProcedureInstance.getRevision(r.taskProcedureRevision.revision - 1)
+            if(previousRevision) {
+                Task.withCriteria {
+                    eq("taskProcedureRevision", previousRevision)
+                    ge("targetStartDate", dateUtilService.today)
+                    taskStatus {
+                        idEq(1L) // Not Started.
+                    }
+                    maxResults(10000)
+                }.each {
+                    it.taskProcedureRevision = r.taskProcedureRevision
+                }
+            }
+
             // Success.
             return result
 
-        } //end withTransaction
+        } // end withTransaction
     }  // end update()
 
@@ -96 +117 @@
             def fail = { Map m ->
                 status.setRollbackOnly()
-                if(result.taskProcedureInstance && m.field) 
+                if(result.taskProcedureInstance && m.field)
                     result.taskProcedureInstance.errors.rejectValue(m.field, m.code)
                 result.error = [ code: m.code, args: ["TaskProcedure", params.id] ]
@@ -107 +128 @@
 
             // Optimistic locking check on linkedTask.
-            if(result.taskProcedureInstance.linkedTask.taskProcedure)
+            if(result.taskProcedureInstance.linkedTask.taskProcedureRevision)
                     return fail(field:"version", code:"default.optimistic.locking.failure")
-
-            result.taskProcedureInstance.createdBy = authService.currentUser
-            result.taskProcedureInstance.lastUpdatedBy = authService.currentUser
 
             // Gaps in the html index's can be created by adding 2 items and removing the first one.
@@ -124 +142 @@
             }
 
-            // Also sets: taskInstance.taskProcedure = taskProcedureInstance
-            result.taskProcedureInstance.addToTasks(result.taskProcedureInstance.linkedTask)
-
             if(result.taskProcedureInstance.hasErrors() || !result.taskProcedureInstance.save()) {
                 // Populate collection errors for display.
@@ -134 +149 @@
             }
 
-        } //end withTransaction
-
-        result.taskProcedureInstance.lastUpdated = new Date() // Required to trigger version increment to 1.
-
-        // success
+            def r = createRevision(result.taskProcedureInstance)
+            if(r.error)
+                return fail(field:'id', code:"default.create.revision.failure")
+
+            // Also sets: taskInstance.taskProcedureRevision = taskProcedureRevision
+            r.taskProcedureRevision.addToTasks(result.taskProcedureInstance.linkedTask)
+
+        } // end withTransaction
+
+        // Success.
         return result
     }  // end save()
 
+    /**
+    * Creates a new taskProcedureRevision.
+    * @param taskProcedureInstance The taskProcedure to create the revision for.
+    * @returns A map containing result.error (if any error) and result.taskProcedureRevision.
+    */
+    def createRevision(taskProcedureInstance) {
+        def result = [:]
+        TaskProcedureRevision.withTransaction { status ->
+            def fail = { Map m ->
+                status.setRollbackOnly()
+                if(result.taskProcedureRevision && m.field)
+                    result.taskProcedureRevision.errors.rejectValue(m.field, m.code)
+                result.error = [ code: m.code, args: ["TaskProcedureRevision"] ]
+                return result
+            }
+
+            result.taskProcedureRevision = new TaskProcedureRevision()
+            taskProcedureInstance.addToRevisions(result.taskProcedureRevision)
+
+            result.taskProcedureRevision.taskProcedure = taskProcedureInstance
+            result.taskProcedureRevision.linkedTask = taskProcedureInstance.linkedTask
+            result.taskProcedureRevision.createdBy =  authService.currentUser
+            result.taskProcedureRevision.revision = 0 // init to prevent DataIntegrityViolationException
+            result.taskProcedureRevision.revision = taskProcedureInstance.revision
+            taskProcedureInstance.maintenanceActions.each {
+                result.taskProcedureRevision.addToMaintenanceActions(new MaintenanceAction(it.properties))
+            }
+            taskProcedureInstance.documentReferences.each {
+                result.taskProcedureRevision.addToDocumentReferences(new DocumentReference(it.properties))
+            }
+
+            if(result.taskProcedureRevision.hasErrors() || !result.taskProcedureRevision.save()) {
+                log.error result.taskProcedureRevision.errors
+                return fail(code:"default.create.failure")
+            }
+
+        } // end withTransaction
+
+        // Success.
+        return result
+    } // end createRevision()
+
 } // end class

trunk/grails-app/services/TaskRecurringScheduleService.groovy

@@ -68 +68 @@
                 p.targetStartDate = it.nextTargetStartDate
                 p.targetCompletionDate = it.nextTargetCompletionDate
-                if(it.task.taskProcedure) p.taskProcedure = it.task.taskProcedure
+                if(it.task.taskProcedureRevision) p.taskProcedureRevision = it.task.taskProcedureRevision
                 if(it.task.assignedGroups) p.assignedGroups = new ArrayList(it.task.assignedGroups)
                 if(it.task.assignedPersons) p.assignedPersons = new ArrayList(it.task.assignedPersons)

trunk/grails-app/services/TaskService.groovy

@@ -188 +188 @@
     * Creates a subTask copying sane attributes from the parentTask unless otherwise specified in params.
     * The targetStartDate and targetCompletionDate default to today since that is the sane thing to do.
-    * The taskProcedure is only assigned to the sub task if supplied in params.
+    * The taskProcedureRevision is only assigned to the sub task if supplied in params.
     * The assignedPersons and assignedGroups are only added to the sub task if supplied in params.
     * The positiveFault property is never set on the subTask.
@@ -228 +228 @@
 
         // Supplied by recurring tasks.
-        if(params.taskProcedure) p.taskProcedure = params.taskProcedure
+        if(params.taskProcedureRevision) p.taskProcedureRevision = params.taskProcedureRevision
         if(params.assignedGroups) p.assignedGroups = params.assignedGroups // Collection.
         if(params.assignedPersons) p.assignedPersons = params.assignedPersons // Collection.
@@ -691 +691 @@
             }
 
-            // Check for taskProcedure using this task as linkedTask.
-            if(result.taskInstance.taskProcedure?.linkedTask?.id == result.taskInstance.id)
-                return fail(field:"taskProcedure", code:"task.operationNotPermittedOnTaskLinkedToProcedure")
+            // Check for taskProcedureRevision using this task as linkedTask.
+            if(result.taskInstance.taskProcedureRevision?.linkedTask?.id == result.taskInstance.id) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskProcedureRevision", code:"task.operationNotPermittedOnTaskLinkedToProcedureWithoutAuth")
+            }
 
             // Check for Parent PM task type.
             if(result.taskInstance.taskType.id == 6)
-                return fail(field:"taskProcedure", code:"task.operationNotPermittedOnParentPmTask")
+                return fail(field:"taskType", code:"task.operationNotPermittedOnParentPmTask")
 
             result.taskInstance.trash = true