Changeset 654 for trunk/grails-app/domain/dbnp/studycapturing/Sample.groovy

Timestamp:

Jul 15, 2010, 2:26:48 PM (13 years ago)

Author:

keesvb

Message:

updated sample and study tests, added belongsTo to Sample (which gives it its parent), tried to write the unique name constraint of Sample and wrote a test for it

File:

• trunk/grails-app/domain/dbnp/studycapturing/Sample.groovy (modified) (4 diffs)

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

@@ -8 +8 @@
  */
 class Sample extends TemplateEntity {
-    static searchable = { [only: ['name']] }
-  
+        static searchable = { [only: ['name']] }
+
+        static belongsTo = [ parent : Study]
+
         Subject parentSubject
         SamplingEvent parentEvent
@@ -17 +19 @@
 
         def getExternalSampleId() { name }
-
-        // TODO: Write a validation method that checks if the externalSampleId (currently defined as name)
-        // is really unique within each parent study of this sample.
-        // Maybe this could also be a constraint, but we might run into trouble creating new Sample objects in e.g. the create wizard.
-        // To be checked.
 
         /**
@@ -32 +29 @@
                         name: 'name',
                         type: TemplateFieldType.STRING,
-                        preferredIdentifier: true
+                        preferredIdentifier: true,
+                        required: true
                 ),
                 new TemplateField(
@@ -42 +40 @@
         static constraints = {
                 parentSubject(nullable:true)
+                material(nullable: true)
+
+                // TODO: Write a validation method that checks if the externalSampleId (currently defined as name)
+                // is really unique within each parent study of this sample.
+                // Maybe this could also be a constraint, but we might run into trouble creating new Sample objects in e.g. the create wizard.
+                // To be checked.
+                // This feature is tested by integration test SampleTests.testSampleUniqueNameConstraint
+
+                /*name(validator: { fields, obj, errors ->
+                        def error = false
+
+                        if (fields) {
+                                // Search through all study
+                                if (obj.parent.samples.findAll({ it.name == fields}).size() != 1) {
+                                        errors.rejectValue(
+                                                'name',
+                                                'sample.name.NotUnique',
+                                                ['name',fields] as Object[],
+                                                'The sample name is not unique within the study'
+                                        )
+                                }
+                        }
+                        else {
+                                // If no value for name is specified, the sample should not validate
+                                error = true
+                        }
+
+                        return (!error)
+                })*/
         }
+
+        /*static def getParentStudies() {
+                Study.findAll {
+                        it.samples.findAll {
+                                it.name == this.name
+                        }
+                }
+        }*/
 
         static getSamplesFor( event ) {