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

Sharing: Refactor album query API #18

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-06-23 07:55:33 +02:00
parent 9bd0e4c74a
commit d8537d4658
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/api/album.go
View file

@ -46,12 +46,13 @@ func GetAlbums(router *gin.RouterGroup, conf *config.Config) {
}
result, err := query.AlbumSearch(f)
if err != nil {
c.AbortWithStatusJSON(400, gin.H{"error": txt.UcFirst(err.Error())})
return
}
// TODO c.Header("X-Count", strconv.Itoa(count))
c.Header("X-Count", strconv.Itoa(len(result)))
c.Header("X-Limit", strconv.Itoa(f.Count))
c.Header("X-Offset", strconv.Itoa(f.Offset))

19
internal/query/albums.go
View file

@ -38,6 +38,8 @@ type AlbumResult struct {
DeletedAt time.Time `json:"DeletedAt,omitempty"`
}
type AlbumResults []AlbumResult
// AlbumByUID returns a Album based on the UID.
func AlbumByUID(albumUID string) (album entity.Album, err error) {
if err := Db().Where("album_uid = ?", albumUID).First(&album).Error; err != nil {
@ -96,23 +98,18 @@ func AlbumPhotos(a entity.Album, count int) (results PhotoResults, err error) {
}
// AlbumSearch searches albums based on their name.
func AlbumSearch(f form.AlbumSearch) (results []AlbumResult, err error) {
func AlbumSearch(f form.AlbumSearch) (results AlbumResults, err error) {
if err := f.ParseQueryString(); err != nil {
return results, err
}
defer log.Debug(capture.Time(time.Now(), fmt.Sprintf("albums: search %s", form.Serialize(f, true))))
s := Db().NewScope(nil).DB()
s = s.Table("albums").
Select(`albums.*,
COUNT(photos_albums.album_uid) AS photo_count,
COUNT(links.share_token) AS link_count`).
Joins("LEFT JOIN photos_albums ON photos_albums.album_uid = albums.album_uid").
Joins("LEFT JOIN links ON links.share_uid = albums.album_uid").
Where("albums.deleted_at IS NULL").
Group("albums.id")
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 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")
if f.ID != "" {
s = s.Where("albums.album_uid IN (?)", strings.Split(f.ID, ","))

2
internal/query/albums_test.go
View file

@ -58,7 +58,7 @@ func TestAlbumPhotos(t *testing.T) {
})
}
func TestAlbums(t *testing.T) {
func TestAlbumSearch(t *testing.T) {
t.Run("search with string", func(t *testing.T) {
query := form.NewAlbumSearch("chr")
result, err := AlbumSearch(query)

2
internal/query/photo_search_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/photoprism/photoprism/internal/form"
)
func TestPhotos(t *testing.T) {
func TestPhotoSearch(t *testing.T) {
t.Run("search all", func(t *testing.T) {
//Db().LogMode(true)
var f form.PhotoSearch