From fd48108f8b87025327c357be0879d8cfc228a381 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 3 Jul 2024 17:47:14 +0200
Subject: [PATCH] don't rely on dates to know if an entry has been inserted in
 the database

---
 .../backend/feed/FeedRefreshUpdater.java      | 10 +++---
 .../backend/service/FeedEntryService.java     | 36 +++++++------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java
index f47c5455..ce6c582e 100644
--- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java
@@ -1,6 +1,5 @@
 package com.commafeed.backend.feed;
 
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -103,9 +102,12 @@ public class FeedRefreshUpdater {
 			if (locked1 && locked2) {
 				processed = true;
 				inserted = unitOfWork.call(() -> {
-					Instant now = Instant.now();
-					FeedEntry feedEntry = feedEntryService.findOrCreate(feed, entry);
-					boolean newEntry = !feedEntry.getInserted().isBefore(now);
+					boolean newEntry = false;
+					FeedEntry feedEntry = feedEntryService.find(feed, entry);
+					if (feedEntry == null) {
+						feedEntry = feedEntryService.create(feed, entry);
+						newEntry = true;
+					}
 					if (newEntry) {
 						entryInserted.mark();
 						for (FeedSubscription sub : subscriptions) {
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 399989e3..7f2445f7 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
@@ -35,18 +35,21 @@ public class FeedEntryService {
 	private final FeedEntryFilteringService feedEntryFilteringService;
 	private final CacheService cache;
 
-	/**
-	 * this is NOT thread-safe
-	 */
-	public FeedEntry findOrCreate(Feed feed, Entry entry) {
-		String guid = FeedUtils.truncate(entry.guid(), 2048);
+	public FeedEntry find(Feed feed, Entry entry) {
 		String guidHash = Digests.sha1Hex(entry.guid());
-		FeedEntry existing = feedEntryDAO.findExisting(guidHash, feed);
-		if (existing != null) {
-			return existing;
-		}
+		return feedEntryDAO.findExisting(guidHash, feed);
+	}
+
+	public FeedEntry create(Feed feed, Entry entry) {
+		FeedEntry feedEntry = new FeedEntry();
+		feedEntry.setGuid(FeedUtils.truncate(entry.guid(), 2048));
+		feedEntry.setGuidHash(Digests.sha1Hex(entry.guid()));
+		feedEntry.setUrl(FeedUtils.truncate(entry.url(), 2048));
+		feedEntry.setUpdated(entry.updated());
+		feedEntry.setInserted(Instant.now());
+		feedEntry.setFeed(feed);
+		feedEntry.setContent(feedEntryContentService.findOrCreate(entry.content(), feed.getLink()));
 
-		FeedEntry feedEntry = buildEntry(feed, entry, guid, guidHash);
 		feedEntryDAO.saveOrUpdate(feedEntry);
 		return feedEntry;
 	}
@@ -68,19 +71,6 @@ public class FeedEntryService {
 		return matches;
 	}
 
-	private FeedEntry buildEntry(Feed feed, Entry e, String guid, String guidHash) {
-		FeedEntry entry = new FeedEntry();
-		entry.setGuid(guid);
-		entry.setGuidHash(guidHash);
-		entry.setUrl(FeedUtils.truncate(e.url(), 2048));
-		entry.setUpdated(e.updated());
-		entry.setInserted(Instant.now());
-		entry.setFeed(feed);
-
-		entry.setContent(feedEntryContentService.findOrCreate(e.content(), feed.getLink()));
-		return entry;
-	}
-
 	public void markEntry(User user, Long entryId, boolean read) {
 		FeedEntry entry = feedEntryDAO.findById(entryId);
 		if (entry == null) {