Fix wallet getStatictics return type and gql schema

src/wallet/wallet.resolver.ts

@@ -18,7 +18,7 @@ import {
   WalletEntity,
 } from 'src/wallet/wallet.entity';
 import { User } from 'src/utils/decorators/User';
-import { GetWalletFilters, WalletStatistics } from './wallet.schemas';
+import { GetWalletFilters, WalletStatisticsRange } from './wallet.schemas';
 
 @UseGuards(AuthGuard)
 @Resolver(() => WalletEntity)
@@ -139,14 +139,16 @@ export class WalletResolver {
     return promise[1] - promise[0];
   }
 
-  @Query(() => WalletStatistics)
+  @Query(() => WalletStatisticsRange)
   async getStatistics(
     @User() usrId: string,
     @Args('type', { type: () => String, description: 'today, month, week' })
     type: 'today' | 'month' | 'week',
   ) {
     if (['today', 'month', 'week'].indexOf(type) === -1)
       throw new BadRequestException('Invalid type');
-    return this.walletService.getStatistics(usrId, type);
+    const stats = await this.walletService.getStatistics(usrId, type);
+
+    return stats[0];
   }
 }

src/wallet/wallet.schemas.ts

@@ -37,7 +37,7 @@ export class GetWalletFilters {
 }
 
 @ObjectType()
-class WalletStatisticsRange {
+export class WalletStatisticsRange {
   @Field(() => Float, { nullable: true })
   total: number;
 
@@ -53,33 +53,18 @@ class WalletStatisticsRange {
   @Field(() => Float, { nullable: true })
   count: number;
 
-  @Field(() => String)
+  @Field(() => String, { nullable: true })
   theMostCommonCategory: string;
 
-  @Field(() => String)
+  @Field(() => String, { nullable: true })
   theLeastCommonCategory: string;
 
-  @Field(() => Float)
+  @Field(() => Float, { nullable: true })
   lastBalance: number;
 
-  @Field(() => Float)
+  @Field(() => Float, { nullable: true })
   income: number;
 
-  @Field(() => Float)
+  @Field(() => Float, { nullable: true })
   expense: number;
 }
-
-@ObjectType()
-export class WalletStatistics {
-  @Field(() => Float)
-  balance: number;
-
-  @Field(() => WalletStatisticsRange)
-  month: WalletStatisticsRange;
-
-  @Field(() => WalletStatisticsRange)
-  today: WalletStatisticsRange;
-
-  @Field(() => WalletStatisticsRange)
-  week: WalletStatisticsRange;
-}

src/wallet/wallet.service.ts

@@ -6,7 +6,7 @@ import {
   WalletEntity,
 } from 'src/wallet/wallet.entity';
 import { Repository } from 'typeorm';
-import { GetWalletFilters, WalletStatistics } from './wallet.schemas';
+import { GetWalletFilters, WalletStatisticsRange } from './wallet.schemas';
 
 @Injectable()
 export class WalletService {
@@ -260,7 +260,7 @@ export class WalletService {
   getStatistics(
     userId: string,
     dateRange: 'today' | 'week' | 'month',
-  ): Promise<[WalletStatistics]> {
+  ): Promise<[WalletStatisticsRange]> {
     // Determine the appropriate interval based on the dateRange
     let interval: string;
     switch (dateRange) {