🧹 extract hard dependency (#132)

🧹 extract hard dependency introduce new bundle
fond-of-impala · Oct 25, 2023 · 5e0780e · 5e0780e
1 parent 646744c
commit 5e0780e
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   "require": {
     "php": ">=8.0",
     "fond-of-impala/company-price-list": "^1.0.0",
-    "fond-of-oryx/company-users-rest-api-extension": "^2.1.0",
+    "fond-of-oryx/company-users-rest-api-extension": "^2.2.0",
     "fond-of-spryker/company-user-reference": "dev-master",
     "spryker/company": "^1.4.0",
     "spryker/company-business-unit": "^1.0.0 || ^2.0.0",

diff --git a/src/FondOfImpala/Zed/CompanyUsersRestApi/CompanyUsersRestApiDependencyProvider.php b/src/FondOfImpala/Zed/CompanyUsersRestApi/CompanyUsersRestApiDependencyProvider.php
@@ -92,6 +92,11 @@ class CompanyUsersRestApiDependencyProvider extends AbstractBundleDependencyProv
      */
     public const PLUGINS_COMPANY_USER_PRE_CREATE = 'PLUGINS_COMPANY_USER_PRE_CREATE';
 
+    /**
+     * @var string
+     */
+    public const PLUGINS_COMPANY_USER_QUERY_EXPANDER = 'PLUGINS_COMPANY_USER_QUERY_EXPANDER';
+
     /**
      * @param \Spryker\Zed\Kernel\Container $container
      *
@@ -126,6 +131,7 @@ public function providePersistenceLayerDependencies(Container $container): Conta
         $container = parent::providePersistenceLayerDependencies($container);
 
         $container = $this->addCompanyRoleToCompanyUserPropelQuery($container);
+        $container = $this->addCompanyUserQueryExpanderPlugins($container);
 
         return $this->addCompanyUserPropelQuery($container);
     }
@@ -381,4 +387,28 @@ protected function getCompanyUserPreCreatePlugins(): array
     {
         return [];
     }
+
+    /**
+     * @param \Spryker\Zed\Kernel\Container $container
+     *
+     * @return \Spryker\Zed\Kernel\Container
+     */
+    public function addCompanyUserQueryExpanderPlugins(Container $container): Container
+    {
+        $self = $this;
+
+        $container[static::PLUGINS_COMPANY_USER_QUERY_EXPANDER] = static function () use ($self) {
+            return $self->getCompanyUserQueryExpanderPlugins();
+        };
+
+        return $container;
+    }
+
+    /**
+     * @return array<\FondOfOryx\Zed\CompanyUsersRestApiExtension\Dependency\Plugin\QueryExpander\CompanyUserQueryExpanderPluginInterface>
+     */
+    protected function getCompanyUserQueryExpanderPlugins(): array
+    {
+        return [];
+    }
 }
diff --git a/...ondOfImpala/Zed/CompanyUsersRestApi/Persistence/CompanyUsersRestApiPersistenceFactory.php b/...ondOfImpala/Zed/CompanyUsersRestApi/Persistence/CompanyUsersRestApiPersistenceFactory.php
@@ -5,6 +5,8 @@
 namespace FondOfImpala\Zed\CompanyUsersRestApi\Persistence;
 
 use FondOfImpala\Zed\CompanyUsersRestApi\CompanyUsersRestApiDependencyProvider;
+use FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Expander\CompanyUserQueryExpander;
+use FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Expander\CompanyUserQueryExpanderInterface;
 use FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Mapper\CompanyUserMapper;
 use FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Mapper\CompanyUserMapperInterface;
 use Orm\Zed\CompanyRole\Persistence\SpyCompanyRoleToCompanyUserQuery;
@@ -35,11 +37,27 @@ public function getCompanyRoleToCompanyUserPropelQuery(): SpyCompanyRoleToCompan
         return $this->getProvidedDependency(CompanyUsersRestApiDependencyProvider::PROPEL_QUERY_COMPANY_ROLE_TO_COMPANY_USER);
     }
 
+    /**
+     * @return array<\FondOfOryx\Zed\CompanyUsersRestApiExtension\Dependency\Plugin\QueryExpander\CompanyUserQueryExpanderPluginInterface>
+     */
+    public function getCompanyUserQueryExpanderPlugins(): array
+    {
+        return $this->getProvidedDependency(CompanyUsersRestApiDependencyProvider::PLUGINS_COMPANY_USER_QUERY_EXPANDER);
+    }
+
     /**
      * @return \FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Mapper\CompanyUserMapperInterface
      */
     public function createCompanyUserMapper(): CompanyUserMapperInterface
     {
         return new CompanyUserMapper();
     }
