From eb8626f0e1e8d7d0ddc3741e3a98ec5abad3fb40 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 9 Nov 2026 06:08:40 +0100 Subject: [PATCH] fix "mark all as read" in tag views marking the wrong entries (#2374) --- commafeed-client/src/app/entries/thunks.ts | 9 +++-- commafeed-client/src/app/types.ts | 1 + .../backend/service/FeedEntryService.java | 5 +-- .../frontend/model/request/MarkRequest.java | 4 +++ .../frontend/resource/CategoryREST.java | 6 ++-- .../commafeed/frontend/resource/FeedREST.java | 2 +- .../frontend/resource/fever/FeverREST.java | 4 +-- .../googlereader/GoogleReaderREST.java | 6 ++-- .../integration/rest/CategoryIT.java | 35 +++++++++++++++++++ 9 files changed, 60 insertions(+), 12 deletions(-) diff --git a/commafeed-client/src/app/entries/thunks.ts b/commafeed-client/src/app/entries/thunks.ts index c94d6a2e..cc780d11 100644 --- a/commafeed-client/src/app/entries/thunks.ts +++ b/commafeed-client/src/app/entries/thunks.ts @@ -126,8 +126,13 @@ export const markAllEntries = createAppAsyncThunk( }, thunkApi ) => { - const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries - await endpoint(arg.req) + if (arg.sourceType === "tag") { + await client.category.markEntries({ ...arg.req, id: Constants.categories.all.id, tag: arg.req.id }) + } else if (arg.sourceType === "category") { + await client.category.markEntries(arg.req) + } else { + await client.feed.markEntries(arg.req) + } thunkApi.dispatch(reloadEntries()) thunkApi.dispatch(reloadTree()) } diff --git a/commafeed-client/src/app/types.ts b/commafeed-client/src/app/types.ts index 80c9e23d..99aa3b43 100644 --- a/commafeed-client/src/app/types.ts +++ b/commafeed-client/src/app/types.ts @@ -147,6 +147,7 @@ export interface MarkRequest { insertedBefore?: number keywords?: string excludedSubscriptions?: number[] + tag?: string } export interface MetricCounter { 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 caaff8fb..374b384c 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 @@ -116,10 +116,11 @@ public class FeedEntryService { List subscriptions, Instant olderThan, Instant insertedBefore, - List keywords) { + List keywords, + String tag) { List statuses = feedEntryStatusDAO.findBySubscriptions( - user, subscriptions, true, keywords, null, -1, -1, null, false, null, null, null); + user, subscriptions, true, keywords, null, -1, -1, null, false, tag, null, null); markList(statuses, olderThan, insertedBefore); } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java index 4ef383d0..cd458f76 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java @@ -37,4 +37,8 @@ public class MarkRequest implements Serializable { @Schema(description = "if marking a category or 'all', exclude those subscriptions from the marking") private List excludedSubscriptions; + + @Schema(description = "if marking a category or 'all', only mark entries tagged with this tag") + @Size(max = 40) + private String tag; } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java index 80add096..79167012 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java @@ -299,7 +299,8 @@ public class CategoryREST { if (ALL.equals(req.getId())) { List subs = feedSubscriptionDAO.findAll(user); removeExcludedSubscriptions(subs, req.getExcludedSubscriptions()); - feedEntryService.markSubscriptionEntries(user, subs, olderThan, insertedBefore, entryKeywords); + feedEntryService.markSubscriptionEntries( + user, subs, olderThan, insertedBefore, entryKeywords, req.getTag()); } else if (STARRED.equals(req.getId())) { feedEntryService.markStarredEntries(user, olderThan, insertedBefore); } else { @@ -307,7 +308,8 @@ public class CategoryREST { List categories = feedCategoryDAO.findAllChildrenCategories(user, parent); List subs = feedSubscriptionDAO.findByCategories(user, categories); removeExcludedSubscriptions(subs, req.getExcludedSubscriptions()); - feedEntryService.markSubscriptionEntries(user, subs, olderThan, insertedBefore, entryKeywords); + feedEntryService.markSubscriptionEntries( + user, subs, olderThan, insertedBefore, entryKeywords, req.getTag()); } return Response.ok().build(); } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java index 0dac2fec..ea2d6ce1 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java @@ -334,7 +334,7 @@ public class FeedREST { FeedSubscription subscription = feedSubscriptionDAO.findById(user, Long.valueOf(req.getId())); if (subscription != null) { feedEntryService.markSubscriptionEntries( - user, Collections.singletonList(subscription), olderThan, insertedBefore, entryKeywords); + user, Collections.singletonList(subscription), olderThan, insertedBefore, entryKeywords, null); } return Response.ok().build(); } 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 40cdd620..8403b375 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 @@ -369,12 +369,12 @@ public class FeverREST { } else if ("feed".equals(source)) { FeedSubscription subscription = feedSubscriptionDAO.findById(user, id); feedEntryService.markSubscriptionEntries( - user, Collections.singletonList(subscription), null, insertedBefore, null); + user, Collections.singletonList(subscription), null, insertedBefore, null, null); } else if ("group".equals(source)) { FeedCategory parent = feedCategoryDAO.findById(user, id); List categories = feedCategoryDAO.findAllChildrenCategories(user, parent); List subscriptions = feedSubscriptionDAO.findByCategories(user, categories); - feedEntryService.markSubscriptionEntries(user, subscriptions, null, insertedBefore, null); + feedEntryService.markSubscriptionEntries(user, subscriptions, null, insertedBefore, null, null); } } } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/googlereader/GoogleReaderREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/googlereader/GoogleReaderREST.java index 62446611..f859eeba 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/googlereader/GoogleReaderREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/googlereader/GoogleReaderREST.java @@ -421,7 +421,7 @@ public class GoogleReaderREST { Long subId = parsed.feedSubscriptionId(); FeedSubscription sub = subId == null ? null : feedSubscriptionDAO.findById(user, subId); if (sub != null) { - feedEntryService.markSubscriptionEntries(user, List.of(sub), olderThan, null, null); + feedEntryService.markSubscriptionEntries(user, List.of(sub), olderThan, null, null, null); } } case LABEL -> { @@ -429,12 +429,12 @@ public class GoogleReaderREST { if (category != null) { List categories = feedCategoryDAO.findAllChildrenCategories(user, category); List subs = feedSubscriptionDAO.findByCategories(user, categories); - feedEntryService.markSubscriptionEntries(user, subs, olderThan, null, null); + feedEntryService.markSubscriptionEntries(user, subs, olderThan, null, null, null); } } default -> feedEntryService.markSubscriptionEntries( - user, feedSubscriptionDAO.findAll(user), olderThan, null, null); + user, feedSubscriptionDAO.findAll(user), olderThan, null, null, null); } return Response.ok("OK").build(); diff --git a/commafeed-server/src/test/java/com/commafeed/integration/rest/CategoryIT.java b/commafeed-server/src/test/java/com/commafeed/integration/rest/CategoryIT.java index e8c7bf6c..ef5694ad 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/rest/CategoryIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/rest/CategoryIT.java @@ -28,10 +28,14 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.xml.sax.InputSource; import java.io.StringReader; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @QuarkusTest class CategoryIT extends BaseIT { @@ -268,6 +272,37 @@ class CategoryIT extends BaseIT { .statusCode(200); Assertions.assertTrue(getCategoryEntries(categoryId).getEntries().stream().allMatch(Entry::isRead)); } + + @ParameterizedTest + @ValueSource(strings = {"my-tag", "1"}) + void tagged(String tag) { + Long subscriptionId = subscribeAndWaitForEntries(getFeedUrl()); + List entries = getFeedEntries(subscriptionId).getEntries(); + Entry taggedEntry = entries.getFirst(); + Entry untaggedEntry = entries.getLast(); + + TagRequest tagRequest = new TagRequest(); + tagRequest.setEntryId(Long.valueOf(taggedEntry.getId())); + tagRequest.setTags(List.of(tag)); + RestAssured.given().body(tagRequest).contentType(ContentType.JSON).post("rest/entry/tag"); + + MarkRequest request = new MarkRequest(); + request.setId(CategoryREST.ALL); + request.setTag(tag); + request.setRead(true); + RestAssured.given() + .body(request) + .contentType(ContentType.JSON) + .post("rest/category/mark") + .then() + .statusCode(200); + + Map readById = + getCategoryEntries(CategoryREST.ALL).getEntries().stream() + .collect(Collectors.toMap(Entry::getId, Entry::isRead)); + Assertions.assertTrue(readById.get(taggedEntry.getId())); + Assertions.assertFalse(readById.get(untaggedEntry.getId())); + } } @Nested