From c8cd2d23e0a223b2665ad2ec70d7e4dc213c78f5 Mon Sep 17 00:00:00 2001
From: Thorsten <39538545+PaintSplasher@users.noreply.github.com>
Date: Fri, 26 Sep 2025 16:34:07 +0200
Subject: [PATCH 1/5] Update DB_AuditController.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VATSIM now requires the pilot’s corresponding VATSIM ID for each flown and submitted flight for auditing purposes.

- Added connection VATSIM ID/IVAO ID to the PIREP.
- Added a column to the CSV for 'ivao_id' or 'vatsim_id'.
---
 Http/Controllers/DB_AuditController.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Http/Controllers/DB_AuditController.php b/Http/Controllers/DB_AuditController.php
index f3a4e52..fc2ec54 100644
--- a/Http/Controllers/DB_AuditController.php
+++ b/Http/Controllers/DB_AuditController.php
@@ -102,14 +102,26 @@ public function export_pireps(Request $request)
         $end = Carbon::parse($request->end);
         $pireps = Pirep::with(['aircraft', 'airline', 'user', 'field_values'])->whereIn('id', json_decode($request->pireps))->orderBy('submitted_at')->get();
 
+        if ($network === 'ivao') {
+            $network_field_name = DB_Setting('dbasic.networkcheck_fieldname_ivao', 'IVAO ID');
+            $id_column = 'ivao_id';
+        } else {
+            $network_field_name = DB_Setting('dbasic.networkcheck_fieldname_vatsim', 'VATSIM ID');
+            $id_column = 'vatsim_id';
+        }
+
+        $network_field_name = DB_Setting('dbasic.networkcheck_fieldname_vatsim', 'VATSIM ID');
+        $network_field_id = optional(UserField::select('id')->where('name', $network_field_name)->first())->id;
+        $network_ids = UserFieldValue::where('user_field_id', $network_field_id)->whereNotNull('value')->pluck('value', 'user_id')->toArray();
+
         $file_name = strtolower($network).'-audit-pireps-'.$start->format('dMY').'-'.$end->format('dMY').'.csv';
-        $header = ['callsign', 'orig_icao', 'dest_icao', 'date', 'dep_time', 'arr_time', 'aircraft'];
+        $header = ['callsign', 'orig_icao', 'dest_icao', 'date', 'dep_time', 'arr_time', 'aircraft', $id_column];];
         $path = $this->runExport($pireps, $header, $file_name);
 
         return response()->download($path, $file_name, ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
     }
 
-    protected function runExport(Collection $collection, $columns, $filename): string
+    protected function runExport(Collection $collection, $columns, $filename, $network_ids = []): string
     {
         // Create the directory under storage/app
         Storage::makeDirectory('export');
@@ -120,7 +132,7 @@ protected function runExport(Collection $collection, $columns, $filename): strin
         $writer->insertOne($columns);
         // Write the rest of the rows
         foreach ($collection as $row) {
-            $writer->insertOne($this->ProcessRow($row, $columns));
+            $writer->insertOne($this->ProcessRow($row, $columns, $network_ids));
         }
 
         return $path;
@@ -134,7 +146,7 @@ protected function openCsv($path): Writer
         return $writer;
     }
 
-    protected function ProcessRow($row, $columns): array
+    protected function ProcessRow($row, $columns, $network_ids = []): array
     {
         $ret = [];
 
@@ -146,6 +158,9 @@ protected function ProcessRow($row, $columns): array
         $ret['dep_time'] = $row->block_off_time->format('H:i');
         $ret['arr_time'] = $row->block_on_time->format('H:i');
         $ret['aircraft'] = $row->aircraft->icao;
+        
+        $last_column = end($columns);
+        $ret[$last_column] = $network_ids[$row->user_id] ?? '';
 
         return $ret;
     }

From d85f6113603d00d0c223aed87e54c3277240ef69 Mon Sep 17 00:00:00 2001
From: Thorsten <39538545+PaintSplasher@users.noreply.github.com>
Date: Fri, 26 Sep 2025 16:44:40 +0200
Subject: [PATCH 2/5] Update DB_AuditController.php

- Typo fix ( ]; )
---
 Http/Controllers/DB_AuditController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Http/Controllers/DB_AuditController.php b/Http/Controllers/DB_AuditController.php
