steleks-university-project
/
steleks_backend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix add event endpoint

master
esensar 2018-01-16 19:46:00 +01:00
parent 17eaecd16a
commit 636846bd55
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
events/src/main/java/ba/steleks/controller/EventController.java
View File

@ -8,8 +8,7 @@ import ba.steleks.model.Event;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.data.rest.webmvc.RepositoryRestController; import org.springframework.data.rest.webmvc.RepositoryRestController;
import org.springframework.http.HttpStatus; import org.springframework.http.*;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -17,6 +16,7 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import java.net.URI; import java.net.URI;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
@ -40,10 +40,16 @@ public class EventController {
} }
@RequestMapping(path = "/events", method = RequestMethod.POST) @RequestMapping(path = "/events", method = RequestMethod.POST)
public ResponseEntity<?> add(@RequestBody Event event) throws ExternalServiceException { public ResponseEntity<?> add(@RequestBody Event event, @RequestHeader(HttpHeaders.AUTHORIZATION) String token) throws ExternalServiceException {
String usersServiceBase = discoveryClient.getServiceUrl(Service.USERS); String usersServiceBase = discoveryClient.getServiceUrl(Service.USERS);
try { try {
String response = restTemplate.getForObject(usersServiceBase + "/users/{id}", String.class, event.getCreatedById()); RestTemplate restTemplate = new RestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.set(HttpHeaders.AUTHORIZATION, token);
HttpEntity<String> entity = new HttpEntity<>("parameters", headers);
restTemplate.exchange(usersServiceBase + "/users/{id}", HttpMethod.GET, entity, String.class, event.getCreatedById());
Event result = repository.save(event); Event result = repository.save(event);
URI location = ServletUriComponentsBuilder URI location = ServletUriComponentsBuilder
.fromCurrentRequest().path("/{id}") .fromCurrentRequest().path("/{id}")
@ -58,8 +64,8 @@ public class EventController {
} }
} }
@RequestMapping(path = "/events", method = RequestMethod.GET) @RequestMapping(path = "/events/{id}", method = RequestMethod.GET)
public ResponseEntity<?> getEventsById(@RequestParam(required = false) Long typeId) { public ResponseEntity<?> getEventsById(@RequestParam Long typeId) {
Iterable<Event> result; Iterable<Event> result;
if (typeId == null) { if (typeId == null) {
result = repository.findAll(); result = repository.findAll();