Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor IOU.categorizeTrackedExpense function #52221

Merged
merged 11 commits into from
Dec 11, 2024
Merged

Refactor IOU.categorizeTrackedExpense function #52221

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8f669b8
Refactor IOU.categorizeTrackedExpense function
ChavdaSachin Nov 7, 2024
3fbe21c
lint fix
ChavdaSachin Nov 7, 2024
23e840f
lint 2
ChavdaSachin Nov 7, 2024
0648dbf
lint 3
ChavdaSachin Nov 7, 2024
80ac36e
lint 4
ChavdaSachin Nov 7, 2024
355d549
lint fix
ChavdaSachin Nov 7, 2024
9210a43
prettier
ChavdaSachin Nov 7, 2024
8fa880b
Merge Main
ChavdaSachin Dec 4, 2024
384f79c
Lint
ChavdaSachin Dec 4, 2024
db14ca8
Refactor IOU.categorizeTrackedExpense
ChavdaSachin Dec 8, 2024
0f13fb3
Refactor
ChavdaSachin Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 72 additions & 64 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,41 @@ type TrackExpenseInformation = {
actionableWhisperReportActionIDParam?: string;
onyxData: OnyxData;
};

type CategorizeTrackedExpenseTransactionParams = {
transactionID: string;
amount: number;
currency: string;
comment: string;
merchant: string;
created: string;
taxCode: string;
taxAmount: number;
category?: string;
tag?: string;
billable?: boolean;
receipt?: Receipt;
};
type CategorizeTrackedExpensePolicyParams = {
policyID: string;
isDraftPolicy: boolean;
};
type CategorizeTrackedExpenseReportInformation = {
moneyRequestPreviewReportActionID: string;
moneyRequestReportID: string;
moneyRequestCreatedReportActionID: string;
actionableWhisperReportActionID: string;
linkedTrackedExpenseReportAction: OnyxTypes.ReportAction;
linkedTrackedExpenseReportID: string;
transactionThreadReportID: string;
reportPreviewReportActionID: string;
};
type CategorizeTrackedExpenseParams = {
onyxData: OnyxData | undefined;
reportInformation: CategorizeTrackedExpenseReportInformation;
transactionParams: CategorizeTrackedExpenseTransactionParams;
policyParams: CategorizeTrackedExpensePolicyParams;
createdWorkspaceParams?: CreateWorkspaceParams;
};
type SendInvoiceInformation = {
senderWorkspaceID: string;
receiver: Partial<OnyxTypes.PersonalDetails>;
Expand Down Expand Up @@ -3452,34 +3486,12 @@ function convertTrackedExpenseToRequest(
API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, {optimisticData, successData, failureData});
}

function categorizeTrackedExpense(
policyID: string,
transactionID: string,
moneyRequestPreviewReportActionID: string,
moneyRequestReportID: string,
moneyRequestCreatedReportActionID: string,
actionableWhisperReportActionID: string,
linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
linkedTrackedExpenseReportID: string,
transactionThreadReportID: string,
reportPreviewReportActionID: string,
onyxData: OnyxData | undefined,
amount: number,
currency: string,
comment: string,
merchant: string,
created: string,
isDraftPolicy: boolean,
category?: string,
tag?: string,
taxCode = '',
taxAmount = 0,
billable?: boolean,
receipt?: Receipt,
createdWorkspaceParams?: CreateWorkspaceParams,
) {
function categorizeTrackedExpense(trackedExpenseParams: CategorizeTrackedExpenseParams) {
const {onyxData, reportInformation, transactionParams, policyParams, createdWorkspaceParams} = trackedExpenseParams;
const {optimisticData, successData, failureData} = onyxData ?? {};

const {transactionID} = transactionParams;
const {isDraftPolicy} = policyParams;
const {actionableWhisperReportActionID, moneyRequestReportID, linkedTrackedExpenseReportAction, linkedTrackedExpenseReportID, transactionThreadReportID} = reportInformation;
const {
optimisticData: moveTransactionOptimisticData,
successData: moveTransactionSuccessData,
Expand All @@ -3498,27 +3510,12 @@ function categorizeTrackedExpense(
optimisticData?.push(...moveTransactionOptimisticData);
successData?.push(...moveTransactionSuccessData);
failureData?.push(...moveTransactionFailureData);

const parameters = {
policyID,
transactionID,
moneyRequestPreviewReportActionID,
moneyRequestReportID,
moneyRequestCreatedReportActionID,
actionableWhisperReportActionID,
onyxData,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you pass onyxData in the API request params?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems to be a blunder made by me while resolving conflicts.
Thank you @paultsimura.
Now there are two options, you could remove it in your current PR or else I would fix it in my upcoming refactor PR.
Also I am re checking this PR to make sure no other such mistakes are done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fixing in my PR 👍

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also linkedTrackedExpenseReportAction from ...reportInformation

...reportInformation,
...policyParams,
...transactionParams,
modifiedExpenseReportActionID,
reportPreviewReportActionID,
amount,
currency,
comment,
merchant,
category,
tag,
taxCode,
taxAmount,
billable,
created,
receipt,
policyExpenseChatReportID: createdWorkspaceParams?.expenseChatReportID,
policyExpenseCreatedReportActionID: createdWorkspaceParams?.expenseCreatedReportActionID,
adminsChatReportID: createdWorkspaceParams?.adminsChatReportID,
Expand Down Expand Up @@ -3891,32 +3888,43 @@ function trackExpense(
if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
return;
}
categorizeTrackedExpense(
chatReport?.policyID ?? '-1',
transaction?.transactionID ?? '-1',
iouAction?.reportActionID ?? '-1',
iouReport?.reportID ?? '-1',
createdIOUReportActionID ?? '-1',
actionableWhisperReportActionID,
linkedTrackedExpenseReportAction,
linkedTrackedExpenseReportID,
transactionThreadReportID ?? '-1',
reportPreviewAction?.reportActionID ?? '-1',
onyxData,
const transactionParams = {
transactionID: transaction?.transactionID ?? '-1',
amount,
currency,
comment,
merchant,
created,
isDraftPolicy,
category,
tag,
taxCode,
taxAmount,
category,
tag,
billable,
trackedReceipt,
receipt: trackedReceipt,
};
const policyParams = {
policyID: chatReport?.policyID ?? '-1',
isDraftPolicy,
};
const reportInformation = {
moneyRequestPreviewReportActionID: iouAction?.reportActionID ?? '-1',
moneyRequestReportID: iouReport?.reportID ?? '-1',
moneyRequestCreatedReportActionID: createdIOUReportActionID ?? '-1',
actionableWhisperReportActionID,
linkedTrackedExpenseReportAction,
linkedTrackedExpenseReportID,
transactionThreadReportID: transactionThreadReportID ?? '-1',
reportPreviewReportActionID: reportPreviewAction?.reportActionID ?? '-1',
};
const trackedExpenseParams = {
onyxData,
reportInformation,
transactionParams,
policyParams,
createdWorkspaceParams,
);
};

categorizeTrackedExpense(trackedExpenseParams);
break;
}
case CONST.IOU.ACTION.SHARE: {
Expand Down
Loading