feat: Move My Expenses to Platform: Moved API Call Of Expenses in My Expenses And Updated Mapping In Expenses Card

src/app/core/models/platform/v1/expense.model.ts

@@ -13,8 +13,8 @@ import { ReportApprovals } from '../report-approvals.model';
 import { PlatformPerDiemRates } from '../platform-per-diem-rates.model';
 import { Level } from './level.model';
 import { Department } from './department.model';
-import { Account } from './account.model';
 import { ReportState } from '../platform-report.model';
+import { Account } from './account.model';
 
 export interface Expense {
   // `activity_details` is not added on purpose

src/app/core/models/platform/v1/expenses-query-params.model.ts

@@ -2,4 +2,7 @@ import { APIQueryParams } from './query-params.model';
 
 export interface ExpensesQueryParams extends APIQueryParams {
   report_id?: string;
+  state?: string;
+  searchString?: string;
+  queryParams?: Record<string, string>;
 }

src/app/core/models/platform/v1/get-expenses-query.model.ts

@@ -0,0 +1,7 @@
+export interface GetExpenseQueryParam {
+  pageNumber: number;
+  sortParam: string;
+  sortDir: string;
+  searchString: string;
+  queryParams: Record<string, string>;
+}

src/app/core/services/platform/v1/shared/expense.service.ts

@@ -6,8 +6,6 @@ import { Expense } from 'src/app/core/models/platform/v1/expense.model';
   providedIn: 'root',
 })
 export class ExpenseService {
-  constructor() {}
-
   getIsDraft(expense: Expense): boolean {
     return expense.state && expense.state === ExpenseState.DRAFT;
   }

src/app/core/services/transaction.service.ts

@@ -76,7 +76,8 @@ export class TransactionService {
     private userEventService: UserEventService,
     private paymentModesService: PaymentModesService,
     private orgSettingsService: OrgSettingsService,
-    private accountsService: AccountsService
+    private accountsService: AccountsService,
+    private spenderPlatformAPIV1Service: SpenderPlatformV1ApiService
   ) {
     transactionsCacheBuster$.subscribe(() => {
       this.userEventService.clearTaskCache();

src/app/fyle/my-expenses/my-expenses.page.html

@@ -189,18 +189,18 @@
 
     <ng-container *ngIf="isConnected$|async">
       <div *ngFor="let expense of myExpenses$ | async as list; let i = index">
-        <app-expense-card
+        <app-expense-card-v2
           [expense]="expense"
-          [previousExpenseTxnDate]="list[i-1]?.tx_txn_dt"
-          [previousExpenseCreatedAt]="list[i-1]?.tx_created_at"
+          [previousExpenseTxnDate]="list[i-1]?.spent_at"
+          [previousExpenseCreatedAt]="list[i-1]?.created_at"
           [isSelectionModeEnabled]="selectionMode"
           [selectedElements]="selectedElements"
           (goToTransaction)="goToTransaction($event)"
           (setMultiselectMode)="switchSelectionMode($event)"
           (cardClickedForSelection)="selectExpense($event)"
           (showCamera)="showCamera($event)"
         >
-        </app-expense-card>
+        </app-expense-card-v2>
       </div>
     </ng-container>
     <ng-container *ngIf="isConnected$|async">

src/app/fyle/my-expenses/my-expenses.page.ts

@@ -27,7 +27,6 @@ import {
   switchMap,
   take,
   takeUntil,
-  tap,
   filter,
 } from 'rxjs/operators';
 import { TransactionService } from 'src/app/core/services/transaction.service';
@@ -79,6 +78,9 @@ import { UniqueCards } from 'src/app/core/models/unique-cards.model';
 import { CategoriesService } from 'src/app/core/services/categories.service';
 import { PlatformCategory } from 'src/app/core/models/platform/platform-category.model';
 import { ReportV1 } from 'src/app/core/models/report-v1.model';
+import { GetExpenseQueryParam } from 'src/app/core/models/platform/v1/get-expenses-query.model';
+import { ExpensesService } from 'src/app/core/services/platform/v1/spender/expenses.service';
+import { Expense as PlatformExpense } from 'src/app/core/models/platform/v1/expense.model';
 
 @Component({
   selector: 'app-my-expenses',
@@ -90,17 +92,19 @@ export class MyExpensesPage implements OnInit {
 
   isConnected$: Observable<boolean>;
 
-  myExpenses$: Observable<Expense[]>;
+  myExpenses$: Observable<PlatformExpense[]>;
 
   count$: Observable<number>;
 
   isInfiniteScrollRequired$: Observable<boolean>;
 
   loadData$: BehaviorSubject<Partial<GetExpensesQueryParamsWithFilters>>;
 
+  loadExpenses$: BehaviorSubject<Partial<GetExpenseQueryParam>>;
+
   currentPageNumber = 1;
 
-  acc: Expense[] = [];
+  acc: PlatformExpense[] = [];
 
   filters: Partial<ExpenseFilters>;
 
@@ -216,7 +220,8 @@ export class MyExpensesPage implements OnInit {
     private orgUserSettingsService: OrgUserSettingsService,
     private platformHandlerService: PlatformHandlerService,
     private categoriesService: CategoriesService,
-    private navController: NavController
+    private navController: NavController,
+    private expenseService: ExpensesService
   ) {}
 
   get HeaderState(): typeof HeaderState {
@@ -491,6 +496,10 @@ export class MyExpensesPage implements OnInit {
       pageNumber: 1,
     });
 
+    this.loadExpenses$ = new BehaviorSubject({
+      pageNumber: 1,
+    });
+
     this.selectionMode = false;
     this.selectedElements = [];
 
@@ -525,55 +534,54 @@ export class MyExpensesPage implements OnInit {
         this.loadData$.next(currentParams);
       });
 
-    const paginatedPipe = this.loadData$.pipe(
+    const paginatedPipe = this.loadExpenses$.pipe(
       switchMap((params) => {
-        let queryParams = params.queryParams || {};
+        const queryParams = params.queryParams || {};
 
-        queryParams.tx_report_id = queryParams.tx_report_id || 'is.null';
-        queryParams.tx_state = 'in.(COMPLETE,DRAFT)';
-        queryParams = this.apiV2Service.extendQueryParamsForTextSearch(queryParams, params.searchString);
-        const orderByParams = params.sortParam && params.sortDir ? `${params.sortParam}.${params.sortDir}` : null;
+        queryParams.report_id = queryParams.report_id || 'is.null';
+        queryParams.state = 'in.(COMPLETE,DRAFT)';
+        const orderByParams =
+          params.sortParam && params.sortDir
+            ? `${params.sortParam}.${params.sortDir}`
+            : 'spent_at.desc,created_at.desc,id.desc';
         this.isLoadingDataInInfiniteScroll = true;
-        return this.transactionService.getMyExpensesCount(queryParams).pipe(
+
+        return this.expenseService.getExpensesCount(queryParams).pipe(
           switchMap((count) => {
             if (count > (params.pageNumber - 1) * 10) {
-              return this.transactionService.getMyExpenses({
+              return this.expenseService.getExpenses({
                 offset: (params.pageNumber - 1) * 10,
                 limit: 10,
-                queryParams,
+                ...queryParams,
                 order: orderByParams,
               });
             } else {
               return of({
                 data: [],
               });
             }
+          }),
+          map((res) => {
+            this.isLoadingDataInInfiniteScroll = false;
+            if (this.currentPageNumber === 1) {
+              this.acc = [];
+            }
+            this.acc = this.acc.concat(res as PlatformExpense[]);
+            return this.acc;
           })
         );
-      }),
-      map((res) => {
-        this.isLoadingDataInInfiniteScroll = false;
-        if (this.currentPageNumber === 1) {
-          this.acc = [];
-        }
-        this.acc = this.acc.concat(res.data);
-        return this.acc;
-      }),
-      tap(() => {
-        this.pendingTransactions = this.formatTransactions(this.transactionOutboxService.getPendingTransactions());
       })
     );
 
     this.myExpenses$ = paginatedPipe.pipe(shareReplay(1));
 
-    this.count$ = this.loadData$.pipe(
+    this.count$ = this.loadExpenses$.pipe(
       switchMap((params) => {
-        let queryParams = params.queryParams || {};
+        const queryParams = params.queryParams || {};
 
-        queryParams.tx_report_id = queryParams.tx_report_id || 'is.null';
-        queryParams.tx_state = 'in.(COMPLETE,DRAFT)';
-        queryParams = this.apiV2Service.extendQueryParamsForTextSearch(queryParams, params.searchString);
-        return this.transactionService.getMyExpensesCount(queryParams);
+        queryParams.report_id = queryParams.report_id || 'is.null';
+        queryParams.state = 'in.(COMPLETE,DRAFT)';
+        return this.expenseService.getExpensesCount(queryParams);
       }),
       shareReplay(1)
     );
@@ -584,7 +592,7 @@ export class MyExpensesPage implements OnInit {
       switchMap((etxns) => this.count$.pipe(map((count) => count > etxns.length)))
     );
 
-    this.isInfiniteScrollRequired$ = this.loadData$.pipe(switchMap(() => paginatedScroll$));
+    this.isInfiniteScrollRequired$ = this.loadExpenses$.pipe(switchMap(() => paginatedScroll$));
 
     this.setAllExpensesCountAndAmount();
 
@@ -690,9 +698,9 @@ export class MyExpensesPage implements OnInit {
   loadData(event: { target?: { complete?: () => void } }): void {
     this.currentPageNumber = this.currentPageNumber + 1;
 
-    const params = this.loadData$.getValue();
+    const params = this.loadExpenses$.getValue();
     params.pageNumber = this.currentPageNumber;
-    this.loadData$.next(params);
+    this.loadExpenses$.next(params);
 
     setTimeout(() => {
       event?.target?.complete();