Skip to content

Max Mecklin / Moya

Go to a project
Commit 8a2b16a8 by Tuukka Kivilahti
Options

Merge branch 'restfix' into 'master' 

Restfix

- Muutamia uusia restijuttuja.
- Fiksattu paikkojen vapautus ja varaus
- joitain pikkuviilauksia esim logituksen pienennystä.
2 parents cebea01d ce30d58f
Inline Side-by-side
Showing with 162 additions and 26 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/EventMapBean.java
...@@ -109,4 +109,12 @@ public class EventMapBean implements EventMapBeanLocal { ...@@ -109,4 +109,12 @@ public class EventMapBean implements EventMapBeanLocal {
public Place updatePlace(Place place) { public Place updatePlace(Place place) {
return placefacade.merge(place); return placefacade.merge(place);
} }
@Override
@RolesAllowed(MapPermission.S_MANAGE_MAPS)
public void createPlace(Place place) {
EventMap map = eventmapfacade.reload(place.getMap());
map.getPlaces().add(place);
place.setMap(map);
}
} }
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
...@@ -34,13 +34,12 @@ import fi.codecrew.moya.model.LanEventPropertyKey; ...@@ -34,13 +34,12 @@ import fi.codecrew.moya.model.LanEventPropertyKey;
import fi.codecrew.moya.model.PlaceGroup; import fi.codecrew.moya.model.PlaceGroup;
import fi.codecrew.moya.model.User; import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.BarcodeUtils; import fi.codecrew.moya.utilities.BarcodeUtils;
import fi.codecrew.moya.utilities.I18n;
/** /**
* Session Bean implementation class PlaceGroupBean * Session Bean implementation class PlaceGroupBean
*/ */
@Stateless @Stateless
@DeclareRoles({ SpecialPermission.S_USER, MapPermission.S_BUY_PLACES }) @DeclareRoles({ SpecialPermission.S_USER, MapPermission.S_BUY_PLACES, MapPermission.S_MANAGE_MAPS })
public class PlaceGroupBean implements PlaceGroupBeanLocal { public class PlaceGroupBean implements PlaceGroupBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(PlaceGroupBean.class); private static final Logger logger = LoggerFactory.getLogger(PlaceGroupBean.class);
...@@ -87,7 +86,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -87,7 +86,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
// } // }
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
public List<GroupMembership> getMembershipsAndCreations(EventUser user) { public List<GroupMembership> getMembershipsAndCreations(EventUser user) {
if (user == null) { if (user == null) {
user = permbean.getCurrentUser(); user = permbean.getCurrentUser();
...@@ -99,7 +98,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -99,7 +98,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
} }
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
public List<GroupMembership> getMemberships(EventUser user) { public List<GroupMembership> getMemberships(EventUser user) {
if (user == null) { if (user == null) {
user = permbean.getCurrentUser(); user = permbean.getCurrentUser();
...@@ -133,7 +132,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -133,7 +132,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
} }
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
public void getGroupMembershipPdf(EventUser usr, OutputStream ostream) { public void getGroupMembershipPdf(EventUser usr, OutputStream ostream) {
List<GroupMembership> memberships = getMembershipsAndCreations(usr); List<GroupMembership> memberships = getMembershipsAndCreations(usr);
...@@ -161,13 +160,12 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -161,13 +160,12 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
Font titlefont = new Font(pdf, CoreFont.TIMES_ROMAN); Font titlefont = new Font(pdf, CoreFont.TIMES_ROMAN);
titlefont.setSize(20); titlefont.setSize(20);
Page page = new Page(pdf, A4.PORTRAIT); Page page = new Page(pdf, A4.PORTRAIT);
int y = YSTART; int y = YSTART;
String titletext = "Lipputositteet"; String titletext = "Lipputositteet";
if(printOnlyOwn || memberships.size() <= 1) { if (printOnlyOwn || memberships.size() <= 1) {
titletext = "Lipputosite"; titletext = "Lipputosite";
} }
...@@ -177,7 +175,6 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -177,7 +175,6 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
y += 30; y += 30;
for (GroupMembership membership : memberships) { for (GroupMembership membership : memberships) {
if (y > 750) { if (y > 750) {
...@@ -185,7 +182,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -185,7 +182,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
y = YSTART; y = YSTART;
} }
if(printOnlyOwn && (membership.getUser() == null || !membership.getUser().equals(usr))) { if (printOnlyOwn && (membership.getUser() == null || !membership.getUser().equals(usr))) {
continue; continue;
} }
...@@ -195,15 +192,15 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -195,15 +192,15 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
// logger.debug("Jpeg: " + jpeg.getWidth() + " h. " + // logger.debug("Jpeg: " + jpeg.getWidth() + " h. " +
// jpeg.getHeight()); // jpeg.getHeight());
if(placecodeFromUser) { if (placecodeFromUser) {
if(membership.getUser() != null) { if (membership.getUser() != null) {
Image image = new Image(pdf, barcodeBean.getUserBarcode(membership.getUser()), ImageType.PNG); Image image = new Image(pdf, barcodeBean.getUserBarcode(membership.getUser()), ImageType.PNG);
image.scaleBy(0.8); image.scaleBy(0.8);
image.setPosition(50, y); image.setPosition(50, y);
image.drawOn(page); image.drawOn(page);
} else { } else {
TextLine nouser = new TextLine(bigfont, "EMPTY PLACE" ); TextLine nouser = new TextLine(bigfont, "EMPTY PLACE");
nouser.setPosition(85, y+10); nouser.setPosition(85, y + 10);
nouser.drawOn(page); nouser.drawOn(page);
} }
} else { } else {
...@@ -213,8 +210,6 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -213,8 +210,6 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
image.drawOn(page); image.drawOn(page);
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (membership.getPlaceReservation().getName() != null) if (membership.getPlaceReservation().getName() != null)
{ {
...@@ -252,11 +247,9 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -252,11 +247,9 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
y = YSTART; y = YSTART;
} }
String footertext = "Nämä lipputositteenne tulee olla tulostettuna paperille kun saavutte tapahtumaan."; String footertext = "Nämä lipputositteenne tulee olla tulostettuna paperille kun saavutte tapahtumaan.";
if(printOnlyOwn || memberships.size() <= 1) { if (printOnlyOwn || memberships.size() <= 1) {
footertext = "Tämä henkilökohtainen lipputositteesi tulee olla mukana tulostettuna paperille kun saavut tapahtumaan."; footertext = "Tämä henkilökohtainen lipputositteesi tulee olla mukana tulostettuna paperille kun saavut tapahtumaan.";
} }
...@@ -272,19 +265,20 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -272,19 +265,20 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
} }
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
public void releaseAndGenerateToken(GroupMembership gmem) { public void releaseAndGenerateToken(GroupMembership gmem) {
gmem = gmemfacade.find(gmem.getId()); gmem = gmemfacade.reload(gmem);
if (!(permbean.getCurrentUser().getId().equals(gmem.getPlaceGroup().getCreator().getId()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS))) { if (!(permbean.getCurrentUser().getId().equals(gmem.getPlaceGroup().getCreator().getId()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS))) {
loggerbean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "User tried to release and generate group membership: " + gmem); loggerbean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "User tried to release and generate group membership: " + gmem);
throw new EJBAccessException("Not enough rights to release token"); throw new EJBAccessException("Not enough rights to release token");
} }
gmem.setUser(null); gmem.setUser(null);
gmem.setInviteToken(gmemfacade.createInviteToken()); gmem.setInviteToken(gmemfacade.createInviteToken());
logger.info("Place released. {} new token {}", gmem.getInviteToken());
} }
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed({ SpecialPermission.S_USER, MapPermission.S_MANAGE_MAPS })
public List<PlaceGroup> getPlacegroups(EventUser user) { public List<PlaceGroup> getPlacegroups(EventUser user) {
return pgfacade.find(user); return pgfacade.find(user);
} }
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java
...@@ -202,8 +202,13 @@ public class ReaderBean implements ReaderBeanLocal { ...@@ -202,8 +202,13 @@ public class ReaderBean implements ReaderBeanLocal {
@Override @Override
public List<ReaderEvent> getReaderEvents(Integer readerId) { public List<ReaderEvent> getReaderEvents(Integer readerId) {
return getReaderEvents(readerId, 20);
}
@Override
public List<ReaderEvent> getReaderEvents(Integer readerId, Integer count) {
Reader reader = readerfacade.find(readerId); Reader reader = readerfacade.find(readerId);
return readerEventFacade.findLastEvents(reader, 20); return readerEventFacade.findLastEvents(reader, count);
} }
@Override @Override
...@@ -294,4 +299,9 @@ public class ReaderBean implements ReaderBeanLocal { ...@@ -294,4 +299,9 @@ public class ReaderBean implements ReaderBeanLocal {
return ret; return ret;
} }
@Override
public List<ReaderEvent> getReaderEventsAfterEvent(Integer readerId, Integer eventId) {
Reader reader = getReader(readerId);
return readerEventFacade.findEventsAfterEvent(reader, eventId);
}
} }
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/ReaderEventFacade.java
...@@ -31,8 +31,26 @@ public class ReaderEventFacade extends IntegerPkGenericFacade<ReaderEvent> { ...@@ -31,8 +31,26 @@ public class ReaderEventFacade extends IntegerPkGenericFacade<ReaderEvent> {
cq.orderBy(cb.desc(root.get(ReaderEvent_.time))); cq.orderBy(cb.desc(root.get(ReaderEvent_.time)));
TypedQuery<ReaderEvent> q = getEm().createQuery(cq); TypedQuery<ReaderEvent> q = getEm().createQuery(cq);
if (count > 0) {
q.setMaxResults(count); q.setMaxResults(count);
}
return q.getResultList();
}
public List<ReaderEvent> findEventsAfterEvent(Reader reader, Integer eventId) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<ReaderEvent> cq = cb.createQuery(ReaderEvent.class);
Root<ReaderEvent> root = cq.from(ReaderEvent.class);
cq.where(cb.equal(root.get(ReaderEvent_.reader), reader),
cb.gt(root.get(ReaderEvent_.id), eventId));
cq.orderBy(cb.desc(root.get(ReaderEvent_.time)));
TypedQuery<ReaderEvent> q = getEm().createQuery(cq);
return q.getResultList(); return q.getResultList();
} }
} }
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/EventMapBeanLocal.java
...@@ -24,4 +24,6 @@ public interface EventMapBeanLocal { ...@@ -24,4 +24,6 @@ public interface EventMapBeanLocal {
Place updatePlace(Place place); Place updatePlace(Place place);
void createPlace(Place create);
} }
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/ReaderBeanLocal.java
...@@ -41,4 +41,8 @@ public interface ReaderBeanLocal { ...@@ -41,4 +41,8 @@ public interface ReaderBeanLocal {
ReaderEvent checkTag(String readerIdent, String tag); ReaderEvent checkTag(String readerIdent, String tag);
List<ReaderEvent> getReaderEvents(Integer readerId, Integer count);
List<ReaderEvent> getReaderEventsAfterEvent(Integer readerId, Integer eventId);
} }
code/MoyaWeb/src/fi/codecrew/moya/rest/MapAdminView.java
...@@ -20,10 +20,14 @@ import org.slf4j.LoggerFactory; ...@@ -20,10 +20,14 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.EventBeanLocal; import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.EventMapBeanLocal; import fi.codecrew.moya.beans.EventMapBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.PlaceGroupBeanLocal; import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
import fi.codecrew.moya.beans.PlaceMapBeanLocal; import fi.codecrew.moya.beans.PlaceMapBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal; import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.exceptions.BortalCatchableException;
import fi.codecrew.moya.model.EventMap; import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Place; import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.Product; import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.rest.pojo.MapRoot; import fi.codecrew.moya.rest.pojo.MapRoot;
...@@ -47,6 +51,11 @@ public class MapAdminView { ...@@ -47,6 +51,11 @@ public class MapAdminView {
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
@EJB @EJB
private ProductBeanLocal productbean; private ProductBeanLocal productbean;
@EJB
private UserBeanLocal eventuserbean;
@EJB
private transient PlaceBeanLocal placebean;
private static final Logger logger = LoggerFactory.getLogger(MapAdminView.class); private static final Logger logger = LoggerFactory.getLogger(MapAdminView.class);
@GET @GET
...@@ -86,8 +95,10 @@ public class MapAdminView { ...@@ -86,8 +95,10 @@ public class MapAdminView {
@POST @POST
@Path("/place/") @Path("/place/")
public Response createPlace(PlaceInputPojo create) { public Response createPlace(PlaceInputPojo create) {
logger.info("Finding map with id {}", create.getMapId());
EventMap map = eventmapbean.find(create.getMapId()); EventMap map = eventmapbean.find(create.getMapId());
if (map == null) { if (map == null) {
logger.warn("No map found!");
return Response.serverError().entity("Error with mapId").build(); return Response.serverError().entity("Error with mapId").build();
} }
Place place = new Place(); Place place = new Place();
...@@ -95,7 +106,8 @@ public class MapAdminView { ...@@ -95,7 +106,8 @@ public class MapAdminView {
setPlaceValues(place, create); setPlaceValues(place, create);
if (create.getProductId() != null && (place.getProduct() == null || !place.getProduct().getId().equals(create.getProductId()))) if (create.getProductId() != null && (place.getProduct() == null || !place.getProduct().getId().equals(create.getProductId())))
return Response.serverError().entity("Product id unknown!").build(); return Response.serverError().entity("Product id unknown!").build();
logger.info("Creating new place {}", place.getName());
eventmapbean.createPlace(place);
return Response.ok().entity(new PlaceOutPojo(place)).build(); return Response.ok().entity(new PlaceOutPojo(place)).build();
} }
...@@ -117,6 +129,36 @@ public class MapAdminView { ...@@ -117,6 +129,36 @@ public class MapAdminView {
return Response.ok(new PlaceOutPojo(place)).build(); return Response.ok(new PlaceOutPojo(place)).build();
} }
@PUT
@Path("/place/{placeId}/release")
public Response releasePlace(@PathParam("placeId") Integer placeId) {
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();
}
@PUT
@Path("/place/{placeId}/reserve/{eventuserId}")
public Response reserve(@PathParam("placeId") Integer placeId, @PathParam("eventuserId") Integer eventuserId) {
Place place = eventmapbean.findPlace(placeId);
EventUser eventuser = eventuserbean.findByEventUserId(eventuserId);
if (placebean.reservePlace(place, eventuser))
{
try {
placebean.buySelectedPlaces(eventuser);
return Response.ok().build();
} catch (BortalCatchableException e) {
logger.warn("Wtf! Bortalerror");
}
}
return Response.serverError().build();
}
private void setPlaceValues(Place place, PlaceInputPojo update) { private void setPlaceValues(Place place, PlaceInputPojo update) {
if (update.getName() != null) if (update.getName() != null)
......
code/MoyaWeb/src/fi/codecrew/moya/rest/ReaderRestView.java
package fi.codecrew.moya.rest; package fi.codecrew.moya.rest;
import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
...@@ -42,6 +44,26 @@ public class ReaderRestView { ...@@ -42,6 +44,26 @@ public class ReaderRestView {
return new ReaderRestRoot(ReaderRestPojo.parse(readerbean.getReaders())); return new ReaderRestRoot(ReaderRestPojo.parse(readerbean.getReaders()));
} }
/**
* Returns events after the designated eventid. If eventid == 0 return last
* 20, eventid < 0 return all
*/
@GET
@Path("/readerevents/{readerId}/{eventId}")
public ReaderEventRestRoot getReaderevents(@PathParam("readerId") Integer readerId, @PathParam("eventId") Integer eventId) {
List<ReaderEvent> events = null;
if (eventId != null && eventId > 0) {
events = readerbean.getReaderEventsAfterEvent(readerId, eventId);
} else {
int count = 20;
if (eventId == null || eventId == 0)
count = 0;
events = readerbean.getReaderEvents(readerId, count);
}
return new ReaderEventRestRoot(ReaderEventRestPojo.parse(events));
}
@GET @GET
@Path("/LastEventusers") @Path("/LastEventusers")
public ReaderEventRestRoot getLastEventusers() public ReaderEventRestRoot getLastEventusers()
......
code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/PlaceInputPojo.java
...@@ -2,6 +2,7 @@ package fi.codecrew.moya.rest.pojo; ...@@ -2,6 +2,7 @@ package fi.codecrew.moya.rest.pojo;
public class PlaceInputPojo { public class PlaceInputPojo {
private Integer id;
private String name; private String name;
private Integer mapX; private Integer mapX;
private Integer mapY; private Integer mapY;
...@@ -11,6 +12,7 @@ public class PlaceInputPojo { ...@@ -11,6 +12,7 @@ public class PlaceInputPojo {
private Boolean disabled; private Boolean disabled;
private Integer productId; private Integer productId;
private Integer mapId; private Integer mapId;
private Boolean taken;
public String getName() { public String getName() {
return name; return name;
...@@ -84,4 +86,20 @@ public class PlaceInputPojo { ...@@ -84,4 +86,20 @@ public class PlaceInputPojo {
this.mapId = mapId; this.mapId = mapId;
} }
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Boolean getTaken() {
return taken;
}
public void setTaken(Boolean taken) {
this.taken = taken;
}
} }
code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/PlaceOutPojo.java
...@@ -112,6 +112,15 @@ public class PlaceOutPojo { ...@@ -112,6 +112,15 @@ public class PlaceOutPojo {
} }
@XmlElement @XmlElement
public Integer getMapId() {
Integer ret = null;
if (place.getMap() != null) {
ret = place.getMap().getId();
}
return ret;
}
@XmlElement
public Integer getEventuserId() public Integer getEventuserId()
{ {
Integer ret = null; Integer ret = null;
......
code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/ReaderEventRestPojo.java
...@@ -76,4 +76,12 @@ public class ReaderEventRestPojo { ...@@ -76,4 +76,12 @@ public class ReaderEventRestPojo {
} }
return ret; return ret;
} }
public PrintedCardRestPojo getPrintedCard() {
return printedCard;
}
public void setPrintedCard(PrintedCardRestPojo printedCard) {
this.printedCard = printedCard;
}
} }
code/MoyaWeb/src/fi/codecrew/moya/servlet/PlaceMap.java
...@@ -60,7 +60,8 @@ public class PlaceMap extends HttpServlet { ...@@ -60,7 +60,8 @@ public class PlaceMap extends HttpServlet {
private static final String PARAMETER_EVENT_MAP_ID = "mapid"; private static final String PARAMETER_EVENT_MAP_ID = "mapid";
/** /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
* methods.
* *
* @param request * @param request
* servlet request * servlet request
...@@ -246,7 +247,7 @@ public class PlaceMap extends HttpServlet { ...@@ -246,7 +247,7 @@ public class PlaceMap extends HttpServlet {
} }
Color color = null; Color color = null;
if (!p.isBuyable()) { if (!p.isBuyable()) {
logger.info("Locking place."); logger.debug("Setting color as locked place.");
color = LOCKED_COLOR; color = LOCKED_COLOR;
} }
...@@ -272,7 +273,7 @@ public class PlaceMap extends HttpServlet { ...@@ -272,7 +273,7 @@ public class PlaceMap extends HttpServlet {
logger.error("Cannot convert string {} to color.", p.getProduct().getColor()); logger.error("Cannot convert string {} to color.", p.getProduct().getColor());
} }
} else { } else {
logger.info("Nothing special for this place. Color should be default."); logger.debug("Nothing special for this place. Color should be default.");
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!