From f8afdf1e6ded68ca2e2d5acffa335c14c328fa28 Mon Sep 17 00:00:00 2001
From: esensar <es.ensar@gmail.com>
Date: Sun, 18 Jun 2017 18:05:50 +0200
Subject: [PATCH] Wrap events in _embedded

---
 .../steleks/controller/EventController.java   | 19 ++++++++++++++++---
 .../repository/EventsJpaRepository.java       |  3 +++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/events/src/main/java/ba/steleks/controller/EventController.java b/events/src/main/java/ba/steleks/controller/EventController.java
index 6edf6d0..9a8b8a4 100644
--- a/events/src/main/java/ba/steleks/controller/EventController.java
+++ b/events/src/main/java/ba/steleks/controller/EventController.java
@@ -10,14 +10,14 @@ import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.ws.rs.GET;
 import java.net.URI;
+import java.util.List;
 
 /**
  * Created by admin on 01/04/2017.
@@ -58,4 +58,17 @@ public class EventController {
         }
     }
 
+    @RequestMapping(path = "/events", method = RequestMethod.GET)
+    public ResponseEntity<?> getEventsById(@RequestParam(required = false) Long typeId) {
+        Iterable<Event> result;
+        if(typeId == null) {
+            result = repository.findAll();
+        } else {
+            result = repository.findByEventTypeId(typeId);
+        }
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new Object() { public Object _embedded = result;});
+    }
+
 }
diff --git a/events/src/main/java/ba/steleks/repository/EventsJpaRepository.java b/events/src/main/java/ba/steleks/repository/EventsJpaRepository.java
index 5d8f6fe..7086d7a 100644
--- a/events/src/main/java/ba/steleks/repository/EventsJpaRepository.java
+++ b/events/src/main/java/ba/steleks/repository/EventsJpaRepository.java
@@ -8,7 +8,10 @@ import ba.steleks.repository.projection.EventProjection;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
+import java.util.List;
+
 
 @RepositoryRestResource(excerptProjection = EventProjection.class)
 public interface EventsJpaRepository extends PagingAndSortingRepository<Event, Long> {
+    List<Event> findByEventTypeId(Long eventTypeId);
 }