From 251d4cfb53921b6bb2a3906db139301cf90b3769 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:01:10 +0100 Subject: [PATCH] chore: remove comments and improve DB column naming --- ...eate_email_notification_settings_table.php | 19 +++---- ...te_discord_notification_settings_table.php | 17 +++---- ...e_telegram_notification_settings_table.php | 35 ++++++------- ...notification_settings_from_teams_table.php | 25 +++++----- ...notification_settings_from_teams_table.php | 27 +++++----- ...notification_settings_from_teams_table.php | 49 +++++++++---------- 6 files changed, 82 insertions(+), 90 deletions(-) diff --git a/database/migrations/2024_12_05_212355_create_email_notification_settings_table.php b/database/migrations/2024_12_05_212355_create_email_notification_settings_table.php index 45b106827..783e1f9e1 100644 --- a/database/migrations/2024_12_05_212355_create_email_notification_settings_table.php +++ b/database/migrations/2024_12_05_212355_create_email_notification_settings_table.php @@ -15,7 +15,6 @@ return new class extends Migration $table->id(); $table->foreignId('team_id')->constrained()->cascadeOnDelete(); - // SMTP Configuration $table->boolean('smtp_enabled')->default(false); $table->string('smtp_from_address')->nullable(); $table->string('smtp_from_name')->nullable(); @@ -29,19 +28,17 @@ return new class extends Migration $table->boolean('use_instance_email_settings')->default(false); - // Resend Configuration $table->boolean('resend_enabled')->default(false); $table->encryptedText('resend_api_key')->nullable(); - // Notification Settings - $table->boolean('deployment_success_email_notification')->default(false); - $table->boolean('deployment_failure_email_notification')->default(true); - $table->boolean('backup_success_email_notification')->default(false); - $table->boolean('backup_failure_email_notification')->default(true); - $table->boolean('scheduled_task_success_email_notification')->default(false); - $table->boolean('scheduled_task_failure_email_notification')->default(true); - $table->boolean('status_change_email_notification')->default(false); - $table->boolean('server_disk_usage_email_notification')->default(true); + $table->boolean('deployment_success_email_notifications')->default(false); + $table->boolean('deployment_failure_email_notifications')->default(true); + $table->boolean('backup_success_email_notifications')->default(false); + $table->boolean('backup_failure_email_notifications')->default(true); + $table->boolean('scheduled_task_success_email_notifications')->default(false); + $table->boolean('scheduled_task_failure_email_notifications')->default(true); + $table->boolean('status_change_email_notifications')->default(false); + $table->boolean('server_disk_usage_email_notifications')->default(true); $table->unique(['team_id']); }); diff --git a/database/migrations/2024_12_05_212416_create_discord_notification_settings_table.php b/database/migrations/2024_12_05_212416_create_discord_notification_settings_table.php index 5c6ebbd2c..6989444bb 100644 --- a/database/migrations/2024_12_05_212416_create_discord_notification_settings_table.php +++ b/database/migrations/2024_12_05_212416_create_discord_notification_settings_table.php @@ -18,15 +18,14 @@ return new class extends Migration $table->boolean('discord_enabled')->default(false); $table->string('discord_webhook_url')->nullable(); - // Notification Settings - $table->boolean('deployment_success_discord_notification')->default(false); - $table->boolean('deployment_failure_discord_notification')->default(true); - $table->boolean('backup_success_discord_notification')->default(false); - $table->boolean('backup_failure_discord_notification')->default(true); - $table->boolean('scheduled_task_success_discord_notification')->default(false); - $table->boolean('scheduled_task_failure_discord_notification')->default(true); - $table->boolean('status_change_discord_notification')->default(false); - $table->boolean('server_disk_usage_discord_notification')->default(true); + $table->boolean('deployment_success_discord_notifications')->default(false); + $table->boolean('deployment_failure_discord_notifications')->default(true); + $table->boolean('backup_success_discord_notifications')->default(false); + $table->boolean('backup_failure_discord_notifications')->default(true); + $table->boolean('scheduled_task_success_discord_notifications')->default(false); + $table->boolean('scheduled_task_failure_discord_notifications')->default(true); + $table->boolean('status_change_discord_notifications')->default(false); + $table->boolean('server_disk_usage_discord_notifications')->default(true); $table->unique(['team_id']); }); diff --git a/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php b/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php index 3a2e8d8a6..a85794636 100644 --- a/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php +++ b/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php @@ -15,30 +15,27 @@ return new class extends Migration $table->id(); $table->foreignId('team_id')->constrained()->cascadeOnDelete(); - // Telegram Configuration $table->boolean('telegram_enabled')->default(false); $table->text('telegram_token')->nullable(); $table->text('telegram_chat_id')->nullable(); - // Notification Settings - $table->boolean('deployment_success_telegram_notification')->default(false); - $table->boolean('deployment_failure_telegram_notification')->default(true); - $table->boolean('backup_success_telegram_notification')->default(false); - $table->boolean('backup_failure_telegram_notification')->default(true); - $table->boolean('scheduled_task_success_telegram_notification')->default(false); - $table->boolean('scheduled_task_failure_telegram_notification')->default(true); - $table->boolean('status_change_telegram_notification')->default(false); - $table->boolean('server_disk_usage_telegram_notification')->default(true); + $table->boolean('deployment_success_telegram_notifications')->default(false); + $table->boolean('deployment_failure_telegram_notifications')->default(true); + $table->boolean('backup_success_telegram_notifications')->default(false); + $table->boolean('backup_failure_telegram_notifications')->default(true); + $table->boolean('scheduled_task_success_telegram_notifications')->default(false); + $table->boolean('scheduled_task_failure_telegram_notifications')->default(true); + $table->boolean('status_change_telegram_notifications')->default(false); + $table->boolean('server_disk_usage_telegram_notifications')->default(true); - // Thread IDs for Different Notifications - $table->text('telegram_notifications_deployment_success_thread_id')->nullable(); - $table->text('telegram_notifications_deployment_failure_thread_id')->nullable(); - $table->text('telegram_notifications_backup_success_thread_id')->nullable(); - $table->text('telegram_notifications_backup_failure_thread_id')->nullable(); - $table->text('telegram_notifications_scheduled_task_success_thread_id')->nullable(); - $table->text('telegram_notifications_scheduled_task_failure_thread_id')->nullable(); - $table->text('telegram_notifications_status_change_thread_id')->nullable(); - $table->text('telegram_notifications_server_disk_usage_thread_id')->nullable(); + $table->text('telegram_notifications_deployment_success_topic_id')->nullable(); + $table->text('telegram_notifications_deployment_failure_topic_id')->nullable(); + $table->text('telegram_notifications_backup_success_topic_id')->nullable(); + $table->text('telegram_notifications_backup_failure_topic_id')->nullable(); + $table->text('telegram_notifications_scheduled_task_success_topic_id')->nullable(); + $table->text('telegram_notifications_scheduled_task_failure_topic_id')->nullable(); + $table->text('telegram_notifications_status_change_topic_id')->nullable(); + $table->text('telegram_notifications_server_disk_usage_topic_id')->nullable(); $table->unique(['team_id']); }); diff --git a/database/migrations/2024_12_05_212546_migrate_email_notification_settings_from_teams_table.php b/database/migrations/2024_12_05_212546_migrate_email_notification_settings_from_teams_table.php index 243a72b21..b8ba245b9 100644 --- a/database/migrations/2024_12_05_212546_migrate_email_notification_settings_from_teams_table.php +++ b/database/migrations/2024_12_05_212546_migrate_email_notification_settings_from_teams_table.php @@ -30,14 +30,14 @@ return new class extends Migration 'resend_enabled' => $team->resend_enabled ?? false, 'resend_api_key' => $team->resend_api_key, - 'deployment_success_email_notification' => $team->smtp_notifications_deployments ?? false, - 'deployment_failure_email_notification' => $team->smtp_notifications_deployments ?? true, - 'backup_success_email_notification' => $team->smtp_notifications_database_backups ?? false, - 'backup_failure_email_notification' => $team->smtp_notifications_database_backups ?? true, - 'scheduled_task_success_email_notification' => $team->smtp_notifications_scheduled_tasks ?? false, - 'scheduled_task_failure_email_notification' => $team->smtp_notifications_scheduled_tasks ?? true, - 'status_change_email_notification' => $team->smtp_notifications_status_changes ?? false, - 'server_disk_usage_email_notification' => true, + 'deployment_success_email_notifications' => $team->smtp_notifications_deployments ?? false, + 'deployment_failure_email_notifications' => $team->smtp_notifications_deployments ?? true, + 'backup_success_email_notifications' => $team->smtp_notifications_database_backups ?? false, + 'backup_failure_email_notifications' => $team->smtp_notifications_database_backups ?? true, + 'scheduled_task_success_email_notifications' => $team->smtp_notifications_scheduled_tasks ?? false, + 'scheduled_task_failure_email_notifications' => $team->smtp_notifications_scheduled_tasks ?? true, + 'status_change_email_notifications' => $team->smtp_notifications_status_changes ?? false, + 'server_disk_usage_email_notifications' => true, ] ); } @@ -104,10 +104,11 @@ return new class extends Migration 'use_instance_email_settings' => $settings->use_instance_email_settings, 'resend_enabled' => $settings->resend_enabled, 'resend_api_key' => $settings->resend_api_key, - 'smtp_notifications_deployments' => $settings->deployment_success_email_notification, - 'smtp_notifications_database_backups' => $settings->backup_success_email_notification, - 'smtp_notifications_scheduled_tasks' => $settings->scheduled_task_success_email_notification, - 'smtp_notifications_status_changes' => $settings->status_change_email_notification, + 'smtp_notifications_deployments' => $settings->deployment_success_email_notifications || $settings->deployment_failure_email_notifications, + 'smtp_notifications_database_backups' => $settings->backup_success_email_notifications || $settings->backup_failure_email_notifications, + 'smtp_notifications_scheduled_tasks' => $settings->scheduled_task_success_email_notifications || $settings->scheduled_task_failure_email_notifications, + 'smtp_notifications_status_changes' => $settings->status_change_email_notifications, + 'smtp_notifications_server_disk_usage' => $settings->server_disk_usage_email_notifications, ]); } } diff --git a/database/migrations/2024_12_05_212631_migrate_discord_notification_settings_from_teams_table.php b/database/migrations/2024_12_05_212631_migrate_discord_notification_settings_from_teams_table.php index 8a2b79c54..efb89b09a 100644 --- a/database/migrations/2024_12_05_212631_migrate_discord_notification_settings_from_teams_table.php +++ b/database/migrations/2024_12_05_212631_migrate_discord_notification_settings_from_teams_table.php @@ -20,14 +20,14 @@ return new class extends Migration 'discord_enabled' => $team->discord_enabled ?? false, 'discord_webhook_url' => $team->discord_webhook_url, - 'deployment_success_discord_notification' => $team->discord_notifications_deployments ?? false, - 'deployment_failure_discord_notification' => $team->discord_notifications_deployments ?? true, - 'backup_success_discord_notification' => $team->discord_notifications_database_backups ?? false, - 'backup_failure_discord_notification' => $team->discord_notifications_database_backups ?? true, - 'scheduled_task_success_discord_notification' => $team->discord_notifications_scheduled_tasks ?? false, - 'scheduled_task_failure_discord_notification' => $team->discord_notifications_scheduled_tasks ?? true, - 'status_change_discord_notification' => $team->discord_notifications_status_changes ?? false, - 'server_disk_usage_discord_notification' => $team->discord_notifications_server_disk_usage ?? true, + 'deployment_success_discord_notifications' => $team->discord_notifications_deployments ?? false, + 'deployment_failure_discord_notifications' => $team->discord_notifications_deployments ?? true, + 'backup_success_discord_notifications' => $team->discord_notifications_database_backups ?? false, + 'backup_failure_discord_notifications' => $team->discord_notifications_database_backups ?? true, + 'scheduled_task_success_discord_notifications' => $team->discord_notifications_scheduled_tasks ?? false, + 'scheduled_task_failure_discord_notifications' => $team->discord_notifications_scheduled_tasks ?? true, + 'status_change_discord_notifications' => $team->discord_notifications_status_changes ?? false, + 'server_disk_usage_discord_notifications' => $team->discord_notifications_server_disk_usage ?? true, ] ); } @@ -68,12 +68,11 @@ return new class extends Migration $team->update([ 'discord_enabled' => $settings->discord_enabled, 'discord_webhook_url' => $settings->discord_webhook_url, - 'discord_notifications_test' => true, - 'discord_notifications_deployments' => $settings->deployment_success_discord_notification, - 'discord_notifications_status_changes' => $settings->status_change_discord_notification, - 'discord_notifications_database_backups' => $settings->backup_success_discord_notification, - 'discord_notifications_scheduled_tasks' => $settings->scheduled_task_success_discord_notification, - 'discord_notifications_server_disk_usage' => $settings->server_disk_usage_discord_notification, + 'discord_notifications_deployments' => $settings->deployment_success_discord_notifications || $settings->deployment_failure_discord_notifications, + 'discord_notifications_status_changes' => $settings->status_change_discord_notifications, + 'discord_notifications_database_backups' => $settings->backup_success_discord_notifications || $settings->backup_failure_discord_notifications, + 'discord_notifications_scheduled_tasks' => $settings->scheduled_task_success_discord_notifications || $settings->scheduled_task_failure_discord_notifications, + 'discord_notifications_server_disk_usage' => $settings->server_disk_usage_discord_notifications, ]); } } diff --git a/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php b/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php index 416c14439..6796a18cb 100644 --- a/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php +++ b/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php @@ -20,22 +20,22 @@ return new class extends Migration 'telegram_token' => $team->telegram_token, 'telegram_chat_id' => $team->telegram_chat_id, - 'deployment_success_telegram_notification' => $team->telegram_notifications_deployments ?? false, - 'deployment_failure_telegram_notification' => $team->telegram_notifications_deployments ?? true, - 'backup_success_telegram_notification' => $team->telegram_notifications_database_backups ?? false, - 'backup_failure_telegram_notification' => $team->telegram_notifications_database_backups ?? true, - 'scheduled_task_success_telegram_notification' => $team->telegram_notifications_scheduled_tasks ?? false, - 'scheduled_task_failure_telegram_notification' => $team->telegram_notifications_scheduled_tasks ?? true, - 'status_change_telegram_notification' => $team->telegram_notifications_status_changes ?? false, - 'server_disk_usage_telegram_notification' => $team->telegram_notifications_server_disk_usage ?? true, + 'deployment_success_telegram_notifications' => $team->telegram_notifications_deployments ?? false, + 'deployment_failure_telegram_notifications' => $team->telegram_notifications_deployments ?? true, + 'backup_success_telegram_notifications' => $team->telegram_notifications_database_backups ?? false, + 'backup_failure_telegram_notifications' => $team->telegram_notifications_database_backups ?? true, + 'scheduled_task_success_telegram_notifications' => $team->telegram_notifications_scheduled_tasks ?? false, + 'scheduled_task_failure_telegram_notifications' => $team->telegram_notifications_scheduled_tasks ?? true, + 'status_change_telegram_notifications' => $team->telegram_notifications_status_changes ?? false, + 'server_disk_usage_telegram_notifications' => $team->telegram_notifications_server_disk_usage ?? true, - 'telegram_notifications_deployment_success_thread_id' => $team->telegram_notifications_deployments_message_thread_id, - 'telegram_notifications_deployment_failure_thread_id' => $team->telegram_notifications_deployments_message_thread_id, - 'telegram_notifications_backup_success_thread_id' => $team->telegram_notifications_database_backups_message_thread_id, - 'telegram_notifications_backup_failure_thread_id' => $team->telegram_notifications_database_backups_message_thread_id, - 'telegram_notifications_scheduled_task_success_thread_id' => $team->telegram_notifications_scheduled_tasks_thread_id, - 'telegram_notifications_scheduled_task_failure_thread_id' => $team->telegram_notifications_scheduled_tasks_thread_id, - 'telegram_notifications_status_change_thread_id' => $team->telegram_notifications_status_changes_message_thread_id, + 'telegram_notifications_deployment_success_topic_id' => $team->telegram_notifications_deployments_message_thread_id, + 'telegram_notifications_deployment_failure_topic_id' => $team->telegram_notifications_deployments_message_thread_id, + 'telegram_notifications_backup_success_topic_id' => $team->telegram_notifications_database_backups_message_thread_id, + 'telegram_notifications_backup_failure_topic_id' => $team->telegram_notifications_database_backups_message_thread_id, + 'telegram_notifications_scheduled_task_success_topic_id' => $team->telegram_notifications_scheduled_tasks_thread_id, + 'telegram_notifications_scheduled_task_failure_topic_id' => $team->telegram_notifications_scheduled_tasks_thread_id, + 'telegram_notifications_status_change_topic_id' => $team->telegram_notifications_status_changes_message_thread_id, ] ); } @@ -89,16 +89,15 @@ return new class extends Migration 'telegram_enabled' => $settings->telegram_enabled, 'telegram_token' => $settings->telegram_token, 'telegram_chat_id' => $settings->telegram_chat_id, - 'telegram_notifications_test' => true, - 'telegram_notifications_deployments' => $settings->deployment_success_telegram_notification, - 'telegram_notifications_status_changes' => $settings->status_change_telegram_notification, - 'telegram_notifications_database_backups' => $settings->backup_success_telegram_notification, - 'telegram_notifications_scheduled_tasks' => $settings->scheduled_task_success_telegram_notification, - 'telegram_notifications_server_disk_usage' => $settings->server_disk_usage_telegram_notification, - 'telegram_notifications_deployments_message_thread_id' => $settings->telegram_notifications_deployment_success_thread_id, - 'telegram_notifications_status_changes_message_thread_id' => $settings->telegram_notifications_status_change_thread_id, - 'telegram_notifications_database_backups_message_thread_id' => $settings->telegram_notifications_backup_success_thread_id, - 'telegram_notifications_scheduled_tasks_thread_id' => $settings->telegram_notifications_scheduled_task_success_thread_id, + 'telegram_notifications_deployments' => $settings->deployment_success_telegram_notifications || $settings->deployment_failure_telegram_notifications, + 'telegram_notifications_status_changes' => $settings->status_change_telegram_notifications, + 'telegram_notifications_database_backups' => $settings->backup_success_telegram_notifications || $settings->backup_failure_telegram_notifications, + 'telegram_notifications_scheduled_tasks' => $settings->scheduled_task_success_telegram_notifications || $settings->scheduled_task_failure_telegram_notifications, + 'telegram_notifications_server_disk_usage' => $settings->server_disk_usage_telegram_notifications, + 'telegram_notifications_deployments_message_thread_id' => $settings->telegram_notifications_deployment_success_topic_id, + 'telegram_notifications_status_changes_message_thread_id' => $settings->telegram_notifications_status_change_topic_id, + 'telegram_notifications_database_backups_message_thread_id' => $settings->telegram_notifications_backup_success_topic_id, + 'telegram_notifications_scheduled_tasks_thread_id' => $settings->telegram_notifications_scheduled_task_success_topic_id, ]); } }