Remove unnecessary heatmap JSON helper functions from model layer

Move the [][2]int64 conversion inline into the route handlers instead
of adding dedicated model functions for it.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: silverwind

models/activities/user_heatmap.go

@@ -80,35 +80,3 @@ func GetTotalContributionsInHeatmap(hdata []*UserHeatmapData) int64 {
 	}
 	return total
 }
-
-// heatmapDataJSON converts UserHeatmapData to a [][2]int64 format and computes
-// total contributions.
-func heatmapDataJSON(hdata []*UserHeatmapData) ([][2]int64, int64) {
-	result := make([][2]int64, len(hdata))
-	var total int64
-	for i, v := range hdata {
-		result[i] = [2]int64{int64(v.Timestamp), v.Contributions}
-		total += v.Contributions
-	}
-	return result, total
-}
-
-// GetUserHeatmapDataByUserJSON returns heatmap data as [][2]int64 and total contributions
-func GetUserHeatmapDataByUserJSON(ctx context.Context, user, doer *user_model.User) ([][2]int64, int64, error) {
-	hdata, err := getUserHeatmapData(ctx, user, nil, doer)
-	if err != nil {
-		return nil, 0, err
-	}
-	data, total := heatmapDataJSON(hdata)
-	return data, total, nil
-}
-
-// GetUserHeatmapDataByUserTeamJSON returns heatmap data as [][2]int64 and total contributions
-func GetUserHeatmapDataByUserTeamJSON(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([][2]int64, int64, error) {
-	hdata, err := getUserHeatmapData(ctx, user, team, doer)
-	if err != nil {
-		return nil, 0, err
-	}
-	data, total := heatmapDataJSON(hdata)
-	return data, total, nil
-}

routers/web/user/home.go

@@ -162,14 +162,18 @@ func DashboardHeatmap(ctx *context.Context) {
 		return
 	}
 
-	data, total, err := activities_model.GetUserHeatmapDataByUserTeamJSON(ctx, ctxUser, ctx.Org.Team, ctx.Doer)
+	hdata, err := activities_model.GetUserHeatmapDataByUserTeam(ctx, ctxUser, ctx.Org.Team, ctx.Doer)
 	if err != nil {
-		ctx.ServerError("GetUserHeatmapDataByUserTeamJSON", err)
+		ctx.ServerError("GetUserHeatmapDataByUserTeam", err)
 		return
 	}
+	data := make([][2]int64, len(hdata))
+	for i, v := range hdata {
+		data[i] = [2]int64{int64(v.Timestamp), v.Contributions}
+	}
 	ctx.JSON(http.StatusOK, map[string]any{
 		"heatmapData":        data,
-		"totalContributions": total,
+		"totalContributions": activities_model.GetTotalContributionsInHeatmap(hdata),
 	})
 }
 

routers/web/user/profile.go

@@ -321,14 +321,18 @@ func Heatmap(ctx *context.Context) {
 		return
 	}
 
-	data, total, err := activities_model.GetUserHeatmapDataByUserJSON(ctx, ctx.ContextUser, ctx.Doer)
+	hdata, err := activities_model.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
 	if err != nil {
-		ctx.ServerError("GetUserHeatmapDataByUserJSON", err)
+		ctx.ServerError("GetUserHeatmapDataByUser", err)
 		return
 	}
+	data := make([][2]int64, len(hdata))
+	for i, v := range hdata {
+		data[i] = [2]int64{int64(v.Timestamp), v.Contributions}
+	}
 	ctx.JSON(http.StatusOK, map[string]any{
 		"heatmapData":        data,
-		"totalContributions": total,
+		"totalContributions": activities_model.GetTotalContributionsInHeatmap(hdata),
 	})
 }