Changeset 20 for trunk/grails-app/services/nl/tno/metagenomics/integration/TrashService.groovy

Timestamp:

Mar 22, 2011, 1:52:56 PM (11 years ago)

Author:

robert@…

Message:

Solved bug in moving data to trash

File:

• trunk/grails-app/services/nl/tno/metagenomics/integration/TrashService.groovy (modified) (3 diffs)

trunk/grails-app/services/nl/tno/metagenomics/integration/TrashService.groovy

@@ -27 +27 @@
                         }
                 }
-                
+                                
                 study.delete(flush:true);
         }
@@ -185 +185 @@
                                 // Move data from this assay sample to the trash version of it
                                 assaySample.moveValuableDataTo( dummyAssaySample );
+                                
+                                // Remove the assaySample from its run, since otherwise the statistics of the run (#sequences for example)
+                                // are not correct anymore and the assaySample will be resaved after delete
+                                dummyAssaySample.run?.removeFromAssaySamples( dummyAssaySample );
+                                
                                 dummyAssaySample.save();
+                        }
+                }
+                
+                // Remove all assaysamples from this assay from their run
+                assay.assaySamples?.each { assaySample ->
+                        assaySample.run?.removeFromAssaySamples( assaySample );
+                }
+                
+                // Remove this assay from the runs, since otherwise the samples will be resaved upon delete
+                if( assay.runs ) {
+                        def l = [] + assay.runs
+                        l.each {
+                                it.removeFromAssays( assay );
                         }
                 }
@@ -232 +250 @@
                                 // Move data from this assay sample to the trash version of it
                                 assaySample.moveValuableDataTo( dummyAssaySample );
+                                
+                                // Remove the assaySample from its run, since otherwise the statistics of the run (#sequences for example)
+                                // are not correct anymore
+                                dummyAssaySample.run?.removeFromAssaySamples( dummyAssaySample );
+
                                 dummyAssaySample.save();
                         }
+                }
+                
+                // Remove all assaysamples from this assay from their run
+                sample.assaySamples?.each { assaySample ->
+                        assaySample.run?.removeFromAssaySamples( assaySample );
                 }
         }