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

Rename user_bids table to bids

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-27 13:25:32 -06:00
parent c89926399b
commit 97764866f2
10 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Database/migrations/2017_12_12_174519_create_bids_table.php
View File

@@ -13,7 +13,7 @@ class CreateBidsTable extends Migration
*/ */
public function up() public function up()
{ {
Schema::create('user_bids', function (Blueprint $table) { Schema::create('bids', function (Blueprint $table) {
$table->increments('id'); $table->increments('id');
$table->unsignedInteger('user_id'); $table->unsignedInteger('user_id');
$table->string('flight_id', \App\Models\Flight::ID_MAX_LENGTH); $table->string('flight_id', \App\Models\Flight::ID_MAX_LENGTH);
@@ -31,6 +31,6 @@ class CreateBidsTable extends Migration
*/ */
public function down() public function down()
{ {
Schema::dropIfExists('user_bids'); Schema::dropIfExists('bids');
} }
} }

2
app/Database/seeds/sample.yml
View File

@@ -313,7 +313,7 @@ flight_fields:
name: cost index name: cost index
value: 100 value: 100
user_bids: bids:
- id: 100 - id: 100
user_id: 1 user_id: 1
flight_id: flightid_1 flight_id: flightid_1

5
app/Http/Controllers/Admin/FlightController.php
View File

@@ -177,16 +177,17 @@ class FlightController extends BaseController
} }
$time = new Time($flight->flight_time); $time = new Time($flight->flight_time);
$flight->hours = $time->hours; $flight->hours = $time->hours;
$flight->minutes = $time->minutes; $flight->minutes = $time->minutes;
$avail_subfleets = $this->getAvailSubfleets($flight);
return view('admin.flights.edit', [ return view('admin.flights.edit', [
'flight' => $flight, 'flight' => $flight,
'airlines' => $this->airlineRepo->selectBoxList(), 'airlines' => $this->airlineRepo->selectBoxList(),
'airports' => $this->airportRepo->selectBoxList(), 'airports' => $this->airportRepo->selectBoxList(),
'alt_airports' => $this->airportRepo->selectBoxList(true),
'avail_fares' => $this->getAvailFares($flight), 'avail_fares' => $this->getAvailFares($flight),
'avail_subfleets' => $avail_subfleets, 'avail_subfleets' => $this->getAvailSubfleets($flight),
'flight_types' => FlightType::select(true), 'flight_types' => FlightType::select(true),
]); ]);
} }

6
app/Http/Controllers/Api/UserController.php
View File

@@ -8,7 +8,7 @@ use App\Http\Resources\Pirep as PirepResource;
use App\Http\Resources\Subfleet as SubfleetResource; use App\Http\Resources\Subfleet as SubfleetResource;
use App\Http\Resources\User as UserResource; use App\Http\Resources\User as UserResource;
use App\Models\Enums\PirepState; use App\Models\Enums\PirepState;
use App\Models\UserBid; use App\Models\Bid;
use App\Repositories\Criteria\WhereCriteria; use App\Repositories\Criteria\WhereCriteria;
use App\Repositories\FlightRepository; use App\Repositories\FlightRepository;
use App\Repositories\PirepRepository; use App\Repositories\PirepRepository;
@@ -111,7 +111,7 @@ class UserController extends RestController
if ($request->isMethod('DELETE')) { if ($request->isMethod('DELETE')) {
if($request->filled('bid_id')) { if($request->filled('bid_id')) {
$bid = UserBid::findOrFail($request->input('bid_id')); $bid = Bid::findOrFail($request->input('bid_id'));
$flight_id = $bid->flight_id; $flight_id = $bid->flight_id;
} else { } else {
$flight_id = $request->input('flight_id'); $flight_id = $request->input('flight_id');
@@ -122,7 +122,7 @@ class UserController extends RestController
} }
# Return the flights they currently have bids on # Return the flights they currently have bids on
$bids = UserBid::where(['user_id' => $user->id])->get(); $bids = Bid::where(['user_id' => $user->id])->get();
return BidResource::collection($bids); return BidResource::collection($bids);
} }

6
app/Http/Controllers/Frontend/FlightController.php
View File

