Commit 862c0c49 by Tuomas Riihimäki

Bugfix

1 parent 19e1d46e
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
package fi.codecrew.moya.rest.pojo.userinfo.v1; package fi.codecrew.moya.rest.pojo.userinfo.v1;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
...@@ -25,18 +26,20 @@ import javax.xml.bind.annotation.XmlRootElement; ...@@ -25,18 +26,20 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement() @XmlRootElement()
public class UserReservationRoot { public class UserReservationRoot {
private List<UserReservationRoot> eventusers; private List<UserReservationPlacePojo> reservations = new ArrayList<UserReservationPlacePojo>();
public UserReservationRoot() { public UserReservationRoot() {
super(); super();
} }
public List<UserReservationRoot> getEventusers() { public List<UserReservationPlacePojo> getReservations() {
return eventusers; return reservations;
} }
public void setEventusers(List<UserReservationRoot> eventusers) { public void setReservations(List<UserReservationPlacePojo> reservations) {
this.eventusers = eventusers; this.reservations = reservations;
} }
} }
...@@ -93,6 +93,7 @@ public class UserRestView { ...@@ -93,6 +93,7 @@ public class UserRestView {
ur.setPlaceid(g.getPlaceReservation().getId()); ur.setPlaceid(g.getPlaceReservation().getId());
ur.setPlacegiven(g.getEnteredEvent() != null); ur.setPlacegiven(g.getEnteredEvent() != null);
ur.setPlacename(g.getPlaceReservation().getName()); ur.setPlacename(g.getPlaceReservation().getName());
ret.getReservations().add(ur);
} }
return Response.ok(ret).build(); return Response.ok(ret).build();
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!