From 88fea73659ee896eb6f4476ebe58eade7f84352b Mon Sep 17 00:00:00 2001 From: arybakov Date: Wed, 25 Sep 2024 13:19:08 -0600 Subject: [PATCH] GRAD2-2639 Update DTOs, entities and related code in BATCH-GRADUATION-API --- .../entity/BatchGradAlgorithmStudentEntity.java | 3 +++ .../entity/StudentCredentialDistributionEntity.java | 3 +++ .../batchgraduation/model/StudentCredentialDistribution.java | 1 + .../educ/api/batchgraduation/service/DistributionService.java | 1 + .../api/batchgraduation/service/DistributionServiceTest.java | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchGradAlgorithmStudentEntity.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchGradAlgorithmStudentEntity.java index 4471b19d..4ce9568d 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchGradAlgorithmStudentEntity.java +++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchGradAlgorithmStudentEntity.java @@ -39,4 +39,7 @@ public class BatchGradAlgorithmStudentEntity extends BaseEntity { @Column(name = "ERROR", nullable = true) private String error; + + @Column(name = "SCHOOL_OF_RECORD_ID") + private UUID schoolOfRecordId; } \ No newline at end of file diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/StudentCredentialDistributionEntity.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/StudentCredentialDistributionEntity.java index aa0f09ae..af737efa 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/StudentCredentialDistributionEntity.java +++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/StudentCredentialDistributionEntity.java @@ -43,4 +43,7 @@ public class StudentCredentialDistributionEntity extends BaseEntity { @Column(name = "ERROR", nullable = true) private String error; + + @Column(name = "SCHOOL_OF_RECORD_ID") + private UUID schoolOfRecordId; } \ No newline at end of file diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java index 91b15633..9d8882e3 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java +++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java @@ -17,6 +17,7 @@ public class StudentCredentialDistribution implements Serializable { private UUID studentID; private String paperType; private String schoolOfRecord; + private UUID schoolOfRecordId; private String documentStatusCode; private String pen; diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionService.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionService.java index f5d8660e..1ddc9091 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionService.java +++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionService.java @@ -61,6 +61,7 @@ public void saveStudentCredentialDistribution(Long batchId, String jobType, Stud entity.setJobType(jobType); entity.setStudentID(scd.getStudentID()); entity.setSchoolOfRecord(scd.getSchoolOfRecord()); + entity.setSchoolOfRecordId(scd.getSchoolOfRecordId()); try { String payload = jsonUtil.getJsonStringFromObject(scd); entity.setPayload(payload); diff --git a/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionServiceTest.java b/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionServiceTest.java index 4125b898..14b611e8 100644 --- a/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionServiceTest.java +++ b/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionServiceTest.java @@ -49,12 +49,14 @@ public void testGetStudentCredentialDistributions() throws Exception { entity.setStudentID(UUID.randomUUID()); entity.setJobType("DISTRUN"); entity.setSchoolOfRecord("12345678"); + entity.setSchoolOfRecordId(UUID.randomUUID()); StudentCredentialDistribution dto = new StudentCredentialDistribution(); dto.setId(entity.getId()); dto.setStudentID(entity.getStudentID()); dto.setPen("123456789"); dto.setSchoolOfRecord(entity.getSchoolOfRecord()); + dto.setSchoolOfRecordId(entity.getSchoolOfRecordId()); entity.setPayload(jsonUtil.getJsonStringFromObject(dto)); @@ -86,12 +88,14 @@ public void testSaveStudentCredentialDistribution() throws Exception { entity.setJobExecutionId(batchId); entity.setJobType("DISTRUN"); entity.setSchoolOfRecord("12345678"); + entity.setSchoolOfRecordId(UUID.randomUUID()); StudentCredentialDistribution dto = new StudentCredentialDistribution(); dto.setId(entity.getId()); dto.setStudentID(entity.getStudentID()); dto.setPen("123456789"); dto.setSchoolOfRecord(entity.getSchoolOfRecord()); + dto.setSchoolOfRecordId(entity.getSchoolOfRecordId()); entity.setPayload(jsonUtil.getJsonStringFromObject(dto));