feat(trial): Introduce Subscriptions::FreeTrialBillingService #1821
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 27, 2024
jdenquin
reviewed
Mar 28, 2024
rsempe
force-pushed
the
feat/free_trial_billing_service
branch
3 times, most recently
from
6419bc6
to
52d8da1
Compare
jdenquin
reviewed
Mar 28, 2024
jdenquin
reviewed
Mar 28, 2024
jdenquin
reviewed
Mar 28, 2024
rsempe
force-pushed
the
feat/free_trial_billing_service
branch
2 times, most recently
from
1fba3a7
to
4a75da3
Compare
jdenquin
reviewed
Mar 28, 2024
db/migrate/20240328075919_add_trial_ended_at_to_subscriptions.rb
Outdated
Show resolved
Hide resolved
jdenquin
reviewed
Mar 28, 2024
db/migrate/20240328075919_add_trial_ended_at_to_subscriptions.rb
Outdated
Show resolved
Hide resolved
jdenquin
reviewed
Mar 28, 2024
db/migrate/20240328075919_add_trial_ended_at_to_subscriptions.rb
Outdated
Show resolved
Hide resolved
jdenquin
reviewed
Mar 28, 2024
db/migrate/20240328075919_add_trial_ended_at_to_subscriptions.rb
Outdated
Show resolved
Hide resolved
julienbourdeau
force-pushed
the
feat/free_trial_billing_service
branch
from
6b1bca9
to
d94da19
Compare
julienbourdeau
commented
Mar 28, 2024
julienbourdeau
force-pushed
the
feat/free_trial_billing_service
branch
from
d94da19
to
7527f41
Compare
julienbourdeau
force-pushed
the
feat/free_trial_billing_service
branch
from
7527f41
to
5a1dcfd
Compare
rsempe
approved these changes
Mar 29, 2024
vincent-pochet
approved these changes
Mar 29, 2024
db/migrate/20240328075919_add_trial_ended_at_to_subscriptions.rb
Outdated
Show resolved
Hide resolved
julienbourdeau
force-pushed
the
feat/free_trial_billing_service
branch
2 times, most recently
from
037401c
to
fe4242a
Compare
julienbourdeau
force-pushed
the
feat/free_trial_billing_service
branch
from
fe4242a
to
51d3e68
Compare
julienbourdeau
added a commit
that referenced
this pull request
Apr 15, 2024
…1847) ## Context When a subscription has a trial period, we want to invoice the customer at the end of the trial, not at the beginning. Following #1820 and #1821 ## Description * Disable billing when creating a new subscription if there is a trial * Disable billing when activating a pending subscription if there is a trial * Run the `Subscriptions::FreeTrialBillingService` introduced in #1821 every hour * Migrate data for existing subscription with trial already ended * Ensure we don't bill customers if an invoice was created when the subscription started (for sub created before this feature) ### Free trial reminder Keep in mind that if you're trial ends on day X, this day is *NOT FREE*. If the 10 days free trial start on the 10th at 14:00, it will end on the 20th at 14:00. You get the 10th to the 19th for free. Day 20 is your first pay day even if you're still in trial for a few hours. This was not changed in this PR or other related PRs. ## Note * Introduction of `invoice.skip_charge` * Refactor of charge fees for first invoice, see: #1836 * Handle grace_period * Handle minimum_commitment --------- Co-authored-by: Romain Sempé <romain@getlago.com>
drejc
pushed a commit
to fliqa-io/lago-api
that referenced
this pull request
May 15, 2024
drejc
pushed a commit
to fliqa-io/lago-api
that referenced
this pull request
May 15, 2024
…etlago#1847) ## Context When a subscription has a trial period, we want to invoice the customer at the end of the trial, not at the beginning. Following getlago#1820 and getlago#1821 ## Description * Disable billing when creating a new subscription if there is a trial * Disable billing when activating a pending subscription if there is a trial * Run the `Subscriptions::FreeTrialBillingService` introduced in getlago#1821 every hour * Migrate data for existing subscription with trial already ended * Ensure we don't bill customers if an invoice was created when the subscription started (for sub created before this feature) ### Free trial reminder Keep in mind that if you're trial ends on day X, this day is *NOT FREE*. If the 10 days free trial start on the 10th at 14:00, it will end on the 20th at 14:00. You get the 10th to the 19th for free. Day 20 is your first pay day even if you're still in trial for a few hours. This was not changed in this PR or other related PRs. ## Note * Introduction of `invoice.skip_charge` * Refactor of charge fees for first invoice, see: getlago#1836 * Handle grace_period * Handle minimum_commitment --------- Co-authored-by: Romain Sempé <romain@getlago.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
Following #1820, we need a job find all subscriptions which has a trial which just ended.
Description
This introduce a new service to find all subscription with a trial period ending today. The job will run every hour to follow customer timezones.
We introduce a new timestamp in subscriptions to know if the trial has ended. This ensure we only run the job once. Without this flag, we would retrieve the same subscription 24 times and dispatch the webhook 24 times. The invoice can't be used to know if the job was run because we only change plans with
pay_in_advance = true.This adds the fourth definition of the
at_time_zonemethod. I'm hoping to refactor this later.Note that the job doesn't run yet. The following PR will add it to the scheduler and generate invoice and send the webhooks.
Migration
The data is migrated for all subscriptions with a trial that has already ended. This is done to ensure a minimum of consistency in the data.
The logic for
initial_started_atis implemented to avoid the N+1 queries triggered by the original method.I didn't reuse the SQL query from the service because
find_by_sqlreturns an array, not a collection so you can't load the data in batch (like withfind_each). We'd have to load ALL subscription in the array 🙈Alternatively, we can probably write an SQL query that update all data at once, without using the model. It would be fun but I'm not sure it's worth the effort.