Merge branch 'develop' of github.com:topcoder-platform/marathon-match-api-v6 into develop

Author: jmgasper

docs/marathon-processor-specification-and-scoring-terminology.md

@@ -337,7 +337,6 @@ Both email payloads include:
 
 The Example/Provisional completion payload also includes:
 
-- aggregate example score after relative scoring updates
 - aggregate provisional score after relative scoring updates
 
 The System completion payload also includes:

src/api/scoring-result/scoring-completion-email.service.spec.ts

@@ -16,7 +16,6 @@ describe('ScoringCompletionEmailService', () => {
   };
 
   const details = {
-    aggregateExampleScore: 95.25,
     aggregateProvisionalScore: 87.5,
     challengeId: '76d6e4b8-1cca-4850-8bc5-bdaddfece87a',
     challengeName: 'Blocks',
@@ -112,7 +111,6 @@ describe('ScoringCompletionEmailService', () => {
           recipients: ['competitor@example.com'],
           sendgrid_template_id: 'sendgrid-template-id',
           data: expect.objectContaining({
-            aggregateExampleScore: details.aggregateExampleScore,
             aggregateProvisionalScore: details.aggregateProvisionalScore,
             challengeId: details.challengeId,
             challengeName: details.challengeName,
@@ -131,6 +129,8 @@ describe('ScoringCompletionEmailService', () => {
         }),
       }),
     );
+    const sentPayload = httpService.post.mock.calls[0][1].payload.data;
+    expect(sentPayload.aggregateExampleScore).toBeUndefined();
     expect(prisma.$executeRaw).toHaveBeenCalledTimes(1);
   });
 

src/api/scoring-result/scoring-completion-email.service.ts

@@ -15,7 +15,6 @@ export interface SubmissionScoringCompletionEmailDetails {
   memberId?: string;
   userId?: string;
   scoringStatus: ScoringCompletionStatus;
-  aggregateExampleScore: number;
   aggregateProvisionalScore: number;
 }
 
@@ -78,7 +77,7 @@ export class ScoringCompletionEmailService {
    * Sends the completion email if the template is configured and this
    * submission has not already produced a successful notification.
    * @param token M2M token used for member-api-v6 and Bus API calls.
-   * @param details Submission, challenge, member, and score values for the email.
+   * @param details Submission, challenge, member, status, and provisional score values for the email.
    * @returns Resolves after the email is sent, skipped, or marked failed.
    */
   async sendSubmissionScoringCompleteEmail(
@@ -460,7 +459,7 @@ export class ScoringCompletionEmailService {
 
   /**
    * Builds the email payload expected by the `external.action.email` topic.
-   * @param details Submission, challenge, member, and score values.
+   * @param details Submission, challenge, member, status, and provisional score values.
    * @param recipientEmail Email address to receive the notification.
    * @param memberHandle Resolved member handle for template data.
    * @param sendgridTemplateId SendGrid dynamic template ID.
@@ -487,7 +486,6 @@ export class ScoringCompletionEmailService {
         challengeUrl,
         challengeURL: challengeUrl,
         scoringStatus: details.scoringStatus,
-        aggregateExampleScore: details.aggregateExampleScore,
         aggregateProvisionalScore: details.aggregateProvisionalScore,
       },
       sendgrid_template_id: sendgridTemplateId,

src/api/scoring-result/scoring-result.service.spec.ts

@@ -789,7 +789,6 @@ describe('ScoringResultService', () => {
     expect(
       scoringCompletionEmailService.sendSubmissionScoringCompleteEmail,
     ).toHaveBeenCalledWith('m2m-token', {
-      aggregateExampleScore: 96,
       aggregateProvisionalScore: 88,
       challengeId: basePayload.challengeId,
       challengeName: 'Marathon Match 2026 Beta Test',
@@ -970,7 +969,6 @@ describe('ScoringResultService', () => {
     ).toHaveBeenCalledWith(
       'm2m-token',
       expect.objectContaining({
-        aggregateExampleScore: 96,
         aggregateProvisionalScore: -1,
         scoringStatus: 'fail',
       }),

src/api/scoring-result/scoring-result.service.ts

@@ -1353,7 +1353,6 @@ export class ScoringResultService {
         exampleResult.status === 'pass' && provisionalResult.status === 'pass'
           ? 'pass'
           : 'fail',
-      aggregateExampleScore: exampleResult.aggregateScore,
       aggregateProvisionalScore: provisionalResult.aggregateScore,
     };
   }