Merge branch 'devel' of codecrew.fi:bortal into devel

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java

@@ -271,4 +271,27 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 		return printedcardfacade.findByState(state);
 		return printedcardfacade.findByState(state);
 	}
 	}
 
 
+	@Override
+	public PrintedCard setCardState(int cardId, CardState state) throws Exception {
+		PrintedCard card = printedcardfacade.find(cardId);
+		switch (state)
+		{
+		case PRINTED:
+			card.setPrintCount(card.getPrintCount() + 1);
+			break;
+		case PRINTING_IN_PROGRESS:
+			if (card.getCardState().equals(CardState.PRINTING_IN_PROGRESS)
+					|| card.getCardState().equals(CardState.PRINTED)) {
+				String response = "Unable to change type to PRINTING_IN_PROGRESS value is already {}" + card.getCardState();
+				logger.warn(response);
+				throw new Exception(response);
+			}
+			break;
+		default:
+			break;
+		}
+		card.setCardState(state);
+
+		return card;
+	}
 }
 }

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/CardTemplateBeanLocal.java

@@ -44,4 +44,6 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
 
 
 	List<PrintedCard> getCardsByState(CardState... pendingPrint);
 	List<PrintedCard> getCardsByState(CardState... pendingPrint);
 
 
+	PrintedCard setCardState(int cardId, CardState printed) throws Exception;
+
 }
 }

code/MoyaUtilities/src/fi/codecrew/moya/enums/CardState.java

@@ -8,7 +8,6 @@ public enum CardState {
 	PENDING_VALIDATION,
 	PENDING_VALIDATION,
 	REJECTED,
 	REJECTED,
 	VALIDATED,
 	VALIDATED,
-	PENDING_PRINT,
 	PRINTING_IN_PROGRESS,
 	PRINTING_IN_PROGRESS,
 	PRINTED;
 	PRINTED;
 
 

code/MoyaWeb/src/fi/codecrew/moya/rest/PrinterRestView.java

@@ -39,12 +39,35 @@ public class PrinterRestView {
 	private static final Logger logger = LoggerFactory.getLogger(PrinterRestView.class);
 	private static final Logger logger = LoggerFactory.getLogger(PrinterRestView.class);
 
 
 	@GET
 	@GET
+	@Path("/Reserve/{id}/")
+	public Response reserveCardForPrinting(@PathParam("id") int cardId, @QueryParam("key") String hash) throws Exception {
+
+		ResponseBuilder ret = null;
+		try {
+			PrintedCard card = cardbean.setCardState(cardId, CardState.PRINTING_IN_PROGRESS);
+			if (card.getCardState().equals(CardState.PRINTING_IN_PROGRESS)) {
+				ret = Response.ok(new PrintedCardRestPojo(card));
+			}
+		} catch (Exception e) {
+			ret = null;
+			logger.warn("Caught exception while reserving card for printing" + cardId, e);
+		}
+
+		if (ret == null) {
+			ret = Response.status(Response.Status.CONFLICT);
+		}
+		return ret.build();
+	}
+
+	@GET
 	@Path("/Printed/{id}/")
 	@Path("/Printed/{id}/")
 	public PrintedCardRestPojo setCardPrinted(@PathParam("id") int cardId, @QueryParam("key") String hash) throws Exception {
 	public PrintedCardRestPojo setCardPrinted(@PathParam("id") int cardId, @QueryParam("key") String hash) throws Exception {
-		PrintedCard card = cardbean.findCard(cardId);
-		card.setCardState(CardState.PRINTED);
-		card = cardbean.saveCard(card);
-		return new PrintedCardRestPojo(card);
+		return new PrintedCardRestPojo(cardbean.setCardState(cardId, CardState.PRINTED));
+		// PrintedCard card = cardbean.findCard(cardId);
+		// card.setCardState(CardState.PRINTED);
+		// card.setPrintCount(card.getPrintCount() + 1);
+		// card = cardbean.saveCard(card);
+		// return new PrintedCardRestPojo(card);
 	}
 	}
 
 
 	@GET
 	@GET
@@ -76,7 +99,7 @@ public class PrinterRestView {
 	@GET
 	@GET
 	@Path("/ListUnprinted")
 	@Path("/ListUnprinted")
 	public List<PrintedCardRestPojo> getUserCard(@QueryParam("key") String key) throws Exception {
 	public List<PrintedCardRestPojo> getUserCard(@QueryParam("key") String key) throws Exception {
-		List<PrintedCardRestPojo> ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState(CardState.PENDING_PRINT));
+		List<PrintedCardRestPojo> ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState(CardState.VALIDATED));
 		logger.info("Returning card pojos: {} for key {}", ret, key);
 		logger.info("Returning card pojos: {} for key {}", ret, key);
 		return ret;
 		return ret;
 	}
 	}