studio/blender-studio
3
4
Fork 4
Code Issues 37 Pull Requests 2 Projects 1 Releases 5 Wiki Activity

Stripe checkout #104411

Merged
Anna Sirota merged 61 commits from stripe into main 2024-06-17 18:08:41 +02:00
Conversation 0 Commits 61 Files Changed 65 +169 -114
13 changed files with 169 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ed078259f - Show all commits

9
subscriptions/forms.py
View File

@ -162,11 +162,16 @@ class PaymentForm(BillingAddressForm):
def __init__(self, *args, **kwargs):
"""Pre-fill additional initial data from request."""
self.request = kwargs.pop('request')
self.customer = self.request.user.customer
self.request = kwargs.pop('request', None)
super().__init__(*args, **kwargs)
self._set_initial_from_request()
def _set_initial_from_request(self):
if not self.request:
return
# Only preset country when it's not already selected by the customer
geoip_country = self.request.session.get(COUNTRY_CODE_SESSION_KEY)
if geoip_country and (not self.instance.country):

2
subscriptions/models.py
View File

@ -90,7 +90,7 @@ class Team(mixins.CreatedUpdatedMixin, models.Model):
"""Add given user to the team."""
seats_taken = self.users.count()
# Not adding the team manager to the team
if user.pk == self.subscription.user_id:
if user.pk == self.subscription.customer.user_id:
return
if self.seats is not None and seats_taken >= self.seats:
logger.warning(

3
subscriptions/tests/base.py
View File

@ -1,6 +1,5 @@
import os
from django.contrib.auth import get_user_model
from django.core import mail
from django.db.models import signals
from django.test import TestCase
@ -11,8 +10,6 @@ import responses
from looper.tests.factories import create_customer_with_billing_address
import users.tests.util as util
User = get_user_model()
def _write_mail(mail, index=0):
email = mail.outbox[index]

6
subscriptions/tests/test_forms.py
View File

@ -213,10 +213,7 @@ class TestBillingAddressForm(BaseSubscriptionTestCase):
class TestPaymentForm(BaseSubscriptionTestCase):
required_payment_form_data = {
'gateway': 'bank',
'payment_method_nonce': 'fake-nonce',
'plan_variation_id': 1,
'price': '9.90',
}
def test_instance_loads_both_address_and_customer_data(self):
@ -243,9 +240,6 @@ class TestPaymentForm(BaseSubscriptionTestCase):
'country': ['This field is required.'],
'email': ['This field is required.'],
'full_name': ['This field is required.'],
'gateway': ['This field is required.'],
'payment_method_nonce': ['This field is required.'],
'price': ['This field is required.'],
},
)

83
subscriptions/tests/test_queries.py
View File

