From c0a165de311cdb5722c92cc8cb485dbfbbcd723e Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Thu, 23 May 2019 23:21:45 +0200
Subject: [PATCH] runservice: fix query when grouping by path

When grouping by group path we have to apply the filter to the group by using
HAVING and not using WHERE
---
 internal/services/runservice/readdb/readdb.go | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/internal/services/runservice/readdb/readdb.go b/internal/services/runservice/readdb/readdb.go
index d84d167..e259053 100644
--- a/internal/services/runservice/readdb/readdb.go
+++ b/internal/services/runservice/readdb/readdb.go
@@ -38,12 +38,12 @@ import (
 	"github.com/sorintlab/agola/internal/services/runservice/store"
 	"github.com/sorintlab/agola/internal/services/runservice/types"
 	"github.com/sorintlab/agola/internal/util"
-	"go.uber.org/zap"
 
 	sq "github.com/Masterminds/squirrel"
 	etcdclientv3 "go.etcd.io/etcd/clientv3"
 	etcdclientv3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.uber.org/zap"
 	errors "golang.org/x/xerrors"
 )
 
@@ -1234,11 +1234,20 @@ func (r *ReadDB) getRunsFilteredQuery(phaseFilter []types.RunPhase, groups []str
 		s = s.Where(sq.Eq{"phase": phaseFilter})
 	}
 	if startRunID != "" {
-		switch sortOrder {
-		case types.SortOrderAsc:
-			s = s.Where(sq.Gt{"run.id": startRunID})
-		case types.SortOrderDesc:
-			s = s.Where(sq.Lt{"run.id": startRunID})
+		if lastRun {
+			switch sortOrder {
+			case types.SortOrderAsc:
+				s = s.Having(sq.Gt{"run.id": startRunID})
+			case types.SortOrderDesc:
+				s = s.Having(sq.Lt{"run.id": startRunID})
+			}
+		} else {
+			switch sortOrder {
+			case types.SortOrderAsc:
+				s = s.Where(sq.Gt{"run.id": startRunID})
+			case types.SortOrderDesc:
+				s = s.Where(sq.Lt{"run.id": startRunID})
+			}
 		}
 	}
 	if limit > 0 {