moon avg update

app/Library/Moons/MoonCalc.php

@@ -6,15 +6,14 @@
 
 namespace App\Library\Moons;
 
-use Illuminate\Http\Request;
+//Internal Library
-use App\Http\Controllers\Controller;
-
 use Session;
 use DB;
-
+use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
 
+//Models
 use App\Models\Moon\Config;
 use App\Models\Moon\ItemComposition;
 use App\Models\Moon\Moon;
@@ -360,6 +359,7 @@ class MoonCalc {
     }
 
     public function FetchNewPrices() {
+        //Create the item id array which we will pull data for from Fuzzwork market api
         $ItemIDs = array(
             "Tritanium" => 34,
             "Pyerite" => 35,
@@ -397,76 +397,88 @@ class MoonCalc {
             "Promethium" => 16652,
             "Thulium" => 16653,
         );
-        $time = time();
+
-        $item = array();
+        //Create the time variable
+        $time = Carbon\Carbon::now();
+
         //Get the json data for each ItemId from https://market.fuzzwork.co.uk/api/
         //Base url is https://market.fuzzwork.co.uk/aggregates/?region=10000002&types=34
         //Going to use curl for these requests
         foreach($ItemIDs as $key => $value) {
+            //Declare a new array each time we cycle through the for loop for the item
+            $item = array();
+
+            //Setup the guzzle client fetch object
             $client = new Client(['base_uri' => 'https://market.fuzzwork.co.uk/aggregates/']);
+            //Setup the uri for the guzzle client
             $uri = '?region=10000002&types=' . $value;
+            //Get the result from the guzzle client request
             $result = $client->request('GET', $uri);
+            //Decode the request into an array from the json body return
             $item = json_decode($result->getBody(), true);
 
-            DB::table('Prices')->where('Name', $key)->update([
+            //Save the entry into the database
-                'Name' => $key,
+            $price = new Price;
-                'ItemId' => $value,
+            $price->Name = $key;
-                'Price' => $item[$value]['sell']['median'],
+            $price->ItemId = $value;
-                'Time' => $time,
+            $price->Price = $item[$value]['sell']['median'];
-            ]);
+            $price->Time = $time;
+            $price->save();
         }
         
+        //Run the update for the item pricing
         $this->UpdateItemPricing();
     }
 
     private function UpdateItemPricing() {
-
         //Get the configuration from the config table
         $config = DB::table('Config')->first();
+
         //Calculate refine rate
         $refineRate = $config->RefineRate / 100.00;
+        
         //Calculate the current time
-        $time = time();
+        $time = Carbon\Carbon::now();
-        //Get the max time from the database
+        //Calcualate the current time minus 30 days
-        $maxTime = DB::table('Prices')->where('ItemId', 34)->max('Time');
+        $pastTime = Carbon::now()->subDays(30);
+
         //Get the price of the basic minerals
-        $tritaniumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [34, $maxTime]);
+        $tritaniumPrice = MineralPrice::where(['ItemId' => 34])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $tritanium = DB::select( DB::raw('SELECT Price FROM Prices WHERE ItemId= :id AND Time= :time'), array('id' => 34, 'time' => $maxTime));
+        $pyeritePrice = MineralPrice::where(['ItemId' => 35])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $pyeritePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [35, $maxTime]);
+        $mexallonPrice = MineralPrice::where(['ItemId' => 36])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $mexallonPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [36, $maxTime]);
+        $isogenPrice = MineralPrice::where(['ItemId' => 37])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $isogenPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [37, $maxTime]);
+        $nocxiumPrice = MineralPrice::where(['ItemId' => 38])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $nocxiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [38, $maxTime]);
+        $zydrinePrice = MineralPrice::where(['ItemId' => 39])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $zydrinePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [39, $maxTime]);
+        $megacytePrice = MineralPrice::where(['ItemId' => 40])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $megacytePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [40, $maxTime]);
+        $morphitePrice = MineralPrice::where(['ItemId' => 11399])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $morphitePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [11399, $maxTime]);
+        $heliumIsotopesPrice = MineralPrice::where(['ItemId' => 16274])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $heliumIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16274, $maxTime]);
+        $nitrogenIsotopesPrice = MineralPrice::where(['ItemId' => 17888])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $nitrogenIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [17888, $maxTime]);
+        $oxygenIsotopesPrice = MineralPrice::where(['ItemId' => 17887])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $oxygenIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [17887, $maxTime]);
+        $hydrogenIsotopesPrice = MineralPrice::where(['ItemId' => 17889])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $hydrogenIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [17889, $maxTime]);
+        $liquidOzonePrice = MineralPrice::where(['ItemId' => 16273])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $liquidOzonePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16273, $maxTime]);
+        $heavyWaterPrice = MineralPrice::where(['ItemId' => 16272])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $heavyWaterPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16272, $maxTime]);
+        $strontiumClathratesPrice = MineralPrice::where(['ItemId' => 16275])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $strontiumClathratesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16275, $maxTime]);
         //Get the price of the moongoo
