Merge branch 'main' of github.com:austenstone/github-value

Author: austenstone

backend/src/services/query.service.ts

@@ -86,7 +86,7 @@ class QueryService {
     logger.info(`Task started for ${org}`);
     try {
       let teamsAndMembers = null;
-      const mostRecentEntry = await teamsService.getLastUpdatedAt();
+      const mostRecentEntry = await teamsService.getLastUpdatedAt(org);
       const msSinceLastUpdate = new Date().getTime() - new Date(mostRecentEntry).getTime();
       const hoursSinceLastUpdate = msSinceLastUpdate / 1000 / 60 / 60;
       logger.info(`Teams & Members updated ${hoursSinceLastUpdate.toFixed(2)} hours ago for ${org}.`);

backend/src/services/seats.service.ts

@@ -464,13 +464,40 @@ class SeatsService {
             date: "$date",
             login: "$assignee_login"
           },
-          daily_time: { $sum: "$total_active_time_ms" }
+          daily_time: { $sum: "$total_active_time_ms" },
+          last_activity_at: { $max: "$last_activity_at" },
+          last_activity_editor: { $last: "$last_activity_editor" },
+          assignee_id: { $first: "$assignee_id" }
+        }
+      },
+      {
+        $lookup: {
+          from: 'members',
+          localField: '_id.login',
+          foreignField: 'login',
+          as: 'memberDetails'
+        }
+      },
+      {
+        $unwind: {
+          path: '$memberDetails',
+          preserveNullAndEmptyArrays: true
         }
       },
       {
         $group: {
           _id: "$_id.login",
-          total_time: { $sum: "$daily_time" }
+          total_time: { $sum: "$daily_time" },
+          last_activity_at: { $max: "$last_activity_at" },
+          last_activity_editor: { $last: "$last_activity_editor" },
+          assignee_id: { $first: "$assignee_id" },
+          avatar_url: { $first: "$memberDetails.avatar_url" },
+          name: { $first: "$memberDetails.name" },
+          url: { $first: "$memberDetails.url" },
+          html_url: { $first: "$memberDetails.html_url" },
+          team: { $first: "$memberDetails.team" },
+          org: { $first: "$memberDetails.org" },
+          type: { $first: "$memberDetails.type" }
         }
       },
       { $sort: { total_time: -1 } },
@@ -479,12 +506,22 @@ class SeatsService {
         $project: {
           _id: 0,
           login: '$_id',
-          total_time: 1
+          total_time: 1,
+          last_activity_at: 1,
+          last_activity_editor: 1,
+          assignee_id: 1,
+          avatar_url: 1,
+          name: 1,
+          url: 1,
+          html_url: 1,
+          team: 1,
+          org: 1,
+          type: 1
         }
       }
     ]);
 
-    return totals.map(t => [t.login, t.total_time]);
+    return totals;
   }
 }
 

frontend/src/app/main/copilot/copilot-dashboard/dashboard-card/active-users-chart/active-users-chart.component.ts

@@ -15,7 +15,11 @@ import { Router } from '@angular/router';
   </highcharts-chart>`
 })
 export class ActiveUsersChartComponent implements OnChanges {
-  @Input() data?: Record<string, number>;
+  @Input() data?: {
+    login: string,
+    total_time: number,
+    avatar_url: string,
+  }[];
   @Input() chartOptions?: Highcharts.Options;
   Highcharts: typeof Highcharts = Highcharts;
   updateFlag = false;
@@ -32,16 +36,20 @@ export class ActiveUsersChartComponent implements OnChanges {
     series: [{
       name: 'Activity',
       type: 'bar',
-      data: this.data ? Object.values(this.data) : [],
+      data: [], // Will be updated in ngOnChanges
       colorByPoint: true,
       borderWidth: 0,
+      // Use point.options to access custom properties
+      keys: ['y', 'login', 'avatar_url']
     }],
     tooltip: {
       pointFormat: '<span style="padding:0">{point.y: .1f} hours</span>',
       headerFormat: '',
       formatter: function () {
         const hours = (this.y || 0); // Convert ms to hours
-        return `<span style="padding:0">@${this.key}</span><br>
+        // Access login from the keys mapping
+        const login = (this.point as any).login || this.key;
+        return `<span style="padding:0">@${login}</span><br>
         <span style="padding:0">${hours.toFixed(1)} hours</span>`;
       },
       outside: true,
