Change bill.expires from Calendar to Date

code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceSlotFacade.java

@@ -20,6 +20,7 @@ package fi.codecrew.moya.facade;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
@@ -142,10 +143,10 @@ public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
 			preds.add(cb.isNotNull(bill.get(Bill_.paidDate)));
 			preds.add(cb.isNotNull(bill.get(Bill_.paidDate)));
 		} else {
 		} else {
 			// If expire is null or has not passed, count it
 			// If expire is null or has not passed, count it
-			Path<Calendar> billexp = bill.get(Bill_.expires);
+			Path<Date> billexp = bill.get(Bill_.expires);
 			preds.add(cb.or(
 			preds.add(cb.or(
 					cb.isNull(billexp),
 					cb.isNull(billexp),
-					cb.greaterThan(billexp, Calendar.getInstance())
+					cb.greaterThan(billexp, new Date())
 					));
 					));
 		}
 		}
 
 
@@ -181,10 +182,10 @@ public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
 		if (paidOnly) {
 		if (paidOnly) {
 			preds.add(cb.isNotNull(bill.get(Bill_.paidDate)));
 			preds.add(cb.isNotNull(bill.get(Bill_.paidDate)));
 		} else {
 		} else {
-			Path<Calendar> billexp = bill.get(Bill_.expires);
+			Path<Date> billexp = bill.get(Bill_.expires);
 			preds.add(cb.or(
 			preds.add(cb.or(
 					cb.isNull(billexp),
 					cb.isNull(billexp),
-					cb.greaterThan(billexp, Calendar.getInstance())
+					cb.greaterThan(billexp, new Date())
 					));
 					));
 		}
 		}
 
 

code/moya-database/src/main/java/fi/codecrew/moya/model/Bill.java

@@ -124,6 +124,7 @@ public class Bill extends GenericEntity {
 
 
 	@Column(name = "payment_time", nullable = false)
 	@Column(name = "payment_time", nullable = false)
 	private Integer paymentTime = 0;
 	private Integer paymentTime = 0;
+
 	@Column(name = "notice_days", nullable = false)
 	@Column(name = "notice_days", nullable = false)
 	private String noticetime = "8 vrk";
 	private String noticetime = "8 vrk";
 	@Column(name = "their_reference", nullable = false)
 	@Column(name = "their_reference", nullable = false)
@@ -137,7 +138,7 @@ public class Bill extends GenericEntity {
 
 
 	@Column(name = "expires", nullable = true)
 	@Column(name = "expires", nullable = true)
 	@Temporal(TemporalType.TIMESTAMP)
 	@Temporal(TemporalType.TIMESTAMP)
-	private Calendar expires = null;
+	private Date expires = null;
 
 
 	/**
 	/**
 	 * Notes for the event organisators about the bill.
 	 * Notes for the event organisators about the bill.
@@ -237,7 +238,7 @@ public class Bill extends GenericEntity {
 		return total;
 		return total;
 	}
 	}
 
 
-	public Bill(LanEvent event, EventUser user, Calendar expires) {
+	public Bill(LanEvent event, EventUser user, Date expires) {
 		this(event, expires);
 		this(event, expires);
 		this.setUser(user);
 		this.setUser(user);
 		this.setAddr1(user.getUser().getFirstnames() + " " + user.getUser().getLastname());
 		this.setAddr1(user.getUser().getFirstnames() + " " + user.getUser().getLastname());
@@ -245,27 +246,23 @@ public class Bill extends GenericEntity {
 		this.setAddr3(user.getUser().getZip() + " " + user.getUser().getTown());
 		this.setAddr3(user.getUser().getZip() + " " + user.getUser().getTown());
 	}
 	}
 
 
-	public Bill(LanEvent event, Calendar expires) {
+	public Bill(LanEvent event, Date expires) {
 		this();
 		this();
 		this.expires = expires;
 		this.expires = expires;
 		this.event = event;
 		this.event = event;
 	}
 	}
 
 
 	public Bill(LanEvent event, EventUser user, long expireTimeHours) {
 	public Bill(LanEvent event, EventUser user, long expireTimeHours) {
-		this(event, user, Calendar.getInstance());
-		this.expires.setTimeInMillis((System.currentTimeMillis() + (expireTimeHours * 60 * 60 * 1000)));
+		this(event, user, new Date(System.currentTimeMillis() + (expireTimeHours * 60 * 60 * 1000)));
 	}
 	}
 
 
 	public Bill(LanEvent event, long expireTimeHours) {
 	public Bill(LanEvent event, long expireTimeHours) {
-		this(event, Calendar.getInstance());
-		this.expires.setTimeInMillis((System.currentTimeMillis() + (expireTimeHours * 60 * 60 * 1000)));
+		this(event, new Date(System.currentTimeMillis() + (expireTimeHours * 60 * 60 * 1000)));
 	}
 	}
 
 
 	public Bill() {
 	public Bill() {
 		super();
 		super();
-
-		this.expires = Calendar.getInstance();
-		this.expires.setTimeInMillis((System.currentTimeMillis() + 1209600000)); // 2vk
+		this.expires = new Date(System.currentTimeMillis() + 14 * 24 * 60 * 60 * 1000); // 2vk
 	}
 	}
 
 
 	public Calendar getDueDate() {
 	public Calendar getDueDate() {
@@ -479,11 +476,11 @@ public class Bill extends GenericEntity {
 		return false;
 		return false;
 	}
 	}
 
 
-	public Calendar getExpires() {
+	public Date getExpires() {
 		return expires;
 		return expires;
 	}
 	}
 
 
-	public void setExpires(Calendar expires) {
+	public void setExpires(Date expires) {
 		this.expires = expires;
 		this.expires = expires;
 	}
 	}
 
 
@@ -491,14 +488,14 @@ public class Bill extends GenericEntity {
 		if (isPaid() || expires == null)
 		if (isPaid() || expires == null)
 			return false;
 			return false;
 
 
-		return Calendar.getInstance().after(expires);
+		return new Date().after(expires);
 	}
 	}
 
 
 	public void markExpired() {
 	public void markExpired() {
 		if (isExpired() || isPaid())
 		if (isExpired() || isPaid())
 			return;
 			return;
 
 
-		expires = Calendar.getInstance();
+		expires = new Date();
 	}
 	}
 
 
 	@Transient
 	@Transient