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

[Goals]: fix stacked templates #4120

Merged
merged 2 commits into from
Jan 13, 2025

Conversation

youngcw
Copy link
Member

@youngcw youngcw commented Jan 9, 2025

Bug discussed here https://discord.com/channels/937901803608096828/1326945284722524170

Multiple templates in a category/priority level would double/triple/etc count the amounts requested by the early templates causing the amount check to think it had overbudgeted and remove funds.

@actual-github-bot actual-github-bot bot changed the title fix stacked templates [WIP] fix stacked templates Jan 9, 2025
@youngcw youngcw changed the title [WIP] fix stacked templates [Goals]: fix stacked templates Jan 9, 2025
Copy link

netlify bot commented Jan 9, 2025

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 7cf6c79
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/67802003864eef0008a20515
😎 Deploy Preview https://deploy-preview-4120.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

github-actions bot commented Jan 9, 2025

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.68 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/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/useAccountPreviewTransactions.js 1.63 kB 0%
static/js/AppliedFilters.js 10.24 kB 0%
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/narrow.js 84.22 kB 0%
static/js/wide.js 104.78 kB 0%
static/js/ReportRouter.js 1.58 MB 0%
static/js/index.js 3.74 MB 0%

Copy link
Contributor

github-actions bot commented Jan 9, 2025

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.33 MB → 1.33 MB (+8 B) +0.00%
Changeset
File Δ Size
packages/loot-core/src/server/budget/categoryTemplate.ts 📈 +267 B (+1.41%) 18.46 kB → 18.72 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
kcab.worker.js 1.33 MB → 1.33 MB (+8 B) +0.00%

Smaller

No assets were smaller

Unchanged

No assets were unchanged

Copy link
Contributor

coderabbitai bot commented Jan 9, 2025

Walkthrough

The pull request modifies the runTemplatesForPriority method in the CategoryTemplate class within the budget calculation logic. The primary change involves replacing the toBudget variable with newBudget to accumulate budget amounts from different template types. Instead of directly adding budget amounts to toBudget, each template processing case now assigns its result to newBudget. After processing all templates, newBudget is added to toBudget in a single operation. The logic for updating the available variable has been adjusted to subtract newBudget, ensuring accurate budget tracking. These modifications aim to improve the clarity and maintainability of budget calculation code by separating the accumulation of budget amounts into a distinct variable.

Possibly related PRs

Suggested labels

sparkles: Merged

Suggested reviewers

  • matt-fidd

Finishing Touches

  • 📝 Generate Docstrings

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/categoryTemplate.ts (1)

Line range hint 1-1: Consider enabling strict TypeScript checking.

The file starts with // @ts-strict-ignore. Consider enabling strict mode to catch potential type-related issues early.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 34ffc5c and 7cf6c79.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4120.md is excluded by !**/*.md
📒 Files selected for processing (1)
  • packages/loot-core/src/server/budget/categoryTemplate.ts (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (4)
  • GitHub Check: Visual regression
  • GitHub Check: Functional
  • GitHub Check: build (windows-latest)
  • GitHub Check: build (ubuntu-latest)
🔇 Additional comments (5)
packages/loot-core/src/server/budget/categoryTemplate.ts (5)

98-98: LGTM! Good separation of concerns.

The introduction of newBudget helps prevent the multiple counting issue by clearly separating the calculation of individual template amounts from the accumulation of the total budget.


Line range hint 101-152: LGTM! Consistent use of newBudget across all template types.

The switch statement now consistently uses newBudget to store template amounts, making the code more maintainable and preventing accidental multiple counting.


157-158: LGTM! Correct order of budget operations.

The sequence of operations is correct:

  1. Update available funds
  2. Add to total budget

This ensures accurate tracking of both the remaining funds and the accumulated budget.


Line range hint 4-4: Add tests for multiple template scenarios.

To prevent regression of the multiple counting bug, consider adding test cases that specifically verify the behavior when multiple templates exist within the same category/priority.

Let's check the current test coverage:

Would you like me to help create test cases for multiple template scenarios?


144-146: Verify the schedule template fix.

The fix for schedule templates looks correct, but let's verify that this change resolves the multiple counting issue for all schedule scenarios.

Run this script to analyze schedule template usage:

✅ Verification successful

Schedule template fix is correctly implemented and comprehensive.

The fix properly prevents double counting by:

  • Using scheduleFlag to track processing state
  • Explicitly subtracting previous toBudget values
  • Maintaining proper validation and error handling
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Find and analyze schedule template usage patterns
# Look for schedule templates and their priority levels
ast-grep --pattern 'type: "schedule"' | rg -A 5 'priority'

# Look for potential test files
fd -g '*test*.ts' -x rg -l 'schedule.*template'

Length of output: 108


Script:

#!/bin/bash
# Search for schedule template related code
rg -l "schedule.*template" --type ts

# Look for schedule implementation details
rg "schedule" -A 5 -B 5 --type ts packages/loot-core/src/server/budget/

# Find test files containing schedule scenarios
rg -l "describe.*schedule" --type ts packages/loot-core/src/

Length of output: 34322


Script:

#!/bin/bash
# Find schedule template parsing and validation
rg -A 5 "template.*schedule" --type ts packages/loot-core/src/

# Look for potential edge cases in template handling
rg "case 'schedule'" -B 5 -A 10 --type ts

# Search for schedule-related error handling
rg "throw new Error.*schedule" --type ts

Length of output: 5244

break;
}
}

available = available - toBudget;
Copy link
Member Author

@youngcw youngcw Jan 9, 2025

Choose a reason for hiding this comment

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

This was the problem. The toBudget value would grow with each template line run so an early template amount would get removed from the available funds amount in every successive template.

@youngcw youngcw requested a review from matt-fidd January 13, 2025 18:34
@youngcw youngcw merged commit 629b001 into master Jan 13, 2025
20 checks passed
@youngcw youngcw deleted the youngcw/fix-stacked-templates-priorities branch January 13, 2025 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