* Add flight_id column to pireps table * Refactor PIREPs and bids closes 406 * Formatting
This commit is contained in:
@@ -3,17 +3,14 @@
|
||||
namespace App\Services;
|
||||
|
||||
use App\Contracts\Service;
|
||||
use App\Exceptions\BidExistsForFlight;
|
||||
use App\Exceptions\DuplicateFlight;
|
||||
use App\Models\Bid;
|
||||
use App\Models\Enums\Days;
|
||||
use App\Models\Flight;
|
||||
use App\Models\FlightFieldValue;
|
||||
use App\Models\User;
|
||||
use App\Repositories\FlightRepository;
|
||||
use App\Repositories\NavdataRepository;
|
||||
use App\Support\Units\Time;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class FlightService extends Service
|
||||
{
|
||||
@@ -123,24 +120,6 @@ class FlightService extends Service
|
||||
return $fields;
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter out any flights according to different settings
|
||||
*
|
||||
* @param $user
|
||||
*
|
||||
* @return FlightRepository
|
||||
*/
|
||||
public function filterFlights($user)
|
||||
{
|
||||
$where = [];
|
||||
if (setting('pilots.only_flights_from_current', false)) {
|
||||
$where['dpt_airport_id'] = $user->curr_airport_id;
|
||||
}
|
||||
|
||||
return $this->flightRepo
|
||||
->whereOrder($where, 'flight_number', 'asc');
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter out subfleets to only include aircraft that a user has access to
|
||||
*
|
||||
@@ -276,91 +255,4 @@ class FlightService extends Service
|
||||
|
||||
return collect($return_points);
|
||||
}
|
||||
|
||||
/**
|
||||
* Allow a user to bid on a flight. Check settings and all that good stuff
|
||||
*
|
||||
* @param Flight $flight
|
||||
* @param User $user
|
||||
*
|
||||
*@throws \App\Exceptions\BidExistsForFlight
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function addBid(Flight $flight, User $user)
|
||||
{
|
||||
// Get all of the bids for this user. See if they're allowed to have multiple
|
||||
// bids
|
||||
$bids = Bid::where('user_id', $user->id)->get();
|
||||
if ($bids->count() > 0 && setting('bids.allow_multiple_bids') === false) {
|
||||
throw new BidExistsForFlight('User "'.$user->ident.'" already has bids, skipping');
|
||||
}
|
||||
|
||||
// Get all of the bids for this flight
|
||||
$bids = Bid::where('flight_id', $flight->id)->get();
|
||||
if ($bids->count() > 0) {
|
||||
// Does the flight have a bid set?
|
||||
if ($flight->has_bid === false) {
|
||||
$flight->has_bid = true;
|
||||
$flight->save();
|
||||
}
|
||||
|
||||
// Check all the bids for one of this user
|
||||
foreach ($bids as $bid) {
|
||||
if ($bid->user_id === $user->id) {
|
||||
Log::info('Bid exists, user='.$user->ident.', flight='.$flight->id);
|
||||
return $bid;
|
||||
}
|
||||
}
|
||||
|
||||
// Check if the flight should be blocked off
|
||||
if (setting('bids.disable_flight_on_bid') === true) {
|
||||
throw new BidExistsForFlight($flight);
|
||||
}
|
||||
|
||||
if (setting('bids.allow_multiple_bids') === false) {
|
||||
throw new BidExistsForFlight($flight);
|
||||
}
|
||||
} else {
|
||||
/* @noinspection NestedPositiveIfStatementsInspection */
|
||||
if ($flight->has_bid === true) {
|
||||
Log::info('Bid exists, flight='.$flight->id.'; no entry in bids table, cleaning up');
|
||||
}
|
||||
}
|
||||
|
||||
$bid = Bid::firstOrCreate([
|
||||
'user_id' => $user->id,
|
||||
'flight_id' => $flight->id,
|
||||
]);
|
||||
|
||||
$flight->has_bid = true;
|
||||
$flight->save();
|
||||
|
||||
return $bid;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a bid from a given flight
|
||||
*
|
||||
* @param Flight $flight
|
||||
* @param User $user
|
||||
*/
|
||||
public function removeBid(Flight $flight, User $user)
|
||||
{
|
||||
$bids = Bid::where([
|
||||
'flight_id' => $flight->id,
|
||||
'user_id' => $user->id,
|
||||
])->get();
|
||||
|
||||
foreach ($bids as $bid) {
|
||||
$bid->forceDelete();
|
||||
}
|
||||
|
||||
// Only flip the flag if there are no bids left for this flight
|
||||
$bids = Bid::where('flight_id', $flight->id)->get();
|
||||
if ($bids->count() === 0) {
|
||||
$flight->has_bid = false;
|
||||
$flight->save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user