index fc2ec54..1ba3258 100644
--- a/Http/Controllers/DB_AuditController.php
+++ b/Http/Controllers/DB_AuditController.php
@@ -115,7 +115,7 @@ public function export_pireps(Request $request)
         $network_ids = UserFieldValue::where('user_field_id', $network_field_id)->whereNotNull('value')->pluck('value', 'user_id')->toArray();
 
         $file_name = strtolower($network).'-audit-pireps-'.$start->format('dMY').'-'.$end->format('dMY').'.csv';
-        $header = ['callsign', 'orig_icao', 'dest_icao', 'date', 'dep_time', 'arr_time', 'aircraft', $id_column];];
+        $header = ['callsign', 'orig_icao', 'dest_icao', 'date', 'dep_time', 'arr_time', 'aircraft', $id_column];
         $path = $this->runExport($pireps, $header, $file_name);
 
         return response()->download($path, $file_name, ['content-type' => 'text/csv'])->deleteFileAfterSend(true);

From dd0d018e340155b0c19ee7e8a56b0125c2f229b5 Mon Sep 17 00:00:00 2001
From: Thorsten <39538545+PaintSplasher@users.noreply.github.com>
Date: Fri, 26 Sep 2025 16:47:46 +0200
Subject: [PATCH 3/5] Update DB_AuditController.php

---
 Http/Controllers/DB_AuditController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Http/Controllers/DB_AuditController.php b/Http/Controllers/DB_AuditController.php
index 1ba3258..35ff449 100644
--- a/Http/Controllers/DB_AuditController.php
+++ b/Http/Controllers/DB_AuditController.php
@@ -116,7 +116,7 @@ public function export_pireps(Request $request)
 
         $file_name = strtolower($network).'-audit-pireps-'.$start->format('dMY').'-'.$end->format('dMY').'.csv';
         $header = ['callsign', 'orig_icao', 'dest_icao', 'date', 'dep_time', 'arr_time', 'aircraft', $id_column];
-        $path = $this->runExport($pireps, $header, $file_name);
+        $path = $this->runExport($pireps, $header, $file_name, $network_ids);
 
         return response()->download($path, $file_name, ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
     }

From ae4903bf0df18a7b8cad220a84e4b650bf1ea8fa Mon Sep 17 00:00:00 2001
From: Thorsten <39538545+PaintSplasher@users.noreply.github.com>
Date: Fri, 26 Sep 2025 16:48:56 +0200
Subject: [PATCH 4/5] Update DB_AuditController.php

- StyleCI fix
---
 Http/Controllers/DB_AuditController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Http/Controllers/DB_AuditController.php b/Http/Controllers/DB_AuditController.php
index 35ff449..cbada95 100644
--- a/Http/Controllers/DB_AuditController.php
+++ b/Http/Controllers/DB_AuditController.php
@@ -157,8 +157,7 @@ protected function ProcessRow($row, $columns, $network_ids = []): array
         $ret['date'] = $row->submitted_at->format('d.M.Y');
         $ret['dep_time'] = $row->block_off_time->format('H:i');
         $ret['arr_time'] = $row->block_on_time->format('H:i');
-        $ret['aircraft'] = $row->aircraft->icao;
-        
+        $ret['aircraft'] = $row->aircraft->icao;        
         $last_column = end($columns);
         $ret[$last_column] = $network_ids[$row->user_id] ?? '';
 

From c3fce876316d8535b2434d09a8cc73a03d5e2b83 Mon Sep 17 00:00:00 2001
From: "B.Fatih KOZ" <fatih.koz@gmail.com>
Date: Fri, 26 Sep 2025 18:01:56 +0300
Subject: [PATCH 5/5] StyleCI Fix

---
 Http/Controllers/DB_AuditController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Http/Controllers/DB_AuditController.php b/Http/Controllers/DB_AuditController.php
index cbada95..72decee 100644
--- a/Http/Controllers/DB_AuditController.php
+++ b/Http/Controllers/DB_AuditController.php
@@ -157,7 +157,7 @@ protected function ProcessRow($row, $columns, $network_ids = []): array
         $ret['date'] = $row->submitted_at->format('d.M.Y');
         $ret['dep_time'] = $row->block_off_time->format('H:i');
         $ret['arr_time'] = $row->block_on_time->format('H:i');
-        $ret['aircraft'] = $row->aircraft->icao;        
+        $ret['aircraft'] = $row->aircraft->icao;
         $last_column = end($columns);
         $ret[$last_column] = $network_ids[$row->user_id] ?? '';