@@ -3058,7 +3058,7 @@ func (q *FakeQuerier) GetTemplateAppInsights(ctx context.Context, arg database.G
30583058// FROM
30593059for _ ,stat := range q .templateUsageStats {
30603060// WHERE
3061- if stat .StartTime .Before (arg .StartTime )|| stat .StartTime .After (arg .EndTime ) {
3061+ if stat .StartTime .Before (arg .StartTime )|| stat .EndTime .After (arg .EndTime ) {
30623062continue
30633063}
30643064if len (arg .TemplateIDs )> 0 && ! slices .Contains (arg .TemplateIDs ,stat .TemplateID ) {
@@ -3118,20 +3118,20 @@ func (q *FakeQuerier) GetTemplateAppInsights(ctx context.Context, arg database.G
31183118}
31193119
31203120templateRows := make (map [appGroupBy ]templateRow )
3121- for _ ,row := range appInsightRows {
3121+ for _ ,aiRow := range appInsightRows {
31223122key := appGroupBy {
3123- AppName :row .AppName ,
3124- DisplayName :row .DisplayName ,
3125- Icon :row .Icon ,
3126- IsApp :row .IsApp ,
3123+ AppName :aiRow .AppName ,
3124+ DisplayName :aiRow .DisplayName ,
3125+ Icon :aiRow .Icon ,
3126+ IsApp :aiRow .IsApp ,
31273127}
31283128row ,ok := templateRows [key ]
31293129if ! ok {
31303130row = templateRow {
31313131appGroupBy :key ,
31323132}
31333133}
3134- row .TemplateIDs = append (row .TemplateIDs ,row .TemplateIDs ... )
3134+ row .TemplateIDs = uniqueSortedUUIDs ( append (row .TemplateIDs ,aiRow .TemplateIDs ... ) )
31353135templateRows [key ]= row
31363136}
31373137
@@ -3171,18 +3171,20 @@ func (q *FakeQuerier) GetTemplateAppInsights(ctx context.Context, arg database.G
31713171IsApp :aiRow .IsApp ,
31723172}
31733173row := groupedRows [key ]
3174- row .TemplateIDs = append (row .TemplateIDs ,aiRow .TemplateIDs ... )
31753174row .ActiveUserIDs = append (row .ActiveUserIDs ,aiRow .UserID )
31763175row .UsageSeconds += aiRow .AppUsageMins * 60
3176+ groupedRows [key ]= row
31773177}
31783178
31793179var rows []database.GetTemplateAppInsightsRow
3180- for k ,gr := range groupedRows {
3180+ for key ,gr := range groupedRows {
31813181rows = append (rows , database.GetTemplateAppInsightsRow {
3182- TemplateIDs :uniqueSortedUUIDs ( gr .TemplateIDs ) ,
3182+ TemplateIDs :templateRows [ key ] .TemplateIDs ,
31833183ActiveUsers :int64 (len (uniqueSortedUUIDs (gr .ActiveUserIDs ))),
3184- DisplayName :k .DisplayName ,
3185- SlugOrPort :k .AppName ,
3184+ SlugOrPort :key .AppName ,
3185+ DisplayName :key .DisplayName ,
3186+ Icon :key .Icon ,
3187+ IsApp :key .IsApp ,
31863188UsageSeconds :gr .UsageSeconds ,
31873189})
31883190}
@@ -8354,7 +8356,7 @@ func (q *FakeQuerier) UpsertTemplateUsageStats(ctx context.Context) error {
83548356return err
83558357}
83568358// CROSS JOIN generate_series
8357- for t := was .SessionStartedAt ;t .Before (was .SessionEndedAt );t = t .Add (time .Minute ) {
8359+ for t := was .SessionStartedAt . Truncate ( time . Minute ) ;t .Before (was .SessionEndedAt );t = t .Add (time .Minute ) {
83588360// WHERE
83598361if t .Before (latestStart )|| t .After (now )|| t .Equal (now ) {
83608362continue