Rename Notification.event_name to event_type

This commit is contained in:
Jeremy Stretch 2024-07-08 14:42:56 -04:00
parent 744d3d8197
commit fa722feaf8
5 changed files with 8 additions and 8 deletions

View File

@ -26,7 +26,7 @@ class NotificationSerializer(ValidatedModelSerializer):
class Meta:
model = Notification
fields = [
'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', 'read', 'event_name',
'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', 'read', 'event_type',
]
brief_fields = ('id', 'url', 'display', 'object_type', 'object_id', 'user', 'event')

View File

@ -136,7 +136,7 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
event_rule.action_object.notify(
object_type=object_type,
object_id=data['id'],
event_name=event_type
event_type=event_type
)
else:

View File

@ -52,7 +52,7 @@ class Migration(migrations.Migration):
('created', models.DateTimeField(auto_now_add=True)),
('read', models.DateTimeField(null=True)),
('object_id', models.PositiveBigIntegerField()),
('event_name', models.CharField(max_length=50)),
('event_type', models.CharField(max_length=50)),
('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to=settings.AUTH_USER_MODEL)),
],

View File

@ -21,7 +21,7 @@ __all__ = (
)
def get_event_name_choices():
def get_event_type_choices():
"""
Compile a list of choices from all registered event types
"""
@ -57,10 +57,10 @@ class Notification(models.Model):
ct_field='object_type',
fk_field='object_id'
)
event_name = models.CharField(
event_type = models.CharField(
verbose_name=_('event'),
max_length=50,
choices=get_event_name_choices
choices=get_event_type_choices
)
objects = NotificationQuerySet.as_manager()
@ -104,7 +104,7 @@ class Notification(models.Model):
@cached_property
def event(self):
return registry['events'].get(self.event_name)
return registry['events'].get(self.event_type)
class NotificationGroup(ChangeLoggedModel):

View File

@ -325,6 +325,6 @@ def notify_object_changed(sender, instance, created, raw, **kwargs):
# Create Notifications for Subscribers
Notification.objects.bulk_create([
Notification(user_id=user, object=instance, event_name=OBJECT_UPDATED)
Notification(user_id=user, object=instance, event_type=OBJECT_UPDATED)
for user in subscribed_users
])