From aff394ae7275a42bec8e1f5af883a06e222b4fc2 Mon Sep 17 00:00:00 2001
From: stasbilay02 <stasbilay02@yandex.ru>
Date: Tue, 3 Dec 2024 12:13:18 +0300
Subject: [PATCH] some fix

---
 kernel/EntityRelation.php                     |  2 +-
 kernel/FormModel.php                          | 10 +++++++
 .../user/controllers/UserController.php       | 26 +++++++++++++++++--
 .../user/models/forms/CreateUserForm.php      |  9 +++++++
 kernel/modules/user/service/UserService.php   |  5 +++-
 kernel/modules/user/views/form.php            |  2 +-
 6 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/kernel/EntityRelation.php b/kernel/EntityRelation.php
index 1d118c2..6050f20 100644
--- a/kernel/EntityRelation.php
+++ b/kernel/EntityRelation.php
@@ -123,7 +123,7 @@ class EntityRelation
             }
         }
 
-        return false;
+        return [];
     }
 
     public static function addEntityRelation(string $entity, string $property): bool
diff --git a/kernel/FormModel.php b/kernel/FormModel.php
index 998d13b..92bc880 100644
--- a/kernel/FormModel.php
+++ b/kernel/FormModel.php
@@ -59,6 +59,16 @@ class FormModel
         return false;
     }
 
+    public function validateForUpdate(): bool
+    {
+        $res = $this->validator->validate($this->data, $this->rulesForUpdate());
+        if (!$res) {
+            return true;
+        }
+
+        return false;
+    }
+
     public function getErrors(): array
     {
         return $this->validator->getProcessedErrors();
diff --git a/kernel/modules/user/controllers/UserController.php b/kernel/modules/user/controllers/UserController.php
index 47d439f..fdd8534 100644
--- a/kernel/modules/user/controllers/UserController.php
+++ b/kernel/modules/user/controllers/UserController.php
@@ -5,9 +5,11 @@ namespace kernel\modules\user\controllers;
 use Exception;
 use JetBrains\PhpStorm\NoReturn;
 use kernel\AdminController;
+use kernel\EntityRelation;
 use kernel\modules\user\models\forms\CreateUserForm;
 use kernel\modules\user\models\User;
 use kernel\modules\user\service\UserService;
+use kernel\Request;
 use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
@@ -35,6 +37,11 @@ class UserController extends AdminController
         $userForm->load($_REQUEST);
         if ($userForm->validate()){
             $user = $this->userService->create($userForm);
+
+
+            $entityRelation = new EntityRelation();
+            $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request());
+
             if ($user){
                 $this->redirect("/admin/user/view/" . $user->id);
             }
@@ -91,8 +98,12 @@ class UserController extends AdminController
         $userForm = new CreateUserForm();
         $userService = new UserService();
         $userForm->load($_REQUEST);
-        if ($userForm->validate()){
+        if ($userForm->validateForUpdate()){
             $user = $userService->update($userForm, $user);
+
+            $entityRelation = new EntityRelation();
+            $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request());
+
             if ($user){
                 $this->redirect("/admin/user/view/" . $user->id);
             }
@@ -100,9 +111,20 @@ class UserController extends AdminController
         $this->redirect("/admin/user/update/" . $id);
     }
 
+    /**
+     * @throws Exception
+     */
     #[NoReturn] public function actionDelete($id): void
     {
-        User::find($id)->delete();
+        $user = User::find($id)->first();
+        if (!$user){
+            throw new Exception(message: "The user not found");
+        }
+
+        $entityRelation = new EntityRelation();
+        $entityRelation->deleteEntityRelation(entity: "user", model: $user);
+
+        $user->delete();
         $this->redirect("/admin/user/");
     }
 
diff --git a/kernel/modules/user/models/forms/CreateUserForm.php b/kernel/modules/user/models/forms/CreateUserForm.php
index 632cfd9..73c5f77 100644
--- a/kernel/modules/user/models/forms/CreateUserForm.php
+++ b/kernel/modules/user/models/forms/CreateUserForm.php
@@ -16,4 +16,13 @@ class CreateUserForm extends FormModel
         ];
     }
 
+    public function rulesForUpdate(): array
+    {
+        return [
+            'username' => 'required|min-str-len:5|max-str-len:30',
+            'password' => '',
+            'email' => 'required|email'
+        ];
+    }
+
 }
\ No newline at end of file
diff --git a/kernel/modules/user/service/UserService.php b/kernel/modules/user/service/UserService.php
index 8619038..077edab 100644
--- a/kernel/modules/user/service/UserService.php
+++ b/kernel/modules/user/service/UserService.php
@@ -3,6 +3,7 @@
 namespace kernel\modules\user\service;
 
 use kernel\FormModel;
+use kernel\helpers\Debug;
 use kernel\modules\user\models\User;
 
 class UserService
@@ -25,7 +26,9 @@ class UserService
     {
         $user->username = $form_model->getItem('username');
         $user->email = $form_model->getItem('email');
-        $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
+        if ($form_model->getItem('password')) {
+            $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
+        }
         if ($user->save()){
             return $user;
         }
diff --git a/kernel/modules/user/views/form.php b/kernel/modules/user/views/form.php
index 66ce4d5..e32d35f 100644
--- a/kernel/modules/user/views/form.php
+++ b/kernel/modules/user/views/form.php
@@ -6,7 +6,7 @@
 use kernel\modules\user\models\User;
 
 $form = new \itguild\forms\ActiveForm();
-$form->beginForm(isset($model) ? "/admin/user/edit/" . $model->id : "/admin/user");
+$form->beginForm(isset($model) ? "/admin/user/edit/" . $model->id : "/admin/user", enctype: 'multipart/form-data');
 
 $form->field(class: \itguild\forms\inputs\TextInput::class, name: "username", params: [
     'class' => "form-control",