Remove/reduce usage of QueryCache
This commit is contained in:
@@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Log;
|
||||
|
||||
use App\Classes\FTN\{Message,Packet};
|
||||
use App\Exceptions\InvalidFTNException;
|
||||
use App\Traits\ScopeActive;
|
||||
use App\Traits\{QueryCacheableConfig,ScopeActive};
|
||||
|
||||
/**
|
||||
* This represents an FTN AKA.
|
||||
@@ -48,7 +48,7 @@ use App\Traits\ScopeActive;
|
||||
|
||||
class Address extends Model
|
||||
{
|
||||
use ScopeActive,SoftDeletes;
|
||||
use ScopeActive,SoftDeletes,QueryCacheableConfig;
|
||||
|
||||
private const LOGKEY = 'MA-';
|
||||
|
||||
@@ -469,7 +469,8 @@ class Address extends Model
|
||||
->whereNotNull('export_at')
|
||||
->whereNull('sent_at')
|
||||
->whereNull('echomails.deleted_at')
|
||||
->groupBy('addresses.id');
|
||||
->groupBy('addresses.id')
|
||||
->dontCache();
|
||||
}
|
||||
|
||||
public function scopeUncollectedEchomailTotal($query)
|
||||
@@ -503,7 +504,8 @@ class Address extends Model
|
||||
->whereNotNull('export_at')
|
||||
->whereNull('sent_at')
|
||||
->whereNull('files.deleted_at')
|
||||
->groupBy('addresses.id');
|
||||
->groupBy('addresses.id')
|
||||
->dontCache();
|
||||
}
|
||||
|
||||
public function scopeUncollectedFilesTotal($query)
|
||||
@@ -535,7 +537,8 @@ class Address extends Model
|
||||
->whereNull('sent_pkt')
|
||||
->whereNull('sent_at')
|
||||
->whereNull('netmails.deleted_at')
|
||||
->groupBy('addresses.id');
|
||||
->groupBy('addresses.id')
|
||||
->dontCache();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -13,11 +13,11 @@ use App\Classes\FTN\Message;
|
||||
use App\Events\Echomail as EchomailEvent;
|
||||
use App\Interfaces\Packet;
|
||||
use App\Models\Casts\{CompressedStringOrNull,CollectionOrNull,UTF8StringOrNull};
|
||||
use App\Traits\{MessageAttributes,MsgID,ParseAddresses,QueryCacheableConfig};
|
||||
use App\Traits\{MessageAttributes,MsgID,ParseAddresses};
|
||||
|
||||
final class Echomail extends Model implements Packet
|
||||
{
|
||||
use SoftDeletes,MessageAttributes,MsgID,ParseAddresses,QueryCacheableConfig;
|
||||
use SoftDeletes,MessageAttributes,MsgID,ParseAddresses;
|
||||
|
||||
private const LOGKEY = 'ME-';
|
||||
public const UPDATED_AT = NULL;
|
||||
@@ -291,7 +291,6 @@ final class Echomail extends Model implements Packet
|
||||
return $this->belongsToMany(Address::class,'echomail_seenby')
|
||||
->select(['addresses.id','zone_id','host_id','node_id'])
|
||||
->withPivot(['export_at','sent_at','sent_pkt'])
|
||||
->dontCache()
|
||||
->FTN2DOrder();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user