refactor: remove unwanted Expense model that has tx_ properties

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

@@ -1,6 +1,5 @@
 import deepFreeze from 'deep-freeze-strict';
 
-import { Expense } from '../models/expense.model';
 import { ApiV2Response } from '../models/v2/api-v2-response.model';
 
 export const apiExpenseRes: Expense[] = deepFreeze([

src/app/core/models/v1/transaction.model.ts

@@ -1,6 +1,7 @@
 import { ExpenseTransactionStatus } from '../../enums/platform/v1/expense-transaction-status.enum';
 import { Destination } from '../destination.model';
 import { PlatformCategory } from '../platform/platform-category.model';
+import { Account } from '../platform/v1/account.model';
 import { File } from '../platform/v1/file.model';
 import { TxnCustomProperties } from '../txn-custom-properties.model';
 
@@ -67,6 +68,7 @@ export interface Transaction {
   reported_at?: Date;
   skip_reimbursement: boolean;
   source: string;
+  source_account?: Pick<Account, 'id' | 'type'>;
   source_account_id?: string;
   advance_wallet_id?: string;
   split_group_id?: string;

src/app/core/services/custom-inputs.service.spec.ts

@@ -13,7 +13,6 @@ import {
   filledDependentFields,
 } from '../test-data/custom-inputs.spec.data';
 import { CustomInputsService } from './custom-inputs.service';
-import { expensesWithDependentFields } from '../mock-data/dependent-field-expenses.data';
 import { CustomInput } from '../models/custom-input.model';
 import { mockExpenseData } from '../mock-data/expense-field.data';
 import { getTranslocoModule } from '../testing/transloco-testing.utils';

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

@@ -394,74 +394,6 @@ describe('TransactionService', () => {
     expect(transactionService.generateStateOrFilter(filters, params)).toEqual(stateOrFilter);
   });
 
-  it('getPaymentModeforEtxn(): should return payment mode for etxn', () => {
-    spyOn(transactionService, 'isEtxnInPaymentMode').and.returnValue(true);
-    const paymentModeList = [
-      {
-        name: 'Reimbursable',
-        key: 'reimbursable',
-      },
-      {
-        name: 'Non-Reimbursable',
-        key: 'nonReimbursable',
-      },
-      {
-        name: 'Advance',
-        key: 'advance',
-      },
-      {
-        name: 'CCC',
-        key: 'ccc',
-      },
-    ];
-    const etxnPaymentMode = { name: 'Reimbursable', key: 'reimbursable' };
-    // @ts-ignore
-    expect(transactionService.getPaymentModeForEtxn(expenseData1, paymentModeList)).toEqual(etxnPaymentMode);
-    expect(transactionService.isEtxnInPaymentMode).toHaveBeenCalledOnceWith(
-      expenseData1.tx_skip_reimbursement,
-      expenseData1.source_account_type,
-      etxnPaymentMode.key,
-    );
-  });
-
-  describe('isEtxnInPaymentMode():', () => {
-    it('should return isEtxnInPaymentMode with reimbursable payment mode', () => {
-      const txnSkipReimbursement = false;
-      const txnPaymentMode = 'reimbursable';
-      const txnSourceAccountType = AccountType.PERSONAL;
-      expect(
-        transactionService.isEtxnInPaymentMode(txnSkipReimbursement, txnSourceAccountType, txnPaymentMode),
-      ).toBeTrue();
-    });
-
-    it('should return isEtxnInPaymentMode with non-reimbursable payment mode', () => {
-      const txnSkipReimbursement = true;
-      const txnPaymentMode = 'nonReimbursable';
-      const txnSourceAccountType = AccountType.PERSONAL;
-      expect(
-        transactionService.isEtxnInPaymentMode(txnSkipReimbursement, txnSourceAccountType, txnPaymentMode),
-      ).toBeTrue();
-    });
-
-    it('should return isEtxnInPaymentMode with advance payment mode', () => {
-      const txnSkipReimbursement = false;
-      const txnPaymentMode = 'advance';
-      const txnSourceAccountType = AccountType.ADVANCE;
-      expect(
-        transactionService.isEtxnInPaymentMode(txnSkipReimbursement, txnSourceAccountType, txnPaymentMode),
-      ).toBeTrue();
-    });
-
-    it('should return isEtxnInPaymentMode with advance payment mode', () => {
-      const txnSkipReimbursement = false;
-      const txnPaymentMode = 'ccc';
-      const txnSourceAccountType = AccountType.CCC;
-      expect(
-        transactionService.isEtxnInPaymentMode(txnSkipReimbursement, txnSourceAccountType, txnPaymentMode),
-      ).toBeTrue();
-    });
-  });
-
   describe('addEtxnToCurrencyMap():', () => {
     it('should add a new currency to the map when the currencyMap does not exist', () => {
       const currencyMap = {};