Changeset 4 for trunk/grails-app/domain

Timestamp:

Jan 17, 2011, 3:49:20 PM (13 years ago)

Author:

robert@…

Message:

Implemented trash in order to prevent deletion of data

Location:

trunk/grails-app/domain/nl/tno/metagenomics

Files:

• AssaySample.groovy (modified) (1 diff)
• Study.groovy (modified) (3 diffs)

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

@@ -142 +142 @@
                 _averageQuality = -1;
         }
+        
+        /**
+         * Check whether this assay-sample combination contains information that should be saved in trash on a delete
+         * @return
+         */
+        public boolean containsData() {
+                return tagSequence || oligoNumber || numFiles() > 0;
+        }
+        
+        /**
+         * Move information that should be kept on delete to another assaySample object.
+         * 
+         * N.B. The sequencedata objects are really moved, so removed from the original object!
+         * 
+         * @param otherAssaySample      Object to move
+         */
+        public void moveValuableDataTo( AssaySample otherAssaySample ) {
+                // Copy properties
+                otherAssaySample.tagSequence = tagSequence;
+                otherAssaySample.oligoNumber = oligoNumber;
+                
+                // Move attached data
+                def dataList = sequenceData?.toList()
+                def otherAssay = otherAssaySample.assay;
+                
+                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;
+                                this.removeFromSequenceData( dataList[j] );
+                                otherAssaySample.addToSequenceData( dataList[j] );
+                                dataList[j].save();
+                        }
+                }
+        }
 }

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

@@ -13 +13 @@
         String studyToken
         String name
+
+        // Set to true only on the specific study object that acts as
+        // a trash can for deleted objects. If objects are deleted in GSCF but still
+        // contain data in this module, they will be moved to the trashcan.
+        Boolean trashcan = false 
         
         // If a study is set to be dirty, it should be updated
@@ -31 +36 @@
         static constraints = {
                 studyToken(unique:true)
+                trashcan(nullable:true)
+                isDirty(nullable:true)
         }
         
@@ -70 +77 @@
                 return authorization.isOwner
         }
+
 }