Changeset 812 for trunk/grails-app/domain

Timestamp:

Aug 16, 2010, 6:04:00 PM (12 years ago)

Author:

keesvb

Message:

added Sample tests for deleting samples via parent sampling event and event group, corrected some small errors, updated BootStrap? to find out why Sample.parentEvent gets serialized into the db, still no luck...

Location:

trunk/grails-app/domain/dbnp/studycapturing

Files:

• Sample.groovy (modified) (1 diff)
• SamplingEvent.groovy (modified) (1 diff)
• Study.groovy (modified) (3 diffs)

trunk/grails-app/domain/dbnp/studycapturing/Sample.groovy

@@ -12 +12 @@
 
         // A Sample always belongs to one study.
-        static belongsTo = [parent : Study]
+        static belongsTo = [parent : Study, parentSubject : Subject, parentEvent : SamplingEvent]
 
         // A Sample optionally has a parent Subject from which it was taken, this Subject should be in the same parent study.
-        Subject parentSubject
+        //long parentSubject
 
         // Also, it has a parent SamplingEvent describing the actual sampling, also within the same parent study.
-        SamplingEvent parentEvent
+        // Strange enough, we need to define parentEvent as a long here, otherwise the SamplingEvent gets serialized into the database (?!!)
+        //long parentEvent
 
         String name             // should be unique with respect to the parent study (which can be inferred)

trunk/grails-app/domain/dbnp/studycapturing/SamplingEvent.groovy

@@ -89 +89 @@
                 return samples == null ? [] : samples
         }
+
+        def String toString() {
+                return fieldExists('Description') ? getFieldValue('Description') : ""
+        }
+        
 }

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -237 +237 @@
                 }
 
-                // remove event from the study
+                // Delete the samples that have this sampling event as parent
+                this.samples.findAll { it.parentEvent.equals(samplingEvent) }.each {
+                        // This should remove the sample itself too, because of the cascading belongsTo relation
+                        this.removeFromSamples(it)
+                        // But apparently it needs an explicit delete() too
+                        it.delete()
+                        msg += ", sample '${it.name}' was deleted"
+                }
+
+                // Remove event from the study
+                // This should remove the event group itself too, because of the cascading belongsTo relation
                 this.removeFromSamplingEvents(samplingEvent)
+                // But apparently it needs an explicit delete() too
+                // (Which can be verified by outcommenting this line, then SampleTests.testDeleteViaParentSamplingEvent fails
+                samplingEvent.delete()
 
                 return msg
@@ -300 +313 @@
                                 // -------
 
-                                println ".removing sample '${it.name}' from study '${this.name}'"
+                                println ".removing sample '${it.name}' from study '${this.title}'"
                                 msg += ", sample '${it.name}' was deleted"
                                 this.removeFromSamples( it )
@@ -321 +334 @@
 
                 // remove the eventGroup from the study
-                println ".remove eventGroup '${eventGroup.name}' from study '${this.name}'"
+                println ".remove eventGroup '${eventGroup.name}' from study '${this.title}'"
                 this.removeFromEventGroups(eventGroup)