Update label

Meeds-io · Oct 21, 2024 · 17a102b · 17a102b
1 parent bbf114a
commit 17a102b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
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
@@ -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
@@ -40,6 +40,6 @@ public class RewardReportStatus {
 
   private double       tokensToSend;
 
-  private boolean      completelyProceeded;
+  private boolean      completelyProcessed;
 
 }
diff --git a/...rvices/src/main/java/io/meeds/wallet/reward/scheduling/task/RewardStatusVerifierTask.java b/...rvices/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/...ward-services/src/main/java/io/meeds/wallet/reward/service/WalletRewardReportService.java b/...ward-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/...ward-services/src/main/java/io/meeds/wallet/reward/storage/WalletRewardReportStorage.java b/...ward-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/...ervices/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java b/...ervices/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
@@ -45,7 +45,7 @@
         <span class="text-header font-weight-light">{{ rangeDateTimeTitle }}</span>
       </v-card-title>
       <template v-if="isValid">
-        <template v-if="hasConfiguredBudget || completelyProceeded">
+        <template v-if="hasConfiguredBudget || completelyProcessed">
           <v-card-title class="px-2 py-1">
             <v-icon
               :class="statusIconClass"
@@ -139,8 +139,8 @@ export default {
     },
   }),
   computed: {
-    completelyProceeded() {
-      return this.rewardReport?.completelyProceeded;
+    completelyProcessed() {
+      return this.rewardReport?.completelyProcessed;
     },
     isNotPastPeriod() {
       return !this.period || this.period.endDateInSeconds > this.currentTimeInSeconds;
@@ -157,7 +157,7 @@ export default {
           message: this.$t('wallet.administration.rewardCard.status.inPeriod'),
         };
       }
-      if (!this.completelyProceeded) {
+      if (!this.completelyProcessed) {
         return {
           icon: 'fas fa-exclamation-triangle',
           iconClass: null,
@@ -217,7 +217,7 @@ export default {
       return Number.isFinite(Number(this.tokensSent)) ? Math.round(this.tokensSent) : 0;
     },
     budget() {
-      return this.completelyProceeded ? `${this.formatedTokensSent} MEED` : (this.hasConfiguredBudget ? `${this.formatedTokensToSend} MEED` : '-');
+      return this.completelyProcessed ? `${this.formatedTokensSent} MEED` : (this.hasConfiguredBudget ? `${this.formatedTokensToSend} MEED` : '-');
     },
     period() {
       return this.rewardReport?.period;

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetails.vue
@@ -41,7 +41,7 @@
       </v-card>
       <v-spacer />
       <span v-if="sendingInProgress" class="text-subtitle pe-2"> {{ $t('wallet.administration.rewardDetails.sendingProgress') }}... </span>
-      <template v-if="!completelyProceeded">
+      <template v-if="!completelyProcessed">
         <div v-if="hasErrorTransactions" class="text-subtitle pe-2 align-self-center">
           <v-icon
             color="warning"
@@ -104,7 +104,7 @@
           :reward="item"
           :contract-details="contractDetails"
           :token-symbol="tokenSymbol"
-          :completely-proceeded="completelyProceeded"
+          :completely-processed="completelyProcessed"
           :transaction-ether-scan-link="transactionEtherScanLink"
           @open-contribution-details="openContributionDetails" />
       </template>
@@ -236,8 +236,8 @@ export default {
       return new window.Intl.DateTimeFormat(this.lang, this.dateFormat)
         .format(new Date(this.endDateInSeconds * 1000 - 86400 * 1000 - new Date().getTimezoneOffset() * 60 * 1000));
     },
-    completelyProceeded() {
-      return this.rewardReport?.completelyProceeded;
+    completelyProcessed() {
+      return this.rewardReport?.completelyProcessed;
     },
     endDateInSeconds() {
       return this.period?.endDateInSeconds;

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/RewardDetailsItem.vue
@@ -190,7 +190,7 @@ export default {
       type: String,
       default: ''
     },
-    completelyProceeded: {
+    completelyProcessed: {
       type: Boolean,
       default: false
     },
@@ -275,7 +275,7 @@ export default {
       return this.pending ? this.$t('wallet.administration.rewardDetails.transactionInProgress') : this.$t('wallet.administration.rewardDetails.transactionError');
     },
     amount() {
-      return this.completelyProceeded ? this.reward?.tokensSent : this.reward?.amount;
+      return this.completelyProcessed ? this.reward?.tokensSent : this.reward?.amount;
     },
     transactionHash() {
       return this.reward?.transaction?.hash;