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

@@ -47,12 +47,12 @@ class HubStats extends Dynamic
DB::raw('sum(a.uncollected_files) as uncollected_files')
])
->from(
Address::UncollectedEchomail()
Address::UncollectedEchomailTotal()
->where('echomails.created_at','<',$date)
->union(Address::UncollectedNetmail()
->union(Address::UncollectedNetmailTotal()
->where('netmails.created_at','<',$date)
)
->union(Address::UncollectedFiles()
->union(Address::UncollectedFilesTotal()
->where('files.created_at','<',$date)
),'a')
->where('systems.active',true)

View File

@@ -71,6 +71,9 @@ class Tic extends FTNBase
case 'file':
return $this->{$key};
case 'name':
return $this->file->name;
default:
return parent::__get($key);
}