diff --git a/wallet-api/src/main/java/io/meeds/wallet/model/RewardReport.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardReport.java index 84f3a27ca1..4c845c93ed 100644 --- a/wallet-api/src/main/java/io/meeds/wallet/model/RewardReport.java +++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardReport.java @@ -103,7 +103,7 @@ public boolean hasErrorTransactions() { return getFailedTransactionCount() > 0; } - public boolean isCompletelyProceeded() { + public boolean isCompletelyProcessed() { // Can be greater if in the mean time of transaction confirmation, a member // has been invalidated / disabled / deleted return getTransactionsCount() > 0 && getSuccessTransactionCount() >= getValidRewardCount(); diff --git a/wallet-api/src/main/java/io/meeds/wallet/model/RewardReportStatus.java b/wallet-api/src/main/java/io/meeds/wallet/model/RewardReportStatus.java index 0c8b9ced2c..7ab394f207 100644 --- a/wallet-api/src/main/java/io/meeds/wallet/model/RewardReportStatus.java +++ b/wallet-api/src/main/java/io/meeds/wallet/model/RewardReportStatus.java @@ -40,6 +40,6 @@ public class RewardReportStatus { private double tokensToSend; - private boolean completelyProceeded; + private boolean completelyProcessed; } diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java index 2b45110081..cd6f2fc531 100644 --- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java +++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java @@ -70,7 +70,7 @@ public void execute() { // progress RewardReport rewardReport = rewardReportService.computeRewards(rewardPeriod.getPeriodMedianDate()); if (rewardReport != null) { - if (rewardReport.isCompletelyProceeded()) { + if (rewardReport.isCompletelyProcessed()) { listenerService.broadcast(REWARD_SUCCESS_EVENT_NAME, rewardReport, null); rewardReportService.saveRewardReport(rewardReport); } else if (rewardReport.getPendingTransactionCount() == 0 && rewardReport.getTokensSent() == 0) { diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java index 3c3229856c..564ebaf849 100644 --- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java +++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java @@ -651,7 +651,7 @@ private RewardReportStatus buildReportStatus(RewardReport rewardReport, RewardPe achievementsCount, rewardReport.getTokensSent(), rewardReport.getTokensToSend(), - CollectionUtils.isNotEmpty(rewardReport.getRewards()) && rewardReport.isCompletelyProceeded()); + CollectionUtils.isNotEmpty(rewardReport.getRewards()) && rewardReport.isCompletelyProcessed()); } } diff --git a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java index 7392586f14..5137787038 100644 --- a/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java +++ b/wallet-reward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java @@ -165,7 +165,7 @@ public void saveRewardReport(RewardReport rewardReport) { // NOSONAR rewardPeriodEntity.setEndTime(period.getEndDateInSeconds()); rewardPeriodEntity.setTimeZone(period.getTimeZone()); - if (rewardReport.isCompletelyProceeded()) { + if (rewardReport.isCompletelyProcessed()) { rewardPeriodEntity.setStatus(RewardStatus.SUCCESS); } else if (rewardReport.getPendingTransactionCount() > 0) { // Always // pending if diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java index 9547003727..8e527a5155 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java @@ -76,7 +76,7 @@ void testSendRewards_RewardPeriodsInProgress() { when(rewardReportService.getRewardPeriodsInProgress()).thenReturn(rewardPeriodsInProgress); RewardReport rewardReport = mock(RewardReport.class); - when(rewardReport.isCompletelyProceeded()).thenReturn(true); + when(rewardReport.isCompletelyProcessed()).thenReturn(true); when(rewardReportService.computeRewards(any())).thenReturn(rewardReport); diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue index 528868744a..598b847f8d 100644 --- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue +++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardCard.vue @@ -45,7 +45,7 @@ {{ rangeDateTimeTitle }}