mark all as read

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

@@ -40,7 +40,7 @@ public class FeedEntryService extends GenericDAO<FeedEntry, Long> {
 	}
 
 	private TypedQuery<FeedEntry> unreadQuery(Feed feed, User user) {
-		String query = "select e from FeedEntry e where e.feed=:feed and not exists (select s from FeedEntryStatus s where s.entry = e and s.user =:user and s.read = true)";
+		String query = "select e from FeedEntry e where e.feed =:feed and not exists (select s from FeedEntryStatus s where s.entry = e and s.user =:user and s.read = true)";
 		TypedQuery<FeedEntry> typedQuery = em.createQuery(query,
 				FeedEntry.class);
 		typedQuery.setParameter("feed", feed);

src/main/java/com/commafeed/backend/feeds/FeedTimer.java

@@ -3,6 +3,7 @@ package com.commafeed.backend.feeds;
 import java.util.Calendar;
 import java.util.Map;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 import javax.ejb.Schedule;
 import javax.ejb.Singleton;
@@ -46,7 +47,7 @@ public class FeedTimer {
 		for (String key : futures.keySet()) {
 			Future<Feed> future = futures.get(key);
 			try {
-				Feed feed = future.get();
+				Feed feed = future.get(1, TimeUnit.MINUTES);
 				feedEntryService
 						.updateEntries(feed.getUrl(), feed.getEntries());
 			} catch (Exception e) {

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

@@ -8,11 +8,11 @@ import java.util.List;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
 
 import org.apache.commons.lang.ObjectUtils;
 
+import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntryStatus;
@@ -30,7 +30,7 @@ public class EntriesREST extends AbstractREST {
 	private static final String ALL = "all";
 
 	public enum Type {
-		category, feed;
+		category, feed, entry;
 	}
 
 	public enum ReadType {
@@ -132,22 +132,42 @@ public class EntriesREST extends AbstractREST {
 		return entry;
 	}
 
-	@Path("mark/{type}/{id}/{read}")
+	@Path("mark")
 	@GET
-	public void mark(@PathParam("type") String type,
-			@PathParam("id") String id, @PathParam("read") boolean read) {
-		if ("entry".equals(type)) {
+	public void mark(@QueryParam("type") Type type,
+			@QueryParam("id") String id, @QueryParam("read") boolean read) {
+		Preconditions.checkNotNull(type);
+		Preconditions.checkNotNull(id);
+		Preconditions.checkNotNull(read);
+
+		if (type == Type.entry) {
 			FeedEntry entry = feedEntryService.findById(Long.valueOf(id));
-			FeedEntryStatus status = feedEntryStatusService.getStatus(
-					getUser(), entry);
-			if (status == null) {
-				status = new FeedEntryStatus();
-				status.setUser(getUser());
-				status.setEntry(entry);
+			markEntry(entry, read);
+		} else if (type == Type.feed) {
+			List<FeedEntry> entries = null;
+			Feed feed = feedSubscriptionService.findById(Long.valueOf(id))
+					.getFeed();
+			if (read) {
+				entries = feedEntryService.getUnreadEntries(feed, getUser());
+			} else {
+				entries = feedEntryService.getAllEntries(feed);
+			}
+			for (FeedEntry entry : entries) {
+				markEntry(entry, read);
 			}
-			status.setRead(read);
-			feedEntryStatusService.saveOrUpdate(status);
 		}
 	}
 
+	private void markEntry(FeedEntry entry, boolean read) {
+		FeedEntryStatus status = feedEntryStatusService.getStatus(getUser(),
+				entry);
+		if (status == null) {
+			status = new FeedEntryStatus();
+			status.setUser(getUser());
+			status.setEntry(entry);
+		}
+		status.setRead(read);
+		feedEntryStatusService.saveOrUpdate(status);
+	}
+
 }