Refactoring Simbrief fares and aircraft (#1054)

* Refactoring simbrief fares and aircraft

* Hide user full name/email

* Sort PIREP fields desc; fix cargo counts

* Change the sorting

* Extra logs

* Fix tests

* Return fare information through the API

* Style fixes

* Test fix

* Another test fix

* More fixes

* Set aircraft and fares in prefile

* Formatting

app/Http/Resources/Fare.php

@@ -17,6 +17,7 @@ class Fare extends Resource
             'name'     => $this->name,
             'capacity' => $this->capacity,
             'cost'     => $this->cost,
+            'count'    => $this->count ?? 0,
             'price'    => $this->price,
             'type'     => $this->type,
             'notes'    => $this->notes,

app/Http/Resources/SimBrief.php

@@ -11,9 +11,27 @@ class SimBrief extends Resource
 {
     public function toArray($request)
     {
-        return [
+        $data = [
             'id'  => $this->id,
             'url' => url(route('api.flights.briefing', ['id' => $this->id])),
         ];
+
+        try {
+            if (!empty($this->fare_data)) {
+                $fares = [];
+                $fare_data = json_decode($this->fare_data, true);
+                foreach ($fare_data as $fare) {
+                    $fares[] = new \App\Models\Fare($fare);
+                }
+
+                $this->aircraft->subfleet->fares = collect($fares);
+            }
+        } catch (\Exception $e) {
+            // Invalid fare data
+        }
+
+        $data['subfleet'] = new Subfleet($this->aircraft->subfleet);
+
+        return $data;
     }
 }

app/Http/Resources/User.php

@@ -15,9 +15,8 @@ class User extends Resource
             'id'            => $this->id,
             'pilot_id'      => $this->pilot_id,
             'ident'         => $this->ident,
-            'name'          => $this->name,
+            'name'          => $this->name_private,
             'name_private'  => $this->name_private,
-            'email'         => $this->email,
             'avatar'        => $this->resolveAvatarUrl(),
             'rank_id'       => $this->rank_id,
             'home_airport'  => $this->home_airport_id,