Merge branch 'userreservation' into 'master'

Userreservation

....

See merge request !205

code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/UserReservationRoot.java

@@ -18,6 +18,7 @@
  */
 package fi.codecrew.moya.rest.pojo.userinfo.v1;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlRootElement;
@@ -25,18 +26,20 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement()
 public class UserReservationRoot {
 
-	private List<UserReservationRoot> eventusers;
+	private List<UserReservationPlacePojo> reservations = new ArrayList<UserReservationPlacePojo>();
 
 	public UserReservationRoot() {
 		super();
 	}
 
-	public List<UserReservationRoot> getEventusers() {
-		return eventusers;
+	public List<UserReservationPlacePojo> getReservations() {
+		return reservations;
 	}
 
-	public void setEventusers(List<UserReservationRoot> eventusers) {
-		this.eventusers = eventusers;
+	public void setReservations(List<UserReservationPlacePojo> reservations) {
+		this.reservations = reservations;
 	}
 
+	
+
 }

code/moya-web/src/main/java/fi/codecrew/moya/rest/UserRestView.java

@@ -93,6 +93,7 @@ public class UserRestView {
 				ur.setPlaceid(g.getPlaceReservation().getId());
 				ur.setPlacegiven(g.getEnteredEvent() != null);
 				ur.setPlacename(g.getPlaceReservation().getName());
+				ret.getReservations().add(ur);
 			}
 			return Response.ok(ret).build();
 		}