Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GRAD2-2639 #535

Open
wants to merge 1 commit into
base: grad-release
Choose a base branch
from
Open

GRAD2-2639 #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .../main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchGradAlgorithmStudentEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
3 changes: 3 additions & 0 deletions ...n/java/ca/bc/gov/educ/api/batchgraduation/entity/StudentCredentialDistributionEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
1 change: 1 addition & 0 deletions ...src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions api/src/test/java/ca/bc/gov/educ/api/batchgraduation/service/DistributionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -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));

Expand Down
Loading