cleanup

Author: austenstone

backend/src/controllers/target.controller.ts

@@ -1,13 +1,15 @@
 import { Request, Response } from 'express';
 import TargetValuesService from '../services/target.service.js';
 import { TargetCalculationService } from '../services/target-calculation-service.js';
+import logger from '../services/logger.js';
 
 class TargetValuesController {
   async getTargetValues(req: Request, res: Response): Promise<void> {
     try {
       const targetValues = await TargetValuesService.getTargetValues();
       res.status(200).json(targetValues);
     } catch (error) {
+      logger.error('Error getting target values:', error);
       res.status(500).json(error);
     }
   }
@@ -17,6 +19,7 @@ class TargetValuesController {
       const updatedTargetValues = await TargetValuesService.updateTargetValues(req.body);
       res.status(200).json(updatedTargetValues);
     } catch (error) {
+      logger.error('Error updating target values:', error);
       res.status(500).json(error);
     }
   }
@@ -42,12 +45,12 @@ class TargetValuesController {
 
       // Check if we have logs before sending the response
       if (includeLogsInResponse) {
-        console.log(`Response will include ${result.logs?.length || 0} logs`);
+        logger.info(`Response will include ${result.logs?.length || 0} logs`);
       }
 
       res.status(200).json(result);
     } catch (error) {
-      console.error('Error calculating target values:', error);
+      logger.error('Error calculating target values:', error);
       res.status(500).json({ error: `Failed to calculate target values: ${error}` });
     }
   }

backend/src/routes/status.route.ts

@@ -1,5 +1,6 @@
 import express from 'express';
 import StatusService from '../services/status.service.js';
+import logger from '../services/logger.js';
 
 const router = express.Router();
 const statusService = new StatusService();
@@ -10,7 +11,7 @@ router.get('/', async (req, res) => {
     const status = await statusService.getStatus(req);
     res.json(status);
   } catch (error) {
-    console.error('Error fetching status:', error);
+    logger.error('Error fetching status:', error);
     res.status(500).json({ error: 'Failed to fetch status' });
   }
 });

backend/src/services/seats.service.ts

@@ -3,7 +3,6 @@ import { SeatType } from "../models/seats.model.js";
 import { components } from "@octokit/openapi-types";
 import mongoose from 'mongoose';
 import { MemberActivityType, MemberType } from 'models/teams.model.js';
-import fs from 'fs';
 import adoptionService from './adoption.service.js';
 import logger from './logger.js';
 
@@ -77,7 +76,7 @@ class SeatsService {
         $lte?: Date;
       };
     }
-    
+
     const query: SeatQuery = {
       assignee: member._id  // This is the MongoDB ObjectId that links to the Member document
     };
