From 71d808982c6dfbc352b0797c328f0afabd555be6 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Tue, 23 Jun 2020 09:41:59 +0200 Subject: [PATCH] Sharing: Fix photo count in query API #18 Signed-off-by: Michael Mayer --- internal/query/albums.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/query/albums.go b/internal/query/albums.go index c1ad5e048..f4bc69245 100644 --- a/internal/query/albums.go +++ b/internal/query/albums.go @@ -107,7 +107,7 @@ func AlbumSearch(f form.AlbumSearch) (results AlbumResults, err error) { s := UnscopedDb().Table("albums"). Select("albums.*, cp.photo_count, cl.link_count"). - Joins("LEFT JOIN (SELECT album_uid, count(album_uid) AS photo_count FROM albums GROUP BY album_uid) AS cp ON cp.album_uid = albums.album_uid"). + Joins("LEFT JOIN (SELECT album_uid, count(photo_uid) AS photo_count FROM photos_albums WHERE hidden = 0 GROUP BY album_uid) AS cp ON cp.album_uid = albums.album_uid"). Joins("LEFT JOIN (SELECT share_uid, count(share_uid) AS link_count FROM links GROUP BY share_uid) AS cl ON cl.share_uid = albums.album_uid"). Where("albums.deleted_at IS NULL")