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

enhance: allow negatives in the budget template #4028

Merged
merged 3 commits into from
Dec 23, 2024

Conversation

UnderKoen
Copy link
Member

@UnderKoen UnderKoen commented Dec 23, 2024

Allow the budget template #template -20

@actual-github-bot actual-github-bot bot changed the title enhance: allow negatives in the budget template [WIP] enhance: allow negatives in the budget template Dec 23, 2024
Copy link

netlify bot commented Dec 23, 2024

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 9e0275a
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/6769d3946af5400008583480
😎 Deploy Preview https://deploy-preview-4028.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
10 5.64 MB 0%

Changeset

No files were changed

View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/resize-observer.js 18.37 kB 0%
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/useAccountPreviewTransactions.js 1.63 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/AppliedFilters.js 10.24 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/narrow.js 83.36 kB 0%
static/js/wide.js 104.11 kB 0%
static/js/ReportRouter.js 1.58 MB 0%
static/js/index.js 3.71 MB 0%

Copy link
Contributor

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
1 1.32 MB → 1.32 MB (+74 B) +0.01%
Changeset
File Δ Size
packages/loot-core/src/server/budget/goal-template.pegjs 📈 +253 B (+0.40%) 61.08 kB → 61.33 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
kcab.worker.js 1.32 MB → 1.32 MB (+74 B) +0.01%

Smaller

No assets were smaller

Unchanged

No assets were unchanged

@UnderKoen UnderKoen changed the title [WIP] enhance: allow negatives in the budget template enhance: allow negatives in the budget template Dec 23, 2024
Copy link
Contributor

coderabbitai bot commented Dec 23, 2024

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

packages/loot-core/src/server/budget/template-notes.test.ts

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "eslint-plugin-eslint-plugin".

(The package "eslint-plugin-eslint-plugin" was not found when loaded as a Node module from the directory "/packages/eslint-plugin-actual".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install eslint-plugin-eslint-plugin@latest --save-dev

The plugin "eslint-plugin-eslint-plugin" was referenced from the config file in "packages/eslint-plugin-actual/.eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.

Walkthrough

The pull request introduces changes to the budget template parsing grammar and adds a corresponding test case. In the goal-template.pegjs file, the grammar rule for parsing amounts is modified to allow negative values by adding an optional negative sign before the digit sequence. This change enables the representation of negative monetary values in budget templates. The accompanying test file template-notes.test.ts includes a new test case that verifies the functionality of storing templates with negative values, specifically testing the storeTemplates function's ability to handle and process negative amounts in template notes.

Possibly related PRs

Suggested labels

sparkles: Merged

Suggested reviewers

  • matt-fidd

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. We would love to hear your feedback on Discord.


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/loot-core/src/server/budget/template-notes.test.ts (1)

56-75: Excellent addition of negative test coverage—consider edge cases.

This new test scenario effectively verifies that negative values (e.g., “-103.23”) are stored correctly. Consider adding boundary tests to confirm correct handling of large negative amounts or values like “-0.01.”

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0b2c8cc and 9e0275a.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4028.md is excluded by !**/*.md
📒 Files selected for processing (2)
  • packages/loot-core/src/server/budget/goal-template.pegjs (1 hunks)
  • packages/loot-core/src/server/budget/template-notes.test.ts (1 hunks)
🧰 Additional context used
📓 Learnings (1)
packages/loot-core/src/server/budget/goal-template.pegjs (2)
Learnt from: youngcw
PR: actualbudget/actual#3754
File: packages/loot-core/src/server/budget/goal-template.pegjs:38-43
Timestamp: 2024-11-10T16:45:25.627Z
Learning: Validations for limit rules, such as checking start date validity and ensuring amounts are positive, are performed during template processing, not in the parser defined in `goal-template.pegjs`.
Learnt from: youngcw
PR: actualbudget/actual#3754
File: packages/loot-core/src/server/budget/goal-template.pegjs:38-43
Timestamp: 2024-11-10T16:45:25.627Z
Learning: In `packages/loot-core/src/server/budget/goal-template.pegjs`, within the `limit` rule, the optional space `_?` is always placed before the `hold` option, ensuring consistency.
🔇 Additional comments (1)
packages/loot-core/src/server/budget/goal-template.pegjs (1)

73-73: Allowing negative amounts is now supported—please confirm no conflicts with downstream code.

The grammar update for the “amount” rule now parses an optional '-' sign. Since prior validations for positivity were performed outside the parser (as noted in previous learnings), this change is consistent. Ensure that any business rules expecting only positive amounts are updated if needed.

✅ Verification successful

Let me search for any code that might be affected by allowing negative amounts in the grammar.

Let me also check for any direct usage of the goal template parser:

And let's look for any test files that might give us insights into the expected behavior:


Let's examine the test files and the app.ts that uses the goal template parser to understand how amounts are handled:


Let's check the goal templates implementation and actions to see how amounts are processed:


Based on the code review, I can now provide a final response:

Support for negative amounts in the grammar is safe and consistent with existing code

The codebase already handles negative amounts throughout the budget system:

  • Test cases explicitly verify negative template amounts (e.g., #template -103.23 in template-notes.test.ts)
  • The goalsSchedule.test.ts shows negative amounts being processed (amount: -10000, -12000)
  • The actions.ts contains logic that works with both positive and negative amounts, including proper sign handling for income vs. expense categories
  • No explicit validation restricting amounts to positive values was found
🏁 Scripts executed

The following scripts were executed for the analysis:

Error: No shell scripts found


Script:

#!/bin/bash
# Search for references to amount validation or processing in the budget-related code
rg -l "amount" --type js packages/loot-core/src/server/budget/

# Look for potential validation logic
rg "amount.*[<>]=?\s*0|amount.*positive|validateAmount" packages/loot-core/src/server/budget/

Length of output: 283


Script:

# Find files that import or use the goal template parser
rg -l "goal-template|goalTemplate" packages/loot-core/src/

Length of output: 359


Script:

# Search for test files related to goals or amounts
fd ".*\.(test|spec)\.(js|ts)" packages/loot-core/src/server/budget/

Length of output: 238


Script:

#!/bin/bash
# Check the test files for amount-related test cases
cat packages/loot-core/src/server/budget/goalsSchedule.test.ts
cat packages/loot-core/src/server/budget/template-notes.test.ts

# Look at the main application code that uses the parser
cat packages/loot-core/src/server/budget/app.ts

# Check for any validation or processing of amounts
ast-grep --pattern 'function $FUNC($_) {
  $$$
  amount
  $$$
}'

Length of output: 12297


Script:

#!/bin/bash
# Check the goal templates implementation
cat packages/loot-core/src/server/budget/goaltemplates.ts

# Look for amount validation in actions
cat packages/loot-core/src/server/budget/actions.ts

# Check if there are any amount-related validations in the handlers
rg -A 5 "amount.*validate|validateAmount" packages/loot-core/src/server/budget/

Length of output: 20494

@youngcw
Copy link
Member

youngcw commented Dec 23, 2024

Ive tested with my test budget and this doesn't seem to have broken any existing things which is good. I also ran some tests and so far they all work fine in the new cases.

@youngcw
Copy link
Member

youngcw commented Dec 23, 2024

Since this is for an experimental feature and small I cleared this for merge.

@UnderKoen UnderKoen merged commit 8976ffc into master Dec 23, 2024
20 checks passed
@UnderKoen UnderKoen deleted the UnderKoen/improve/budget-template-negatives branch December 23, 2024 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants