Apply Extensions from transaction log

docs/index.rst

@@ -16,4 +16,5 @@ Packtrain is software for grading and student extension management.
    src/Authentication
    src/GradingPolicy
    src/Migrations
+   src/DeveloperGuide
    src/Assignments

docs/src/DeveloperGuide.rst

@@ -0,0 +1,4 @@
+.. _DeveloperGuide:
+
+Developer Guide
+==========================

docs/src/GradingPolicy.rst

@@ -138,6 +138,9 @@ Your policy must return an object with these properties set:
 
     **submissionMessage** *(nullable string)*
         An optional message for the overall submission.
+
+    **numberExtensionDaysApplied** *(number)*
+        the number of extension days applied
 
 An example for format is below:
 

openapi/openapi.yml

@@ -2010,7 +2010,10 @@ components:
           type: string
         submissionMessage:
           type: string
-
+        numberExtensionDaysApplied:
+          type: integer
+          format: int32
+# add number extension days applied to match above.
     PolicyDryRunResults:
       properties:
         policyResults:

packtrain-frontend/apps/admin/src/pages/course/Policy.tsx

@@ -353,6 +353,13 @@ export function PolicyPage({
                             value={dryRunRes.policyResults.adjustedDaysLate}
                             disabled
                           />
+                           <NumberInput
+                            pb={8}
+                            label="Number extension days applied"
+                            value={dryRunRes.policyResults.numberExtensionDaysApplied} 
+                            // make sure this is the same as open api
+                            disabled
+                          />
                         </Group>
                         <Group grow>
                           <TextInput

packtrain-policy-service/src/data/PolicyScoredDTO.ts

@@ -8,4 +8,5 @@ export default class PolicyScoredDTO {
     extensionStatus!: ExtensionStatus;
     extensionMessage?: string;
     submissionMessage?: string;
-}
+    numberExtensionDaysApplied?: number;
+}

packtrain-policy-service/src/data/ScoredDTO.ts

@@ -12,4 +12,5 @@ export default class ScoredDTO {
     extensionStatus!: ExtensionStatus;
     extensionMessage!: string;
     submissionMessage!: string;
+    numberExtensionDaysApplied!: number;
 }

packtrain-policy-service/src/services/policyService.ts

@@ -93,6 +93,9 @@ function validateScoredDTO(scored: PolicyScoredDTO): string[] {
         );
     }
 
+    if (scored.numberExtensionDaysApplied == null){
+        errors.push("the number of extension days applied was not set by policy!")
+    }
     return errors;
 }
 

packtrain-service/src/main/java/edu/mines/packtrain/data/policyServer/ScoredDTO.java

@@ -18,4 +18,5 @@ public class ScoredDTO {
     private LateRequestStatus extensionStatus;
     private String extensionMessage;
     private String submissionMessage;
+    private int numberExtensionDaysApplied;
 }

packtrain-service/src/main/java/edu/mines/packtrain/models/MigrationTransactionLog.java

@@ -60,4 +60,7 @@ public class MigrationTransactionLog {
 
     @Column(name = "message", length = 1000)
     private String message;
+
+    @Column(name = "number_extension_days")
+    private int extensionDays = 0;
 }

packtrain-service/src/main/java/edu/mines/packtrain/repositories/MigrationTransactionLogRepo.java

@@ -16,4 +16,10 @@ public interface MigrationTransactionLogRepo extends CrudRepository<MigrationTra
     @Query("select l from migration_transaction_log l where l.migrationId = ?2 " +
             "and l.cwid = ?1 order by l.revision asc")
     List<MigrationTransactionLog> getByCwidAndMigrationId(String cwid, UUID migrationId);
+
+    @Query("select l from migration_transaction_log l where l.migrationId = ?1 " + 
+            "and l.revision = (select max(l2.revision) from migration_transaction_log l2 where l2.cwid = l.cwid )")
+    // grabbing the latest revision from migration transaction log by migration id 
+    // cursed subquery version (im so sorry)
+     List<MigrationTransactionLog> getLatestByMigrationId(UUID migrationId);
 }

packtrain-service/src/main/java/edu/mines/packtrain/services/ExtensionService.java

@@ -192,4 +192,22 @@ public Map<String, LateRequest> getLateRequestsForAssignment(UUID assignment) {
                 .collect(Collectors.toUnmodifiableMap(
                         l -> l.getRequestingUser().getCwid(), l -> l));
     }
