Fix rest

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

@@ -48,11 +48,14 @@ import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
 import com.wordnik.swagger.annotations.ApiParam;
 
 
 import fi.codecrew.moya.beans.CardTemplateBeanLocal;
 import fi.codecrew.moya.beans.CardTemplateBeanLocal;
+import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.PermissionBeanLocal;
 import fi.codecrew.moya.beans.PermissionBeanLocal;
 import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
 import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
+import fi.codecrew.moya.beans.TicketBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.GroupMembership;
 import fi.codecrew.moya.model.GroupMembership;
+import fi.codecrew.moya.model.LanEventPropertyKey;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.PrintedCardRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.PrintedCardRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.SimpleEventuserRoot;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.SimpleEventuserRoot;
@@ -86,18 +89,30 @@ public class UserRestView {
 	@EJB
 	@EJB
 	private PlaceGroupBeanLocal placegroupbean;
 	private PlaceGroupBeanLocal placegroupbean;
 
 
+	@EJB
+	private TicketBeanLocal ticketbean;
+
+	@POST
 	@GET
 	@GET
 	@Path("/{userid}/reservations")
 	@Path("/{userid}/reservations")
-	public Response usersPlaces(@QueryParam("userid") Integer userid) {
+	public Response usersPlaces(@PathParam("userid") Integer userid) {
+		logger.info("user {} is trying to fetch user {}", permbean.getCurrentUser().getLogin(), userid);
+
 		EventUser eu = userbean.findByUserId(userid, false);
 		EventUser eu = userbean.findByUserId(userid, false);
+		logger.info("Trying to fetch reservations for user {}, with useid {}", eu, userid);
 		if (eu != null) {
 		if (eu != null) {
-			List<GroupMembership> gms = placegroupbean.getMemberships(eu);
+
+			List<GroupMembership> gms = ticketbean.findMembershipPrintlistForUser(eu);
+
 			UserReservationRoot ret = new UserReservationRoot();
 			UserReservationRoot ret = new UserReservationRoot();
+			logger.info("Got membersips {}", gms);
 			for (GroupMembership g : gms) {
 			for (GroupMembership g : gms) {
 				UserReservationPlacePojo ur = new UserReservationPlacePojo();
 				UserReservationPlacePojo ur = new UserReservationPlacePojo();
+				
 				ur.setPlaceid(g.getPlaceReservation().getId());
 				ur.setPlaceid(g.getPlaceReservation().getId());
-				ur.setPlacegiven(g.getEnteredEvent() != null);
 				ur.setPlacename(g.getPlaceReservation().getName());
 				ur.setPlacename(g.getPlaceReservation().getName());
+				ur.setPlacegiven(g.getEnteredEvent() != null);
+				
 				ret.getReservations().add(ur);
 				ret.getReservations().add(ur);
 			}
 			}
 			return Response.ok(ret).build();
 			return Response.ok(ret).build();