+
@lang('common.subfleet')
+ {{ Form::select('subfleet_id', $subfleets, null , ['class' => 'form-control select2']) }}
+
{{ Form::submit(__('common.find'), ['class' => 'btn btn-primary']) }}
@lang('common.reset')
diff --git a/swagger.yml b/swagger.yml
index 9c2d9e65..06b7e87b 100644
--- a/swagger.yml
+++ b/swagger.yml
@@ -23,6 +23,11 @@ paths:
type: string
required: false
description: ID of the airline
+ - name: subfleet_id
+ in: query
+ type: string
+ required: false
+ description: 'The subfleet to search on. Flights would be returned, but if the subfleets are empty, that means the pilot doesn\'t have permissions for that flight'
- name: flight_number
in: query
type: string
@@ -48,11 +53,11 @@ paths:
type: integer
required: false
description: Flights with a distance greater than
- - name: dgt
+ - name: dlt
in: query
type: integer
required: false
- description: Flights with a distance greater than
+ description: Flights with a distance less than
produces:
- application/json
responses:
diff --git a/tests/FlightTest.php b/tests/FlightTest.php
index 7aa10e01..e61ce6e5 100644
--- a/tests/FlightTest.php
+++ b/tests/FlightTest.php
@@ -1,6 +1,9 @@
settingsRepo = app(SettingRepository::class);
}
+ /**
+ * Add a single flight
+ *
+ * @param $user
+ *
+ * @return mixed
+ */
public function addFlight($user)
{
$flight = factory(App\Models\Flight::class)->create([
@@ -36,6 +46,25 @@ class FlightTest extends TestCase
return $flight;
}
+ /**
+ * Add a given number of flights for a subfleet
+ *
+ * @param $subfleet
+ * @param $num_flights
+ *
+ * @return \App\Models\Flight[]
+ */
+ public function addFlightsForSubfleet($subfleet, $num_flights)
+ {
+ return factory(App\Models\Flight::class, $num_flights)->create([
+ 'airline_id' => $subfleet->airline->id,
+ ])->each(function (Flight $f) use ($subfleet) {
+ $f->subfleets()->syncWithoutDetaching([
+ $subfleet->id,
+ ]);
+ });
+ }
+
/**
* Test adding a flight and also if there are duplicates
*/
@@ -148,10 +177,7 @@ class FlightTest extends TestCase
$this->assertEquals($first_point['id'], $route[0]->id);
$this->assertEquals($first_point['name'], $route[0]->name);
$this->assertEquals($first_point['type']['type'], $route[0]->type);
- $this->assertEquals(
- $first_point['type']['name'],
- \App\Models\Enums\NavaidType::label($route[0]->type)
- );
+ $this->assertEquals($first_point['type']['name'], NavaidType::label($route[0]->type));
}
/**
@@ -173,6 +199,38 @@ class FlightTest extends TestCase
$res->assertJsonCount(5, 'data');
}
+ /**
+ * Search for flights based on a subfleet. If subfleet is blank
+ */
+ public function testSearchFlightBySubfleet()
+ {
+ $airline = factory(App\Models\Airline::class)->create();
+ $subfleetA = factory(App\Models\Subfleet::class)->create(['airline_id' => $airline->id]);
+ $subfleetB = factory(App\Models\Subfleet::class)->create(['airline_id' => $airline->id]);
+
+ $rank = $this->createRank(0, [$subfleetB->id]);
+ $this->user = factory(App\Models\User::class)->create([
+ 'airline_id' => $airline->id,
+ 'rank_id' => $rank->id,
+ ]);
+
+ $this->addFlightsForSubfleet($subfleetA, 5);
+ $this->addFlightsForSubfleet($subfleetB, 10);
+
+ // search specifically for a given subfleet
+ //$query = 'subfleet_id='.$subfleetB->id;
+ $query = 'subfleet_id='.$subfleetB->id;
+ $res = $this->get('/api/flights/search?'.$query);
+ $res->assertStatus(200);
+ $res->assertJsonCount(10, 'data');
+
+ $body = $res->json('data');
+ collect($body)->each(function ($flight) use ($subfleetB) {
+ self::assertNotEmpty($flight['subfleets']);
+ self::assertEquals($subfleetB->id, $flight['subfleets'][0]['id']);
+ });
+ }
+
/**
* Test the bitmasks that they work for setting the day of week and
* then retrieving by searching on those
@@ -227,8 +285,8 @@ class FlightTest extends TestCase
]);
// Run the event that will enable/disable flights
- $event = new \App\Events\CronNightly();
- (new \App\Cron\Nightly\SetActiveFlights())->handle($event);
+ $event = new CronNightly();
+ (new SetActiveFlights())->handle($event);
$res = $this->get('/api/flights');
$body = $res->json('data');
@@ -274,8 +332,8 @@ class FlightTest extends TestCase
]);
// Run the event that will enable/disable flights
- $event = new \App\Events\CronNightly();
- (new \App\Cron\Nightly\SetActiveFlights())->handle($event);
+ $event = new CronNightly();
+ (new SetActiveFlights())->handle($event);
$res = $this->get('/api/flights');
$body = $res->json('data');
@@ -313,8 +371,8 @@ class FlightTest extends TestCase
]);
// Run the event that will enable/disable flights
- $event = new \App\Events\CronNightly();
- (new \App\Cron\Nightly\SetActiveFlights())->handle($event);
+ $event = new CronNightly();
+ (new SetActiveFlights())->handle($event);
$res = $this->get('/api/flights');
$body = $res->json('data');