From b7268dac939a9150792d8219ec046b7a222fb0ac Mon Sep 17 00:00:00 2001
From: arybakov <alex.rybakov@cgi.com>
Date: Mon, 22 Apr 2024 17:01:31 -0600
Subject: [PATCH 1/2] GRAD2-2377 HD-22859 (GRAD) YE Distribution run should
 direct Certificates to School at Graduation, not School of Record

---
 .../processor/DistributionRunStatusUpdateProcessor.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java
index 30ee2b48..98e6ceda 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java
@@ -75,7 +75,7 @@ private Map<String, ServiceException> updateBackStudentRecords(List<StudentCrede
                 restUtils.updateStudentCredentialRecord(scd.getStudentID(),scd.getCredentialTypeCode(),scd.getPaperType(),
                         "NONGRADYERUN".equalsIgnoreCase(activityCode)? "IP" : scd.getDocumentStatusCode(),activityCode,token);
                 LOGGER.debug("Dist Job [{}] / [{}] - update {} of {} student credential record: studentID, credentials, document status [{}, {}, {}]", batchId, activityCode, processedCount[0] + 1, totalCount, scd.getStudentID(), scd.getCredentialTypeCode(), scd.getDocumentStatusCode());
-                if(!StringUtils.equalsAnyIgnoreCase(jobType, "DISTRUN_YE", "NONGRADRUN", "REGALG", "TVRRUN")) {
+                if(!StringUtils.equalsAnyIgnoreCase(jobType, "NONGRADRUN", "REGALG", "TVRRUN")) {
                     restUtils.updateStudentGradRecord(scd.getStudentID(), batchId, activityCode);
                     LOGGER.debug("Dist Job [{}] / [{}] - update {} of {} student grad record: studentID, credentials, document status [{}, {}, {}]", batchId, activityCode, processedCount[0] + 1, totalCount, scd.getStudentID(), scd.getCredentialTypeCode(), scd.getDocumentStatusCode());
                 }

From 01807c82d6bc1bdd62185c5dcbdc29284934e34f Mon Sep 17 00:00:00 2001
From: arybakov <alex.rybakov@cgi.com>
Date: Mon, 22 Apr 2024 17:06:44 -0600
Subject: [PATCH 2/2] GRAD2-2377 HD-22859 (GRAD) YE Distribution run should
 direct Certificates to School at Graduation, not School of Record

---
 .../processor/DistributionRunStatusUpdateProcessor.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java
index 98e6ceda..d76f2ace 100644
--- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java
+++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/DistributionRunStatusUpdateProcessor.java
@@ -71,11 +71,11 @@ private Map<String, ServiceException> updateBackStudentRecords(List<StudentCrede
         final int[] processedCount = {0};
         cList.forEach(scd-> {
             try {
-                final String token = restUtils.getAccessToken();
+                final String accessToken = restUtils.getAccessToken();
                 restUtils.updateStudentCredentialRecord(scd.getStudentID(),scd.getCredentialTypeCode(),scd.getPaperType(),
-                        "NONGRADYERUN".equalsIgnoreCase(activityCode)? "IP" : scd.getDocumentStatusCode(),activityCode,token);
+                        "NONGRADYERUN".equalsIgnoreCase(activityCode)? "IP" : scd.getDocumentStatusCode(),activityCode,accessToken);
                 LOGGER.debug("Dist Job [{}] / [{}] - update {} of {} student credential record: studentID, credentials, document status [{}, {}, {}]", batchId, activityCode, processedCount[0] + 1, totalCount, scd.getStudentID(), scd.getCredentialTypeCode(), scd.getDocumentStatusCode());
-                if(!StringUtils.equalsAnyIgnoreCase(jobType, "NONGRADRUN", "REGALG", "TVRRUN")) {
+                if(!StringUtils.equalsAnyIgnoreCase(jobType, "REGALG", "TVRRUN")) {
                     restUtils.updateStudentGradRecord(scd.getStudentID(), batchId, activityCode);
                     LOGGER.debug("Dist Job [{}] / [{}] - update {} of {} student grad record: studentID, credentials, document status [{}, {}, {}]", batchId, activityCode, processedCount[0] + 1, totalCount, scd.getStudentID(), scd.getCredentialTypeCode(), scd.getDocumentStatusCode());
                 }