T272 added method for last day in history. History is being sorted
This commit is contained in:
@@ -8,6 +8,9 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* It's the REST api for {@link com.release11.klaus.model.Event}
|
* It's the REST api for {@link com.release11.klaus.model.Event}
|
||||||
* @author Gabriel Modzelewski
|
* @author Gabriel Modzelewski
|
||||||
@@ -27,8 +30,24 @@ public class EventController {
|
|||||||
* @return list of Event's
|
* @return list of Event's
|
||||||
*/
|
*/
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public ResponseEntity getHistory(@RequestBody EventRequestDto event){
|
public ResponseEntity filterHistory(@RequestBody EventRequestDto event){
|
||||||
return new ResponseEntity(service.getEventsByDateTimeAndBusinessKeys(event), HttpStatus.OK);
|
return new ResponseEntity(service.getEventsByDateTimeAndBusinessKeys(event), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping(path = "/{uuid}/{messageId}")
|
||||||
|
public ResponseEntity getLastDay(@PathVariable UUID uuid,
|
||||||
|
@PathVariable Integer messageId){
|
||||||
|
LocalDateTime requestTime = LocalDateTime.now();
|
||||||
|
LocalDateTime dayBeforeRequest = requestTime.minusDays(1L);
|
||||||
|
EventRequestDto eventRequestDto = EventRequestDto.builder()
|
||||||
|
.clientUUID(uuid)
|
||||||
|
.mockedResponseId(messageId)
|
||||||
|
.localDateTimeFrom(dayBeforeRequest)
|
||||||
|
.localDateTimeTo(requestTime)
|
||||||
|
.build();
|
||||||
|
return new ResponseEntity(service.getEventsByDateTimeAndBusinessKeys(eventRequestDto), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
|
|||||||
@ToString
|
@ToString
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class Event {
|
public class Event implements Comparable<Event>{
|
||||||
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-ddTHH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-ddTHH:mm:ss")
|
||||||
private LocalDateTime dateTimeStamp;
|
private LocalDateTime dateTimeStamp;
|
||||||
@@ -29,4 +29,9 @@ public class Event {
|
|||||||
private String level;
|
private String level;
|
||||||
@Nullable
|
@Nullable
|
||||||
private String message;
|
private String message;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int compareTo(Event o) {
|
||||||
|
return this.getDateTimeStamp().compareTo(o.getDateTimeStamp()) * -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -37,7 +38,9 @@ public class EtrackServiceImpl implements EtrackService {
|
|||||||
if (eventsDto.getMockedResponseId() != null){
|
if (eventsDto.getMockedResponseId() != null){
|
||||||
businessKeys.put(BusinessKey.MESSAGE_ID, String.valueOf(eventsDto.getMockedResponseId()));
|
businessKeys.put(BusinessKey.MESSAGE_ID, String.valueOf(eventsDto.getMockedResponseId()));
|
||||||
}
|
}
|
||||||
return eventRepository.findEvents(eventsDto.getLocalDateTimeFrom(), eventsDto.getLocalDateTimeTo(),
|
List<Event> events = eventRepository.findEvents(eventsDto.getLocalDateTimeFrom(), eventsDto.getLocalDateTimeTo(),
|
||||||
businessKeys);
|
businessKeys);
|
||||||
|
Collections.sort(events);
|
||||||
|
return events;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,9 +63,7 @@
|
|||||||
<textarea id="bodyEditor" class="data-field bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
|
<textarea id="bodyEditor" class="data-field bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<!-- show/hide -->
|
<!-- show/hide -->
|
||||||
<div id="optional" class="clickable-text highlight">
|
<button id="optional" class="clickable-text highlight switch"><span class="toggleIndicator"></span> show/hide advanced settings</button>
|
||||||
<h3>> show/hide advanced settings</h3>
|
|
||||||
</div>
|
|
||||||
<!-- advanced -->
|
<!-- advanced -->
|
||||||
<div id="advanced" class="max-width with-padding hiddable">
|
<div id="advanced" class="max-width with-padding hiddable">
|
||||||
<!-- tab menu -->
|
<!-- tab menu -->
|
||||||
@@ -102,7 +100,7 @@
|
|||||||
<!-- history -->
|
<!-- history -->
|
||||||
<div id="history" class="medium-vertical-margin tabcontent">
|
<div id="history" class="medium-vertical-margin tabcontent">
|
||||||
<div class="block-display max-width">
|
<div class="block-display max-width">
|
||||||
<button id="btn-history-filter" class="clickable-text highlight"><span>></span> filter</button>
|
<button id="btn-history-filter" class="clickable-text highlight switch"><span class="toggleIndicator"></span> filter</button>
|
||||||
<div id ="history-filter" class="display-space-between max-width small-vertical-margin hiddable">
|
<div id ="history-filter" class="display-space-between max-width small-vertical-margin hiddable">
|
||||||
<div class="three-fourth-width display-space-evenly">
|
<div class="three-fourth-width display-space-evenly">
|
||||||
<div class="block-display half-width with-padding">
|
<div class="block-display half-width with-padding">
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -63,9 +63,7 @@
|
|||||||
<textarea id="bodyEditor" class="data-field bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
|
<textarea id="bodyEditor" class="data-field bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<!-- show/hide -->
|
<!-- show/hide -->
|
||||||
<div id="optional" class="clickable-text highlight">
|
<button id="optional" class="clickable-text highlight switch"><span class="toggleIndicator"></span> show/hide advanced settings</button>
|
||||||
<h3>> show/hide advanced settings</h3>
|
|
||||||
</div>
|
|
||||||
<!-- advanced -->
|
<!-- advanced -->
|
||||||
<div id="advanced" class="max-width with-padding hiddable">
|
<div id="advanced" class="max-width with-padding hiddable">
|
||||||
<!-- tab menu -->
|
<!-- tab menu -->
|
||||||
@@ -102,7 +100,7 @@
|
|||||||
<!-- history -->
|
<!-- history -->
|
||||||
<div id="history" class="medium-vertical-margin tabcontent">
|
<div id="history" class="medium-vertical-margin tabcontent">
|
||||||
<div class="block-display max-width">
|
<div class="block-display max-width">
|
||||||
<button id="btn-history-filter" class="clickable-text highlight"><span>></span> filter</button>
|
<button id="btn-history-filter" class="clickable-text highlight switch"><span class="toggleIndicator"></span> filter</button>
|
||||||
<div id ="history-filter" class="display-space-between max-width small-vertical-margin hiddable">
|
<div id ="history-filter" class="display-space-between max-width small-vertical-margin hiddable">
|
||||||
<div class="three-fourth-width display-space-evenly">
|
<div class="three-fourth-width display-space-evenly">
|
||||||
<div class="block-display half-width with-padding">
|
<div class="block-display half-width with-padding">
|
||||||
|
|||||||
Reference in New Issue
Block a user