TRAX course replication

Author: arcshiftsolutions

api/src/main/java/ca/bc/gov/educ/api/pen/replication/repository/TraxStudentCourseRepository.java

@@ -4,7 +4,10 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface TraxStudentCourseRepository extends JpaRepository<TraxStudentCourseEntity, String> {
     void deleteAllByStudXcrseId_StudNo(String studNo);
+    List<TraxStudentCourseEntity> findAllByStudXcrseId_StudNo(String studNo);
 }

api/src/main/java/ca/bc/gov/educ/api/pen/replication/service/StudentCourseUpdateService.java

@@ -19,9 +19,6 @@
 
 import static ca.bc.gov.educ.api.pen.replication.constants.EventType.UPDATE_STUDENT_COURSES;
 
-/**
- * The type Student update service.
- */
 @Service
 @Slf4j
 public class StudentCourseUpdateService extends BaseService<StudentCourseUpdate> {
@@ -50,7 +47,8 @@ public void processEvent(final StudentCourseUpdate studentCourseUpdate, final Ev
     var studentPEN = restUtils.getStudentPen(studentCourseUpdate.getStudentID());
     val existingTraxStudentRecord = this.traxStudentService.findTraxStudentByPen(StringUtils.rightPad(studentPEN, 10));
     if (existingTraxStudentRecord.isPresent()) {
-      this.traxStudentCourseService.deletePriorAndSaveTraxStudentCourses(studentPEN, getStudentCourseEntityList(studentPEN, studentCourseUpdate.getStudentCourses()));
+      var existingCourses = this.traxStudentCourseService.findTraxStudentCoursesByPen(studentPEN);
+      this.traxStudentCourseService.deletePriorAndSaveTraxStudentCourses(studentPEN, getStudentCourseEntityList(studentPEN, studentCourseUpdate.getStudentCourses(), existingCourses));
       log.info("Processing choreography update event with ID {} :: payload is: {}", event.getEventId(), studentCourseUpdate);
     }else{
       log.info("Student course event not processed {} :: payload is: {} :: student does not yet exist in TRAX STUDENT_MASTER", event.getEventId(), studentCourseUpdate);
@@ -59,7 +57,7 @@ public void processEvent(final StudentCourseUpdate studentCourseUpdate, final Ev
     this.updateEvent(event);
   }
 
-  private List<TraxStudentCourseEntity> getStudentCourseEntityList(String studentPEN, List<StudentCourse> studentCourse) {
+  private List<TraxStudentCourseEntity> getStudentCourseEntityList(String studentPEN, List<StudentCourse> studentCourse, List<TraxStudentCourseEntity> existingTraxStudentCourses) {
     var entityList = new ArrayList<TraxStudentCourseEntity>();
     studentCourse.forEach(student -> {
       TraxStudentCourseEntity traxStudentCourseEntity = new TraxStudentCourseEntity();
@@ -69,13 +67,24 @@ private List<TraxStudentCourseEntity> getStudentCourseEntityList(String studentP
       traxStudentCourseEntity.setFinalLetterGrade(student.getFinalLetterGrade());
       traxStudentCourseEntity.setFinalPercentage(student.getFinalPercent() != null ? student.getFinalPercent().toString() : null);
       traxStudentCourseEntity.setNumberOfCredits(student.getCredits() != null ? student.getCredits().toString() : null);
-//      traxStudentCourseEntity.setStudyType();
-//      traxStudentCourseEntity.setUsedForGrad();
+      setStudyTypeAndUsedForGradFields(traxStudentCourseEntity, existingTraxStudentCourses);
       entityList.add(traxStudentCourseEntity);
     });
     return entityList;
   }
 
+  private void setStudyTypeAndUsedForGradFields(TraxStudentCourseEntity traxStudentCourseEntity, List<TraxStudentCourseEntity> existingTraxStudentCourses){
+    for(TraxStudentCourseEntity course: existingTraxStudentCourses){
+      if(course.getStudXcrseId().getCourseCode().equals(traxStudentCourseEntity.getStudXcrseId().getCourseCode()) &&
+          course.getStudXcrseId().getCourseLevel().equals(traxStudentCourseEntity.getStudXcrseId().getCourseLevel()) &&
+          course.getStudXcrseId().getCourseSession().equals(traxStudentCourseEntity.getStudXcrseId().getCourseSession())){
+        traxStudentCourseEntity.setStudyType(course.getStudyType());
+        traxStudentCourseEntity.setUsedForGrad(course.getUsedForGrad());
+        break;
+      }
+    }
+  }
+  
   private void setCourseCodeAndLevel(TraxStudentCourseEntity traxStudentCourseEntity, String courseID){
     var optionalCourse = restUtils.getCoreg39CourseByID(courseID);
     if (optionalCourse.isPresent()) {

api/src/main/java/ca/bc/gov/educ/api/pen/replication/service/TraxStudentCourseService.java

@@ -1,13 +1,15 @@
 package ca.bc.gov.educ.api.pen.replication.service;
 
 import ca.bc.gov.educ.api.pen.replication.model.TraxStudentCourseEntity;
+import ca.bc.gov.educ.api.pen.replication.model.TraxStudentEntity;
 import ca.bc.gov.educ.api.pen.replication.repository.TraxStudentCourseRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -18,6 +20,11 @@ public TraxStudentCourseService(TraxStudentCourseRepository traxStudentCourseRep
     this.traxStudentCourseRepository = traxStudentCourseRepository;
   }
 
+  @Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+  public List<TraxStudentCourseEntity> findTraxStudentCoursesByPen(final String pen) {
+    return this.traxStudentCourseRepository.findAllByStudXcrseId_StudNo(pen);
+  }
+
   // it is saved in a new transaction to make sure commit happens in DB.
   @Transactional(propagation = Propagation.REQUIRES_NEW, timeout = 60)
   public void deletePriorAndSaveTraxStudentCourses(final String pen, final List<TraxStudentCourseEntity> studentCourseEntityList) {