Refactor Highcharts theme configuration; remove unused time setting and update table header to be disabled; enhance metrics service logging; modify seat service to include additional member details and update database schema for seat associations.

Author: austenstone

backend/src/controllers/teams.controller.ts

@@ -37,7 +37,12 @@ class TeamsController {
     const Member = mongoose.model('Member');
     try {
       const members = await Member.find()
-        .select('login name url avatar_url')
+        .select('login org name url avatar_url')
+        .populate({
+          path: 'seat',
+          select: '-_id -__v',
+          options: { lean: true }
+        })
         .sort({ login: 'asc' })
         .exec();
 

backend/src/database.ts

@@ -201,10 +201,15 @@ class Database {
       email: String,
       starred_at: String,
       user_view_type: String,
+      seat: {
+        type: Schema.Types.ObjectId,
+        ref: 'Seats'
+      }
     }, {
       timestamps: true,
     });
     memberSchema.index({ org: 1, login: 1, id: 1 }, { unique: true });
+    memberSchema.index({ seat: 1 });
     memberSchema.virtual('seats', {
       ref: 'Seats',
       localField: '_id',
@@ -226,24 +231,25 @@ class Database {
     const seatsSchema = new mongoose.Schema({
       org: String,
       team: String,
-      assigning_team_id: Number,
-      plan_type: String,
+      created_at: Date,
+      updated_at: Date,
+      pending_cancellation_date: Date,
       last_activity_at: Date,
       last_activity_editor: String,
-      queryAt: Date,
-      assignee_id: Number,
-      assignee_login: String,
+      plan_type: String,
       assignee: {
         type: Schema.Types.ObjectId,
         ref: 'Member'
       },
+      queryAt: Date,
+      assignee_id: Number,
+      assignee_login: String,
     }, {
       timestamps: true
     });
 
     seatsSchema.index({ org: 1, queryAt: 1, last_activity_at: -1 });
     seatsSchema.index({ org: 1, team: 1, queryAt: 1, assignee_id: 1 }, { unique: true });
-
     mongoose.model('Seats', seatsSchema);
 
     const adoptionSchema = new Schema({

backend/src/models/copilot.seats.model.ts

@@ -10,7 +10,6 @@ type SeatType = {
   last_activity_editor: string | null;
   plan_type: string;
   assignee_id: number;
-  assigning_team_id: number | null;
   createdAt: Date;
   updatedAt: Date;
 };

backend/src/services/copilot.seats.service.ts

@@ -28,19 +28,19 @@ type MemberDailyActivity = {
 
 class SeatsService {
   async getAllSeats(org?: string) {
-    const Seats = mongoose.model('Seats');
     const Member = mongoose.model('Member');
-
-    const latestQuery = await Seats.findOne()
-      .sort({ queryAt: -1 })  // -1 for descending order
-      .select('queryAt');
-
-    const seats = await Seats.find({
-      ...(org ? { org } : {}),
-      queryAt: latestQuery?.queryAt
+    
+    const seats = await Member.find({
+      ...(org ? { org } : {})
     })
-      .populate('assignee')
-      .sort({ last_activity_at: -1 });  // DESC ordering ⬇️
+      .select('org login id name url avatar_url')
+      .populate({
+        path: 'seat',
+        select: '-_id -__v',
+        options: { lean: true }
+      })
+      .sort({ 'seat.last_activity_at': -1 })
+      .exec();
 
     return seats;
   }
@@ -127,6 +127,7 @@ class SeatsService {
       id: { $in: data.map(seat => seat.assignee.id) }
     });
 
+    console.log('austenstone-alt2', data.find(s => s.assignee.login === 'austenstone-alt2'));
     const seatsData = data.map((seat) => ({
       queryAt,
       org,
@@ -137,6 +138,17 @@ class SeatsService {
       assignee: updatedMembers.find(m => m.id === seat.assignee.id)?._id
     }));
     const seatResults = await Seats.insertMany(seatsData);
+    
+    // Add member seat updates
+    const memberSeatUpdates = seatResults.map(seat => ({
+      updateOne: {
+        filter: { org, id: seat.assignee_id },
+        update: {
+          $set: { seat: seat._id }
+        }
+      }
+    }));
+    await Members.bulkWrite(memberSeatUpdates);
 
     const adoptionData = {
       enterprise: null,

backend/src/services/metrics.service.ts

@@ -305,6 +305,7 @@ class MetricsService {
 
   async insertMetrics(org: string, data: MetricDailyResponseType[], team?: string) {
     const Metrics = mongoose.model('Metrics');
+    console.log('data', data);
     for (const day of data) {
       // const parts = day.date.split('-').map(Number);
       // const date = new Date(Date.UTC(parts[0], parts[1] - 1, parts[2] + 1));

frontend/src/app/highcharts.theme.ts

@@ -192,9 +192,6 @@ const theme: Highcharts.Options = {
   },
   xAxis: xAxisConfig,
   yAxis: yAxisConfig,
-  time: {
-    useUTC: false
-  },
   legend: {
     align: 'left',
     verticalAlign: 'top',

frontend/src/app/main/copilot/copilot-dashboard/dashboard-card/dashboard-card-drilldown-bar-chart/dashboard-card-drilldown-bar-chart.component.ts

@@ -65,6 +65,7 @@ export class DashboardCardDrilldownBarChartComponent implements OnChanges {
         ...this.chartOptions,
         ...this._chartOptions
       };
+      console.log('chartOptions', this._chartOptions);
       this.updateFlag = true;
     }
   }

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

@@ -1,6 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { ColumnOptions, TableComponent } from '../../../shared/table/table.component';
-import { Seat, SeatService } from '../../../services/api/seat.service';
+import { AllSeats, Seat, SeatService } from '../../../services/api/seat.service';
 import { SortDirection } from '@angular/material/sort';
 import { Router } from '@angular/router';
 import { InstallationsService } from '../../../services/api/installations.service';
@@ -16,56 +16,60 @@ import { takeUntil } from 'rxjs';
   styleUrl: './copilot-seats.component.scss'
 })
 export class CopilotSeatsComponent implements OnInit {
-  seats?: Seat[];
+  seats?: AllSeats[];
   tableColumns: ColumnOptions[] = [
     { 
       columnDef: 'avatar', 
       header: '', 
-      cell: (element: Seat) => `${element.assignee.avatar_url}`,
+      cell: (element: AllSeats) => `${element.avatar_url}`,
       isImage: true
     },
     { 
       columnDef: 'login', 
       header: 'User', 
-      cell: (element: Seat) => `${element.assignee.login}`,
-      // link: (element: Seat) => `https://github.com/${element.assignee.login}`
+      cell: (element: AllSeats) => `${element.login}`,
+      // link: (element: AllSeats) => `https://github.com/${element.assignee.login}`
     },
     { 
       columnDef: 'last_activity_at', 
       header: 'Last Active', 
-      cell: (element: Seat) => element.last_activity_at ? new Date(element.last_activity_at).toLocaleString([], { dateStyle: 'short', timeStyle: 'short' }) : '-'
+      cell: (element: AllSeats) => element.seat?.last_activity_at ? new Date(element.seat.last_activity_at).toLocaleString([], { dateStyle: 'short', timeStyle: 'short' }) : '-'
     },
     { 
       columnDef: 'last_activity_editor', 
       header: 'Editor', 
-      cell: (element: Seat) => element.last_activity_editor?.split('/')[0] || '-',
+      cell: (element: AllSeats) => element.seat?.last_activity_editor?.split('/')[0] || '-',
       chipList: true,
-      chipListIcon: (element: Seat) => this.getIconForEditor(element.last_activity_editor),
+      chipListIcon: (element: AllSeats) => this.getIconForEditor(element.seat?.last_activity_editor),
     },
     { 
       columnDef: 'created_at', 
       header: 'Created', 
-      cell: (element: Seat) => new Date(element.created_at).toLocaleString([], { dateStyle: 'short' })
+      cell: (element: AllSeats) => new Date(element.seat?.created_at).toLocaleString([], { dateStyle: 'short' })
     },
     { 
       columnDef: 'plan_type', 
       header: 'Plan', 
-      cell: (element: Seat) => `${element.plan_type}`,
+      cell: (element: AllSeats) => `${element.seat?.plan_type || 'disabled'}`,
       chipList: true,
-      chipListIcon: (element: Seat) => element.plan_type === 'enterprise' ? 'corporate_fare' : 'paid'
+      chipListIcon: (element: AllSeats) => element.seat?.plan_type === 'enterprise' ? 'corporate_fare' : element.seat?.plan_type === 'business' ? 'paid' : 'close'
+    },
+    { 
+      columnDef: 'org', 
+      header: 'Org', 
+      cell: (element: AllSeats) => `${element.org}`,
     }
   ];
   defaultSort = {id: 'last_activity_at', start: 'desc' as SortDirection, disableClear: false};
-  sortingDataAccessor = (item: Seat, property: string) => {
+  sortingDataAccessor = (item: AllSeats, property: string) => {
     switch(property) {
       case 'login':
-        return (item.assignee as { login: string })?.login.toLowerCase();
+        return item.login.toLowerCase();
       default:
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        return (item as any)[property];
+        return item.seat?.[property as keyof Seat]
     }
   };
-  filterPredicate = (data: Seat, filter: string) => {
+  filterPredicate = (data: AllSeats, filter: string) => {
     const searchStr = JSON.stringify(data).toLowerCase();
     return searchStr.includes(filter);
   };
@@ -81,14 +85,14 @@ export class CopilotSeatsComponent implements OnInit {
       takeUntil(this.installationsService.destroy$)
     ).subscribe(installation => {
       this.seatsService.getAllSeats(installation?.account?.login).subscribe(seats => {
-        this.seats = seats as Seat[];
+        this.seats = seats;
       });
     });
   }
 
-  onRowClick(seat: Seat) {
-    if (seat.assignee.id) {
-      this.router.navigate(['/copilot/seats', seat.assignee.id]);
+  onRowClick(seat: AllSeats) {
+    if (seat.id) {
+      this.router.navigate(['/copilot/seats', seat.id]);
     }
   }
 

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

@@ -2,12 +2,20 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { serverUrl } from '../server.service';
 import { Endpoints } from "@octokit/types";
-import { map, reduce } from 'rxjs';
+import { map } from 'rxjs';
 
 type _Seat = NonNullable<Endpoints["GET /orgs/{org}/copilot/billing/seats"]["response"]["data"]["seats"]>[0];
 export interface Seat extends _Seat {
   plan_type: string;
 }
+export interface AllSeats {
+  avatar_url: string,
+  login: string,
+  id: number,
+  org: string,
+  url: string,
+  seat: Seat;
+}
 export interface ActivityResponseData {
   totalSeats: number,
   totalActive: number,
@@ -33,7 +41,7 @@ export class SeatService {
   constructor(private http: HttpClient) { }
 
   getAllSeats(org?: string) {
-    return this.http.get<Seat[]>(`${this.apiUrl}`, {
+    return this.http.get<AllSeats[]>(`${this.apiUrl}`, {
       params: org ? { org } : undefined
     });
   }