[shopsys] product recalculation and export is now done by queue (#2917)

shopsys · Dec 19, 2023 · 932079f · 932079f
2 parents a1ed3c0 + 443e732
commit 932079f
Show file tree

Hide file tree

Showing 124 changed files with 847 additions and 3,673 deletions.
diff --git a/app/.env.test b/app/.env.test
@@ -3,6 +3,7 @@
 DATABASE_NAME=shopsys-test
 
 MAILER_DSN=null://null
+MESSENGER_TRANSPORT_DSN=in-memory://
 
 GOPAY_IS_PRODUCTION_MODE=false
 GOPAY_EN_GOID=test-data

diff --git a/app/config/cron.yaml b/app/config/cron.yaml
@@ -73,25 +73,9 @@ services:
 
     # Products
 
-    Shopsys\FrameworkBundle\Model\Product\Pricing\ProductPriceCronModule:
+    Shopsys\FrameworkBundle\Model\Product\Elasticsearch\ProductRecalculationCronModule:
         tags:
-            - { name: shopsys.cron, hours: '*', minutes: '*', instanceName: products, readableName: 'Recalculate product prices' }
-
-    Shopsys\FrameworkBundle\Model\Product\ProductVisibilityImmediateCronModule:
-        tags:
-            - { name: shopsys.cron, hours: '*', minutes: '*', instanceName: products, readableName: 'Recalculate immediate product visibilities' }
-
-    Shopsys\FrameworkBundle\Model\Product\ProductVisibilityMidnightCronModule:
-        tags:
-            - { name: shopsys.cron, hours: '0', minutes: '0', instanceName: products, readableName: 'Recalculate midnight product visibilities' }
-
-    App\Model\Product\Elasticsearch\ProductExportCronModule:
-        tags:
-            - { name: shopsys.cron, hours: '0', minutes: '0', instanceName: products, readableName: "Export products to Elasticsearch" }
-
-    App\Model\Product\Elasticsearch\ProductExportChangedCronModule:
-        tags:
-            - { name: shopsys.cron, hours: '*', minutes: '*', instanceName: products, readableName: "Export changed products to Elasticsearch" }
+            - { name: shopsys.cron, hours: '0', minutes: '0', instanceName: products, readableName: "Dispatches all products to be recalculated and exported" }
 
     # Akeneo import products
 

diff --git a/app/config/packages/messenger.yaml b/app/config/packages/messenger.yaml
@@ -6,15 +6,15 @@ framework:
                 middleware:
                     - 'Shopsys\FrameworkBundle\Component\Messenger\DelayedEnvelope\DelayEnvelopeMiddleware'
         transports:
-            example_transport:
+            product_recalculation:
                 dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
                 options:
                     vhost: '%env(MESSENGER_TRANSPORT_VHOST)%'
                     exchange:
-                        name: example_exchange
+                        name: product_recalculation
                         type: direct
                     queues:
-                        example_queue: ~
+                        product_recalculation: ~
             placed_order_transport:
                 dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
                 options:
@@ -30,5 +30,6 @@ framework:
                     multiplier: 5
 
         routing:
-            Shopsys\FrameworkBundle\Component\Messenger\ExampleMessage: example_transport
+            Shopsys\FrameworkBundle\Model\Product\Recalculation\ProductRecalculationMessage: product_recalculation
+            Shopsys\FrameworkBundle\Model\Product\Recalculation\DispatchAllProductsMessage: product_recalculation
             Shopsys\FrameworkBundle\Model\Order\Messenger\PlacedOrderMessage: placed_order_transport
diff --git a/app/config/services.yaml b/app/config/services.yaml
@@ -299,18 +299,12 @@ services:
     Shopsys\FrameworkBundle\Model\Product\ProductRepository:
         alias: App\Model\Product\ProductRepository
 
-    Shopsys\FrameworkBundle\Model\Product\ProductHiddenRecalculator:
-        alias: App\Model\Product\ProductHiddenRecalculator
-
     Shopsys\FrameworkBundle\Model\Product\ProductSellingDeniedRecalculator:
         alias: App\Model\Product\ProductSellingDeniedRecalculator
 
     Shopsys\FrameworkBundle\Model\Product\Availability\AvailabilityRepository:
         alias: App\Model\Product\Availability\AvailabilityRepository
 
-    Shopsys\FrameworkBundle\Model\Product\Availability\AvailabilityFacade:
-        alias: App\Model\Product\Availability\AvailabilityFacade
-
     Shopsys\FrameworkBundle\Model\Product\Brand\BrandFacade:
         alias: App\Model\Product\Brand\BrandFacade
 
@@ -495,21 +489,12 @@ services:
     Shopsys\FrameworkBundle\Model\Product\ProductBreadcrumbGenerator:
         alias: App\Model\Product\ProductBreadcrumbGenerator
 
-    Shopsys\FrameworkBundle\Model\Product\ProductVisibilityFacade:
-        class: App\Model\Product\ProductVisibilityFacade
-        tags:
-            # must be ran after CategoryVisibilityRepository and ProductPriceRecalculator
-            - { name: kernel.event_listener, event: kernel.response, method: onKernelResponse, priority: 10 }
-
     Shopsys\FrameworkBundle\Model\Product\ProductFacade:
         alias: App\Model\Product\ProductFacade
 
     Shopsys\FrameworkBundle\Model\Product\ProductFactory:
         alias: App\Model\Product\ProductFactory
 
-    Shopsys\FrameworkBundle\Model\Product\ProductVariantFacade:
-        alias: App\Model\Product\ProductVariantFacade
-
     Shopsys\FrameworkBundle\Model\Product\Elasticsearch\ProductExportRepository:
         alias: App\Model\Product\Elasticsearch\ProductExportRepository
 
@@ -525,17 +510,6 @@ services:
     Shopsys\FrameworkBundle\Model\Product\Filter\ParameterFilterChoiceRepository:
         alias: App\Model\Product\Filter\ParameterFilterChoiceRepository
 
-    Shopsys\FrameworkBundle\Model\Product\Filter\ProductFilterRepository:
-        alias: App\Model\Product\Filter\ProductFilterRepository
-
-    Shopsys\FrameworkBundle\Model\Product\ProductVisibilityRepository:
-        alias: App\Model\Product\ProductVisibilityRepository
-
-    Shopsys\FrameworkBundle\Model\Product\Availability\ProductAvailabilityCalculation:
-        alias: App\Model\Product\Availability\ProductAvailabilityCalculation
-
-    Shopsys\FrameworkBundle\Model\Product\Availability\ProductAvailabilityRecalculator: ~
-
     App\Model\AdvancedSearch\ProductAdvancedSearchConfig: ~
 
     Shopsys\FrameworkBundle\Model\AdvancedSearch\ProductAdvancedSearchConfig:
@@ -701,9 +675,6 @@ services:
 
     App\Model\Administrator\Mail\TwoFactorAuthenticationMail: ~
 
-    Shopsys\FrameworkBundle\Model\Product\Elasticsearch\MarkProductForExportSubscriber:
-        alias: App\Model\Product\Elasticsearch\MarkProductForExportSubscriber
-
     Shopsys\FrameworkBundle\Component\Domain\DomainAwareSecurityHeadersSetter:
         class: App\Component\Domain\DomainAwareSecurityHeadersSetter
         tags:
@@ -763,10 +734,6 @@ services:
                 - '@snc_redis.global'
                 - '@snc_redis.blog_article_export_queue'
 
-    App\Component\Redis\CleanStorefrontCacheFacade:
-        arguments:
-            $storefrontGraphqlQueryClient: '@snc_redis.storefront_graphql_query'
-
     Shopsys\FrameworkBundle\Component\Redis\RedisFacade:
         alias: App\Component\Redis\RedisFacade
 
@@ -808,13 +775,6 @@ services:
     App\FrontendApi\Component\ExpressionLanguage\DynamicPaginationComplexityExpressionFunction:
         tags: ['overblog_graphql.expression_function']
 
-    App\Model\ImageSitemap\ImageSitemapFacade:
-        arguments:
-            - '%shopsys.sitemaps_dir%'
-            - '%shopsys.sitemaps_url_prefix%'
-
-    App\Model\ImageSitemap\ImageSitemapFilePrefixer: ~
-
     App\FrontendApi\Model\Token\TokenAuthenticator: ~
 
     Shopsys\FrontendApiBundle\Model\Token\TokenAuthenticator:

diff --git a/app/deploy/deploy-project.sh b/app/deploy/deploy-project.sh
@@ -118,7 +118,7 @@ function merge() {
     # Specify consumers configuration with the default configuration in the format:
     # <consumer-name>:<transport-names-separated-by-space>:<number-of-consumers>
     DEFAULT_CONSUMERS=(
-        "example:example_transport:1"
+        "product-recalculation:product_recalculation:1"
         "placed_order:placed_order_transport:1"
     )
 

diff --git a/app/docker/php-fpm/consumer-entrypoint.sh b/app/docker/php-fpm/consumer-entrypoint.sh
@@ -3,6 +3,6 @@
 TIME_LIMIT=${1:-60}
 
 php ./bin/console messenger:consume \
-    example_transport \
+    product_recalculation \
     placed_order_transport \
     --time-limit=$TIME_LIMIT
diff --git a/app/src/Command/CleanStorefrontQueryCacheCommand.php b/app/src/Command/CleanStorefrontQueryCacheCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Command;
 
-use App\Component\Redis\CleanStorefrontCacheFacade;
+use Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -16,7 +16,7 @@
 class CleanStorefrontQueryCacheCommand extends Command
 {
     /**
-     * @param \App\Component\Redis\CleanStorefrontCacheFacade $cleanStorefrontCacheFacade
+     * @param \Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade $cleanStorefrontCacheFacade
      */
     public function __construct(
         private readonly CleanStorefrontCacheFacade $cleanStorefrontCacheFacade,

diff --git a/app/src/Component/Doctrine/OrderByCollationHelper.php b/app/src/Component/Doctrine/OrderByCollationHelper.php
diff --git a/app/src/Component/Doctrine/RemoveMappingsSubscriber.php b/app/src/Component/Doctrine/RemoveMappingsSubscriber.php
@@ -40,7 +40,6 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
                 'outOfStockAction',
                 'stockQuantity',
                 'usingStock',
-                'calculatedAvailability',
             ],
             $classMetadata,
         );

diff --git a/app/src/Component/Redis/CleanStorefrontCacheFacade.php b/app/src/Component/Redis/CleanStorefrontCacheFacade.php
diff --git a/app/src/Controller/Admin/ArticleController.php b/app/src/Controller/Admin/ArticleController.php
@@ -4,11 +4,11 @@
 
 namespace App\Controller\Admin;
 
-use App\Component\Redis\CleanStorefrontCacheFacade;
 use App\Model\Article\Article;
 use Shopsys\FrameworkBundle\Component\ConfirmDelete\ConfirmDeleteResponseFactory;
 use Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade;
 use Shopsys\FrameworkBundle\Component\Grid\GridFactory;
+use Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade;
 use Shopsys\FrameworkBundle\Controller\Admin\ArticleController as BaseArticleController;
 use Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider;
 use Shopsys\FrameworkBundle\Model\Article\ArticleDataFactoryInterface;
@@ -35,7 +35,7 @@ class ArticleController extends BaseArticleController
      * @param \Shopsys\FrameworkBundle\Component\ConfirmDelete\ConfirmDeleteResponseFactory $confirmDeleteResponseFactory
      * @param \App\Model\LegalConditions\LegalConditionsFacade $legalConditionsFacade
      * @param \Shopsys\FrameworkBundle\Model\Cookies\CookiesFacade $cookiesFacade
-     * @param \App\Component\Redis\CleanStorefrontCacheFacade $cleanStorefrontCacheFacade
+     * @param \Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade $cleanStorefrontCacheFacade
      */
     public function __construct(
         ArticleFacade $articleFacade,

diff --git a/app/src/Controller/Admin/DefaultController.php b/app/src/Controller/Admin/DefaultController.php
@@ -25,7 +25,6 @@
 
 /**
  * @property \App\Component\Setting\Setting $setting
- * @property \App\Model\Product\Availability\AvailabilityFacade $availabilityFacade
  * @property \App\Model\Mail\MailTemplateFacade $mailTemplateFacade
  * @property \App\Model\Product\Unit\UnitFacade $unitFacade
  */
@@ -37,7 +36,7 @@ class DefaultController extends BaseDefaultController
      * @param \App\Model\Mail\MailTemplateFacade $mailTemplateFacade
      * @param \App\Model\Product\Unit\UnitFacade $unitFacade
      * @param \App\Component\Setting\Setting $setting
-     * @param \App\Model\Product\Availability\AvailabilityFacade $availabilityFacade
+     * @param \Shopsys\FrameworkBundle\Model\Product\Availability\AvailabilityFacade $availabilityFacade
      * @param \Shopsys\FrameworkBundle\Component\Cron\CronModuleFacade $cronModuleFacade
      * @param \Shopsys\FrameworkBundle\Component\Grid\GridFactory $gridFactory
      * @param \Shopsys\FrameworkBundle\Component\Cron\Config\CronConfig $cronConfig

diff --git a/app/src/Controller/Admin/ProductController.php b/app/src/Controller/Admin/ProductController.php
@@ -15,11 +15,10 @@
  * @property \App\Model\Product\ProductFacade $productFacade
  * @property \App\Model\Product\ProductDataFactory $productDataFactory
  * @property \App\Component\Setting\Setting $setting
- * @property \App\Model\Product\Availability\AvailabilityFacade $availabilityFacade
  * @property \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
  * @method setSellingToUntilEndOfDay(\App\Model\Product\ProductData|null $productData)
- * @method __construct(\Shopsys\FrameworkBundle\Model\Product\MassAction\ProductMassActionFacade $productMassActionFacade, \Shopsys\FrameworkBundle\Component\Grid\GridFactory $gridFactory, \App\Model\Product\ProductFacade $productFacade, \App\Model\Product\ProductDataFactory $productDataFactory, \Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider $breadcrumbOverrider, \Shopsys\FrameworkBundle\Model\Administrator\AdministratorGridFacade $administratorGridFacade, \Shopsys\FrameworkBundle\Model\Product\Listing\ProductListAdminFacade $productListAdminFacade, \Shopsys\FrameworkBundle\Model\AdvancedSearch\AdvancedSearchProductFacade $advancedSearchProductFacade, \App\Model\Product\ProductVariantFacade $productVariantFacade, \Shopsys\FrameworkBundle\Twig\ProductExtension $productExtension, \Shopsys\FrameworkBundle\Component\Domain\Domain $domain, \App\Model\Product\Unit\UnitFacade $unitFacade, \App\Component\Setting\Setting $setting, \App\Model\Product\Availability\AvailabilityFacade $availabilityFacade)
- * @property \App\Model\Product\ProductVariantFacade $productVariantFacade
+ * @method __construct(\Shopsys\FrameworkBundle\Model\Product\MassAction\ProductMassActionFacade $productMassActionFacade, \Shopsys\FrameworkBundle\Component\Grid\GridFactory $gridFactory, \App\Model\Product\ProductFacade $productFacade, \App\Model\Product\ProductDataFactory $productDataFactory, \Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider $breadcrumbOverrider, \Shopsys\FrameworkBundle\Model\Administrator\AdministratorGridFacade $administratorGridFacade, \Shopsys\FrameworkBundle\Model\Product\Listing\ProductListAdminFacade $productListAdminFacade, \Shopsys\FrameworkBundle\Model\AdvancedSearch\AdvancedSearchProductFacade $advancedSearchProductFacade, \Shopsys\FrameworkBundle\Model\Product\ProductVariantFacade $productVariantFacade, \Shopsys\FrameworkBundle\Twig\ProductExtension $productExtension, \Shopsys\FrameworkBundle\Component\Domain\Domain $domain, \App\Model\Product\Unit\UnitFacade $unitFacade, \App\Component\Setting\Setting $setting, \Shopsys\FrameworkBundle\Model\Product\Availability\AvailabilityFacade $availabilityFacade)
+ * @property \Shopsys\FrameworkBundle\Model\Product\ProductVariantFacade $productVariantFacade
  * @property \App\Model\Product\Unit\UnitFacade $unitFacade
  */
 class ProductController extends BaseProductController

diff --git a/app/src/Controller/Admin/RedisController.php b/app/src/Controller/Admin/RedisController.php
@@ -4,7 +4,7 @@
 
 namespace App\Controller\Admin;
 
-use App\Component\Redis\CleanStorefrontCacheFacade;
+use Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade;
 use Shopsys\FrameworkBundle\Controller\Admin\AdminBaseController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -13,7 +13,7 @@
 class RedisController extends AdminBaseController
 {
     /**
-     * @param \App\Component\Redis\CleanStorefrontCacheFacade $cleanStorefrontCacheFacade
+     * @param \Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade $cleanStorefrontCacheFacade
      */
     public function __construct(
         private CleanStorefrontCacheFacade $cleanStorefrontCacheFacade,

diff --git a/app/src/DataFixtures/Demo/AvailabilityDataFixture.php b/app/src/DataFixtures/Demo/AvailabilityDataFixture.php
@@ -21,7 +21,7 @@ class AvailabilityDataFixture extends AbstractReferenceFixture
     public const AVAILABILITY_PREPARING = 'availability_preparing';
 
     /**
-     * @param \App\Model\Product\Availability\AvailabilityFacade $availabilityFacade
+     * @param \Shopsys\FrameworkBundle\Model\Product\Availability\AvailabilityFacade $availabilityFacade
      * @param \Shopsys\FrameworkBundle\Model\Product\Availability\AvailabilityDataFactory $availabilityDataFactory
      * @param \App\Component\Setting\Setting $setting
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain