FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow nullable field and calculate distance if nulled for flight import #478 (#482)

Browse Source
This commit is contained in:
Nabeel S
2019-12-25 17:16:34 +05:00
committed by GitHub
parent 17637c32d4
commit 4f4d0c266a
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Services/ImportExport/FlightImporter.php
View File

@@ -3,7 +3,6 @@
namespace App\Services\ImportExport; namespace App\Services\ImportExport;
use App\Contracts\ImportExport; use App\Contracts\ImportExport;
use App\Models\Airport;
use App\Models\Enums\Days; use App\Models\Enums\Days;
use App\Models\Enums\FlightType; use App\Models\Enums\FlightType;
use App\Models\Fare; use App\Models\Fare;
@@ -37,7 +36,7 @@ class FlightImporter extends ImportExport
'dpt_time' => 'nullable', 'dpt_time' => 'nullable',
'arr_time' => 'nullable', 'arr_time' => 'nullable',
'level' => 'nullable|integer', 'level' => 'nullable|integer',
'distance' => 'required|numeric', 'distance' => 'nullable|numeric',
'flight_time' => 'required|integer', 'flight_time' => 'required|integer',
'flight_type' => 'required|alpha', 'flight_type' => 'required|alpha',
'route' => 'nullable', 'route' => 'nullable',
@@ -109,6 +108,14 @@ class FlightImporter extends ImportExport
// Any specific transformations // Any specific transformations
// Check/calculate the distance
if (empty($row['distance'])) {
$row['distance'] = $this->airportSvc->calculateDistance(
$row['dpt_airport'],
$row['arr_airport']
);
}
// Check for a valid value // Check for a valid value
$flight_type = $row['flight_type']; $flight_type = $row['flight_type'];
if (!array_key_exists($flight_type, FlightType::labels())) { if (!array_key_exists($flight_type, FlightType::labels())) {

5
tests/ImporterTest.php
View File

@@ -19,9 +19,6 @@ use App\Services\ImportExport\FlightExporter;
use App\Services\ImportService; use App\Services\ImportService;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
/**
* Class ImporterTest
*/
class ImporterTest extends TestCase class ImporterTest extends TestCase
{ {
private $importBaseClass; private $importBaseClass;
@@ -470,7 +467,7 @@ class ImporterTest extends TestCase
$file_path = base_path('tests/data/flights.csv'); $file_path = base_path('tests/data/flights.csv');
$status = $this->importSvc->importFlights($file_path); $status = $this->importSvc->importFlights($file_path);
$this->assertCount(1, $status['success']); $this->assertCount(2, $status['success']);
$this->assertCount(1, $status['errors']); $this->assertCount(1, $status['errors']);
// See if it imported // See if it imported

1
tests/data/flights.csv
View File

@@ -1,3 +1,4 @@
airline,flight_number,route_code,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,route,notes,active,subfleets,fares,fields airline,flight_number,route_code,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,route,notes,active,subfleets,fares,fields
VMS,1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41 VMS,1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
" ",1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41 " ",1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
VMS,113,,,KJFK,KAUS,KDFW,15,0810 EST,1035 CST,350,,207,J,,"Empty distance",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=C41;Arrival Gate=2
1 airline flight_number route_code route_leg dpt_airport arr_airport alt_airport days dpt_time arr_time level distance flight_time flight_type route notes active subfleets fares fields
2 VMS 1972 KAUS KJFK KLGA 15 0810 CST 1235 EST 350 1477 207 J ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6 Just a flight 1 A32X Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B? Departure Gate=4;Arrival Gate=C41
3 1972 KAUS KJFK KLGA 15 0810 CST 1235 EST 350 1477 207 J ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6 Just a flight 1 A32X Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B? Departure Gate=4;Arrival Gate=C41
4 VMS 113 KJFK KAUS KDFW 15 0810 EST 1035 CST 350 207 J Empty distance 1 A32X Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B? Departure Gate=C41;Arrival Gate=2