Initially look for 5 reviewers instead of 2

Author: kylehoehns

.aws/bin/HackerRankQueue.ts

@@ -46,6 +46,7 @@ new HackerRankQueueStack(app, 'HackerRankQueueStack', {
     WORKDAY_END_HOUR: modeConfig.WORKDAY_END_HOUR,
     HACK_PARSER_BUCKET_NAME: modeConfig.HACK_PARSER_BUCKET_NAME,
     TZ: 'America/Chicago',
+    NUMBER_OF_INITIAL_REVIEWERS: modeConfig.NUMBER_OF_INITIAL_REVIEWERS,
   },
 });
 

.aws/cdk.json

@@ -14,7 +14,8 @@
       "ENCRYPTED_GOOGLE_SERVICE_ACCOUNT_EMAIL": "AQICAHgmK7RLzJGLsX027nGL/3YoG67Jh4Mxgt5hOhZTg/kH0AEaRVPWlX2aVKL8w/25FRmuAAAAlDCBkQYJKoZIhvcNAQcGoIGDMIGAAgEAMHsGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMKzMqXyLoCKEizJLXAgEQgE6KG7oJcvvJDkhnvxOR5Z2blZ0UH/ib7FTXBaDDQUASqASjyQhOyIVB+V7boljYMTgVhcUWZprkgMvS2hFbiS7gaRlC59KLgkPFP5+VmaE=",
       "WORKDAY_START_HOUR": "8",
       "WORKDAY_END_HOUR": "17",
-      "HACK_PARSER_BUCKET_NAME": "hack-parser-dev"
+      "HACK_PARSER_BUCKET_NAME": "hack-parser-dev",
+      "NUMBER_OF_INITIAL_REVIEWERS": "5"
     },
     "prod": {
       "HOSTED_ZONE": "sourceallies.com",
@@ -29,7 +30,8 @@
       "ENCRYPTED_GOOGLE_SERVICE_ACCOUNT_EMAIL": "AQICAHj0rd9+A15pncr1JrWCjeFtR4hrNnZnqKAX0mW97lZXPAGr0HRhl9Anq+UoyGhRYnZbAAAAlDCBkQYJKoZIhvcNAQcGoIGDMIGAAgEAMHsGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMHkGZcyEuoE5kdC9CAgEQgE5bFFe7hRWHrVDO9J90X2izrLD8fbLGAzU0gHtoSQwHvfg6YxEgpu5R4bnEH61AgkjkhsSKndMtyjZWnvc2yT+cRPFX8THuOiwt4zKtm+Y=",
       "WORKDAY_START_HOUR": "8",
       "WORKDAY_END_HOUR": "17",
-      "HACK_PARSER_BUCKET_NAME": "hack-parser-prod"
+      "HACK_PARSER_BUCKET_NAME": "hack-parser-prod",
+      "NUMBER_OF_INITIAL_REVIEWERS": "5"
     }
   }
 }

.aws/lib/HackerRankQueueStack.ts

@@ -28,6 +28,7 @@ interface HackerRankQueueStackProps extends StackProps {
     WORKDAY_END_HOUR: string;
     HACK_PARSER_BUCKET_NAME: string;
     TZ: string;
+    NUMBER_OF_INITIAL_REVIEWERS: string;
   };
 }
 

src/bot/__tests__/requestReview.test.ts

