Merge pull request #87957 from DylanDylann/refactor-split-distance-creation

refactor: move split/distance creation functions to IOU/Split.ts

Author: roryabraham

src/libs/actions/IOU/Duplicate.ts

@@ -43,20 +43,13 @@ import type * as OnyxTypes from '@src/types/onyx';
 import type {Attendee, Participant} from '@src/types/onyx/IOU';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type {WaypointCollection} from '@src/types/onyx/Transaction';
-import type {CreateDistanceRequestInformation, RequestMoneyInformation} from '.';
-import {
-    createDistanceRequest,
-    getAllReportActionsFromIOU,
-    getAllReports,
-    getAllTransactions,
-    getAllTransactionViolations,
-    getCurrentUserEmail,
-    getMoneyRequestParticipantsFromReport,
-    getUserAccountID,
-} from '.';
+import type {RequestMoneyInformation} from '.';
+import {getAllReportActionsFromIOU, getAllReports, getAllTransactions, getAllTransactionViolations, getCurrentUserEmail, getMoneyRequestParticipantsFromReport, getUserAccountID} from '.';
 import {getCleanUpTransactionThreadReportOnyxData} from './DeleteMoneyRequest';
 import type {PerDiemExpenseInformation} from './PerDiem';
 import {submitPerDiemExpense} from './PerDiem';
+import type {CreateDistanceRequestInformation} from './Split';
+import {createDistanceRequest} from './Split';
 import type {CreateTrackExpenseParams} from './TrackExpense';
 import {requestMoney, trackExpense} from './TrackExpense';
 

src/libs/actions/IOU/MoneyRequest.ts

@@ -41,7 +41,6 @@ import type {Unit} from '@src/types/onyx/Policy';
 import type {Receipt, WaypointCollection} from '@src/types/onyx/Transaction';
 import type {GpsPoint} from './index';
 import {
-    createDistanceRequest,
     getMoneyRequestParticipantsFromReport,
     setCustomUnitRateID,
     setMoneyRequestDistance,
@@ -51,7 +50,7 @@ import {
     setMoneyRequestPendingFields,
     setMultipleMoneyRequestParticipantsFromReport,
 } from './index';
-import {resetSplitShares, startSplitBill} from './Split';
+import {createDistanceRequest, resetSplitShares, startSplitBill} from './Split';
 import {requestMoney, trackExpense} from './TrackExpense';
 
 type CreateTransactionParams = {

src/libs/actions/IOU/Split.ts

@@ -36,11 +36,10 @@ import {
     isManualDistanceRequest as isManualDistanceRequestTransactionUtils,
 } from '@libs/TransactionUtils';
 import type {GpsPoint} from '@userActions/IOU';
-import {createDistanceRequest as createDistanceRequestIOUActions} from '@userActions/IOU';
 import {submitPerDiemExpenseForSelfDM, submitPerDiemExpense as submitPerDiemExpenseIOUActions} from '@userActions/IOU/PerDiem';
 import {getReceiverType, sendInvoice} from '@userActions/IOU/SendInvoice';
 import {sendMoneyElsewhere, sendMoneyWithWallet} from '@userActions/IOU/SendMoney';
-import {splitBill, splitBillAndOpenReport, startSplitBill} from '@userActions/IOU/Split';
+import {createDistanceRequest as createDistanceRequestIOUActions, splitBill, splitBillAndOpenReport, startSplitBill} from '@userActions/IOU/Split';
 import {requestMoney as requestMoneyIOUActions, trackExpense as trackExpenseIOUActions} from '@userActions/IOU/TrackExpense';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';

src/libs/actions/IOU/index.ts

@@ -13,7 +13,7 @@ import ROUTES from '@src/ROUTES';
 import type {Policy, PolicyTagLists, QuickAction, RecentWaypoint} from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
 import type {SplitShares} from '@src/types/onyx/Transaction';
-import * as IOU from '../../../src/libs/actions/IOU';
+import type * as IOU from '../../../src/libs/actions/IOU';
 import * as Split from '../../../src/libs/actions/IOU/Split';
 import * as TrackExpense from '../../../src/libs/actions/IOU/TrackExpense';
 import DistanceRequestUtils from '../../../src/libs/DistanceRequestUtils';
@@ -29,7 +29,6 @@ jest.mock('@libs/actions/IOU', () => {
     const actualNav = jest.requireActual<typeof IOU>('@libs/actions/IOU');
     return {
         ...actualNav,
-        createDistanceRequest: jest.fn(),
     };
 });
 
@@ -46,6 +45,7 @@ jest.mock('@libs/actions/IOU/Split', () => {
     const actualSplit = jest.requireActual<typeof Split>('@libs/actions/IOU/Split');
     return {
         ...actualSplit,
+        createDistanceRequest: jest.fn(),
         startSplitBill: jest.fn(),
         resetSplitShares: jest.fn(),
     };
@@ -1215,7 +1215,7 @@ describe('MoneyRequest', () => {
             });
 
             // The function must return after trackExpense and not call createDistanceRequest
-            expect(IOU.createDistanceRequest).not.toHaveBeenCalled();
+            expect(Split.createDistanceRequest).not.toHaveBeenCalled();
         });
 
         it('should call trackExpense for TRACK iouType with valid waypoints when not from manual distance step and skipping confirmation', async () => {
@@ -1319,7 +1319,7 @@ describe('MoneyRequest', () => {
                 draftTransactionIDs: [baseParams.transactionID],
             });
 
-            expect(IOU.createDistanceRequest).toHaveBeenCalledWith(
+            expect(Split.createDistanceRequest).toHaveBeenCalledWith(
                 expect.objectContaining({
                     report: baseParams.report,
                     // participants: getParticipantsForTest(),
@@ -1358,7 +1358,7 @@ describe('MoneyRequest', () => {
                 draftTransactionIDs: [baseParams.transactionID],
             });
 
-            expect(IOU.createDistanceRequest).toHaveBeenCalledWith(
+            expect(Split.createDistanceRequest).toHaveBeenCalledWith(
                 expect.objectContaining({
                     report: baseParams.report,
                     // participants: getParticipantsForTest(),