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

!!! TASK: Workspace aware commands #4708

Merged
merged 51 commits into from
Mar 14, 2024
Merged

!!! TASK: Workspace aware commands #4708

Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3949e13
WIP: BUGFIX: Prevent new events in published content streams
bwaidelich Nov 2, 2023
3698abe
Refactor commands from content stream IDs to workspace names
Nov 3, 2023
d983937
Merge branch '9.0' into workspaceAwareCommands
Nov 3, 2023
dd29133
WIP: Adjust test cases
Nov 3, 2023
0be0a13
WIP: Adjust workspace publication handling
Nov 3, 2023
a32eeff
Merge branch '9.0' into workspaceAwareCommands
Nov 6, 2023
4d02a94
Adjust publishing to workspace based workflow
Nov 6, 2023
8e83e99
WIP: Adjust test cases and add surrogate WorkspaceWasRebased
Nov 6, 2023
7248cb1
Adjust Neos tests
Nov 7, 2023
18df5dc
Adjust Doctrine DBAL adapter tests
Nov 7, 2023
609913e
Adjust session handling to Flow
Nov 7, 2023
40f238c
Merge remote-tracking branch 'origin/9.0' into workspaceAwareCommands
mhsdesign Nov 26, 2023
d55994a
Merge remote-tracking branch 'origin/9.0' into workspaceAwareCommands
mhsdesign Dec 1, 2023
eb10d00
Merge branch '9.0' into workspaceAwareCommands
Dec 8, 2023
5f8ceb1
Merge branch '9.0' into workspaceAwareCommands
Dec 20, 2023
db6b449
Merge remote-tracking branch 'origin/9.0' into workspaceAwareCommands
mhsdesign Jan 16, 2024
0f46918
Merge remote-tracking branch 'origin/9.0' into workspaceAwareCommands
mhsdesign Jan 23, 2024
7a4877c
TASK: Fix using $workspaceName for `CreateNodeVariant`
mhsdesign Jan 30, 2024
bddd901
Merge remote-tracking branch 'origin/9.0' into workspaceAwareCommands
mhsdesign Jan 30, 2024
d1c7b0b
WIP: Adjust workspace command handling
Jan 31, 2024
2c223e2
Merge branch 'workspaceAwareCommands' of https://github.com/neos/neos…
Jan 31, 2024
75e5606
Merge remote-tracking branch 'origin/9.0' into workspaceAwareCommands
mhsdesign Feb 18, 2024
dd61ac0
Merge branch '9.0' into workspaceAwareCommands
Feb 22, 2024
0920362
Merge branch 'workspaceAwareCommands' of https://github.com/neos/neos…
Feb 22, 2024
7d7e698
Require paratest
Feb 22, 2024
90823c3
Require paratest and matching phpunit version
Feb 22, 2024
bb046ff
Also require paratest in distribution non-dev
Feb 22, 2024
a8c5332
Adjust tests to PHPUnit 10
Feb 22, 2024
24250f8
Downgrade to paratest 6
Feb 22, 2024
d0f4ecc
Merge branch '9.0' into workspaceAwareCommands
Mar 11, 2024
6fb689b
Introduce parallel testing for workspace changes during rebase
Mar 11, 2024
d094280
Merge branch '9.0' into workspaceAwareCommands
Mar 11, 2024
b70bae0
Increase reproduction of publication errors
Mar 11, 2024
9b40942
Merge branch 'bugfix/4680-prevent-events-in-closed-content-streams' i…
Mar 12, 2024
b987fa3
4708 - Enforce content streams to not be closed
Mar 12, 2024
bf3c36d
Implement partial workspace publication
Mar 12, 2024
7f6492c
Stabilize parallel tests
Mar 12, 2024
2da5ee8
Pacify linter
Mar 12, 2024
f360c1b
Adjust newer tests
Mar 12, 2024
40378d3
Merge branch '9.0' into workspaceAwareCommands
Mar 13, 2024
35822a9
Remove obsolete runtime cache disabling
Mar 13, 2024
bf84fa9
4708 - Add ExpectedVersion checks
Mar 13, 2024
a93bdde
Merge branch '9.0' into workspaceAwareCommands
Mar 13, 2024
b194763
4708 - add test cases for content stream closing
Mar 13, 2024
6c998f8
Update Neos.ContentRepository.BehavioralTests/Tests/Functional/Featur…
nezaniel Mar 13, 2024
44bfb29
4583 - WIP: Implement variant recreation tests
Mar 13, 2024
1bae464
WIP: Refactor partial workspace discarding
Mar 13, 2024
f81864c
4583 - Introduce Contentstream reopening to recover workspaces from r…
Mar 14, 2024
542c4ad
Merge branch '4583-variantRecreation' into workspaceAwareCommands
Mar 14, 2024
fb4e442
4583 - Allow ContentStreamProjection to apply ContenStreamWasReopened
Mar 14, 2024
82494f1
Merge branch '4583-variantRecreation' into workspaceAwareCommands
Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
"../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml Neos.ContentRepository.Core/Tests/Unit",
"../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml Neos.ContentRepositoryRegistry/Tests/Unit"
],
"test:parallel": [
"FLOW_CONTEXT=Testing/Behat ../../bin/paratest --debug -v --functional --group parallel --processes 2 --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.BehavioralTests/Tests/Functional/Feature/WorkspacePublication/WorkspaceWritingDuringPublication.php",
"FLOW_CONTEXT=Testing/Behat ../../bin/paratest --debug -v --functional --group parallel --processes 2 --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.BehavioralTests/Tests/Functional/Feature/WorkspacePublication/WorkspaceWritingDuringPublication.php",
"FLOW_CONTEXT=Testing/Behat ../../bin/paratest --debug -v --functional --group parallel --processes 2 --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.BehavioralTests/Tests/Functional/Feature/WorkspacePublication/WorkspaceWritingDuringPublication.php"
],
"test:functional": [
"../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.Core/Tests/Functional"
],
Expand All @@ -54,7 +59,8 @@
"test": [
"@test:unit",
"@test:functional",
"@test:behavioral"
"@test:behavioral",
"@test:parallel"
]
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion ...res/Projection/ProjectionIntegrityViolationDetection/HierarchyIntegrityIsProvided.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Feature: Run integrity violation detection regarding hierarchy relations and nod
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in the active content stream of workspace "live" and dimension space point {}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
Expand Down
2 changes: 1 addition & 1 deletion ...jection/ProjectionIntegrityViolationDetection/NodesHaveAtMostOneParentPerSubgraph.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Feature: Run integrity violation detection regarding parent relations
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
Expand Down
3 changes: 1 addition & 2 deletions ...res/Projection/ProjectionIntegrityViolationDetection/ReferenceIntegrityIsProvided.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Feature: Run integrity violation detection regarding reference relations
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
Expand All @@ -51,7 +51,6 @@ Feature: Run integrity violation detection regarding reference relations
Scenario: Detach a reference relation from its source
When the command SetNodeReferences is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| sourceOriginDimensionSpacePoint | {"language":"de"} |
| sourceNodeAggregateId | "source-nodandaise" |
| referenceName | "referenceProperty" |
Expand Down
2 changes: 1 addition & 1 deletion ...s/Projection/ProjectionIntegrityViolationDetection/RestrictionIntegrityIsProvided.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Feature: Run integrity violation detection regarding restriction relations
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
Expand Down
2 changes: 1 addition & 1 deletion ...ection/ProjectionIntegrityViolationDetection/RestrictionsArePropagatedRecursively.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Feature: Run integrity violation detection regarding restriction relations
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the graph projection is fully up to date
Expand Down
2 changes: 1 addition & 1 deletion ...ures/Projection/ProjectionIntegrityViolationDetection/SiblingsAreDistinctlySorted.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Feature: Run integrity violation detection regarding sibling sorting
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the graph projection is fully up to date
Expand Down
2 changes: 1 addition & 1 deletion ...r/Features/Projection/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Feature: Run projection integrity violation detection regarding naming of tether
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the event NodeAggregateWithNodeWasCreated was published with payload:
Expand Down
19 changes: 16 additions & 3 deletions .../Features/01-RootNodeCreation/01-CreateRootNodeAggregateWithNode_ConstraintChecks.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ Feature: Create a root node aggregate
'Neos.ContentRepository.Testing:AbstractRoot':
abstract: true
'Neos.ContentRepository.Testing:NonRoot': []
'Neos.ContentRepository.Testing:OtherRoot':
superTypes:
'Neos.ContentRepository:Root': true
"""
And using identifier "default", I define a content repository
And I am in content repository "default"
Expand All @@ -24,21 +27,31 @@ Feature: Create a root node aggregate
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in content stream "cs-identifier"
And I am in the active content stream of workspace "live"
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the graph projection is fully up to date

Scenario: Try to create a root node aggregate in a content stream that currently does not exist:
Scenario: Try to create a root node aggregate in a workspace that currently does not exist:
When the command CreateRootNodeAggregateWithNode is executed with payload and exceptions are caught:
| Key | Value |
| contentStreamId | "i-do-not-exist" |
| workspaceName | "i-do-not-exist" |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository:Root" |
Then the last command should have thrown an exception of type "ContentStreamDoesNotExistYet"

Scenario: Try to create a root node aggregate in a closed content stream:
When the command CloseContentStream is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
And the command CreateRootNodeAggregateWithNode is executed with payload and exceptions are caught:
| Key | Value |
| nodeAggregateId | "nody-mc-nodeface" |
| nodeTypeName | "Neos.ContentRepository.Testing:OtherRoot" |
Then the last command should have thrown an exception of type "ContentStreamIsClosed"

Scenario: Try to create a root node aggregate in a content stream where it is already present:
When the command CreateRootNodeAggregateWithNode is executed with payload and exceptions are caught:
| Key | Value |
Expand Down
2 changes: 1 addition & 1 deletion ...Features/01-RootNodeCreation/02-CreateRootNodeAggregateWithNode_WithoutDimensions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Feature: Create a root node aggregate
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in content stream "cs-identifier"
And I am in the active content stream of workspace "live"

Scenario: Create the initial root node aggregate using valid payload without dimensions
When the command CreateRootNodeAggregateWithNode is executed with payload:
Expand Down
5 changes: 2 additions & 3 deletions ...eCreation/03-CreateRootNodeAggregateWithNodeAndTetheredChildren_WithoutDimensions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ Feature: Create a root node aggregate with tethered children
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in content stream "cs-identifier"
And I am in dimension space point {}
And I am in the active content stream of workspace "live" and dimension space point {}
And I am user identified by "initiating-user-identifier"

Scenario: Create root node with tethered children
Expand Down Expand Up @@ -134,7 +133,7 @@ Feature: Create a root node aggregate with tethered children
| Key | Value |
| text | "my sub sub default" |

When I am in content stream "cs-identifier" and dimension space point []
And I am in the active content stream of workspace "live" and dimension space point {}
And I expect node aggregate identifier "lady-eleonode-rootford" to lead to node cs-identifier;lady-eleonode-rootford;{}
And I expect this node to have no parent node
And I expect this node to have the following child nodes:
Expand Down
10 changes: 5 additions & 5 deletions ...NodeCreation/04-CreateRootNodeAggregateWithNodeAndTetheredChildren_WithDimensions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Feature: Create a root node aggregate with tethered children
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in content stream "cs-identifier"
And I am in the active content stream of workspace "live"
And I am user identified by "initiating-user-identifier"

Scenario: Create root node with tethered children
Expand Down Expand Up @@ -173,7 +173,7 @@ Feature: Create a root node aggregate with tethered children
| Key | Value |
| text | "my sub sub default" |

When I am in content stream "cs-identifier" and dimension space point {"language": "de"}
When I am in the active content stream of workspace "live" and dimension space point {"language": "de"}
And I expect node aggregate identifier "lady-eleonode-rootford" to lead to node cs-identifier;lady-eleonode-rootford;{}
And I expect this node to have no parent node
And I expect this node to have the following child nodes:
Expand Down Expand Up @@ -202,7 +202,7 @@ Feature: Create a root node aggregate with tethered children
And I expect this node to have no references
And I expect this node to not be referenced

When I am in content stream "cs-identifier" and dimension space point {"language": "gsw"}
When I am in the active content stream of workspace "live" and dimension space point {"language": "gsw"}
And I expect node aggregate identifier "lady-eleonode-rootford" to lead to node cs-identifier;lady-eleonode-rootford;{}
And I expect this node to have no parent node
And I expect this node to have the following child nodes:
Expand Down Expand Up @@ -232,7 +232,7 @@ Feature: Create a root node aggregate with tethered children
And I expect this node to not be referenced


When I am in content stream "cs-identifier" and dimension space point {"language": "en"}
When I am in the active content stream of workspace "live" and dimension space point {"language": "en"}
And I expect node aggregate identifier "lady-eleonode-rootford" to lead to node cs-identifier;lady-eleonode-rootford;{}
And I expect this node to have no parent node
And I expect this node to have the following child nodes:
Expand Down Expand Up @@ -262,7 +262,7 @@ Feature: Create a root node aggregate with tethered children
And I expect this node to not be referenced


When I am in content stream "cs-identifier" and dimension space point {"language": "en_US"}
When I am in the active content stream of workspace "live" and dimension space point {"language": "en_US"}
And I expect node aggregate identifier "lady-eleonode-rootford" to lead to node cs-identifier;lady-eleonode-rootford;{}
And I expect this node to have no parent node
And I expect this node to have the following child nodes:
Expand Down
2 changes: 1 addition & 1 deletion ...or/Features/01-RootNodeCreation/05-CreateRootNodeAggregateWithNode_WithDimensions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Feature: Create a root node aggregate
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in content stream "cs-identifier"
And I am in the active content stream of workspace "live"

Scenario: Create the initial root node aggregate using valid payload with dimensions
When the command CreateRootNodeAggregateWithNode is executed with payload:
Expand Down
22 changes: 17 additions & 5 deletions ...Behavior/Features/02-NodeCreation/01-CreateNodeAggregateWithNode_ConstraintChecks.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,38 @@ Feature: Create node aggregate with node
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in content stream "cs-identifier"
And I am in dimension space point {}
And I am in the active content stream of workspace "live" and dimension space point {}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
| nodeAggregateId | "lady-eleonode-rootford" |
| nodeTypeName | "Neos.ContentRepository:Root" |
And the graph projection is fully up to date

Scenario: Try to create a node aggregate in a content stream that currently does not exist:
Scenario: Try to create a node aggregate in a workspace that currently does not exist:
When the command CreateNodeAggregateWithNode is executed with payload and exceptions are caught:
| Key | Value |
| contentStreamId | "non-existent-cs-identifier" |
| workspaceName | "non-existent" |
| nodeAggregateId | "sir-david-nodenborough" |
| nodeTypeName | "Neos.ContentRepository.Testing:Node" |
| parentNodeAggregateId | "lady-eleonode-rootford" |
| nodeName | "document" |

Then the last command should have thrown an exception of type "ContentStreamDoesNotExistYet"

Scenario: Try to create a node aggregate in a content stream where it is already present:
Scenario: Try to create a node aggregate in a workspace whose content stream is closed:
When the command CloseContentStream is executed with payload:
| Key | Value |
| contentStreamId | "cs-identifier" |
And the command CreateNodeAggregateWithNode is executed with payload and exceptions are caught:
| Key | Value |
| nodeAggregateId | "sir-david-nodenborough" |
| nodeTypeName | "Neos.ContentRepository.Testing:Node" |
| parentNodeAggregateId | "lady-eleonode-rootford" |
| nodeName | "document" |

Then the last command should have thrown an exception of type "ContentStreamIsClosed"

Scenario: Try to create a node aggregate in a workspace where it is already present:
When the command CreateNodeAggregateWithNode is executed with payload and exceptions are caught:
| Key | Value |
| nodeAggregateId | "lady-eleonode-rootford" |
Expand Down
2 changes: 1 addition & 1 deletion ...es/02-NodeCreation/02-CreateNodeAggregateWithNode_ConstraintChecks_WithDimensions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Feature: Create node aggregate with node
| workspaceDescription | "The live workspace" |
| newContentStreamId | "cs-identifier" |
And the graph projection is fully up to date
And I am in content stream "cs-identifier"
And I am in the active content stream of workspace "live"
And I am in dimension space point {}
And the command CreateRootNodeAggregateWithNode is executed with payload:
| Key | Value |
Expand Down
Loading
Loading