Skip to content

fix(contexts): keep the nodes added by an application update in the loaded shape #3230

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

Open
rubenvdlinde wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(contexts): keep the nodes added by an application update in the loaded shape #3230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions lib/Service/ContextService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,17 @@ public function update(int $contextId, string $userId, ?string $name, ?string $i
$node['order'] ?? 100,
$userId
);
$currentNodes[$addedNode->getId()] = $addedNode->jsonSerialize();
$currentPages[$updatedContent->getPageId()]['content'][$updatedContent->getId()] = $updatedContent->jsonSerialize();
// The same shape as the nodes and contents the mapper loads
$currentNodes[$addedNode->getId()] = [
'id' => $addedNode->getId(),
'node_id' => $addedNode->getNodeId(),
'node_type' => $addedNode->getNodeType(),
'permissions' => $addedNode->getPermissions(),
];
$currentPages[$updatedContent->getPageId()]['content'][$updatedContent->getId()] = [
'order' => $updatedContent->getOrder(),
'node_rel_id' => $updatedContent->getNodeRelId(),
];
}
unset($nodesBeingAdded);

Expand Down
47 changes: 45 additions & 2 deletions tests/unit/Service/ContextServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ final class ContextServiceTest extends TestCase {
private MockObject $pageContentMapper;
private MockObject $userManager;
private MockObject $auditLogService;
private MockObject $permissionsService;

protected function setUp(): void {
parent::setUp();
Expand All @@ -47,7 +48,7 @@ protected function setUp(): void {
$this->pageMapper = $this->createMock(PageMapper::class);
$this->pageContentMapper = $this->createMock(PageContentMapper::class);
$logger = $this->createMock(LoggerInterface::class);
$permissionsService = $this->createMock(PermissionsService::class);
$this->permissionsService = $this->createMock(PermissionsService::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->auditLogService = $this->createMock(AuditLogServiceInterface::class);
$dbConnection = $this->createMock(IDBConnection::class);
Expand All @@ -61,7 +62,7 @@ protected function setUp(): void {
$this->pageMapper,
$this->pageContentMapper,
$logger,
$permissionsService,
$this->permissionsService,
$this->userManager,
$this->auditLogService,
$dbConnection,
Expand Down Expand Up @@ -189,6 +190,48 @@ public function testUpdateReordersStartPageContentsFromSubmittedNodes(): void {
self::assertSame(10, $updatedContext->getPages()[301]['content'][502]['order']);
}

public function testUpdateGivesAnAddedNodeTheShapeOfTheLoadedNodesAndOrdersIt(): void {
$context = new Context();
$context->id = 7;
$context->setNodes([
101 => ['id' => 101, 'node_type' => 0, 'node_id' => 11, 'permissions' => 1],
]);
$context->setPages([
301 => [
'id' => 301,
'page_type' => Page::TYPE_STARTPAGE,
'content' => [501 => ['order' => 10, 'node_rel_id' => 101]],
],
]);
$this->contextMapper->method('findById')->willReturn($context);
$this->contextMapper->method('update')->willReturnArgument(0);
$this->permissionsService->method('canManageNodeById')->willReturn(true);
$this->contextNodeRelMapper->method('insert')->willReturnCallback(static function (ContextNodeRelation $relation): ContextNodeRelation {
$relation->id = 102;
return $relation;
});
$this->pageContentMapper->method('insert')->willReturnCallback(static function (PageContent $content): PageContent {
$content->id = 502;
return $content;
});
$pageContentsById = [
501 => $this->buildPageContent(501, 301, 101, 10),
502 => $this->buildPageContent(502, 301, 102, 100),
];
$this->pageContentMapper->method('findById')
->willReturnCallback(static fn (int $contentId): PageContent => $pageContentsById[$contentId]);
$this->pageContentMapper->method('update')->willReturnArgument(0);

$updatedContext = $this->service->update(7, 'user-1', null, null, null, [
['id' => 12, 'type' => 1, 'permissions' => 3],
['id' => 11, 'type' => 0, 'permissions' => 1],
]);

self::assertSame(['id' => 102, 'node_id' => 12, 'node_type' => 1, 'permissions' => 3], $updatedContext->getNodes()[102]);
self::assertSame(['order' => 10, 'node_rel_id' => 102], $updatedContext->getPages()[301]['content'][502]);
self::assertSame(20, $updatedContext->getPages()[301]['content'][501]['order']);
}

public function testUpdateLogsRemovedNodes(): void {
$context = new Context();
$context->id = 7;
Expand Down
Loading