dashboard/app: ns/cover?jsonl=1 supports manager and subsystem selection

Continued refactoring.

Author: tarasmadan

dashboard/app/coverage.go

@@ -129,7 +129,7 @@ func handleCoverageHeatmap(c context.Context, w http.ResponseWriter, r *http.Req
 		ns := hdr.Namespace
 		repo, _ := getNsConfig(c, ns).mainRepoBranch()
 		w.Header().Set("Content-Type", "application/json")
-		return writeExtAPICoverageFor(c, w, ns, repo)
+		return writeExtAPICoverageFor(c, w, ns, repo, params)
 	}
 	return handleHeatmap(c, w, hdr, params, cover.DoHeatMapStyleBodyJS)
 }

dashboard/app/public_json_api.go

@@ -178,7 +178,7 @@ func GetJSONDescrFor(page interface{}) ([]byte, error) {
 	return json.MarshalIndent(res, "", "\t")
 }
 
-func writeExtAPICoverageFor(ctx context.Context, w io.Writer, ns, repo string) error {
+func writeExtAPICoverageFor(ctx context.Context, w io.Writer, ns, repo string, p *coverageHeatmapParams) error {
 	// By default, return the previous month coverage. It guarantees the good numbers.
 	//
 	// The alternative is to return the current month.
@@ -187,13 +187,19 @@ func writeExtAPICoverageFor(ctx context.Context, w io.Writer, ns, repo string) e
 	if err != nil {
 		return fmt.Errorf("coveragedb.GenNPeriodsTill: %w", err)
 	}
-	defaultTimePeriod := tps[0]
+
 	covDBClient := getCoverageDBClient(ctx)
-	ff, err := coveragedb.MakeFuncFinder(ctx, covDBClient, ns, defaultTimePeriod)
+	ff, err := coveragedb.MakeFuncFinder(ctx, covDBClient, ns, tps[0])
 	if err != nil {
 		return fmt.Errorf("coveragedb.MakeFuncFinder: %w", err)
 	}
-	covCh, errCh := coveragedb.FilesCoverageStream(ctx, covDBClient, ns, defaultTimePeriod)
+	covCh, errCh := coveragedb.FilesCoverageStream(ctx, covDBClient,
+		&coveragedb.SelectScope{
+			Ns:        ns,
+			Subsystem: p.subsystem,
+			Manager:   p.manager,
+			Periods:   tps,
+		})
 	if err := writeFileCoverage(ctx, w, repo, ff, covCh); err != nil {
 		return fmt.Errorf("populateFileCoverage: %w", err)
 	}

pkg/coveragedb/coveragedb.go

@@ -409,10 +409,10 @@ type SelectScope struct {
 
 // FilesCoverageStream streams information about all the line coverage.
 // It is expensive and better to be used for time insensitive operations.
-func FilesCoverageStream(ctx context.Context, client spannerclient.SpannerClient, ns string, timePeriod TimePeriod,
+func FilesCoverageStream(ctx context.Context, client spannerclient.SpannerClient, scope *SelectScope,
 ) (<-chan *FileCoverageWithLineInfo, <-chan error) {
 	iter := client.Single().Query(ctx,
-		filesCoverageWithDetailsStmt(ns, "", "", timePeriod, true))
+		filesCoverageWithDetailsStmt(scope, true))
 	resCh := make(chan *FileCoverageWithLineInfo)
 	errCh := make(chan error)
 	go func() {
@@ -435,14 +435,24 @@ func FilesCoverageWithDetails(
 	for _, timePeriod := range scope.Periods {
 		needLinesDetails := onlyUnique
 		iterManager := client.Single().Query(ctx,
-			filesCoverageWithDetailsStmt(scope.Ns, scope.Subsystem, scope.Manager, timePeriod, needLinesDetails))
+			filesCoverageWithDetailsStmt(&SelectScope{
+				Ns:        scope.Ns,
+				Subsystem: scope.Subsystem,
+				Manager:   scope.Manager,
+				Periods:   []TimePeriod{timePeriod},
+			}, needLinesDetails))
 		defer iterManager.Stop()
 
 		var err error
 		var periodRes []*FileCoverageWithDetails
 		if onlyUnique {
 			iterAll := client.Single().Query(ctx,
-				filesCoverageWithDetailsStmt(scope.Ns, scope.Subsystem, "", timePeriod, needLinesDetails))
+				filesCoverageWithDetailsStmt(&SelectScope{
+					Ns:        scope.Ns,
+					Subsystem: scope.Subsystem,
+					Manager:   "",
+					Periods:   []TimePeriod{timePeriod},
+				}, needLinesDetails))
 			defer iterAll.Stop()
 			periodRes, err = readCoverageUniq(iterAll, iterManager)
 			if err != nil {
@@ -462,8 +472,8 @@ func FilesCoverageWithDetails(
 	return res, nil
 }
 
-func filesCoverageWithDetailsStmt(ns, subsystem, manager string, timePeriod TimePeriod, withLines bool,
-) spanner.Statement {
+func filesCoverageWithDetailsStmt(scope *SelectScope, withLines bool) spanner.Statement {
+	manager := scope.Manager
 	if manager == "" {
 		manager = "*"
 	}
@@ -481,15 +491,15 @@ from merge_history
 where
   merge_history.namespace=$1 and dateto=$2 and duration=$3 and manager=$4`,
 		Params: map[string]interface{}{
-			"p1": ns,
-			"p2": timePeriod.DateTo,
-			"p3": timePeriod.Days,
+			"p1": scope.Ns,
+			"p2": scope.Periods[0].DateTo,
+			"p3": scope.Periods[0].Days,
 			"p4": manager,
 		},
 	}
-	if subsystem != "" {
+	if scope.Subsystem != "" {
 		stmt.SQL += " and $5=ANY(subsystems)"
-		stmt.Params["p5"] = subsystem
+		stmt.Params["p5"] = scope.Subsystem
 	}
 	stmt.SQL += "\norder by files.filepath"
 	return stmt