@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Frontend; namespace App\Http\Controllers\Frontend;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\UserBid; use App\Models\Bid;
use App\Repositories\AirlineRepository; use App\Repositories\AirlineRepository;
use App\Repositories\AirportRepository; use App\Repositories\AirportRepository;
use App\Repositories\Criteria\WhereCriteria; use App\Repositories\Criteria\WhereCriteria;
@@ -65,7 +65,7 @@ class FlightController extends Controller
$flights = $this->flightRepo->paginate(); $flights = $this->flightRepo->paginate();
$saved_flights = UserBid::where('user_id', Auth::id()) $saved_flights = Bid::where('user_id', Auth::id())
->pluck('flight_id')->toArray(); ->pluck('flight_id')->toArray();
return $this->view('flights.index', [ return $this->view('flights.index', [
@@ -86,7 +86,7 @@ class FlightController extends Controller
{ {
$flights = $this->flightRepo->searchCriteria($request)->paginate(); $flights = $this->flightRepo->searchCriteria($request)->paginate();
$saved_flights = UserBid::where('user_id', Auth::id()) $saved_flights = Bid::where('user_id', Auth::id())
->pluck('flight_id')->toArray(); ->pluck('flight_id')->toArray();
return $this->view('flights.index', [ return $this->view('flights.index', [

4
app/Models/UserBid.php → app/Models/Bid.php
View File

@@ -5,9 +5,9 @@ namespace App\Models;
/** /**
* @package App\Models * @package App\Models
*/ */
class UserBid extends BaseModel class Bid extends BaseModel
{ {
public $table = 'user_bids'; public $table = 'bids';
public $fillable = [ public $fillable = [
'user_id', 'user_id',

2
app/Models/User.php
View File

@@ -153,7 +153,7 @@ class User extends Authenticatable
public function bids() public function bids()
{ {
return $this->hasMany(UserBid::class, 'user_id'); return $this->hasMany(Bid::class, 'user_id');
} }
public function pireps() public function pireps()

16
app/Services/FlightService.php
View File

@@ -6,7 +6,7 @@ use App\Exceptions\BidExists;
use App\Models\Flight; use App\Models\Flight;
use App\Models\Subfleet; use App\Models\Subfleet;
use App\Models\User; use App\Models\User;
use App\Models\UserBid; use App\Models\Bid;
use App\Repositories\FlightRepository; use App\Repositories\FlightRepository;
use App\Repositories\NavdataRepository; use App\Repositories\NavdataRepository;
use Log; use Log;
@@ -102,7 +102,7 @@ class FlightService extends BaseService
public function deleteFlight(Flight $flight) public function deleteFlight(Flight $flight)
{ {
$where = ['flight_id' => $flight->id]; $where = ['flight_id' => $flight->id];
UserBid::where($where)->delete(); Bid::where($where)->delete();
$flight->delete(); $flight->delete();
} }
@@ -136,7 +136,7 @@ class FlightService extends BaseService
* Allow a user to bid on a flight. Check settings and all that good stuff * Allow a user to bid on a flight. Check settings and all that good stuff
* @param Flight $flight * @param Flight $flight
* @param User $user * @param User $user
* @return UserBid|null * @return Bid|null
* @throws \App\Exceptions\BidExists * @throws \App\Exceptions\BidExists
*/ */
public function addBid(Flight $flight, User $user) public function addBid(Flight $flight, User $user)
@@ -149,7 +149,7 @@ class FlightService extends BaseService
# See if we're allowed to have multiple bids or not # See if we're allowed to have multiple bids or not
if (!setting('bids.allow_multiple_bids')) { if (!setting('bids.allow_multiple_bids')) {
$user_bids = UserBid::where(['user_id' => $user->id])->first(); $user_bids = Bid::where(['user_id' => $user->id])->first();
if ($user_bids) { if ($user_bids) {
Log::info('User "' . $user->id . '" already has bids, skipping'); Log::info('User "' . $user->id . '" already has bids, skipping');
throw new BidExists(); throw new BidExists();
@@ -162,12 +162,12 @@ class FlightService extends BaseService
'flight_id' => $flight->id 'flight_id' => $flight->id
]; ];
$user_bid = UserBid::where($bid_data)->first(); $user_bid = Bid::where($bid_data)->first();
if ($user_bid) { if ($user_bid) {
return $user_bid; return $user_bid;
} }
$user_bid = UserBid::create($bid_data); $user_bid = Bid::create($bid_data);
$flight->has_bid = true; $flight->has_bid = true;
$flight->save(); $flight->save();
@@ -182,7 +182,7 @@ class FlightService extends BaseService
*/ */
public function removeBid(Flight $flight, User $user) public function removeBid(Flight $flight, User $user)
{ {
$user_bid = UserBid::where([ $user_bid = Bid::where([
'flight_id' => $flight->id, 'user_id' => $user->id 'flight_id' => $flight->id, 'user_id' => $user->id
])->first(); ])->first();
@@ -191,7 +191,7 @@ class FlightService extends BaseService
} }
# Only flip the flag if there are no bids left for this flight # Only flip the flag if there are no bids left for this flight
if (!UserBid::where('flight_id', $flight->id)->exists()) { if (!Bid::where('flight_id', $flight->id)->exists()) {
$flight->has_bid = false; $flight->has_bid = false;
$flight->save(); $flight->save();
} }

21
resources/views/admin/flights/fields.blade.php
View File

@@ -31,7 +31,7 @@
<div class="row"> <div class="row">
<div class="form-group col-sm-3"> <div class="form-group col-sm-3">
{!! Form::label('level', 'Flight Type:') !!} {!! Form::label('level', 'Flight Type:') !!}&nbsp;<span class="required">*</span>
{!! Form::select('flight_type', $flight_types, null, ['class' => 'form-control select2']) !!} {!! Form::select('flight_type', $flight_types, null, ['class' => 'form-control select2']) !!}
<p class="text-danger">{{ $errors->first('flight_type') }}</p> <p class="text-danger">{{ $errors->first('flight_type') }}</p>
</div> </div>
@@ -52,7 +52,7 @@
<!-- Alt Airport Id Field --> <!-- Alt Airport Id Field -->
<div class="form-group col-sm-3"> <div class="form-group col-sm-3">
{!! Form::label('alt_airport_id', 'Alt Airport:') !!} {!! Form::label('alt_airport_id', 'Alt Airport:') !!}
{!! Form::select('alt_airport_id', $airports, null , ['class' => 'form-control select2']) !!} {!! Form::select('alt_airport_id', $alt_airports, null , ['class' => 'form-control select2']) !!}
<p class="text-danger">{{ $errors->first('alt_airport_id') }}</p> <p class="text-danger">{{ $errors->first('alt_airport_id') }}</p>
</div> </div>
</div> </div>
@@ -75,13 +75,22 @@
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
{!! Form::label('flight_time', 'Flight Time (hours & minutes):') !!} {!! Form::label('flight_time', 'Flight Time (hours & minutes):') !!}
<div style="float: left"> <div style="float: left">
{!! Form::number('hours', null, ['class' => 'form-control', 'placeholder' => 'hours']) !!} {!! Form::number('hours', null, [
'class' => 'form-control',
'placeholder' => 'hours'
]) !!}
</div> </div>
<div style="float: left"> <div style="float: left">
{!! Form::number('minutes', null, ['class' => 'form-control', 'placeholder' => 'minutes']) !!} {!! Form::number('minutes', null, [
<p class="text-danger">{{ $errors->first('hours') }}</p> 'class' => 'form-control',
<p class="text-danger">{{ $errors->first('minutes') }}</p> 'placeholder' => 'minutes'
]) !!}
</div> </div>
{!! $flight->flight_time !!}
{!! $flight->hours !!}
{!! $flight->minutes !!}
<p class="text-danger">{{ $errors->first('hours') }}</p>
<p class="text-danger">{{ $errors->first('minutes') }}</p>
</div> </div>
<div class="form-group col-sm-2"> <div class="form-group col-sm-2">

4
tests/FlightTest.php
View File

@@ -2,7 +2,7 @@
use App\Models\Flight; use App\Models\Flight;
use App\Models\User; use App\Models\User;
use App\Models\UserBid; use App\Models\Bid;
use App\Repositories\SettingRepository; use App\Repositories\SettingRepository;
use App\Services\FlightService; use App\Services\FlightService;
@@ -272,7 +272,7 @@ class FlightTest extends TestCase
$this->assertNull($empty_flight); $this->assertNull($empty_flight);
# Make sure no bids exist # Make sure no bids exist
$user_bids = UserBid::where('flight_id', $flight->id)->get(); $user_bids = Bid::where('flight_id', $flight->id)->get();
#$this->assertEquals(0, $user_bid->count()); #$this->assertEquals(0, $user_bid->count());