FEAT #11296 TIME 0:20 Refactoring

modules/sendmail/Controllers/SendMessageExchangeController.php

@@ -36,7 +36,8 @@ class SendMessageExchangeController
         // }
 
         /***************** GET MAIL INFOS *****************/
-        $AllUserEntities = \Entity\models\EntityModel::getEntitiesByUserId(['user_id' => $_SESSION['user']['UserId']]);
+        $AllUserEntities = \Entity\models\EntityModel::getWithUserEntities(['where' => ['user_id = ?', 'business_id != \'\''], 'data' => [$_SESSION['user']['UserId']]]);
+
         foreach ($AllUserEntities as $value) {
             if ($value['entity_id'] == $aArgs['sender_email']) {
                 $TransferringAgencyInformations = $value;

modules/sendmail/mail_form.php

@@ -169,7 +169,7 @@ if ($mode == 'add') {
             }
         }
     } else {
-        $userEntitiesMails = \Entity\models\EntityModel::getEntitiesByUserId(['user_id' => $_SESSION['user']['UserId']]);
+        $userEntitiesMails = \Entity\models\EntityModel::getWithUserEntities(['where' => ['user_id = ?'], 'data' => [$_SESSION['user']['UserId']]);
         if (empty($userEntitiesMails)) {
             $content .= '<option value="" >'._NO_SENDER.'</option>';
         } else {

src/app/entity/models/EntityModelAbstract.php

@@ -194,20 +194,19 @@ abstract class EntityModelAbstract
         return $aEntities;
     }
 
-    public static function getEntitiesByUserId(array $aArgs = [])
+    public static function getWithUserEntities(array $args = [])
     {
-        ValidatorModel::notEmpty($aArgs, ['user_id']);
-        ValidatorModel::stringType($aArgs, ['user_id']);
+        ValidatorModel::arrayType($args, ['select', 'where', 'data']);
 
-        $aReturn = DatabaseModel::select([
-            'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
+        $entities = DatabaseModel::select([
+            'select'    => empty($args['select']) ? ['*'] : $args['select'],
             'table'     => ['users_entities', 'entities'],
             'left_join' => ['users_entities.entity_id = entities.entity_id'],
-            'where'     => ['user_id = ?', 'business_id <> \'\''],
-            'data'      => [$aArgs['user_id']]
+            'where'     => empty($args['where']) ? [] : $args['where'],
+            'data'      => empty($args['data']) ? [] : $args['data']
         ]);
 
-        return $aReturn;
+        return $entities;
     }
 
     public static function getEntityRootById(array $aArgs = [])

src/app/folder/controllers/FolderController.php

@@ -42,10 +42,7 @@ class FolderController
     {
         $folders = FolderController::getScopeFolders(['login' => $GLOBALS['userId']]);
 
-        $userEntities = EntityModel::getEntitiesByUserId([
-            'select'  => ['entities.id'],
-            'user_id' => $GLOBALS['userId']
-        ]);
+        $userEntities = EntityModel::getWithUserEntities(['select'  => ['entities.id'], 'where' => ['user_id = ?'], 'data' => [$GLOBALS['userId']]]);
 
         $userEntities = array_column($userEntities, 'id');
         if (empty($userEntities)) {
@@ -564,10 +561,7 @@ class FolderController
     private static function getScopeFolders(array $aArgs)
     {
         $login = $aArgs['login'];
-        $userEntities = EntityModel::getEntitiesByUserId([
-            'select'  => ['entities.id'],
-            'user_id' => $login
-        ]);
+        $userEntities = EntityModel::getWithUserEntities(['select'  => ['entities.id'], 'where' => ['user_id = ?'], 'data' => [$login]]);
 
         $userEntities = array_column($userEntities, 'id');
         if (empty($userEntities)) {