Refactor adoption and target services: export AdoptionType, enhance getAllSettings method with type, and implement calculateTargets for improved target initialization

Author: austenstone

backend/src/services/adoption.service.ts

@@ -4,7 +4,7 @@ import logger from './logger.js';
 import { SeatEntry } from './seats.service.js';
 import { SeatType } from 'models/seats.model.js';
 
-type AdoptionType = {
+export type AdoptionType = {
   _id?: string;
   enterprise: string | null;
   org: string | null;

backend/src/services/settings.service.ts

@@ -39,7 +39,7 @@ class SettingsService {
     return this.settings;
   }
 
-  async getAllSettings() {
+  async getAllSettings(): Promise<SettingsType> {
     try {
       const Setting = mongoose.model('Settings');
       const settingsArray = await Setting.find<{

backend/src/services/target.service.ts

@@ -1,6 +1,7 @@
 import mongoose from 'mongoose';
-import adoptionService from './adoption.service.js';
+import adoptionService, { AdoptionType } from './adoption.service.js';
 import app from 'index.js';
+import { SettingsType } from './settings.service.js';
 
 interface Target {
   current: number;
@@ -53,75 +54,66 @@ class TargetValuesService {
     }
   }
 
+  calculateTargets(settings: SettingsType, adoptions: AdoptionType[]): Targets {
+
+    console.log('tmp', settings);
+
+    const topAdoptions = adoptions
+      .sort((a, b) => b.totalActive - a.totalActive)
+      .slice(0, 10);
+
+    const averages = topAdoptions.reduce((acc, curr) => {
+      return {
+        totalSeats: acc.totalSeats + curr.totalSeats,
+        totalActive: acc.totalActive + curr.totalActive,
+        totalInactive: acc.totalInactive + curr.totalInactive
+      };
+    }, { totalSeats: 0, totalActive: 0, totalInactive: 0 });
+
+    const avgTotalSeats = Math.round(averages.totalSeats / topAdoptions.length);
+    const avgTotalActive = Math.round(averages.totalActive / topAdoptions.length);
+
+    return {
+      org: {
+        seats: { current: avgTotalSeats, target: avgTotalSeats, max: avgTotalSeats },
+        adoptedDevs: { current: avgTotalActive, target: avgTotalActive, max: avgTotalSeats },
+        monthlyDevsReportingTimeSavings: { current: 0, target: 0, max: avgTotalSeats },
+        percentOfSeatsReportingTimeSavings: { current: 0, target: 0, max: 100 },
+        percentOfSeatsAdopted: {
+          current: Math.round((avgTotalActive / avgTotalSeats) * 100),
+          target: Math.round((avgTotalActive / avgTotalSeats) * 100),
+          max: 100
+        },
+        percentOfMaxAdopted: { current: 0, target: 0, max: 100 },
+      },
+      user: {
+        dailySuggestions: { current: 0, target: 0, max: 0 },
+        dailyAcceptances: { current: 0, target: 0, max: 0 },
+        dailyChatTurns: { current: 0, target: 0, max: 0 },
+        dailyDotComChats: { current: 0, target: 0, max: 0 },
+        weeklyPRSummaries: { current: 0, target: 0, max: 0 },
+        weeklyTimeSavedHrs: { current: 0, target: 0, max: 0 },
+      },
+      impact: {
+        monthlyTimeSavingsHrs: { current: 0, target: 0, max: 0 },
+        annualTimeSavingsAsDollars: { current: 0, target: 0, max: 0 },
+        productivityOrThroughputBoostPercent: { current: 0, target: 0, max: 100 },
+      },
+    };
+  }
+
   async initialize() {
     try {
       const Targets = mongoose.model('Targets');
       const existingTargets = await Targets.findOne();
 
-      if (!existingTargets) {
-        const {
-          devCostPerYear = 100000,
-          percentCoding,
-          percentTimeSaved,
-          developerCount,
-          hoursPerYear
-        } = await app.settingsService.getAllSettings();
-
-        console.log('tmp', {
-          devCostPerYear,
-          percentCoding,
-          percentTimeSaved,
-          developerCount,
-          hoursPerYear
-        });
-
+      if (1 || !existingTargets) {
+        const settings = await app.settingsService.getAllSettings();
         const adoptions = await adoptionService.getAllAdoptions2({
           filter: { enterprise: 'enterprise' },
           projection: {}
         });
-
-        const topAdoptions = adoptions
-          .sort((a, b) => b.totalActive - a.totalActive)
-          .slice(0, 10);
-
-        const averages = topAdoptions.reduce((acc, curr) => {
-          return {
-            totalSeats: acc.totalSeats + curr.totalSeats,
-            totalActive: acc.totalActive + curr.totalActive,
-            totalInactive: acc.totalInactive + curr.totalInactive
-          };
-        }, { totalSeats: 0, totalActive: 0, totalInactive: 0 });
-
-        const avgTotalSeats = Math.round(averages.totalSeats / topAdoptions.length);
-        const avgTotalActive = Math.round(averages.totalActive / topAdoptions.length);
-
-        const initialData: Targets = {
-          org: {
-            seats: { current: avgTotalSeats, target: avgTotalSeats, max: avgTotalSeats },
-            adoptedDevs: { current: avgTotalActive, target: avgTotalActive, max: avgTotalSeats },
-            monthlyDevsReportingTimeSavings: { current: 0, target: 0, max: avgTotalSeats },
-            percentOfSeatsReportingTimeSavings: { current: 0, target: 0, max: 100 },
-            percentOfSeatsAdopted: {
-              current: Math.round((avgTotalActive / avgTotalSeats) * 100),
-              target: Math.round((avgTotalActive / avgTotalSeats) * 100),
-              max: 100
-            },
-            percentOfMaxAdopted: { current: 0, target: 0, max: 100 },
-          },
-          user: {
-            dailySuggestions: { current: 0, target: 0, max: 0 },
-            dailyAcceptances: { current: 0, target: 0, max: 0 },
-            dailyChatTurns: { current: 0, target: 0, max: 0 },
-            dailyDotComChats: { current: 0, target: 0, max: 0 },
-            weeklyPRSummaries: { current: 0, target: 0, max: 0 },
-            weeklyTimeSavedHrs: { current: 0, target: 0, max: 0 },
-          },
-          impact: {
-            monthlyTimeSavingsHrs: { current: 0, target: 0, max: 0 },
-            annualTimeSavingsAsDollars: { current: 0, target: 0, max: 0 },
-            productivityOrThroughputBoostPercent: { current: 0, target: 0, max: 100 },
-          },
-        };
+        const initialData = this.calculateTargets(settings, adoptions);
         await Targets.create(initialData);
       }
     } catch (error) {

frontend/src/app/main/main.component.html

@@ -67,7 +67,7 @@ <h1>
               }
             </mat-select>
             <ng-template #singleInstall>
-              <span>{{ installations[0].account?.login }}</span>
+              <span>{{ installations[0]?.account?.login }}</span>
             </ng-template>
           </h1>
         </ng-container>