From e362cf36a34ed0d270eaa6446cc485b201a79564 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 4 Mar 2021 16:16:14 +0100 Subject: [PATCH] T139 removed old EvenetController code --- .../klaus/controller/EventController.java | 59 +++++------------- src/main/resources/data-access.properties | 2 +- .../klaus/controller/EventController.class | Bin 1046 -> 2559 bytes 3 files changed, 16 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/release11/klaus/controller/EventController.java b/src/main/java/com/release11/klaus/controller/EventController.java index b18eef0..f48586c 100644 --- a/src/main/java/com/release11/klaus/controller/EventController.java +++ b/src/main/java/com/release11/klaus/controller/EventController.java @@ -3,8 +3,11 @@ package com.release11.klaus.controller; import com.release11.klaus.model.Event; import com.release11.klaus.model.EventRequestDto; import com.release11.klaus.service.EtrackService; +import com.release11.klaus.service.KlausService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; @@ -14,6 +17,7 @@ import javax.validation.Valid; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.UUID; @@ -23,53 +27,20 @@ import java.util.UUID; * Class responds to request asking about history of messages. */ @Slf4j -@Controller +@RestController @RequestMapping(path = "/event") @AllArgsConstructor public class EventController { + private final EtrackService service; - private final EtrackService etrackService; - private final List eventList = new LinkedList<>(); - - -// @GetMapping("/etrack/{uuid}") -// public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model, -// BindingResult bindingResult){ -// model.addAttribute("clientUUID", uuid); -// model.addAttribute("eventRequestDto", eventRequestDto); -// return "etrack"; -// } -// -// @PostMapping("/etrack/{uuid}") -// public String getLogs(@Valid EventRequestDto eventRequestDto, final Model model, BindingResult bindingResult, -// @PathVariable UUID uuid){ -// model.addAttribute("clientUUID", uuid); -// populateModelWithLists(model, eventRequestDto, true); -// return "etrack"; -// } -// -// private void populateModelWithLists(Model model, EventRequestDto eventRequestDto, boolean updateList){ -// if (updateList){ -// eventList.clear(); -// eventList.addAll(etrackService.getEventsByDateTimeAndBusinessKeys(eventRequestDto)); -// } -// model.addAttribute("eventList", eventList); -// } -// -// @ModelAttribute("eventRequestDto") -// public EventRequestDto eventRequestDto() { -// return EventRequestDto.builder() -// .mockedResponseId(1) -// .localDateTimeFrom(LocalDateTime.of(LocalDate.now(), LocalTime.MIN)) -// .localDateTimeTo(LocalDateTime.of(LocalDate.now().plusDays(1), LocalTime.MIDNIGHT)) -// .build(); -// } -// -// -// @ModelAttribute("eventList") -// public List eventList() { -// return eventList; -// } - + @GetMapping + public ResponseEntity getHistory(@RequestBody(required = false) EventRequestDto event){ + event = EventRequestDto.builder() + .localDateTimeFrom(LocalDateTime.of(2021, 3, 4, 10, 1)) + .localDateTimeTo(LocalDateTime.of(2021, 3, 4, 15, 40)) + .clientUUID(UUID.fromString("3482382d-76df-45bd-825e-1c742c989796")) + .build(); + return new ResponseEntity>(service.getEventsByDateTimeAndBusinessKeys(event), HttpStatus.OK); + } } diff --git a/src/main/resources/data-access.properties b/src/main/resources/data-access.properties index 27196b6..122952c 100644 --- a/src/main/resources/data-access.properties +++ b/src/main/resources/data-access.properties @@ -1,2 +1,2 @@ -redis.host = redis +redis.host = localhost redis.port = 6379 \ No newline at end of file diff --git a/target/classes/com/release11/klaus/controller/EventController.class b/target/classes/com/release11/klaus/controller/EventController.class index e9affac026624591cd58553b57ec180d7bbb31be..9e9a0d3efcd2074dcd6d898c1d720516357e68c8 100644 GIT binary patch literal 2559 zcmb_ei&EQ06g_JU!b0WYrlg@w8wd$D#3+CP6B825BT!68dALo|w3X$x5y+A&t;z5S z{hPi*Xfo3e=zsJ#I=zxy8&Z1)rtyp{-PPW6@7_J(ga*)DKXT{+^G*ycY}xhs~1%^>BghFRba!*VR1y|Cl(J3yHL zB`u>95ec$_E+`CF540mq6-Jq>SzFi4Wliv1vKT^kk>N&c-TTF}Ev6A%H+m%WD(FL$ z;o<+ykD<>zo5!kSml3kuPnw;i|34Jy>sn4b6X6I&PT*H8bPZWHL>kQp~#j3(E)xEv-Wd^xOOW6^QVU-B6 zwjfipN@_5et`)iN;@9?b1vfBA-nwZJF#@RFns;OBd#b`s1;e<-(C%}NA#oYTr6r6o zjMz>|bt~R7i;h<2FKy>g-4~*wZgaO{TP|O*gdvV2h+|a3n1VY(muE0S;H0S2&OS3VOBv3a|}0ImU4~ixg#`DrI4Ym z4Tf9U3(O@#-9}o$Jnl1e%o~;=78vfGrQ%lpfa@ZCA+&f-#sfT*u;@W%7r%Pi^`wHu z@r8m7WGR$sldz)yokZdx;590+A0>CWEoxcU^K?!#gqNs+QwPZsA0AiBdG73Ld6Pyc zC+e&@%`rT?HW(KB2JPP6rhI8le2UY~y(6L(@0(MNHfNKIeY@~P^F%4QL$R-IS4oOx zo-b~VMj4V#De#i#)x2R9RINT&eZF95Wjs1@C5Pm`OHSYaHAR#=V{{eyowU#c7&~pq!lu8Vv6n+d}(wqJuAhxkX z7KO$x_9&?wJ-0J5fUoH4prNnn{**5IGGTZ|*YjuihHmqCK_FiK3v~DLmq%Y?VRY;j zVn34=B;p}}&dWwnxgJ#Zt5FYn2fg$m^er;v;=vC3u0SLjKgH6oSoctwzq|nTI@R$z fKhpPpwo!_yk)5Ym`g1TB1#q%uvb*VB5s`lYF!bQ* delta 533 zcmZ8dT}vB56g{(>-N|M*ALgr#Cff8<6U`FRmy#gPa z1AXmpC`D3QD1GjKX@7!xCw(an%$$4g+;h&Ixh;H3j(^{L{|Vp~{1gnB90?B=Y=+!X za2EK-L3HT9d4DAKC4=1yqfl-#n5%0ejwC~I-gGL%W4|9p6LHWFW0?Yn>A;1@k@k>5 zmZ7EI*+sQwR@;s^6Oq(?pSl8thMo>aF=Qok9s^jt3qdqM{1c zAn9VsLlreOv1&DE7#>D}Je>-L&OOnd3V2Cf8m`&h?5aK9QGc!RLhiMYNST7NaDGBwoNKLv2+j)XT}c-%$LDMJ>;u<#h{CA;DEb18Zmy<|%3tuG8(tE?A7# E9r^-WF8}}l