Revert "GRAD2-2639"

This reverts commit b47c5d3.
bcgov · Sep 25, 2024 · 3bfe9ba · 3bfe9ba
1 parent b47c5d3
commit 3bfe9ba
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 12 deletions.
diff --git a/.../main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchGradAlgorithmStudentEntity.java b/.../main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchGradAlgorithmStudentEntity.java
@@ -39,7 +39,4 @@ public class BatchGradAlgorithmStudentEntity extends BaseEntity {
 
 	@Column(name = "ERROR", nullable = true)
     private String error;
-
-	@Column(name = "SCHOOL_OF_RECORD_ID")
-	private UUID schoolOfRecordId;
 }
diff --git a/...n/java/ca/bc/gov/educ/api/batchgraduation/entity/StudentCredentialDistributionEntity.java b/...n/java/ca/bc/gov/educ/api/batchgraduation/entity/StudentCredentialDistributionEntity.java
@@ -43,7 +43,4 @@ public class StudentCredentialDistributionEntity extends BaseEntity {
 
 	@Column(name = "ERROR", nullable = true)
     private String error;
-
-	@Column(name = "SCHOOL_OF_RECORD_ID")
-	private UUID schoolOfRecordId;
 }
diff --git a/...src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java b/...src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java
@@ -17,7 +17,6 @@ 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
@@ -61,7 +61,6 @@ 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
@@ -49,14 +49,12 @@ 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));
 
@@ -88,14 +86,12 @@ 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));