-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #179 from colab/delete_user
Delete user
- Loading branch information
Showing
5 changed files
with
65 additions
and
24 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
|
||
from django.dispatch import Signal | ||
|
||
|
||
user_created = Signal(providing_args=['user', 'password']) | ||
user_password_changed = Signal(providing_args=['user', 'password']) | ||
user_basic_info_updated = Signal(providing_args=['user', 'update_email']) | ||
delete_user = Signal(providing_args=['user', 'emails']) |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,16 @@ | ||
|
||
from django.db.models.signals import post_save | ||
from django.dispatch import receiver | ||
from django.conf import settings | ||
|
||
from .models import EmailAddress | ||
from django.dispatch import receiver | ||
from colab.accounts.signals import (delete_user) | ||
|
||
|
||
@receiver(post_save, sender=settings.AUTH_USER_MODEL) | ||
def create_email_address(sender, instance, created, **kwargs): | ||
if not created: | ||
return | ||
@receiver(delete_user) | ||
def delete_user_from_superarchive(sender, **kwargs): | ||
user = kwargs.get('user') | ||
emails = [] | ||
|
||
email, email_created = EmailAddress.objects.get_or_create( | ||
address=instance.email, | ||
defaults={ | ||
'real_name': instance.get_full_name(), | ||
'user': instance, | ||
} | ||
) | ||
if kwargs.get('emails'): | ||
emails = kwargs.get('emails').split(' ') | ||
|
||
email.user = instance | ||
email.save() | ||
for email in emails: | ||
EmailAddress.objects.filter(address=email).first().delete() | ||
user.update_subscription(email, []) |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# -*- coding:utf-8 -*- | ||
|
||
from mock import patch | ||
|
||
from colab.accounts.models import User | ||
from django.test import TestCase | ||
from colab.super_archives.models import EmailAddress | ||
|
||
|
||
class SignalsTest(TestCase): | ||
def setUp(self): | ||
self.user = self.create_user() | ||
|
||
def create_user(self): | ||
user = User() | ||
user.username = "USERtestCoLaB" | ||
user.set_password("123colab4") | ||
user.email = "usertest@colab.com.br" | ||
user.id = 1 | ||
user.first_name = "USERtestCoLaB" | ||
user.last_name = "COLAB" | ||
user.save() | ||
|
||
return user | ||
|
||
@patch.object(User, 'update_subscription') | ||
def test_delete_user_without_email(self, update_subscription_mock): | ||
update_subscription_mock.return_value = True | ||
self.user.delete() | ||
self.assertEqual(0, update_subscription_mock.call_count) | ||
|
||
@patch.object(User, 'update_subscription') | ||
def test_delete_user_with_email(self, update_subscription_mock): | ||
update_subscription_mock.return_value = True | ||
|
||
EmailAddress.objects.get_or_create(user=self.user, | ||
address="usertest@colab.com.br") | ||
EmailAddress.objects.get_or_create(user=self.user, | ||
address="teste@gmail.com") | ||
|
||
self.user.delete() | ||
self.assertEqual(2, update_subscription_mock.call_count) | ||
self.assertEqual(0, EmailAddress.objects.count()) |