Added user notification settings

ZakharovAndrew · ZakharovAndrew · commit 21b6ebfeceb6 · 2025-03-05T01:26:56.000+03:00
diff --git a/migrations/m250223_110111_create_user_notification_settings_table.php b/migrations/m250223_110111_create_user_notification_settings_table.php
@@ -6,35 +6,39 @@ class m250223_110111_create_user_notification_settings_table extends Migration
 {
     public function up()
     {
-
         $this->createTable('user_notification_settings', [
             'id' => $this->primaryKey(),
-            'user_id' => $this->integer()->notNull(),
-            'notification_group_id' => $this->integer()->notNull(),
-            'telegram' => $this->boolean()->notNull()->defaultValue(true),
-            'email' => $this->boolean()->notNull()->defaultValue(true),
-            'push' => $this->boolean()->notNull()->defaultValue(true),
+            'user_id' => $this->integer()->notNull(), // ID пользователя
+            'notification_id' => $this->integer()->notNull(), // ID уведомления
+            'send_email' => $this->boolean()->defaultValue(false), // Разрешить отправку по Email
+            'send_telegram' => $this->boolean()->defaultValue(false), // Разрешить отправку в Telegram
+            'send_push' => $this->boolean()->defaultValue(false), // Разрешить отправку Push-уведомлений
             'created_at' => $this->timestamp()->defaultExpression('CURRENT_TIMESTAMP'),
             'updated_at' => $this->timestamp()->defaultExpression('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
         ]);
-        
-        // foreign key for user_id
+
+        // Добавляем индексы для оптимизации запросов
+        $this->createIndex('idx-user_notification_settings-user_id', 'user_notification_settings', 'user_id');
+        $this->createIndex('idx-user_notification_settings-notification_id', 'user_notification_settings', 'notification_id');
+
+        // Добавляем внешние ключи
         $this->addForeignKey(
             'fk-user_notification_settings-user_id',
             'user_notification_settings',
             'user_id',
             'users',
             'id',
+            'CASCADE',
             'CASCADE'
         );
 
-        // foreign key for notification_group_id
         $this->addForeignKey(
-            'fk-user_notification_settings-notification_group_id',
+            'fk-user_notification_settings-notification_id',
             'user_notification_settings',
-            'notification_group_id',
-            'notification_groups',
+            'notification_id',
+            'notifications',
             'id',
+            'CASCADE',
             'CASCADE'
         );
     }
@@ -45,7 +49,10 @@ public function up()
     public function down()
     {
         $this->dropForeignKey('fk-user_notification_settings-user_id', 'user_notification_settings');
-        $this->dropForeignKey('fk-user_notification_settings-notification_group_id', 'user_notification_settings');
+        $this->dropForeignKey('fk-user_notification_settings-notification_id', 'user_notification_settings');
+
+        $this->dropIndex('idx-user_notification_settings-user_id', 'user_notification_settings');
+        $this->dropIndex('idx-user_notification_settings-notification_id', 'user_notification_settings');
 
         $this->dropTable('user_notification_settings');
     }
diff --git a/src/controllers/NotificationsController.php b/src/controllers/NotificationsController.php
@@ -6,146 +6,70 @@
 use yii\web\Controller;
 use ZakharovAndrew\user\models\NotificationGroup;
 use ZakharovAndrew\user\models\Notification;
+use ZakharovAndrew\user\models\UserNotificationSetting;
+use ZakharovAndrew\user\models\UserRoles;
 use yii\web\NotFoundHttpException;
 use yii\web\Response;
 
-class NotificationAdminController extends Controller
+class NotificationsController extends Controller
 {
     public function actionIndex()
     {
-        $groups = NotificationGroup::find()->all(); // Fetch all notification groups
-        
+        $userId = Yii::$app->user->id;
+
+        $userRoleIds = UserRoles::getUserRolesIds($userId);      
+
+        // Запрос для получения всех групп уведомлений и связанных с ними уведомлений
+        $groups = NotificationGroup::find()
+            ->with([
+                'notifications' => function ($query) use ($userRoleIds) {
+                    // Фильтруем уведомления:
+                    // - Если уведомление связано с ролями, проверяем, есть ли совпадение с ролями пользователя.
+                    // - Если уведомление НЕ связано с ролями, оно доступно всем.
+                    $query->joinWith('roles')
+                        ->andWhere([
+                            'or',
+                            ['notification_role.role_id' => null], // Уведомления без ролей (доступны всем)
+                            ['and', ['notification_role.role_id' => $userRoleIds]], // Уведомления с ролями, соответствующими пользователю
+                        ])
+                        ->groupBy('notifications.id'); // Группируем по ID уведомлений, чтобы избежать дубликатов
+                },
+            ])
+            ->all();
+
         return $this->render('index', [
             'groups' => $groups,
-            'model' => new NotificationGroup(),
-            'modelNotification' => new Notification()
+            'userId' => $userId,
         ]);
     }
     
-    // Action to handle AJAX request for creating a new NotificationGroup
-    public function actionCreateGroupAjax()
-    {
-        Yii::$app->response->format = Response::FORMAT_JSON; // Set response format to JSON
-        
-        $model = new NotificationGroup();
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return ['success' => true, 'group' => $model]; // Return success response with the new group
-        }
-
-        return ['success' => false, 'errors' => $model->getErrors()]; // Return error response if saving fails
-    }
-
-    public function actionDeleteGroup($id)
-    {
-        $model = NotificationGroup::findOne($id);
-
-        if ($model) {
-            $model->delete();
-            Yii::$app->session->setFlash('success', 'Group deleted successfully.');
-        } else {
-            Yii::$app->session->setFlash('error', 'Group not found.');
-        }
-
-        return $this->redirect(['index']); // Перенаправление обратно на страницу с группами
-    }
-    
-
-    /**
-     * Сreating a notification
-     * @param integer $groupId - ID of the group to which the notification is added
-     * @return type
-     */
-    public function actionCreateNotificationAjax($groupId)
+    public function actionSaveNotificationSetting()
     {
-        Yii::$app->response->format = Response::FORMAT_JSON;
+        Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
 
-        $group = $this->findGroup($groupId);
-        $model = new Notification();
+        $userId = Yii::$app->request->post('user_id');
+        $notificationId = Yii::$app->request->post('notification_id');
+        $type = Yii::$app->request->post('type');
+        $value = Yii::$app->request->post('value');
 
-        if ($model->load(Yii::$app->request->post())) {
-            $model->notification_group_id = $group->id;
-            if ($model->save()) {
-                return ['success' => true, 'notification' => $model];
-            }
-        } else {
-            echo 'asd';
-        }
-
-        return ['success' => false, 'errors' => $model->getErrors()];
-    }
-    
-    public function actionEditNotificationAjax($id)
-    {
-        Yii::$app->response->format = Response::FORMAT_JSON;
+        $setting = UserNotificationSetting::findOne([
+            'user_id' => $userId,
+            'notification_id' => $notificationId,
+        ]);
 
-        $model = Notification::findOne($id);
-        if (!$model) {
-            return ['success' => false, 'message' => 'Notification not found'];
+        if (!$setting) {
+            $setting = new UserNotificationSetting([
+                'user_id' => $userId,
+                'notification_id' => $notificationId,
+            ]);
         }
         
-        if ($model->load(Yii::$app->request->post())) {
-            // Save roles
-            $roleIds = Yii::$app->request->post('Notification')['roles'] ?? [];
-            $model->setRoles($roleIds);
-
-            if ($model->save()) {
-                // Convert roles to an array for returning in JSON
-                $roles = array_map(function ($role) {
-                    return $role->id;
-                }, $model->roles);
-                
-                return [
-                    'success' => true,
-                    'notification' => [
-                        'id' => $model->id,
-                        'name' => $model->name,
-                        'description' => $model->description,
-                        'code_name' => $model->code_name,
-                        'function_to_call' => $model->function_to_call,
-                        'roles' => $roles,
-                    ],
-                ];
-            }
-        }
-
-        return ['success' => false, 'errors' => $model->getErrors()];
-    }
-    
-    public function actionDeleteNotificationAjax($id)
-    {
-        Yii::$app->response->format = Response::FORMAT_JSON;
-
-        $model = Notification::findOne($id);
-        if ($model) {
-            $model->delete();
-            return ['success' => true];
-        }
-
-        return ['success' => false, 'message' => 'Notification not found'];
-    }
-
-    public function actionEditGroupAjax($id)
-    {
-        Yii::$app->response->format = Response::FORMAT_JSON;
-
-        $model = $this->findGroup($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return ['success' => true, 'group' => $model];
-        }
-
-        return ['success' => false, 'errors' => $model->getErrors()];
-    }
-
-
-    // Helper method to find a NotificationGroup by ID
-    protected function findGroup($id)
-    {
-        if (($model = NotificationGroup::findOne($id)) !== null) {
-            return $model;
+        $setting->{'send_' . $type} = ($value=="false" ? 0 : 1);
+        
+        if ($setting->save()) {
+            return ['success' => true, 'res' => $value];
         }
 
-        throw new NotFoundHttpException('The requested page does not exist.'); // Throw an error if the group does not exist
+        return ['success' => false, 'errors' => $setting->getErrors()];
     }
 }
diff --git a/src/models/Notification.php b/src/models/Notification.php
@@ -56,14 +56,10 @@ public function getGroup()
         return $this->hasOne(NotificationGroup::class, ['id' => 'notification_group_id']); // One-to-one relationship with NotificationGroup.
     }
 
-    /**
-     * This method defines the relationship between a notification and user settings.
-     * 
-     * @return \yii\db\ActiveQuery the relation to the UserNotificationSetting model.
-     */
-    public function getUserSettings()
+
+    public function getUserSetting($userId)
     {
-        return $this->hasMany(UserNotificationSetting::class, ['notification_id' => 'id']); // One-to-many relationship with UserNotificationSetting.
+        return UserNotificationSetting::findOne(['notification_id' => $this->id, 'user_id' => $userId]);
     }
 
     /**
@@ -96,10 +92,13 @@ public function setRoles($roleIds)
     {
         $currentRoleIds = $this->getRoleIds(); // Получаем текущие ID ролей
 
-        $rolesToAdd = array_diff($roleIds, $currentRoleIds);
-
-        $rolesToRemove = array_diff($currentRoleIds, $roleIds);
-
+        if (is_array($roleIds)) {
+            $rolesToAdd = array_diff($roleIds, $currentRoleIds);
+            $rolesToRemove = array_diff($currentRoleIds, $roleIds);
+        } else {
+            $rolesToAdd = [];
+            $rolesToRemove = $currentRoleIds ?? [];
+        }
         
         foreach ($rolesToRemove as $roleId) {
             $this->unlink('roles', Roles::findOne($roleId), true);
diff --git a/src/models/UserNotificationSetting.php b/src/models/UserNotificationSetting.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace ZakharovAndrew\user\models;
+
+use Yii;
+use yii\db\ActiveRecord;
+use ZakharovAndrew\user\models\User;
+use ZakharovAndrew\user\models\Notification;
+
+class UserNotificationSetting extends ActiveRecord
+{
+    public static function tableName()
+    {
+        return 'user_notification_settings';
+    }
+
+    public function rules()
+    {
+        return [
+            [['user_id', 'notification_id'], 'required'],
+            [['user_id', 'notification_id'], 'integer'],
+            [['send_email', 'send_telegram', 'send_push'], 'boolean'],
+        ];
+    }
+
+    public function attributeLabels()
+    {
+        return [
+            'user_id' => 'User ID',
+            'notification_id' => 'Notification ID',
+            'send_email' => 'Send Email',
+            'send_telegram' => 'Send Telegram',
+            'send_push' => 'Send Push',
+        ];
+    }
+
+    public function getUser()
+    {
+        return $this->hasOne(User::class, ['id' => 'user_id']);
+    }
+
+    public function getNotification()
+    {
+        return $this->hasOne(Notification::class, ['id' => 'notification_id']);
+    }
+}
diff --git a/src/models/UserRoles.php b/src/models/UserRoles.php
@@ -4,6 +4,7 @@
 
 use Yii;
 use ZakharovAndrew\user\Module;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "user_roles".
@@ -71,6 +72,26 @@ public static function getUserRoles($user_id)
         }, 600);
     }
     
+    /**
+     * Get all user IDs roles
+     * 
+     * @param integer $user_id User ID
+     * @return array
+     */
+    public static function getUserRolesIds($user_id)
+    {
+        return Yii::$app->cache->getOrSet('get_users_roles_ids_'.$user_id, function () use ($user_id) {
+            return ArrayHelper::getColumn(
+                static::find()
+                ->select('DISTINCT(user_roles.role_id)')
+                ->where(['user_roles.user_id' => $user_id])
+                ->asArray()
+                ->all(),
+                'role_id'
+            );
+        }, 600);
+    }
+    
     /**
      * Get a list of users who have a role
      * 
@@ -91,7 +112,7 @@ public static function getUsersListByRoleSubject($role, $subject_id = null)
             $model->andWhere(["or", ["user_roles.subject_id" => $subject_id], ["subject_id" => null]]);
         }
    
-        return \yii\helpers\ArrayHelper::getColumn(
+        return ArrayHelper::getColumn(
                 $model->asArray()->all(),
                 'user_id'
                 );
@@ -127,6 +148,7 @@ public function afterSave($insert, $changedAttributes)
     {
         parent::afterSave($insert, $changedAttributes);
         Yii::$app->cache->delete('get_users_roles_'.$this->user_id);
+        Yii::$app->cache->delete('get_users_roles_ids_'.$this->user_id);
         Yii::$app->cache->delete('get_roles_by_user_'.$this->user_id);
     }
 }
diff --git a/src/views/notification-admin/index.php b/src/views/notification-admin/index.php
diff --git a/src/views/notifications/index.php b/src/views/notifications/index.php
