Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

!!! FEATURE: Add workspaceName to relevant events #5002

Merged
merged 21 commits into from May 18, 2024
Merged

!!! FEATURE: Add workspaceName to relevant events #5002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6f3be98
WIP: FEATURE: Add `workspaceName` to relevant events
bwaidelich Apr 19, 2024
c3019e6
Merge branch '9.0' into feature/4996-add-workspacename-to-events
bwaidelich May 1, 2024
dfd1007
Merge branch '9.0' into feature/4996-add-workspacename-to-events
bwaidelich May 17, 2024
ce99c0b
Fix NodeVariationInternals
bwaidelich May 17, 2024
85d2922
Remove unused `getWorkspaceName()` from `EmbedsContentStreamAndNodeAg…
bwaidelich May 17, 2024
f4d2f41
Rename and tweak `PublishableInterface`
bwaidelich May 17, 2024
02624aa
Forward contentGraph workspace name to events
bwaidelich May 17, 2024
8140490
Fix behat tests
bwaidelich May 17, 2024
0f46361
Provide event migration
bwaidelich May 17, 2024
ded6c13
Remove unused namespace imports and add missing type annotation
bwaidelich May 17, 2024
4f3dcc5
Remove obsolete todo comment
bwaidelich May 17, 2024
d4f40e3
Fix event migration
bwaidelich May 17, 2024
b4e533d
Tweak event migration
bwaidelich May 17, 2024
7db53b6
Merge remote-tracking branch 'origin/9.0' into feature/4996-add-works…
mhsdesign May 17, 2024
f635c9e
TASK: Use `$contentGraph->getContentStreamId()` instead of from `$nod…
mhsdesign May 17, 2024
eabb990
Add workspaceName to all relevant events in behat tests
bwaidelich May 18, 2024
104b2a1
Merge branch '9.0' into feature/4996-add-workspacename-to-events
bwaidelich May 18, 2024
a545c21
Fix namespace import in TetheredNodeAdjustments
bwaidelich May 18, 2024
7d97ebc
Add more workspaceNames to tests..
bwaidelich May 18, 2024
e47bac8
Fix typo in behat test
bwaidelich May 18, 2024
7caba3c
one more "workspaceName"...
bwaidelich May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ...res/Projection/ProjectionIntegrityViolationDetection/HierarchyIntegrityIsProvided.feature
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ Feature: Run integrity violation detection regarding hierarchy relations and nod
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand Down
3 changes: 3 additions & 0 deletions ...jection/ProjectionIntegrityViolationDetection/NodesHaveAtMostOneParentPerSubgraph.feature
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ Feature: Run integrity violation detection regarding parent relations
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-david-nodenborough" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -36,6 +37,7 @@ Feature: Run integrity violation detection regarding parent relations
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-nodeward-nodington-iii" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -46,6 +48,7 @@ Feature: Run integrity violation detection regarding parent relations
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand Down
2 changes: 2 additions & 0 deletions ...res/Projection/ProjectionIntegrityViolationDetection/ReferenceIntegrityIsProvided.feature
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ Feature: Run integrity violation detection regarding reference relations
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "source-nodandaise" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -38,6 +39,7 @@ Feature: Run integrity violation detection regarding reference relations
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "anthony-destinode" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand Down
2 changes: 2 additions & 0 deletions ...ures/Projection/ProjectionIntegrityViolationDetection/SiblingsAreDistinctlySorted.feature
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ Feature: Run integrity violation detection regarding sibling sorting
Scenario: Create two siblings and set the sorting to the same value
When the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -37,6 +38,7 @@ Feature: Run integrity violation detection regarding sibling sorting
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "noderella-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand Down
4 changes: 4 additions & 0 deletions ...Features/Projection/ProjectionIntegrityViolationDetection/SubtreeTagsAreInherited.feature
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ Feature: Run integrity violation detection regarding subtree tag inheritance
Scenario: Create nodes, disable the topmost and remove some restriction edges manually
When the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-david-nodenborough" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -38,6 +39,7 @@ Feature: Run integrity violation detection regarding subtree tag inheritance
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-nodeward-nodington-iii" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -48,6 +50,7 @@ Feature: Run integrity violation detection regarding subtree tag inheritance
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -58,6 +61,7 @@ Feature: Run integrity violation detection regarding subtree tag inheritance
| nodeAggregateClassification | "regular" |
And the event SubtreeWasTagged was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-david-nodenborough" |
| affectedDimensionSpacePoints | [{"language":"de"},{"language":"gsw"},{"language":"fr"}] |
Expand Down
2 changes: 2 additions & 0 deletions ...r/Features/Projection/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ Feature: Run projection integrity violation detection regarding naming of tether
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-david-nodenborough" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -38,6 +39,7 @@ Feature: Run projection integrity violation detection regarding naming of tether
Scenario: Remove tethered node's name
When the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nodewyn-tetherton" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand Down
4 changes: 4 additions & 0 deletions Neos.ContentRepository.BehavioralTests/Classes/Command/PerformanceMeasurementService.php
View file
Open in desktop
Expand Up @@ -45,6 +45,7 @@
class PerformanceMeasurementService implements ContentRepositoryServiceInterface
{
private ContentStreamId $contentStreamId;
private WorkspaceName $workspaceName;
private DimensionSpacePointSet $dimensionSpacePoints;
private ContentStreamEventStreamName $contentStreamEventStream;

Expand All @@ -55,6 +56,7 @@ public function __construct(
private readonly ContentRepositoryId $contentRepositoryId
) {
$this->contentStreamId = contentStreamId::fromString('cs-identifier');
$this->workspaceName = WorkspaceName::fromString('some-workspace');
$this->dimensionSpacePoints = new DimensionSpacePointSet([
DimensionSpacePoint::fromArray(['language' => 'mul']),
DimensionSpacePoint::fromArray(['language' => 'de']),
Expand Down Expand Up @@ -86,6 +88,7 @@ public function createNodesForPerformanceTest(int $nodesPerLevel, int $levels):

$rootNodeAggregateId = nodeAggregateId::fromString('lady-eleonode-rootford');
$rootNodeAggregateWasCreated = new RootNodeAggregateWithNodeWasCreated(
$this->workspaceName,
$this->contentStreamId,
$rootNodeAggregateId,
NodeTypeName::fromString('Neos.ContentRepository:Root'),
Expand Down Expand Up @@ -129,6 +132,7 @@ private function createHierarchy(
for ($i = 0; $i < $numberOfNodes; $i++) {
$nodeAggregateId = nodeAggregateId::create();
$events[] = new NodeAggregateWithNodeWasCreated(
$this->workspaceName,
$this->contentStreamId,
$nodeAggregateId,
NodeTypeName::fromString('Neos.ContentRepository:Testing'),
Expand Down
4 changes: 4 additions & 0 deletions ...alTests/Tests/Behavior/Features/08-NodeMove/07-MoveNodeAggregateWithoutDimensions.feature
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@ Feature: Move a node without content dimensions
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-david-nodenborough" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -40,6 +41,7 @@ Feature: Move a node without content dimensions
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand All @@ -50,6 +52,7 @@ Feature: Move a node without content dimensions
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-nodeward-nodington-iii" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand Down Expand Up @@ -130,6 +133,7 @@ Feature: Move a node without content dimensions
Scenario: Move a node to a new parent and the end of its children
Given the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-abigail-nodenborough" |
| nodeTypeName | "Neos.ContentRepository.Testing:Document" |
Expand Down
2 changes: 2 additions & 0 deletions ...ests/Behavior/Features/ContentStreamForking/01-ForkContentStream_ConstraintChecks.feature
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@ Feature: ForkContentStream Without Dimensions
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Content" |
Expand All @@ -40,6 +41,7 @@ Feature: ForkContentStream Without Dimensions
| nodeAggregateClassification | "regular" |
And the event NodePropertiesWereSet was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| originDimensionSpacePoint | {} |
Expand Down
2 changes: 2 additions & 0 deletions ...Features/ContentStreamForking/ForkContentStreamWithDisabledNodesWithoutDimensions.feature
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ Feature: On forking a content stream, hidden nodes should be correctly copied as
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "the-great-nodini" |
| nodeTypeName | "Neos.ContentRepository.Testing:Content" |
Expand All @@ -39,6 +40,7 @@ Feature: On forking a content stream, hidden nodes should be correctly copied as
| nodeAggregateClassification | "regular" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nodingers-cat" |
| nodeTypeName | "Neos.ContentRepository.Testing:Content" |
Expand Down
4 changes: 4 additions & 0 deletions ...s/Tests/Behavior/Features/ContentStreamForking/ForkContentStreamWithoutDimensions.feature
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@ Feature: ForkContentStream Without Dimensions
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:Content" |
Expand All @@ -40,6 +41,7 @@ Feature: ForkContentStream Without Dimensions
| nodeAggregateClassification | "regular" |
And the event NodePropertiesWereSet was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| originDimensionSpacePoint | {} |
Expand All @@ -63,6 +65,7 @@ Feature: ForkContentStream Without Dimensions
| sourceContentStreamId | "cs-identifier" |
And the event NodePropertiesWereSet was published with payload:
| Key | Value |
| workspaceName | "user" |
| contentStreamId | "user-cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| originDimensionSpacePoint | {} |
Expand Down Expand Up @@ -92,6 +95,7 @@ Feature: ForkContentStream Without Dimensions
| sourceContentStreamId | "cs-identifier" |
And the event NodePropertiesWereSet was published with payload:
| Key | Value |
| workspaceName | "live" |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "nody-mc-nodeface" |
| originDimensionSpacePoint | {} |
Expand Down