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.

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

fix: retain receipt when editing, remove code for advance wallet id, set unspecified category id #3245

Merged
merged 4 commits into from
Nov 4, 2024

Conversation

arjunaj5
Copy link
Contributor

Clickup

Please add link here

Code Coverage

Please add code coverage here

UI Preview

Please add screenshots for UI changes

Copy link

coderabbitai bot commented Oct 28, 2024

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added the size/S Small PR label Oct 28, 2024
Copy link

PR title must start with "fix:", "feat:", "chore:", "refactor:", or "test:" (case-insensitive)

Copy link

PR description must contain a link to a ClickUp (case-insensitive)

@arjunaj5 arjunaj5 changed the title Fyle 86cwwkjx2 fix: retain receipt when editing, remove code for advance wallet id, set unspecified category id Oct 28, 2024
Copy link

PR description must contain a link to a ClickUp (case-insensitive)

Copy link

PR description must contain a link to a ClickUp (case-insensitive)

};
return this.expensesService.post(expense).pipe(map(() => txn));
} else {
return of(txn);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

advance_wallet_id will be already set in the normal POST flow. We don't need this additional call

return this.transactionService.upsert(etxn.tx as Transaction).pipe(
switchMap((txn) => this.expensesService.getExpenseById(txn.id)),
map((expense) => this.transactionService.transformExpense(expense).tx),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we are not using the result of this double call for checking policy_amount and other fields

@@ -3545,7 +3548,8 @@ export class AddEditExpensePage implements OnInit {
amount = etxn.tx.user_amount;
}

//TODO: Add depenedent fields to custom_properties array once APIs are available
const category_id = this.getOrgCategoryID() || unspecifiedCategory.id;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

setting unspecified category as the default category.

@@ -205,7 +205,8 @@ export class TransactionService {
}
} else {
const fileIds = fileObjs.map((fileObj) => fileObj.id);
return this.upsert(txn, fileIds);
txn.file_ids = fileIds;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

only during createTxnWithFiles do we have to set the file_ids in the add/edit flow. In other scenarios of the add/edit, the file_ids will be already present.

* fix expense for sending claim_amount as user_amount

* fix mileage expenses creation -> add mileage_rate_id

* test: Fix failing tests for move expenses POST to platform (#3251)

* fix all failing tests except add-edit-expense-4.spec unknown ones on component.editExpense()

* fix more test

* minor
@arjunaj5 arjunaj5 merged commit dc8aed3 into Fyle-expenses-post-main Nov 4, 2024
5 of 6 checks passed
@github-actions github-actions bot added size/L Large PR and removed size/S Small PR labels Nov 4, 2024
Copy link

github-actions bot commented Nov 4, 2024

PR description must contain a link to a ClickUp (case-insensitive)

Copy link

github-actions bot commented Nov 4, 2024

Unit Test Coverage % values
Statements 95.96% ( 19101 / 19905 )
Branches 91.19% ( 10559 / 11578 )
Functions 94.36% ( 5707 / 6048 )
Lines 96% ( 18232 / 18991 )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Large PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants