Moved misuse filtering logic to an accessor on Run.

Author: joschli

mubench.reviewsite/src/Controllers/RunsController.php

@@ -229,33 +229,7 @@ static function getRuns($detector, $experiment, $max_reviews)
         $runs = Run::of($detector)->in($experiment)->orderBy('project_muid')->orderBy('version_muid')->get();
 
         foreach($runs as $run){
-            $conclusive_reviews = 0;
-            $filtered_misuses = new Collection;
-            $misuses = $run->misuses->sortBy('misuse_muid', SORT_NATURAL);
-            if($experiment->id === 1) {
-                foreach($misuses as $misuse){
-                    if($misuse->metadata && !$misuse->metadata->correct_usages->isEmpty()){
-                        $filtered_misuses->add($misuse);
-                    }
-                }
-            } else if($experiment->id === 2) {
-                foreach ($misuses as $misuse) {
-                    if ($conclusive_reviews >= $max_reviews) {
-                        break;
-                    }
-                    $filtered_misuses->add($misuse);
-                    if ($misuse->hasConclusiveReviewState() || (!$misuse->hasSufficientReviews() && !$misuse->hasInconclusiveReview())) {
-                        $conclusive_reviews++;
-                    }
-                }
-            } else {
-                foreach($misuses as $misuse){
-                    if($misuse->metadata){
-                        $filtered_misuses->add($misuse);
-                    }
-                }
-            }
-            $run->misuses = $filtered_misuses;
+            $run->misuses = $run->getMisuses($experiment, $max_reviews);
         }
 
         return $runs;

mubench.reviewsite/src/Models/Run.php

@@ -2,6 +2,7 @@
 
 namespace MuBench\ReviewSite\Models;
 
+use Illuminate\Database\Eloquent\Collection;
 
 class Run extends DetectorDependent
 {
@@ -14,4 +15,35 @@ public function misuses()
     {
         return $this->hasMany(Misuse::class, 'run_id', 'id')->where('detector_id', $this->detector->id);
     }
+
+    public function getMisuses($experiment, $max_review_size)
+    {
+        $filtered_misuses = new Collection;
+        $misuses = $this->misuses->sortBy('misuse_muid', SORT_NATURAL);
+        if($experiment->id === 1) {
+            foreach($misuses as $misuse){
+                if($misuse->metadata && !$misuse->metadata->correct_usages->isEmpty()){
+                    $filtered_misuses->add($misuse);
+                }
+            }
+        } else if($experiment->id === 2) {
+            $conclusive_reviews = 0;
+            foreach ($misuses as $misuse) {
+                if ($conclusive_reviews >= $max_review_size) {
+                    break;
+                }
+                $filtered_misuses->add($misuse);
+                if ($misuse->hasConclusiveReviewState() || (!$misuse->hasSufficientReviews() && !$misuse->hasInconclusiveReview())) {
+                    $conclusive_reviews++;
+                }
+            }
+        } else {
+            foreach($misuses as $misuse){
+                if($misuse->metadata){
+                    $filtered_misuses->add($misuse);
+                }
+            }
+        }
+        return $filtered_misuses;
+    }
 }