Merge branch 'main' into TempTargetReversionBranch

Author: austenstone

backend/package-lock.json

@@ -18,36 +18,36 @@
     "@octokit/core": "^6.1.4",
     "bunyan": "^1.8.15",
     "cors": "^2.8.5",
-    "cron": "^3.2.1",
+    "cron": "^4.1.3",
     "date-fns": "^4.1.0",
-    "dotenv": "^16.4.5",
-    "eventsource": "^2.0.2",
+    "dotenv": "^16.4.7",
+    "eventsource": "^3.0.6",
     "express": "^4.21.2",
-    "express-rate-limit": "^7.4.1",
-    "mongoose": "^8.9.5",
-    "mysql2": "^3.11.4",
+    "express-rate-limit": "^7.5.0",
+    "mongoose": "^8.13.2",
+    "mysql2": "^3.14.0",
     "octokit": "4.1",
-    "smee-client": "^2.0.4",
+    "smee-client": "^3.1.1",
     "update-dotenv": "^1.1.1",
-    "validator": "^13.12.0",
-    "why-is-node-running": "^3.2.1"
+    "validator": "^13.15.0",
+    "why-is-node-running": "^3.2.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.16.0",
-    "@octokit/types": "^13.8.0",
+    "@eslint/js": "^9.23.0",
+    "@octokit/types": "^13.10.0",
     "@types/bunyan": "^1.8.11",
     "@types/cors": "^2.8.17",
-    "@types/eventsource": "^1.1.15",
+    "@types/eventsource": "^3.0.0",
     "@types/express": "^4.17.21",
-    "@types/node": "^22.10.5",
-    "@types/validator": "^13.12.2",
-    "eslint": "9.16",
-    "globals": "^15.13.0",
+    "@types/node": "^22.14.0",
+    "@types/validator": "^13.12.3",
+    "eslint": "9.23",
+    "globals": "^16.0.0",
     "ts-node": "^10.9.2",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.17.0",
-    "vitest": "^3.0.5"
+    "tsx": "^4.19.3",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.29.0",
+    "vitest": "^3.1.1"
   },
   "engines": {
     "node": ">=18.0.0"

backend/package.json

@@ -6,7 +6,7 @@ class SettingsController {
     try {
       const settings = await app.settingsService.getAllSettings();
       if (!settings) {
-        return res.status(404).json({ error: 'Settings not found' });
+        res.status(404).json({ error: 'Settings not found' });
       }
       res.json(settings);
     } catch (error) {

backend/src/controllers/settings.controller.ts

@@ -41,7 +41,7 @@ class SetupController {
       const { appId, privateKey, webhookSecret } = req.body;
 
       if (!appId || !privateKey || !webhookSecret) {
-        return res.status(400).json({ error: 'All fields are required' });
+        res.status(400).json({ error: 'All fields are required' });
       }
 
       await app.github.connect({
@@ -75,7 +75,7 @@ class SetupController {
           installation: i.installation,
         }))
       };
-      return res.json(status);
+      res.json(status);
     } catch (error) {
       res.status(500).json(error);
     }
@@ -85,7 +85,7 @@ class SetupController {
     try {
       const statusService = new StatusService();
       const status = await statusService.getStatus();
-      return res.json(status);
+      res.json(status);
     } catch (error) {
       res.status(500).json(error);
     }

backend/src/controllers/setup.controller.ts

@@ -110,7 +110,10 @@ class GitHub {
         this.expressApp._router.stack.splice(webhookMiddlewareIndex, 1);
       }
       setupWebhookListeners(this.app);
-      this.webhooks = this.expressApp.use(createNodeMiddleware(this.app));
+      
+      this.expressApp.use(createNodeMiddleware(this.app));
+      
+      this.webhooks = this.expressApp;
     } catch (error) {
       logger.debug(error);
       logger.error('Failed to create webhook middleware')

backend/src/github.ts

@@ -14,31 +14,37 @@ router.get('/', (req: Request, res: Response) => {
   res.send('Hello github-value!');
 });
 
+// Survey routes
 router.get('/survey', surveyController.getAllSurveys);
 router.post('/survey', surveyController.createSurvey);
 router.get('/survey/:id', surveyController.getSurveyById);
 router.put('/survey/:id', surveyController.updateSurvey); // put github survey logic here
 router.delete('/survey/:id', surveyController.deleteSurvey);
 router.post('/survey/:id/github', surveyController.updateSurveyGitHub);
 
+// Metrics routes
 router.get('/metrics', metricsController.getMetrics);
 router.get('/metrics/totals', metricsController.getMetricsTotals);
 
+// Seats routes
 router.get('/seats', SeatsController.getAllSeats);
 router.get('/seats/activity', adoptionController.getAdoptions);
 router.get('/seats/activity/totals', adoptionController.getAdoptionTotals);
 router.get('/seats/:id', SeatsController.getSeat);
 
+// Teams routes
 router.get('/teams', teamsController.getAllTeams);
 router.get('/members', teamsController.getAllMembers);
 router.get('/members/:login', teamsController.getMemberByLogin);
 
+// Settings routes - Fix for updated Express typings
 router.get('/settings', settingsController.getAllSettings);
 router.post('/settings', settingsController.createSettings);
 router.put('/settings', settingsController.updateSettings);
 router.get('/settings/:name', settingsController.getSettingsByName);
 router.delete('/settings/:name', settingsController.deleteSettings);
 
+// Setup routes
 router.get('/setup/registration/complete', setupController.registrationComplete);
 router.get('/setup/install/complete', setupController.installComplete);
 router.get('/setup/install', setupController.getInstall);
@@ -49,6 +55,7 @@ router.get('/setup/status', setupController.setupStatus);
 
 router.get('/status', setupController.getStatus);
 
+// Target routes
 router.get('/targets', targetValuesController.getTargetValues);
 router.post('/targets', targetValuesController.updateTargetValues);
 

backend/src/routes/index.ts

@@ -1,6 +1,6 @@
 import logger from "./logger.js";
 import Client from "smee-client";
-import EventSource from "eventsource";
+import { EventSource } from "eventsource";
 
 export interface WebhookServiceOptions {
   url?: string,