Remove usage controller and model, and update query service to eliminate usage metrics handling

Author: austenstone

backend/src/controllers/usage.controller.ts

@@ -1,6 +1,5 @@
 import { Router, Request, Response } from 'express';
 import surveyController from '../controllers/survey.controller.js';
-import usageController from '../controllers/usage.controller.js';
 import settingsController from '../controllers/settings.controller.js';
 import setupController from '../controllers/setup.controller.js';
 import SeatsController from '../controllers/seats.controller.js';
@@ -22,8 +21,6 @@ router.put('/survey/:id', surveyController.updateSurvey); // put github survey l
 router.delete('/survey/:id', surveyController.deleteSurvey);
 router.post('/survey/:id/github', surveyController.updateSurveyGitHub);
 
-router.get('/usage', usageController.getUsage);
-
 router.get('/metrics', metricsController.getMetrics);
 router.get('/metrics/totals', metricsController.getMetricsTotals);
 

backend/src/models/usage.model.ts

@@ -1,6 +1,5 @@
 import { CronJob, CronJobParams, CronTime } from 'cron';
 import logger from './logger.js';
-import { insertUsage } from '../models/usage.model.js';
 import SeatService, { SeatEntry } from './seats.service.js';
 import { App, Octokit } from 'octokit';
 import { MetricDailyResponseType } from '../models/metrics.model.js';
@@ -98,11 +97,7 @@ class QueryService {
       }
 
       const queries = [
-        this.queryCopilotUsageMetrics(octokit, org).then(result => {
-          this.status.usage = true;
-          return result;
-        }),
-        this.queryCopilotUsageMetricsNew(octokit, org).then(result => {
+        this.queryCopilotMetrics(octokit, org).then(result => {
           this.status.metrics = true;
           return result;
         }),
@@ -112,12 +107,11 @@ class QueryService {
         }),
       ];
 
-      const [usageMetrics, usageMetricsNew, copilotSeatAssignments] = await Promise.all(queries);
+      const [copilotMetrics, copilotSeatAssignments] = await Promise.all(queries);
       this.status.dbInitialized = true;
 
       return {
-        usageMetrics,
-        usageMetricsNew,
+        copilotMetrics,
         copilotSeatAssignments,
         teamsAndMembers
       }
@@ -127,7 +121,7 @@ class QueryService {
     logger.info(`${org} finished task`);
   }
 
-  public async queryCopilotUsageMetricsNew(octokit: Octokit, org: string, team?: string) {
+  public async queryCopilotMetrics(octokit: Octokit, org: string, team?: string) {
     try {
       const metricsArray = await octokit.paginate<MetricDailyResponseType>(
         'GET /orgs/{org}/copilot/metrics',
@@ -142,19 +136,6 @@ class QueryService {
     }
   }
 
-  public async queryCopilotUsageMetrics(octokit: Octokit, org: string) {
-    try {
-      const rsp = await octokit.rest.copilot.usageMetricsForOrg({
-        org
-      });
-
-      insertUsage(org, rsp.data);
-      logger.info(`${org} usage metrics updated`);
-    } catch (error) {
-      logger.error(`Error updating ${org} usage metrics`, error);
-    }
-  }
-
   public async queryCopilotSeatAssignments(octokit: Octokit, org: string, queryAt: Date) {
     try {
       const rsp = await octokit.paginate(octokit.rest.copilot.listCopilotSeats, {