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

[Mobile App] Resolve incorrect payment calculations for past and future payments (#869) #1040

Merged

Conversation

floodoo
Copy link
Contributor

@floodoo floodoo commented Feb 3, 2025

This Merge Request resolves the issue of incorrect calculations for past and future payments, as described in #869.
Previously, all payments were counted regardless of their status, leading to inaccurate totals.

Changes

  • Past Payments
    Only payments with the status paid and confirmed are considered.
  • Future Payments:
    Deductions from the total amount are now only applied for payments with the status paid and confirmed.

Summary by CodeRabbit

  • Bug Fixes
    • Enhanced the payment summary calculations so that only verified payments are included. This update ensures that past and future payment totals, as well as currency details, are now displayed more accurately for a clearer financial overview.

Copy link

vercel bot commented Feb 3, 2025

@floodoo is attempting to deploy a commit to the Social Income Team on Vercel.

A member of the Team first needs to authorize it.

Copy link

coderabbitai bot commented Feb 3, 2025

📝 Walkthrough

Walkthrough

The changes modify the payment calculation logic in recipients_app/lib/view/pages/payments_page.dart. The _calculatePastPayments method now skips payments that are not paid or confirmed, while _calculateFuturePayments is adjusted to only count payments with these statuses. This refines the payment totals without affecting any publicly exposed entities.

Changes

File Change Summary
recipients_app/.../payments_page.dart Enhanced filtering in _calculatePastPayments (skips non-paid/confirmed payments) and modified _calculateFuturePayments to count only filtered (i.e., paid/confirmed) payments and update the currency from the filtered list.

Sequence Diagram(s)

sequenceDiagram
    participant P as _calculatePastPayments
    participant L as Payment List
    participant C as Calculation Logic

    P->>L: Iterate over each payment
    loop For each Payment
        L->>P: Return payment details
        P->>P: Check if status is 'paid' or 'confirmed'
        alt Status Valid
            P->>C: Add payment to total
        else Status Invalid
            P->>P: Continue to next payment
        end
    end
    P->>P: Return total of past payments
Loading
sequenceDiagram
    participant F as _calculateFuturePayments
    participant L as Payment List
    participant FL as Filtered Payments

    F->>L: Retrieve payments list
    F->>L: Filter payments with status 'paid' or 'confirmed'
    L-->>FL: Return filtered payments
    FL->>F: Provide filtered list
    F->>F: Calculate count from filtered list
    F->>F: Return future payments count along with initial payment currency
Loading

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

@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: 1

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 323d37d and d31b71c.

📒 Files selected for processing (1)
  • recipients_app/lib/view/pages/payments_page.dart (2 hunks)
🔇 Additional comments (2)
recipients_app/lib/view/pages/payments_page.dart (2)

147-149: LGTM! Clean implementation of payment status filtering.

The status check effectively implements the requirement to only count 'paid' and 'confirmed' payments.


160-166: LGTM! Consistent filtering implementation.

The where clause elegantly filters for 'paid' and 'confirmed' payments, maintaining consistency with past payments logic.

@KarinBerg KarinBerg changed the title Resolve incorrect payment calculations for past and future payments (#869) [Mobile App] Resolve incorrect payment calculations for past and future payments (#869) Feb 3, 2025
@KarinBerg KarinBerg linked an issue Feb 3, 2025 that may be closed by this pull request
2 tasks
@KarinBerg KarinBerg self-assigned this Feb 8, 2025
@KarinBerg
Copy link
Contributor

@floodoo
Thanks a lot for your PR! We really appreciate this 🤩.

I will double-check my suggested rules for past and future payments calculation from the issue with @ssandino because I'm also quite new to this project and do not have the whole overview 😊.

In the meantime you could have a look on my refactoring suggestion if you want.

@ssandino
Copy link
Member

@KarinBerg, I think your logic in issue #869 solves the problem. Thanks, @floodoo, for the PR!

@KarinBerg KarinBerg merged commit 37a90a2 into socialincome-san:main Feb 12, 2025
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Mobile]: Past payments and Future payments are incorrect
3 participants