Add GitHub survey update functionality and new survey route

Author: austenstone

backend/src/controllers/survey.controller.ts

@@ -6,47 +6,16 @@ import app from '../index.js';
 
 class SurveyController {
   async createSurvey(req: Request, res: Response): Promise<void> {
-    let survey: Survey;
     try {
-      const _survey = await surveyService.updateSurvey({
+      const survey = await surveyService.createSurvey({
         ...req.body,
         status: 'completed'
       })
-      if (!_survey) throw new Error('Survey not found');
-      survey = _survey;
       res.status(201).json(survey);
     } catch (error) {
       res.status(500).json(error);
       return;
     }
-    try {
-      const { installation, octokit } = await app.github.getInstallation(survey.org);
-      const surveyUrl = new URL(`copilot/surveys/${survey.id}`, app.baseUrl);
-
-      if (!survey.repo || !survey.org || !survey.prNumber) {
-        logger.warn('Cannot process survey comment: missing survey data');
-        return;
-      }
-      const comments = await octokit.rest.issues.listComments({
-        owner: survey.org,
-        repo: survey.repo,
-        issue_number: survey.prNumber
-      });
-      const comment = comments.data.find(comment => comment.user?.login.startsWith(installation.app_slug));
-      if (comment) {
-        octokit.rest.issues.updateComment({
-          owner: survey.org,
-          repo: survey.repo,
-          comment_id: comment.id,
-          body: `Thanks for filling out the [copilot survey](${surveyUrl.toString()}) @${survey.userId}!`
-        });
-      } else {
-        logger.info(`No comment found for survey from ${survey.org}`);
-      }
-    } catch (error) {
-      logger.error('Error updating survey comment', error);
-      throw error;
-    }
   }
 
   async getAllSurveys(req: Request, res: Response): Promise<void> {
@@ -96,6 +65,50 @@ class SurveyController {
     }
   }
 
+  async updateSurveyGitHub(req: Request, res: Response): Promise<void> {
+    let survey: Survey;
+    try {
+      const _survey = await surveyService.updateSurvey({
+        ...req.body,
+        status: 'completed'
+      })
+      if (!_survey) throw new Error('Survey not found');
+      survey = _survey;
+      res.status(201).json(survey);
+    } catch (error) {
+      res.status(500).json(error);
+      return;
+    }
+    try {
+      const { installation, octokit } = await app.github.getInstallation(survey.org);
+      const surveyUrl = new URL(`copilot/surveys/${survey.id}`, app.baseUrl);
+
+      if (!survey.repo || !survey.org || !survey.prNumber) {
+        logger.warn('Cannot process survey comment: missing survey data');
+        return;
+      }
+      const comments = await octokit.rest.issues.listComments({
+        owner: survey.org,
+        repo: survey.repo,
+        issue_number: survey.prNumber
+      });
+      const comment = comments.data.find(comment => comment.user?.login.startsWith(installation.app_slug));
+      if (comment) {
+        octokit.rest.issues.updateComment({
+          owner: survey.org,
+          repo: survey.repo,
+          comment_id: comment.id,
+          body: `Thanks for filling out the [copilot survey](${surveyUrl.toString()}) @${survey.userId}!`
+        });
+      } else {
+        logger.info(`No comment found for survey from ${survey.org}`);
+      }
+    } catch (error) {
+      logger.error('Error updating survey comment', error);
+      throw error;
+    }
+  }
+
   async deleteSurvey(req: Request, res: Response): Promise<void> {
     try {
       const { id } = req.params;

backend/src/routes/index.ts

@@ -17,8 +17,9 @@ router.get('/', (req: Request, res: Response) => {
 router.get('/survey', surveyController.getAllSurveys);
 router.post('/survey', surveyController.createSurvey);
 router.get('/survey/:id', surveyController.getSurveyById);
-router.put('/survey/:id', surveyController.updateSurvey);
+router.put('/survey/:id', surveyController.updateSurvey); // put github survey logic here
 router.delete('/survey/:id', surveyController.deleteSurvey);
+router.put('/survey/:id/github', surveyController.updateSurveyGitHub);
 
 router.get('/usage', usageController.getUsage);
 

frontend/src/app/app.routes.ts

@@ -31,6 +31,7 @@ export const routes: Routes = [
       { path: 'copilot/seats', component: CopilotSeatsComponent, title: 'Seats' },
       { path: 'copilot/seats/:id', component: CopilotSeatComponent, title: 'Seat' },
       { path: 'copilot/surveys', component: CopilotSurveysComponent, title: 'Surveys' },
+      { path: 'copilot/surveys/new', component: NewCopilotSurveyComponent, title: 'New Survey' },
       { path: 'copilot/surveys/new/:id', component: NewCopilotSurveyComponent, title: 'New Survey' },
       { path: 'copilot/surveys/:id', component: CopilotSurveyComponent, title: 'Survey' },
       { path: 'copilot/predictive-modeling', component: PredictiveModelingComponent, title: 'Predictive Modeling' },

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

@@ -2,7 +2,7 @@ import { Component, forwardRef, OnInit } from '@angular/core';
 import { AppModule } from '../../../../app.module';
 import { FormBuilder, FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
 import { CopilotSurveyService } from '../../../../services/api/copilot-survey.service';
-import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRoute, Params, Router } from '@angular/router';
 
 @Component({
   selector: 'app-copilot-survey',
@@ -38,7 +38,8 @@ export class NewCopilotSurveyComponent implements OnInit {
   constructor(
     private fb: FormBuilder,
     private copilotSurveyService: CopilotSurveyService,
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
+    private router: Router
   ) {
     const id = Number(this.route.snapshot.paramMap.get('id'));
     this.id = isNaN(id) ? 0 : id
@@ -156,7 +157,7 @@ export class NewCopilotSurveyComponent implements OnInit {
 
   onSubmit() {
     const { org, repo, prNumber } = this.parseGitHubPRUrl(this.params['url']);
-    this.copilotSurveyService.createSurvey({
+    const survey = {
       id: this.id,
       userId: this.params['author'],
       org,
@@ -166,14 +167,21 @@ export class NewCopilotSurveyComponent implements OnInit {
       percentTimeSaved: Number(this.surveyForm.value.percentTimeSaved),
       reason: this.surveyForm.value.reason,
       timeUsedFor: this.surveyForm.value.timeUsedFor
-    }).subscribe(() => {
-      const redirectUrl = this.params['url'];
-      if (redirectUrl && redirectUrl.startsWith('https://github.com/')) {
-        window.location.href = redirectUrl;
-      } else {
-        console.error('Unauthorized URL:', redirectUrl);
-      }
-    });
+    };
+    if (!this.id) {
+      this.copilotSurveyService.createSurvey(survey).subscribe(() => {
+        this.router.navigate(['/copilot/surveys']);
+      });
+    } else {
+      this.copilotSurveyService.createSurveyGitHub(survey).subscribe(() => {
+        const redirectUrl = this.params['url'];
+        if (redirectUrl && redirectUrl.startsWith('https://github.com/')) {
+          window.location.href = redirectUrl;
+        } else {
+          console.error('Unauthorized URL:', redirectUrl);
+        }
+      });
+    }
   }
 
   formatPercent(value: number): string {

frontend/src/app/services/api/copilot-survey.service.ts

@@ -30,6 +30,10 @@ export class CopilotSurveyService {
     return this.http.post(this.apiUrl, survey);
   }
 
+  createSurveyGitHub(survey: Survey) {
+    return this.http.post(`${this.apiUrl}/${survey.id}/github`, survey);
+  }
+
   getAllSurveys(org?: string) {
     return this.http.get<Survey[]>(this.apiUrl, {
       params: org ? { org } : undefined