-        $atmosphericGasesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16634, $maxTime]);
+        $atmosphericGasesPrice = MineralPrice::where(['ItemId' => 16634])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $evaporiteDepositsPirce = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16635, $maxTime]);
+        $evaporiteDepositsPirce = MineralPrice::where(['ItemId' => 16635])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $hydrocarbonsPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16633, $maxTime]);
+        $hydrocarbonsPrice = MineralPrice::where(['ItemId' => 16633])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $silicatesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16636, $maxTime]);
+        $silicatesPrice = MineralPrice::where(['ItemId' => 16636])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $cobaltPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16640, $maxTime]);
+        $cobaltPrice = MineralPrice::where(['ItemId' => 16640])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $scandiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16639, $maxTime]);
+        $scandiumPrice = MineralPrice::where(['ItemId' => 16639])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $titaniumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16638, $maxTime]);
+        $titaniumPrice = MineralPrice::where(['ItemId' => 16638])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $tungstenPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16637, $maxTime]);
+        $tungstenPrice = MineralPrice::where(['ItemId' => 16637])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $cadmiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16643, $maxTime]);
+        $cadmiumPrice = MineralPrice::where(['ItemId' => 16643])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $platinumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16644, $maxTime]);
+        $platinumPrice = MineralPrice::where(['ItemId' => 16644])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $vanadiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16642, $maxTime]);
+        $vanadiumPrice = MineralPrice::where(['ItemId' => 16642])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $chromiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16641, $maxTime]);
+        $chromiumPrice = MineralPrice::where(['ItemId' => 16641])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $technetiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16649, $maxTime]);
+        $technetiumPrice = MineralPrice::where(['ItemId' => 16649])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $hafniumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16648, $maxTime]);
+        $hafniumPrice = MineralPrice::where(['ItemId' => 16648])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $caesiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16647, $maxTime]);
+        $caesiumPrice = MineralPrice::where(['ItemId' => 16647])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $mercuryPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16646, $maxTime]);
+        $mercuryPrice = MineralPrice::where(['ItemId' => 16646])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $dysprosiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16650, $maxTime]);
+        $dysprosiumPrice = MineralPrice::where(['ItemId' => 16650])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $neodymiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16651, $maxTime]);
+        $neodymiumPrice = MineralPrice::where(['ItemId' => 16651])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $promethiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16652, $maxTime]);
+        $promethiumPrice = MineralPrice::where(['ItemId' => 16652])->whereDate('Time', '>', $pastTime)->avg('Price');
-        $thuliumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16653, $maxTime]);
+        $thuliumPrice = MineralPrice::where(['ItemId' => 16653])->whereDate('Time', '>', $pastTime)->avg('Price');
         //Get the item compositions
         $items = DB::select('SELECT Name,ItemId FROM ItemComposition');
         //Go through each of the items and update the price

app/Library/Moons/MoonCalcAvg.php

