From 29c198620434a49c43bd3b7e0d8bdacf2ae554ed Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Thu, 12 Dec 2019 18:04:33 -0600 Subject: [PATCH] removing a bunch of unused tables in the database --- app/Library/Finances/JumpBridgeTax.php | 53 ++----------------- app/Library/Lookups/LookupHelper.php | 2 - app/Models/Finances/CorpMarketStructure.php | 26 --------- app/Models/Lookups/CharacterToCorporation.php | 26 --------- app/Models/Lookups/CorporationToAlliance.php | 26 --------- app/Models/Lookups/SolarSystemDistance.php | 27 ---------- app/Models/Lookups/UserToCorporation.php | 26 --------- ...2_233750_remove_non_utilized_db_tables.php | 37 +++++++++++++ vendor/composer/autoload_classmap.php | 5 +- vendor/composer/autoload_static.php | 5 +- 10 files changed, 42 insertions(+), 191 deletions(-) delete mode 100644 app/Models/Finances/CorpMarketStructure.php delete mode 100644 app/Models/Lookups/CharacterToCorporation.php delete mode 100644 app/Models/Lookups/CorporationToAlliance.php delete mode 100644 app/Models/Lookups/SolarSystemDistance.php delete mode 100644 app/Models/Lookups/UserToCorporation.php create mode 100644 database/migrations/2019_12_12_233750_remove_non_utilized_db_tables.php diff --git a/app/Library/Finances/JumpBridgeTax.php b/app/Library/Finances/JumpBridgeTax.php index b37020dce..e5ed5cc8c 100644 --- a/app/Library/Finances/JumpBridgeTax.php +++ b/app/Library/Finances/JumpBridgeTax.php @@ -6,13 +6,15 @@ namespace App\Library\Finances; +//Internal Library use DB; use Carbon\Carbon; +//Library use App\Library\Esi\Esi; +//Models use App\Models\Finances\JumpBridgeJournal; -use App\Models\User\UserToCorporation; class JumpBridgeTax { private $date; @@ -76,55 +78,6 @@ class JumpBridgeTax { } } - /** - * Function to get the corporations using the jump bridge over a given time period - */ - public function CorporationUsage() { - //Make an array for corporations, and amounts - $amounts = array(); - $characters = array(); - $data = array(); - $esi = new Esi(); - - //Get all of the parties which have utilized the jump bridge - $parties = DB::table('jump_bridge_journal') - ->select('first_party_id') - ->groupBy('first_party_id') - ->whereTime('date', '>', $this->date) - ->get(); - - //Run through each party and assign them into a corporation, then add the corporation to the corporation array if they don't - //exist in the array. - foreach($parties as $party) { - //If the entry in the database lookup table isn't found, add it. - if(!CharacterToCorporation::where(['character_id' => $party->first_party_id])->exists()) { - $character = $esi->GetCharacterData($party->first_party_id); - $corporation = $esi->GetCorporationData($character->corporation_id); - $char = new CharacterToCorporation; - $char->character_id = $party->first_party_id; - $char->character_name = $character->name; - $char->corporation_id = $character->corporation_id; - $char->corporation_name = $corporation->name; - $char->save(); - } - - //Perform the lookup and add the user into the corps array, and the ammount to the amount array - $char = CharacterToCorporation::where(['character_id' => $party->first_party_id])->get(); - - //Find the amount utilized from the jump bridge by the character - $isk = JumpBridgeJournal::where(['first_party_id' => $char->character_id]) - ->whereBetween('date', [$this->date, $this->date->addDays(30)]) - ->sum('amount'); - - //We have the character and isk amount, so we need to build an array with these two values as key value pairs. - $data[$char->corporation_name] = $data[$char->corporation_name] + $isk; - } - - //Return the data - return $data; - - } - /** * Returns the overall usage for statistics */ diff --git a/app/Library/Lookups/LookupHelper.php b/app/Library/Lookups/LookupHelper.php index 1efbe55b5..c1bd96200 100644 --- a/app/Library/Lookups/LookupHelper.php +++ b/app/Library/Lookups/LookupHelper.php @@ -15,8 +15,6 @@ use Seat\Eseye\Exceptions\RequestFailedException; use App\Library\Esi\Esi; //Models -use App\Models\Lookups\CharacterToCorporation; -use App\Models\Lookups\CorporationToAlliance; use App\Models\Lookups\CharacterLookup; use App\Models\Lookups\CorporationLookup; use App\Models\Lookups\AllianceLookup; diff --git a/app/Models/Finances/CorpMarketStructure.php b/app/Models/Finances/CorpMarketStructure.php deleted file mode 100644 index 6a0d7c12d..000000000 --- a/app/Models/Finances/CorpMarketStructure.php +++ /dev/null @@ -1,26 +0,0 @@ - $baseDir . '/app/Charts/StructureFuelGauge.php', 'App\\Console\\Commands\\CleanStaleDataCommand' => $baseDir . '/app/Console/Commands/Data/CleanStaleDataCommand.php', - 'App\\Console\\Commands\\CorpFinances' => $baseDir . '/app/Console/Commands/Finances/CorpFinances.php', 'App\\Console\\Commands\\EmptyJumpBridges' => $baseDir . '/app/Console/Commands/Data/EmptyJumpBridges.php', 'App\\Console\\Commands\\FlexStructureCommand' => $baseDir . '/app/Console/Commands/Flex/FlexStructureCommand.php', 'App\\Console\\Commands\\GetAssetsCommand' => $baseDir . '/app/Console/Commands/Assets/GetAssets.php', @@ -39,6 +38,7 @@ return array( 'App\\Http\\Controllers\\Moons\\MoonsController' => $baseDir . '/app/Http/Controllers/Moons/MoonsController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => $baseDir . '/app/Http/Controllers/SRP/SRPAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPController' => $baseDir . '/app/Http/Controllers/SRP/SRPController.php', + 'App\\Http\\Controllers\\Test\\TestController' => $baseDir . '/app/Http/Controllers/Test/TestController.php', 'App\\Http\\Controllers\\Wiki\\WikiController' => $baseDir . '/app/Http/Controllers/Wiki/WikiController.php', 'App\\Http\\Controllers\\Wormholes\\WormholeController' => $baseDir . '/app/Http/Controllers/Wormholes/WormholeController.php', 'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php', @@ -54,7 +54,6 @@ return array( 'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php', 'App\\JobProcessCorpJournal' => $baseDir . '/app/Models/Jobs/JobProcessCorpJournal.php', 'App\\Jobs\\ProcessAssetsJob' => $baseDir . '/app/Jobs/ProcessAssetsJob.php', - 'App\\Jobs\\ProcessCorpJournalJob' => $baseDir . '/app/Jobs/ProcessCorpJournalJob.php', 'App\\Jobs\\ProcessSendEveMailJob' => $baseDir . '/app/Jobs/ProcessSendEveMailJob.php', 'App\\Jobs\\ProcessStructureJob' => $baseDir . '/app/Jobs/ProcessStructureJob.php', 'App\\Jobs\\ProcessWalletJournalJob' => $baseDir . '/app/Jobs/ProcessWalletJournalJob.php', @@ -62,7 +61,6 @@ return array( 'App\\Library\\Esi\\Esi' => $baseDir . '/app/Library/Esi/Esi.php', 'App\\Library\\Esi\\Mail' => $baseDir . '/app/Library/Esi/Mail.php', 'App\\Library\\Finances\\AllianceMarketTax' => $baseDir . '/app/Library/Finances/AllianceMarketTax.php', - 'App\\Library\\Finances\\CorpMarketTax' => $baseDir . '/app/Library/Finances/CorpMarketTax.php', 'App\\Library\\Finances\\Helper\\FinanceHelper' => $baseDir . '/app/Library/Finances/Helper/FinanceHelper.php', 'App\\Library\\Finances\\JumpBridgeTax' => $baseDir . '/app/Library/Finances/JumpBridgeTax.php', 'App\\Library\\Finances\\OfficeFee' => $baseDir . '/app/Library/Finances/OfficeFee.php', @@ -91,7 +89,6 @@ return array( 'App\\Models\\Esi\\EsiScope' => $baseDir . '/app/Models/Esi/EsiScope.php', 'App\\Models\\Esi\\EsiToken' => $baseDir . '/app/Models/Esi/EsiToken.php', 'App\\Models\\Finances\\AllianceMarketJournal' => $baseDir . '/app/Models/Finances/AllianceMarketJournal.php', - 'App\\Models\\Finances\\CorpMarketJournal' => $baseDir . '/app/Models/Finances/CorpMarketJournal.php', 'App\\Models\\Finances\\JumpBridgeJournal' => $baseDir . '/app/Models/Finances/JumpBridgeJournal.php', 'App\\Models\\Finances\\OfficeFeesJournal' => $baseDir . '/app/Models/Finances/OfficeFeesJournal.php', 'App\\Models\\Finances\\PISaleJournal' => $baseDir . '/app/Models/Finances/PISaleJournal.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 08227d284..ed9588f91 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -472,7 +472,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 public static $classMap = array ( 'App\\Charts\\StructureFuelGauge' => __DIR__ . '/../..' . '/app/Charts/StructureFuelGauge.php', 'App\\Console\\Commands\\CleanStaleDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Data/CleanStaleDataCommand.php', - 'App\\Console\\Commands\\CorpFinances' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/CorpFinances.php', 'App\\Console\\Commands\\EmptyJumpBridges' => __DIR__ . '/../..' . '/app/Console/Commands/Data/EmptyJumpBridges.php', 'App\\Console\\Commands\\FlexStructureCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Flex/FlexStructureCommand.php', 'App\\Console\\Commands\\GetAssetsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Assets/GetAssets.php', @@ -503,6 +502,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Controllers\\Moons\\MoonsController' => __DIR__ . '/../..' . '/app/Http/Controllers/Moons/MoonsController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPController.php', + 'App\\Http\\Controllers\\Test\\TestController' => __DIR__ . '/../..' . '/app/Http/Controllers/Test/TestController.php', 'App\\Http\\Controllers\\Wiki\\WikiController' => __DIR__ . '/../..' . '/app/Http/Controllers/Wiki/WikiController.php', 'App\\Http\\Controllers\\Wormholes\\WormholeController' => __DIR__ . '/../..' . '/app/Http/Controllers/Wormholes/WormholeController.php', 'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php', @@ -518,7 +518,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php', 'App\\JobProcessCorpJournal' => __DIR__ . '/../..' . '/app/Models/Jobs/JobProcessCorpJournal.php', 'App\\Jobs\\ProcessAssetsJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessAssetsJob.php', - 'App\\Jobs\\ProcessCorpJournalJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessCorpJournalJob.php', 'App\\Jobs\\ProcessSendEveMailJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessSendEveMailJob.php', 'App\\Jobs\\ProcessStructureJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessStructureJob.php', 'App\\Jobs\\ProcessWalletJournalJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessWalletJournalJob.php', @@ -526,7 +525,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Library\\Esi\\Esi' => __DIR__ . '/../..' . '/app/Library/Esi/Esi.php', 'App\\Library\\Esi\\Mail' => __DIR__ . '/../..' . '/app/Library/Esi/Mail.php', 'App\\Library\\Finances\\AllianceMarketTax' => __DIR__ . '/../..' . '/app/Library/Finances/AllianceMarketTax.php', - 'App\\Library\\Finances\\CorpMarketTax' => __DIR__ . '/../..' . '/app/Library/Finances/CorpMarketTax.php', 'App\\Library\\Finances\\Helper\\FinanceHelper' => __DIR__ . '/../..' . '/app/Library/Finances/Helper/FinanceHelper.php', 'App\\Library\\Finances\\JumpBridgeTax' => __DIR__ . '/../..' . '/app/Library/Finances/JumpBridgeTax.php', 'App\\Library\\Finances\\OfficeFee' => __DIR__ . '/../..' . '/app/Library/Finances/OfficeFee.php', @@ -555,7 +553,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Models\\Esi\\EsiScope' => __DIR__ . '/../..' . '/app/Models/Esi/EsiScope.php', 'App\\Models\\Esi\\EsiToken' => __DIR__ . '/../..' . '/app/Models/Esi/EsiToken.php', 'App\\Models\\Finances\\AllianceMarketJournal' => __DIR__ . '/../..' . '/app/Models/Finances/AllianceMarketJournal.php', - 'App\\Models\\Finances\\CorpMarketJournal' => __DIR__ . '/../..' . '/app/Models/Finances/CorpMarketJournal.php', 'App\\Models\\Finances\\JumpBridgeJournal' => __DIR__ . '/../..' . '/app/Models/Finances/JumpBridgeJournal.php', 'App\\Models\\Finances\\OfficeFeesJournal' => __DIR__ . '/../..' . '/app/Models/Finances/OfficeFeesJournal.php', 'App\\Models\\Finances\\PISaleJournal' => __DIR__ . '/../..' . '/app/Models/Finances/PISaleJournal.php',