bbs/clrghouz
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Ensure our jobs are storing objects without relations

Browse Source
This commit is contained in:
Deon George 2024-11-03 00:16:48 +11:00
parent 3b7ce4b9ce
commit f03533b62a
7 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/AddressIdle.php
View File

@ -37,8 +37,8 @@ class AddressIdle implements ShouldQueue
*/ */
public function __construct(Domain $do,Address $ao=NULL) public function __construct(Domain $do,Address $ao=NULL)
{ {
$this->do = $do; $this->do = $do->withoutRelations();
$this->ao = $ao; $this->ao = $ao?->withoutRelations();
} }
/** /**

7
app/Jobs/AddressIdleDomain.php
View File

@ -14,13 +14,6 @@ class AddressIdleDomain implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Create a new job instance.
*/
public function __construct()
{
}
/** /**
* Execute the job. * Execute the job.
*/ */

4
app/Jobs/AddressPoll.php
View File

@ -38,8 +38,8 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
public function __construct(Address $ao,Mailer $mo=NULL) public function __construct(Address $ao,Mailer $mo=NULL)
{ {
$this->ao = $ao; $this->ao = $ao->withoutRelations();
$this->mo = $mo; $this->mo = $mo?->withoutRelations();
$this->onQueue(self::QUEUE); $this->onQueue(self::QUEUE);
} }

2
app/Jobs/EchoareaImport.php
View File

@ -36,7 +36,7 @@ class EchoareaImport implements ShouldQueue
public function __construct(string $file,Domain $do,string $prefix='',bool $delete_recs=FALSE,bool $delete_file=FALSE) public function __construct(string $file,Domain $do,string $prefix='',bool $delete_recs=FALSE,bool $delete_file=FALSE)
{ {
$this->file = $file; $this->file = $file;
$this->do = $do; $this->do = $do->withoutRelations();
$this->prefix = $prefix ?: ''; $this->prefix = $prefix ?: '';
$this->delete_file = $delete_file; $this->delete_file = $delete_file;
$this->delete_recs = $delete_recs; $this->delete_recs = $delete_recs;

2
app/Jobs/FileareaImport.php
View File

@ -36,7 +36,7 @@ class FileareaImport implements ShouldQueue
public function __construct(string $file,Domain $do,string $prefix='',bool $delete_recs=FALSE,bool $delete_file=FALSE) public function __construct(string $file,Domain $do,string $prefix='',bool $delete_recs=FALSE,bool $delete_file=FALSE)
{ {
$this->file = $file; $this->file = $file;
$this->do = $do; $this->do = $do->withoutRelations();
$this->prefix = $prefix ?: ''; $this->prefix = $prefix ?: '';
$this->delete_file = $delete_file; $this->delete_file = $delete_file;
$this->delete_recs = $delete_recs; $this->delete_recs = $delete_recs;

2
app/Jobs/MessageProcess.php
View File

@ -34,7 +34,7 @@ class MessageProcess implements ShouldQueue
public function __construct(Echomail|Netmail $mo,bool $skipbot=FALSE) public function __construct(Echomail|Netmail $mo,bool $skipbot=FALSE)
{ {
// @todo We need to serialize this model here, because laravel has an error unserializing it (Model Not Found) // @todo We need to serialize this model here, because laravel has an error unserializing it (Model Not Found)
$this->mo = utf8_encode(serialize($mo)); $this->mo = utf8_encode(serialize($mo->withoutRelations()));
$this->skipbot = $skipbot; $this->skipbot = $skipbot;
} }

2
app/Jobs/PacketProcess.php
View File

@ -35,7 +35,7 @@ class PacketProcess implements ShouldQueue
public function __construct(string $filename,System $so,bool $interactive=TRUE,Carbon $rcvd_time=NULL,bool $nobot=FALSE) public function __construct(string $filename,System $so,bool $interactive=TRUE,Carbon $rcvd_time=NULL,bool $nobot=FALSE)
{ {
$this->filename = $filename; $this->filename = $filename;
$this->so = $so; $this->so = $so->withoutRelations();
$this->interactive = $interactive; $this->interactive = $interactive;
$this->rcvd_time = $rcvd_time ?: Carbon::now(); $this->rcvd_time = $rcvd_time ?: Carbon::now();
$this->nobot = $nobot; $this->nobot = $nobot;