-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor and add event service that merges query results
- Loading branch information
1 parent
3f582a1
commit 47009a1
Showing
6 changed files
with
276 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| package no.fintlabs; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import no.fintlabs.model.*; | ||
| import no.fintlabs.repositories.EventRepository; | ||
| import org.springframework.data.domain.Page; | ||
| import org.springframework.data.domain.PageImpl; | ||
| import org.springframework.data.domain.Pageable; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import java.time.OffsetDateTime; | ||
| import java.util.*; | ||
| import java.util.function.Function; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @Service | ||
| @AllArgsConstructor | ||
| public class EventService { | ||
|
|
||
| private final EventRepository eventRepository; | ||
|
|
||
| public void save(Event event) { | ||
| eventRepository.save(event); | ||
| } | ||
|
|
||
| public Page<EventDto> findAll(Pageable pageable) { | ||
| return convertPageOfEventIntoPageOfEventDto(eventRepository.findAll(pageable)); | ||
| } | ||
|
|
||
| public Page<EventDto> getMergedLatestEvents(Pageable pageable) { | ||
| List<Event> latestEvents = eventRepository | ||
| .findLatestEventPerSourceApplicationInstanceId(pageable).getContent(); | ||
|
|
||
| List<Event> latestNonDeletedEvents = eventRepository | ||
| .findLatestEventNotDeletedPerSourceApplicationInstanceId(pageable).getContent(); | ||
|
|
||
| return getEventDtos(pageable, latestNonDeletedEvents, latestEvents); | ||
| } | ||
|
|
||
| public Page<EventDto> getMergedLatestEventsWhereSourceApplicationIdIn( | ||
| List<Long> sourceApplicationIds, | ||
| Pageable pageable | ||
| ) { | ||
| List<Event> latestEvents = eventRepository | ||
| .findLatestEventPerSourceApplicationInstanceIdAndSourceApplicationIdIn( | ||
| sourceApplicationIds, | ||
| pageable | ||
| ).getContent(); | ||
|
|
||
| List<Event> latestNonDeletedEvents = eventRepository | ||
| .findLatestEventNotDeletedPerSourceApplicationInstanceIdAndSourceApplicationIdIn( | ||
| sourceApplicationIds, | ||
| pageable | ||
| ).getContent(); | ||
|
|
||
| return getEventDtos(pageable, latestNonDeletedEvents, latestEvents); | ||
| } | ||
|
|
||
| private PageImpl<EventDto> getEventDtos(Pageable pageable, List<Event> latestNonDeletedEvents, List<Event> latestEvents) { | ||
| Map<String, Event> nonDeletedEventMap = latestNonDeletedEvents.stream() | ||
| .collect( | ||
| Collectors.toMap( | ||
| event -> event.getInstanceFlowHeaders().getSourceApplicationInstanceId(), | ||
| event -> event | ||
| ) | ||
| ); | ||
|
|
||
| List<EventDto> mergedEvents = new ArrayList<>(); | ||
|
|
||
| for (Event latestEvent : latestEvents) { | ||
| if ("instance-deleted".equals(latestEvent.getName())) { | ||
| Event nonDeletedEvent = nonDeletedEventMap | ||
| .get(latestEvent.getInstanceFlowHeaders().getSourceApplicationInstanceId()); | ||
| if (nonDeletedEvent != null) { | ||
| EventDto updatedEventDto = EventToEventDto(nonDeletedEvent); | ||
| updatedEventDto.setStatus("deleted"); | ||
| mergedEvents.add(updatedEventDto); | ||
| } | ||
| } else { | ||
| EventDto eventDto = EventToEventDto(latestEvent); | ||
| mergedEvents.add(eventDto); | ||
| } | ||
| } | ||
|
|
||
| int start = (int) pageable.getOffset(); | ||
| int end = Math.min((start + pageable.getPageSize()), mergedEvents.size()); | ||
|
|
||
| List<EventDto> paginatedList = mergedEvents.subList(start, end); | ||
|
|
||
| return new PageImpl<>(paginatedList, pageable, mergedEvents.size()); | ||
| } | ||
|
|
||
| public ResponseEntity<?> storeManualEvent(ManualEventDto manualEventDto, Function<Event, Event> existingToNewEvent) { | ||
| Optional<Event> optionalEvent = eventRepository. | ||
| findFirstByInstanceFlowHeadersSourceApplicationIdAndInstanceFlowHeadersSourceApplicationInstanceIdAndInstanceFlowHeadersSourceApplicationIntegrationIdOrderByTimestampDesc( | ||
| manualEventDto.getSourceApplicationId(), | ||
| manualEventDto.getSourceApplicationInstanceId(), | ||
| manualEventDto.getSourceApplicationIntegrationId() | ||
| ); | ||
|
|
||
| if (optionalEvent.isEmpty()) { | ||
| return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Event not found."); | ||
| } | ||
|
|
||
| Event event = optionalEvent.get(); | ||
|
|
||
| if (!event.getType().equals(EventType.ERROR)) { | ||
| return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Event is not of type ERROR"); | ||
| } | ||
|
|
||
| Event newEvent = existingToNewEvent.apply(event); | ||
|
|
||
| this.save(newEvent); | ||
|
|
||
| return ResponseEntity.ok(newEvent); | ||
| } | ||
|
|
||
| public Event createManualEvent(Event event, String name, String archiveId) { | ||
|
|
||
| InstanceFlowHeadersEmbeddable.InstanceFlowHeadersEmbeddableBuilder headersEmbeddableBuilder = | ||
| event.getInstanceFlowHeaders() | ||
| .toBuilder() | ||
| .correlationId(UUID.randomUUID()); | ||
|
|
||
| if (archiveId != null && !archiveId.isEmpty()) { | ||
| headersEmbeddableBuilder.archiveInstanceId(archiveId); | ||
| } | ||
|
|
||
| InstanceFlowHeadersEmbeddable newInstanceFlowHeaders = headersEmbeddableBuilder.build(); | ||
|
|
||
| return Event.builder() | ||
| .instanceFlowHeaders(newInstanceFlowHeaders) | ||
| .name(name) | ||
| .timestamp(OffsetDateTime.now()) | ||
| .type(EventType.INFO) | ||
| .applicationId(event.getApplicationId()) | ||
| .build(); | ||
| } | ||
|
|
||
| public Page<EventDto> findAllByInstanceFlowHeadersSourceApplicationIdAndInstanceFlowHeadersSourceApplicationInstanceId( | ||
| Long sourceApplicationId, | ||
| String sourceApplicationInstanceId, | ||
| Pageable pageable | ||
| ) { | ||
| return convertPageOfEventIntoPageOfEventDto( | ||
| eventRepository.findAllByInstanceFlowHeadersSourceApplicationIdAndInstanceFlowHeadersSourceApplicationInstanceId( | ||
| sourceApplicationId, sourceApplicationInstanceId, pageable | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| public Page<EventDto> findAllByInstanceFlowHeadersSourceApplicationIdIn( | ||
| List<Long> sourceApplicationIds, | ||
| Pageable pageable | ||
| ) { | ||
| return convertPageOfEventIntoPageOfEventDto( | ||
| eventRepository.findAllByInstanceFlowHeadersSourceApplicationIdIn( | ||
| sourceApplicationIds, | ||
| pageable | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| private Page<EventDto> convertPageOfEventIntoPageOfEventDto(Page<Event> events) { | ||
| return events.map(this::EventToEventDto); | ||
| } | ||
|
|
||
| private EventDto EventToEventDto(Event event) { | ||
| return EventDto.builder() | ||
| .instanceFlowHeaders(event.getInstanceFlowHeaders()) | ||
| .name(event.getName()) | ||
| .timestamp(event.getTimestamp()) | ||
| .type(event.getType()) | ||
| .applicationId(event.getApplicationId()) | ||
| .errors(event.getErrors()) | ||
| .build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package no.fintlabs.model; | ||
|
|
||
| import lombok.*; | ||
|
|
||
| import java.time.OffsetDateTime; | ||
| import java.util.Collection; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @Builder(toBuilder = true) | ||
| @AllArgsConstructor | ||
| public class EventDto { | ||
| private InstanceFlowHeadersEmbeddable instanceFlowHeaders; | ||
| private String name; | ||
| private OffsetDateTime timestamp; | ||
| private EventType type; | ||
| private String applicationId; | ||
| private Collection<Error> errors; | ||
| private String status; | ||
|
|
||
| public EventDto() { | ||
| } | ||
| } |
Oops, something went wrong.