Reworked targeting, fixed som little issues with survey via url parameters, and updated the way target lines are rendered, so they are more likely to be visible.

Author: MattG57

backend/src/controllers/survey.controller.ts

@@ -64,37 +64,19 @@ 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: mongoose.FilterQuery<{
-        $gte: Date;
-        $lte: Date;
-      }> = {};
-      if (since) {
-        dateFilter.$gte = new Date(since);
-      }
-      if (until) {
-        dateFilter.$lte = new Date(until);
-      }
-
-      const query = {
-        filter: {
-          ...(org ? { org: String(org) } : {}),
-          ...(team ? { team: String(team) } : {}),
-          ...(reasonLength ? { $expr: { $and: [{ $gt: [{ $strLenCP: { $ifNull: ['$reason', ''] } }, 40] }, { $ne: ['$reason', null] }] } } : {}),
-          ...(Object.keys(dateFilter).length > 0 ? { createdAt: dateFilter } : {}),
-          ...(status ? { status } : {}),
-        },
-        projection: {
-          _id: 0,
-          __v: 0,
-        }
-      };
-
-      const Survey = mongoose.model('Survey');
-      const surveys = await Survey.find(query.filter, query.projection);
+      const { org, team, reasonLength, since, until, status } = req.query as { [key: string]: string | undefined };
+      
+      const surveys = await surveyService.getAllSurveys({
+        org,
+        team,
+        reasonLength,
+        since,
+        until,
+        status
+      });
+      
       res.status(200).json(surveys);
-
     } catch (error) {
       res.status(500).json(error);
     }

backend/src/controllers/target.controller.ts

@@ -1,5 +1,6 @@
 import { Request, Response } from 'express';
 import TargetValuesService from '../services/target.service.js';
+import { TargetCalculationService } from '../services/target-calculation-service.js';
 
 class TargetValuesController {
   async getTargetValues(req: Request, res: Response): Promise<void> {
@@ -19,6 +20,28 @@ class TargetValuesController {
       res.status(500).json(error);
     }
   }
+
+  /**
+   * Calculate targets based on current metrics, adoption, and survey data
+   * @route GET /targets/calculate
+   */
+  async calculateTargetValues(req: Request, res: Response): Promise<void> {
+    try {
+      const org = req.query.org || 'enterprise';
+      const enableLogging = req.query.enableLogging === 'true';
+      
+      // Create an instance of the calculation service
+      const calculationService = new TargetCalculationService();
+      
+      // Fetch data and calculate targets with optional logging
+      const targets = await calculationService.fetchAndCalculateTargets(org, enableLogging);
+      
+      return res.status(200).json(targets);
+    } catch (error) {
+      console.error('Error calculating target values:', error);
+      return res.status(500).json({ error: 'Failed to calculate target values' });
+    }
+  }
 }
 
 export default new TargetValuesController();

backend/src/routes/index.ts

@@ -56,6 +56,8 @@ router.get('/status', setupController.getStatus);
 
 router.get('/targets', targetValuesController.getTargetValues);
 router.post('/targets', targetValuesController.updateTargetValues);
+// Add the new route for target calculation
+router.get('/targets/calculate', targetValuesController.calculateTargetValues);
 
 router.get('*', (req: Request, res: Response) => {
   res.status(404).send('Route not found');

backend/src/services/survey.service.ts

@@ -1,8 +1,25 @@
-import { SurveyType } from "../models/survey.model.js";
 import mongoose from 'mongoose';
 import SequenceService from './sequence.service.js';
 import logger from "./logger.js";
 
+// Define the SurveyType interface here instead of importing it
+export interface SurveyType {
+  id: number;
+  userId: string;
+  org?: string;
+  repo?: string;
+  prNumber?: number;
+  usedCopilot?: boolean;
+  percentTimeSaved?: number;
+  reason?: string;
+  timeUsedFor?: string;
+  kudos?: number;
+  status?: string;
+  hits?: number;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+
 class SurveyService {
 
   async createSurvey(survey: SurveyType) {
@@ -48,6 +65,49 @@ class SurveyService {
       }
     }).sort({ updatedAt: -1 }).limit(20).exec();
   }
+
+  /**
+   * Get all surveys based on filtering criteria
+   */
+  async getAllSurveys(params: {
+    org?: string;
+    team?: string;
+    reasonLength?: string;
+    since?: string;
+    until?: string;
+    status?: string;
+  }) {
+    const { org, team, reasonLength, since, until, status } = params;
+    
+    const dateFilter: mongoose.FilterQuery<{
+      $gte: Date;
+      $lte: Date;
+    }> = {};
+    
+    if (since) {
+      dateFilter.$gte = new Date(since);
+    }
+    if (until) {
+      dateFilter.$lte = new Date(until);
+    }
+
+    const query = {
+      filter: {
+        ...(org ? { org: String(org) } : {}),
+        ...(team ? { team: String(team) } : {}),
+        ...(reasonLength ? { $expr: { $and: [{ $gt: [{ $strLenCP: { $ifNull: ['$reason', ''] } }, 40] }, { $ne: ['$reason', null] }] } } : {}),
+        ...(Object.keys(dateFilter).length > 0 ? { createdAt: dateFilter } : {}),
+        ...(status ? { status } : {}),
+      },
+      projection: {
+        _id: 0,
+        __v: 0,
+      }
+    };
+
+    const Survey = mongoose.model('Survey');
+    return Survey.find(query.filter, query.projection);
+  }
 }
 
 export default new SurveyService();