survey, seats and members fixes primarily around keeping Org straight/valid

Author: MattG57

backend/package-lock.json

@@ -27,6 +27,7 @@
     "octokit": "4.1",
     "smee-client": "^2.0.4",
     "update-dotenv": "^1.1.1",
+    "validator": "^13.12.0",
     "why-is-node-running": "^3.2.1"
   },
   "devDependencies": {
@@ -36,6 +37,7 @@
     "@types/eventsource": "^1.1.15",
     "@types/express": "^4.17.21",
     "@types/node": "^22.10.5",
+    "@types/validator": "^13.12.2",
     "eslint": "9.16",
     "globals": "^15.13.0",
     "ts-node": "^10.9.2",

backend/package.json

@@ -54,7 +54,7 @@ class MockSurveyGenerator {
     const newData = JSON.parse(JSON.stringify(this.baseData));
 
     newData.surveys = await Promise.all(newData.surveys.map(async (survey: SurveyType) => {
-      survey.id = await SequenceService.getNextSequenceValue('survey-sequence');
+      //survey.id = await SequenceService.getNextSequenceValue('survey-sequence');
       survey.userId = this.getRandomUserId();
       survey.org = this.getRandomOrg();
       //survey.repo = this.getRandomRepo();

backend/src/__tests__/__mock__/survey-gen/mockSurveyGenerator.ts

@@ -4,6 +4,9 @@ import logger from '../services/logger.js';
 import surveyService from '../services/survey.service.js';
 import app from '../index.js';
 import mongoose from 'mongoose';
+import { MemberType } from 'models/teams.model.js';
+import { memoryUsage } from 'process';
+import validator from 'validator';
 
 
 
@@ -55,16 +58,15 @@ class SurveyController {
 
   async createSurvey(req: Request, res: Response): Promise<void> {
     try {
+      console.log('req.body', req.body);
       const newSurvey = req.body;
-      this.getMemberByLogin(newSurvey.userId);
-      const Survey = mongoose.model('Survey');
-      const survey = await Survey.create(req.body);
-      // surveyService.createSurvey(req.body);
-      //TODO refactor db code to service layer
-
-      res.status(201).json(survey);
+      //const member = await this.getMemberByLogin(newSurvey.userId, newSurvey.org)|| true; //needs to be fixed :"Cannot read properties of undefined (reading 'getMemberByLogin')""
+      if (true) {
+        const survey = surveyService.createSurvey(newSurvey);
+        res.status(201).json(survey);
+      }
     } catch (error) {
-      res.status(500).json(error);
+      res.status(500).json((error as Error).message);
       return;
     }
   }
@@ -152,22 +154,40 @@ class SurveyController {
     //router.get('/members/:login', teamsController.getMemberByLogin);
   }
 
-  async getMemberByLogin(loginToFind: any): Promise<void> {
-    const Member = mongoose.model('Member');
-        try {
-          const { login } = loginToFind;
-          const member = await Member.findOne({ login })
-            .select('login name url avatar_url')
-            .exec();
-    
-          if (member) {
-            return member
-          } else {
-            throw new Error('User not found');
-          }
-        } catch (error) {
-          throw new Error('Member lookup failed with: ' + (error as any).message);
-        }
+  async getMemberByLogin(loginToFind: string, orgToMatch: string): Promise<MemberType> {
+    // Ensure both values are provided.
+    if (!loginToFind || !orgToMatch) {
+      throw new Error('Both login and org must be provided');
+    }
+
+    // Trim the login input and then validate.
+    const trimmedLogin = loginToFind.trim();
+    if (!validator.isAlphanumeric(trimmedLogin, 'en-US', { ignore: '-' })) {
+      throw new Error('Invalid login: Only alphanumeric characters and dashes are allowed');
+    }
+
+    // Optionally validate org if needed
+    const trimmedOrg = orgToMatch.trim();
+    if (!trimmedOrg) {
+      throw new Error('Invalid organization provided');
+    }
+
+    // Retrieve the Member model once instead of on every method call.
+    const Member = mongoose.model<MemberType>('Member');
+
+    try {
+      const member = await Member.findOne({ login: trimmedLogin, org: trimmedOrg })
+        .select('login name url avatar_url')
+        .exec();
+
+      if (member) {
+        return member;
+      } else {
+        throw new Error('User not found');
+      }
+    } catch (error) {
+      throw new Error('Member lookup failed with: ' + (error as Error).message);
+    }
   }
 }
 

backend/src/controllers/survey.controller.ts

@@ -48,7 +48,7 @@ class SeatsService {
   async getAssignee(id: number) {
     const Seats = mongoose.model('Seats');
     const Member = mongoose.model('Member');
-    const member = await Member.findOne({ id });
+    const member = await Member.findOne({id}).sort({org: -1}); //this temporarily resolves a bug where one org fails but the other one succeeds
 
     if (!member) {
       throw `Member with id ${id} not found`

backend/src/services/copilot.seats.service.ts

@@ -1,19 +1,40 @@
 import { SurveyType } from "../models/survey.model.js";
 import mongoose from 'mongoose';
+import SequenceService from './sequence.service.js';
 
 class SurveyService {
+
   async createSurvey(survey: SurveyType) {
+    survey.id = await SequenceService.getNextSequenceValue('survey-sequence');
+    console.log('survey', survey);
     const Survey = mongoose.model('Survey');
     return await Survey.create(survey);
   }
 
   async updateSurvey(survey: SurveyType) {
+    if (!survey || !survey.id || typeof survey.id !== 'number') {
+      throw new Error('Invalid survey data provided');
+    }
     const Survey = mongoose.model('Survey');
-    await Survey.updateOne({ id: survey.id }, survey);
-    return await Survey.findOne({ id: survey.id });
+    const result = await Survey.updateOne({ id: survey.id }, survey);
+  
+    // Check if the update modified any document.
+  if (result.modifiedCount === 0) {
+    throw new Error('Survey update failed: no document was modified');
+  }
+  
+  const updatedSurvey = await Survey.findOne({ id: survey.id });
+  if (!updatedSurvey) {
+    throw new Error('Survey update failed: survey not found');
+  }
+  
+  return updatedSurvey;
   }
 
   async getRecentSurveysWithGoodReasons(minReasonLength: number): Promise<SurveyType[]> {
+    if (typeof minReasonLength !== 'number' || isNaN(minReasonLength) || minReasonLength < 1) {
+      throw new Error('Invalid minReasonLength provided');
+    }
     const Survey = mongoose.model('Survey');
     return Survey.find({
       reason: {

backend/src/services/survey.service.ts

@@ -40,6 +40,7 @@ export class NewCopilotSurveyComponent implements OnInit {
   defaultPercentTimeSaved = 25;
   id: number;
   surveys: Survey[] = [];
+  orgFromApp: string = '';
 
   constructor(
     private fb: FormBuilder,
@@ -70,6 +71,11 @@ export class NewCopilotSurveyComponent implements OnInit {
       this.params = params;
     });
 
+    // Subscribe to the installationsService to get the latest organization
+    this.installationsService.currentInstallation.subscribe(installation => {
+      this.orgFromApp = installation?.account?.login || '';
+    });
+
     this.loadHistoricalReasons();
 
     this.surveyForm.get('usedCopilot')?.valueChanges.subscribe((value) => {
@@ -84,7 +90,7 @@ export class NewCopilotSurveyComponent implements OnInit {
   loadHistoricalReasons() {
     this.copilotSurveyService.getAllSurveys({
       reasonLength: 20,
-      // org: this.installationsService.currentInstallation.value?.account?.login
+      org: this.orgFromApp
     }).subscribe((surveys: Survey[]) => {
       this.surveys = surveys;
     }
@@ -122,7 +128,7 @@ export class NewCopilotSurveyComponent implements OnInit {
     const survey = {
       id: this.id,
       userId: this.surveyForm.value.userId,
-      org,
+      org: org || this.orgFromApp,
       repo: repo || this.surveyForm.value.repo,
       prNumber: prNumber || this.surveyForm.value.prNumber,
       usedCopilot: this.surveyForm.value.usedCopilot,
@@ -132,7 +138,7 @@ export class NewCopilotSurveyComponent implements OnInit {
     };
     if (!this.id) {
       this.copilotSurveyService.createSurvey(survey).subscribe(() => {
-        this.router.navigate(['/copilot/surveys']);
+        this.router.navigate(['/copilot/survey']);
       });
     } else {
       this.copilotSurveyService.createSurveyGitHub(survey).subscribe(() => {