Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/analytics/controllers/analytic.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import { BadRequestException, Controller, Get, Query } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Between, Repository } from 'typeorm';
import { Analytic } from '../entities/analytic.entity';
import { ApiQuery } from '@nestjs/swagger';
import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger';
import moment from 'moment';
import { CacheDailyAnalyticsDataService } from '../services/cache-daily-analytics-data.service';

@Controller('analytics')
@ApiTags('Analytics')
export class AnalyticController {
constructor(
@InjectRepository(Analytic)
Expand All @@ -21,6 +22,9 @@ export class AnalyticController {
@ApiQuery({ name: 'start_date', type: 'string', required: false })
@ApiQuery({ name: 'end_date', type: 'string', required: false })
@ApiQuery({ name: 'force_pull', type: 'boolean', required: false })
@ApiOperation({
operationId: 'getAnalyticsData',
})
async getAnalyticsData(
@Query('start_date') start_date: string,
@Query('end_date') end_date: string,
Expand Down Expand Up @@ -53,6 +57,9 @@ export class AnalyticController {
}

@Get('past-24-hours')
@ApiOperation({
operationId: 'getPast24HoursAnalytics',
})
async getPast24HoursAnalytics() {
const startDate = moment().subtract(24, 'hours').toDate();
const endDate = moment().add(1, 'day').toDate();
Expand Down
13 changes: 12 additions & 1 deletion src/tokens/account-tokens.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,22 @@ export class AccountTokensController {
address: owner_address || creator_address,
});

const tokenIds = tokensQueryResult.items
.map((holder) => holder.address)
.filter((address): address is string => address !== undefined);

const tokenRanks = await this.tokensService.getTokenRanksByAex9Address(
tokenIds as any,
);

const holdings = await tokenHoldersQueryBuilder.getMany();
return {
...tokensQueryResult,
items: tokensQueryResult.items?.map((token) => ({
token,
token: {
...token,
rank: tokenRanks.get(token.address as any),
},
address: owner_address || creator_address,
balance:
holdings.find((holder) => holder.aex9_address === token.address)
Expand Down