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

Backend: Include categories when creating albums from labels

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-04-23 19:22:41 +02:00
parent 7181adb360
commit a88c499b70
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/query/selection.go
View file

@ -17,12 +17,14 @@ func (q *Query) PhotoSelection(f form.Selection) (results []entity.Photo, err er
s = s.Table("photos").
Select("photos.*").
Joins("LEFT JOIN photos_labels ON photos_labels.photo_id = photos.id").
Joins("LEFT JOIN labels ON photos_labels.label_id = labels.id AND labels.deleted_at IS NULL").
Joins("LEFT JOIN photos_labels pl ON pl.photo_id = photos.id").
Joins("LEFT JOIN labels l ON pl.label_id = l.id AND l.deleted_at IS NULL").
Joins("LEFT JOIN categories c ON c.label_id = pl.label_id").
Joins("LEFT JOIN labels lc ON lc.id = c.category_id AND lc.deleted_at IS NULL").
Where("photos.deleted_at IS NULL").
Group("photos.id")
s = s.Where("photos.photo_uuid IN (?) OR labels.label_uuid IN (?)", f.Photos, f.Labels)
s = s.Where("photos.photo_uuid IN (?) OR l.label_uuid IN (?) OR lc.label_uuid IN (?)", f.Photos, f.Labels, f.Labels)
if result := s.Scan(&results); result.Error != nil {
return results, result.Error