@@ -1,36 +0,0 @@
-<?php
-
-/**
- * W4RP Services
- * GNU Public License
- */
-
-namespace App\Library\Moons;
-
-//Internal Library
-use Session;
-use DB;
-use Log;
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-//Models
-use App\Models\Moon\Config;
-use App\Models\Moon\ItemComposition;
-use App\Models\Moon\Moon;
-use App\Models\Moon\OrePrice;
-use App\Models\Moon\Price;
-
-class MoonCalcAvg {
-
-    public function GetOreComposition($ore) {
-        $composition = ItemComposition::where([
-            'Name' => $ore,
-        ])->first();
-
-        return $composition;
-    }
-
-}
-
-?>

app/Models/Moon/AvgMineralPrices.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Models\Moon;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AvgMineralPrices extends Model
+{
+    //Table Name
+    protected $table = 'avg_mineral_prices';
+
+    //Primary Key
+    public $primaryKey = 'id';
+
+    //Timestamps
+    public $timestamps = true;
+
+    /**
+     * Fillable array
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'Name',
+        'ItemId',
+        'Price',
+        'Time',
+    ];
+}

app/Models/Moon/AvgOrePrices.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models\Moon;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AvgOrePrices extends Model
+{
+    //Table Name
+    protected $table = 'avg_ore_prices';
+
+    //Primary Key
+    public $primaryKey = 'id';
+
+    //Timestamps
+    public $timestamps = true;
+
+    /**
+     * Fillable array
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'Name',
+        'ItemId',
+        'BatchPrice',
+        'UnitPrice',
+        'm3Price',
+        'Time',
+    ];
+}

app/Models/Moon/Config.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Moon;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -10,5 +10,17 @@ class Config extends Model
     protected $table = 'Config';
 
     // Timestamps
-    public $timestamps = 'false';
+    public $timestamps = false;
+
+    /**
+     * Fillable Array
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'RentalTax',
+        'AllyRentalTax',
+        'RefineRate',
+        'RentalTime',
+    ];
 }

app/Models/Moon/ItemComposition.php

@@ -10,5 +10,5 @@ class ItemComposition extends Model
     protected $table = 'ItemComposition';
 
     // Timestamps
-    public $timestamps = 'false';
+    public $timestamps = false;
 }

app/Models/Moon/MineralPrice.php

@@ -14,4 +14,16 @@ class Price extends Model
 
     // Timestamps
     public $timestamps = false;
+
+    /**
+     * Fillable Array
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'Name',
+        'ItemId',
+        'Price',
+        'Time',
+    ];
 }

app/Models/Moon/OrePrice.php

@@ -13,5 +13,19 @@ class OrePrice extends Model
     public $primaryKey = 'id';
 
     // Timestamps
-    public $timestamps = 'false';
+    public $timestamps = false;
+
+    /**
+     * Fillable Array
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'Name',
+        'ItemId',
+        'BatchPrice',
+        'UnitPrice',
+        'm3Price',
+        'Time',
+    ];
 }

vendor/composer/autoload_classmap.php

@@ -17,7 +17,6 @@ return array(
     'App\\Console\\Commands\\MoonMailerCommand' => $baseDir . '/app/Console/Commands/Moons/MoonMailer.php',
     'App\\Console\\Commands\\PurgeUsers' => $baseDir . '/app/Console/Commands/Users/PurgeUsers.php',
     'App\\Console\\Commands\\UpdateMoonPriceCommand' => $baseDir . '/app/Console/Commands/Moons/UpdateMoonPricing.php',
-    'App\\Console\\Commands\\UpdateMoonRental' => $baseDir . '/app/Console/Commands/Moons/UpdateMoonRental.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
     'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
     'App\\Http\\Controllers\\Auth\\EsiScopeController' => $baseDir . '/app/Http/Controllers/Auth/EsiScopeController.php',
@@ -57,7 +56,6 @@ return array(
     'App\\Jobs\\ProcessWalletJournalJob' => $baseDir . '/app/Jobs/ProcessWalletJournalJob.php',
     'App\\Library\\Assets\\AssetHelper' => $baseDir . '/app/Library/Assets/AssetHelper.php',
     '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\\Helper\\FinanceHelper' => $baseDir . '/app/Library/Finances/Helper/FinanceHelper.php',
     'App\\Library\\Finances\\JumpBridgeTax' => $baseDir . '/app/Library/Finances/JumpBridgeTax.php',
@@ -68,8 +66,10 @@ return array(
     'App\\Library\\Finances\\ReprocessingTax' => $baseDir . '/app/Library/Finances/ReprocessingTax.php',
     'App\\Library\\Finances\\StructureIndustryTax' => $baseDir . '/app/Library/Finances/StructureIndustryTax.php',
     'App\\Library\\Lookups\\LookupHelper' => $baseDir . '/app/Library/Lookups/LookupHelper.php',
+    'App\\Library\\Mail\\Helper\\EveMailHelper' => $baseDir . '/app/Library/Mail/Helper/EveMailHelper.php',
     'App\\Library\\Moons\\MiningLedgerHelper' => $baseDir . '/app/Library/Moons/MiningLedgerHelper.php',
     'App\\Library\\Moons\\MoonCalc' => $baseDir . '/app/Library/Moons/MoonCalc.php',
+    'App\\Library\\Moons\\MoonCalcAvg' => $baseDir . '/app/Library/Moons/MoonCalcAvg.php',
     'App\\Library\\SRP\\SRPHelper' => $baseDir . '/app/Library/SRP/SRPHelper.php',
     'App\\Library\\Structures\\StructureHelper' => $baseDir . '/app/Library/Structures/StructureHelper.php',
     'App\\Library\\Taxes\\TaxesHelper' => $baseDir . '/app/Library/Taxes/TaxesHelper.php',

vendor/composer/autoload_static.php

@@ -481,7 +481,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'App\\Console\\Commands\\MoonMailerCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/MoonMailer.php',
         'App\\Console\\Commands\\PurgeUsers' => __DIR__ . '/../..' . '/app/Console/Commands/Users/PurgeUsers.php',
         'App\\Console\\Commands\\UpdateMoonPriceCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/UpdateMoonPricing.php',
-        'App\\Console\\Commands\\UpdateMoonRental' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/UpdateMoonRental.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
         'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
         'App\\Http\\Controllers\\Auth\\EsiScopeController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/EsiScopeController.php',
@@ -521,7 +520,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'App\\Jobs\\ProcessWalletJournalJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessWalletJournalJob.php',
         'App\\Library\\Assets\\AssetHelper' => __DIR__ . '/../..' . '/app/Library/Assets/AssetHelper.php',
         '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\\Helper\\FinanceHelper' => __DIR__ . '/../..' . '/app/Library/Finances/Helper/FinanceHelper.php',
         'App\\Library\\Finances\\JumpBridgeTax' => __DIR__ . '/../..' . '/app/Library/Finances/JumpBridgeTax.php',
@@ -532,8 +530,10 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'App\\Library\\Finances\\ReprocessingTax' => __DIR__ . '/../..' . '/app/Library/Finances/ReprocessingTax.php',
         'App\\Library\\Finances\\StructureIndustryTax' => __DIR__ . '/../..' . '/app/Library/Finances/StructureIndustryTax.php',
         'App\\Library\\Lookups\\LookupHelper' => __DIR__ . '/../..' . '/app/Library/Lookups/LookupHelper.php',
+        'App\\Library\\Mail\\Helper\\EveMailHelper' => __DIR__ . '/../..' . '/app/Library/Mail/Helper/EveMailHelper.php',
         'App\\Library\\Moons\\MiningLedgerHelper' => __DIR__ . '/../..' . '/app/Library/Moons/MiningLedgerHelper.php',
         'App\\Library\\Moons\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/Moons/MoonCalc.php',
+        'App\\Library\\Moons\\MoonCalcAvg' => __DIR__ . '/../..' . '/app/Library/Moons/MoonCalcAvg.php',
         'App\\Library\\SRP\\SRPHelper' => __DIR__ . '/../..' . '/app/Library/SRP/SRPHelper.php',
         'App\\Library\\Structures\\StructureHelper' => __DIR__ . '/../..' . '/app/Library/Structures/StructureHelper.php',
         'App\\Library\\Taxes\\TaxesHelper' => __DIR__ . '/../..' . '/app/Library/Taxes/TaxesHelper.php',