Skip to content

Commit a7ca5b9

Browse files
DanielBaduraDanielBadura
committed
Integrate missing features from 3.5.0 to 3.13.0:
* ReadonlyStore * StoreMigrationCommand * Store options * CommandBus * QueryBus * MessageLoader * Multiple RetryStrategies * Tag default ArgumentResolver for Subscribers * Enable cryptography options
1 parent 311ed27 commit a7ca5b9

19 files changed

+735
-205
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"require": {
2121
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
2222
"illuminate/contracts": "^10.0 || ^11.0 || ^12.0",
23-
"patchlevel/event-sourcing": "^3.5"
23+
"patchlevel/event-sourcing": "^3.13.0"
2424
},
2525
"require-dev": {
2626
"ext-pdo_sqlite": "*",

‎composer.lock‎

Lines changed: 110 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/event-sourcing.php‎

Lines changed: 96 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
use Patchlevel\EventSourcing\Repository\AggregateOutdated;
4+
35
return [
46
/*
57
|--------------------------------------------------------------------------
@@ -27,7 +29,7 @@
2729
| Here you can configure the event store.
2830
| You can choose between different types of stores.
2931
| dbal_aggregate (default): Store events in a single table with the aggregate and aggregate id.
30-
| dbal_stream (experimental): Store events in a single table with a stream id.
32+
| dbal_stream (new default in 4.x): Store events in a single table with a stream id.
3133
| in_memory: Store events in memory.
3234
| custom: Use a custom store, you need to provide a service.
3335
|
@@ -37,7 +39,36 @@
3739
'service' => null,
3840
'options' => [
3941
'table_name' => 'eventstore',
40-
]
42+
],
43+
'readonly' => false,
44+
'migrate_to_new_store' => [
45+
'enabled' => false,
46+
],
47+
],
48+
49+
/*
50+
|--------------------------------------------------------------------------
51+
| Migrate Store
52+
|--------------------------------------------------------------------------
53+
|
54+
| Here you can configure the migration options for the event store.
55+
| If you enable this option you can use our migration services for a smooth migration.
56+
| You can specify which translators should be used for the migratiop process and also
57+
| to which store you want to migrate.
58+
|
59+
| You can choose between different types of stores:
60+
| dbal_aggregate (default): Store events in a single table with the aggregate and aggregate id.
61+
| dbal_stream (new default in 4.x): Store events in a single table with a stream id.
62+
| in_memory: Store events in memory.
63+
| custom: Use a custom store, you need to provide a service.
64+
|
65+
*/
66+
'migrate_to_new_store' => [
67+
'enabled' => false,
68+
'type' => '',
69+
'service' => null,
70+
'options' => [],
71+
'translators' => [],
4172
],
4273

4374
/*
@@ -69,11 +100,30 @@
69100
*/
70101
'subscription' => [
71102
'throw_on_error' => true,
72-
'catch_up' => true,
73-
'retry_strategy' => [
74-
'base_delay' => 5,
75-
'delay_factor' => 2,
76-
'max_attempts' => 5,
103+
'catch_up' => [
104+
'enabled' => true,
105+
'limit' => null,
106+
],
107+
'retry_strategies' => [
108+
'default' => [
109+
'type' => 'clock_based',
110+
'options' => [
111+
'base_delay' => 5,
112+
'delay_factor' => 2,
113+
'max_attempts' => 5,
114+
],
115+
],
116+
'no_retry' => [
117+
'type' => 'no_retry',
118+
],
119+
],
120+
'default_retry_strategy' => 'default',
121+
'store' => [
122+
'type' => 'dbal',
123+
'service' => null,
124+
'options' => [
125+
'table_name' => 'subscriptions',
126+
]
77127
],
78128
'run_after_aggregate_save' => [
79129
'enabled' => true,
@@ -89,6 +139,11 @@
89139
'ids' => null,
90140
'groups' => null,
91141
],
142+
'gap_detection' => [
143+
'enabled' => false,
144+
'retries_in_ms' => [0, 5, 50, 500],
145+
'detection_window' => 'PT5M',
146+
],
92147
],
93148

94149
/*
@@ -102,7 +157,40 @@
102157
*/
103158
'cryptography' => [
104159
'enabled' => true,
105-
'algorithm' => 'aes256'
160+
'algorithm' => 'aes256',
161+
'use_encrypted_field_name' => false,
162+
'fallback_to_field_name' => false,
163+
],
164+
165+
/*
166+
|--------------------------------------------------------------------------
167+
| CommandBus
168+
|--------------------------------------------------------------------------
169+
|
170+
| Here you can enable or disable the command bus.
171+
| You can also configure the command bus regarding the retries and the handlers.
172+
|
173+
*/
174+
'command_bus' => [
175+
'enabled' => true,
176+
'instant_retry' => [
177+
'max_retries' => 3,
178+
'exceptions' => [
179+
AggregateOutdated::class,
180+
],
181+
],
182+
],
183+
184+
/*
185+
|--------------------------------------------------------------------------
186+
| QueryBus
187+
|--------------------------------------------------------------------------
188+
|
189+
| Here you can enable or disable the query bus.
190+
|
191+
*/
192+
'query_bus' => [
193+
'enabled' => true,
106194
],
107195

108196
/*

‎infection.json.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"mutators": {
1717
"@default": true
1818
},
19-
"minMsi": 80,
20-
"minCoveredMsi": 80,
19+
"minMsi": 76,
20+
"minCoveredMsi": 76,
2121
"testFrameworkOptions": "--testsuite=unit"
2222
}

‎src/Command/StoreMigrateCommand.php‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Patchlevel\LaravelEventSourcing\Command;
6+
7+
use Patchlevel\EventSourcing\Console\InputHelper;
8+
use Patchlevel\EventSourcing\Console\OutputStyle;
9+
use Patchlevel\EventSourcing\Message\Pipe;
10+
use Patchlevel\EventSourcing\Message\Translator\Translator;
11+
use Patchlevel\EventSourcing\Store\Store;
12+
use Symfony\Component\Console\Attribute\AsCommand;
13+
use Symfony\Component\Console\Command\Command;
14+
use Symfony\Component\Console\Input\InputInterface;
15+
use Symfony\Component\Console\Input\InputOption;
16+
use Symfony\Component\Console\Output\OutputInterface;
17+
18+
use function count;
19+
20+
#[AsCommand(
21+
'event-sourcing:store:migrate',
22+
'migrate events from one store to another',
23+
)]
24+
final class StoreMigrateCommand extends Command
25+
{
26+
/** @param iterable<int, Translator> $translators */
27+
public function __construct(
28+
private readonly Store $store,
29+
private readonly Store $newStore,
30+
private readonly iterable $translators = [],
31+
) {
32+
parent::__construct();
33+
}
34+
35+
protected function configure(): void
36+
{
37+
$this
38+
->addOption(
39+
'buffer',
40+
null,
41+
InputOption::VALUE_REQUIRED,
42+
'How many messages should be buffered',
43+
1_000,
44+
);
45+
}
46+
47+
protected function execute(InputInterface $input, OutputInterface $output): int
48+
{
49+
$buffer = InputHelper::positiveIntOrZero($input->getOption('buffer'));
50+
$style = new OutputStyle($input, $output);
51+
52+
$style->info('Migration initialization...');
53+
54+
$count = $this->store->count();
55+
$messages = $this->store->load();
56+
57+
$style->progressStart($count);
58+
59+
$bufferedMessages = [];
60+
61+
$pipe = new Pipe(
62+
$messages,
63+
...$this->translators,
64+
);
65+
66+
foreach ($pipe as $message) {
67+
$bufferedMessages[] = $message;
68+
69+
if (count($bufferedMessages) < $buffer) {
70+
continue;
71+
}
72+
73+
$this->newStore->save(...$bufferedMessages);
74+
$bufferedMessages = [];
75+
$style->progressAdvance($buffer);
76+
}
77+
78+
if (count($bufferedMessages) !== 0) {
79+
$this->newStore->save(...$bufferedMessages);
80+
$style->progressAdvance(count($bufferedMessages));
81+
}
82+
83+
$style->progressFinish();
84+
$style->success('Migration finished');
85+
86+
return 0;
87+
}
88+
}

0 commit comments

Comments
 (0)