From 2f05e53e14f6081c32f96f07033effe46fe38427 Mon Sep 17 00:00:00 2001 From: Athou Date: Fri, 30 May 2025 10:45:00 +0200 Subject: [PATCH] remove feed/refresh rest endpoint as it's unused and does not honor the force-refresh-cooldown-duration setting (#1802) --- .../service/FeedSubscriptionService.java | 11 ---------- .../commafeed/frontend/resource/FeedREST.java | 18 ----------------- .../commafeed/integration/rest/FeedIT.java | 20 ------------------- 3 files changed, 49 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java index 1e5012bf..86a0a133 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java @@ -114,17 +114,6 @@ public class FeedSubscriptionService { user.setLastForceRefresh(Instant.now()); } - public void refreshAllUpForRefresh(User user) { - List subs = feedSubscriptionDAO.findAll(user); - for (FeedSubscription sub : subs) { - Instant disabledUntil = sub.getFeed().getDisabledUntil(); - if (disabledUntil == null || disabledUntil.isBefore(Instant.now())) { - Feed feed = sub.getFeed(); - feedRefreshEngine.refreshImmediately(feed); - } - } - } - public Map getUnreadCount(User user) { return feedSubscriptionDAO.findAll(user) .stream() 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 279c230c..140995dc 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 @@ -286,24 +286,6 @@ public class FeedREST { } - @Path("/refresh") - @POST - @Transactional - @Operation(summary = "Queue a feed for refresh", description = "Manually add a feed to the refresh queue") - public Response queueForRefresh(@Parameter(description = "Feed id", required = true) IDRequest req) { - Preconditions.checkNotNull(req); - Preconditions.checkNotNull(req.getId()); - - User user = authenticationContext.getCurrentUser(); - FeedSubscription sub = feedSubscriptionDAO.findById(user, req.getId()); - if (sub != null) { - Feed feed = sub.getFeed(); - feedRefreshEngine.refreshImmediately(feed); - return Response.ok().build(); - } - return Response.ok(Status.NOT_FOUND).build(); - } - @Path("/mark") @POST @Transactional diff --git a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java index 0883e53a..e59b7cf0 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java @@ -163,26 +163,6 @@ class FeedIT extends BaseIT { @Nested class Refresh { - @Test - void refresh() { - Long subscriptionId = subscribeAndWaitForEntries(getFeedUrl()); - - // mariadb/mysql timestamp precision is 1 second - Instant threshold = Instant.now().minus(Duration.ofSeconds(1)); - - IDRequest request = new IDRequest(); - request.setId(subscriptionId); - RestAssured.given() - .body(request) - .contentType(MediaType.APPLICATION_JSON) - .post("rest/feed/refresh") - .then() - .statusCode(HttpStatus.SC_OK); - - Awaitility.await() - .atMost(Duration.ofSeconds(15)) - .until(() -> getSubscription(subscriptionId), f -> f.getLastRefresh().isAfter(threshold)); - } @Test void refreshAll() {