Merge pull request Expensify#88292 from parasharrajat/onyx/session-6

Refactor mergeDuplicates to pass currentUserData

Author: tgolen

src/libs/actions/IOU/Duplicate.ts

@@ -76,15 +76,14 @@ function getIOUActionForTransactions(transactionIDList: Array<string | undefined
     );
 }
 
+type MergeDuplicatesFuncParams = MergeDuplicatesParams & {currentUserLogin: string; currentUserAccountID: number};
+
 /** Merge several transactions into one by updating the fields of the one we want to keep and deleting the rest */
-function mergeDuplicates({transactionThreadReportID: optimisticTransactionThreadReportID, ...params}: MergeDuplicatesParams) {
+function mergeDuplicates({transactionThreadReportID: optimisticTransactionThreadReportID, currentUserLogin, currentUserAccountID, ...params}: MergeDuplicatesFuncParams) {
     const allParams: MergeDuplicatesParams = {...params};
     const allTransactions = getAllTransactions();
     const allTransactionViolations = getAllTransactionViolations();
     const allReports = getAllReports();
-    const currentUserEmail = getCurrentUserEmail();
-    const currentUserAccountID = getUserAccountID();
-
     const originalSelectedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`];
 
     const optimisticTransactionData: OnyxUpdate<typeof ONYXKEYS.COLLECTION.TRANSACTION> = {
@@ -283,7 +282,7 @@ function mergeDuplicates({transactionThreadReportID: optimisticTransactionThread
 
     if (optimisticTransactionThreadReportID) {
         const iouAction = getIOUActionForReportID(params.reportID, params.transactionID);
-        const optimisticCreatedAction = buildOptimisticCreatedReportAction(currentUserEmail);
+        const optimisticCreatedAction = buildOptimisticCreatedReportAction(currentUserLogin);
         const optimisticTransactionThreadReport = buildTransactionThread(iouAction, expenseReport, undefined, optimisticTransactionThreadReportID);
 
         allParams.transactionThreadReportID = optimisticTransactionThreadReportID;

src/pages/TransactionDuplicate/Confirmation.tsx

@@ -80,13 +80,13 @@ function Confirmation() {
         if (!reportAction?.childReportID) {
             transactionsMergeParams.transactionThreadReportID = transactionThreadReportID;
         }
-        mergeDuplicates(transactionsMergeParams);
+        mergeDuplicates({...transactionsMergeParams, currentUserAccountID: currentUserPersonalDetails.accountID, currentUserLogin: currentUserPersonalDetails?.login ?? ''});
         if (isSuperWideRHPDisplayed) {
             Navigation.dismissToSuperWideRHP();
             return;
         }
         Navigation.dismissModal();
-    }, [reportAction?.childReportID, transactionsMergeParams, isSuperWideRHPDisplayed]);
+    }, [reportAction?.childReportID, transactionsMergeParams, currentUserPersonalDetails.accountID, currentUserPersonalDetails?.login, isSuperWideRHPDisplayed]);
 
     const handleResolveDuplicates = useCallback(() => {
         resolveDuplicates(transactionsMergeParams);

tests/actions/IOUTest/DuplicateTest.ts

@@ -7,6 +7,7 @@ import {bulkDuplicateExpenses, bulkDuplicateReports, duplicateExpenseTransaction
 import type {BulkDuplicateReportsParams, DuplicateReportParams} from '@libs/actions/IOU/Duplicate';
 import initOnyxDerivedValues from '@libs/actions/OnyxDerived';
 import {addComment, openReport} from '@libs/actions/Report';
+import type {MergeDuplicatesParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import Navigation from '@libs/Navigation/Navigation';
 import {getLoginsByAccountIDs} from '@libs/PersonalDetailsUtils';
@@ -186,7 +187,7 @@ describe('actions/Duplicate', () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${childReportID}`, {});
             await waitForBatchedUpdates();
 
-            const mergeParams = {
+            const mergeParams: MergeDuplicatesParams = {
                 transactionID: mainTransactionID,
                 transactionIDList: duplicateTransactionIDs,
                 created: '2024-01-01 12:00:00',
@@ -203,7 +204,7 @@ describe('actions/Duplicate', () => {
             };
 
             // When: Call mergeDuplicates
-            mergeDuplicates(mergeParams);
+            mergeDuplicates({...mergeParams, currentUserLogin: RORY_EMAIL, currentUserAccountID: RORY_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
             // Then: Verify main transaction was updated
@@ -267,7 +268,7 @@ describe('actions/Duplicate', () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {});
             await waitForBatchedUpdates();
 
-            const mergeParams = {
+            const mergeParams: MergeDuplicatesParams = {
                 transactionID: mainTransactionID,
                 transactionIDList: [],
                 created: '2024-01-01 12:00:00',
@@ -284,7 +285,7 @@ describe('actions/Duplicate', () => {
             };
 
             // When: Call mergeDuplicates with empty duplicate list
-            mergeDuplicates(mergeParams);
+            mergeDuplicates({...mergeParams, currentUserLogin: RORY_EMAIL, currentUserAccountID: RORY_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
             // Then: Verify main transaction was still updated
@@ -318,7 +319,7 @@ describe('actions/Duplicate', () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {});
             await waitForBatchedUpdates();
 
-            const mergeParams = {
+            const mergeParams: MergeDuplicatesParams = {
                 transactionID: mainTransactionID,
                 transactionIDList: duplicateTransactionIDs,
                 created: '2024-01-01 12:00:00',
@@ -335,7 +336,7 @@ describe('actions/Duplicate', () => {
             };
 
             // When: Call mergeDuplicates without expense report
-            mergeDuplicates(mergeParams);
+            mergeDuplicates({...mergeParams, currentUserLogin: RORY_EMAIL, currentUserAccountID: RORY_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
             // Then: Verify function completed without errors
@@ -519,7 +520,7 @@ describe('actions/Duplicate', () => {
 
             await waitForBatchedUpdates();
 
-            const mergeParams = {
+            const mergeParams: MergeDuplicatesParams = {
                 transactionID: mainTransactionID,
                 transactionIDList: duplicateTransactionIDs,
                 created: '2024-01-01 12:00:00',
@@ -536,7 +537,7 @@ describe('actions/Duplicate', () => {
             };
 
             // When: Call mergeDuplicates
-            mergeDuplicates(mergeParams);
+            mergeDuplicates({...mergeParams, currentUserLogin: RORY_EMAIL, currentUserAccountID: RORY_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
             // Then we expect the reportPreview to update with new childVisibleActionCount
@@ -618,7 +619,7 @@ describe('actions/Duplicate', () => {
             });
             await waitForBatchedUpdates();
 
-            const mergeParams = {
+            const mergeParams: MergeDuplicatesParams = {
                 transactionID: mainTransactionID,
                 transactionIDList: duplicateTransactionIDs,
                 transactionThreadReportID: optimisticTransactionThreadReportID,
@@ -636,7 +637,7 @@ describe('actions/Duplicate', () => {
             };
 
             // When: Call mergeDuplicates with transactionThreadReportID
-            mergeDuplicates(mergeParams);
+            mergeDuplicates({...mergeParams, currentUserLogin: RORY_EMAIL, currentUserAccountID: RORY_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
             // Then: Verify the optimistic transaction thread report was created