diff --git a/Backend/mocked-services/src/main/java/com/r11/tools/controller/RequestHistoryController.java b/Backend/mocked-services/src/main/java/com/r11/tools/controller/RequestHistoryController.java index 0a0c114..bfd7ddb 100644 --- a/Backend/mocked-services/src/main/java/com/r11/tools/controller/RequestHistoryController.java +++ b/Backend/mocked-services/src/main/java/com/r11/tools/controller/RequestHistoryController.java @@ -1,7 +1,6 @@ package com.r11.tools.controller; import com.r11.tools.mappers.RequestHistoryMapper; -import com.r11.tools.model.HistoryRequestModel; import com.r11.tools.model.RequestHistory; import com.r11.tools.model.RequestHistoryDTO; import com.r11.tools.service.RequestHistoryService; @@ -9,9 +8,7 @@ import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; import java.util.List; -import java.util.UUID; import java.util.stream.Collectors; /** @@ -28,37 +25,14 @@ public class RequestHistoryController { private final RequestHistoryMapper mapper; /** - * Returns the list of Events in given time bracket. - * The list of objects is received via {@link RequestHistoryDTO}, which contains time brackets, - * as well as the key - uuid. - * @param historyRequestModel EventRequestDto object that contains data needed to query the database - * @return list of {@link RequestHistory} - */ - @PostMapping - public ResponseEntity> filterHistory(@RequestBody HistoryRequestModel historyRequestModel){ - return ResponseEntity.ok( - service.getHistoryRecordsBetweenDatesAndByUUID(historyRequestModel) - .stream() - .map(mapper::requestHistoryToRequestHistoryDTO) - .collect(Collectors.toList()) - ); - } - - /** - * Returns the list of Events of last 24h from given date. + * Returns the list of Events. * @param uuid unique id of message list * @return list of {@link RequestHistory} */ @GetMapping(path = "/{uuid}") - public ResponseEntity> getLastDay(@PathVariable UUID uuid){ - LocalDateTime requestTime = LocalDateTime.now(); - LocalDateTime dayBeforeRequest = requestTime.minusDays(1L); - List requestHistory = service.getHistoryRecordsBetweenDatesAndByUUID( - HistoryRequestModel.builder() - .localDateTimeFrom(dayBeforeRequest) - .localDateTimeTo(requestTime) - .clientUUID(uuid) - .build() + public ResponseEntity> getLastDay(@PathVariable String uuid){ + List requestHistory = service.getHistoryRecordsByUUID( + uuid ).stream() .map(mapper::requestHistoryToRequestHistoryDTO) .collect(Collectors.toList()); diff --git a/Backend/mocked-services/src/main/java/com/r11/tools/model/HistoryRequestModel.java b/Backend/mocked-services/src/main/java/com/r11/tools/model/HistoryRequestModel.java deleted file mode 100644 index 06b251f..0000000 --- a/Backend/mocked-services/src/main/java/com/r11/tools/model/HistoryRequestModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.r11.tools.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; -import java.util.UUID; - -/** - * Represents all data needed to get HistoryRecord from database - * @author Mikołaj Widła - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HistoryRequestModel { - - private UUID clientUUID; - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private LocalDateTime localDateTimeFrom; - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private LocalDateTime localDateTimeTo; - -} diff --git a/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryService.java b/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryService.java index f3d492d..ccd2206 100644 --- a/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryService.java +++ b/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryService.java @@ -1,12 +1,12 @@ package com.r11.tools.service; import com.r11.tools.controller.RequestHistoryController; -import com.r11.tools.model.HistoryRequestModel; import com.r11.tools.model.RequestHistory; import com.r11.tools.model.RequestHistoryDTO; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + /** * Spring service interface for {@link RequestHistoryController} * @author Rafał Żukowicz @@ -15,9 +15,9 @@ import org.springframework.stereotype.Service; public interface RequestHistoryService { /** * Searches for {@link RequestHistory} objects between date brackets - * @param historyRequestModel object containing required data for request + * @param uuid user uuid * @return list of {@link RequestHistory} */ - List getHistoryRecordsBetweenDatesAndByUUID(HistoryRequestModel historyRequestModel); + List getHistoryRecordsByUUID(String uuid); void saveRequest(RequestHistoryDTO requestDTO); } diff --git a/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryServiceImpl.java b/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryServiceImpl.java index f327679..c0da875 100644 --- a/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryServiceImpl.java +++ b/Backend/mocked-services/src/main/java/com/r11/tools/service/RequestHistoryServiceImpl.java @@ -2,7 +2,6 @@ package com.r11.tools.service; import com.r11.tools.controller.RequestHistoryController; import com.r11.tools.mappers.RequestHistoryMapper; -import com.r11.tools.model.HistoryRequestModel; import com.r11.tools.model.RequestHistory; import com.r11.tools.model.RequestHistoryDTO; import com.r11.tools.repository.RequestHistoryRepository; @@ -11,7 +10,6 @@ import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; /** * Spring Service for {@link RequestHistoryController}. Contains logic required for quering @@ -26,28 +24,11 @@ public class RequestHistoryServiceImpl implements RequestHistoryService { private final RequestHistoryRepository repository; private final RequestHistoryMapper requestMapper; - /** - * in order to create query via{@link com.r11.tools.repository.RequestHistoryRepository} - * @param historyRequestModel object containing required data for request - * @return list of {@link RequestHistory} - */ @Override - public List getHistoryRecordsBetweenDatesAndByUUID(HistoryRequestModel historyRequestModel) { - List history = repository.findAllByClientUUID( - historyRequestModel.getClientUUID().toString() - ); + public List getHistoryRecordsByUUID(String uuid) { + List history = repository.findAllByClientUUID(uuid); Collections.sort(history); - - return history.stream() - .filter( historyRecord -> historyRecord - .getDateTimeStamp() - .isAfter(historyRequestModel.getLocalDateTimeFrom()) - ).filter( - historyRecord-> historyRecord - .getDateTimeStamp() - .isBefore(historyRequestModel.getLocalDateTimeTo()) - ) - .collect(Collectors.toList()); + return history; } @Override diff --git a/Frontend/assets/scripts/tools/mock/historyloader.js b/Frontend/assets/scripts/tools/mock/historyloader.js index 2ddfabe..179e665 100644 --- a/Frontend/assets/scripts/tools/mock/historyloader.js +++ b/Frontend/assets/scripts/tools/mock/historyloader.js @@ -1,38 +1,7 @@ var historyJson = {}; const maxIterations = 200; -function filterHistory(){ - var dateFrom = new Date($('#historyFrom').val() + 'T' + $('#historyTimeFrom').val()); - - var dateTo = new Date($('#historyTo').val() + 'T' + $('#historyTimeTo').val()); - - loadHistory(dateFrom, dateTo); -} - -const startSearch = function(){ - filterHistory(); -} -$('#btn-searchHistory').click(startSearch); - -function loadHistory(dateFrom, dateTo){ - - var eventRequest = { - clientUUID : json.clientUUID, - localDateTimeFrom : dateFrom, - localDateTimeTo : dateTo, - }; - $.ajax({ - url: host + '/api/event', - type: 'POST', - data: JSON.stringify(eventRequest, null, 2), - contentType: "application/json" - }).done(function(data){ - historyJson = data; - displayHistory(); - }); -} - -function getLast24hHistoryData(){ +function getHistoryData(){ $.getJSON(host + '/api/event/' + clientUUID, function(data){ historyJson = data; displayHistory(); diff --git a/Frontend/assets/scripts/tools/mock/uianimation.js b/Frontend/assets/scripts/tools/mock/uianimation.js index ef212d6..28644ef 100644 --- a/Frontend/assets/scripts/tools/mock/uianimation.js +++ b/Frontend/assets/scripts/tools/mock/uianimation.js @@ -48,7 +48,7 @@ function showHistory(){ function initializeHistory(){ historyFilter.removeClass('active'); - getLast24hHistoryData(); + getHistoryData(); } function showHeaders(){ @@ -176,7 +176,7 @@ function focusOutTip(element){ } function refreshHistoryRecords(){ - getLast24hHistoryData(); + getHistoryData(); } function hidTip(element){ diff --git a/Frontend/tools/mock.html b/Frontend/tools/mock.html index 8805a5d..1ef5af1 100644 --- a/Frontend/tools/mock.html +++ b/Frontend/tools/mock.html @@ -127,25 +127,7 @@
- - -
-
-
- - - -
-
- - - -
-
- -
+