Skip to content

feat(fixed-charges): Add fixed charge boundaries to billing period #4492

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 22, 2025
Merged

feat(fixed-charges): Add fixed charge boundaries to billing period #4492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
064c2f2
feat(fixed-charges): Add fixed charge boundaries to billing period
ancorcruz Oct 15, 2025
5170b9c
Existing invoice subscriptions does not have fixed charge boundaries
ancorcruz Oct 20, 2025
ea87285
Add test to ensure legacy invoice subscription works
ancorcruz Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/serializers/v1/invoices/billing_period_serializer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ def serialize
subscription_to_datetime: model.to_datetime.iso8601,
charges_from_datetime: model.charges_from_datetime.iso8601,
charges_to_datetime: model.charges_to_datetime.iso8601,
fixed_charges_from_datetime: model.fixed_charges_from_datetime&.iso8601,
fixed_charges_to_datetime: model.fixed_charges_to_datetime&.iso8601,
invoicing_reason: model.invoicing_reason
}
end
Expand Down
2 changes: 2 additions & 0 deletions spec/factories/invoice_subscriptions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
to_datetime { timestamp.end_of_month }
charges_from_datetime { from_datetime - 1.month }
charges_to_datetime { to_datetime.end_of_month }
fixed_charges_from_datetime { from_datetime.beginning_of_month }
fixed_charges_to_datetime { to_datetime.end_of_month }
end
end
end
28 changes: 20 additions & 8 deletions spec/serializers/v1/invoices/billing_period_serializer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,27 @@
it "serializes the object" do
result = JSON.parse(serializer.to_json)

aggregate_failures do
expect(result["billing_period"]["lago_subscription_id"]).to eq(invoice_subscription.subscription_id)
expect(result["billing_period"]["external_subscription_id"]).to eq(invoice_subscription.subscription.external_id)
expect(result["billing_period"]["lago_plan_id"]).to eq(invoice_subscription.subscription.plan_id)
expect(result["billing_period"]["subscription_from_datetime"]).to eq(invoice_subscription.from_datetime.iso8601)
expect(result["billing_period"]["subscription_to_datetime"]).to eq(invoice_subscription.to_datetime.iso8601)
expect(result["billing_period"]["charges_from_datetime"]).to eq(invoice_subscription.charges_from_datetime.iso8601)
expect(result["billing_period"]["charges_to_datetime"]).to eq(invoice_subscription.charges_to_datetime.iso8601)
expect(result["billing_period"]["fixed_charges_from_datetime"]).to eq(invoice_subscription.fixed_charges_from_datetime.iso8601)
expect(result["billing_period"]["fixed_charges_to_datetime"]).to eq(invoice_subscription.fixed_charges_to_datetime.iso8601)
expect(result["billing_period"]["invoicing_reason"]).to eq(invoice_subscription.invoicing_reason)
end

context "when legacy invoice subscription without fixed charges boundaries" do
let(:invoice_subscription) { build(:invoice_subscription, :boundaries, fixed_charges_from_datetime: nil, fixed_charges_to_datetime: nil) }

it "serializes the object without fixed charges boundaries" do
result = JSON.parse(serializer.to_json)

expect(result["billing_period"]["lago_subscription_id"]).to eq(invoice_subscription.subscription_id)
expect(result["billing_period"]["external_subscription_id"]).to eq(invoice_subscription.subscription.external_id)
expect(result["billing_period"]["lago_plan_id"]).to eq(invoice_subscription.subscription.plan_id)
expect(result["billing_period"]["subscription_from_datetime"]).to eq(invoice_subscription.from_datetime.iso8601)
expect(result["billing_period"]["subscription_to_datetime"]).to eq(invoice_subscription.to_datetime.iso8601)
expect(result["billing_period"]["charges_from_datetime"]).to eq(invoice_subscription.charges_from_datetime.iso8601)
expect(result["billing_period"]["charges_to_datetime"]).to eq(invoice_subscription.charges_to_datetime.iso8601)
expect(result["billing_period"]["invoicing_reason"]).to eq(invoice_subscription.invoicing_reason)
expect(result["billing_period"]["fixed_charges_from_datetime"]).to be_nil
expect(result["billing_period"]["fixed_charges_to_datetime"]).to be_nil
end
end
end
Loading