From 10f9be7746e856eb1bbb132d51e4cb8bcd4501af Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 3 Dec 2018 13:52:57 -0600 Subject: [PATCH] create migration to remove fleet_end from Fleets table cleaned up register fleet in FleetsController modified FleetHelper class --- app/Http/Controllers/FleetsController.php | 19 ------- app/Library/FleetHelper.php | 50 ++----------------- ...037_drop_fleet_end_column_fleets_table.php | 32 ++++++++++++ vendor/composer/autoload_classmap.php | 2 +- vendor/composer/autoload_static.php | 2 +- 5 files changed, 39 insertions(+), 66 deletions(-) create mode 100644 database/migrations/2018_12_03_193037_drop_fleet_end_column_fleets_table.php diff --git a/app/Http/Controllers/FleetsController.php b/app/Http/Controllers/FleetsController.php index 8117096a2..8c95213cb 100644 --- a/app/Http/Controllers/FleetsController.php +++ b/app/Http/Controllers/FleetsController.php @@ -105,32 +105,13 @@ class FleetsController extends Controller $check = DB::table('Fleets')->where('fleet', $fleetUri)->first(); //If we do not find the fleet, let's create it. if($check === null) { - - $current = Carbon::now(); - //If we are between 00:00 and 05:00, we want to set the end time for 0500 - if($current->hour > 0 && $current->hour < 5) { - //Figure out the hours to add to the fleet before purging it. - $hour = $current->hour; - $endTime = Carbon::now(); - $endTime->hour = 11 - $hour; - } else { - //Figure out the hours to add to the fleet before purging it. - $endTime = Carbon::now(); - $endTime->day++; - $endTime->hour = 11; - $endTime->minute = 0; - $endTime->second = 0; - } // Insert the fleet into the table DB::table('Fleets')->insert([ 'character_id' => Auth::user()->character_id, 'fleet' => $fleetUri, 'description' => $request->description, 'creation_time' => $current, - 'fleet_end' => $endTime, ]); - //Is this line needed? - $fleet->SetFleetEndTime($endTime); } return redirect('/fleets/display'); diff --git a/app/Library/FleetHelper.php b/app/Library/FleetHelper.php index 48004bcb2..705e2604e 100644 --- a/app/Library/FleetHelper.php +++ b/app/Library/FleetHelper.php @@ -17,9 +17,8 @@ use Seat\Eseye\Eseye; class FleetHelper { - private $fleet; + private $fleetUri; private $fcId; - private $endTime; /** * Constructor @@ -41,50 +40,15 @@ class FleetHelper { $uris = explode('https://esi.tech.ccp.is/v1/fleets/', $fleetUri); //Trim the right side of the fleet number $fleetUri = rtrim($uris[1], '/?datasource=tranquility'); - $this->fleet = $fleetUri; + $this->fleetUri = $fleetUri; } public function GetFleetUri() { - return $this->fleet; + return $this->fleetUri; } - /** - * Set the fleet's end time - * - * @param endTime - */ - public function SetFleetEndTime($endTime) { - $this->endTime = $endTime; - } - - public function UpdateFleet($fleet, $isFreeMove, $motd) { - //Get the fcid from the datatable - $fc = DB::table('Fleets')->where('fleet', $fleetId)->get(); - - //Check if the fc has the right scope - if(!$this->HaveEsiScope($fc->character_id, 'esi-fleets.write_fleet.v1')) { - return 1; - } - //Get the FC's refresh token from the table - $token = DB::table('EsiTokens')->where('character_id', $fc->character_id)->first(); - //Create the esi authentication container - $config = config('esi'); - $authentication = new EsiAuthentication([ - 'client_id' => $config['client_id'], - 'secret' => $config['secret'], - 'refresh_token' => $token->refresh_token, - ]); - //Create the esi class - $esi = new Eseye($authentication); - $error = $esi->invoke('put', '/fleets/{fleet_id}/', [ - 'fleet_id' => $fleet, - 'new_settings' => [ - 'is_free_move' => $isFreeMove, - 'motd' => $motd, - ], - ]); - - return $error; + public function UpdateFleet() { + return null; } public function AddPilot($fc, $charId, $fleetId) { @@ -119,10 +83,6 @@ class FleetHelper { return null; } - - public function RenderFleetDisplay() { - // - } } ?> \ No newline at end of file diff --git a/database/migrations/2018_12_03_193037_drop_fleet_end_column_fleets_table.php b/database/migrations/2018_12_03_193037_drop_fleet_end_column_fleets_table.php new file mode 100644 index 000000000..688fb8bb7 --- /dev/null +++ b/database/migrations/2018_12_03_193037_drop_fleet_end_column_fleets_table.php @@ -0,0 +1,32 @@ +dropColumn('fleet_end'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('Fleets', function($table) { + $table->dateTime('fleet_end'); + }); + } +} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 2f488e753..4119f6ad1 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -7,9 +7,9 @@ $baseDir = dirname($vendorDir); return array( 'App\\Console\\Commands\\CorpJournal' => $baseDir . '/app/Console/Commands/corpJournal.php', + 'App\\Console\\Commands\\DumpFleets' => $baseDir . '/app/Console/Commands/dumpFleets.php', 'App\\Console\\Commands\\GetCorps' => $baseDir . '/app/Console/Commands/getCorps.php', 'App\\Console\\Commands\\UpdateMoonPricing' => $baseDir . '/app/Console/Commands/UpdateMoonPricing.php', - 'App\\Console\\Commands\\dumpFleets' => $baseDir . '/app/Console/Commands/dumpFleets.php', 'App\\Console\\Commands\\getLogisticContracts' => $baseDir . '/app/Console/Commands/getLogisticContracts.php', 'App\\Console\\Commands\\sendMail' => $baseDir . '/app/Console/Commands/sendmail.php', 'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 70f0e54a9..443813295 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -402,9 +402,9 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 public static $classMap = array ( 'App\\Console\\Commands\\CorpJournal' => __DIR__ . '/../..' . '/app/Console/Commands/corpJournal.php', + 'App\\Console\\Commands\\DumpFleets' => __DIR__ . '/../..' . '/app/Console/Commands/dumpFleets.php', 'App\\Console\\Commands\\GetCorps' => __DIR__ . '/../..' . '/app/Console/Commands/getCorps.php', 'App\\Console\\Commands\\UpdateMoonPricing' => __DIR__ . '/../..' . '/app/Console/Commands/UpdateMoonPricing.php', - 'App\\Console\\Commands\\dumpFleets' => __DIR__ . '/../..' . '/app/Console/Commands/dumpFleets.php', 'App\\Console\\Commands\\getLogisticContracts' => __DIR__ . '/../..' . '/app/Console/Commands/getLogisticContracts.php', 'App\\Console\\Commands\\sendMail' => __DIR__ . '/../..' . '/app/Console/Commands/sendmail.php', 'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',