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

Timestamp:

Jul 21, 2010, 4:52:12 PM (7 years ago)

Author:

keesvb

Message:

finally added the uniqueness constraint for sample names. it's real simple after all now we have the belongsTo

File:

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

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

@@ -2 +2 @@
 
 import dbnp.data.Term
-import dbnp.data.Ontology
 
 /**
@@ -44 +43 @@
                 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.
+                // Checks if the externalSampleId (currently defined as name) is really unique within each parent study of this sample.
                 // 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)
-                })*/
+                name(unique:['parent'])
         }
-
-        /*static def getParentStudies() {
-                Study.findAll {
-                        it.samples.findAll {
-                                it.name == this.name
-                        }
-                }
-        }*/
 
         static getSamplesFor( event ) {