@ -23,25 +23,27 @@ class TestHasActiveSubscription(TestCase):
def test_true_when_subscription_active(self):
subscription = SubscriptionFactory(
customer=UserFactory().customer,
plan_id=1,
status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
self.assertTrue(has_active_subscription(subscription.user))
self.assertTrue(has_active_subscription(subscription.customer.user))
def test_false_when_subscription_inactive(self):
subscription = SubscriptionFactory(plan_id=1)
subscription = SubscriptionFactory(customer=UserFactory().customer, plan_id=1)
self.assertFalse(has_active_subscription(subscription.user))
self.assertFalse(has_active_subscription(subscription.customer.user))
def test_false_when_team_subscription_inactive(self):
team = TeamFactory(subscription__plan_id=1)
team = TeamFactory(subscription__customer=UserFactory().customer, subscription__plan_id=1)
team.team_users.create(user=UserFactory())
self.assertFalse(has_active_subscription(team.team_users.first().user))
def test_true_when_team_subscription_active(self):
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
@ -58,30 +60,34 @@ class TestHasNotYetCancelledSubscription(TestCase):
def test_true_when_subscription_active(self):
subscription = SubscriptionFactory(
customer=UserFactory().customer,
plan_id=1,
status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
self.assertTrue(has_not_yet_cancelled_subscription(subscription.user))
self.assertTrue(has_not_yet_cancelled_subscription(subscription.customer.user))
def test_false_when_subscription_cancelled(self):
subscription = SubscriptionFactory(plan_id=1, status='cancelled')
subscription = SubscriptionFactory(
customer=UserFactory().customer, plan_id=1, status='cancelled'
)
self.assertFalse(has_not_yet_cancelled_subscription(subscription.user))
self.assertFalse(has_not_yet_cancelled_subscription(subscription.customer.user))
def test_true_when_subscription_inactive(self):
subscription = SubscriptionFactory(plan_id=1)
subscription = SubscriptionFactory(customer=UserFactory().customer, plan_id=1)
self.assertTrue(has_not_yet_cancelled_subscription(subscription.user))
self.assertTrue(has_not_yet_cancelled_subscription(subscription.customer.user))
def test_false_when_team_subscription_inactive(self):
team = TeamFactory(subscription__plan_id=1)
team = TeamFactory(subscription__customer=UserFactory().customer, subscription__plan_id=1)
team.team_users.create(user=UserFactory())
self.assertFalse(has_not_yet_cancelled_subscription(team.team_users.first().user))
def test_false_when_team_subscription_active(self):
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
@ -91,6 +97,7 @@ class TestHasNotYetCancelledSubscription(TestCase):
def test_false_when_team_subscription_cancelled(self):
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__status='cancelled',
)
@ -100,12 +107,13 @@ class TestHasNotYetCancelledSubscription(TestCase):
def test_true_when_team_subscription_cancelled_personal_active(self):
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__status='cancelled',
)
team.team_users.create(user=UserFactory())
SubscriptionFactory(
user=team.team_users.first().user,
customer=team.team_users.first().user.customer,
plan_id=1,
status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
@ -114,12 +122,13 @@ class TestHasNotYetCancelledSubscription(TestCase):
def test_false_when_team_subscription_active_personal_cancelled(self):
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
team.team_users.create(user=UserFactory())
SubscriptionFactory(
user=team.team_users.first().user,
customer=team.team_users.first().user.customer,
plan_id=1,
status='cancelled',
)
@ -135,25 +144,27 @@ class TestHasSubscription(TestCase):
def test_true_when_subscription_active(self):
subscription = SubscriptionFactory(
customer=UserFactory().customer,
plan_id=1,
status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
self.assertTrue(has_subscription(subscription.user))
self.assertTrue(has_subscription(subscription.customer.user))
def test_true_when_subscription_inactive(self):
subscription = SubscriptionFactory(plan_id=1)
subscription = SubscriptionFactory(customer=UserFactory().customer, plan_id=1)
self.assertTrue(has_subscription(subscription.user))
self.assertTrue(has_subscription(subscription.customer.user))
def test_true_when_team_subscription_inactive(self):
team = TeamFactory(subscription__plan_id=1)
team = TeamFactory(subscription__customer=UserFactory().customer, subscription__plan_id=1)
team.team_users.create(user=UserFactory())
self.assertTrue(has_subscription(team.team_users.first().user))
def test_true_when_team_subscription_active(self):
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
@ -163,20 +174,27 @@ class TestHasSubscription(TestCase):
def test_true_when_subscription_active_is_legacy(self):
subscription = SubscriptionFactory(
customer=UserFactory().customer,
plan_id=1,
status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
is_legacy=True,
)
self.assertTrue(has_subscription(subscription.user))
self.assertTrue(has_subscription(subscription.customer.user))
def test_true_when_subscription_inactive_and_is_legacy(self):
subscription = SubscriptionFactory(plan_id=1, is_legacy=True)
subscription = SubscriptionFactory(
customer=UserFactory().customer, plan_id=1, is_legacy=True
)
self.assertTrue(has_subscription(subscription.user))
self.assertTrue(has_subscription(subscription.customer.user))
def test_true_when_team_subscription_inactive_and_is_legacy(self):
team = TeamFactory(subscription__plan_id=1, subscription__is_legacy=True)
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__is_legacy=True,
)
team.team_users.create(user=UserFactory())
self.assertTrue(has_subscription(team.team_users.first().user))
@ -190,45 +208,54 @@ class TestHasNonLegacySubscription(TestCase):
def test_true_when_subscription_active_and_not_is_legacy(self):
subscription = SubscriptionFactory(
customer=UserFactory().customer,
plan_id=1,
status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
)
self.assertTrue(has_non_legacy_subscription(subscription.user))
self.assertTrue(has_non_legacy_subscription(subscription.customer.user))
def test_true_when_subscription_inactive_and_not_is_legacy(self):
subscription = SubscriptionFactory(plan_id=1)
subscription = SubscriptionFactory(customer=UserFactory().customer, plan_id=1)
self.assertTrue(has_non_legacy_subscription(subscription.user))
self.assertTrue(has_non_legacy_subscription(subscription.customer.user))
def test_true_when_team_subscription_inactive_and_not_is_legacy(self):
team = TeamFactory(subscription__plan_id=1)
team = TeamFactory(subscription__customer=UserFactory().customer, subscription__plan_id=1)
team.team_users.create(user=UserFactory())
self.assertTrue(has_non_legacy_subscription(team.team_users.first().user))
def test_false_when_subscription_inactive_and_is_legacy(self):
subscription = SubscriptionFactory(plan_id=1, is_legacy=True)
subscription = SubscriptionFactory(
customer=UserFactory().customer, plan_id=1, is_legacy=True
)
self.assertFalse(has_non_legacy_subscription(subscription.user))
self.assertFalse(has_non_legacy_subscription(subscription.customer.user))
def test_false_when_subscription_active_and_is_legacy(self):
subscription = SubscriptionFactory(
customer=UserFactory().customer,
plan_id=1,
status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
is_legacy=True,
)
self.assertFalse(has_non_legacy_subscription(subscription.user))
self.assertFalse(has_non_legacy_subscription(subscription.customer.user))
def test_false_when_team_subscription_inactive_and_is_legacy(self):
team = TeamFactory(subscription__plan_id=1, subscription__is_legacy=True)
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__is_legacy=True,
)
team.team_users.create(user=UserFactory())
self.assertFalse(has_non_legacy_subscription(team.team_users.first().user))
def test_false_when_team_subscription_active_and_is_legacy(self):
team = TeamFactory(
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
subscription__status=list(looper.models.Subscription._ACTIVE_STATUSES)[0],
subscription__is_legacy=True,

6
subscriptions/tests/test_signals.py
View File

@ -19,12 +19,14 @@ class TestAddToTeams(TestCase):
emails=['test1@example.com', 'test2@example.com'],
name='Team Awesome',
subscription__status='active',
subscription__customer=UserFactory().customer,
)
cls.team_unlimited = TeamFactory(
seats=None,
name='Team Unlimited',
email_domain='my-awesome-blender-studio.org',
subscription__status='active',
subscription__customer=UserFactory().customer,
)
@responses.activate
@ -150,6 +152,7 @@ class TestAddToTeams(TestCase):
name='Team Unlimited',
email_domain='some-domain.com',
subscription__status='active',
subscription__customer=UserFactory().customer,
)
self.assertTrue(has_active_subscription(user))
@ -182,6 +185,7 @@ class TestAddToTeams(TestCase):
name='Team Unlimited',
email_domain='some-domain.com',
subscription__status='active',
subscription__customer=UserFactory().customer,
)
self.assertEqual(team.email_domain, 'some-domain.com')
@ -232,6 +236,7 @@ class TestAddToTeams(TestCase):
name='Team Unlimited',
email_domain='edu.some-domain.com',
subscription__status='active',
subscription__customer=UserFactory().customer,
)
self.assertEqual(team.email_domain, 'edu.some-domain.com')
@ -265,6 +270,7 @@ class TestAddToTeams(TestCase):
name='Team Unlimited',
email_domain='edu.some-domain.com',
subscription__status='active',
subscription__customer=UserFactory().customer,
)
self.assertEqual(team.email_domain, 'edu.some-domain.com')