@@ -52,8 +60,10 @@ export class ActiveUsersChartComponent implements OnChanges {
         dataLabels: [{
           enabled: true,
           formatter: function () {
+            // Access avatar_url from the keys mapping
+            const avatar_url = (this.point as any).avatar_url || `https://github.com/${this.key}.png`;
             return `<div style="width: 20px; height: 20px; overflow: hidden; border-radius: 50%; margin-right: -25px">
-            <img src="https://github.com/${this.key}.png" style="width: 30px; margin-left: -5px; margin-top: -2px"> 
+            <img src="${avatar_url}" style="width: 30px; margin-left: -5px; margin-top: -2px"> 
           </div>`
           },
           useHTML: true,
@@ -65,7 +75,7 @@ export class ActiveUsersChartComponent implements OnChanges {
         point: {
           events: {
             click: (event) => {
-              this.router.navigate(['/copilot/seats', event.point.name]);
+              this.router.navigate(['/copilot/seats', (event.point as any).login || event.point.name]);
             }
           }
         }
@@ -78,9 +88,16 @@ export class ActiveUsersChartComponent implements OnChanges {
   ) { }
 
   ngOnChanges() {
+    console.log('ngOnChanges', this.data);
     this._chartOptions = Object.assign({}, this.chartOptions, this._chartOptions);
     if (this._chartOptions?.series && this.data) {
-      (this._chartOptions?.series as Highcharts.SeriesBarOptions[])[0].data = Object.values(this.data);
+      // Create an array with [total_time, login, avatar_url] for each point
+      const seriesData = this.data.map(user => [
+        user.total_time,
+        user.login,
+        user.avatar_url
+      ]);
+      (this._chartOptions?.series as Highcharts.SeriesBarOptions[])[0].data = seriesData;
       this.updateFlag = true;
     }
   }

frontend/src/app/main/copilot/copilot-metrics/copilot-metrics.component.ts

@@ -8,7 +8,7 @@ import { Installation, InstallationsService } from '../../../services/api/instal
 import { Subject, Subscription, takeUntil } from 'rxjs';
 import { DashboardCardDrilldownBarChartComponent } from '../copilot-dashboard/dashboard-card/dashboard-card-drilldown-bar-chart/dashboard-card-drilldown-bar-chart.component';
 import { ActiveUsersChartComponent } from '../copilot-dashboard/dashboard-card/active-users-chart/active-users-chart.component';
-import { SeatService } from '../../../services/api/seat.service';
+import { ActivityTotals, SeatService } from '../../../services/api/seat.service';
 import { MembersService } from '../../../services/api/members.service';
 import { CommonModule } from '@angular/common';
 import { LoadingSpinnerComponent } from '../../../shared/loading-spinner/loading-spinner.component';
@@ -38,7 +38,7 @@ export class CopilotMetricsComponent implements OnInit {
   metrics?: CopilotMetrics[];
   metricsTotals?: CopilotMetrics;
   installation?: Installation = undefined;
-  activityTotals?: Record<string, number>;
+  activityTotals?: ActivityTotals[];
   totalSeats?: number;
   subscriptions: Subscription[] = [];
   private readonly _destroy$ = new Subject<void>();
@@ -85,14 +85,17 @@ export class CopilotMetricsComponent implements OnInit {
 
     this.reset();
 
+    console.log({
+      since: event.start.toISOString(),
+      until: event.end.toISOString()
+    })
     this.subscriptions.push(
       this.seatService.getActivityTotals({
         org: this.installation?.account?.login,
         since: event.start.toISOString(),
-        until: event.end.toISOString(),
-        limit: 10
+        until: event.end.toISOString()
       }).subscribe(totals => {
-        this.activityTotals = totals;
+        this.activityTotals = totals.length > 10 ? totals.slice(0, 10) : totals;
         this.cdr.detectChanges();
       })
     )

frontend/src/app/services/api/seat.service.ts

@@ -32,6 +32,22 @@ export interface ActivityResponse2 {
   updatedAt: Date;
 };
 export type ActivityResponse = Record<string, ActivityResponseData>;
+
+export interface ActivityTotals {
+  total_time: number;
+  last_activity_at: string | null;
+  last_activity_editor: string | null;
+  assignee_id: number;
+  avatar_url: string;
+  name: string | null;
+  url: string;
+  html_url: string;
+  team: string | null;
+  org: string;
+  type: string;
+  login: string;
+}
+
 @Injectable({
   providedIn: 'root'
 })
@@ -78,7 +94,7 @@ export class SeatService {
     limit?: number;
   }) {
     if (!queryParams?.org) delete queryParams?.org;
-    return this.http.get<Record<string, number>>(`${this.apiUrl}/activity/totals`, {
+    return this.http.get<ActivityTotals[]>(`${this.apiUrl}/activity/totals`, {
       params: queryParams
     });
   }