mirror of
https://github.com/simple-login/app.git
synced 2024-09-29 21:21:29 +02:00
use a grace period of 14 days for paddle subscription
This commit is contained in:
parent
a8c01a1443
commit
2573c68e82
@ -751,8 +751,9 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
|
|||||||
sub = Subscription.get_by(user_id=self.id)
|
sub = Subscription.get_by(user_id=self.id)
|
||||||
|
|
||||||
if sub:
|
if sub:
|
||||||
# sub is active until the next billing_date + 1
|
# grace period is 14 days
|
||||||
if sub.next_bill_date >= arrow.now().shift(days=-1).date():
|
# sub is active until the next billing_date + 14
|
||||||
|
if sub.next_bill_date >= arrow.now().shift(days=-14).date():
|
||||||
return sub
|
return sub
|
||||||
# past subscription, user is considered not having a subscription = free plan
|
# past subscription, user is considered not having a subscription = free plan
|
||||||
else:
|
else:
|
||||||
@ -1944,7 +1945,6 @@ class AppleSubscription(Base, ModelMixin):
|
|||||||
user = orm.relationship(User)
|
user = orm.relationship(User)
|
||||||
|
|
||||||
def is_valid(self):
|
def is_valid(self):
|
||||||
# Todo: take into account grace period?
|
|
||||||
return self.expires_date > arrow.now().shift(days=-_APPLE_GRACE_PERIOD_DAYS)
|
return self.expires_date > arrow.now().shift(days=-_APPLE_GRACE_PERIOD_DAYS)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
|
import random
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
|
import arrow
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from app.config import EMAIL_DOMAIN, MAX_NB_EMAIL_FREE_PLAN
|
from app.config import EMAIL_DOMAIN, MAX_NB_EMAIL_FREE_PLAN
|
||||||
@ -12,6 +14,8 @@ from app.models import (
|
|||||||
Mailbox,
|
Mailbox,
|
||||||
SenderFormatEnum,
|
SenderFormatEnum,
|
||||||
EnumE,
|
EnumE,
|
||||||
|
Subscription,
|
||||||
|
PlanEnum,
|
||||||
)
|
)
|
||||||
from tests.utils import login, create_new_user
|
from tests.utils import login, create_new_user
|
||||||
|
|
||||||
@ -258,3 +262,24 @@ def test_can_create_new_alias_disabled_user():
|
|||||||
|
|
||||||
user.disabled = True
|
user.disabled = True
|
||||||
assert not user.can_create_new_alias()
|
assert not user.can_create_new_alias()
|
||||||
|
|
||||||
|
|
||||||
|
def test_user_get_subscription_grace_period(flask_client):
|
||||||
|
user = create_new_user()
|
||||||
|
sub = Subscription.create(
|
||||||
|
user_id=user.id,
|
||||||
|
cancel_url="https://checkout.paddle.com/subscription/cancel?user=1234",
|
||||||
|
update_url="https://checkout.paddle.com/subscription/update?user=1234",
|
||||||
|
subscription_id=str(random.random()),
|
||||||
|
event_time=arrow.now(),
|
||||||
|
next_bill_date=arrow.now()
|
||||||
|
.shift(days=-14)
|
||||||
|
.date(), # the grace period is 14 days
|
||||||
|
plan=PlanEnum.monthly,
|
||||||
|
commit=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
assert user.get_subscription() is not None
|
||||||
|
|
||||||
|
sub.next_bill_date = arrow.now().shift(days=-15).date()
|
||||||
|
assert user.get_subscription() is None
|
||||||
|
Loading…
Reference in New Issue
Block a user