2
subscriptions/views/tests/test_join.py
View File

@ -63,7 +63,7 @@ class TestGETJoinView(BaseSubscriptionTestCase):
)
self.assertContains(
response,
'<input type="email" name="email" value="jane.doe@example.com" placeholder="mail@example.com" class="form-control" required id="id_email">',
'<input type="email" name="email" value="jane.doe@example.com" placeholder="mail@example.com" class="form-control" required id="id_email" maxlength="320">',
html=True,
)

44
subscriptions/views/tests/test_receipt_pdf.py
View File

@ -57,16 +57,16 @@ class TestReceiptPDFView(TestCase):
def setUpClass(cls):
super().setUpClass()
user = create_customer_with_billing_address(email='mail1@example.com')
cls.payment_method = PaymentMethodFactory(user=user)
customer = create_customer_with_billing_address(email='mail1@example.com')
cls.payment_method = PaymentMethodFactory(customer=customer)
cls.paid_order = OrderFactory(
user=user,
customer=customer,
price=990,
status='paid',
tax_country='NL',
payment_method=cls.payment_method,
subscription__customer=customer,
subscription__payment_method=cls.payment_method,
subscription__user=user,
subscription__plan__product__name='Blender Studio Subscription',
)
@ -87,15 +87,15 @@ class TestReceiptPDFView(TestCase):
def test_get_pdf_unpaid_order_not_found(self):
unpaid_order = OrderFactory(
user=self.payment_method.user,
customer=self.payment_method.customer,
price=990,
tax_country='NL',
payment_method=self.payment_method,
subscription__customer=self.payment_method.customer,
subscription__payment_method=self.payment_method,
subscription__user=self.payment_method.user,
subscription__plan_id=1,
)
self.client.force_login(unpaid_order.user)
self.client.force_login(unpaid_order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': unpaid_order.pk})
response = self.client.get(url)
@ -118,7 +118,7 @@ class TestReceiptPDFView(TestCase):
self.assertEqual(404, response.status_code)
def test_get_pdf_has_logo(self):
self.client.force_login(self.paid_order.user)
self.client.force_login(self.paid_order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': self.paid_order.pk})
response = self.client.get(url)
@ -139,7 +139,9 @@ class TestReceiptPDFView(TestCase):
tax_type=looper.taxes.TaxType.VAT_CHARGE,
tax_rate=Decimal(19),
)
user = UserFactory()
order = OrderFactory(
customer=user.customer,
price=taxable.price,
status='paid',
tax=taxable.tax,
@ -147,9 +149,10 @@ class TestReceiptPDFView(TestCase):
tax_type=taxable.tax_type.value,
tax_rate=taxable.tax_rate,
email='billing@example.com',
subscription__customer=user.customer,
subscription__plan_id=1,
)
self.client.force_login(order.user)
self.client.force_login(order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': order.pk})
response = self.client.get(url)
@ -181,7 +184,9 @@ class TestReceiptPDFView(TestCase):
tax_type=looper.taxes.TaxType.VAT_REVERSE_CHARGE,
tax_rate=Decimal(19),
)
user = UserFactory()
order = OrderFactory(
customer=user.customer,
price=taxable.price,
status='paid',
tax=taxable.tax,
@ -190,9 +195,10 @@ class TestReceiptPDFView(TestCase):
tax_rate=taxable.tax_rate,
vat_number='DE123456789',
email='billing@example.com',
subscription__customer=user.customer,
subscription__plan_id=1,
)
self.client.force_login(order.user)
self.client.force_login(order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': order.pk})
response = self.client.get(url)
@ -229,7 +235,9 @@ class TestReceiptPDFView(TestCase):
tax_type=looper.taxes.TaxType.VAT_CHARGE,
tax_rate=Decimal(21),
)
user = UserFactory()
order = OrderFactory(
customer=user.customer,
price=taxable.price,
status='paid',
tax=taxable.tax,
@ -238,9 +246,10 @@ class TestReceiptPDFView(TestCase):
tax_rate=taxable.tax_rate,
vat_number='NL123456789',
email='billing@example.com',
subscription__customer=user.customer,
subscription__plan_id=1,
)
self.client.force_login(order.user)
self.client.force_login(order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': order.pk})
response = self.client.get(url)
@ -268,15 +277,18 @@ class TestReceiptPDFView(TestCase):
@freeze_time('2023-02-08T11:12:20+01:00')
def test_get_pdf_total_no_vat(self):
user = UserFactory()
order = OrderFactory(
customer=user.customer,
price=1000,
currency='USD',
status='paid',
tax_country='US',
email='billing@example.com',
subscription__customer=user.customer,
subscription__plan_id=1,
)
self.client.force_login(order.user)
self.client.force_login(order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': order.pk})
response = self.client.get(url)
@ -307,9 +319,11 @@ class TestReceiptPDFView(TestCase):
seats=4,
emails=['test1@example.com', 'test2@example.com'],
name='Team Awesome',
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
)
order = OrderFactory(
customer=team.subscription.customer,
price=20000,
currency='USD',
status='paid',
@ -317,7 +331,7 @@ class TestReceiptPDFView(TestCase):
email='billing@example.com',
subscription=team.subscription,
)
self.client.force_login(order.user)
self.client.force_login(order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': order.pk})
response = self.client.get(url)
@ -348,10 +362,12 @@ class TestReceiptPDFView(TestCase):
seats=4,
emails=['test1@example.com', 'test2@example.com'],
name='Team Awesome',
subscription__customer=UserFactory().customer,
subscription__plan_id=1,
invoice_reference='PO #9876',
)
order = OrderFactory(
customer=team.subscription.customer,
price=20000,
currency='USD',
status='paid',
@ -359,7 +375,7 @@ class TestReceiptPDFView(TestCase):
email='billing@example.com',
subscription=team.subscription,
)
self.client.force_login(order.user)
self.client.force_login(order.customer.user)
url = reverse('subscriptions:receipt-pdf', kwargs={'order_id': order.pk})
response = self.client.get(url)

16
subscriptions/views/tests/test_select_plan_variation.py
View File

@ -49,8 +49,8 @@ class TestSelectPlanVariationView(BaseSubscriptionTestCase):
self._assert_default_variation_selected_no_tax_usd(response)
def test_get_displays_plan_selection_to_logged_in_nl(self):
user = create_customer_with_billing_address(vat_number='', country='NL')
self.client.force_login(user)
customer = create_customer_with_billing_address(vat_number='', country='NL')
self.client.force_login(customer.user)
response = self.client.get(self.url, REMOTE_ADDR=EURO_IPV4)
@ -60,8 +60,8 @@ class TestSelectPlanVariationView(BaseSubscriptionTestCase):
self._assert_default_variation_selected_tax_21_eur(response)
def test_get_displays_plan_selection_to_logged_in_de(self):
user = create_customer_with_billing_address(vat_number='', country='DE')
self.client.force_login(user)
customer = create_customer_with_billing_address(vat_number='', country='DE')
self.client.force_login(customer.user)
response = self.client.get(self.url, REMOTE_ADDR=EURO_IPV4)
@ -71,10 +71,10 @@ class TestSelectPlanVariationView(BaseSubscriptionTestCase):
self._assert_default_variation_selected_tax_19_eur(response)
def test_get_displays_plan_selection_to_logged_in_us(self):
user = create_customer_with_billing_address(
customer = create_customer_with_billing_address(
vat_number='', country='US', region='NY', postal_code='12001'
)
self.client.force_login(user)
self.client.force_login(customer.user)
response = self.client.get(self.url)
@ -84,10 +84,10 @@ class TestSelectPlanVariationView(BaseSubscriptionTestCase):
self._assert_plan_selector_no_tax(response)
def test_get_team_displays_plan_selection_to_logged_in_us(self):
user = create_customer_with_billing_address(
customer = create_customer_with_billing_address(
vat_number='', country='US', region='NY', postal_code='12001'
)
self.client.force_login(user)
self.client.force_login(customer.user)
response = self.client.get(self.url_team)

19
users/models.py
View File

@ -174,7 +174,7 @@ class User(AbstractUser):
self.delete_oauth()
# If there are no orders, the user account can be deleted
if self.order_set.count() == 0:
if self.customer.order_set.count() == 0:
logger.warning(
'User pk=%s requested deletion and has no orders: deleting the account',
self.pk,
@ -199,7 +199,7 @@ class User(AbstractUser):
logger.warning('Anonymized user pk=%s', self.pk)
logger.warning('Soft-deleting payment methods records of user pk=%s', self.pk)
for payment_method in self.paymentmethod_set.all():
for payment_method in self.customer.paymentmethod_set.all():
payment_method.recognisable_name = '<deleted>'
logger.warning(
'Deleting payment method %s of user pk=%s at the payment gateway',
@ -208,17 +208,14 @@ class User(AbstractUser):
)
payment_method.delete()
logger.warning('Deleting address records of user pk=%s', self.pk)
looper.models.Address.objects.filter(user_id=self.pk).delete()
customer_id = self.customer.pk
logger.warning('Deleting address records of customer pk=%s', customer_id)
looper.models.Address.objects.filter(customer_id=customer_id).delete()
logger.warning('Anonymizing Customer record of user pk=%s', self.pk)
looper.models.Customer.objects.exclude(user_id=None).filter(user_id=self.pk).update(
billing_email=f'{username}@example.com',
full_name='',
)
looper.models.GatewayCustomerId.objects.filter(user_id=self.pk).delete()
logger.warning('Deleting gateway customer ID records of customer pk=%s', customer_id)
looper.models.GatewayCustomerId.objects.filter(customer_id=customer_id).delete()
logger.warning('Deleting user pk=%s from teams', self.pk)
subscriptions.models.TeamUsers.objects.filter(user_id=self.pk).delete()
logger.warning('Anonymizing comments of user pk=%s', self.pk)

2
users/tasks.py
View File

@ -135,7 +135,7 @@ def handle_deletion_request(pk: int) -> bool:
try:
unsubscribe_from_newsletters(pk=pk)
except Exception:
logger.warning('Error while trying to unsubscribe user pk=%s from newsletters')
logger.warning('Error while trying to unsubscribe user pk=%s from newsletters', pk)
user.anonymize_or_delete()
return True

87
users/tests/test_tasks.py
View File

@ -10,11 +10,12 @@ from looper.tests.factories import (
TransactionFactory,
create_customer_with_billing_address,
)
import looper.models
from comments.queries import set_comment_like
from common.tests.factories.comments import CommentFactory
from common.tests.factories.subscriptions import TeamFactory
from common.tests.factories.users import UserFactory
from common.tests.factories.users import UserFactory, OAuthUserInfoFactory, OAuthUserTokenFactory
import users.tasks as tasks
import users.tests.util as util
@ -50,9 +51,13 @@ class TestTasks(TestCase):
def test_handle_deletion_request(self):
now = timezone.now()
user = create_customer_with_billing_address(
customer = create_customer_with_billing_address(
email='mail1@example.com', date_deletion_requested=now - timedelta(days=30)
)
user = customer.user
OAuthUserInfoFactory(user=user, oauth_user_id=223344)
OAuthUserTokenFactory(user=user)
OAuthUserTokenFactory(user=user)
# this user made some comments
user_comments = [CommentFactory(user=user) for _ in range(2)]
# this user liked some comments as well
@ -103,22 +108,27 @@ class TestTasks(TestCase):
def test_handle_deletion_request_user_has_orders(self):
now = timezone.now()
user = create_customer_with_billing_address(
customer = create_customer_with_billing_address(
email='mail1@example.com', date_deletion_requested=now - timedelta(days=30)
)
user = customer.user
OAuthUserInfoFactory(user=user, oauth_user_id=223344)
OAuthUserTokenFactory(user=user)
OAuthUserTokenFactory(user=user)
# this user has a subscription with an order and a transaction
payment_method = PaymentMethodFactory(user=user)
payment_method = PaymentMethodFactory(customer=customer, token='fake-token')
transaction = TransactionFactory(
user=user,
order__price=990,
order__tax_country='NL',
customer=customer,
order__customer=customer,
order__payment_method=payment_method,
order__price=990,
order__subscription__customer=customer,
order__subscription__payment_method=payment_method,
order__subscription__user=user,
order__subscription__status='cancelled',
order__user=user,
order__tax_country='NL',
payment_method=payment_method,
)
billing_address = customer.billing_address
# this user made some comments
user_comments = [CommentFactory(user=user) for _ in range(2)]
# this user liked some comments as well
@ -143,8 +153,9 @@ class TestTasks(TestCase):
f'Anonymized user pk={user.pk}',
f'Soft-deleting payment methods records of user pk={user.pk}',
rf'Deleting payment method \d+ of user pk={user.pk} at the payment gateway',
f'Deleting address records of user pk={user.pk}',
f'Anonymizing Customer record of user pk={user.pk}',
f'Deleting address records of customer pk={customer.pk}',
f'Deleting gateway customer ID records of customer pk={customer.pk}',
f'Deleting user pk={user.pk} from teams',
f'Anonymizing comments of user pk={user.pk}',
f'Anonymizing likes of user pk={user.pk}',
f'Deleting actions of user pk={user.pk}',
@ -166,14 +177,11 @@ class TestTasks(TestCase):
self.assertEqual(user.full_name, '')
self.assertTrue(user.email.startswith('del'))
self.assertTrue(user.email.endswith('@example.com'))
user.customer.refresh_from_db()
self.assertTrue(user.customer.billing_email.startswith('del'), user.customer.billing_email)
self.assertTrue(
user.customer.billing_email.endswith('@example.com'), user.customer.billing_email
)
self.assertEqual(user.customer.full_name, '', user.customer.full_name)
self.assertEqual(user.address_set.count(), 0)
self.assertEqual(user.paymentmethod_set.first().recognisable_name, '')
# billing address was deleted
with self.assertRaises(looper.models.Address.DoesNotExist):
billing_address.refresh_from_db()
customer.refresh_from_db()
self.assertEqual(customer.paymentmethod_set.first().recognisable_name, '')
# user actions got deleted
for action in user_actions:
@ -195,22 +203,23 @@ class TestTasks(TestCase):
def test_handle_deletion_request_user_has_not_yet_cancelled_subscription(self):
now = timezone.now()
user = create_customer_with_billing_address(
customer = create_customer_with_billing_address(
full_name='Joe Dane',
email='mail1@example.com',
date_deletion_requested=now - timedelta(days=30),
)
user = customer.user
# this user has a subscription with an order and a transaction
payment_method = PaymentMethodFactory(user=user)
payment_method = PaymentMethodFactory(customer=customer)
transaction = TransactionFactory(
user=user,
order__price=990,
order__tax_country='NL',
customer=customer,
order__customer=customer,
order__payment_method=payment_method,
order__price=990,
order__subscription__customer=customer,
order__subscription__payment_method=payment_method,
order__subscription__user=user,
order__subscription__status='on-hold',
order__user=user,
order__tax_country='NL',
payment_method=payment_method,
)
@ -238,7 +247,7 @@ class TestTasks(TestCase):
def test_handle_deletion_request_user_has_orders_and_is_on_a_team(self):
now = timezone.now()
team = TeamFactory(
subscription__user=create_customer_with_billing_address(
subscription__customer=create_customer_with_billing_address(
full_name='Joe Manager Dane',
email='mail1@example.com',
)
@ -249,25 +258,27 @@ class TestTasks(TestCase):
team.users.add(user_to_be_deleted)
self.assertEqual(3, team.users.count())
# this user also has a subscription with an order and a transaction
payment_method = PaymentMethodFactory(user=user_to_be_deleted)
payment_method = PaymentMethodFactory(
customer=user_to_be_deleted.customer, token='fake-token'
)
TransactionFactory(
user=user_to_be_deleted,
customer=user_to_be_deleted.customer,
order__price=990,
order__tax_country='NL',
order__customer=user_to_be_deleted.customer,
order__payment_method=payment_method,
order__subscription__payment_method=payment_method,
order__subscription__user=user_to_be_deleted,
order__subscription__customer=user_to_be_deleted.customer,
order__subscription__status='cancelled',
order__user=user_to_be_deleted,
payment_method=payment_method,
)
tasks.handle_deletion_request.task_function(pk=user_to_be_deleted.pk)
# sanity check: nothing happened to the user owning the team subscription
team.subscription.user.refresh_from_db()
self.assertEqual('Joe Manager Dane', team.subscription.user.full_name)
self.assertTrue(team.subscription.user.is_active)
team.subscription.customer.user.refresh_from_db()
self.assertEqual('Joe Manager Dane', team.subscription.customer.user.full_name)
self.assertTrue(team.subscription.customer.user.is_active)
# user wasn't deleted but anonymised
user_to_be_deleted.refresh_from_db()
@ -283,7 +294,7 @@ class TestTasks(TestCase):
def test_handle_deletion_request_user_and_is_on_a_team(self):
now = timezone.now()
team = TeamFactory(
subscription__user=create_customer_with_billing_address(
subscription__customer=create_customer_with_billing_address(
full_name='Joe Manager Dane',
email='mail1@example.com',
)
@ -297,9 +308,9 @@ class TestTasks(TestCase):
tasks.handle_deletion_request.task_function(pk=user_to_be_deleted.pk)
# sanity check: nothing happened to the user owning the team subscription
team.subscription.user.refresh_from_db()
self.assertEqual('Joe Manager Dane', team.subscription.user.full_name)
self.assertTrue(team.subscription.user.is_active)
team.subscription.customer.user.refresh_from_db()
self.assertEqual('Joe Manager Dane', team.subscription.customer.user.full_name)
self.assertTrue(team.subscription.customer.user.is_active)
# user was deleted
with self.assertRaises(User.DoesNotExist):

4
users/tests/util.py
View File

@ -145,7 +145,9 @@ def mock_mailgun_responses() -> None:
def create_admin_log_user() -> User:
"""Create the admin user used for logging."""
admin_user = UserFactory(id=1, email='admin@blender.studio', is_staff=True, is_superuser=True)
admin_user, _ = User.objects.get_or_create(
id=1, email='admin@blender.studio', is_staff=True, is_superuser=True
)
# Reset ID sequence to avoid clashing with an already used ID 1
UserFactory.reset_sequence(100, force=True)
return admin_user