Cache interface refactor balances

Author: andreespirela

package.json

@@ -1,6 +1,6 @@
 {
   "name": "verto-cache-interface",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A communication package with Verto Cache System",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/calls/fetch-balance-by-user-addr.ts

@@ -16,7 +16,10 @@ export const fetchBalanceByUserAddress = async (contractId: string, userAddress:
     if(stateKeys.length <= 0) {
         return undefined;
     }
-    
+
+    console.warn(`fetchBalanceByUserAddress does not return 'username'`);
+
+    // @ts-ignore
     return {
         name: contractMetadata.name,
         ticker: contractMetadata.ticker,

src/calls/fetch-balance-by-username.ts

@@ -1,26 +1,34 @@
 import {fetchUserMetadataByUsername} from "./fetch-user-metadata-by-username";
 import {UserBalance} from "./types/user-balance-model";
 import {fetchBalancesForAddress} from "./fetch-balances-for-address";
+import {cacheApiBaseRequest} from "./cache-api-base-request";
 
 /**
  * Fetches all the balances given a username.
  * @param username
  * @param tokenType Type contract with balances to be fetched, for example: 'art'
+ * @param manual Whether it should fetch by each or by cache
  */
-export const fetchBalancesByUsername = async (username: string, tokenType?: string) => {
-    const userMetadata = await fetchUserMetadataByUsername(username);
-    if(userMetadata) {
-        const addresses = userMetadata.addresses || [];
-        let response: Array<UserBalance> = [];
+export const fetchBalancesByUsername = async (username: string, tokenType?: string, manual?: boolean) => {
+    let response: Array<UserBalance> = [];
+    if(manual) {
+        const userMetadata = await fetchUserMetadataByUsername(username);
+        if (userMetadata) {
+            const addresses = userMetadata.addresses || [];
 
-        for (const address of addresses) {
-            const balancesInAddress = await fetchBalancesForAddress(address, tokenType);
-            response = [
-                ...response,
-                ...balancesInAddress
-            ];
-        }
+            for (const address of addresses) {
+                const balancesInAddress = await fetchBalancesForAddress(address, tokenType);
+                response = [
+                    ...response,
+                    ...balancesInAddress
+                ];
+            }
 
+            return response;
+        }
+    } else {
+        const data = (await cacheApiBaseRequest<{ entities: Array<UserBalance>}>(`users/balances/${username}?username=true`))?.data;
+        response = [...(data?.entities || [])];
         return response;
     }
 

src/calls/fetch-balances-for-address.ts

@@ -1,24 +1,31 @@
 import {UserBalance} from "./types/user-balance-model";
 import {fetchBalanceByUserAddress} from "./fetch-balance-by-user-addr";
 import {fetchContractsInUser} from "./fetch-contracts-in-user";
+import {cacheApiBaseRequest} from "./cache-api-base-request";
 
 /**
  * Fetches all the balances for a given address.
  * This code execute a look-up in all the contracts that are known to the user.
  * @param userAddress
  * @param tokenType Whether to filter by an specific token type.
+ * @param manual Whether it should fetch by each or by cache
  */
-export const fetchBalancesForAddress = async (userAddress: string, tokenType?: string): Promise<Array<UserBalance>> => {
-    const contracts = await fetchContractsInUser(userAddress) || [];
-    
+export const fetchBalancesForAddress = async (userAddress: string, tokenType?: string, manual?: boolean): Promise<Array<UserBalance>> => {
     let response: Array<UserBalance> = [];
-    for (let contractId of contracts) {
-        const balance = await fetchBalanceByUserAddress(contractId, userAddress);
-        if(balance) {
-            response.push(balance);
+    if(manual) {
+        const contracts = await fetchContractsInUser(userAddress) || [];
+        for (let contractId of contracts) {
+            const balance = await fetchBalanceByUserAddress(contractId, userAddress);
+            if (balance) {
+                response.push(balance);
+            }
         }
+    } else {
+        const data = (await cacheApiBaseRequest<{ entities: Array<UserBalance>}>(`users/balances/${userAddress}`))?.data;
+        response = [...(data?.entities || [])];
     }
 
+
     if(tokenType) {
         response = response.filter((item) => item.type?.toLowerCase() === tokenType.toLowerCase());
     }

src/calls/types/user-balance-model.ts

@@ -5,5 +5,6 @@ export interface UserBalance {
     balance: number;
     contractId: string;
     userAddress: string;
+    username: string;
     type?: string;
 }