refactor: prima ottimizzazione caricamento moduli

Author: Pek5892

modules/utenti/edit.php

@@ -268,7 +268,7 @@
 						</thead>
 						<tbody>';
 
-    $moduli = Modules::getHierarchy();
+    $moduli = Modules::getHierarchy(true);
 
     $permessi_disponibili = [
         '-' => tr('Nessun permesso'),

src/Models/Module.php

@@ -121,16 +121,20 @@ public function getViewsAttribute()
     {
         $user = \Auth::user();
 
-        $views = database()->fetchArray('SELECT * FROM `zz_views` LEFT JOIN `zz_views_lang` ON (`zz_views`.`id` = `zz_views_lang`.`id_record` AND `zz_views_lang`.`id_lang` = '.prepare(Locale::getDefault()->id).') WHERE `id_module` = :module_id AND
-        `zz_views`.`id` IN (
-            SELECT `id_vista` FROM `zz_group_view` WHERE `id_gruppo` = (
-                SELECT `idgruppo` FROM `zz_users` WHERE `id` = :user_id
-            ))
-        ORDER BY `order` ASC', [
-            'module_id' => $this->id,
-            'user_id' => $user->id,
-        ]);
-
+        $views = database()->fetchArray('SELECT 
+            `zz_views`.*, 
+            `zz_views_lang`.*
+        FROM 
+            `zz_views` 
+            LEFT JOIN `zz_views_lang` ON (`zz_views`.`id` = `zz_views_lang`.`id_record` AND `zz_views_lang`.`id_lang` = '.prepare(\Models\Locale::getDefault()->id).') 
+            LEFT JOIN `zz_group_view` ON `zz_views`.`id` = `zz_group_view`.`id_vista`
+            LEFT JOIN `zz_users` ON `zz_users`.`idgruppo` = `zz_group_view`.`id_gruppo`
+        WHERE 
+            `id_module`='.$this->id.' AND
+            `zz_users`.`id` = '.$user->id.'
+        ORDER BY 
+            `order` ASC');
+            
         return $views;
     }
 

src/Modules.php

@@ -20,6 +20,7 @@
 
 use Models\Module;
 use Util\Query;
+use Illuminate\Support\Collection;
 
 /**
  * Classe per la gestione delle informazioni relative ai moduli installati.
@@ -36,21 +37,26 @@ class Modules
     /** @var array Elenco gerarchico dei moduli */
     protected static $hierarchy;
 
+    /** @var Collection Elenco dei moduli disponibili */
+    protected static $all_modules;
+
     /**
      * Restituisce tutte le informazioni di tutti i moduli installati.
      *
      * @return array
      */
     public static function getModules()
     {
-        $results = Module::getAll();
-
+        if (!isset(self::$all_modules)) {
+            self::$all_modules = Module::getAll();
+        }
+        
         // Caricamento dei plugin
-        if (!$results->first()->relationLoaded('plugins')) {
-            $results->load('plugins');
+        if (!self::$all_modules->first()->relationLoaded('plugins')) {
+            self::$all_modules->load('plugins');
         }
 
-        return $results;
+        return self::$all_modules;
     }
 
     /**
@@ -136,7 +142,18 @@ public static function getAdditionals($module, $include_segments = true)
             $additionals['WHR'] = [];
             $additionals['HVN'] = [];
 
-            $results = $database->fetchArray('SELECT * FROM `zz_group_module` LEFT JOIN `zz_group_module_lang` ON (`zz_group_module`.`id` = `zz_group_module_lang`.`id_record` AND `zz_group_module_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') WHERE `idgruppo` = (SELECT `idgruppo` FROM `zz_users` WHERE `id` = '.prepare($user['id']).') AND `enabled` = 1 AND `idmodule` = '.prepare($module['id']));
+            $results = $database->fetchArray('SELECT 
+                `zz_group_module`.`clause`, 
+                `zz_group_module`.`position`
+            FROM 
+                `zz_group_module` 
+                LEFT JOIN `zz_group_module_lang` ON (`zz_group_module`.`id` = `zz_group_module_lang`.`id_record` AND `zz_group_module_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') 
+                LEFT JOIN `zz_users` ON `zz_users`.`idgruppo` = `zz_group_module`.`idgruppo`
+            WHERE 
+                `zz_users`.`id` = '.prepare($user['id']).' 
+                AND 
+                `zz_group_module`.`idmodule` = '.prepare($module['id']));
+
             foreach ($results as $result) {
                 if (!empty($result['clause'])) {
                     $result['clause'] = Query::replacePlaceholder($result['clause']);

src/Util/Query.php

@@ -664,7 +664,7 @@ protected static function readNewQuery($element)
         $query = $element['option'];
 
         // Aggiunta eventuali filtri dai segmenti per eseguire la query filtrata
-        $query = str_replace('1=1', '1=1 '.\Modules::getAdditionalsQuery(\Models\Module::where('name', $element['attributes']['name'])->first()->id, null, self::$segments), $query);
+        $query = str_replace('1=1', '1=1 '.\Modules::getAdditionalsQuery($element->id, null, self::$segments), $query);
         $views = self::getViews($element);
         $select = [];
 
@@ -777,12 +777,17 @@ protected static function getViews($element)
 
         $user = \Auth::user();
 
-        $views = $database->fetchArray('SELECT *, `zz_views`.`id` FROM `zz_views` LEFT JOIN `zz_views_lang` ON (`zz_views`.`id` = `zz_views_lang`.`id_record` AND `zz_views_lang`.`id_lang` = '.prepare(\Models\Locale::getDefault()->id).') WHERE `id_module`='.prepare($element['id']).' AND
-        `zz_views`.`id` IN (
-            SELECT `id_vista` FROM `zz_group_view` WHERE `id_gruppo`=(
-                SELECT `idgruppo` FROM `zz_users` WHERE `id`='.prepare($user['id']).'
-            ))
-        ORDER BY `order` ASC');
+        $views = $database->fetchArray('SELECT `zz_views`.*, `zz_views_lang`.*
+        FROM 
+            `zz_views` 
+            LEFT JOIN `zz_views_lang` ON (`zz_views`.`id` = `zz_views_lang`.`id_record` AND `zz_views_lang`.`id_lang` = '.prepare(\Models\Locale::getDefault()->id).') 
+            LEFT JOIN `zz_group_view` ON `zz_views`.`id` = `zz_group_view`.`id_vista`
+            LEFT JOIN `zz_users` ON `zz_users`.`idgruppo` = `zz_group_view`.`id_gruppo`
+        WHERE 
+            `id_module`='.prepare($element['id']).' AND
+            `zz_users`.`id` = '.prepare($user['id']).'
+        ORDER BY 
+            `order` ASC');
 
         return $views;
     }