Merge branch 'fix/dashboard' into 'development'

[FIX][BE]: fix get dashboard

See merge request mbugroup/lti-api!418
This commit is contained in:
Adnan Zahir
2026-04-14 15:25:08 +07:00
@@ -172,7 +172,7 @@ func (r *DashboardRepositoryImpl) GetUniformityWeeklyMetrics(ctx context.Context
db = applyDashboardFilters(db, filters)
if err := db.Group("week").Order("week ASC").Scan(&rows).Error; err != nil {
if err := db.Group(weekExpr).Order("1 ASC").Scan(&rows).Error; err != nil {
return nil, err
}
@@ -561,8 +561,8 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyUniformityMetrics(ctx conte
db = applyDashboardFilters(db, filters)
groupBy := fmt.Sprintf("week, %s", groupExpr)
orderBy := fmt.Sprintf("week ASC, %s", orderExpr)
groupBy := fmt.Sprintf("%s, %s", weekExpr, groupExpr)
orderBy := fmt.Sprintf("1 ASC, %s", orderExpr)
if err := db.Group(groupBy).Order(orderBy).Scan(&rows).Error; err != nil {
return nil, err
}