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

Timestamp:

Jan 26, 2011, 5:08:25 PM (11 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/AssaySample.groovy (modified) (5 diffs)

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

@@ -17 +17 @@
         String tagSequence              // Tag originally used to identify the sample
 
-        static belongsTo  = [ assay: Assay, sample: Sample ]
+        static belongsTo  = [ assay: Assay, sample: Sample, run: Run ]
         static hasMany    = [ sequenceData: SequenceData ]
 
@@ -24 +24 @@
                 oligoNumber(nullable: true)
                 tagSequence(nullable: true)
+                run(nullable: true);
         }
 
@@ -30 +31 @@
                         numSequences index:'numsequences_idx'
                 }
+                sequenceData cascade: "all-delete-orphan"
         }
 
@@ -162 +164 @@
                 otherAssaySample.tagSequence = tagSequence;
                 otherAssaySample.oligoNumber = oligoNumber;
+                otherAssaySample.run         = run;
                 
                 // Move attached data
@@ -169 +172 @@
                 if( dataList && dataList.size() > 0 ) {
                         for( def j = dataList.size() - 1; j >= 0; j-- ) {
-                                // Check whether the run of this sequenceData object is also connected to the assay
-                                def run = dataList[j].run;
-                                
-                                if( !otherAssay.runs || !otherAssay.runs.contains( run ) ) {
-                                        otherAssay.addToRuns( run );
-                                }
-                                
                                 // Copy data
                                 dataList[j].sample = otherAssaySample;