Optimise our use of items waiting and queries used. We are now using a single consistent query for each resource.

This commit is contained in:
2023-12-16 23:22:23 +11:00
parent 7af67de2a8
commit 7b9ab388d8
5 changed files with 80 additions and 44 deletions

View File

@@ -39,7 +39,7 @@ class MailSend #implements ShouldQueue
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::UncollectedEchomailTotal()->union(Address::UncollectedNetmailTotal())->union(Address::UncollectedFilesTotal()),'a')
->where('systems.active',true)
->where('addresses.active',TRUE)
->where('zones.active',TRUE)