From dac2aa43b4dbdbffa2c5e24a736096a6d928f633 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Thu, 20 Jun 2024 11:56:19 +0200 Subject: dashboard/app/entities_spanner.go: fixes --- dashboard/app/entities_spanner.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dashboard/app/entities_spanner.go b/dashboard/app/entities_spanner.go index 7f2c47b97..450167977 100644 --- a/dashboard/app/entities_spanner.go +++ b/dashboard/app/entities_spanner.go @@ -7,7 +7,6 @@ import ( "context" "fmt" "os" - "time" "cloud.google.com/go/civil" "cloud.google.com/go/spanner" @@ -32,7 +31,7 @@ func MergedCoverage(ctx context.Context, ns string, fromDate, toDate civil.Date) stmt := spanner.Statement{ SQL: `select - dateto targetdate, + dateto as targetdate, cast(sum(instrumented) as INTEGER) as instrumented, cast(sum(covered) as INTEGER) as covered from "files" @@ -60,15 +59,15 @@ func MergedCoverage(ctx context.Context, ns string, fromDate, toDate civil.Date) return nil, fmt.Errorf("failed to iter.Next() spanner DB: %w", err) } var r struct { - Targetdate time.Time + Targetdate civil.Date Instrumented int64 Covered int64 } if err = row.ToStruct(&r); err != nil { return nil, fmt.Errorf("failed to row.ToStruct() spanner DB: %w", err) } - res.instrumented[r.Targetdate.Format(time.DateOnly)] = r.Instrumented - res.covered[r.Targetdate.Format(time.DateOnly)] = r.Covered + res.instrumented[r.Targetdate.String()] = r.Instrumented + res.covered[r.Targetdate.String()] = r.Covered } return res, nil } -- cgit mrf-deployment