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

Bugfixes #251

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Bugfixes #251

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5cf7d4
fix: missing response for the ending state
trev-dev Oct 18, 2023
0149202
fix: incorrect timing on school payload update
trev-dev Oct 18, 2023
361ea8e
Revert "fix: missing response for the ending state"
trev-dev Oct 18, 2023
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
23 changes: 13 additions & 10 deletions api/src/main/java/ca/bc/gov/educ/api/edx/orchestrator/CreateSchoolOrchestrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import static ca.bc.gov.educ.api.edx.constants.TopicsEnum.INSTITUTE_API_TOPIC;
import static lombok.AccessLevel.PRIVATE;

import java.util.UUID;

import org.springframework.stereotype.Component;

import com.fasterxml.jackson.core.JsonProcessingException;
Expand Down Expand Up @@ -111,6 +113,13 @@ public void createSchool(Event event, SagaEntity saga, CreateSchoolSagaData saga

public void checkForInitialUser(Event event, SagaEntity saga, CreateSchoolSagaData sagaData)
throws JsonProcessingException {
School createdSchoolFromInstitute = JsonUtil.getJsonObjectFromString(School.class, event.getEventPayload());
CreateSchoolSagaData updatedSagaData = new CreateSchoolSagaData();
updatedSagaData.setSchool(createdSchoolFromInstitute);
updatedSagaData.setInitialEdxUser(sagaData.getInitialEdxUser());
saga.setPayload(JsonUtil.getJsonStringFromObject(updatedSagaData));
saga.setSchoolID(UUID.fromString(createdSchoolFromInstitute.getSchoolId()));

final SagaEventStatesEntity eventStates =
this.createEventState(saga, event.getEventType(), event.getEventOutcome(), event.getEventPayload());
saga.setSagaState(ONBOARD_INITIAL_USER.toString());
Expand All @@ -119,10 +128,10 @@ public void checkForInitialUser(Event event, SagaEntity saga, CreateSchoolSagaDa
final Event.EventBuilder nextEventBuilder = Event.builder()
.eventType(ONBOARD_INITIAL_USER)
.replyTo(this.getTopicToSubscribe())
.eventPayload(JsonUtil.getJsonStringFromObject(sagaData))
.eventPayload(JsonUtil.getJsonStringFromObject(updatedSagaData))
.sagaId(event.getSagaId());

if (sagaData.getInitialEdxUser().isPresent()) {
if (updatedSagaData.getInitialEdxUser().isPresent()) {
nextEventBuilder.eventOutcome(INITIAL_USER_FOUND);
} else {
nextEventBuilder.eventOutcome(NO_INITIAL_USER_FOUND);
Expand All @@ -135,24 +144,18 @@ public void checkForInitialUser(Event event, SagaEntity saga, CreateSchoolSagaDa

public void createPrimaryCode(Event event, SagaEntity saga, CreateSchoolSagaData sagaData)
throws JsonProcessingException {
School createdSchoolFromInstitute = JsonUtil.getJsonObjectFromString(School.class, event.getEventPayload());
CreateSchoolSagaData updatedSagaData = new CreateSchoolSagaData();
updatedSagaData.setSchool(createdSchoolFromInstitute);
updatedSagaData.setInitialEdxUser(sagaData.getInitialEdxUser());
saga.setPayload(JsonUtil.getJsonStringFromObject(updatedSagaData));

final SagaEventStatesEntity eventStates =
this.createEventState(saga, event.getEventType(), event.getEventOutcome(), event.getEventPayload());
saga.setSagaState(CREATE_SCHOOL_PRIMARY_CODE.toString());
this.getSagaService().updateAttachedSagaWithEvents(saga, eventStates);

this.orchestratorService.createPrimaryActivationCode(updatedSagaData);
this.orchestratorService.createPrimaryActivationCode(sagaData);

final Event nextEvent = Event.builder().sagaId(saga.getSagaId())
.eventType(CREATE_SCHOOL_PRIMARY_CODE)
.eventOutcome(SCHOOL_PRIMARY_CODE_CREATED)
.replyTo(getTopicToSubscribe())
.eventPayload(JsonUtil.getJsonStringFromObject(updatedSagaData))
.eventPayload(JsonUtil.getJsonStringFromObject(sagaData))
.build();
this.postMessageToTopic(this.getTopicToSubscribe(), nextEvent);
log.info("message sent to EDX_API_TOPIC for CREATE_SCHOOL_PRIMARY_CODE Event. :: {}", saga.getSagaId());
Expand Down
Loading