-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into performance-improvement-canonicals
- Loading branch information
Showing
24 changed files
with
770 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace CultuurNet\UDB3\Console\Command; | ||
|
|
||
| use CultuurNet\UDB3\Event\Productions\ProductionId; | ||
| use CultuurNet\UDB3\Event\Productions\RemoveEventsFromProduction; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
|
|
||
| final class BulkRemoveFromProduction extends AbstractCommand | ||
| { | ||
| protected function configure(): void | ||
| { | ||
| $this->setName('event:bulk-remove-from-production') | ||
| ->setDescription('Bulk removes events from a production') | ||
| ->addArgument( | ||
| 'productionId', | ||
| InputOption::VALUE_REQUIRED, | ||
| 'The id of the production contains incorrect events.' | ||
| ) | ||
| ->addOption( | ||
| 'eventId', | ||
| null, | ||
| InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, | ||
| 'An array of eventIds to remove from the production.' | ||
| ); | ||
| } | ||
|
|
||
| protected function execute(InputInterface $input, OutputInterface $output): int | ||
| { | ||
| $eventIds = $input->getOption('eventId'); | ||
| $productionId = $input->getArgument('productionId'); | ||
|
|
||
| $this->commandBus->dispatch( | ||
| new RemoveEventsFromProduction( | ||
| $eventIds, | ||
| ProductionId::fromNative($productionId) | ||
| ) | ||
| ); | ||
|
|
||
| $output->writeln(count($eventIds) . ' events were removed from production with id ' . $productionId); | ||
|
|
||
| return 0; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace CultuurNet\UDB3\Console\Command; | ||
|
|
||
| use Broadway\CommandHandling\CommandBus; | ||
| use CultuurNet\UDB3\Event\Commands\UpdateLocation; | ||
| use CultuurNet\UDB3\Event\ValueObjects\LocationId; | ||
| use CultuurNet\UDB3\Search\ResultsGenerator; | ||
| use CultuurNet\UDB3\Search\ResultsGeneratorInterface; | ||
| use CultuurNet\UDB3\Search\SearchServiceInterface; | ||
| use CultuurNet\UDB3\Search\Sorting; | ||
| use Exception; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
| use Symfony\Component\Console\Question\ConfirmationQuestion; | ||
|
|
||
| /** | ||
| * @url https://jira.publiq.be/browse/III-6228 | ||
| */ | ||
| class MoveEvents extends AbstractCommand | ||
| { | ||
| private const PLACE_UUID = 'place-uuid'; | ||
| private const QUERY = 'query'; | ||
| private const FORCE = 'force'; | ||
| private const DRY_RUN = 'dry-run'; | ||
|
|
||
| private ResultsGeneratorInterface $searchResultsGenerator; | ||
|
|
||
| public function __construct( | ||
| CommandBus $commandBus, | ||
| SearchServiceInterface $searchService | ||
| ) { | ||
| parent::__construct($commandBus); | ||
| $this->searchResultsGenerator = new ResultsGenerator( | ||
| $searchService, | ||
| new Sorting('created', 'asc'), | ||
| 100 | ||
| ); | ||
| } | ||
|
|
||
| public function configure(): void | ||
| { | ||
| $this | ||
| ->setName('event:move') | ||
| ->setDescription('Update the location of all events from the given SAPI3 query to the given new location') | ||
| ->addArgument( | ||
| self::PLACE_UUID, | ||
| null, | ||
| 'Place uuid to move events to.' | ||
| ) | ||
| ->addArgument( | ||
| self::QUERY, | ||
| null, | ||
| 'SAPI3 query for which events to move.' | ||
| ) | ||
| ->addOption( | ||
| self::FORCE, | ||
| null, | ||
| InputOption::VALUE_NONE, | ||
| 'Skip confirmation.' | ||
| ) | ||
| ->addOption( | ||
| self::DRY_RUN, | ||
| null, | ||
| InputOption::VALUE_NONE, | ||
| 'Execute the script as a dry run.' | ||
| ); | ||
| } | ||
|
|
||
| protected function execute(InputInterface $input, OutputInterface $output): ?int | ||
| { | ||
| $placeUuid = $input->getArgument(self::PLACE_UUID); | ||
| $query = $input->getArgument(self::QUERY); | ||
|
|
||
| if ($placeUuid === null || $query === null) { | ||
| $output->writeln('<error>Missing argument, the correct syntax is: event:move "place_uuid_to_move_to" "sapi3_query"</error>'); | ||
| return self::FAILURE; | ||
| } | ||
|
|
||
| $query = str_replace('q=', '', $query); | ||
|
|
||
| $count = $this->searchResultsGenerator->count($query); | ||
|
|
||
| if ($count <= 0) { | ||
| $output->writeln('<error>No events found</error>'); | ||
| return self::SUCCESS; | ||
| } | ||
|
|
||
| if (!$this->askConfirmation($input, $output, $count)) { | ||
| return self::SUCCESS; | ||
| } | ||
|
|
||
| foreach ($this->searchResultsGenerator->search($query) as $event) { | ||
| try { | ||
| $command = new UpdateLocation($event->getId(), new LocationId($placeUuid)); | ||
| $output->writeln('Dispatching UpdateLocation for event with id ' . $command->getItemId()); | ||
|
|
||
| if (!$input->getOption(self::DRY_RUN)) { | ||
| $this->commandBus->dispatch($command); | ||
| } | ||
| } catch (Exception $exception) { | ||
| $output->writeln(sprintf('<error>Event with id: %s caused an exception: %s</error>', $event->getId(), $exception->getMessage())); | ||
| } | ||
| } | ||
|
|
||
| return self::SUCCESS; | ||
| } | ||
|
|
||
| private function askConfirmation(InputInterface $input, OutputInterface $output, int $count): bool | ||
| { | ||
| if ($input->getOption(self::FORCE)) { | ||
| return true; | ||
| } | ||
|
|
||
| return $this | ||
| ->getHelper('question') | ||
| ->ask( | ||
| $input, | ||
| $output, | ||
| new ConfirmationQuestion( | ||
| sprintf('This action will move %d events, continue? [y/N] ', $count), | ||
| true | ||
| ) | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace CultuurNet\UDB3\Migrations; | ||
|
|
||
| use Doctrine\DBAL\Schema\Schema; | ||
| use Doctrine\DBAL\Types\Type; | ||
| use Doctrine\DBAL\Types\Types; | ||
| use Doctrine\Migrations\AbstractMigration; | ||
|
|
||
| final class Version20240718143512 extends AbstractMigration | ||
| { | ||
| public function up(Schema $schema): void | ||
| { | ||
| $table = $schema->getTable('duplicate_places'); | ||
|
|
||
| $table->changeColumn( | ||
| 'cluster_id', | ||
| [ | ||
| 'type' => Type::getType(Types::STRING), | ||
| 'length' => 40, //SHA1 length | ||
| ] | ||
| ); | ||
|
|
||
| $table->addColumn('created_date', Types::DATETIME_IMMUTABLE); | ||
|
|
||
| $table->addColumn( | ||
| 'processed', | ||
| Types::BOOLEAN, | ||
| ['default' => false] | ||
| ) | ||
| ->setNotnull(true); | ||
| } | ||
|
|
||
| public function down(Schema $schema): void | ||
| { | ||
| $table = $schema->getTable('duplicate_places'); | ||
|
|
||
| $table->dropColumn('created_date'); | ||
| $table->dropColumn('processed'); | ||
|
|
||
| $table->changeColumn( | ||
| 'cluster_id', | ||
| [ | ||
| 'type' => Type::getType(Types::BIGINT), | ||
| 'length' => 40, //SHA1 length | ||
| ] | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.