Changeset 7 for trunk/grails-app/domain/nl/tno/metagenomics/Run.groovy

Timestamp:

Jan 26, 2011, 5:08:25 PM (12 years ago)

Author:

robert@…

Message:

• Created tests for the synchronization and trash
• Improved synchronizationservice and trash
• Put authorization checks in several pages

File:

• trunk/grails-app/domain/nl/tno/metagenomics/Run.groovy (modified) (4 diffs)

trunk/grails-app/domain/nl/tno/metagenomics/Run.groovy

@@ -18 +18 @@
         String  parameterFile
 
-        static hasMany = [sequenceData: SequenceData, assays: Assay]
+        static hasMany = [assaySamples: AssaySample, assays: Assay]
         static belongsTo = Assay        // Only used to determine the owner of the many-to-many relationship assay-run
 
@@ -71 +71 @@
          */
         public int numFiles() {
-                if( !sequenceData )
+                if( !assaySamples )
                         return 0
 
                 int numFiles = 0;
-                sequenceData.each { numFiles += it.numFiles() }
+                assaySamples.each { numFiles += it.numFiles() }
 
                 return numFiles;
@@ -86 +86 @@
          */
         public long numSequences() {
-                if( !sequenceData )
+                if( !assaySamples )
                         return 0
 
                 long numSequences = 0;
-                sequenceData.each { numSequences += it.numSequences }
+                assaySamples.each { numSequences += it.numSequences() }
 
                 return numSequences;
@@ -101 +101 @@
          */
         public ArrayList samples( def assayId ) {
-                if( !sequenceData )
+                if( !assaySamples )
                         return []
 
                 def list = []
-                sequenceData.each {
-                        if( it.sample.assay.id == assayId )
-                                list << it.sample
+                assaySamples.each {
+                        if( it.assay.id == assayId )
+                                list << it
                 }