fix: removed unused library

DevForce99 · Sep 14, 2024 · 87311eb · 87311eb
1 parent 0065069
commit 87311eb
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 27 deletions.
diff --git a/packages/app-explorer/src/systems/Statistics/actions/getAccounts.ts b/packages/app-explorer/src/systems/Statistics/actions/getAccounts.ts
@@ -3,7 +3,6 @@
 import { z } from 'zod';
 import { act } from '~/systems/Core/utils/act-server';
 import { sdk } from '~/systems/Core/utils/sdk';
-import { DateHelper } from '../utils/date';
 import {
   createIntervals,
   getUnitAndInterval,
@@ -43,10 +42,8 @@ async function fetchAccountStatistics(
     return isCumulative ? { accounts: [], offset: 0 } : { accounts: [] };
   }
 
-  const firstTimestamp = Number(DateHelper.tai64toDate(nodes[0].timestamp));
-  const lastTimestamp = Number(
-    DateHelper.tai64toDate(nodes[nodes.length - 1].timestamp),
-  );
+  const firstTimestamp = Number(nodes[0].timestamp);
+  const lastTimestamp = Number(nodes[nodes.length - 1].timestamp);
 
   const intervalMap = createIntervals(
     firstTimestamp,

diff --git a/packages/app-explorer/src/systems/Statistics/utils/utils.ts b/packages/app-explorer/src/systems/Statistics/utils/utils.ts
@@ -6,6 +6,10 @@ interface TransactionNode {
   timestamp: string;
 }
 
+interface AccountNode {
+  timestamp: string;
+}
+
 interface Interval {
   start: Date;
   end: Date;
@@ -178,7 +182,7 @@ export function processTransactions(
 // Helper to process accounts and map to intervals
 export function processAccounts(nodes: AccountNode[], intervalMap: Interval[]) {
   nodes.forEach((account) => {
-    const accountTimestamp = Number(DateHelper.tai64toDate(account.timestamp));
+    const accountTimestamp = Number(account.timestamp);
 
     // Find the correct interval for the current account
     for (const interval of intervalMap) {

diff --git a/packages/graphql/src/graphql/resolvers/index.ts b/packages/graphql/src/graphql/resolvers/index.ts
@@ -1,3 +1,4 @@
+import { AccountResolver } from './AccountResolver';
 import { BalanceResolver } from './BalanceResolver';
 import { BlockResolver } from './BlockResolver';
 import { ChainResolver } from './ChainResolver';
@@ -15,6 +16,7 @@ const nodeResolver = NodeResolver.create();
 const predicateResolver = PredicateResolver.create();
 const searchResolver = SearchResolver.create();
 const transactionResolver = TransactionResolver.create();
+const accountResolver = AccountResolver.create();
 
 export const resolvers = {
   Query: {
@@ -26,6 +28,7 @@ export const resolvers = {
     ...predicateResolver.Query,
     ...searchResolver.Query,
     ...transactionResolver.Query,
+    ...accountResolver.Query,
   },
   Balance: balanceResolver.Balance,
 };
diff --git a/packages/graphql/src/infra/dao/AccountDAO.ts b/packages/graphql/src/infra/dao/AccountDAO.ts
@@ -1,4 +1,3 @@
-import { DateHelper } from '~/core/Date';
 import { AccountEntity } from '../../domain/Account/AccountEntity';
 import { DatabaseConnection } from '../database/DatabaseConnection';
 import { getTimeInterval } from './utils';
@@ -116,34 +115,43 @@ export default class AccountDAO {
 
     let query = `
       SELECT 
-        (data->'first_transaction_timestamp')::bigint AS timestamp
+        first_transaction_timestamp AS timestamp
       FROM indexer.accounts
     `;
 
-    let intervalStartTimeTai64 = '';
+    let intervalStartTimeDate = '';
 
     if (_interval) {
       const intervalStartTimeInMilliseconds = Date.now() - _interval;
-      const intervalStartTimeDate = new Date(intervalStartTimeInMilliseconds);
-      intervalStartTimeTai64 = DateHelper.dateToTai64(intervalStartTimeDate);
-      query += `WHERE (data->'first_transaction_timestamp')::bigint >= ${intervalStartTimeTai64}`;
+      intervalStartTimeDate = new Date(
+        intervalStartTimeInMilliseconds,
+      ).toISOString();
+
+      // Add the WHERE clause, parameterizing the date value to ensure proper handling
+      query += 'WHERE first_transaction_timestamp >= $1';
     }
 
-    query += ' ORDER BY timestamp asc';
+    query += ' ORDER BY timestamp ASC';
 
-    const accountsData = await this.databaseConnection.query(query, []);
+    // Execute the main query with the interval start date as a parameter
+    const accountsData = await this.databaseConnection.query(query, [
+      intervalStartTimeDate,
+    ]);
 
     // Calculate accountOffset: Accounts created before the first timestamp in the interval
     const offsetQuery = `
-      SELECT COUNT(*) as accountOffset 
+      SELECT COUNT(*) as "accountOffset"
       FROM indexer.accounts
-      WHERE (data->'first_transaction_timestamp')::bigint < ${intervalStartTimeTai64}
+      WHERE first_transaction_timestamp < $1
     `;
-    const offsetResult = await this.databaseConnection.query(offsetQuery, []);
+
+    const offsetResult = await this.databaseConnection.query(offsetQuery, [
+      intervalStartTimeDate,
+    ]);
 
     return {
       nodes: accountsData,
-      accountOffset: offsetResult[0].accountoffset || 0,
+      accountOffset: offsetResult[0].accountOffset || 0,
     };
   }
 
@@ -152,23 +160,28 @@ export default class AccountDAO {
 
     let query = `
       SELECT 
-        COUNT(*) as count,
-        (data->'first_transaction_timestamp')::bigint AS timestamp
+        first_transaction_timestamp AS timestamp
       FROM indexer.accounts
     `;
+    // Prepare interval start time as a valid ISO string
+    let intervalStartTimeDate = '';
 
     if (_interval) {
       const intervalStartTimeInMilliseconds = Date.now() - _interval;
-      const intervalStartTimeDate = new Date(intervalStartTimeInMilliseconds);
-      const intervalStartTimeTai64 = DateHelper.dateToTai64(
-        intervalStartTimeDate,
-      );
-      query += `WHERE (data->'first_transaction_timestamp')::bigint >= ${intervalStartTimeTai64}`;
+      intervalStartTimeDate = new Date(
+        intervalStartTimeInMilliseconds,
+      ).toISOString();
+
+      // Add the WHERE clause, parameterizing the date value to ensure proper handling
+      query += 'WHERE first_transaction_timestamp >= $1';
     }
 
-    query += ' ORDER BY timestamp asc';
+    query += ' ORDER BY timestamp ASC';
 
-    const accountsData = await this.databaseConnection.query(query, []);
+    // Execute the main query with the interval start date as a parameter
+    const accountsData = await this.databaseConnection.query(query, [
+      intervalStartTimeDate,
+    ]);
 
     return {
       nodes: accountsData,