Refactor codebase: update ESLint configuration to ignore test files, remove unused imports, enhance type definitions, and improve error handling in various services and controllers.

Author: austenstone

backend/eslint.config.mjs

@@ -9,4 +9,7 @@ export default [
   {languageOptions: { globals: globals.browser }},
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
+  {
+    ignores: ["src/__tests__/**"]
+  }
 ];

backend/src/controllers/survey.controller.ts

@@ -75,7 +75,10 @@ class SurveyController {
   async getAllSurveys(req: Request, res: Response): Promise<void> {
     const { org, team, reasonLength, since, until, status } = req.query as { [key: string]: string | undefined };;
     try {
-      const dateFilter: any = {};
+      const dateFilter: mongoose.FilterQuery<{
+        $gte: Date;
+        $lte: Date;
+      }> = {};
       if (since) {
         dateFilter.$gte = new Date(since);
       }

backend/src/controllers/usage.controller.ts

@@ -1,11 +1,12 @@
 import { Request, Response } from 'express';
+import { UsageType } from 'models/usage.model.js';
 import mongoose from 'mongoose';
 
 class UsageController {
   async getUsage(req: Request, res: Response): Promise<void> {
     const Usage = mongoose.model('Usage');
     try {
-      const query: any = {};
+      const query: mongoose.FilterQuery<UsageType> = {};
       if (req.query.org) {
         query.org = req.query.org as string;
       }

backend/src/controllers/webhook.controller.ts

@@ -1,4 +1,4 @@
-import { App } from 'octokit';
+import { App, RequestError } from 'octokit';
 import logger from '../services/logger.js';
 import surveyService from '../services/survey.service.js';
 import app from '../index.js';
@@ -51,7 +51,7 @@ export const setupWebhookListeners = (github: App) => {
       });
     } catch (error) {
       logger.debug(error);
-      if ((error as any)?.status === 422) {
+      if (error instanceof RequestError && error.status === 422) {
         logger.info('Survey comment created. (422)');
       } else {
         logger.error('Error creating survey comment');

backend/src/github.ts

@@ -70,7 +70,10 @@ class GitHub {
       oauth: {
         clientId: null,
         clientSecret: null
-      } as any
+      } as {
+        clientId: never;
+        clientSecret: never;
+      }
     });
 
     await updateDotenv({ GITHUB_APP_ID: this.input.appId })
@@ -91,7 +94,7 @@ class GitHub {
         });
         logger.info('Webhook config updated for app', this.smee.options.url, this.input.webhooks?.secret?.replace(/\S/, '*'));
       } catch (error) {
-        logger.error('Failed to update webhook config for app');
+        logger.error('Failed to update webhook config for app', error);
       }
       app.settingsService.updateSetting('webhookProxyUrl', this.smee.options.url, false);
     }

backend/src/models/usage.model.ts

@@ -27,7 +27,7 @@ type UsageBreakdownType = {
   activeUsers: number;
 }
 
-async function insertUsage(org: string, data: Endpoints["GET /orgs/{org}/copilot/usage"]["response"]["data"], team?: string) {
+async function insertUsage(org: string, data: Endpoints["GET /orgs/{org}/copilot/usage"]["response"]["data"]) {
   for (const metrics of data) {
     const Usage = mongoose.model('Usage');
 

backend/src/services/adoption.service.ts

@@ -2,8 +2,22 @@
 import mongoose from 'mongoose';
 import logger from './logger.js';
 import { SeatEntry } from './seats.service.js';
+import { SeatType } from 'models/seats.model.js';
 
-type AdoptionType = any;
+type AdoptionType = {
+  _id?: string;
+  enterprise: string | null;
+  org: string | null;
+  team: string | null;
+  date: Date;
+  totalSeats: number;
+  totalActive: number;
+  totalInactive: number;
+  seats: Partial<SeatType>[];
+  createdAt?: Date;
+  updatedAt?: Date;
+  __v?: number;
+};
 
 export interface GetAdoptionsParams {
   enterprise?: string;
@@ -20,12 +34,12 @@ export class AdoptionService {
   constructor() {
   }
 
-  async createAdoption(adoptionData: any): Promise<AdoptionType> {
+  async createAdoption(adoptionData: AdoptionType): Promise<AdoptionType> {
     const adoptionModel = mongoose.model('Adoption');
     try {
       const result = await adoptionModel.create(adoptionData);
       return result;
-    } catch (error: any) {
+    } catch (error) {
       logger.error('Error creating adoption:', error);
       throw error; // Rethrow other errors
     }
@@ -79,7 +93,10 @@ export class AdoptionService {
     }
   }
 
-  async getAllAdoptions2(params: any): Promise<AdoptionType[]> {
+  async getAllAdoptions2(params: {
+    filter: mongoose.RootFilterQuery<AdoptionType>;
+    projection: mongoose.ProjectionType<AdoptionType>;
+  }): Promise<AdoptionType[]> {
     const adoptionModel = mongoose.model<AdoptionType>('Adoption');
 
     try {

backend/src/services/metrics.service.ts

@@ -13,61 +13,59 @@ export interface MetricsQueryParams {
 
 class MetricsService {
   async getMetrics(params: MetricsQueryParams) {
-    const { org, type, since, until, editor, language, model } = params;
-    
+    const { org, since, until, editor, language, model } = params; // type
+
     const dateFilter = {
       ...(since && { $gte: new Date(since) }),
       ...(until && { $lte: new Date(until) })
     };
 
-    const query: any = {
+    const query: mongoose.FilterQuery<MetricDailyResponseType> = {
       ...(org && { org }),
       ...(Object.keys(dateFilter).length && { date: dateFilter })
     };
 
-    const types = type ? type.split(/[ ,]+/) : [];
-
-    const metrics = await mongoose.model('Metrics').find(query).sort({date:1}).lean();
+    const metrics = await mongoose.model<MetricDailyResponseType>('Metrics').find(query).sort({ date: 1 }).lean();
 
     if (editor || language || model) {
       metrics.forEach(metric => {
-        if (metric.copilot_ide_code_completions) {
-          metric.copilot_ide_code_completions.editors = metric.copilot_ide_code_completions.editors.filter((editorItem: any) => {
+        if (metric.copilot_ide_code_completions?.editors) {
+          metric.copilot_ide_code_completions.editors = metric.copilot_ide_code_completions.editors.filter((editorItem) => {
             if (editor && editorItem.name !== editor) return false;
-            if (model) {
-              editorItem.models = editorItem.models.filter((modelItem: any) => {
+            if (editorItem.models) {
+              editorItem.models = editorItem.models.filter((modelItem) => {
                 if (modelItem.name !== model) return false;
-                if (language) {
-                  modelItem.languages = modelItem.languages.filter((languageItem: any) => languageItem.name === language);
+                if (modelItem.languages) {
+                  modelItem.languages = modelItem.languages.filter((languageItem) => languageItem.name === language);
                 }
                 return true;
               });
             }
             return true;
           });
         }
-        if (metric.copilot_ide_chat) {
-          metric.copilot_ide_chat.editors = metric.copilot_ide_chat.editors.filter((editorItem: any) => {
+        if (metric.copilot_ide_chat?.editors) {
+          metric.copilot_ide_chat.editors = metric.copilot_ide_chat.editors.filter((editorItem) => {
             if (editor && editorItem.name !== editor) return false;
-            if (model) {
-              editorItem.models = editorItem.models.filter((modelItem: any) => {
+            if (editorItem.models) {
+              editorItem.models = editorItem.models.filter((modelItem) => {
                 if (modelItem.name !== model) return false;
                 return true;
               });
             }
             return true;
           });
         }
-        if (metric.copilot_dotcom_chat) {
-          metric.copilot_dotcom_chat.models = metric.copilot_dotcom_chat.models.filter((modelItem: any) => {
+        if (metric.copilot_dotcom_chat?.models) {
+          metric.copilot_dotcom_chat.models = metric.copilot_dotcom_chat.models.filter((modelItem) => {
             if (modelItem.name !== model) return false;
             return true;
           });
         }
-        if (metric.copilot_dotcom_pull_requests) {
-          metric.copilot_dotcom_pull_requests.repositories = metric.copilot_dotcom_pull_requests.repositories.filter((repositoryItem: any) => {
-            if (model) {
-              repositoryItem.models = repositoryItem.models.filter((modelItem: any) => {
+        if (metric.copilot_dotcom_pull_requests?.repositories) {
+          metric.copilot_dotcom_pull_requests.repositories = metric.copilot_dotcom_pull_requests.repositories.filter((repositoryItem) => {
+            if (repositoryItem.models) {
+              repositoryItem.models = repositoryItem.models.filter((modelItem) => {
                 if (modelItem.name !== model) return false;
                 return true;
               });
@@ -152,13 +150,13 @@ class MetricsService {
       }
     };
 
-    metrics.forEach((daily: any) => {
+    metrics.forEach((daily) => {
       if (daily.copilot_ide_code_completions) {
         periodMetrics.copilot_ide_code_completions.total_code_acceptances += daily.copilot_ide_code_completions.total_code_acceptances || 0;
         periodMetrics.copilot_ide_code_completions.total_code_suggestions += daily.copilot_ide_code_completions.total_code_suggestions || 0;
         periodMetrics.copilot_ide_code_completions.total_code_lines_accepted += daily.copilot_ide_code_completions.total_code_lines_accepted || 0;
         periodMetrics.copilot_ide_code_completions.total_code_lines_suggested += daily.copilot_ide_code_completions.total_code_lines_suggested || 0;
-        daily.copilot_ide_code_completions.editors?.forEach((editor: any) => {
+        daily.copilot_ide_code_completions.editors?.forEach((editor) => {
           let editorTotals = periodMetrics.copilot_ide_code_completions.editors.find(e => e.name === editor.name);
           if (editorTotals) {
             editorTotals.total_code_acceptances += editor.total_code_acceptances || 0;
@@ -176,7 +174,7 @@ class MetricsService {
             }
             periodMetrics.copilot_ide_code_completions.editors.push(editorTotals);
           }
-          editor.models?.forEach((model: any) => {
+          editor.models?.forEach((model) => {
             let editorModelTotals = editorTotals?.models.find(m => m.name === model.name);
             if (editorModelTotals) {
               editorModelTotals.total_code_acceptances += model.total_code_acceptances || 0;
@@ -194,7 +192,7 @@ class MetricsService {
               }
               editorTotals?.models.push(editorModelTotals);
             }
-            model.languages?.forEach((language: any) => {
+            model.languages?.forEach((language) => {
               let modelLanguageTotals = editorModelTotals?.languages.find(l => l.name === language.name);
               if (modelLanguageTotals) {
                 modelLanguageTotals.total_code_acceptances += language.total_code_acceptances || 0;
@@ -220,7 +218,7 @@ class MetricsService {
         periodMetrics.copilot_ide_chat.total_chats += daily.copilot_ide_chat.total_chats || 0;
         periodMetrics.copilot_ide_chat.total_chat_copy_events += daily.copilot_ide_chat.total_chat_copy_events || 0;
         periodMetrics.copilot_ide_chat.total_chat_insertion_events += daily.copilot_ide_chat.total_chat_insertion_events || 0;
-        daily.copilot_ide_chat.editors?.forEach((editor: any) => {
+        daily.copilot_ide_chat.editors?.forEach((editor) => {
           let editorTotals = periodMetrics.copilot_ide_chat.editors.find(e => e.name === editor.name);
           if (editorTotals) {
             editorTotals.total_chats += editor.total_chats || 0;
@@ -236,7 +234,7 @@ class MetricsService {
             }
             periodMetrics.copilot_ide_chat.editors.push(editorTotals);
           }
-          editor.models?.forEach((model: any) => {
+          editor.models?.forEach((model) => {
             let editorModelTotals = editorTotals?.models.find(m => m.name === model.name);
             if (editorModelTotals) {
               editorModelTotals.total_chats += model.total_chats || 0;
@@ -257,7 +255,7 @@ class MetricsService {
 
       if (daily.copilot_dotcom_chat) {
         periodMetrics.copilot_dotcom_chat.total_chats += daily.copilot_dotcom_chat.total_chats || 0;
-        daily.copilot_dotcom_chat.models?.forEach((model: any) => {
+        daily.copilot_dotcom_chat.models?.forEach((model) => {
           let modelTotals = periodMetrics.copilot_dotcom_chat.models.find(m => m.name === model.name);
           if (modelTotals) {
             modelTotals.total_chats += model.total_chats || 0;
@@ -273,7 +271,7 @@ class MetricsService {
 
       if (daily.copilot_dotcom_pull_requests) {
         periodMetrics.copilot_dotcom_pull_requests.total_pr_summaries_created += daily.copilot_dotcom_pull_requests.total_pr_summaries_created || 0;
-        daily.copilot_dotcom_pull_requests.repositories?.forEach((repository: any) => {
+        daily.copilot_dotcom_pull_requests.repositories?.forEach((repository) => {
           let repositoryTotals = periodMetrics.copilot_dotcom_pull_requests.repositories.find(r => r.name === repository.name);
           if (repositoryTotals) {
             repositoryTotals.total_pr_summaries_created += repository.total_pr_summaries_created || 0;
@@ -285,7 +283,7 @@ class MetricsService {
             }
             periodMetrics.copilot_dotcom_pull_requests.repositories.push(repositoryTotals);
           }
-          repository.models?.forEach((model: any) => {
+          repository.models?.forEach((model) => {
             const repositoryModelTotals = repositoryTotals?.models.find(m => m.name === model.name);
             if (repositoryModelTotals) {
               repositoryModelTotals.total_pr_summaries_created += model.total_pr_summaries_created || 0;

backend/src/services/seats.service.ts

@@ -6,7 +6,7 @@ import { MemberActivityType, MemberType } from 'models/teams.model.js';
 import fs from 'fs';
 import adoptionService from './adoption.service.js';
 
-type _Seat = any;// NonNullable<Endpoints["GET /orgs/{org}/copilot"]["response"]["data"]["seats"]>[0];
+type _Seat = NonNullable<Endpoints["GET /orgs/{org}/copilot/billing/seats"]["response"]["data"]["seats"]>[0];
 export interface SeatEntry extends _Seat {
   plan_type: "business" | "enterprise" | "unknown";
   assignee: components['schemas']['simple-user'];
@@ -237,7 +237,7 @@ class SeatsService {
     precision?: 'hour' | 'day' | 'minute';
     since?: string;
     until?: string;
-  } = {}): Promise<any> { // Promise<MemberDailyActivity> {
+  } = {}): Promise<MemberDailyActivity> {
     const Seats = mongoose.model('Seats');
     // const seats = await Seats.find({})
     // return seats.length;
@@ -296,7 +296,6 @@ class SeatsService {
           dateIndex.setUTCHours(0, 0, 0, 0);
         } else if (precision === 'hour') {
           dateIndex.setUTCMinutes(0, 0, 0);
-        } else if (precision === 'minute') {
         }
         const dateIndexStr = new Date(dateIndex).toISOString();
         if (!activityDays[dateIndexStr]) {
@@ -342,8 +341,18 @@ class SeatsService {
     const { org, since, until } = params;
     const Member = mongoose.model('Member');
 
+    const match: mongoose.FilterQuery<SeatEntry> = {};
+    if (org) match.org = org;
+    if (since || until) {
+      match.createdAt = {
+        ...(since && { $gte: new Date(since) }),
+        ...(until && { $lte: new Date(until) })
+      };
+    }
+
     const assignees: MemberType[] = await Member
       .aggregate([
+        { $match: match },
         {
           $lookup: {
             from: 'seats',          // MongoDB collection name (lowercase)
@@ -374,7 +383,7 @@ class SeatsService {
       return totals;
     }, {} as { [assignee: string]: number });
 
-    return Object.entries(activityTotals).sort((a: any, b: any) => b[1] - a[1]);
+    return Object.entries(activityTotals).sort((a: [string, number], b: [string, number]) => b[1] - a[1]);
   }
 
   async getMembersActivityTotals2(params: {
@@ -385,7 +394,7 @@ class SeatsService {
     const ActivityTotals = mongoose.model('ActivityTotals');
     const { org, since, until } = params;
 
-    const match: any = {};
+    const match: mongoose.FilterQuery<MemberActivityType> = {};
     if (org) match.org = org;
     if (since || until) {
       match.date = {
@@ -395,9 +404,7 @@ class SeatsService {
     }
 
     const totals = await ActivityTotals.aggregate([
-      // Match documents within date range and org
       { $match: match },
-      // First group by date AND assignee_login
       {
         $group: {
           _id: {
@@ -407,16 +414,13 @@ class SeatsService {
           daily_time: { $sum: "$total_active_time_ms" }
         }
       },
-      // Then group by just assignee_login to sum across days
       {
         $group: {
           _id: "$_id.login",
           total_time: { $sum: "$daily_time" }
         }
       },
-      // Sort by total time descending
       { $sort: { total_time: -1 } },
-      // Project final fields
       {
         $project: {
           _id: 0,

backend/src/services/settings.service.ts

@@ -47,9 +47,9 @@ class SettingsService {
         value: string;
       }>({});
       return settingsArray.reduce((acc, setting) => {
-        acc[setting.name] = setting.value;
+        acc[setting.name as keyof SettingsType] = setting.value;
         return acc;
-      }, {} as any);
+      }, {} as SettingsType);
     } catch (error) {
       console.error('Failed to get all settings:', error);
       throw error;