luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moments: Fix AlbumFolders query

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-06-15 16:07:09 +02:00
parent 5ba8303519
commit 8eb5e5ca44
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/query/folders.go
View file

@ -39,9 +39,9 @@ func FoldersByPath(rootName, rootPath, path string, recursive bool) (folders ent
// AlbumFolders returns folders that should be added as album. // AlbumFolders returns folders that should be added as album.
func AlbumFolders(threshold int) (folders entity.Folders, err error) { func AlbumFolders(threshold int) (folders entity.Folders, err error) {
db := UnscopedDb().Table("folders"). db := UnscopedDb().Table("folders").
Select("folders.*, COUNT(photos.id) AS photo_count"). Select("folders.path, folders.root, folders.folder_uid, folders.folder_title, folders.folder_country, folders.folder_year, folders.folder_month, COUNT(photos.id) AS photo_count").
Joins("JOIN photos ON photos.photo_path = folders.path AND photos.deleted_at IS NULL AND photos.photo_quality >= 3"). Joins("JOIN photos ON photos.photo_path = folders.path AND photos.deleted_at IS NULL AND photos.photo_quality >= 3").
Group("folders.path"). Group("folders.path, folders.root, folders.folder_uid, folders.folder_title, folders.folder_country, folders.folder_year, folders.folder_month").
Having("photo_count >= ?", threshold) Having("photo_count >= ?", threshold)
if err := db.Scan(&folders).Error; err != nil { if err := db.Scan(&folders).Error; err != nil {