fixing wrong migration from helper to indexer

oak · oak · commit 81ab0234a4f2 · 2022-05-20T11:51:09.000-03:00
diff --git a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/NearKitWalletService.java b/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/NearKitWalletService.java
diff --git a/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearKitWalletServiceHelper.java b/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearKitWalletServiceHelper.java
diff --git a/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearKitWalletServiceTest.java b/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearKitWalletServiceTest.java
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/json/deserializer/RecentActivityItemDeserializer.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/json/deserializer/RecentActivityItemDeserializer.java
@@ -1,22 +1,22 @@
-package com.syntifi.near.api.helper.json.deserializer;
+package com.syntifi.near.api.indexer.json.deserializer;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.syntifi.near.api.common.model.key.PublicKey;
-import com.syntifi.near.api.helper.model.RecentActivityAccessKey;
-import com.syntifi.near.api.helper.model.RecentActivityArgAddKey;
-import com.syntifi.near.api.helper.model.RecentActivityArgCreateAccount;
-import com.syntifi.near.api.helper.model.RecentActivityArgDeleteAccount;
-import com.syntifi.near.api.helper.model.RecentActivityArgDeleteKey;
-import com.syntifi.near.api.helper.model.RecentActivityArgDeployContract;
-import com.syntifi.near.api.helper.model.RecentActivityArgFunctionCall;
-import com.syntifi.near.api.helper.model.RecentActivityArgStake;
-import com.syntifi.near.api.helper.model.RecentActivityArgTransfer;
-import com.syntifi.near.api.helper.model.RecentActivityItem;
-import com.syntifi.near.api.helper.model.RecentActivityPermission;
-import com.syntifi.near.api.helper.service.exception.NearHelperServiceException;
+import com.syntifi.near.api.indexer.model.RecentActivityAccessKey;
+import com.syntifi.near.api.indexer.model.RecentActivityArgAddKey;
+import com.syntifi.near.api.indexer.model.RecentActivityArgCreateAccount;
+import com.syntifi.near.api.indexer.model.RecentActivityArgDeleteAccount;
+import com.syntifi.near.api.indexer.model.RecentActivityArgDeleteKey;
+import com.syntifi.near.api.indexer.model.RecentActivityArgDeployContract;
+import com.syntifi.near.api.indexer.model.RecentActivityArgFunctionCall;
+import com.syntifi.near.api.indexer.model.RecentActivityArgStake;
+import com.syntifi.near.api.indexer.model.RecentActivityArgTransfer;
+import com.syntifi.near.api.indexer.model.RecentActivityItem;
+import com.syntifi.near.api.indexer.model.RecentActivityPermission;
+import com.syntifi.near.api.indexer.service.exception.NearIndexerServiceException;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -90,7 +90,7 @@ public RecentActivityItem deserialize(JsonParser p, DeserializationContext ctxt)
                     .beneficiaryId(argsNode.get("beneficiary_id").asText())
                     .build());
         } else {
-            throw new NearHelperServiceException(
+            throw new NearIndexerServiceException(
                     String.format("Action %s not mapped for deserialization", recentActivityItem.getActionKind()));
         }
 
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivity.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivity.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import java.util.ArrayList;
 
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityAccessKey.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityAccessKey.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArg.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArg.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 /**
  * RecentActivityArg
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgAddKey.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgAddKey.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgCreateAccount.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgCreateAccount.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgDeleteAccount.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgDeleteAccount.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgDeleteKey.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgDeleteKey.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.syntifi.near.api.common.model.key.PublicKey;
 import lombok.AllArgsConstructor;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgDeployContract.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgDeployContract.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgFunctionCall.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgFunctionCall.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgStake.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgStake.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.syntifi.near.api.common.model.key.PublicKey;
 import lombok.AllArgsConstructor;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgTransfer.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityArgTransfer.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityItem.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityItem.java
@@ -1,8 +1,8 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.syntifi.near.api.helper.json.deserializer.RecentActivityItemDeserializer;
+import com.syntifi.near.api.indexer.json.deserializer.RecentActivityItemDeserializer;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityPermission.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/model/RecentActivityPermission.java
@@ -1,4 +1,4 @@
-package com.syntifi.near.api.helper.model;
+package com.syntifi.near.api.indexer.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/service/NearIndexerService.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/service/NearIndexerService.java
@@ -2,6 +2,7 @@
 
 import com.syntifi.near.api.common.service.NearObjectMapper;
 import com.syntifi.near.api.indexer.model.AccountIdList;
+import com.syntifi.near.api.indexer.model.RecentActivity;
 import com.syntifi.near.api.indexer.model.StakingDeposit;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
@@ -49,6 +50,15 @@ public interface NearIndexerService {
     @GET("staking-deposits/{accountId}")
     Call<List<StakingDeposit>> getStakingDeposits(@Path("accountId") String accountId);
 
+    /**
+     * Fetches a list of recent activities for one account
+     *
+     * @param accountId the account to fetch activity
+     * @return list of recent activity for the account
+     */
+    @GET("account/{accountId}/activity")
+    Call<RecentActivity> getNearRecentActivity(@Path("accountId") String accountId);
+
     /**
      * NearIndexerService builder
      *
diff --git a/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/service/exception/NearIndexerServiceException.java b/near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/service/exception/NearIndexerServiceException.java
@@ -0,0 +1,15 @@
+package com.syntifi.near.api.indexer.service.exception;
+
+
+/**
+ * Thrown on Near helper service error
+ *
+ * @author Alexandre Carvalho
+ * @author Andre Bertolace
+ * @since 0.2.0
+ */
+public class NearIndexerServiceException extends RuntimeException {
+    public NearIndexerServiceException(String message) {
+        super(message);
+    }
+}
diff --git a/near-java-api-indexer/src/test/java/com/syntifi/near/api/indexer/service/NearIndexerServiceTest.java b/near-java-api-indexer/src/test/java/com/syntifi/near/api/indexer/service/NearIndexerServiceTest.java
@@ -1,6 +1,7 @@
 package com.syntifi.near.api.indexer.service;
 
 import com.syntifi.near.api.indexer.model.AccountIdList;
+import com.syntifi.near.api.indexer.model.RecentActivity;
 import com.syntifi.near.api.indexer.model.StakingDeposit;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -63,4 +64,21 @@ void getStakingDeposits_valid() throws IOException {
 
         stakingDeposits.forEach(i -> LOGGER.debug("deposit: {} validator: {}", i.getDeposit(), i.getValidator()));
     }
+
+    @Test
+    void getNearRecentActivity_valid() throws IOException {
+        Response<RecentActivity> value = nearIndexerService.getNearRecentActivity("wallet-test.testnet").execute();
+
+        assertTrue(value.isSuccessful());
+
+        RecentActivity nearValue = value.body();
+
+        assertNotNull(nearValue);
+
+        nearValue.forEach(item -> LOGGER.debug("Item kind: {}", item.getActionKind()));
+
+        LOGGER.debug("Response {}", nearValue.size());
+
+        assertNotNull(nearValue);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.syntifi.near.api.helper.model;`
	`1`	`+package com.syntifi.near.api.indexer.model;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`