Merge remote-tracking branch 'origin/main' into feat/scripts-source

kubeshop · Feb 3, 2022 · 5dfc3c8 · 5dfc3c8
2 parents 97eb4f7 + 3be610c
commit 5dfc3c8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/internal/app/api/v1/executions.go b/internal/app/api/v1/executions.go
@@ -132,12 +132,12 @@ func (s TestKubeAPI) ListExecutionsHandler() fiber.Handler {
 			return s.Error(c, http.StatusInternalServerError, err)
 		}
 
-		executionTotals, err := s.ExecutionResults.GetExecutionTotals(c.Context())
+		executionTotals, err := s.ExecutionResults.GetExecutionTotals(c.Context(), false, filter)
 		if err != nil {
 			return s.Error(c, http.StatusInternalServerError, err)
 		}
 
-		filteredTotals, err := s.ExecutionResults.GetExecutionTotals(c.Context(), filter)
+		filteredTotals, err := s.ExecutionResults.GetExecutionTotals(c.Context(), true, filter)
 		if err != nil {
 			return s.Error(c, http.StatusInternalServerError, err)
 		}

diff --git a/internal/pkg/api/repository/result/interface.go b/internal/pkg/api/repository/result/interface.go
@@ -35,8 +35,8 @@ type Repository interface {
 	GetByNameAndScript(ctx context.Context, name, script string) (testkube.Execution, error)
 	// GetExecutions gets executions using a filter, use filter with no data for all
 	GetExecutions(ctx context.Context, filter Filter) ([]testkube.Execution, error)
-	// GetExecutionTotals gets the statistics on number of executions using a filter, use filter with no data for all
-	GetExecutionTotals(ctx context.Context, filter ...Filter) (result testkube.ExecutionsTotals, err error)
+	// GetExecutionTotals gets the statistics on number of executions using a filter, but without paging
+	GetExecutionTotals(ctx context.Context, paging bool, filter ...Filter) (result testkube.ExecutionsTotals, err error)
 	// Insert inserts new execution result
 	Insert(ctx context.Context, result testkube.Execution) error
 	// Update updates execution result

diff --git a/internal/pkg/api/repository/result/mongo.go b/internal/pkg/api/repository/result/mongo.go
@@ -59,7 +59,7 @@ func (r *MongoRepository) GetExecutions(ctx context.Context, filter Filter) (res
 	return
 }
 
-func (r *MongoRepository) GetExecutionTotals(ctx context.Context, filter ...Filter) (totals testkube.ExecutionsTotals, err error) {
+func (r *MongoRepository) GetExecutionTotals(ctx context.Context, paging bool, filter ...Filter) (totals testkube.ExecutionsTotals, err error) {
 	var result []struct {
 		Status string `bson:"_id"`
 		Count  int32  `bson:"count"`
@@ -73,8 +73,10 @@ func (r *MongoRepository) GetExecutionTotals(ctx context.Context, filter ...Filt
 	pipeline := []bson.D{{{"$match", query}}}
 	if len(filter) > 0 {
 		pipeline = append(pipeline, bson.D{{"$sort", bson.D{{"starttime", -1}}}})
-		pipeline = append(pipeline, bson.D{{"$skip", int64(filter[0].Page() * filter[0].PageSize())}})
-		pipeline = append(pipeline, bson.D{{"$limit", int64(filter[0].PageSize())}})
+		if paging {
+			pipeline = append(pipeline, bson.D{{"$skip", int64(filter[0].Page() * filter[0].PageSize())}})
+			pipeline = append(pipeline, bson.D{{"$limit", int64(filter[0].PageSize())}})
+		}
 	}
 
 	pipeline = append(pipeline, bson.D{{"$group", bson.D{{"_id", "$executionresult.status"}, {"count", bson.D{{"$sum", 1}}}}}})

diff --git a/internal/pkg/api/repository/result/mongo_test.go b/internal/pkg/api/repository/result/mongo_test.go
@@ -86,7 +86,7 @@ func TestStorage(t *testing.T) {
 	})
 
 	t.Run("filter with status should return only totals with that status", func(t *testing.T) {
-		filteredTotals, err := repository.GetExecutionTotals(context.Background(), NewExecutionsFilter().WithStatus(testkube.ERROR__ExecutionStatus))
+		filteredTotals, err := repository.GetExecutionTotals(context.Background(), false, NewExecutionsFilter().WithStatus(testkube.ERROR__ExecutionStatus))
 
 		assert.NoError(err)
 		assert.Equal(int32(12), filteredTotals.Results)
@@ -97,7 +97,7 @@ func TestStorage(t *testing.T) {
 	})
 
 	t.Run("getting totals without filters should return all the executions", func(t *testing.T) {
-		totals, err := repository.GetExecutionTotals(context.Background())
+		totals, err := repository.GetExecutionTotals(context.Background(), false)
 
 		assert.NoError(err)
 		assert.Equal(int32(21), totals.Results)
@@ -125,7 +125,7 @@ func TestStorage(t *testing.T) {
 	})
 
 	t.Run("getting totals with filter by date start date should return only the results after this date", func(t *testing.T) {
-		totals, err := repository.GetExecutionTotals(context.Background(), NewExecutionsFilter().WithStartDate(dateFilter.Start))
+		totals, err := repository.GetExecutionTotals(context.Background(), false, NewExecutionsFilter().WithStartDate(dateFilter.Start))
 
 		assert.NoError(err)
 		assert.Equal(int32(14), totals.Results)
@@ -147,7 +147,7 @@ func TestStorage(t *testing.T) {
 	})
 
 	t.Run("getting totals with filter by date start date should return only the results before this date", func(t *testing.T) {
-		totals, err := repository.GetExecutionTotals(context.Background(), NewExecutionsFilter().WithEndDate(dateFilter.End))
+		totals, err := repository.GetExecutionTotals(context.Background(), false, NewExecutionsFilter().WithEndDate(dateFilter.End))
 
 		assert.NoError(err)
 		assert.Equal(int32(7), totals.Results)
@@ -165,7 +165,7 @@ func TestStorage(t *testing.T) {
 	})
 
 	t.Run("getting totals with script name that doesn't exist should return 0 results", func(t *testing.T) {
-		totals, err := repository.GetExecutionTotals(context.Background(), NewExecutionsFilter().WithScriptName("noneExisting"))
+		totals, err := repository.GetExecutionTotals(context.Background(), false, NewExecutionsFilter().WithScriptName("noneExisting"))
 
 		assert.NoError(err)
 		assert.Equal(int32(0), totals.Results)
@@ -192,7 +192,7 @@ func TestStorage(t *testing.T) {
 			WithStartDate(twoDaysAgo).
 			WithEndDate(oneDayAgo).
 			WithScriptName(defaultName)
-		totals, err := repository.GetExecutionTotals(context.Background(), filter)
+		totals, err := repository.GetExecutionTotals(context.Background(), false, filter)
 
 		assert.NoError(err)
 		assert.Equal(int32(2), totals.Results)
@@ -215,7 +215,7 @@ func TestStorage(t *testing.T) {
 	})
 
 	t.Run("getting totals with script name should return result only for that script name", func(t *testing.T) {
-		totals, err := repository.GetExecutionTotals(context.Background(), NewExecutionsFilter().WithScriptName(name))
+		totals, err := repository.GetExecutionTotals(context.Background(), false, NewExecutionsFilter().WithScriptName(name))
 
 		assert.NoError(err)
 		assert.Equal(int32(1), totals.Results)