refactored the way entries and statuses are fetched

src/main/java/com/commafeed/backend/model/FeedEntry.java

@@ -14,6 +14,7 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Transient;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -53,6 +54,12 @@ public class FeedEntry extends AbstractModel {
 	@OneToMany(mappedBy = "entry", cascade = CascadeType.REMOVE)
 	private Set<FeedEntryStatus> statuses;
 
+	/**
+	 * useful placeholder for the subscription, not persisted
+	 */
+	@Transient
+	private FeedSubscription subscription;
+
 	public String getGuid() {
 		return guid;
 	}
@@ -125,4 +132,12 @@ public class FeedEntry extends AbstractModel {
 		this.feedRelationships = feedRelationships;
 	}
 
+	public FeedSubscription getSubscription() {
+		return subscription;
+	}
+
+	public void setSubscription(FeedSubscription subscription) {
+		this.subscription = subscription;
+	}
+
 }

src/main/java/com/commafeed/backend/model/FeedFeedEntry.java

@@ -1,6 +1,7 @@
 package com.commafeed.backend.model;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import javax.persistence.Cacheable;
 import javax.persistence.Entity;
@@ -9,6 +10,8 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -30,6 +33,9 @@ public class FeedFeedEntry implements Serializable {
 	@JoinColumn(name = "FEEDENTRY_ID")
 	private FeedEntry entry;
 
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date entryUpdated;
+
 	public FeedFeedEntry() {
 
 	}
@@ -37,6 +43,7 @@ public class FeedFeedEntry implements Serializable {
 	public FeedFeedEntry(Feed feed, FeedEntry entry) {
 		this.feed = feed;
 		this.entry = entry;
+		this.entryUpdated = entry.getUpdated();
 	}
 
 	public Feed getFeed() {
@@ -55,4 +62,12 @@ public class FeedFeedEntry implements Serializable {
 		this.entry = entry;
 	}
 
+	public Date getEntryUpdated() {
+		return entryUpdated;
+	}
+
+	public void setEntryUpdated(Date entryUpdated) {
+		this.entryUpdated = entryUpdated;
+	}
+
 }