Changeset 798 for trunk/grails-app/services

Timestamp:

Feb 8, 2011, 11:00:27 PM (14 years ago)

Author:

gav

Message:

Svn merge -r752:r797 branches/features/taskProcedureRework into trunk/.

Location:

trunk/grails-app/services

Files:

• AssetService.groovy (modified) (1 diff)
• CreateDataService.groovy (modified) (5 diffs)
• TaskProcedureService.groovy (copied) (copied from branches/features/taskProcedureRework/grails-app/services/TaskProcedureService.groovy)

trunk/grails-app/services/AssetService.groovy

@@ -22 +22 @@
                 }
         }
+    }
+
+    /**
+    * Determines and returns a list of assemblies for an asset.
+    * This is purely a 'load from database' type method since a new hibernateSession is used.
+    * @params Asset to get the subItems for.
+    * @returns A list of the assemblies.
+    */
+    def getAssemblies(asset) {
+        def assemblies = []
+        if(!(asset instanceof Asset))
+            return assemblies
+        // Database efficiency:
+        // The asset is configured to batch fetch assetSubItems which
+        // in turn are configured to batch fetch subItems.
+        Asset.withNewSession {
+            Asset.get(asset.id).assetSubItems.each {
+                assemblies.addAll(it.subItems)
+            }
+        }
+        assemblies.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+        return assemblies
     }
 

trunk/grails-app/services/CreateDataService.groovy

@@ -3 +3 @@
 /**
 * Provides a data service to create base and demo data.
-* Beware that most, if not all, base data is referenced by "Id" throughout the program.
+* Beware that most, if not all, BASE data is referenced by "Id" throughout the program.
 * This allows changing the text of the 'name' property to something of the same meaning.
 * But be sure to maintain the correct Id during creation, indicated by #1, #2 etc.
+* Task.list()[0] is used to allow integration testing with DEMO data, where Id's may change due to create-delete.
 */
 class  CreateDataService {
@@ -846 +847 @@
         //Task #1
         p = [taskGroup:TaskGroup.findByName("Engineering Activites"),
-                taskPriority:TaskPriority.get(2),
+                taskPriority:TaskPriority.get(1),
                 taskType:TaskType.get(1),
                 leadPerson:Person.get(2),
@@ -1097 +1098 @@
         //TaskProcedure
         def taskProcedureInstance
-
-        taskProcedureInstance = new TaskProcedure(name: "Daily check")
+        def taskInstance
+        def person = Person.get(3)
+
+        taskInstance = Task.list()[6]
+        taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance,
+                                                                                    createdBy: person,
+                                                                                    lastUpdatedBy: person)
         saveAndTest(taskProcedureInstance)
-        taskProcedureInstance.addToTasks(Task.list()[0])
-
-        taskProcedureInstance = new TaskProcedure(name: "100hr Service")
+        taskProcedureInstance.addToTasks(taskInstance)
+
+        taskInstance = Task.list()[4]
+        taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance,
+                                                                                    createdBy: person,
+                                                                                    lastUpdatedBy: person)
         saveAndTest(taskProcedureInstance)
-        taskProcedureInstance.addToTasks(Task.list()[6])
+        taskProcedureInstance.addToTasks(taskInstance)
     }
 
@@ -1111 +1120 @@
         //MaintenanceAction
         def maintenanceActionInstance
+        def taskProcedure = TaskProcedure.get(1)
+        def assetSubItem = AssetSubItem.get(6)
 
         //MaintenanceAction #1
         maintenanceActionInstance = new MaintenanceAction(description: "Check all E-stops, activate E-stops S1-S12 and ensure machine cannot run",
                                                                                                         procedureStepNumber: 10,
-                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        assetSubItem: assetSubItem,
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
 
         //MaintenanceAction #2
         maintenanceActionInstance = new MaintenanceAction(description: "Do more pushups",
                                                                                                         procedureStepNumber: 20,
-                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        assetSubItem: assetSubItem,
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
 
         //MaintenanceAction #3
         maintenanceActionInstance = new MaintenanceAction(description: "Ok just one more pushup",
                                                                                                         procedureStepNumber: 30,
-                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        assetSubItem: assetSubItem,
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
+
+        saveAndTest(taskProcedure)
     }
 
@@ -1475 +1488 @@
                                                                 section: Section.get(1))
         saveAndTest(assetInstance1)
-//        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
 
         //Asset #2