fix: invoice line updates

[turip]

Overview

Fixes:

• Call prepare for create on updates
• Populate flat fee's payment terms if needed
• fix bad line type settings on line merges

Summary by CodeRabbit

• Bug Fixes

  • Corrected the type assignment for usage-based invoice line updates to ensure accurate categorization.
  • Improved handling of empty payment terms in price validation to prevent unnecessary validation errors.

• New Features

  • Enhanced invoice update process to prepare and validate invoice lines before recalculation, improving reliability.
  • Added validation and normalization of price information for usage-based lines, including default payment term assignment if missing.

[coderabbitai]

📝 Walkthrough

Walkthrough

The changes introduce enhanced validation and normalization for usage-based flat fee invoice lines, ensure correct invoice line type assignment, and update invoice processing to prepare line services before recalculation. Additionally, validation logic for payment terms in flat prices is adjusted to allow empty values without error.

Changes

Files/Paths	Change Summary
openmeter/billing/httpdriver/invoiceline.go	Corrected invoice line type assignment for usage-based line replacements.
openmeter/billing/service/invoice.go	Updated invoice update logic to prepare line services for creation before recalculation.
openmeter/billing/service/lineservice/usagebasedlineflat.go	Enhanced PrepareForCreate to validate and normalize price, including payment term checks.
openmeter/productcatalog/price.go	Modified FlatPrice validation to allow empty PaymentTerm without triggering an error.

Possibly related PRs

• fix: flat fee line do not validate meter #2908: Modifies validation logic for ubpFlatFeeLine, related to preparation and validation of flat fee lines.
• fix: updating gathering invoices with split lines #2918: Updates UpdateInvoice method, also changing invoice line handling logic.
• feat: implement ubp flat fee #2886: Implements the usage-based flat fee line type and its service methods, which the current changes build upon.

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.

🔧 golangci-lint (1.64.8)

Error: you are using a configuration file for golangci-lint v2 with golangci-lint v1: please use golangci-lint v2
Failed executing command with error: you are using a configuration file for golangci-lint v2 with golangci-lint v1: please use golangci-lint v2

---

📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 799ce91 and 14f412f.

📒 Files selected for processing (4)

• openmeter/billing/httpdriver/invoiceline.go (1 hunks)
• openmeter/billing/service/invoice.go (1 hunks)
• openmeter/billing/service/lineservice/usagebasedlineflat.go (2 hunks)
• openmeter/productcatalog/price.go (1 hunks)

🧰 Additional context used

🧬 Code Graph Analysis (4)

openmeter/productcatalog/price.go (1)

api/api.gen.go (1)

• PaymentTermType (5439-5439)

openmeter/billing/httpdriver/invoiceline.go (2)

openmeter/ent/db/billinginvoicelinediscount/where.go (1)

• Type (121-123)

openmeter/billing/invoiceline.go (1)

• InvoiceLineTypeUsageBased (33-33)

openmeter/billing/service/lineservice/usagebasedlineflat.go (2)

openmeter/productcatalog/price.go (4)

• Price (84-91)
• FlatPriceType (41-41)
• InAdvancePaymentTerm (20-20)
• NewPriceFrom (367-389)

openmeter/billing/invoiceline.go (1)

• Price (835-835)

openmeter/billing/service/invoice.go (3)

openmeter/billing/service/lineservice/service.go (1)

• Lines (222-222)

openmeter/billing/invoice.go (1)

• Invoice (337-348)

openmeter/billing/invoiceline.go (1)

• NewLineChildren (697-704)

⏰ Context from checks skipped due to timeout of 90000ms (4)

• GitHub Check: CI
• GitHub Check: E2E
• GitHub Check: Lint
• GitHub Check: Test

🔇 Additional comments (6)

openmeter/billing/httpdriver/invoiceline.go (1)

780-780: LGTM: Correct line type assignment for usage-based lines.

This fix ensures that usage-based invoice line replacement updates correctly set the Type field to billing.InvoiceLineTypeUsageBased instead of billing.InvoiceLineTypeFee. This alignment between the line type and the actual line data being processed is crucial for consistency throughout the billing system.

openmeter/productcatalog/price.go (1)

451-451: LGTM: Allow empty payment terms in validation.

This change relaxes the validation logic to only check payment term validity when the PaymentTerm is not empty. This complements the preparation logic in openmeter/billing/service/lineservice/usagebasedlineflat.go (lines 39-43) that applies default payment terms when they're missing, preventing validation errors during the preparation phase.

openmeter/billing/service/lineservice/usagebasedlineflat.go (3)

12-12: Good addition: Import productcatalog for price validation.

Adding the productcatalog import is necessary for the enhanced price validation and normalization logic in the PrepareForCreate method.

---

23-36: Excellent validation: Comprehensive price validation logic.

The validation logic properly ensures:

1. Price is present (lines 25-27)
2. Price type is flat (lines 29-31)
3. Price conversion succeeds (lines 33-36)

This defensive approach prevents runtime errors and ensures data integrity before line processing.

---

38-43: Smart normalization: Default payment term assignment.

Applying the default InAdvancePaymentTerm when none is set ensures consistent behavior and works well with the relaxed validation in openmeter/productcatalog/price.go (line 451). This normalization approach maintains backward compatibility while ensuring proper configuration.

openmeter/billing/service/invoice.go (1)

924-938: Excellent integration: Prepare line services before recalculation.

This addition ensures that when updating gathering invoices, line services are properly prepared through the PrepareForCreate method before recalculation. This is crucial because:

1. It applies validation and normalization logic (e.g., default payment terms in usagebasedlineflat.go)
2. It ensures data integrity before invoice recalculation
3. It leverages the enhanced preparation logic added in the line services

The workflow order is logical: edit invoice → prepare line services → recalculate → validate.

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 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.
  • Explain this complex logic.
  • 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 explain this code block.
  • @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 explain its main purpose.
  • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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.