Skip to content

Update DB_AuditController.php #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PaintSplasher wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Update DB_AuditController.php #29

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8cd2d2
Update DB_AuditController.php
PaintSplasher Sep 26, 2025
d85f611
Update DB_AuditController.php
PaintSplasher Sep 26, 2025
dd0d018
Update DB_AuditController.php
PaintSplasher Sep 26, 2025
ae4903b
Update DB_AuditController.php
PaintSplasher Sep 26, 2025
c3fce87
StyleCI Fix
FatihKoz Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions Http/Controllers/DB_AuditController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
$path = $this->runExport($pireps, $header, $file_name);
$header = ['callsign', 'orig_icao', 'dest_icao', 'date', 'dep_time', 'arr_time', 'aircraft', $id_column];
$path = $this->runExport($pireps, $header, $file_name, $network_ids);

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');
Expand All @@ -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;
Expand All @@ -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 = [];

Expand All @@ -146,6 +158,8 @@ 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;
}
Expand Down