Changeset 398

Timestamp:

May 10, 2010, 4:29:04 PM (13 years ago)

Author:

keesvb

Message:

added Ontology/Term? and Subject integration tests

Location:

trunk

Files:

• grails-app/domain/dbnp/data/Ontology.groovy (modified) (1 diff)
• grails-app/domain/dbnp/data/Term.groovy (modified) (1 diff)
• test/integration/gscf (added)
• test/integration/gscf/OntologyTests.groovy (added)
• test/integration/gscf/SubjectTests.groovy (added)

trunk/grails-app/domain/dbnp/data/Ontology.groovy

@@ -19 +19 @@
         int ncboId              // BioPortal: ontologyId
         int ncboVersionedId     // BioPortal: id
+
+        /**
+         * Find child terms
+         * @return A set containing all terms that reside under this ontology
+         */
+        Set<Term> giveTerms() {
+                Term.findAllByOntology(this)
+        }
+
+        Object giveTermByName(String name) {
+                giveTerms().find {
+                        it.name == name
+                }
+
+                /* TODO: find out why the following doesn't work (probably more efficient):
+                Term.find {
+                        it.name == name
+                        it.ontology == this
+                }
+                }*/
+        }
 }

trunk/grails-app/domain/dbnp/data/Term.groovy

@@ -18 +18 @@
 
         String name             // BioPortal: label (preferred name)
-        Ontology ontology       // Parent ontology
+        Ontology ontology       // Parent ontology. To enable the unique constraints, we describe the Ontology-Term relation here
         String accession        // BioPortal: conceptId
 
         static constraints = {
-                accession(unique: 'ontology')
+                accession(unique: 'ontology')   // Accession should be unique within an ontology
+                name(unique: 'ontology')        // Preferred name should be unique within an ontology
         }