+
+    /**
+     * @return \FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Expander\CompanyUserQueryExpanderInterface
+     */
+    public function createCompanyUserQueryExpander(): CompanyUserQueryExpanderInterface
+    {
+        return new CompanyUserQueryExpander($this->getCompanyUserQueryExpanderPlugins());
+    }
 }
diff --git a/src/FondOfImpala/Zed/CompanyUsersRestApi/Persistence/CompanyUsersRestApiRepository.php b/src/FondOfImpala/Zed/CompanyUsersRestApi/Persistence/CompanyUsersRestApiRepository.php
@@ -33,23 +33,22 @@ class CompanyUsersRestApiRepository extends AbstractRepository implements Compan
      */
     public function findActiveCompanyUsersByCustomerReference(string $customerReference): array
     {
-        /** @var array<\Orm\Zed\CompanyUser\Persistence\Base\SpyCompanyUser> $companyUsers */
-        $companyUsers = $this->getFactory()
+        $query = $this->getFactory()
             ->getCompanyUserPropelQuery()
             ->useCustomerQuery()
-            ->filterByCustomerReference($customerReference)
-            ->endUse()
-            ->useCompanyQuery()
-            ->usePriceListQuery()
-            ->endUse()
+                ->filterByCustomerReference($customerReference)
             ->endUse()
             ->useCompanyBusinessUnitQuery()
             ->endUse()
             ->useSpyCompanyRoleToCompanyUserQuery()
-            ->useCompanyRoleQuery()
-            ->endUse()
-            ->endUse()
-            ->find();
+                ->useCompanyRoleQuery()
+                ->endUse()
+            ->endUse();
+
+        $query = $this->getFactory()->createCompanyUserQueryExpander()->expand($query);
+
+        /** @var array<\Orm\Zed\CompanyUser\Persistence\Base\SpyCompanyUser> $companyUsers */
+        $companyUsers = $query->find();
 
         $companyUserTransfers = [];
 

diff --git a/src/FondOfImpala/Zed/CompanyUsersRestApi/Persistence/Expander/CompanyUserQueryExpander.php b/src/FondOfImpala/Zed/CompanyUsersRestApi/Persistence/Expander/CompanyUserQueryExpander.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Expander;
+
+use Orm\Zed\CompanyUser\Persistence\SpyCompanyUserQuery;
+
+class CompanyUserQueryExpander implements CompanyUserQueryExpanderInterface
+{
+    /**
+     * @var \FondOfOryx\Zed\CompanyUsersRestApiExtension\Dependency\Plugin\QueryExpander\CompanyUserQueryExpanderPluginInterface[]|array
+     */
+    protected array $expanderPlugins;
+
+    /**
+     * @param array<\FondOfOryx\Zed\CompanyUsersRestApiExtension\Dependency\Plugin\QueryExpander\CompanyUserQueryExpanderPluginInterface> $expanderPlugins
+     */
+    public function __construct(array $expanderPlugins)
+    {
+        $this->expanderPlugins = $expanderPlugins;
+    }
+
+    /**
+     * @param \Orm\Zed\CompanyUser\Persistence\SpyCompanyUserQuery $companyUserQuery
+     *
+     * @return \Orm\Zed\CompanyUser\Persistence\SpyCompanyUserQuery
+     */
+    public function expand(SpyCompanyUserQuery $companyUserQuery): SpyCompanyUserQuery
+    {
+        foreach ($this->expanderPlugins as $expanderPlugin) {
+            $companyUserQuery = $expanderPlugin->expandCompanyUserQuery($companyUserQuery);
+        }
+
+        return $companyUserQuery;
+    }
+}
diff --git a/...Impala/Zed/CompanyUsersRestApi/Persistence/Expander/CompanyUserQueryExpanderInterface.php b/...Impala/Zed/CompanyUsersRestApi/Persistence/Expander/CompanyUserQueryExpanderInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace FondOfImpala\Zed\CompanyUsersRestApi\Persistence\Expander;
+
+use Orm\Zed\CompanyUser\Persistence\SpyCompanyUserQuery;
+
+interface CompanyUserQueryExpanderInterface
+{
+    /**
+     * @param \Orm\Zed\CompanyUser\Persistence\SpyCompanyUserQuery $companyUserQuery
+     *
+     * @return \Orm\Zed\CompanyUser\Persistence\SpyCompanyUserQuery
+     */
+    public function expand(SpyCompanyUserQuery $companyUserQuery): SpyCompanyUserQuery;
+}