Skip to content

Commit

Permalink
Changes to move the student exists check to student orchestration ser…
Browse files Browse the repository at this point in the history
…vice.
  • Loading branch information
sumathi-thirumani committed Oct 21, 2024
1 parent bd4df8b commit 5a23c83
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ public AssessmentStudentEntity getStudentByID(UUID assessmentStudentID) {
);
}

public Optional<AssessmentStudentEntity> getStudentByAssessmentIDAndStudentID(UUID assessmentID, UUID studentID) {
return assessmentStudentRepository.findByAssessmentEntity_AssessmentIDAndStudentID(assessmentID, studentID);
}

@Transactional(propagation = Propagation.REQUIRES_NEW)
public AssessmentStudentEntity updateStudent(AssessmentStudentEntity assessmentStudentEntity) {
AssessmentStudentEntity currentAssessmentStudentEntity = assessmentStudentRepository.findById(assessmentStudentEntity.getAssessmentStudentID()).orElseThrow(() ->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
package ca.bc.gov.educ.eas.api.service.v1;

import ca.bc.gov.educ.eas.api.mappers.v1.AssessmentStudentMapper;
import ca.bc.gov.educ.eas.api.model.v1.AssessmentStudentEntity;
import ca.bc.gov.educ.eas.api.model.v1.EasSagaEntity;
import ca.bc.gov.educ.eas.api.struct.v1.AssessmentStudent;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.Optional;
import java.util.UUID;

@Service
@Slf4j
public class StudentRegistrationOrchestrationService {

private static final AssessmentStudentMapper mapper = AssessmentStudentMapper.mapper;
protected final SagaService sagaService;

//Inject Downstream Service
@Getter(AccessLevel.PRIVATE)
private final AssessmentStudentService assessmentStudentService;

Expand All @@ -25,7 +28,12 @@ public StudentRegistrationOrchestrationService(AssessmentStudentService assessme
}

public void createNewStudentRegistration(AssessmentStudent assessmentStudent) {
assessmentStudentService.createStudent(mapper.toModel(assessmentStudent));
Optional<AssessmentStudentEntity> studentEntity = assessmentStudentService.getStudentByAssessmentIDAndStudentID(UUID.fromString(assessmentStudent.getAssessmentID()), UUID.fromString(assessmentStudent.getStudentID()));
if (studentEntity.isEmpty()) {
assessmentStudentService.createStudent(mapper.toModel(assessmentStudent));
} else {
log.info("Student already exists in assessment {} ", assessmentStudent);
}
}

public void publishStudentRegistration(AssessmentStudent assessmentStudent, EasSagaEntity sagaEntity) {
Expand Down

0 comments on commit 5a23c83

Please sign in to comment.