Merge pull request #4 from near-daos/feature/leaderboard_overview_month

Using month as a timespan for leaderboard overview
near-daos · Jan 17, 2022 · 97d0456 · 97d0456
2 parents b9b20eb + 4dd5e8d
commit 97d0456
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/apps/api/src/common/metric.service.ts b/apps/api/src/common/metric.service.ts
@@ -89,7 +89,7 @@ export class MetricService {
     const { contractId } = context;
 
     const dayAgo = moment().subtract(1, 'day');
-    const weekAgo = moment().subtract(1, 'week');
+    const monthAgo = moment().subtract(1, 'month');
 
     const leaderboard = await this.daoStatsService.getLeaderboard({
       contractId,
@@ -109,7 +109,7 @@ export class MetricService {
             contractId,
             dao,
             metric,
-            from: weekAgo.valueOf(),
+            from: monthAgo.valueOf(),
           }),
         ]);
 

diff --git a/apps/api/src/flow/flow.service.ts b/apps/api/src/flow/flow.service.ts
@@ -173,8 +173,8 @@ export class FlowService {
   ): Promise<FlowLeaderboardMetricResponse> {
     const { contract } = context;
 
-    const weekAgo = moment().subtract(7, 'days');
-    const days = getDailyIntervals(weekAgo.valueOf(), moment().valueOf());
+    const monthAgo = moment().subtract(1, 'month');
+    const days = getDailyIntervals(monthAgo.valueOf(), moment().valueOf());
     const dayAgo = moment().subtract(1, 'days');
 
     const [
@@ -190,7 +190,7 @@ export class FlowService {
         metricType,
         TransferType.Incoming,
         {
-          from: weekAgo.valueOf(),
+          from: monthAgo.valueOf(),
           to: moment().valueOf(),
         },
         true,
@@ -200,7 +200,7 @@ export class FlowService {
         metricType,
         TransferType.Outgoing,
         {
-          from: weekAgo.valueOf(),
+          from: monthAgo.valueOf(),
           to: moment().valueOf(),
         },
         true,

diff --git a/apps/api/src/general/general.service.ts b/apps/api/src/general/general.service.ts
@@ -88,13 +88,13 @@ export class GeneralService {
   async activeLeaderboard(
     context: ContractContext,
   ): Promise<LeaderboardMetricResponse> {
-    const weekAgo = moment().subtract(7, 'days');
-    const days = getDailyIntervals(weekAgo.valueOf(), moment().valueOf());
+    const monthAgo = moment().subtract(1, 'month');
+    const days = getDailyIntervals(monthAgo.valueOf(), moment().valueOf());
 
     const byDays = await this.transactionService.getActivityLeaderboard(
       context,
       {
-        from: weekAgo.valueOf(),
+        from: monthAgo.valueOf(),
         to: moment().valueOf(),
       },
       true,

diff --git a/apps/api/src/governance/governance.service.ts b/apps/api/src/governance/governance.service.ts
@@ -326,7 +326,7 @@ export class GovernanceService {
     const { contractId, dao } = context as DaoContractContext;
 
     const dayAgo = moment().subtract(1, 'days');
-    const weekAgo = moment().subtract(7, 'days');
+    const monthAgo = moment().subtract(30, 'month');
 
     const [totalLeaderboard, approvedLeaderboard] = await Promise.all([
       this.daoStatsService.getLeaderboard({
@@ -376,13 +376,13 @@ export class GovernanceService {
               contractId,
               dao,
               metric: DaoStatsMetric.ProposalsCount,
-              from: weekAgo.valueOf(),
+              from: monthAgo.valueOf(),
             }),
             this.daoStatsHistoryService.getHistory({
               contractId,
               dao,
               metric: DaoStatsMetric.ProposalsApprovedCount,
-              from: weekAgo.valueOf(),
+              from: monthAgo.valueOf(),
             }),
           ]);
 

diff --git a/apps/api/src/users/users.service.ts b/apps/api/src/users/users.service.ts
@@ -129,8 +129,8 @@ export class UsersService {
   async usersLeaderboard(
     context: ContractContext,
   ): Promise<LeaderboardMetricResponse> {
-    const weekAgo = moment().subtract(7, 'days');
-    const days = getDailyIntervals(weekAgo.valueOf(), moment().valueOf());
+    const monthAgo = moment().subtract(1, 'month');
+    const days = getDailyIntervals(monthAgo.valueOf(), moment().valueOf());
 
     const { results: byDays, errors } = await PromisePool.withConcurrency(5)
       .for(days)
@@ -249,15 +249,15 @@ export class UsersService {
   async interactionsLeaderboard(
     context: ContractContext,
   ): Promise<LeaderboardMetricResponse> {
-    const weekAgo = moment().subtract(7, 'days');
-    const days = getDailyIntervals(weekAgo.valueOf(), moment().valueOf());
+    const monthAgo = moment().subtract(1, 'month');
+    const days = getDailyIntervals(monthAgo.valueOf(), moment().valueOf());
     const dayAgo = moment().subtract(1, 'days');
 
     const [byDays, dayAgoActivity, totalActivity] = await Promise.all([
       this.transactionService.getActivityLeaderboard(
         context,
         {
-          from: weekAgo.valueOf(),
+          from: monthAgo.valueOf(),
           to: moment().valueOf(),
         },
         true,