diff --git a/tournaments/models/custom_user.py b/tournaments/models/custom_user.py index 1c082a9..5ade1d8 100644 --- a/tournaments/models/custom_user.py +++ b/tournaments/models/custom_user.py @@ -37,9 +37,13 @@ class CustomUser(AbstractUser): # returns the list of fields to update without password return ['id', 'username', 'email', 'umpire_code', 'clubs', 'phone', 'first_name', 'last_name', 'licence_id', 'country', - 'summons_message_body', 'summons_message_signature', 'summons_available_payment_methods', 'summons_display_format', 'summons_display_entry_fee', + 'summons_message_body', 'summons_message_signature', 'summons_available_payment_methods', + 'summons_display_format', 'summons_display_entry_fee', 'summons_use_full_custom_message', 'match_formats_default_duration', 'bracket_match_format_preference', 'group_stage_match_format_preference', 'loser_bracket_match_format_preference'] def __str__(self): + return self.username + + def discord_string(self): return f"{self.username} : {self.first_name} {self.last_name} | {self.email} | {self.phone}" diff --git a/tournaments/models/failed_api_call.py b/tournaments/models/failed_api_call.py index 5b48fe9..01fa7d1 100644 --- a/tournaments/models/failed_api_call.py +++ b/tournaments/models/failed_api_call.py @@ -17,3 +17,6 @@ class FailedApiCall(models.Model): return f"{datetime} | {self.user.username} | {self.type} : {self.error}" else: return f"{datetime} | {self.type} : {self.error}" + + def discord_string(self): + return str(self) diff --git a/tournaments/signals.py b/tournaments/signals.py index 712d711..f262ae4 100644 --- a/tournaments/signals.py +++ b/tournaments/signals.py @@ -32,10 +32,10 @@ def notify_user_creation_on_discord(sender, instance, created, **kwargs): def notify_object_creation_on_discord(created, instance): if created: - default_db_engine = settings.DATABASES['default']['ENGINE'] - if default_db_engine != 'django.db.backends.sqlite3': - message = f'New {instance.__class__.__name__} created: {instance}' - send_discord_message(DISCORD_WEBHOOK_URL, message) + # default_db_engine = settings.DATABASES['default']['ENGINE'] + # if default_db_engine != 'django.db.backends.sqlite3': + message = f'New {instance.__class__.__name__} created: {instance.discord_string()}' + send_discord_message(DISCORD_WEBHOOK_URL, message) def send_discord_message(webhook_url, content): data = {