Update survey titles and labels for clarity: reflect focus on Copilot impact and time savings

backend/package.json

@@ -8,7 +8,7 @@
     "start": "node --enable-source-maps dist/index.js | bunyan -o short -l info",
     "test": "jest",
     "build": "tsc",
-    "dev": "tsx watch src/index.ts | bunyan -o short -l debug",
+    "dev": "tsx watch src/index.ts | bunyan -o short -l info",
     "lint": "eslint src/**/*.ts",
     "db:start": "docker-compose -f ../compose.yml up -d db",
     "dotenv": "cp -n .env.example .env || true"

backend/src/controllers/survey.controller.ts

@@ -6,47 +6,17 @@ 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) {
+      console.log(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> {
@@ -63,6 +33,16 @@ class SurveyController {
     }
   }
 
+  async getRecentSurveysWithGoodReasons(req: Request, res: Response): Promise<void> {
+    try {
+      const minReasonLength = parseInt(req.params.minReasonLength, 10) || 20;
+      const surveys = await surveyService.getRecentSurveysWithGoodReasons(minReasonLength);
+      res.status(200).json(surveys);
+    } catch (error) {
+      res.status(500).json(error);
+    }
+  }
+
   async getSurveyById(req: Request, res: Response): Promise<void> {
     try {
       const { id } = req.params;
@@ -96,6 +76,70 @@ 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 updateKudos(req: Request, res: Response): Promise<void> {
+    try {
+      const { id } = req.params;
+
+      const survey = await Survey.findByPk(id);
+      if (!survey) {
+        res.status(404).json({ error: 'Survey not found' });
+        return;
+      }
+
+      survey.kudos = (survey.kudos || 0) + 1;
+      await survey.save();
+
+      res.status(200).json(survey);
+    } catch (error) {
+      console.log(error);
+      res.status(500).json(error);
+    }
+  }
+
   async deleteSurvey(req: Request, res: Response): Promise<void> {
     try {
       const { id } = req.params;

backend/src/controllers/teams.controller.ts

@@ -58,6 +58,24 @@ class TeamsController {
       res.status(500).json(error);
     }
   }
+
+  async getMemberByLogin(req: Request, res: Response): Promise<void> {
+    try {
+      const { login } = req.params;
+      const member = await Member.findOne({
+        where: { login },
+        attributes: ['login', 'name', 'url', 'avatar_url']
+      });
+
+      if (member) {
+        res.json(member);
+      } else {
+        res.status(404).json({ message: 'User not found' });
+      }
+    } catch (error) {
+      res.status(500).json(error);
+    }
+  }
 }
 
 export default new TeamsController();

backend/src/database.ts

@@ -17,7 +17,7 @@ class Database {
   sequelize?: Sequelize;
   options: Options = {
     dialect: 'mysql',
-    logging: (sql) => logger.debug(sql),
+    logging: (sql) => logger.error(sql),
     timezone: '+00:00', // Force UTC timezone
     dialectOptions: {
       timezone: '+00:00' // Force UTC for MySQL connection

backend/src/models/survey.model.ts

@@ -12,7 +12,9 @@ type SurveyType = {
   percentTimeSaved: number;
   timeUsedFor: string;
   reason: string;
+  kudos?: number; // Add kudos property
   createdAt?: Date;
+  kudos: number;
   updatedAt?: Date;
 }
 
@@ -28,8 +30,10 @@ class Survey extends Model<SurveyType> {
   declare percentTimeSaved: number;
   declare timeUsedFor: string;
   declare reason: string;
+  declare kudos: number;
   declare createdAt: CreationOptional<Date>;
   declare updatedAt: CreationOptional<Date>;
+  declare kudos?: number; // Add kudos property
 
   static initModel(sequelize: Sequelize) {
     Survey.init({
@@ -81,6 +85,10 @@ class Survey extends Model<SurveyType> {
         type: DataTypes.INTEGER,
         allowNull: true,
       },
+      kudos: {
+        type: DataTypes.INTEGER,
+        allowNull: true
+      },
       createdAt: DataTypes.DATE,
       updatedAt: DataTypes.DATE
     }, {

backend/src/routes/index.ts

@@ -17,8 +17,11 @@ 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.get('/survey/recent-good-reasons/:minReasonLength', surveyController.getRecentSurveysWithGoodReasons);
+router.put('/survey/:id/github', surveyController.updateSurveyGitHub);
+router.put('/survey/kudos/:id', surveyController.updateKudos);
 
 router.get('/usage', usageController.getUsage);
 
@@ -32,6 +35,7 @@ router.get('/seats/:id', SeatsController.getSeat);
 
 router.get('/teams', teamsController.getAllTeams);
 router.get('/members', teamsController.getAllMembers);
+router.get('/members/:login', teamsController.getMemberByLogin);
 
 router.get('/settings', settingsController.getAllSettings);
 router.post('/settings', settingsController.createSettings);

backend/src/services/survey.service.ts

@@ -1,4 +1,5 @@
 import { Survey, SurveyType } from "../models/survey.model.js";
+import { Op } from 'sequelize';
 
 class SurveyService {
   async createSurvey(survey: SurveyType) {
@@ -11,6 +12,23 @@ class SurveyService {
     });
     return await Survey.findByPk(survey.id);
   }
+
+
+  async getRecentSurveysWithGoodReasons(minReasonLength: number): Promise<Survey[]> {
+    return Survey.findAll({
+      where: {
+        reason: {
+          [Op.and]: [
+            { [Op.ne]: null },
+            { [Op.ne]: '' },
+            { [Op.gte]: minReasonLength }
+          ]
+        }
+      },
+      order: [['updatedAt', 'DESC']],
+      limit: 20
+    });
+  }
 }
 
 export default new SurveyService();

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/copilot-survey-details/copilot-survey.component.html

@@ -1,6 +1,6 @@
 <div class="page-container" *ngIf="survey">
   <div class="page-header">
-    <h1>Survey #{{ survey.id }}</h1>
+    <h1>Estimate of Copilot Impact #{{ survey.id }}</h1>
   </div>
   <mat-card appearance="outlined">
     <mat-card-header>
@@ -17,7 +17,7 @@ <h1>Survey #{{ survey.id }}</h1>
       <ng-container *ngIf="survey.status !== 'pending'">
         <p><strong>Used Copilot: </strong>{{ survey.usedCopilot ? 'Yes' : 'No' }}</p>
         <p><strong>Time Saved: </strong>{{ survey.percentTimeSaved }}%</p>
-        <p><strong>Reason: </strong>{{ survey.reason }}</p>
+        <p><strong>Reason: </strong><span matLine>{{ survey.reason }}</span></p>
         <p><strong>Time Used For: </strong>{{ survey.timeUsedFor }}</p>
       </ng-container>
       <p><strong>PR: </strong><a [href]="'https://github.com/' + survey.org + '/' + survey.repo + '/pull/' + survey.prNumber">{{ survey.repo }}#{{ survey.prNumber }}</a></p>

frontend/src/app/main/copilot/copilot-surveys/copilot-surveys.component.html

@@ -1,10 +1,10 @@
 <div class="page-container">
   <div class="page-header">
-    <h1>Surveys</h1>
+    <h1>Estimate Time Saved and Share Expertise</h1>
     <span class="spacer"></span>
-    <!-- <p>
+    <p>
       <a mat-flat-button color="primary" routerLink="/copilot/surveys/new">New Survey</a>
-    </p> -->
+    </p>
   </div>
   <app-table [data]="surveys!" [columns]="surveysColumns" [defaultSort]="{id: 'dateTime', start: 'desc', disableClear: false}" (rowClick)="onSurveyClick($event)"></app-table>
 </div>