drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed model for process structure job

Browse Source
This commit is contained in:
drkthunder02
2020-05-10 23:25:06 -05:00
parent 6f00ffe0e8
commit 806b872465
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Console/Commands/Structures/GetStructures.php
View File

@@ -15,7 +15,6 @@ use Seat\Eseye\Exceptions\RequestFailedException;
use App\Jobs\ProcessStructureJob;
//Models
use App\Models\Jobs\JobProcessStructure;
use App\Models\Esi\EsiScope;
use App\Models\Esi\EsiToken;
@@ -106,11 +105,7 @@ class GetStructuresCommand extends Command
$totalPages = $structures->pages;
for($i = 1; $i <= $totalPages; $i++) {
$job = new JobProcessStructure;
$job->charId = $charId;
$job->corpId = $corpId;
$job->page = $currentPage;
ProcessStructureJob::dispatch($job)->onQueue('structures');
ProcessStructureJob::dispatch($charId, $corpId, $currentPage)->onQueue('structures');
}
//Mark the job as finished

9
app/Jobs/ProcessStructureJob.php
View File

@@ -13,7 +13,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
use App\Library\Structures\StructureHelper;
//App Models
use App\Models\Jobs\JobProcessStructure;
use App\Models\Jobs\JobStatus;
class ProcessStructureJob implements ShouldQueue
@@ -44,11 +43,11 @@ class ProcessStructureJob implements ShouldQueue
*
* @return void
*/
public function __construct(JobProcessStructure $jps)
public function __construct($charId, $corpId, $page)
{
$this->charId = $jps->charId;
$this->corpId = $jps->corpId;
$this->page = $jps->page;
$this->charId = $charId;
$this->corpId = $corpId;
$this->page = $page;
//Set the connection for the job
$this->connection = 'redis';

1
app/Library/Structures/StructureHelper.php
View File

@@ -17,7 +17,6 @@ use App\Library\Esi\Esi;
use App\Library\Lookups\LookupHelper;
//App Models
use App\Models\Jobs\JobProcessStructure;
use App\Models\Jobs\JobStatus;
use App\Models\Structure\Structure;
use App\Models\Structure\Service;