Изменен механизм кэширования.

ProklUng · May 2, 2021 · 86f0408 · 86f0408
1 parent c6e47ad
commit 86f0408
Show file tree

Hide file tree

Showing 15 changed files with 181 additions and 149 deletions.
diff --git a/DependencyInjection/ModelExtension.php b/DependencyInjection/ModelExtension.php
@@ -41,6 +41,7 @@ public function load(array $configs, ContainerBuilder $container) : void
         );
 
         $loader->load('services.yaml');
+        $loader->load('caching.yaml');
 
         // Фасады подтягиваются только, если установлен соответствующий бандл.
         if (class_exists('Prokl\FacadeBundle\Services\AbstractFacade')) {

diff --git a/Resources/config/caching.yaml b/Resources/config/caching.yaml
@@ -0,0 +1,38 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: true
+
+  # Кэш
+  model_bundle.cacher:
+    public: false
+    class: WebArch\BitrixCache\AntiStampedeCacheAdapter
+    arguments: ['/', '%bitrix-model.ttl_cache%', '%bitrix-model.cache_dir%']
+
+  model_bundle.reflection_processor:
+    public: false
+    class: Prokl\CacheProxificator\ReflectionProcessor
+
+  model_bundle.factory_elements_cached:
+    class: Prokl\BitrixModelBundle\Services\Factories\ModelElementFactoryCached
+    arguments:
+      - '@model_bundle.factory_elements'
+      - '@model_bundle.cacher'
+      - '@model_bundle.reflection_processor'
+      - ['getModel', 'getModelByCodeIblock', 'getModelByIdIblock']
+      - '@model_bundle.env_resolver_factory'
+
+  Prokl\BitrixModelBundle\Services\Factories\ModelElementFactoryCached: 'model_bundle.factory_elements_cached'
+
+  model_bundle.factory_sections_cached:
+    class: Prokl\BitrixModelBundle\Services\Factories\ModelSectionFactoryCached
+    arguments:
+      - '@model_bundle.factory_elements'
+      - '@model_bundle.cacher'
+      - '@model_bundle.reflection_processor'
+      - ['getModel', 'getModelByCodeIblock', 'getModelByIdIblock']
+      - '@model_bundle.env_resolver_factory'
+
+  Prokl\BitrixModelBundle\Services\Factories\ModelSectionFactoryCached: 'model_bundle.factory_elements_cached'
+
diff --git a/Resources/config/facades.yaml b/Resources/config/facades.yaml
@@ -5,5 +5,7 @@ services:
     public: true
 
   Prokl\BitrixModelBundle\Services\Facades\ModelElementFacade: ~
+  Prokl\BitrixModelBundle\Services\Facades\ModelElementFacadeCached: ~
   Prokl\BitrixModelBundle\Services\Facades\ModelSectionFacade: ~
+  Prokl\BitrixModelBundle\Services\Facades\ModelSectionFacadeCached: ~
   Prokl\BitrixModelBundle\Services\Facades\D7ModelFacade: ~
diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml
@@ -15,14 +15,14 @@ services:
   model_bundle.factory_elements:
     public: true
     class: Prokl\BitrixModelBundle\Services\Factories\ModelElementFactory
-    arguments: [!tagged_locator { tag: 'iblock.element.model', index_by: 'key' }, '@model_bundle.ciblockelement', '@model_bundle.cacher']
+    arguments: [!tagged_locator { tag: 'iblock.element.model', index_by: 'key' }, '@model_bundle.ciblockelement']
 
   Prokl\BitrixModelBundle\Services\Factories\ModelElementFactory: '@model_bundle.factory_elements'
 
   model_bundle.factory_sections:
     public: true
     class: Prokl\BitrixModelBundle\Services\Factories\ModelSectionFactory
-    arguments: [!tagged_locator { tag: 'iblock.section.model', index_by: 'key' }, '@model_bundle.ciblocksection', '@model_bundle.cacher']
+    arguments: [!tagged_locator { tag: 'iblock.section.model', index_by: 'key' }, '@model_bundle.ciblocksection']
 
   Prokl\BitrixModelBundle\Services\Factories\ModelSectionFactory: '@model_bundle.factory_sections'
 
@@ -33,8 +33,12 @@ services:
 
   Prokl\BitrixModelBundle\Services\Factories\D7ModelFactory: '@model_bundle.d7_model'
 
-  # Кэш
-  model_bundle.cacher:
+  model_bundle.env_resolver:
     public: false
-    class: WebArch\BitrixCache\AntiStampedeCacheAdapter
-    arguments: ['/', '%bitrix-model.ttl_cache%', '%bitrix-model.cache_dir%']
+    class: Prokl\BitrixModelBundle\Services\Utils\EnvironmentResolver
+    arguments: ['%env(resolve:DEBUG)%']
+
+  model_bundle.env_resolver_factory:
+    public: false
+    class: Prokl\BitrixModelBundle\Services\Utils\EnvironmentResolver
+    factory: ['@model_bundle.env_resolver', 'getEnv']
diff --git a/Services/Facades/ModelElementFacade.php b/Services/Facades/ModelElementFacade.php
@@ -11,10 +11,8 @@
  * @since 30.04.2021
  *
  * @method static getModel(int $idElement)
- * @method static getModelCached(int $idElement)
  * @method static getModelByIdIblock(int $iblockId)
  * @method static getModelByCodeIblock(string $iblockType, string $iblockCode)
- * @method static getModelByCodeIblockCached(string $iblockType, string $iblockCode)
  */
 class ModelElementFacade extends AbstractFacade
 {

diff --git a/Services/Facades/ModelElementFacadeCached.php b/Services/Facades/ModelElementFacadeCached.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Prokl\BitrixModelBundle\Services\Facades;
+
+use Prokl\FacadeBundle\Services\AbstractFacade;
+
+/**
+ * Class ModelElementFacade
+ * @package Prokl\BitrixModelBundle\Services\Facades
+ *
+ * @since 02.05.2021
+ *
+ * @method static getModel(int $idElement)
+ * @method static getModelByIdIblock(int $iblockId)
+ * @method static getModelByCodeIblock(string $iblockType, string $iblockCode)
+ */
+class ModelElementFacadeCached extends AbstractFacade
+{
+    /**
+     * @inheritDoc
+     */
+    protected static function getFacadeAccessor() : string
+    {
+        return 'model_bundle.factory_elements_cached';
+    }
+}
diff --git a/Services/Facades/ModelSectionFacade.php b/Services/Facades/ModelSectionFacade.php
@@ -11,10 +11,8 @@
  * @since 30.04.2021
  *
  * @method static getModel(int $idElement)
- * @method static getModelCached(int $idElement)
  * @method static getModelByIdIblock(int $iblockId)
  * @method static getModelByCodeIblock(string $iblockType, string $iblockCode)
- * @method static getModelByCodeIblockCached(string $iblockType, string $iblockCode)
  */
 class ModelSectionFacade extends AbstractFacade
 {

diff --git a/Services/Facades/ModelSectionFacadeCached.php b/Services/Facades/ModelSectionFacadeCached.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Prokl\BitrixModelBundle\Services\Facades;
+
+use Prokl\FacadeBundle\Services\AbstractFacade;
+
+/**
+ * Class ModelSectionFacadeCached
+ * @package Prokl\BitrixModelBundle\Services\Facades
+ *
+ * @since 02.05.2021
+ *
+ * @method static getModel(int $idElement)
+ * @method static getModelByIdIblock(int $iblockId)
+ * @method static getModelByCodeIblock(string $iblockType, string $iblockCode)
+ */
+class ModelSectionFacadeCached extends AbstractFacade
+{
+    /**
+     * @inheritDoc
+     */
+    protected static function getFacadeAccessor() : string
+    {
+        return 'model_bundle.factory_sections';
+    }
+}
diff --git a/Services/Factories/ModelElementFactory.php b/Services/Factories/ModelElementFactory.php
@@ -5,12 +5,8 @@
 use Arrilot\BitrixModels\Models\ElementModel;
 use CIBlockElement;
 use LogicException;
-use Prokl\BitrixModelBundle\Services\Traits\CacheTrait;
 use Prokl\BitrixModelBundle\Services\Traits\IblockTrait;
-use Psr\Cache\CacheItemInterface;
-use Psr\Cache\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\ServiceLocator;
-use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * Class ModelElementFactory
@@ -21,7 +17,6 @@
 class ModelElementFactory
 {
     use IblockTrait;
-    use CacheTrait;
 
     /**
      * @var ServiceLocator $modelLocator Сервисы, помеченные в контейнере тэгом iblock.model.
@@ -33,26 +28,18 @@ class ModelElementFactory
      */
     private $blockElement;
 
-    /**
-     * @var CacheInterface $cacher Кэшер.
-     */
-    private $cacher;
-
     /**
      * ModelElementFactory constructor.
      *
      * @param ServiceLocator $locator      Сервисы, помеченные в контейнере тэгом iblock.model.
      * @param CIBlockElement $blockElement Битриксовый CIBlockElement.
-     * @param CacheInterface $cacher       Кэшер.
      */
     public function __construct(
         ServiceLocator $locator,
-        CIBlockElement $blockElement,
-        CacheInterface $cacher
+        CIBlockElement $blockElement
     ) {
         $this->modelLocator = $locator;
         $this->blockElement = $blockElement;
-        $this->cacher = $cacher;
     }
 
     /**
@@ -70,32 +57,6 @@ public function getModel(int $idElement) : ElementModel
         return $this->getModelByIdIblock($iblockId);
     }
 
-    /**
-     * Модель по ID элемента. С использованием кэша.
-     *
-     * @param integer $idElement ID элемента.
-     *
-     * @return ElementModel
-     * @throws LogicException|InvalidArgumentException
-     */
-    public function getModelCached(int $idElement) : ElementModel
-    {
-        $keyCache = $this->getCacheKey(__CLASS__ . __METHOD__ . $idElement);
-
-        $iblockId = $this->cacher->get(
-            $keyCache,
-            /**
-             * @param CacheItemInterface $item
-             * @return mixed
-             */
-            function (CacheItemInterface $item) use ($idElement) {
-                return $this->getIblockId($idElement);
-            }
-        );
-
-        return $this->getModelByIdIblock($iblockId);
-    }
-
     /**
      * Модель по коду и типу инфоблока.
      *
@@ -111,32 +72,6 @@ public function getModelByCodeIblock(string $iblockType, string $iblockCode) : E
         return $this->getModelByIdIblock($iblockId);
     }
 
-    /**
-     * Модель по коду и типу инфоблока. Кэширование.
-     *
-     * @param string $iblockType Тип инфоблока.
-     * @param string $iblockCode Код инфоблока.
-     *
-     * @return ElementModel
-     * @throws InvalidArgumentException
-     */
-    public function getModelByCodeIblockCached(string $iblockType, string $iblockCode) : ElementModel
-    {
-        $keyCache = $this->getCacheKey(__CLASS__ . __METHOD__ . $iblockType . $iblockCode);
-        $iblockId = $this->cacher->get(
-            $keyCache,
-            /**
-             * @param CacheItemInterface $item
-             * @return mixed
-             */
-            function (CacheItemInterface $item) use ($iblockType, $iblockCode) {
-                return $this->getIBlockIdByCode($iblockType, $iblockCode);
-            }
-        );
-
-        return $this->getModelByIdIblock($iblockId);
-    }
-
     /**
      * Модель по ID инфоблока.
      *

diff --git a/Services/Factories/ModelElementFactoryCached.php b/Services/Factories/ModelElementFactoryCached.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Prokl\BitrixModelBundle\Services\Factories;
+
+use Prokl\CacheProxificator\CacheProxificator;
+
+/**
+ * Class ModelElementFactoryCached
+ * @package Prokl\BitrixModelBundle\Services\Factories
+ *
+ * @since 02.05.2021
+ */
+class ModelElementFactoryCached extends CacheProxificator
+{
+
+}