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/Models/Fare.php

@@ -20,12 +20,14 @@ class Fare extends Model
     public $table = 'fares';
 
     protected $fillable = [
+        'id',
         'code',
         'name',
         'type',
         'price',
         'cost',
         'capacity',
+        'count',
         'notes',
         'active',
     ];
@@ -34,6 +36,7 @@ class Fare extends Model
         'price'    => 'float',
         'cost'     => 'float',
         'capacity' => 'integer',
+        'count'    => 'integer',
         'type'     => 'integer',
         'active'   => 'boolean',
     ];

app/Models/Pirep.php

@@ -305,7 +305,9 @@ class Pirep extends Model
     public function getFieldsAttribute()
     {
         $custom_fields = PirepField::all();
-        $field_values = PirepFieldValue::where('pirep_id', $this->id)->get();
+        $field_values = PirepFieldValue::where('pirep_id', $this->id)
+            ->orderBy('created_at', 'asc')
+            ->get();
 
         // Merge the field values into $fields
         foreach ($custom_fields as $field) {
@@ -321,7 +323,7 @@ class Pirep extends Model
             }
         }
 
-        return $field_values->sortBy('source');
+        return $field_values;
     }
 
     /**

app/Models/SimBrief.php

@@ -13,11 +13,13 @@ use Illuminate\Support\Collection;
  * @property string      $acars_xml
  * @property string      $ofp_xml
  * @property string      $ofp_html
+ * @property string      $fare_data            JSON string of the fare data that was generated
  * @property Collection  $images
  * @property Collection  $files
  * @property Flight      $flight
  * @property User        $user
  * @property SimBriefXML $xml
+ * @property Aircraft    $aircraft
  * @property string      $acars_flightplan_url
  */
 class SimBrief extends Model
@@ -29,9 +31,11 @@ class SimBrief extends Model
         'id',
         'user_id',
         'flight_id',
+        'aircraft_id',
         'pirep_id',
         'acars_xml',
         'ofp_xml',
+        'fare_data',
         'created_at',
         'updated_at',
     ];
@@ -80,6 +84,11 @@ class SimBrief extends Model
      * Relationships
      */
 
+    public function aircraft()
+    {
+        return $this->belongsTo(Aircraft::class, 'aircraft_id');
+    }
+
     public function flight()
     {
         if (!empty($this->attributes['flight_id'])) {