Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 220fddf4 by Tuukka Kivilahti
Options

Merge branch 'restDeleteFix' into 'master' 

Fix rest place removing

Add missing remove function, and more informative responses to http.

See merge request !327
2 parents a6ed14c6 06960395
Inline Side-by-side
Showing with 116 additions and 111 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventMapBean.java
......@@ -53,9 +53,10 @@ public class EventMapBean implements EventMapBeanLocal {
@EJB
private PlaceFacade placefacade;
private static final Logger logger = LoggerFactory.getLogger(EventMapBean.class);
@EJB
private PermissionBeanLocal permbean;
private static final Logger logger = LoggerFactory.getLogger(EventMapBean.class);
@Override
@RolesAllowed(MapPermission.S_MANAGE_MAPS)
......@@ -110,6 +111,7 @@ public class EventMapBean implements EventMapBeanLocal {
if (!currentEvent.equals(place.getMap().getEvent())) {
throw new EJBAccessException("Deleting placce for wrong event!");
}
placefacade.remove(place);
}
@Override
......@@ -119,7 +121,8 @@ public class EventMapBean implements EventMapBeanLocal {
Place place = placefacade.find(id);
LanEvent currentEvent = eventbean.getCurrentEvent();
if (!currentEvent.equals(place.getMap().getEvent())) {
throw new EJBAccessException("Fetcing place for wrong event!");
logger.warn("Tried to fetch place from wrong event!: user {}, place: {}, event {}", permbean.getCurrentUser(), place, currentEvent);
place = null;
}
return place;
}
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/MapAdminView.java
......@@ -82,16 +82,15 @@ public class MapAdminView {
@GET
@Path("/background/{mapId}")
@ApiResponse(code = 200, message = "Return backround map as JPEG")
public Response getMapBg(@PathParam("mapId") Integer mapid)
{
try {
EventMap map = placebean.findMap(mapid);
ByteArrayInputStream istream = new ByteArrayInputStream(map.getMapData());
return Response.ok().entity(istream).type("image/jpeg").build();
} catch(Exception e) {
logger.error("GET /placeadmin/background/{mapId} threw an exception", e);
throw e;
}
public Response getMapBg(@PathParam("mapId") Integer mapid) {
try {
EventMap map = placebean.findMap(mapid);
ByteArrayInputStream istream = new ByteArrayInputStream(map.getMapData());
return Response.ok().entity(istream).type("image/jpeg").build();
} catch (Exception e) {
logger.error("GET /placeadmin/background/{mapId} threw an exception", e);
throw e;
}
}
@GET
......@@ -99,43 +98,46 @@ public class MapAdminView {
@ApiOperation(value = "Get All maps", response = MapRoot.class)
@ApiResponse(code = 200, message = "Return all maps")
public MapRoot getAllMaps() {
try {
MapRoot ret = PojoUtils.parseMaps(eventbean.getCurrentEvent().getEventMaps());
logger.info("getallmaps called! {}", ret);
return ret;
} catch(Exception e) {
logger.error("GET /placeadmin/maps threw an exception", e);
throw e;
}
try {
MapRoot ret = PojoUtils.parseMaps(eventbean.getCurrentEvent().getEventMaps());
logger.info("getallmaps called! {}", ret);
return ret;
} catch (Exception e) {
logger.error("GET /placeadmin/maps threw an exception", e);
throw e;
}
}
@GET
@Path("/places/{mapId}")
@ApiOperation(value = "Get places by mapId", response = PlaceRoot.class)
public PlaceRoot getPlaces(@PathParam("mapId") Integer mapid) {
try {
EventMap map = placebean.findMap(mapid);
PlaceRoot ret = PojoUtils.initPlaceRoot(map);
logger.info("returning map {} entity {}", mapid, ret);
return ret;
} catch(Exception e) {
logger.error("PUT /placeadmin/places/{mapId} threw an exception", e);
throw e;
}
try {
EventMap map = placebean.findMap(mapid);
PlaceRoot ret = PojoUtils.initPlaceRoot(map);
logger.info("returning map {} entity {}", mapid, ret);
return ret;
} catch (Exception e) {
logger.error("PUT /placeadmin/places/{mapId} threw an exception", e);
throw e;
}
}
@DELETE
@Path("/place/{id}")
@ApiOperation("Delete a place")
public Response deletePlace(@PathParam("id") Integer id) {
try {
Place place = eventmapbean.findPlace(id);
eventmapbean.deletePlace(place);
return Response.ok().build();
} catch(Exception e) {
logger.error("DELETE /placeadmin/place/{id} threw an exception", e);
throw e;
}
try {
Place place = eventmapbean.findPlace(id);
if (place == null) {
return Response.status(Status.NOT_FOUND).entity("Place not found for id " + id).build();
}
eventmapbean.deletePlace(place);
return Response.ok().build();
} catch (Exception e) {
logger.error("DELETE /placeadmin/place/{id} threw an exception", e);
return Response.serverError().entity("Got exception when removing place: " + e.getMessage()).build();
}
}
@GET
......@@ -143,105 +145,105 @@ public class MapAdminView {
@ApiOperation(value = "Always returns 406 - Not acceptable")
@ApiResponse(code = 406, message = "Nope. Not acceptable.")
public Response getPlaceError() {
try {
ResponseBuilder ret = Response.ok();
ret = ret.status(Status.NOT_ACCEPTABLE);
ret.entity("Method not allowed!\nGET is not supported for /place/. See api for correct use!");
return ret.build();
} catch(Exception e) {
logger.error("GET /placeadmin/place/ threw an exception", e);
throw e;
}
try {
ResponseBuilder ret = Response.ok();
ret = ret.status(Status.NOT_ACCEPTABLE);
ret.entity("Method not allowed!\nGET is not supported for /place/. See api for correct use!");
return ret.build();
} catch (Exception e) {
logger.error("GET /placeadmin/place/ threw an exception", e);
throw e;
}
}
@POST
@Path("/place/")
@ApiOperation(value = "Create a place", response = PlacePojo.class)
public Response createPlace(PlacePojo create) {
try {
logger.info("Finding map with id {}", create.getMapId());
EventMap map = eventmapbean.find(create.getMapId());
if (map == null) {
logger.warn("No map found!");
return Response.serverError().entity("Error with mapId").build();
}
Place place = new Place();
place.setMap(map);
setUpdatablePlaceValues(place, create);
if (create.getProductId() != null && (place.getProduct() == null || !place.getProduct().getId().equals(create.getProductId())))
return Response.serverError().entity("Product id unknown!").build();
logger.info("Creating new place {}", place.getName());
eventmapbean.createPlace(place);
return Response.ok().entity(PojoUtils.initPlacePojo(place)).build();
} catch(Exception e) {
logger.error("POST /placeadmin/place/ threw an exception", e);
throw e;
}
try {
logger.info("Finding map with id {}", create.getMapId());
EventMap map = eventmapbean.find(create.getMapId());
if (map == null) {
logger.warn("No map found!");
return Response.serverError().entity("Error with mapId").build();
}
Place place = new Place();
place.setMap(map);
setUpdatablePlaceValues(place, create);
if (create.getProductId() != null && (place.getProduct() == null || !place.getProduct().getId().equals(create.getProductId())))
return Response.serverError().entity("Product id unknown!").build();
logger.info("Creating new place {}", place.getName());
eventmapbean.createPlace(place);
return Response.ok().entity(PojoUtils.initPlacePojo(place)).build();
} catch (Exception e) {
logger.error("POST /placeadmin/place/ threw an exception", e);
throw e;
}
}
@PUT
@Path("/place/{id}")
@ApiOperation(value = "Set a place", response = PlacePojo.class)
public Response updatePlace(@PathParam("id") Integer id, PlacePojo update) {
try {
if (update == null || id == null) {
return Response.serverError().entity("'id' field is required!").build();
}
Place place = eventmapbean.findPlace(id);
if (place == null) {
return Response.serverError().entity("place not found with id: " + id).build();
}
setUpdatablePlaceValues(place, update);
if (update.getProductId() != null && (place.getProduct() == null || !place.getProduct().getId().equals(update.getProductId())))
return Response.serverError().entity("Product id unknown!").build();
try {
if (update == null || id == null) {
return Response.serverError().entity("'id' field is required!").build();
}
Place place = eventmapbean.findPlace(id);
if (place == null) {
return Response.serverError().entity("place not found with id: " + id).build();
}
setUpdatablePlaceValues(place, update);
if (update.getProductId() != null && (place.getProduct() == null || !place.getProduct().getId().equals(update.getProductId())))
return Response.serverError().entity("Product id unknown!").build();
place = eventmapbean.updatePlace(place);
return Response.ok(PojoUtils.initPlacePojo(place)).build();
} catch (Exception e) {
logger.error("PUT /placeadmin/place/{id} threw an exception", e);
throw e;
}
place = eventmapbean.updatePlace(place);
return Response.ok(PojoUtils.initPlacePojo(place)).build();
} catch (Exception e) {
logger.error("PUT /placeadmin/place/{id} threw an exception", e);
throw e;
}
}
@PUT
@Path("/place/{placeId}/release")
@ApiOperation("Release a class")
public Response releasePlace(@PathParam("placeId") Integer placeId) {
try {
Place place = eventmapbean.findPlace(placeId);
if (place == null) {
return Response.serverError().entity("Place not found!").build();
}
logger.info("Releasing place {}", place);
placebean.unbuyPlace(place);
try {
Place place = eventmapbean.findPlace(placeId);
if (place == null) {
return Response.serverError().entity("Place not found!").build();
}
logger.info("Releasing place {}", place);
placebean.unbuyPlace(place);
return Response.ok().build();
} catch (Exception e) {
logger.error("PUT /placeadmin/place/{placeId}/release threw an exception", e);
throw e;
}
return Response.ok().build();
} catch (Exception e) {
logger.error("PUT /placeadmin/place/{placeId}/release threw an exception", e);
throw e;
}
}
@PUT
@Path("/place/{placeId}/reserve/{eventuserId}")
@ApiOperation("Reserve a place")
public Response reserve(@PathParam("placeId") Integer placeId, @PathParam("eventuserId") Integer eventuserId) {
try {
Place place = eventmapbean.findPlace(placeId);
EventUser eventuser = eventuserbean.findByEventUserId(eventuserId);
if (placebean.reservePlace(place, eventuser)) {
try {
placebean.reserveSelectedPlaces(eventuser);
return Response.ok().build();
} catch (BortalCatchableException e) {
logger.warn("Wtf! Bortalerror", e);
}
}
return Response.serverError().build();
} catch(Exception e) {
logger.error("PUT /placeadmin/place/{placeId}/reserve/{eventuserId} threw an exception", e);
throw e;
}
try {
Place place = eventmapbean.findPlace(placeId);
EventUser eventuser = eventuserbean.findByEventUserId(eventuserId);
if (placebean.reservePlace(place, eventuser)) {
try {
placebean.reserveSelectedPlaces(eventuser);
return Response.ok().build();
} catch (BortalCatchableException e) {
logger.warn("Wtf! Bortalerror", e);
}
}
return Response.serverError().build();
} catch (Exception e) {
logger.error("PUT /placeadmin/place/{placeId}/reserve/{eventuserId} threw an exception", e);
throw e;
}
}
private void setUpdatablePlaceValues(Place place, PlacePojo update) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!