fix: Update cost calculations to use direct values and aggregate dail…

…y costs
nais · Nov 27, 2024 · 5a9cc42 · 5a9cc42
1 parent c4e6736
commit 5a9cc42
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/internal/cost/client.go b/internal/cost/client.go
@@ -117,7 +117,7 @@ func (client) DailyForTeamEnvironment(ctx context.Context, teamSlug slug.Slug, e
 
 		if row.AppLabel != nil {
 			daily[row.Date].Workloads = append(daily[row.Date].Workloads, &WorkloadCostSample{
-				Cost:            float64(ptr.Deref(row.DailyCost, 0)),
+				Cost:            float64(row.DailyCost),
 				TeamSlug:        teamSlug,
 				EnvironmentName: environmentName,
 				WorkloadName:    *row.AppLabel,

diff --git a/internal/cost/costsql/cost.sql.go b/internal/cost/costsql/cost.sql.go
diff --git a/internal/cost/queries/cost.sql b/internal/cost/queries/cost.sql
@@ -223,7 +223,7 @@ SELECT
 	cost.environment,
 	cost.team_slug,
 	cost.app_label,
-	cost.daily_cost
+	SUM(cost.daily_cost)::REAL AS daily_cost
 FROM
 	date_range
 	LEFT OUTER JOIN cost ON cost.date = date_range.date
@@ -233,6 +233,11 @@ WHERE
 		environment = @environment::TEXT
 		AND team_slug = @team_slug::slug
 	)
+GROUP BY
+	date_range.date,
+	cost.environment,
+	cost.team_slug,
+	cost.app_label
 ORDER BY
 	date_range.date,
 	cost.app_label ASC