Skip to content

Commit

Permalink
Don't call a lifecycle hook twice with the same state.
Browse files Browse the repository at this point in the history
This allows users to listen for multiple specific change events and
handle them all in a single function.
  • Loading branch information
garyd203 committed Feb 3, 2020
1 parent 8318f12 commit 97804c3
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 12 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ __pycache__/
README.txt
.tox
django_lifecycle.egg-info
site/
site/
.idea/
venv/
22 changes: 12 additions & 10 deletions django_lifecycle/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,17 +189,19 @@ def _run_hooked_methods(self, hook: str) -> List[str]:
when_any_field = callback_specs.get("when_any")

if when_field:
if self._check_callback_conditions(when_field, callback_specs):
fired.append(method.__name__)
method()
if not self._check_callback_conditions(when_field, callback_specs):
continue
elif when_any_field:
for field_name in when_any_field:
if self._check_callback_conditions(field_name, callback_specs):
fired.append(method.__name__)
method()
else:
fired.append(method.__name__)
method()
if not any([
self._check_callback_conditions(field_name, callback_specs)
for field_name in when_any_field
]):
continue

# Only call the method once per hook
fired.append(method.__name__)
method()
break

return fired

Expand Down
18 changes: 18 additions & 0 deletions tests/testapp/migrations/0003_useraccount_name_changes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.8 on 2020-02-03 10:45

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('testapp', '0002_auto_20190928_2324'),
]

operations = [
migrations.AddField(
model_name='useraccount',
name='name_changes',
field=models.IntegerField(default=0),
),
]
10 changes: 9 additions & 1 deletion tests/testapp/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class UserAccount(LifecycleModel):
joined_at = models.DateTimeField(null=True)
has_trial = models.BooleanField(default=False)
organization = models.ForeignKey(Organization, null=True, on_delete=models.SET_NULL)
name_changes = models.IntegerField(default=0)

status = models.CharField(
default="active",
Expand Down Expand Up @@ -61,7 +62,14 @@ def do_after_create_jobs(self):
def timestamp_password_change(self):
self.password_updated_at = timezone.now()

@hook("before_delete", when="has_trial", was="*", is_now=True)

@hook('before_update', when='first_name', has_changed=True)
@hook('before_update', when='last_name', has_changed=True)
def count_name_changes(self):
self.name_changes += 1


@hook("before_delete", when='has_trial', was='*', is_now=True)
def ensure_trial_not_active(self):
raise CannotDeleteActiveTrial("Cannot delete trial user!")

Expand Down
1 change: 1 addition & 0 deletions tests/testapp/tests/test_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def test_snapshot_state(self):
"organization_id": org.id,
"status": "active",
"organization.name": "Dunder Mifflin",
"name_changes": 0,
},
)

Expand Down
7 changes: 7 additions & 0 deletions tests/testapp/tests/test_user_account.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ def test_email_after_delete(self):
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].subject, "We have deleted your account")

def test_only_call_hook_once(self):
account = UserAccount.objects.create(**self.stub_data)
account.first_name = "Waylon"
account.last_name = "Smithers"
account.save()
self.assertEqual(account.name_changes, 1)

def test_lowercase_email(self):
data = self.stub_data
data["email"] = "[email protected]"
Expand Down

0 comments on commit 97804c3

Please sign in to comment.