From fa197c33f1834b74d49bee90b350fe014c973006 Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 14 Jul 2024 20:26:30 +0200 Subject: [PATCH] rename field accordingly --- .../commafeed/backend/dao/FeedEntryDAO.java | 8 ++++++-- .../backend/dao/FeedEntryStatusDAO.java | 18 +++++++++--------- .../com/commafeed/backend/model/FeedEntry.java | 5 ++--- .../backend/model/FeedEntryStatus.java | 6 +++--- .../backend/service/FeedEntryService.java | 4 ++-- .../com/commafeed/frontend/model/Entry.java | 2 +- .../frontend/resource/fever/FeverREST.java | 2 +- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java index d24148f5..2cf226ad 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java @@ -50,7 +50,11 @@ public class FeedEntryDAO extends GenericDAO { * Delete entries older than a certain date */ public int deleteEntriesOlderThan(Instant olderThan, long max) { - List list = query().selectFrom(ENTRY).where(ENTRY.updated.lt(olderThan)).orderBy(ENTRY.updated.asc()).limit(max).fetch(); + List list = query().selectFrom(ENTRY) + .where(ENTRY.published.lt(olderThan)) + .orderBy(ENTRY.published.asc()) + .limit(max) + .fetch(); return delete(list); } @@ -58,7 +62,7 @@ public class FeedEntryDAO extends GenericDAO { * Delete the oldest entries of a feed */ public int deleteOldEntries(Long feedId, long max) { - List list = query().selectFrom(ENTRY).where(ENTRY.feed.id.eq(feedId)).orderBy(ENTRY.updated.asc()).limit(max).fetch(); + List list = query().selectFrom(ENTRY).where(ENTRY.feed.id.eq(feedId)).orderBy(ENTRY.published.asc()).limit(max).fetch(); return delete(list); } diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index 37f3267a..358fbaa2 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -61,7 +61,7 @@ public class FeedEntryStatusDAO extends GenericDAO { private FeedEntryStatus handleStatus(User user, FeedEntryStatus status, FeedSubscription sub, FeedEntry entry) { if (status == null) { Instant unreadThreshold = config.getApplicationSettings().getUnreadThreshold(); - boolean read = unreadThreshold != null && entry.getUpdated().isBefore(unreadThreshold); + boolean read = unreadThreshold != null && entry.getPublished().isBefore(unreadThreshold); status = new FeedEntryStatus(user, sub, entry); status.setRead(read); status.setMarkable(!read); @@ -92,9 +92,9 @@ public class FeedEntryStatusDAO extends GenericDAO { } if (order == ReadingOrder.asc) { - query.orderBy(STATUS.entryUpdated.asc(), STATUS.id.asc()); + query.orderBy(STATUS.entryPublished.asc(), STATUS.id.asc()); } else { - query.orderBy(STATUS.entryUpdated.desc(), STATUS.id.desc()); + query.orderBy(STATUS.entryPublished.desc(), STATUS.id.desc()); } if (offset > -1) { @@ -165,9 +165,9 @@ public class FeedEntryStatusDAO extends GenericDAO { if (order != null) { if (order == ReadingOrder.asc) { - query.orderBy(ENTRY.updated.asc(), ENTRY.id.asc()); + query.orderBy(ENTRY.published.asc(), ENTRY.id.asc()); } else { - query.orderBy(ENTRY.updated.desc(), ENTRY.id.desc()); + query.orderBy(ENTRY.published.desc(), ENTRY.id.desc()); } } @@ -199,7 +199,7 @@ public class FeedEntryStatusDAO extends GenericDAO { } public UnreadCount getUnreadCount(FeedSubscription sub) { - JPAQuery query = query().select(ENTRY.count(), ENTRY.updated.max()) + JPAQuery query = query().select(ENTRY.count(), ENTRY.published.max()) .from(ENTRY) .leftJoin(ENTRY.statuses, STATUS) .on(STATUS.subscription.eq(sub)) @@ -208,8 +208,8 @@ public class FeedEntryStatusDAO extends GenericDAO { Tuple tuple = query.fetchOne(); Long count = tuple.get(ENTRY.count()); - Instant updated = tuple.get(ENTRY.updated.max()); - return new UnreadCount(sub.getId(), count == null ? 0 : count, updated); + Instant published = tuple.get(ENTRY.published.max()); + return new UnreadCount(sub.getId(), count == null ? 0 : count, published); } private BooleanBuilder buildUnreadPredicate() { @@ -219,7 +219,7 @@ public class FeedEntryStatusDAO extends GenericDAO { Instant unreadThreshold = config.getApplicationSettings().getUnreadThreshold(); if (unreadThreshold != null) { - return or.and(ENTRY.updated.goe(unreadThreshold)); + return or.and(ENTRY.published.goe(unreadThreshold)); } else { return or; } diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java index 5bb2b7e7..c86c4992 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java @@ -46,10 +46,9 @@ public class FeedEntry extends AbstractModel { /** * the moment the entry was published in the feed * - * TODO rename the field to published */ - @Column - private Instant updated; + @Column(name = "updated") + private Instant published; @OneToMany(mappedBy = "entry", cascade = CascadeType.REMOVE) private Set statuses; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java index 1f73e674..d708404d 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java @@ -50,8 +50,8 @@ public class FeedEntryStatus extends AbstractModel { @Column private Instant entryInserted; - @Column - private Instant entryUpdated; + @Column(name = "entryUpdated") + private Instant entryPublished; public FeedEntryStatus() { @@ -62,7 +62,7 @@ public class FeedEntryStatus extends AbstractModel { this.subscription = subscription; this.entry = entry; this.entryInserted = entry.getInserted(); - this.entryUpdated = entry.getUpdated(); + this.entryPublished = entry.getPublished(); } } diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java index c1006d3c..d75e1915 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java @@ -45,7 +45,7 @@ public class FeedEntryService { feedEntry.setGuid(FeedUtils.truncate(entry.guid(), 2048)); feedEntry.setGuidHash(Digests.sha1Hex(entry.guid())); feedEntry.setUrl(FeedUtils.truncate(entry.url(), 2048)); - feedEntry.setUpdated(entry.published()); + feedEntry.setPublished(entry.published()); feedEntry.setInserted(Instant.now()); feedEntry.setFeed(feed); feedEntry.setContent(feedEntryContentService.findOrCreate(entry.content(), feed.getLink())); @@ -124,7 +124,7 @@ public class FeedEntryService { private void markList(List statuses, Instant olderThan, Instant insertedBefore) { List statusesToMark = statuses.stream().filter(FeedEntryStatus::isMarkable).filter(s -> { - Instant entryDate = s.getEntry().getUpdated(); + Instant entryDate = s.getEntry().getPublished(); return olderThan == null || entryDate == null || entryDate.isBefore(olderThan); }).filter(s -> { Instant insertedDate = s.getEntry().getInserted(); diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java index 606dcd4d..87624d77 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java @@ -115,7 +115,7 @@ public class Entry implements Serializable { entry.setRead(status.isRead()); entry.setStarred(status.isStarred()); entry.setMarkable(status.isMarkable()); - entry.setDate(feedEntry.getUpdated()); + entry.setDate(feedEntry.getPublished()); entry.setInsertedDate(feedEntry.getInserted()); entry.setUrl(feedEntry.getUrl()); entry.setFeedName(sub.getTitle()); diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java index 512b6c3c..551f1f8e 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java @@ -295,7 +295,7 @@ public class FeverREST { i.setUrl(s.getEntry().getUrl()); i.setSaved(s.isStarred()); i.setRead(s.isRead()); - i.setCreatedOnTime(s.getEntryUpdated().getEpochSecond()); + i.setCreatedOnTime(s.getEntryPublished().getEpochSecond()); return i; }