Get the correct ordering for flight route on map

nabeelio · Feb 21, 2018 · 7705599 · 7705599
1 parent ec9d00c
commit 7705599
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php
@@ -240,7 +240,7 @@ public function acars()
     {
         return $this->hasMany(Acars::class, 'pirep_id')
                     ->where('type', AcarsType::FLIGHT_PATH)
-                    ->orderBy('created_at', 'asc');
+                    ->orderBy('created_at', 'desc');
     }
 
     public function acars_logs()

diff --git a/app/Repositories/AcarsRepository.php b/app/Repositories/AcarsRepository.php
@@ -28,12 +28,18 @@ public function forPirep($pirep_id, $type)
             'type' => $type,
         ];
 
-        $order_by = 'created_at';
+        switch($type) {
-        if($type === AcarsType::ROUTE) {
+            default:
-            $order_by = 'order';
+            case AcarsType::FLIGHT_PATH:
+            case AcarsType::LOG:
+                $order_by = 'created_at';
+                break;
+            case AcarsType::ROUTE:
+                $order_by = 'order';
+                break;
         }
 
-        return $this->orderBy('order', 'asc')->findWhere($where);
+        return $this->orderBy($order_by, 'asc')->findWhere($where);
     }
 
     /**