Optimisations to uncollected Items, which fix mail:send, which was only being triggered for mail unsent from yesterday

app/Http/Controllers/HomeController.php

@@ -250,34 +250,47 @@ class HomeController extends Controller
 
 		$r = Address::select([
 				'a.id',
-				'addresses.system_id',
-				'addresses.zone_id',
+				'a.system_id',
+				'a.zone_id',
 				'addresses.region_id',
-				'addresses.host_id',
-				'addresses.node_id',
-				'addresses.point_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::UncollectedEchomail()->union(Address::UncollectedNetmail())->union(Address::UncollectedFiles()),'a')
+			->from(
+				Address::UncollectedEchomail()
+					->where('echomails.created_at','<',$this->yesterdayEOD())
+					->union(Address::UncollectedNetmail()
+						->where('netmails.created_at','<',$this->yesterdayEOD())
+					)
+					->union(Address::UncollectedFiles()
+						->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'=>'addresses.system_id'])
+			->join('systems',['systems.id'=>'a.system_id'])
 			->join('zones',['zones.id'=>'addresses.zone_id'])
 			->join('domains',['domains.id'=>'zones.domain_id'])
 			->ftnOrder()
-			->groupBy('addresses.system_id','a.id','addresses.zone_id','addresses.region_id','addresses.host_id','addresses.node_id','addresses.point_id','addresses.hub_id','addresses.role')
+			->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();
+	}
 }