fix: Fix tests for tasks page stats changes [2]

src/app/core/mock-data/report-stats.data.ts

@@ -1,43 +1,44 @@
 import deepFreeze from 'deep-freeze-strict';
 
 import { ReportStats } from '../models/report-stats.model';
+import { PlatformReportsStatsResponse } from '../models/platform/v1/report-stats-response.model';
 
 export const expectedReportStats: ReportStats = deepFreeze({
   draft: {
-    count: 6,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    count: 2,
     total_amount: 93165.91,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   report: {
-    count: 45,
+    count: 2,
     total_amount: 5177243929.65219,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   approved: {
     count: 56,
     total_amount: 28758273650702.816,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   paymentPending: {
     count: 4,
     total_amount: 501602.12,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   processing: {
     count: 7,
@@ -54,46 +55,66 @@ export const expectedEmptyReportStats: ReportStats = deepFreeze({
   draft: {
     total_amount: 0,
     count: 0,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   report: {
     total_amount: 0,
     count: 0,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   approved: {
     total_amount: 0,
     count: 0,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   paymentPending: {
     total_amount: 0,
     count: 0,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
   processing: {
     total_amount: 0,
     count: 0,
-    failed_amount: null,
-    failed_count: null,
-    processing_amount: null,
-    processing_count: null,
-    reimbursable_amount: null,
+    failed_amount: 0,
+    failed_count: 0,
+    processing_amount: 0,
+    processing_count: 0,
+    reimbursable_amount: 0,
   },
 });
+
+export const expectedSentBackResponse: PlatformReportsStatsResponse = deepFreeze({
+  total_amount: 4500,
+  count: 2,
+  failed_amount: 0,
+  failed_count: 0,
+  processing_amount: 0,
+  processing_count: 0,
+  reimbursable_amount: 0,
+});
+
+export const expectedSentBackResponseSingularReport: PlatformReportsStatsResponse = deepFreeze({
+  total_amount: 4500,
+  count: 1,
+  failed_amount: 0,
+  failed_count: 0,
+  processing_amount: 0,
+  processing_count: 0,
+  reimbursable_amount: 0,
+});

src/app/core/mock-data/task.data.ts

@@ -60,10 +60,24 @@ export const teamReportTaskSample = deepFreeze({
 });
 
 export const sentBackReportTaskSample = deepFreeze({
-  amount: '44.53',
+  amount: '4.5K',
+  count: 2,
+  header: 'Reports sent back!',
+  subheader: '2 reports worth ₹4.5K  were sent back by your approver',
+  icon: TaskIcon.REPORT,
+  ctas: [
+    {
+      content: 'View Reports',
+      event: TASKEVENT.openSentBackReport,
+    },
+  ],
+});
+
+export const sentBackReportTaskSingularSample = deepFreeze({
+  amount: '4.5K',
   count: 1,
   header: 'Report sent back!',
-  subheader: '1 report worth ₹44.53  was sent back by your approver',
+  subheader: '1 report worth ₹4.5K  was sent back by your approver',
   icon: TaskIcon.REPORT,
   ctas: [
     {
@@ -102,10 +116,10 @@ export const unreportedExpenseTaskSample2 = deepFreeze({
 });
 
 export const unsubmittedReportTaskSample = deepFreeze({
-  amount: '0.00',
+  amount: '93.17K',
   count: 2,
   header: 'Unsubmitted reports',
-  subheader: '2 reports remain in draft state',
+  subheader: '2 reports worth ₹93.17K  remain in draft state',
   icon: TaskIcon.REPORT,
   ctas: [
     {

src/app/core/models/approver.model.ts

@@ -1,6 +1,6 @@
 export interface Approver {
-  full_name: string;
-  email: string;
+  full_name: string | null;
+  email: string | null;
 }
 export interface AdvanceApprover {
   added_by: string;

src/app/core/models/custom_field.model.ts

@@ -3,7 +3,7 @@ import { AbstractControl } from '@angular/forms';
 export interface CustomField {
   id?: number;
   name: string;
-  value: string | boolean | number | Date | string[] | { display: string };
+  value: string | boolean | number | Date | string[] | { display: string } | null;
   type?: string;
   displayValue?: string | boolean | number | Date | string[] | { display: string };
   mandatory?: boolean;

src/app/core/models/org-user.model.ts

@@ -7,20 +7,20 @@ export interface OrgUser {
   user_id?: string;
   employee_id?: number | string;
   location: string;
-  level?: number | string;
+  level?: number | string | null;
   level_id?: string;
-  band?: string;
-  business_unit?: string;
-  department_id?: string;
-  department?: string;
-  sub_department?: string;
+  band?: string | null;
+  business_unit?: string | null;
+  department_id?: string | null;
+  department?: string | null;
+  sub_department?: string | null;
   roles?: string[];
   approver1_id?: string;
-  approver2_id?: string;
-  approver3_id?: string;
-  delegatee_id?: string;
-  delegation_start_at?: Date;
-  delegation_end_at?: Date;
+  approver2_id?: string | null;
+  approver3_id?: string | null;
+  delegatee_id?: string | null;
+  delegation_start_at?: Date | null;
+  delegation_end_at?: Date | null;
   title?: string;
   status: string;
   branch_ifsc?: string;
@@ -29,16 +29,16 @@ export interface OrgUser {
   mobile_verified?: boolean;
   mobile_verified_at?: Date;
   is_primary?: boolean;
-  owner?: boolean;
-  joining_dt?: Date;
+  owner?: boolean | null;
+  joining_dt?: Date | null;
   special_email?: string;
   custom_field_values?: CustomField[];
   org_name: string;
   settings_id?: string;
   default_cost_center_id?: number;
   default_cost_center_name?: string;
   default_cost_center_code?: string;
-  rank?: number;
+  rank?: number | null;
   cost_center_ids?: number[];
   mobile_verification_attempts_left?: number;
 }

src/app/core/services/platform/v1/approver/reports.service.spec.ts

@@ -15,6 +15,7 @@ import {
 import { ReportsQueryParams } from 'src/app/core/models/platform/v1/reports-query-params.model';
 import { StatsResponse } from 'src/app/core/models/platform/v1/stats-response.model';
 import { expectedReportStats } from 'src/app/core/mock-data/report-stats.data';
+import { ReportState } from '../../../../models/platform/v1/report.model';
 
 describe('ApproverReportsService', () => {
   let approverReportsService: ApproverReportsService;
@@ -58,6 +59,15 @@ describe('ApproverReportsService', () => {
     });
   });
 
+  it('generateStatsQueryParams(): should generate stats query params', () => {
+    const queryParams = {
+      state: `eq.${ReportState.DRAFT}`,
+    };
+
+    const result = approverReportsService.generateStatsQueryParams(queryParams);
+    expect(result).toEqual('state=eq.DRAFT');
+  });
+
   it('getReportsCount(): should get a count of reports', (done) => {
     // Mock the response of getReportsByParams
     spyOn(approverReportsService, 'getReportsByParams').and.returnValue(of(platformReportCountData));
@@ -158,14 +168,10 @@ describe('ApproverReportsService', () => {
   });
 
   it('getReportsStats(): should get advance request stats', (done) => {
-    const statsResponse: StatsResponse = {
-      count: 2,
-      total_amount: 1200,
-    };
     approverPlatformApiService.post.and.returnValue(of({ data: expectedReportStats.draft }));
 
     const params = {
-      state: 'eq.DRAFT',
+      state: `eq.${ReportState.DRAFT}`,
     };
 
     approverReportsService.getReportsStats(params).subscribe((res) => {

src/app/core/services/platform/v1/spender/reports.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable, PlatformRef } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { Observable, Subject, range } from 'rxjs';
 import { concatMap, map, reduce, switchMap, tap } from 'rxjs/operators';
 import { Report } from 'src/app/core/models/platform/v1/report.model';
@@ -73,7 +73,7 @@ export class SpenderReportsService {
     );
   }
 
-  getAllReportsByParams(queryParams: ReportsQueryParams, order?: string): Observable<Report[]> {
+  getAllReportsByParams(queryParams: ReportsQueryParams): Observable<Report[]> {
     return this.getReportsCount(queryParams).pipe(
       switchMap((count) => {
         count = count > this.paginationSize ? count / this.paginationSize : 1;