From 9768356da1c92b45c919a7f7a38b1472869f42c8 Mon Sep 17 00:00:00 2001 From: Miljenko Muha Date: Mon, 24 Feb 2025 18:19:14 +0100 Subject: [PATCH 1/5] NGAIPLAY-54 added sync and netgen_ibexa_search_extra_asynchronous_indexing handlers instead of only one --- .../common/asynchronous_indexing/content.yaml | 103 +++++++++++-- .../asynchronous_indexing/location.yaml | 121 ++++++++++++--- .../asynchronous_indexing/object_state.yaml | 17 ++- .../common/asynchronous_indexing/section.yaml | 15 +- .../common/asynchronous_indexing/trash.yaml | 25 +++- .../common/asynchronous_indexing/user.yaml | 138 +++++++++++++++--- 6 files changed, 359 insertions(+), 60 deletions(-) diff --git a/lib/Resources/config/search/common/asynchronous_indexing/content.yaml b/lib/Resources/config/search/common/asynchronous_indexing/content.yaml index ea303fb8..bc8bc8e9 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/content.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/content.yaml @@ -1,60 +1,135 @@ services: - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\CopyContentHandler: + netgen.search_extra.message_handler.copy_content: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\CopyContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\DeleteContentHandler: + netgen.search_extra.message_handler.copy_content_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\CopyContentHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: sync } + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.delete_content: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\DeleteContentHandler + arguments: + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} + + netgen.search_extra.message_handler.delete_content_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\DeleteContentHandler arguments: - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\DeleteTranslationHandler: + + netgen.search_extra.message_handler.delete_translation: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\DeleteTranslationHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.delete_translation_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\DeleteTranslationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync} - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\HideContentHandler: + netgen.search_extra.message_handler.hide_content: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\HideContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\PublishVersionHandler: + netgen.search_extra.message_handler.hide_content_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\HideContentHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.publish_version: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\PublishVersionHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.publish_version_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\PublishVersionHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\RevealContentHandler: + netgen.search_extra.message_handler.reveal_content: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\RevealContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + + netgen.search_extra.message_handler.reveal_content_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\RevealContentHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.update_content: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\UpdateContentMetadataHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\UpdateContentMetadataHandler: + netgen.search_extra.message_handler.update_content_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\UpdateContentMetadataHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/location.yaml b/lib/Resources/config/search/common/asynchronous_indexing/location.yaml index 287eb478..bfc4e058 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/location.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/location.yaml @@ -1,67 +1,152 @@ services: - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\AssignSectionToSubtreeHandler: + netgen.search_extra.message_handler.location_assign_section_to_subtree: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\AssignSectionToSubtreeHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CopySubtreeHandler: + netgen.search_extra.message_handler.location_assign_section_to_subtree_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\AssignSectionToSubtreeHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CreateLocationHandler: + netgen.search_extra.message_handler.location_copy_subtree: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CopySubtreeHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + + netgen.search_extra.message_handler.location_copy_subtree_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CopySubtreeHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.create_location: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CreateLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\DeleteLocationHandler: + netgen.search_extra.message_handler.create_location_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CreateLocationHandler arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' + - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } + - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\HideLocationHandler: + netgen.search_extra.message_handler.delete_location: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\DeleteLocationHandler + arguments: + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} + + netgen.search_extra.message_handler.delete_location_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\DeleteLocationHandler + arguments: + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.hide_location: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\HideLocationHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} + + netgen.search_extra.message_handler.hide_location_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\HideLocationHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\MoveSubtreeHandler: + netgen.search_extra.message_handler.location_move_subtree: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\MoveSubtreeHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\SwapLocationHandler: + netgen.search_extra.message_handler.location_move_subtree_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\MoveSubtreeHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.swap_location: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\SwapLocationHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.swap_location_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\SwapLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UnhideLocationHandler: + netgen.search_extra.message_handler.unhide_location: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UnhideLocationHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + + netgen.search_extra.message_handler.unhide_location_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UnhideLocationHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.update_location: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UpdateLocationHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UpdateLocationHandler: + netgen.search_extra.message_handler.update_location_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UpdateLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/object_state.yaml b/lib/Resources/config/search/common/asynchronous_indexing/object_state.yaml index b0b32e7c..bf902d2a 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/object_state.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/object_state.yaml @@ -1,10 +1,23 @@ services: - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ObjectState\SetContentStateHandler: + netgen.search_extra.message_handler.set_content_state: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ObjectState\SetContentStateHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } + + + netgen.search_extra.message_handler.set_content_state_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ObjectState\SetContentStateHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/section.yaml b/lib/Resources/config/search/common/asynchronous_indexing/section.yaml index 8a7c330e..4115c130 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/section.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/section.yaml @@ -1,9 +1,20 @@ services: - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Section\AssignSectionHandler: + netgen.search_extra.message_handler.assign_section: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Section\AssignSectionHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.assign_section_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Section\AssignSectionHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml b/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml index fc3d7813..b221b9e7 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml @@ -1,13 +1,30 @@ services: - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\RecoverHandler: + netgen.search_extra.message_handler.recover_trash: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\RecoverHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\TrashHandler: + netgen.search_extra.message_handler.recover_trash_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\RecoverHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.trash: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\TrashHandler + arguments: + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + + netgen.search_extra.message_handler.trash_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\TrashHandler arguments: - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml index ca054664..1b618111 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml @@ -1,77 +1,175 @@ services: - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\AssignUserToUserGroupHandler: + netgen.search_extra.message_handler.assign_user_to_group: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\AssignUserToUserGroupHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\BeforeUnAssignUserFromUserGroupHandler: + netgen.search_extra.message_handler.assign_user_to_group_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\AssignUserToUserGroupHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.before_unassign_user_from_group: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\BeforeUnAssignUserFromUserGroupHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\CreateUserGroupHandler: + netgen.search_extra.message_handler.before_unassign_user_from_group_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\BeforeUnAssignUserFromUserGroupHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.create_user_group: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\CreateUserGroupHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\CreateUserHandler: + netgen.search_extra.message_handler.create_user_group_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\CreateUserGroupHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: sync } + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.create_user: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\CreateUserHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.create_user_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\CreateUserHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserGroupHandler: + netgen.search_extra.message_handler.delete_user_group: + class:Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserGroupHandler: arguments: - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserHandler: + netgen.search_extra.message_handler.delete_user_group_sync: + class:Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserGroupHandler: arguments: - '@ibexa.spi.search' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, , from_transport: sync } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\MoveUserGroupHandler: + netgen.search_extra.message_handler.delete_user: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserHandler + arguments: + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + + netgen.search_extra.message_handler.delete_user_sync: + class: + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserHandler + arguments: + - '@ibexa.spi.search' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.move_user_group: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\MoveUserGroupHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + + netgen.search_extra.message_handler.move_user_group_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\MoveUserGroupHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UnAssignUserFromUserGroupHandler: + netgen.search_extra.message_handler.unassign_user_from_user_group: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UnAssignUserFromUserGroupHandler arguments: - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + + netgen.search_extra.message_handler.unassign_user_from_user_group_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UnAssignUserFromUserGroupHandler + arguments: + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' + tags: + - { name: messenger.message_handler, from_transport: sync } + + netgen.search_extra.message_handler.update_user_group: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UpdateUserGroupHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } + - { name: monolog.logger, channel: ngsearchextra } + + netgen.search_extra.message_handler.update_user_group_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UpdateUserGroupHandler + arguments: + - '@Ibexa\Contracts\Core\Persistence\Content\Handler' + - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' + - '@ibexa.spi.search' + - '@?logger' + tags: + - { name: messenger.message_handler, from_transport: sync } + - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UpdateUserGroupHandler: + netgen.search_extra.message_handler.update_user: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UpdateUserHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UpdateUserHandler: + netgen.search_extra.message_handler.update_user_sync: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UpdateUserHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@ibexa.spi.search' - '@?logger' tags: - - { name: messenger.message_handler } + - { name: messenger.message_handler, from_transport: sync } - { name: monolog.logger, channel: ngsearchextra } From 124ea790a68327d912decb4c9c651709f933974a Mon Sep 17 00:00:00 2001 From: Miljenko Muha Date: Mon, 24 Feb 2025 18:34:21 +0100 Subject: [PATCH 2/5] NGAIPLAY-54 removed event mappings, added instructions to add them to project --- README.md | 42 ++++++++++++++++++++++++++ bundle/Resources/config/messenger.yaml | 31 ------------------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 6d597a9c..da72a41a 100644 --- a/README.md +++ b/README.md @@ -99,12 +99,14 @@ for more details on specific ones. ## Installation +### 1. To install Ibexa Search Extra first add it as a dependency to your project: ```sh composer require netgen/ibexa-search-extra:^3.0 ``` +### 2. Once the added dependency is installed, activate the bundle in `config/bundles.php` file by adding it to the returned array, together with other required bundles: ```php @@ -116,3 +118,43 @@ return [ Netgen\Bundle\IbexaSearchExtraBundle\NetgenIbexaSearchExtraBundle::class => ['all' => true], } ``` + + +### 3. +Routing needs to be setup in project. It maps message to the queue/queues it needs to go in. +If you want async indexing for all events, just add this routing: + +```yaml +messenger: + routing: + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\CopyContent': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteContent': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteTranslation': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\HideContent': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\PublishVersion': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\RevealContent': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\UpdateContentMetadata': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\AssignSectionToSubtree': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CopySubtree': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CreateLocation': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\DeleteLocation': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\HideLocation': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\MoveSubtree': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\SwapLocation': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UnhideLocation': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UpdateLocation': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\ObjectState\SetContentState': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Section\AssignSection': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Recover': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Trash': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\AssignUserToUserGroup': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\BeforeUnAssignUserFromUserGroup': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\CreateUserGroup': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\CreateUser': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\DeleteUserGroup': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\DeleteUser': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\MoveUserGroup': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\UnAssignUserFromUserGroup': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\UpdateUserGroup': netgen_ibexa_search_extra_asynchronous_indexing + 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\UpdateUser': netgen_ibexa_search_extra_asynchronous_indexing +``` \ No newline at end of file diff --git a/bundle/Resources/config/messenger.yaml b/bundle/Resources/config/messenger.yaml index cf818449..774c1ed5 100644 --- a/bundle/Resources/config/messenger.yaml +++ b/bundle/Resources/config/messenger.yaml @@ -12,37 +12,6 @@ messenger: redeliver_timeout: 300 queue_name: netgen_ibexa_search_extra_asynchronous_indexing netgen_ibexa_search_extra_asynchronous_indexing_failed: "doctrine://default?queue_name=netgen_ibexa_search_extra_asynchronous_indexing_failed" - routing: - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\CopyContent': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteContent': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteTranslation': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\HideContent': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\PublishVersion': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\RevealContent': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\UpdateContentMetadata': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\AssignSectionToSubtree': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CopySubtree': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CreateLocation': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\DeleteLocation': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\HideLocation': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\MoveSubtree': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\SwapLocation': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UnhideLocation': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UpdateLocation': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\ObjectState\SetContentState': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Section\AssignSection': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Recover': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Trash': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\AssignUserToUserGroup': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\BeforeUnAssignUserFromUserGroup': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\CreateUserGroup': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\CreateUser': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\DeleteUserGroup': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\DeleteUser': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\MoveUserGroup': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\UnAssignUserFromUserGroup': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\UpdateUserGroup': netgen_ibexa_search_extra_asynchronous_indexing - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\UpdateUser': netgen_ibexa_search_extra_asynchronous_indexing default_bus: messenger.bus.default buses: messenger.bus.default: ~ From 8004573801d096a9be31f2640ac8e021cb7cc06f Mon Sep 17 00:00:00 2001 From: Miljenko Muha Date: Mon, 3 Mar 2025 16:58:40 +0100 Subject: [PATCH 3/5] NGAIPLAY-54 remover typo with : in config --- .../config/search/common/asynchronous_indexing/user.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml index 1b618111..9b52a9c3 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml @@ -72,14 +72,14 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.search_extra.message_handler.delete_user_group: - class:Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserGroupHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserGroupHandler arguments: - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } netgen.search_extra.message_handler.delete_user_group_sync: - class:Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserGroupHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\DeleteUserGroupHandler arguments: - '@ibexa.spi.search' tags: From ddeb070c602d83bc85a94613067ae95c0180a952 Mon Sep 17 00:00:00 2001 From: Miljenko Muha Date: Mon, 3 Mar 2025 17:58:53 +0100 Subject: [PATCH 4/5] NGAIPLAY-54 changes names of common services from class names to service name --- .../common/asynchronous_indexing/common.yaml | 6 ++++-- .../common/asynchronous_indexing/content.yaml | 8 ++++---- .../asynchronous_indexing/location.yaml | 20 +++++++++---------- .../common/asynchronous_indexing/trash.yaml | 4 ++-- .../common/asynchronous_indexing/user.yaml | 12 +++++------ 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/lib/Resources/config/search/common/asynchronous_indexing/common.yaml b/lib/Resources/config/search/common/asynchronous_indexing/common.yaml index b02b4075..ad925007 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/common.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/common.yaml @@ -1,5 +1,6 @@ services: - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer: + netgen.search_extra.message_handler.subtree_index: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' @@ -8,7 +9,8 @@ services: tags: - { name: monolog.logger, channel: ngsearchextra } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer: + netgen.search_extra.message_handler.user_content_with_location_indexer: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' diff --git a/lib/Resources/config/search/common/asynchronous_indexing/content.yaml b/lib/Resources/config/search/common/asynchronous_indexing/content.yaml index bc8bc8e9..4c0ca62c 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/content.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/content.yaml @@ -62,7 +62,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\HideContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} @@ -70,7 +70,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\HideContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } @@ -100,7 +100,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\RevealContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -108,7 +108,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\RevealContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/location.yaml b/lib/Resources/config/search/common/asynchronous_indexing/location.yaml index bfc4e058..fe42a5b5 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/location.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/location.yaml @@ -2,28 +2,28 @@ services: netgen.search_extra.message_handler.location_assign_section_to_subtree: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\AssignSectionToSubtreeHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } netgen.search_extra.message_handler.location_assign_section_to_subtree_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\AssignSectionToSubtreeHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } netgen.search_extra.message_handler.location_copy_subtree: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CopySubtreeHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } netgen.search_extra.message_handler.location_copy_subtree_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CopySubtreeHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } @@ -66,28 +66,28 @@ services: netgen.search_extra.message_handler.hide_location: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\HideLocationHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} netgen.search_extra.message_handler.hide_location_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\HideLocationHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } netgen.search_extra.message_handler.location_move_subtree: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\MoveSubtreeHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } netgen.search_extra.message_handler.location_move_subtree_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\MoveSubtreeHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } @@ -116,7 +116,7 @@ services: netgen.search_extra.message_handler.unhide_location: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UnhideLocationHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -124,7 +124,7 @@ services: netgen.search_extra.message_handler.unhide_location_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UnhideLocationHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: sync } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml b/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml index b221b9e7..7fe7ba54 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml @@ -2,7 +2,7 @@ services: netgen.search_extra.message_handler.recover_trash: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\RecoverHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -10,7 +10,7 @@ services: netgen.search_extra.message_handler.recover_trash_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\RecoverHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: sync } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml index 9b52a9c3..19e370c6 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml @@ -2,14 +2,14 @@ services: netgen.search_extra.message_handler.assign_user_to_group: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\AssignUserToUserGroupHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' + - '@netgen.search_extra.message_handler.user_content_with_location_indexer' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } netgen.search_extra.message_handler.assign_user_to_group_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\AssignUserToUserGroupHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' + - '@netgen.search_extra.message_handler.user_content_with_location_indexer' tags: - { name: messenger.message_handler, from_transport: sync } @@ -104,7 +104,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\MoveUserGroupHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - 'netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -112,21 +112,21 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\MoveUserGroupHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\SubtreeIndexer' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } netgen.search_extra.message_handler.unassign_user_from_user_group: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UnAssignUserFromUserGroupHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' + - '@netgen.search_extra.message_handler.user_content_with_location_indexer' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } netgen.search_extra.message_handler.unassign_user_from_user_group_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UnAssignUserFromUserGroupHandler arguments: - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\UserContentWithLocationIndexer' + - '@netgen.search_extra.message_handler.user_content_with_location_indexer' tags: - { name: messenger.message_handler, from_transport: sync } From b729c56487a9b8ea1e4af4b045bb04110d517937 Mon Sep 17 00:00:00 2001 From: Miljenko Muha Date: Tue, 20 May 2025 14:26:38 +0200 Subject: [PATCH 5/5] NGAIPLAY-54 added @ where missing in yaml files --- .../search/common/asynchronous_indexing/content.yaml | 8 ++++---- .../common/asynchronous_indexing/location.yaml | 12 ++++++------ .../search/common/asynchronous_indexing/trash.yaml | 4 ++-- .../search/common/asynchronous_indexing/user.yaml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/Resources/config/search/common/asynchronous_indexing/content.yaml b/lib/Resources/config/search/common/asynchronous_indexing/content.yaml index 4c0ca62c..cafe00bb 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/content.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/content.yaml @@ -62,7 +62,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\HideContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing} @@ -70,7 +70,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\HideContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } @@ -100,7 +100,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\RevealContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -108,7 +108,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Content\RevealContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/location.yaml b/lib/Resources/config/search/common/asynchronous_indexing/location.yaml index fe42a5b5..20e4bd7f 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/location.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/location.yaml @@ -16,14 +16,14 @@ services: netgen.search_extra.message_handler.location_copy_subtree: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CopySubtreeHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } netgen.search_extra.message_handler.location_copy_subtree_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\CopySubtreeHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } @@ -73,14 +73,14 @@ services: netgen.search_extra.message_handler.hide_location_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\HideLocationHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: sync } netgen.search_extra.message_handler.location_move_subtree: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\MoveSubtreeHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -116,7 +116,7 @@ services: netgen.search_extra.message_handler.unhide_location: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UnhideLocationHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -124,7 +124,7 @@ services: netgen.search_extra.message_handler.unhide_location_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Location\UnhideLocationHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: sync } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml b/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml index 7fe7ba54..cb69eaf2 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/trash.yaml @@ -2,7 +2,7 @@ services: netgen.search_extra.message_handler.recover_trash: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\RecoverHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing } @@ -10,7 +10,7 @@ services: netgen.search_extra.message_handler.recover_trash_sync: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\Trash\RecoverHandler arguments: - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' - '@ibexa.spi.search' tags: - { name: messenger.message_handler, from_transport: sync } diff --git a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml index 19e370c6..62c25574 100644 --- a/lib/Resources/config/search/common/asynchronous_indexing/user.yaml +++ b/lib/Resources/config/search/common/asynchronous_indexing/user.yaml @@ -104,7 +104,7 @@ services: class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\MoveUserGroupHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - - 'netgen.search_extra.message_handler.subtree_index' + - '@netgen.search_extra.message_handler.subtree_index' tags: - { name: messenger.message_handler, from_transport: netgen_ibexa_search_extra_asynchronous_indexing }