fix: MET-1629 missing rewards for epoch

.github/workflows/publish.yaml

@@ -23,7 +23,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     if: |
       "contains(github.event.head_commit.message, 'release-please--branches--main')" ||
       ${{ github.event_name == 'pull_request' }}

.github/workflows/release.yaml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   create_release:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - name: 🚀 release-please-action
         uses: google-github-actions/release-please-action@v3

.github/workflows/tests.yaml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3

src/main/java/org/cardanofoundation/explorer/rewards/concurrent/EpochConcurrentFetching.java

@@ -49,7 +49,9 @@ public List<Epoch> fetchDataConcurrently(List<Integer> epochNoList) {
       }
     }
 
-    List<Epoch> result = futures.stream().map(CompletableFuture::join).toList();
+    List<Epoch> result = futures.stream()
+        .filter(epoch -> Objects.nonNull(epoch.join()))
+        .map(CompletableFuture::join).toList();
 
     log.info("Fetch and save epoch record concurrently by koios api: {} ms",
         System.currentTimeMillis() - curTime);

src/main/java/org/cardanofoundation/explorer/rewards/service/impl/EpochFetchingServiceImpl.java

@@ -7,6 +7,7 @@
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
 import org.cardanofoundation.explorer.consumercommon.entity.Epoch;
+import org.cardanofoundation.explorer.consumercommon.enumeration.EraType;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.EpochRepository;
 import org.cardanofoundation.explorer.rewards.service.EpochFetchingService;
@@ -36,14 +37,17 @@ public class EpochFetchingServiceImpl implements EpochFetchingService {
   @SneakyThrows
   public CompletableFuture<Epoch> fetchData(Integer epochNo) {
     Epoch epoch = epochRepository.findByNo(epochNo).orElse(null);
-    if(Objects.isNull(epoch)) {
-      return null;
-    }
-    if(Objects.nonNull(epoch.getRewardsDistributed())) {
+    if(Objects.isNull(epoch)
+        || Objects.nonNull(epoch.getRewardsDistributed())
+        || epoch.getEra().equals(EraType.BYRON)
+        || epoch.getEra().equals(EraType.BYRON_EBB)) {
       return null;
     }
     String totalRewards = koiosClient.epochService().getEpochInformationByEpoch(epochNo).getValue().getTotalRewards();
-    BigInteger rewardDistributed = StringUtils.isEmpty(totalRewards) ? BigInteger.ZERO : new BigInteger(totalRewards);
+    if (StringUtils.isEmpty(totalRewards)) {
+      return CompletableFuture.completedFuture(epoch);
+    }
+    BigInteger rewardDistributed = new BigInteger(totalRewards);
     epochRepository.updateRewardDistributedByNo(rewardDistributed, epochNo);
     epoch.setRewardsDistributed(rewardDistributed);
     return CompletableFuture.completedFuture(epoch);

src/main/resources/db/migration/V1_2_5__reset-reward-distributed-in-epoch-table.sql

@@ -0,0 +1,2 @@
+UPDATE epoch SET rewards_distributed = NULL WHERE rewards_distributed IS NOT NULL;
+

src/test/java/org/cardanofoundation/explorer/rewards/service/impl/EpochFetchingServiceImplTest.java

@@ -1,6 +1,7 @@
 package org.cardanofoundation.explorer.rewards.service.impl;
 
 import org.cardanofoundation.explorer.consumercommon.entity.Epoch;
+import org.cardanofoundation.explorer.consumercommon.enumeration.EraType;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.EpochRepository;
 import org.junit.jupiter.api.Test;
@@ -35,6 +36,28 @@ class EpochFetchingServiceImplTest {
   @InjectMocks
   private EpochFetchingServiceImpl epochFetchingService;
 
+  @Test
+  void testFetchDataWithByronBlock() {
+    // Setup
+    Integer epoch = 315;
+
+    var epochInfo = new EpochInfo();
+    epochInfo.setEpochNo(epoch);
+    epochInfo.setTotalRewards("577641621267691");
+
+    when(epochRepository.findByNo(any()))
+        .thenReturn(Optional
+            .ofNullable(Epoch
+                .builder()
+                .no(epoch)
+                .era(EraType.BYRON)
+                .build()));
+
+    // Run the test
+    final CompletableFuture<Epoch> result = epochFetchingService.fetchData(epoch);
+    assertNull(result);
+  }
+
   @Test
   void testFetchData() throws Exception {
     // Setup
@@ -49,6 +72,7 @@ void testFetchData() throws Exception {
                     .ofNullable(Epoch
                             .builder()
                             .no(epoch)
+                            .era(EraType.SHELLEY)
                             .build()));
     when(koiosClient.epochService().getEpochInformationByEpoch(epoch)
         .getValue()).thenReturn(epochInfo);
@@ -57,7 +81,7 @@ void testFetchData() throws Exception {
     // Run the test
     final CompletableFuture<Epoch> result = epochFetchingService.fetchData(epoch);
 
-    assertEquals(result.get().getNo(), 315);
+    assertEquals(315, result.get().getNo());
     assertEquals(result.get().getRewardsDistributed(), new BigInteger("577641621267691"));
   }