From 77b17a6782c0b90edd26a34d2c396c6dfdc82211 Mon Sep 17 00:00:00 2001 From: Mykola Rudyk Date: Wed, 14 Feb 2024 12:39:02 +0200 Subject: [PATCH] fix: add changes after review comment, remove unnecessary check --- src/main/java/com/lpvs/service/LPVSQueueService.java | 7 +------ src/test/java/com/lpvs/service/LPVSQueueServiceTest.java | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/lpvs/service/LPVSQueueService.java b/src/main/java/com/lpvs/service/LPVSQueueService.java index 195718eb..6b9954ef 100644 --- a/src/main/java/com/lpvs/service/LPVSQueueService.java +++ b/src/main/java/com/lpvs/service/LPVSQueueService.java @@ -146,14 +146,9 @@ public BlockingDeque getQueue() { public void checkForQueue() throws InterruptedException { log.debug("Checking for previous queue"); List webhookConfigList = queueRepository.getQueueList(); - if (webhookConfigList.size() > 0) { - LPVSQueue webhookConfig = getLatestScan(webhookConfigList); - webhookConfig.setAttempts(webhookConfig.getAttempts() + 1); - queueRepository.save(webhookConfig); - } for (LPVSQueue webhook : webhookConfigList) { log.info("PROCESSING WebHook id = " + webhook.getId()); - if (webhook.getAttempts() > maxAttempts) { + if (webhook.getAttempts() < maxAttempts) { LPVSPullRequest pullRequest = new LPVSPullRequest(); pullRequest.setPullRequestUrl(webhook.getPullRequestUrl()); pullRequest.setUser(webhook.getUserId()); diff --git a/src/test/java/com/lpvs/service/LPVSQueueServiceTest.java b/src/test/java/com/lpvs/service/LPVSQueueServiceTest.java index 8882c8a5..a307b5fe 100644 --- a/src/test/java/com/lpvs/service/LPVSQueueServiceTest.java +++ b/src/test/java/com/lpvs/service/LPVSQueueServiceTest.java @@ -842,11 +842,10 @@ void setUp() { @Test public void testCheckForQueue() { LPVSQueue webhookConfig = new LPVSQueue(); - webhookConfig.setAttempts(0); + webhookConfig.setAttempts(100); webhookConfig.setDate(new Date()); when(mocked_queueRepository.getQueueList()).thenReturn(List.of(webhookConfig)); assertDoesNotThrow(() -> queueService.checkForQueue()); - verify(mocked_queueRepository).save(webhookConfig); } @Test @@ -860,7 +859,6 @@ public void testCheckForQueue__Alternative() { when(mocked_lpvsPullRequestRepository.saveAndFlush(Mockito.any(LPVSPullRequest.class))) .thenAnswer(i -> i.getArguments()[0]); assertDoesNotThrow(() -> queueService.checkForQueue()); - verify(mocked_queueRepository).save(webhookConfig); } @Test