+
+    public void processExtensionApplied(UUID extensionId, boolean extensionApplied, int extensionDays) {
+        LateRequest lateRequest = lateRequestRepo.getLateRequestById(extensionId);
+        LateRequestStatus status;
+        status = LateRequestStatus.IGNORED;
+        if (extensionApplied) {
+            status = LateRequestStatus.APPLIED;
+        }
+        if (lateRequest == null) {
+            return;
+        }
+
+        lateRequest.setStatus(status);
+        lateRequest.setDaysRequested(extensionDays);
+        lateRequestRepo.save(lateRequest);
+
+    }
+
 }

packtrain-service/src/main/java/edu/mines/packtrain/services/MigrationService.java

@@ -276,6 +276,7 @@ public void handleScoreReceived(User asUser, UUID migrationId, ScoredDTO dto) {
         entry.setSubmissionStatus(dto.getSubmissionStatus());
         entry.setScore(dto.getFinalScore());
         entry.setSubmissionTime(dto.getAdjustedSubmissionTime());
+        entry.setExtensionDays(dto.getNumberExtensionDaysApplied());
 
         StringBuilder msg = new StringBuilder();
         Optional<LateRequest> lateRequest = extensionService.getLateRequest(entry.getExtensionId());
@@ -728,7 +729,7 @@ public void postGradesToCanvasTask(PostToCanvasTaskDef taskDef) {
                 .prepCanvasSubmissionsForPublish(String.valueOf(taskDef.getCanvasCourseId()),
                         taskDef.getCanvasAssignmentId());
 
-        List<MigrationTransactionLog> entries = transactionLogRepo.getAllByMigrationIdSorted(
+        List<MigrationTransactionLog> entries = transactionLogRepo.getLatestByMigrationId(
                 taskDef.getMigrationId());
 
         log.info("Processing {} migration log entries for posting to canvas for migration '{}'",
@@ -737,6 +738,10 @@ public void postGradesToCanvasTask(PostToCanvasTaskDef taskDef) {
         for (MigrationTransactionLog entry : entries) {
             submissions.addSubmission(entry.getCanvasId(), entry.getMessage(), entry.getScore(),
                     entry.getSubmissionStatus().equals(SubmissionStatus.EXCUSED));
+            if (entry.getExtensionId() != null) {
+                extensionService.processExtensionApplied(entry.getExtensionId(), 
+                        entry.isExtensionApplied(), entry.getExtensionDays());
+            }
         }
 
         Optional<Progress> progress = canvasService.asUser(provider)
@@ -745,7 +750,7 @@ public void postGradesToCanvasTask(PostToCanvasTaskDef taskDef) {
         if (progress.isEmpty()) {
             throw new RuntimeException("Failed to post scores to Canvas!");
         }
-
+        
         // We will probably want to periodically check in on this and then only flag this
         // as completed once this is done
     }

packtrain-service/src/test/java/edu/mines/packtrain/services/TestExtensionService.java

@@ -1,29 +1,41 @@
 package edu.mines.packtrain.services;
 
 import edu.mines.packtrain.containers.PostgresTestContainer;
+import edu.mines.packtrain.models.LateRequest;
+import edu.mines.packtrain.models.enums.LateRequestStatus;
 import edu.mines.packtrain.repositories.ExtensionRepo;
+import edu.mines.packtrain.repositories.LateRequestRepo;
 import edu.mines.packtrain.seeders.CourseSeeders;
+
+import java.util.UUID;
+
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
 public class TestExtensionService implements PostgresTestContainer {
 
-    @Autowired ExtensionService extensionService;
+    @Autowired
+    private ExtensionService extensionService;
 
     @Autowired
     private ExtensionRepo extensionRepo;
     @Autowired
     private CourseSeeders courseSeeders;
+    @Autowired
+    private LateRequestRepo lateRequestRepo;
 
     @BeforeAll
     static void setupClass(){
         postgres.start();
     }
 
+
     @AfterEach
     void tearDown(){
         extensionRepo.deleteAll();
@@ -38,4 +50,20 @@ void verifyGetAllExtensions(){
 
     }
 
+    @Test
+    void verifyProcessExtensionApplied(){
+        LateRequest mockLateRequest = new LateRequest();
+        mockLateRequest.setDaysRequested(4);
+        mockLateRequest.setStatus(LateRequestStatus.IGNORED);
+
+        mockLateRequest = lateRequestRepo.save(mockLateRequest);
+
+        extensionService.processExtensionApplied(UUID.randomUUID(), true, 2);
+        LateRequest capturedRequest = lateRequestRepo.getLateRequestById(mockLateRequest.getId());
+
+        Assertions.assertEquals(capturedRequest.getStatus(), LateRequestStatus.APPLIED);
+        Assertions.assertEquals(capturedRequest.getDaysRequested(), 2);
+
+    }
+
 }