From 6299df5d070a5da591c7adbeb8ce4523cd9385a6 Mon Sep 17 00:00:00 2001 From: ildyria Date: Tue, 12 Nov 2024 15:31:53 +0100 Subject: [PATCH] avoid placeholder to be shown in stats --- app/Actions/Statistics/Spaces.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/Actions/Statistics/Spaces.php b/app/Actions/Statistics/Spaces.php index 588960ca991..135b67ef0da 100644 --- a/app/Actions/Statistics/Spaces.php +++ b/app/Actions/Statistics/Spaces.php @@ -34,7 +34,9 @@ public function getFullSpacePerUser(?int $owner_id = null): Collection type: 'left' ) ->joinSub( - query: DB::table('size_variants')->select(['size_variants.photo_id', 'size_variants.filesize']), + query: DB::table('size_variants') + ->select(['size_variants.photo_id', 'size_variants.filesize']) + ->where('size_variants.type', '!=', 7), as: 'size_variants', first: 'size_variants.photo_id', operator: '=', @@ -79,6 +81,7 @@ public function getSpacePerSizeVariantTypePerUser(?int $owner_id = null): Collec 'size_variants.type', DB::raw('SUM(size_variants.filesize) as size') ) + ->where('size_variants.type', '!=', 7) ->groupBy('size_variants.type') ->orderBy('size_variants.type', 'asc') ->get() @@ -115,7 +118,9 @@ public function getSpacePerSizeVariantTypePerAlbum(string $album_id): Collection second: 'descendants.id', ) ->joinSub( - query: DB::table('size_variants')->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.type', 'size_variants.filesize']), + query: DB::table('size_variants') + ->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.type', 'size_variants.filesize']) + ->where('size_variants.type', '!=', 7), as: 'size_variants', first: 'size_variants.photo_id', operator: '=', @@ -174,7 +179,9 @@ public function getSpacePerAlbum(?string $album_id = null, ?int $owner_id = null second: 'albums.id' ) ->joinSub( - query: DB::table('size_variants')->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.filesize']), + query: DB::table('size_variants') + ->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.filesize']) + ->where('size_variants.type', '!=', 7), as: 'size_variants', first: 'size_variants.photo_id', operator: '=', @@ -234,7 +241,9 @@ public function getTotalSpacePerAlbum(?string $album_id = null, ?int $owner_id = second: 'descendants.id' ) ->joinSub( - query: DB::table('size_variants')->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.filesize']), + query: DB::table('size_variants') + ->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.filesize']) + ->where('size_variants.type', '!=', 7), as: 'size_variants', first: 'size_variants.photo_id', operator: '=',