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

improve summary report monthly average calculation #4302

Merged
merged 9 commits into from
Mar 4, 2025

Conversation

matt-fidd
Copy link
Contributor

At the moment summary reports take into account the entire current month when doing the average calculation.
This makes the average too low at the start of the month and is only accurate at the end.

This changes the divisor to accurately calculate for the amount of time through the current month (Screenshots taken on the 6th of February).

Before:
image

After:
image

@actual-github-bot actual-github-bot bot changed the title improve summary report monthly average calculation [WIP] improve summary report monthly average calculation Feb 6, 2025
Copy link

netlify bot commented Feb 6, 2025

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit dcbca39
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/67c6d2575b5bc200085bacbd
😎 Deploy Preview https://deploy-preview-4302.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 Feb 6, 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
18 8.06 MB → 8.06 MB (+250 B) +0.00%
Changeset
File Δ Size
src/components/reports/spreadsheets/summary-spreadsheet.ts 📈 +250 B (+4.30%) 5.68 kB → 5.92 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/ReportRouter.js 1.59 MB → 1.59 MB (+250 B) +0.01%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/en-GB.js 96.66 kB 0%
static/js/de.js 115.52 kB 0%
static/js/en.js 103.78 kB 0%
static/js/es.js 58.26 kB 0%
static/js/nl.js 95.51 kB 0%
static/js/fr.js 116.48 kB 0%
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/pt-BR.js 110.52 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/narrow.js 86.26 kB 0%
static/js/uk.js 111.06 kB 0%
static/js/useAccountPreviewTransactions.js 1.69 kB 0%
static/js/AppliedFilters.js 10.8 kB 0%
static/js/wide.js 103.68 kB 0%
static/js/index.js 5.33 MB 0%

Copy link
Contributor

github-actions bot commented Feb 6, 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.34 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
kcab.worker.js 1.34 MB 0%

@matt-fidd matt-fidd force-pushed the summary-average-months branch from db357b7 to df95ad2 Compare February 6, 2025 01:52
@matt-fidd matt-fidd force-pushed the summary-average-months branch from df95ad2 to 7e1dcba Compare February 6, 2025 01:55
@matt-fidd matt-fidd changed the title [WIP] improve summary report monthly average calculation improve summary report monthly average calculation Feb 6, 2025
Copy link
Contributor

coderabbitai bot commented Feb 6, 2025

Caution

Review failed

The head commit changed during the review from 4c9cf92 to 24a42b6.

Walkthrough

The changes involve significant updates to date handling and calculations in the summarySpreadsheet and calculatePerMonth functions. The logic for determining endDay now checks if the month of the provided end date matches the current month; if they match, endDay is set to the current day, otherwise, it uses the last day of the month for the provided end date. Additionally, the calculation of the average amount per month in calculatePerMonth has been revised to divide the total amount by a newly calculated numMonths, which accounts for the days in the last month. This change enhances the accuracy of calculations related to date ranges and averages. The function signature remains unchanged, with modifications confined to the internal logic.

Possibly related PRs

Suggested labels

sparkles: Merged

Suggested reviewers

  • youngcw
  • carkom

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/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts (1)

202-206: LGTM! Average calculation now correctly handles partial months.

The implementation accurately calculates averages by:

  1. Using actual elapsed days for the current month
  2. Maintaining full month counts for past months
  3. Properly handling the transition between months

This aligns perfectly with the PR objective of improving average accuracy throughout the month.

Consider improving readability with descriptive variable names and comments:

-  const dayOfMonth = months.at(-1)!.getDate();
-  const daysInMonth = monthUtils.getDay(
-    monthUtils.lastDayOfMonth(months.at(-1)!),
-  );
-  const numMonths = months.length - 1 + dayOfMonth / daysInMonth;
+  // Calculate the fraction of the last month that has elapsed
+  const lastMonthElapsedDays = months.at(-1)!.getDate();
+  const lastMonthTotalDays = monthUtils.getDay(
+    monthUtils.lastDayOfMonth(months.at(-1)!),
+  );
+  // Add the elapsed fraction to the count of full months
+  const effectiveMonths = months.length - 1 + lastMonthElapsedDays / lastMonthTotalDays;

-  const averageAmountPerMonth = totalAmount / numMonths;
+  const averageAmountPerMonth = totalAmount / effectiveMonths;

-    divisor: numMonths,
+    divisor: effectiveMonths,

Also applies to: 209-209, 214-214

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a23a285 and 7e1dcba.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4302.md is excluded by !**/*.md
📒 Files selected for processing (1)
  • packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Functional
  • GitHub Check: Visual regression
🔇 Additional comments (1)
packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts (1)

51-54: LGTM! End date determination logic aligns with PR objectives.

The updated logic correctly handles both current and past months by:

  • Using the current day for the current month
  • Using the last day for past months

This change improves average calculation accuracy by preventing future days from affecting current month averages.

Let's verify the edge cases:

✅ Verification successful

🏁 Script executed:

#!/bin/bash
# Description: Verify edge cases in date handling

# Test: Search for date-related error handling
rg -A 5 'catch.*error.*date'

# Test: Search for date validation checks
rg -A 5 'isValid.*date'

Length of output: 2778


LGTM! Edge case verification confirms the updated end date logic is sound.

The shell scripts did not reveal any issues with date validation or error handling that would impact the new logic. The edge case checks indicate that:

  • The current month correctly utilizes the actual day (via monthUtils.currentDay()).
  • Past months appropriately compute the last day using monthUtils.lastDayOfMonth(end).

This aligns with the PR objectives for improving the monthly average calculation accuracy by avoiding future day values.

Copy link
Contributor

@andrew--r andrew--r left a comment

Choose a reason for hiding this comment

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

Makes sense to me, I also tested it on preview 👍

@matt-fidd matt-fidd force-pushed the summary-average-months branch from 163080a to 4c9cf92 Compare February 21, 2025 00:06
Copy link
Member

@youngcw youngcw left a comment

Choose a reason for hiding this comment

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

Seems fine to me. @lelemm What do you think?

@lelemm
Copy link
Contributor

lelemm commented Mar 4, 2025

Seems fine to me. @lelemm What do you think?

I will take a look tomorrow if possible. No PC access until tomorrow

Copy link
Contributor

@lelemm lelemm left a comment

Choose a reason for hiding this comment

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

LGTM

@matt-fidd matt-fidd merged commit c8d14ca into actualbudget:master Mar 4, 2025
21 checks passed
@matt-fidd matt-fidd deleted the summary-average-months branch March 4, 2025 11:33
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.

4 participants