@@ -150,42 +149,32 @@ class SeatsService {
   async getSeat(identifier: string | number, params: { since?: string; until?: string; org?: string } = {}) {
     const Seats = mongoose.model('Seats');
     const Member = mongoose.model('Member');
-    
+
     try {
-      //console.log('========== SEAT LOOKUP START ==========');
-      //console.log(`Looking up seat for identifier: ${identifier}, params:`, JSON.stringify(params));
-      
-      // Force console output to appear immediately
-      process.stdout.write(''); 
-      
       // Determine if identifier is numeric
       const isNumeric = !isNaN(Number(identifier)) && String(Number(identifier)) === String(identifier);
       let numericId: number | null = null;
-      
+
       // If it's a login, look up the ID first
       if (!isNumeric) {
         // Ensure identifier is treated as string before calling replace
         const identifierString = String(identifier);
-        
+
         try {
           // Find the member by login - exact match with explicit type casting
           const member = await Member.findOne({ login: identifierString }).lean() as MemberDocument | null;
-          
+
           if (!member) {
             // Try case-insensitive search as a fallback
             const regex = new RegExp(`^${identifierString.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')}$`, 'i');
-            const memberCaseInsensitive = await Member.findOne({ 
+            const memberCaseInsensitive = await Member.findOne({
               login: regex
             }).lean() as MemberDocument | null;
-            
-            // Check if we got a document and then safely access properties
-            console.log(`Case-insensitive search result:`, 
-                        memberCaseInsensitive ? `Found ${memberCaseInsensitive.login}` : 'Not found');
-            
+
             if (!memberCaseInsensitive) {
               return []; // Return empty array if no member found
             }
-            
+
             // Now TypeScript knows memberCaseInsensitive has these properties
             numericId = memberCaseInsensitive.id;
           } else {
@@ -198,29 +187,24 @@ class SeatsService {
       } else {
         numericId = Number(identifier);
       }
-      
+
       const query: mongoose.FilterQuery<SeatType> = { assignee_id: numericId };
-      
+
       if (params.org) {
         query.org = params.org;
       }
-      
+
       if (params.since || params.until) {
         query.createdAt = {};
         if (params.since) {
           query.createdAt.$gte = new Date(params.since);
-        //  console.log(`Added since filter: ${params.since}`);
         }
         if (params.until) {
           query.createdAt.$lte = new Date(params.until);
-        //  console.log(`Added until filter: ${params.until}`);
         }
       }
-      
-     // console.log(`Final query:`, JSON.stringify(query));
-      
+
       // Execute the query
-      //console.log(`Executing Seats.find() with query`);
       const results = await Seats.find(query)
         .sort({ createdAt: 1 })
         .populate({
@@ -230,19 +214,17 @@ class SeatsService {
         })
         .lean()
         .exec(); // Explicitly call exec()
-      
+
       logger.debug(`Query complete. Found ${results?.length || 0} seat records`);
-      //console.log('========== SEAT LOOKUP END ==========');
-      
+
       return results || [];
-      
     } catch (error: unknown) {
       console.error('========== SEAT LOOKUP ERROR ==========');
       console.error(`Error retrieving seat data for ${identifier}:`, error);
       // Safe access to stack property
       console.error(`Stack trace:`, error instanceof Error ? error.stack : 'No stack trace available');
       console.error('=======================================');
-      
+
       // Return empty results rather than throwing error
       return [];
     }
@@ -541,8 +523,6 @@ class SeatsService {
         .sort(([dateA], [dateB]) => new Date(dateA).getTime() - new Date(dateB).getTime())
     );
 
-    fs.writeFileSync('sortedActivityDays.json', JSON.stringify(sortedActivityDays, null, 2), 'utf-8');
-
     return sortedActivityDays;
   }
 
@@ -609,7 +589,7 @@ class SeatsService {
     const { org, since, until } = params;
     const limit = typeof params.limit === 'string' ? parseInt(params.limit) : (params.limit || 100);
 
-        const match: mongoose.FilterQuery<MemberActivityType> = {};
+    const match: mongoose.FilterQuery<MemberActivityType> = {};
     if (org) match.org = org;
     if (since || until) {
       match.date = {

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

@@ -6,7 +6,8 @@ import copilotSurveyService from './survey.service.js';
 import { SurveyType } from './survey.service.js'; // Import from survey.service.js instead
 import app from '../index.js';
 import dayjs from 'dayjs';
-import util from 'util';           // NEW
+import util from 'util';
+import logger from './logger.js';
 
 // Define types for calculation logging
 interface CalcLogType {
@@ -91,7 +92,7 @@ export class TargetCalculationService {
         this.calculationLogs.push(logEntry);
 
         // Also pretty print to console
-        console.log(`
+        logger.info(`
 ========== CALCULATION: ${name} ==========
 INPUTS:
 ${util.inspect(inputs, { depth: null, colors: false, compact: false })}
@@ -925,7 +926,7 @@ RESULT:
   ): Promise<{ targets: Targets; logs?: CalcLogType[] }> {
     this.debugLogging = enableLogging;
     this.resetLogging(); // Reset logging state
-    console.log(`Calculation logging ${enableLogging ? 'enabled' : 'disabled'}`);
+    logger.info(`Calculation logging ${enableLogging ? 'enabled' : 'disabled'}`);
 
     await this.fetchCalculationData(org);
     const targets = this.calculateAllTargets();
@@ -951,7 +952,7 @@ RESULT:
     enableLogging: boolean = false,
     includeLogsInResponse: boolean = false
   ): Promise<{ targets: Targets; logs?: CalcLogType[] }> {
-    console.log('Static method received params:', {
+    logger.info('Static method received params:', {
       org: org || 'null',
       enableLogging, 
       includeLogsInResponse
@@ -968,7 +969,7 @@ RESULT:
 
     // Verify the structure of the result before returning
     const hasLogs = Boolean(result.logs && result.logs.length > 0);
-    console.log(`Result has logs: ${hasLogs}, includeLogsInResponse: ${includeLogsInResponse}`);
+    logger.info(`Result has logs: ${hasLogs}, includeLogsInResponse: ${includeLogsInResponse}`);
 
     return result;
   }
@@ -981,7 +982,7 @@ if (import.meta.url.endsWith(process.argv[1])) {
   (async () => {
     // Example of using the static method with logs included in response
     const result = await TargetCalculationService.fetchAndCalculateTargets('test-org', true, true);
-    console.log('Calculated Targets:', JSON.stringify(result.targets, null, 2));
-    console.log(`Returned ${result.logs?.length || 0} calculation logs`);
+    logger.info('Calculated Targets:', JSON.stringify(result.targets, null, 2));
+    logger.info(`Returned ${result.logs?.length || 0} calculation logs`);
   })();
 }

backend/src/services/target.service.ts

@@ -2,6 +2,7 @@ import mongoose from 'mongoose';
 import { AdoptionType } from './adoption.service.js'
 import { SettingsType } from './settings.service.js';
 import { TargetCalculationService } from './target-calculation-service.js';
+import logger from './logger.js';
 
 interface Target {
   current: number;
@@ -116,9 +117,8 @@ class TargetValuesService {
 
       if (!existingTargets ) {
         const result = await this.calculateTargets();
-        // Extract the targets property from the result
         await Targets.create(result.targets);
-        console.log('Default targets created successfully.');
+        logger.info('Default targets created successfully.');
       }
     } catch (error) {
       throw new Error(`Error initializing target values: ${error}`);

frontend/src/app/main/copilot/copilot-dashboard/dashboard-card/active-users-chart/active-users-chart.component.ts

@@ -88,7 +88,6 @@ export class ActiveUsersChartComponent implements OnChanges {
   ) { }
 
   ngOnChanges() {
-    console.log('ngOnChanges', this.data);
     this._chartOptions = Object.assign({}, this.chartOptions, this._chartOptions);
     if (this._chartOptions?.series && this.data) {
       // Create an array with [total_time, login, avatar_url] for each point

frontend/src/app/main/copilot/copilot-dashboard/dashboard.component.ts

@@ -171,7 +171,6 @@ export class CopilotDashboardComponent implements OnInit, OnDestroy {
       this.subscriptions.push(
         this.targetsService.getTargets().subscribe(data => {
           this.targetsData = data;
-          console.log('Dashboard targets loaded:', data);   // DEBUG
           this.cdr.detectChanges();
         })
       );

frontend/src/app/main/copilot/copilot-metrics/copilot-metrics.component.ts

@@ -85,10 +85,6 @@ export class CopilotMetricsComponent implements OnInit, OnDestroy {
 
     this.reset();
 
-    console.log({
-      since: event.start.toISOString(),
-      until: event.end.toISOString()
-    })
     this.subscriptions.push(
       this.seatService.getActivityTotals({
         org: this.installation?.account?.login,

frontend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

@@ -297,8 +297,6 @@ export class NewCopilotSurveyComponent implements OnInit {
           timeUsedFor: this.surveyForm.value.timeUsedFor || ''
         };
 
-        console.log('Submitting survey:', survey);
-
         if (!this.id) {
           this.copilotSurveyService.createSurvey(survey).pipe(
             catchError(error => {
@@ -359,7 +357,6 @@ export class NewCopilotSurveyComponent implements OnInit {
    */
   onMemberSelected(event: MatAutocompleteSelectedEvent): void {
     const selectedMember = event.option.value as Member;
-    console.log('Member selected:', selectedMember); // Optional: for debugging
 
     // Set the value in the form and clear errors
     const userIdControl = this.surveyForm.get('userId');
@@ -378,11 +375,8 @@ export class NewCopilotSurveyComponent implements OnInit {
       const userIdControl = this.surveyForm.get('userId');
       const userId = userIdControl?.value;
 
-      console.log('onUserIdBlur called with value:', userId); // Optional: for debugging
-
       // Skip validation if the value is already a Member object (meaning an option was selected)
       if (userId && typeof userId !== 'string' && userId.login) {
-        console.log('Value is a Member object, skipping validation'); // Optional: for debugging
         return;
       }
 
@@ -400,8 +394,6 @@ export class NewCopilotSurveyComponent implements OnInit {
     const userIdControl = this.surveyForm.get('userId');
     const userId = userIdControl?.value;
 
-    console.log('Validating userId:', userId); // Optional: for debugging
-
     // Skip validation if empty (let the required validator handle this)
     if (!userId) {
       return;
@@ -413,14 +405,9 @@ export class NewCopilotSurveyComponent implements OnInit {
       return;
     }
 
-    // Only validate if the value is a string (user typed it in and didn't select an option)
     if (typeof userId === 'string') {
-      console.log('Validating string value:', userId); // Optional: for debugging
-
-      // Set loading state
       this.isLoading$.next(true);
 
-      // Call validation method with exact=true for case-insensitive matching
       this.membersService.getMemberByLogin(userId, true).pipe(
         catchError(error => {
           console.error('Error validating user ID:', error);
@@ -437,8 +424,6 @@ export class NewCopilotSurveyComponent implements OnInit {
 
           // Always update to the correctly cased username from the API
           userIdControl?.setValue(result);
-
-          console.log('User validated and updated to correct case:', result.login); // Optional: for debugging
         } else {
           // Invalid user (and not caught by catchError, e.g., API returned null)
           if (!userIdControl?.hasError('invalidUserId')) { // Avoid overwriting existing error

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

@@ -92,7 +92,6 @@ export class CopilotValueModelingComponent implements OnInit {
           this.userDataSource = this.transformTargets(targets.user);
           this.impactDataSource = this.transformTargets(targets.impact);
         });
-        console.log('Targets:', this.orgDataSource, this.userDataSource, this.impactDataSource);
       } catch (error) {
         console.error('Error during initialization:', error);
       }