chore: update script to include stretch grading (#189)

Signed-off-by: Anthony D. Mays <[email protected]>

Author: anthonydmays

lib/javascript/grader/src/main.ts

@@ -12,6 +12,7 @@ const GRADES_COLUMNS = {
   PR_URL: 12,        // Column L
   FUNCTIONAL_SCORE: 5, // Column E
   TECHNICAL_SCORE: 7,  // Column G
+  STRETCH_SCORE: 9, // Column I
   GRADING_STATUS: 11    // Column K
 } as const;
 
@@ -134,18 +135,28 @@ function processPullRequest(pr: any): {updated: boolean, message?: string} {
       return {updated: false, message: "Already graded"};
     }
 
-    // 6) Update PR URL if different
-    if (currentPrUrl !== prHyperlink) {
+    // 6) Check if there's already a PR number in the cell - don't overwrite existing PRs
+    const currentPrUrlStr = currentPrUrl ? currentPrUrl.toString().trim() : "";
+    
+    // Skip if there's already a different PR URL/hyperlink in the cell 
+    // This prevents overwriting existing PR submissions with newer ones
+    if (currentPrUrlStr !== "" && currentPrUrlStr !== prHyperlink) {
+      return {updated: false, message: "Different PR already exists"};
+    }
+    
+    // 7) Update PR URL only if cell is empty (first submission for this student/lesson)
+    if (currentPrUrlStr === "") {
       sheet.getRange(targetRow, GRADES_COLUMNS.PR_URL).setValue(prHyperlink);
     }
 
-    // 7) Perform grading if not already done and if GRADING-COPILOT.md exists
+    // 8) Perform grading if not already done and if GRADING-COPILOT.md exists
     if (!gradingStatus || gradingStatus.toString().trim() === "") {
       const gradingResult = gradePullRequest(pr, lessonNumber, changedFiles, studentName);
       if (gradingResult.success) {
         // Update scores and status
         sheet.getRange(targetRow, GRADES_COLUMNS.FUNCTIONAL_SCORE).setValue(gradingResult.functionalScore);
         sheet.getRange(targetRow, GRADES_COLUMNS.TECHNICAL_SCORE).setValue(gradingResult.technicalScore);
+        sheet.getRange(targetRow, GRADES_COLUMNS.STRETCH_SCORE).setValue(gradingResult.stretchScore);
         sheet.getRange(targetRow, GRADES_COLUMNS.GRADING_STATUS).setValue(GRADING_STATUS.RECEIVED);
 
         return {updated: true, message: `Graded: F${gradingResult.functionalScore}/T${gradingResult.technicalScore}`};
@@ -157,6 +168,11 @@ function processPullRequest(pr: any): {updated: boolean, message?: string} {
       // If no GRADING-COPILOT.md found, just skip grading (don't mark as error)
     }
 
+    // Return success if PR was newly added (even if grading was skipped)
+    if (currentPrUrlStr === "") {
+      return {updated: true, message: "PR added (grading skipped - no criteria found)"};
+    }
+
     return {updated: false};
 
   } catch (error) {
@@ -342,6 +358,7 @@ function gradePullRequest(pr: any, lessonNumber: string, changedFiles: string[],
       success: true,
       functionalScore: analysis.functionalScore,
       technicalScore: analysis.technicalScore,
+      stretchScore: analysis.stretchScore,
       reviewCreated: reviewCreated
     };
 
@@ -478,6 +495,7 @@ Please provide your analysis in the following JSON format:
 {
   "functionalScore": <number 1-5>,
   "technicalScore": <number 1-5>,
+  "technicalScore: <number 1-5, or 0 if no stretch criteria is provided>
   "feedback": "<detailed feedback explaining the scores>"
 }
 
@@ -522,6 +540,7 @@ Guidelines:
       return {
         functionalScore: Math.min(Math.max(analysis.functionalScore || 5, 0), 10),
         technicalScore: Math.min(Math.max(analysis.technicalScore || 5, 0), 10),
+        stretchScore: Math.min(Math.max(analysis.stretchScore || 0, 0), 10),
         feedback: analysis.feedback || "Analysis completed",
         gradingInstructions
       };
@@ -604,6 +623,7 @@ interface GradingResult {
   success: boolean;
   functionalScore?: number;
   technicalScore?: number;
+  stretchScore?: number;
   reviewCreated?: boolean;
   error?: string;
 }
@@ -616,6 +636,7 @@ interface PRContent {
 interface GradingAnalysis {
   functionalScore: number;
   technicalScore: number;
+  stretchScore: number;
   feedback: string;
   gradingInstructions: string;
 }
@@ -884,6 +905,7 @@ function testGradingSystem(): void {
           `Lesson: ${lessonNumber}\n` +
           `Functional Score: ${gradingResult.functionalScore}/10\n` +
           `Technical Score: ${gradingResult.technicalScore}/10\n` +
+          `Stretch Score: ${gradingResult.stretchScore}/10\n` +
           `Draft Review: ${gradingResult.reviewCreated ? 'Created' : 'Failed'}`,
           ui.ButtonSet.OK
         );