Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fetch the entry instead of creating an empty one

Browse Source
This commit is contained in:
Athou
2013-07-19 12:02:20 +02:00
parent be8a381377
commit 079a73c92e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/commafeed/backend/services/FeedEntryService.java
View File

@@ -3,6 +3,7 @@ package com.commafeed.backend.services;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.inject.Inject; import javax.inject.Inject;
import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntry;
@@ -18,6 +19,9 @@ public class FeedEntryService {
@Inject @Inject
FeedSubscriptionDAO feedSubscriptionDAO; FeedSubscriptionDAO feedSubscriptionDAO;
@Inject
FeedEntryDAO feedEntryDAO;
public void markEntry(User user, Long entryId, Long subscriptionId, public void markEntry(User user, Long entryId, Long subscriptionId,
boolean read) { boolean read) {
@@ -27,8 +31,10 @@ public class FeedEntryService {
return; return;
} }
FeedEntry entry = new FeedEntry(); FeedEntry entry = feedEntryDAO.findById(entryId);
entry.setId(entryId); if (entry == null) {
return;
}
FeedEntryStatus status = feedEntryStatusDAO.getStatus(sub, entry); FeedEntryStatus status = feedEntryStatusDAO.getStatus(sub, entry);
@@ -61,8 +67,10 @@ public class FeedEntryService {
return; return;
} }
FeedEntry entry = new FeedEntry(); FeedEntry entry = feedEntryDAO.findById(entryId);
entry.setId(entryId); if (entry == null) {
return;
}
FeedEntryStatus status = feedEntryStatusDAO.getStatus(sub, entry); FeedEntryStatus status = feedEntryStatusDAO.getStatus(sub, entry);