Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya

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

@@ -334,12 +334,17 @@ public class CardPrintBean implements CardPrintBeanLocal {
 				mpr.getAffectedUsers().add(user);
 			}
 		}
+		
+		if (mpr.getAffectedUsers().size() == 0) {
+			outputStream.close();
+			throw new Exception("No cards generated");
+		}
+		
 		pdf.flush();
 		outputStream.close();
-
-		if (mpr.getAffectedUsers().size() == 0)
-			throw new Exception("No cards generated");
+		
 		mpr.setPdf(outputStream.toByteArray());
+		
 		return mpr;
 	}
 

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

@@ -144,24 +144,15 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 		List<PrintedCard> myCards = printedcardfacade.getCards(user);
 
 		PrintedCard biggestCard = null;
-		// PrintedCard smallestCard = null;
 		for (PrintedCard card : myCards) {
-			// logger.info("Checking card {}", card);
 			if (card.getEnabled()) {
-
 				if (biggestCard == null || biggestCard.getTemplate().getPower() < card.getTemplate().getPower()) {
 					// The biggest card should be the only one enabled.
 					if (biggestCard != null) {
 						biggestCard.setEnabled(false);
 					}
 					biggestCard = card;
-					biggestCard.setEnabled(true);
 				}
-				// if (smallestCard == null ||
-				// smallestCard.getTemplate().getPower() >
-				// card.getTemplate().getPower()) {
-				// smallestCard = card;
-				// }
 			}
 		}
 
@@ -201,17 +192,19 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 				msg.setFromName("Lippukauppa");
 				msg.setToAddress(value.getTextvalue());
 				msg.setSubject("User " + user.getUser().getLogin() + " has too powerful card!");
-				msg.setMessage("User ", user.getUser().getLogin(), "has too powerful card!\nCurrent power ", existingPower, ". Should be ", newPower, "\n\n-- \nLippukauppa");
+				msg.setMessage("User ", user.getUser().getLogin(), "has too powerful card!\nCurrent power ", existingPower, ". Should be ", newPower, ". Card replaced with less power.\n\n-- \nLippukauppa");
 				mailbean.sendMail(msg);
-				logger.info("User {} has too much power old role {} New role {}", new Object[] { user.getUser().getLogin(), existingPower, newPower });
 			}
+			
+			logger.info("User {} has too much power old role {} New role {}, old card revoked.", new Object[] { user.getUser().getLogin(), existingPower, newPower });
+			
+			biggestCard.setEnabled(false);
+			return this.checkPrintedCard(user);
 		} else {
 			logger.info("User {} has power {} and roles has power {}", new Object[] { user.getUser().getLogin(), existingPower, newPower });
 		}
 
-		eventPropertyFacade.flush();
 		return biggestCard;
-
 	}
 
 	@Override