diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/messaging/jetstream/FetchGradStudentRecordSubscriber.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/messaging/jetstream/FetchGradStudentRecordSubscriber.java index 7dd13052..8c78935f 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/messaging/jetstream/FetchGradStudentRecordSubscriber.java +++ b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/messaging/jetstream/FetchGradStudentRecordSubscriber.java @@ -69,7 +69,6 @@ private String getResponse(GradStudentRecord studentRecord) throws JsonProcessin .studentID(String.valueOf(studentRecord.getStudentID())) .program(studentRecord.getProgram()) .programCompletionDate(studentRecord.getProgramCompletionDate() != null ? EducGradStudentApiUtils.formatDate(studentRecord.getProgramCompletionDate()) : null) - .schoolOfRecord(studentRecord.getSchoolOfRecord()) .schoolOfRecordId(String.valueOf(studentRecord.getSchoolOfRecordId())) .studentStatusCode(studentRecord.getStudentStatus()) .graduated(gradStudentService.parseGraduationStatus(studentRecord.getStudentProjectedGradData()).toString()) diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dc/GradStudentRecordPayload.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dc/GradStudentRecordPayload.java index 76bcfe8e..98e58066 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dc/GradStudentRecordPayload.java +++ b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dc/GradStudentRecordPayload.java @@ -11,7 +11,6 @@ public class GradStudentRecordPayload { private String exception; private String program; private String programCompletionDate; - private String schoolOfRecord; private String schoolOfRecordId; private String studentStatusCode; private String graduated; diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/messaging/GradStudentRecord.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/messaging/GradStudentRecord.java index de5864a6..807605c4 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/messaging/GradStudentRecord.java +++ b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/messaging/GradStudentRecord.java @@ -15,7 +15,6 @@ public class GradStudentRecord { private UUID studentID; private String program; private Date programCompletionDate; - private String schoolOfRecord; private UUID schoolOfRecordId; private String studentStatus; private String studentProjectedGradData; diff --git a/api/src/test/java/ca/bc/gov/educ/api/gradstudent/service/GradStudentServiceTest.java b/api/src/test/java/ca/bc/gov/educ/api/gradstudent/service/GradStudentServiceTest.java index f1247c49..27c897b0 100644 --- a/api/src/test/java/ca/bc/gov/educ/api/gradstudent/service/GradStudentServiceTest.java +++ b/api/src/test/java/ca/bc/gov/educ/api/gradstudent/service/GradStudentServiceTest.java @@ -986,7 +986,7 @@ public void testGetGraduationStudentRecord_GivenValidProgramCompletionDate_Expec UUID studentID = UUID.randomUUID(); GraduationStudentRecordEntity graduationStudentRecordEntity = new GraduationStudentRecordEntity(); graduationStudentRecordEntity.setProgramCompletionDate(new java.util.Date()); - when(graduationStatusRepository.findByStudentID(studentID, GradStudentRecord.class)).thenReturn(new GradStudentRecord(studentID, "2018-EN", new java.util.Date(), "schoolOfRecord", UUID.randomUUID(), "studentStatusCode", "{\"nonGradReasons\":null,\"graduated\":true}")); + when(graduationStatusRepository.findByStudentID(studentID, GradStudentRecord.class)).thenReturn(new GradStudentRecord(studentID, "2018-EN", new java.util.Date(), UUID.randomUUID(), "studentStatusCode", "{\"nonGradReasons\":null,\"graduated\":true}")); GradStudentRecord result = gradStudentService.getGraduationStudentRecord(studentID); assertNotNull(result); }