From 529444561bfbc2843f341728279b144687c09ed7 Mon Sep 17 00:00:00 2001 From: viktorstrate Date: Sun, 14 Feb 2021 11:40:13 +0100 Subject: [PATCH] Fix timeline date ordering --- api/graphql/resolvers/timeline.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/api/graphql/resolvers/timeline.go b/api/graphql/resolvers/timeline.go index 9f6a2311..d4adaa51 100644 --- a/api/graphql/resolvers/timeline.go +++ b/api/graphql/resolvers/timeline.go @@ -45,12 +45,18 @@ func (r *queryResolver) MyTimeline(ctx context.Context, paginate *models.Paginat } } - dateChain := fmt.Sprintf("%s, %s, %s", - database.DateExtract(tx, database.DateCompYear, "media.date_shot"), - database.DateExtract(tx, database.DateCompMonth, "media.date_shot"), - database.DateExtract(tx, database.DateCompDay, "media.date_shot")) - - rows, err := daysQuery.Group("albums.id").Group(dateChain).Order(dateChain).Rows() + rows, err := daysQuery.Group("albums.id").Group( + fmt.Sprintf("%s, %s, %s", + database.DateExtract(tx, database.DateCompYear, "media.date_shot"), + database.DateExtract(tx, database.DateCompMonth, "media.date_shot"), + database.DateExtract(tx, database.DateCompDay, "media.date_shot")), + ). + Order( + fmt.Sprintf("%s DESC, %s DESC, %s DESC", + database.DateExtract(tx, database.DateCompYear, "media.date_shot"), + database.DateExtract(tx, database.DateCompMonth, "media.date_shot"), + database.DateExtract(tx, database.DateCompDay, "media.date_shot")), + ).Rows() defer rows.Close()