Added card state and cardId to rest LastEventusers

code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/ReaderEventRestPojo.java

@@ -6,19 +6,23 @@ import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
 
+import fi.codecrew.moya.enums.CardState;
 import fi.codecrew.moya.model.ReaderEvent;
 
 public class ReaderEventRestPojo {
 	private ReaderEvent event;
 	private EventUserRestPojo eventUser;
+	private PrintedCardRestPojo printedCard;
 
 	public ReaderEventRestPojo() {
 	}
 
 	public ReaderEventRestPojo(ReaderEvent re) {
 		this.event = re;
-		if (re != null && re.getPrintedCard() != null && re.getPrintedCard().getUser() != null) {
-			eventUser = new EventUserRestPojo(re.getPrintedCard().getUser());
+		if (re != null && re.getPrintedCard() != null) {
+			if (re.getPrintedCard().getUser() != null) {
+				eventUser = new EventUserRestPojo(re.getPrintedCard().getUser());
+			}
 		}
 	}
 
@@ -42,6 +46,27 @@ public class ReaderEventRestPojo {
 		return event.getReader().getId();
 	}
 
+	@XmlElement(name = "printedCardId")
+	public Integer getPrintedCardId()
+	{
+		Integer ret = null;
+		if (event != null && event.getPrintedCard() != null)
+		{
+			ret = event.getPrintedCard().getId();
+		}
+		return ret;
+	}
+
+	@XmlElement(name = "printedCardState")
+	public CardState getPrintedCardState()
+	{
+		CardState ret = null;
+		if (event != null && event.getPrintedCard() != null) {
+			ret = event.getPrintedCard().getCardState();
+		}
+		return ret;
+	}
+
 	public static List<ReaderEventRestPojo> parse(List<ReaderEvent> readers) {
 
 		List<ReaderEventRestPojo> ret = new ArrayList<>();