Merge branches 'mongoose' and 'mongoose' of github.com:austenstone/github-value into mongoose

Author: austenstone

backend/src/__tests__/services/calendarClockServiceTests.ts

@@ -2,7 +2,7 @@
 import SurveyService from '../../services/survey.service.js';
 import SeatService from '../../services/copilot.seats.service.js';
 import metricsService from '../../services/metrics.service.js';
-import TeamsService from '../../services/teams.service.js';
+import TeamsService from '../../services/teams.service.js'; 
 import { runSurveysForDate } from '../__mock__/survey-gen/runSurveyGenerator.js';
 import { MockSeatsGenerator } from '../__mock__/seats-gen/mockSeatsGenerator.js';
 import { MockMetricsGenerator } from '../__mock__/metrics-gen/mockGenerator.js';

backend/src/controllers/survey.controller.ts

@@ -122,7 +122,9 @@ class SurveyController {
     try {
       const Survey = mongoose.model('Survey');
       const { id } = req.params;
-      const updated = await Survey.findByIdAndUpdate(id, req.body);
+      const updated = await Survey.findOneAndUpdate({
+        id: Number(id) // Cast `id` to Number
+      }, req.body);
       if (updated) {
         res.status(200).json({ _id: id, ...req.body });
       } else {

backend/src/database.ts

@@ -311,25 +311,27 @@ class Database {
       usedCopilot: Boolean,
       percentTimeSaved: Number,
       reason: String,
-      timeUsedFor: String
+      timeUsedFor: String,
+      kudos: Number
     }, {
       timestamps: true
     }));
 
     const TargetsDetailSchema = new mongoose.Schema({
-      seats: String,
-      adoptedDevs: String,
-      monthlyDevsReportingTimeSavings: String,
-      percentSeatsReportingTimeSavings: String,
-      percentSeatsAdopted: String,
-      percentMaxAdopted: String,
-      dailySuggestions: String,
-      dailyChatTurns: String,
-      weeklyPRSummaries: String,
-      weeklyTimeSaved: String,
-      monthlyTimeSavings: String,
-      annualTimeSavingsDollars: String,
-      productivityBoost: String
+      seats: Number,
+      adoptedDevs: Number,
+      monthlyDevsReportingTimeSavings: Number,
+      percentSeatsReportingTimeSavings: Number,
+      percentSeatsAdopted: Number,
+      percentMaxAdopted: Number,
+      dailySuggestions: Number,
+      dailyChatTurns: Number,
+      weeklyPRSummaries: Number,
+      weeklyTimeSaved: Number,
+      monthlyTimeSavings: Number,
+      annualTimeSavingsDollars: Number,
+      productivityBoost: Number,
+      asOfDate: Number
     });
 
     const TargetsSchema = new mongoose.Schema({

backend/src/services/metrics.service.ts

@@ -27,7 +27,7 @@ class MetricsService {
 
     const types = type ? type.split(/[ ,]+/) : [];
 
-    const metrics = await mongoose.model('Metrics').find(query).lean();
+    const metrics = await mongoose.model('Metrics').find(query).sort({date:1}).lean();
 
     if (editor || language || model) {
       metrics.forEach(metric => {

backend/src/services/target-values.service.ts

@@ -10,52 +10,52 @@ class TargetValuesService {
       throw new Error(`Error fetching target values: ${error}`);
     }
   }
-
+  
   async updateTargetValues(data: {
     current: {
-      seats: string;
-      adoptedDevs: string;
-      monthlyDevsReportingTimeSavings: string;
-      percentSeatsReportingTimeSavings: string;
-      percentSeatsAdopted: string;
-      percentMaxAdopted: string;
-      dailySuggestions: string;
-      dailyChatTurns: string;
-      weeklyPRSummaries: string;
-      weeklyTimeSaved: string;
-      monthlyTimeSavings: string;
-      annualTimeSavingsDollars: string;
-      productivityBoost: string;
+      seats: number;
+      adoptedDevs: number;
+      monthlyDevsReportingTimeSavings: number;
+      percentSeatsReportingTimeSavings: number;
+      percentSeatsAdopted: number;
+      percentMaxAdopted: number;
+      dailySuggestions: number;
+      dailyChatTurns: number;
+      weeklyPRSummaries: number;
+      weeklyTimeSaved: number;
+      monthlyTimeSavings: number;
+      annualTimeSavingsDollars: number;
+      productivityBoost: number;
     };
     target: {
-      seats: string;
-      adoptedDevs: string;
-      monthlyDevsReportingTimeSavings: string;
-      percentSeatsReportingTimeSavings: string;
-      percentSeatsAdopted: string;
-      percentMaxAdopted: string;
-      dailySuggestions: string;
-      dailyChatTurns: string;
-      weeklyPRSummaries: string;
-      weeklyTimeSaved: string;
-      monthlyTimeSavings: string;
-      annualTimeSavingsDollars: string;
-      productivityBoost: string;
+      seats: number;
+      adoptedDevs: number;
+      monthlyDevsReportingTimeSavings: number;
+      percentSeatsReportingTimeSavings: number;
+      percentSeatsAdopted: number;
+      percentMaxAdopted: number;
+      dailySuggestions: number;
+      dailyChatTurns: number;
+      weeklyPRSummaries: number;
+      weeklyTimeSaved: number;
+      monthlyTimeSavings: number;
+      annualTimeSavingsDollars: number;
+      productivityBoost: number;
     };
     max: {
-      seats: string;
-      adoptedDevs: string;
-      monthlyDevsReportingTimeSavings: string;
-      percentSeatsReportingTimeSavings: string;
-      percentSeatsAdopted: string;
-      percentMaxAdopted: string;
-      dailySuggestions: string;
-      dailyChatTurns: string;
-      weeklyPRSummaries: string;
-      weeklyTimeSaved: string;
-      monthlyTimeSavings: string;
-      annualTimeSavingsDollars: string;
-      productivityBoost: string;
+      seats: number;
+      adoptedDevs: number;
+      monthlyDevsReportingTimeSavings: number;
+      percentSeatsReportingTimeSavings: number;
+      percentSeatsAdopted: number;
+      percentMaxAdopted: number;
+      dailySuggestions: number;
+      dailyChatTurns: number;
+      weeklyPRSummaries: number;
+      weeklyTimeSaved: number;
+      monthlyTimeSavings: number;
+      annualTimeSavingsDollars: number;
+      productivityBoost: number;
     };
   }) {
     try {

frontend/src/app/main/copilot/value-modeling/value-modeling.component.html

@@ -350,21 +350,21 @@ <h1>Value Modeling and Targeting</h1>
               <td>Annual Time Savings as Dollars ($)</td>
               <td>
                 <mat-form-field [formGroupName]="'current'">
-                  <input matInput type="text" formControlName="annualTimeSavingsDollars" class="example-right-align" [ngClass]="{'invalid': form.get('current.annualTimeSavingsDollars')?.invalid && form.get('current.annualTimeSavingsDollars')?.touched}" [value]="form.get('current.annualTimeSavingsDollars')?.value || '' | matCurrencyPipe" (blur)="onBlur($event, 'current', 'annualTimeSavingsDollars')" [attr.disabled]="disableInputs ? true : null">
+                  <input matInput type="text" formControlName="annualTimeSavingsDollars" class="example-right-align" [ngClass]="{'invalid': form.get('current.annualTimeSavingsDollars')?.invalid && form.get('current.annualTimeSavingsDollars')?.touched}" [value]="form.get('current.annualTimeSavingsDollars')?.value " (blur)="onBlur($event, 'current', 'annualTimeSavingsDollars')" [attr.disabled]="disableInputs ? true : null">
                   <span matTextPrefix>$&nbsp;</span>
                   <mat-error *ngIf="form.get('current.annualTimeSavingsDollars')?.invalid">Invalid value</mat-error>
                 </mat-form-field>
               </td>
               <td>
                 <mat-form-field [formGroupName]="'target'">
-                  <input matInput type="text" formControlName="annualTimeSavingsDollars" class="example-right-align" [ngClass]="{'invalid': form.get('target.annualTimeSavingsDollars')?.invalid && form.get('target.annualTimeSavingsDollars')?.touched}" [value]="form.get('target.annualTimeSavingsDollars')?.value || '' | matCurrencyPipe" (blur)="onBlur($event, 'target', 'annualTimeSavingsDollars')">
+                  <input matInput type="text" formControlName="annualTimeSavingsDollars" class="example-right-align" [ngClass]="{'invalid': form.get('target.annualTimeSavingsDollars')?.invalid && form.get('target.annualTimeSavingsDollars')?.touched}" [value]="form.get('target.annualTimeSavingsDollars')?.value " (blur)="onBlur($event, 'target', 'annualTimeSavingsDollars')">
                   <span matTextPrefix>$&nbsp;</span>
                   <mat-error *ngIf="form.get('target.annualTimeSavingsDollars')?.invalid">Invalid value</mat-error>
                 </mat-form-field>
               </td>
               <td>
                 <mat-form-field [formGroupName]="'max'">
-                  <input matInput type="text" formControlName="annualTimeSavingsDollars" class="example-right-align" [ngClass]="{'invalid': form.get('max.annualTimeSavingsDollars')?.invalid && form.get('max.annualTimeSavingsDollars')?.touched}" [value]="form.get('max.annualTimeSavingsDollars')?.value || '' | matCurrencyPipe" (blur)="onBlur($event, 'max', 'annualTimeSavingsDollars')" [attr.disabled]="disableInputs ? true : null">
+                  <input matInput type="text" formControlName="annualTimeSavingsDollars" class="example-right-align" [ngClass]="{'invalid': form.get('max.annualTimeSavingsDollars')?.invalid && form.get('max.annualTimeSavingsDollars')?.touched}" [value]="form.get('max.annualTimeSavingsDollars')?.value " (blur)="onBlur($event, 'max', 'annualTimeSavingsDollars')" [attr.disabled]="disableInputs ? true : null">
                   <span matTextPrefix>$&nbsp;</span>
                   <mat-error *ngIf="form.get('max.annualTimeSavingsDollars')?.invalid">Invalid value</mat-error>
                 </mat-form-field>

frontend/src/app/main/copilot/value-modeling/value-modeling.component.ts

@@ -230,7 +230,11 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
         // const currentAsStrings = this.convertMetricStateToString(this.gridObject.current);
         //console.log('AsOfDate as string:', currentAsStrings.asOfDate);
 
-        this.loadGridObject();
+        // Add a 2-second timer and call a method
+        setTimeout(() => {
+          this.loadGridObject();
+        }, 1000);
+
         console.log('0. Update Current gridObject:', this.gridObject);
       } catch (error) {
         console.error('Error during initialization:', error);
@@ -249,14 +253,16 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
       // Step 2: Perform calculations on the updated gridObject
       this.modelCalc();
 
+      await this.queryCurrentAndMaxValues();
+
       // Step 3: Synchronize the form with gridObject
       this.updateFormFromGridObject();
 
       // Step 4: refresh the chart 
       Highcharts.charts.forEach(chart => {
         chart?.update({});
       }
-      
+
       );
       console.log('execGridLifecycle: Lifecycle completed successfully');
     }
@@ -293,10 +299,11 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
 
   loadGridObject() {
     // Stub: Load the gridObject from a data source
-    console.log('loadGridObject: Loading saved gridObject', this.gridObjectSaved);
+    
     this.targetService.getTargets().subscribe((targetGrid) => {
       if (targetGrid) {
         this.gridObject = targetGrid;
+        console.log('Loaded gridObject:', this.gridObject);
       }
       this.execGridLifecycle();
     });
@@ -342,13 +349,16 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
     try {
       for (const key in metricState) {
         if (metricState.hasOwnProperty(key) && key !== '_id') {
-            if (key === 'asOfDate') {
+          if (key === 'asOfDate') {
             result[key] = metricState.asOfDate ? new Date(metricState.asOfDate).toDateString() : '';
-            } else if (key === 'productivityBoost') {
+          } else if (key === 'productivityBoost') {
             result[key] = this.decimalPipe.transform(metricState[key as keyof TargetsDetailType], '1.0-2') || '0.00';
-            } else {
+          } else if (key === 'annualTimeSavingsDollars') {
+            console.log(' Raw Value >',metricState[key as keyof TargetsDetailType]);
+            result[key] = this.decimalPipe.transform(metricState[key as keyof TargetsDetailType], '1.0-0') || '0';  
+          } else {
             result[key] = this.decimalPipe.transform(metricState[key as keyof TargetsDetailType], '1.0-0') || '0';
-            }
+          }
         }
       }
     } catch (error) {
@@ -428,22 +438,22 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
   }
 
   private calculateAnnualTimeSavingsDollars(weeklyTimeSaved: number, adoptedDevs: number): number {
-    const weeksInYear = 50; 
-    const hourlyRate = this.devCostPerYear / (this.hoursPerYear || 1); 
+    const weeksInYear = 50;
+    const hourlyRate = this.devCostPerYear / (this.hoursPerYear || 1);
     return weeklyTimeSaved * weeksInYear * hourlyRate * adoptedDevs;
   }
 
   private calculateProductivityBoost(weeklyTimeSaved: number, adoptedDevs: number, maxDevs: number): number {
-      console.log('weeklyTimeSaved:', weeklyTimeSaved);
-      console.log('adoptedDevs:', adoptedDevs);
-      console.log('maxDevs:', maxDevs);
-      console.log('this.hoursPerYear:', this.hoursPerYear);
-      return  weeklyTimeSaved * adoptedDevs * 50  / (this.hoursPerYear * maxDevs ) || 1;
-    }
+    console.log('weeklyTimeSaved:', weeklyTimeSaved);
+    console.log('adoptedDevs:', adoptedDevs);
+    console.log('maxDevs:', maxDevs);
+    console.log('this.hoursPerYear:', this.hoursPerYear);
+    return weeklyTimeSaved * adoptedDevs * 50 / (this.hoursPerYear * maxDevs) || 1;
+  }
 
   private calculateMonthlyTimeSavings(adoptedDevs: number, weeklyTimeSaved: number): number {
     const weeksInMonth = 4;
-    return weeklyTimeSaved * weeksInMonth * adoptedDevs ;
+    return weeklyTimeSaved * weeksInMonth * adoptedDevs;
   }
 
   toggleInputs(disable: boolean) {
@@ -457,7 +467,7 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
 
 
   async queryCurrentAndMaxValues(): Promise<void> {
-    
+
     const now = new Date();
     const utcNow = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), 0, 0, 0, 0);
     const xDaysAgoUTC = new Date(utcNow - this.clickCounter * 24 * 60 * 60 * 1000);
@@ -569,7 +579,7 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
 
         if (weekAtaTimeSurveys?.length) {
           weekAtaTimeSurveys.forEach(survey => {
-            console.log('Survey data:', survey);
+            //console.log('Survey pcts:', survey.percentTimeSaved);
           });
           const avgWeeklyTimeSaved = weekAtaTimeSurveys.reduce((acc, survey) =>
             acc + (survey.percentTimeSaved || 0), 0) * 12 * 0.01 / (weekAtaTimeSurveys.length * distinctUsers.length);