Merge pull request #3 from Giveth/fix/is_number_test

Fixed bug in parsing date in number format

src/modules/fetch-state/data-fetch-state.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { isNumber } from '@nestjs/common/utils/shared.utils';
 import { InjectRepository } from '@nestjs/typeorm';
 import { SingleFetchConfig } from 'src/modules/data-fetcher/load-blockchain-config.service';
 import { DataFetchState } from 'src/modules/fetch-state/data-fetch-state.entity';
+import { isNumber } from 'src/utils';
 import { Repository } from 'typeorm';
 
 @Injectable()
@@ -102,7 +102,7 @@ export class DataFetchStateService {
     // Single network
     if (isNumber(networks)) {
       query = query.andWhere('state.network = :network', {
-        network: networks,
+        network: +networks,
       });
     }
     // Multiple networks

src/modules/token-balance/token-balance.controller.ts

@@ -11,6 +11,7 @@ import {
   ValidatorConstraintInterface,
 } from 'class-validator';
 import { TokenBalanceService } from 'src/modules/token-balance/token-balance.service';
+import { isNumber } from 'src/utils';
 
 class EthereumAddress implements ValidatorConstraintInterface {
   validate(value: string) {
@@ -87,15 +88,16 @@ class QueryParamsUpdatedAfterDate {
   network?: number;
 
   @IsDate()
-  @Type(() => Date)
-  @Transform(({ value }) => {
-    console.log('value', value);
-    return new Date(value);
-  })
+  @Transform(({ value }) => new Date(isNumber(value) ? +value : value))
   @ApiProperty({
-    type: 'string',
-    description:
-      'Date in acceptable by NodeJS Date constructor (e.g. ISO, Timestamp milliseconds, ...)',
+    oneOf: [
+      { type: 'number', description: 'Date in timestamp milliseconds' },
+      {
+        type: 'string',
+        description:
+          'Date in acceptable by NodeJS Date constructor (e.g. ISO, ...)',
+      },
+    ],
   })
   date: Date;
 

src/modules/token-balance/token-balance.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
-import { isNumber } from '@nestjs/common/utils/shared.utils';
 import { InjectRepository } from '@nestjs/typeorm';
 import { SubgraphBalanceChangeEntity } from 'src/modules/subgraph/graphql-client-adapter.service';
 import { TokenBalanceUpdate } from 'src/modules/token-balance/token-balance-update.entity';
 import { TokenBalance } from 'src/modules/token-balance/token-balance.entity';
+import { isNumber } from 'src/utils';
 import { Repository } from 'typeorm';
 
 @Injectable()
@@ -107,7 +107,7 @@ export class TokenBalanceService {
     // Single network
     if (isNumber(networks)) {
       query = query.andWhere('tokenBalance.network = :network', {
-        network: networks,
+        network: +networks,
       });
     }
     // Multiple networks
@@ -172,7 +172,7 @@ export class TokenBalanceService {
 
     if (isNumber(networks)) {
       query = query.andWhere('tokenBalance.network = :network', {
-        network: networks,
+        network: +networks,
       });
     }
     // Multiple networks

src/utils.ts

@@ -0,0 +1,9 @@
+export const isNumber = (val: any): val is number => {
+  if (typeof val === 'number') return true;
+
+  if (typeof val === 'string') {
+    return !isNaN(+val);
+  }
+
+  return false;
+};