@@ -309,6 +309,7 @@ describe('requestReview', () => {
 
     async function callCallback(param = buildParam()) {
       process.env.INTERVIEWING_CHANNEL_ID = 'some-channel-id';
+      process.env.NUMBER_OF_INITIAL_REVIEWERS = '5';
 
       chatService.sendRequestReviewMessage = jest.fn().mockResolvedValue('100');
       QueueService.getInitialUsersForReview = jest.fn().mockResolvedValueOnce([
@@ -374,7 +375,7 @@ _Candidate Identifier: some-identifier_
     it('should get next users to review', async () => {
       await callCallback();
 
-      expect(QueueService.getInitialUsersForReview).toBeCalledWith(['Go', 'Javascript'], '1');
+      expect(QueueService.getInitialUsersForReview).toBeCalledWith(['Go', 'Javascript'], 5);
     });
 
     it('should create a new active review row', async () => {

src/bot/requestReview.ts

@@ -159,9 +159,10 @@ export const requestReview = {
 
     const user = body.user;
     const channel = process.env.INTERVIEWING_CHANNEL_ID;
+    const numberOfInitialReviewers = Number(process.env.NUMBER_OF_INITIAL_REVIEWERS);
     const languages = blockUtils.getLanguageFromBody(body);
     const deadline = blockUtils.getBlockValue(body, ActionId.REVIEW_DEADLINE);
-    const numberOfReviewers = blockUtils.getBlockValue(body, ActionId.NUMBER_OF_REVIEWERS);
+    const numberOfRequestedReviewers = blockUtils.getBlockValue(body, ActionId.NUMBER_OF_REVIEWERS);
     const candidateIdentifier = blockUtils.getBlockValue(body, ActionId.CANDIDATE_IDENTIFIER);
 
     let pdfIdentifier = '';
@@ -184,7 +185,7 @@ export const requestReview = {
       }
     }
 
-    const numberOfReviewersValue = numberOfReviewers.value;
+    const numberOfReviewersValue = numberOfRequestedReviewers.value;
     const deadlineValue = deadline.selected_option.value;
     const deadlineDisplay = deadline.selected_option.text.text;
     const candidateIdentifierValue = candidateIdentifier.value;
@@ -221,7 +222,7 @@ export const requestReview = {
 
     const reviewers = await QueueService.getInitialUsersForReview(
       languages,
-      numberOfReviewersValue,
+      numberOfInitialReviewers,
     );
 
     if (reviewers.length < numberOfReviewersValue) {

src/services/ReviewCloser.ts

@@ -4,12 +4,16 @@ import { mention } from '@/utils/text';
 import { App } from '@slack/bolt';
 import { chatService } from '@/services/ChatService';
 import { ActiveReview } from '@models/ActiveReview';
+import { expireRequest } from '@/services/RequestService';
 
 export const reviewCloser = {
   async closeReviewIfComplete(app: App, threadId: string): Promise<void> {
     const review = await activeReviewRepo.getReviewByThreadIdOrFail(threadId);
 
     if (isCompleted(review)) {
+      for (const user of review.pendingReviewers) {
+        await expireRequest(app, review, user.userId);
+      }
       await closeReview(
         app,
         review,

src/services/__tests__/reviewCloser.test.ts

@@ -6,6 +6,13 @@ import { App } from '@slack/bolt';
 import { buildMockApp } from '@utils/slackMocks';
 import { reviewCloser } from '@/services/ReviewCloser';
 
+jest.mock('@/services/RequestService', () => ({
+  ...jest.requireActual('@/services/RequestService'),
+  expireRequest: jest.fn(),
+}));
+
+import { expireRequest } from '@/services/RequestService';
+
 describe('reviewCloser', () => {
   let app: App;
   beforeEach(() => {
@@ -98,6 +105,45 @@ describe('reviewCloser', () => {
       expect(chatService.replyToReviewThread).not.toHaveBeenCalled();
       expect(activeReviewRepo.remove).not.toHaveBeenCalled();
     });
+
+    it('should call expireRequest for all pending reviewers before closing the review', async () => {
+      const threadId = '111';
+      const requestorId = '123';
+      const pendingReviewers = [
+        { userId: '123', expiresAt: 1, messageTimestamp: '456' },
+        { userId: '456', expiresAt: 2, messageTimestamp: '789' },
+      ];
+      const review: ActiveReview = {
+        threadId: threadId,
+        requestorId: requestorId,
+        languages: ['Java'],
+        requestedAt: new Date(),
+        dueBy: Deadline.MONDAY,
+        candidateIdentifier: 'some-id',
+        reviewersNeededCount: 2,
+        acceptedReviewers: [acceptedUser('A'), acceptedUser('B')],
+        declinedReviewers: [],
+        pendingReviewers: pendingReviewers,
+        pdfIdentifier: '',
+      };
+
+      activeReviewRepo.getReviewByThreadIdOrFail = jest.fn().mockResolvedValue(review);
+
+      await reviewCloser.closeReviewIfComplete(app, threadId);
+
+      expect(expireRequest).toHaveBeenCalledTimes(pendingReviewers.length);
+      pendingReviewers.forEach(pendingReviewer => {
+        expect(expireRequest).toHaveBeenCalledWith(app, review, pendingReviewer.userId);
+      });
+
+      // Verify the review is closed after expiring requests
+      expect(chatService.replyToReviewThread).toHaveBeenCalledWith(
+        app.client,
+        threadId,
+        `<@${requestorId}> all 2 reviewers have been found!`,
+      );
+      expect(activeReviewRepo.remove).toHaveBeenCalledWith(threadId);
+    });
   });
 });