Optimize the SQL queries that finds unsent echomail,netmail and files
This commit is contained in:
@@ -14,9 +14,12 @@ use App\Classes\FTN\{Message,Packet};
|
||||
use App\Http\Requests\SetupRequest;
|
||||
use App\Models\File as FileModel;
|
||||
use App\Models\{Address,Echomail,Netmail,Setup,System};
|
||||
use App\Traits\HubStats;
|
||||
|
||||
class HomeController extends Controller
|
||||
{
|
||||
use HubStats;
|
||||
|
||||
public function home()
|
||||
{
|
||||
return redirect(Auth::check() ? 'dashboard' : 'about');
|
||||
@@ -246,49 +249,8 @@ class HomeController extends Controller
|
||||
{
|
||||
$date = Carbon::now()->yesterday()->endOfday();
|
||||
|
||||
$r = Address::select([
|
||||
'a.id',
|
||||
'a.system_id',
|
||||
'a.zone_id',
|
||||
'addresses.region_id',
|
||||
'a.host_id',
|
||||
'a.node_id',
|
||||
'a.point_id',
|
||||
'addresses.hub_id',
|
||||
'addresses.role',
|
||||
DB::raw('sum(a.uncollected_echomail) as uncollected_echomail'),
|
||||
DB::raw('sum(a.uncollected_netmail) as uncollected_netmail'),
|
||||
DB::raw('sum(a.uncollected_files) as uncollected_files')
|
||||
])
|
||||
->from(
|
||||
Address::UncollectedEchomailTotal()
|
||||
->where('echomails.created_at','<',$this->yesterdayEOD())
|
||||
->union(Address::UncollectedNetmailTotal()
|
||||
->where('netmails.created_at','<',$this->yesterdayEOD())
|
||||
)
|
||||
->union(Address::UncollectedFilesTotal()
|
||||
->where('files.created_at','<',$this->yesterdayEOD())
|
||||
),'a')
|
||||
->where('systems.active',TRUE)
|
||||
->where('addresses.active',TRUE)
|
||||
->where('zones.active',TRUE)
|
||||
->where('domains.active',TRUE)
|
||||
->when(! ($x=Auth::user()) || (! $x->isAdmin()),function($query) { return $query->where('domains.public',TRUE); })
|
||||
->join('addresses',['addresses.id'=>'a.id'])
|
||||
->join('systems',['systems.id'=>'a.system_id'])
|
||||
->join('zones',['zones.id'=>'addresses.zone_id'])
|
||||
->join('domains',['domains.id'=>'zones.domain_id'])
|
||||
->ftnOrder()
|
||||
->groupBy('a.system_id','a.id','a.zone_id','addresses.region_id','a.host_id','a.node_id','a.point_id','addresses.hub_id','addresses.role')
|
||||
->with(['system','zone.domain']);
|
||||
|
||||
return view('status')
|
||||
->with('date',$date)
|
||||
->with('uncollected',$r->get());
|
||||
}
|
||||
|
||||
private function yesterdayEOD(): Carbon
|
||||
{
|
||||
return Carbon::now()->yesterday()->endOfday();
|
||||
->with('uncollected',$this->HubStats($date)->get());
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user