smarter feed entry storing (fixes #10)

src/main/java/com/commafeed/backend/dao/FeedEntryService.java

@@ -9,6 +9,7 @@ import javax.inject.Inject;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.commafeed.backend.model.Feed;
@@ -39,17 +40,30 @@ public class FeedEntryService extends GenericDAO<FeedEntry> {
 
 		List<FeedEntry> existingEntries = getByGuids(guids);
 		for (FeedEntry entry : entries) {
-			boolean found = false;
+			FeedEntry foundEntry = null;
 			for (FeedEntry existingEntry : existingEntries) {
 				if (StringUtils
 						.equals(entry.getGuid(), existingEntry.getGuid())) {
-					found = true;
+					foundEntry = existingEntry;
 					break;
 				}
 			}
-			if (!found) {
+			if (foundEntry == null) {
-				entry.setFeed(feed);
+				entry.getFeeds().add(feed);
 				save(entry);
+			} else {
+				boolean foundFeed = false;
+				for (Feed existingFeed : foundEntry.getFeeds()) {
+					if (ObjectUtils.equals(existingFeed.getId(), feed.getId())) {
+						foundFeed = true;
+						break;
+					}
+				}
+
+				if (!foundFeed) {
+					foundEntry.getFeeds().add(feed);
+					update(foundEntry);
+				}
 			}
 		}
 

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

@@ -5,6 +5,7 @@ import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
@@ -33,7 +34,7 @@ public class Feed extends AbstractModel {
 	@Column(length = 1024)
 	private String message;
 
-	@OneToMany(mappedBy = "feed")
+	@ManyToMany(mappedBy = "feeds")
 	private Set<FeedEntry> entries = Sets.newHashSet();
 
 	@OneToMany(mappedBy = "feed")

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

@@ -5,9 +5,11 @@ import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
+import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
@@ -15,6 +17,8 @@ import javax.persistence.TemporalType;
 
 import org.hibernate.annotations.Index;
 
+import com.google.api.client.util.Sets;
+
 @Entity
 @Table(name = "FEEDENTRIES")
 @SuppressWarnings("serial")
@@ -23,9 +27,9 @@ public class FeedEntry extends AbstractModel {
 	@Column(length = 2048, nullable = false)
 	private String guid;
 
-	@ManyToOne
+	@ManyToMany(fetch = FetchType.EAGER)
-	@JoinColumn(nullable = false)
+	@JoinTable(name = "FEED_FEEDENTRIES", joinColumns = { @JoinColumn(name = "FEED_ID", nullable = false, updatable = false) }, inverseJoinColumns = { @JoinColumn(name = "FEEDENTRY_ID", nullable = false, updatable = false) })
-	private Feed feed;
+	private Set<Feed> feeds = Sets.newHashSet();
 
 	@Column(length = 2048)
 	private String title;
@@ -84,12 +88,12 @@ public class FeedEntry extends AbstractModel {
 		this.updated = updated;
 	}
 
-	public Feed getFeed() {
+	public Set<Feed> getFeeds() {
-		return feed;
+		return feeds;
 	}
 
-	public void setFeed(Feed feed) {
+	public void setFeeds(Set<Feed> feeds) {
-		this.feed = feed;
+		this.feeds = feeds;
 	}
 
 	public Set<FeedEntryStatus> getStatuses() {

src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java

@@ -103,8 +103,14 @@ public class EntriesREST extends AbstractREST {
 		List<FeedEntryWithStatus> unreadEntries = feedEntryService.getEntries(
 				getUser(), unreadOnly, offset, limit);
 		for (FeedEntryWithStatus feedEntry : unreadEntries) {
-			Long id = feedEntry.getEntry().getFeed().getId();
+			FeedSubscription sub = null;
-			entries.add(populateEntry(buildEntry(feedEntry), subMapping.get(id)));
+			for (Feed feed : feedEntry.getEntry().getFeeds()) {
+				sub = subMapping.get(feed.getId());
+				if (sub != null) {
+					break;
+				}
+			}
+			entries.add(populateEntry(buildEntry(feedEntry), sub));
 		}
 
 		return entries;
@@ -131,8 +137,14 @@ public class EntriesREST extends AbstractREST {
 		List<FeedEntryWithStatus> unreadEntries = feedEntryService.getEntries(
 				categories, getUser(), unreadOnly, offset, limit);
 		for (FeedEntryWithStatus feedEntry : unreadEntries) {
-			Long id = feedEntry.getEntry().getFeed().getId();
+			FeedSubscription sub = null;
-			entries.add(populateEntry(buildEntry(feedEntry), subMapping.get(id)));
+			for (Feed feed : feedEntry.getEntry().getFeeds()) {
+				sub = subMapping.get(feed.getId());
+				if (sub != null) {
+					break;
+				}
+			}
+			entries.add(populateEntry(buildEntry(feedEntry), sub));
 		}
 
 		return entries;
@@ -253,8 +265,14 @@ public class EntriesREST extends AbstractREST {
 		List<FeedEntryWithStatus> entriesWithStatus = feedEntryService
 				.getEntriesByKeywords(getUser(), keywords);
 		for (FeedEntryWithStatus feedEntry : entriesWithStatus) {
-			Long id = feedEntry.getEntry().getFeed().getId();
+			FeedSubscription sub = null;
-			list.add(populateEntry(buildEntry(feedEntry), subMapping.get(id)));
+			for (Feed feed : feedEntry.getEntry().getFeeds()) {
+				sub = subMapping.get(feed.getId());
+				if (sub != null) {
+					break;
+				}
+			}
+			list.add(populateEntry(buildEntry(feedEntry), sub));
 		}
 
 		entries.setName("Search for : " + keywords);

src/main/resources/META-INF/orm.xml

@@ -14,30 +14,30 @@
 	</named-query>
 	
 	<named-query name="Entry.unread">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed = e.feed) and not exists (select s3 from FeedEntryStatus s3 where s3.entry = e and s3.user =:user and s3.read=true) order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed member of e.feeds) and not exists (select s3 from FeedEntryStatus s3 where s3.entry = e and s3.user =:user and s3.read=true) order by e.updated desc</query>
 	</named-query>
 	<named-query name="Entry.all">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed = e.feed) order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed member of e.feeds) order by e.updated desc</query>
 	</named-query>
 	
 	<named-query name="Entry.unreadByFeed">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where e.feed=:feed and not exists (select s2 from FeedEntryStatus s2 where s2.entry=e and s2.user.id=:userId and s2.read=true) order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where :feed member of e.feeds and not exists (select s2 from FeedEntryStatus s2 where s2.entry=e and s2.user.id=:userId and s2.read=true) order by e.updated desc</query>
 	</named-query>
 	<named-query name="Entry.unreadByFeedCount">
-		<query>select count(e) from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where e.feed=:feed and not exists (select s2 from FeedEntryStatus s2 where s2.entry=e and s2.user.id=:userId and s2.read=true)</query>
+		<query>select count(e) from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where :feed member of e.feeds and not exists (select s2 from FeedEntryStatus s2 where s2.entry=e and s2.user.id=:userId and s2.read=true)</query>
 	</named-query>
 	<named-query name="Entry.allByFeed">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where e.feed=:feed order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where :feed member of e.feeds order by e.updated desc</query>
 	</named-query>
 	
 	<named-query name="Entry.unreadByCategories">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed = e.feed and s2.category in (:categories) ) and not exists (select s3 from FeedEntryStatus s3 where s3.entry = e and s3.user =:user and s3.read=true) order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed member of e.feeds and s2.category in (:categories) ) and not exists (select s3 from FeedEntryStatus s3 where s3.entry = e and s3.user =:user and s3.read=true) order by e.updated desc</query>
 	</named-query>
 	<named-query name="Entry.allByCategories">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed = e.feed and s2.category in (:categories) )  order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed member of e.feeds and s2.category in (:categories) )  order by e.updated desc</query>
 	</named-query>
 	
 	<named-query name="Entry.allByKeywords">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed = e.feed) and (lower(e.content) like :keywords or lower(e.title) like :keywords) order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed member of e.feeds) and (lower(e.content) like :keywords or lower(e.title) like :keywords) order by e.updated desc</query>
 	</named-query>
 </entity-mappings>

src/main/webapp/js/controllers.js

@@ -88,7 +88,7 @@ module.controller('CategoryTreeCtrl', function($scope, $timeout, $stateParams,
 
 	$timeout(function refreshTree() {
 		SubscriptionService.init(function() {
-			$timeout(refreshTree, 30000);
+			$timeout(refreshTree, 15000);
 		});
 	}, 30000);
 

src/main/webapp/js/directives.js

@@ -20,21 +20,21 @@ module.directive('scrollTo', function($timeout) {
 					return;
 				$timeout(function() {
 					var docTop = $(window).scrollTop();
-				    var docBottom = docTop + $(window).height();
+					var docBottom = docTop + $(window).height();
 
-				    var elemTop = $(element).offset().top;
+					var elemTop = $(element).offset().top;
-				    var elemBottom = elemTop + $(element).height();
+					var elemBottom = elemTop + $(element).height();
 
-				    if ((elemTop > docTop) && (elemBottom < docBottom)) {
+					if ((elemTop > docTop) && (elemBottom < docBottom)) {
-				    	// element is entirely visible
+						// element is entirely visible
-				    	return;
+						return;
-				    } else {
+					} else {
-				    	var offset = parseInt(attrs.scrollToOffset, 10);
+						var offset = parseInt(attrs.scrollToOffset, 10);
-				    	 var scrollTop = $(element).offset().top + offset;
+						var scrollTop = $(element).offset().top + offset;
-				    	 $('html, body').animate({
+						$('html, body').animate({
-				    		 scrollTop : scrollTop
+							scrollTop : scrollTop
-				    	 }, 0);
+						}, 0);
-				    }
+					}
 				});
 			});
 		}