Skip to content

Update expire_date column of table comments #33106

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

Merged
blizzz merged 2 commits into from
May 3, 2023
Merged

Update expire_date column of table comments #33106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ab50ab
Update expire_date column of table comments
vitormattos Jul 4, 2022
5ed6722
Cover expire_date with unit tests
vitormattos Apr 26, 2023
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
3 changes: 2 additions & 1 deletion lib/private/Comments/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,8 @@ protected function updateQuery(IComment $comment, bool $tryWritingReferenceId):
->set('creation_timestamp', $qb->createNamedParameter($comment->getCreationDateTime(), 'datetime'))
->set('latest_child_timestamp', $qb->createNamedParameter($comment->getLatestChildDateTime(), 'datetime'))
->set('object_type', $qb->createNamedParameter($comment->getObjectType()))
->set('object_id', $qb->createNamedParameter($comment->getObjectId()));
->set('object_id', $qb->createNamedParameter($comment->getObjectId()))
->set('expire_date', $qb->createNamedParameter($comment->getExpireDate(), 'datetime'));

if ($tryWritingReferenceId) {
$qb->set('reference_id', $qb->createNamedParameter($comment->getReferenceId()));
Expand Down
30 changes: 28 additions & 2 deletions tests/lib/Comments/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,15 +516,41 @@ public function testSaveUpdate() {
->setActor('users', 'alice')
->setObject('files', 'file64')
->setMessage('very beautiful, I am impressed!')
->setVerb('comment');
->setVerb('comment')
->setExpireDate(new \DateTime('+2 hours'));

$manager->save($comment);

$comment->setMessage('very beautiful, I am really so much impressed!');
$loadedComment = $manager->get($comment->getId());
// Compare current object with database values
$this->assertSame($comment->getMessage(), $loadedComment->getMessage());
$this->assertSame(
$comment->getExpireDate()->format('Y-m-d H:i:s'),
$loadedComment->getExpireDate()->format('Y-m-d H:i:s')
);

// Preserve the original comment to compare after update
$original = clone $comment;

// Update values
$comment->setMessage('very beautiful, I am really so much impressed!')
->setExpireDate(new \DateTime('+1 hours'));
$manager->save($comment);

$loadedComment = $manager->get($comment->getId());
// Compare current object with database values
$this->assertSame($comment->getMessage(), $loadedComment->getMessage());
$this->assertSame(
$comment->getExpireDate()->format('Y-m-d H:i:s'),
$loadedComment->getExpireDate()->format('Y-m-d H:i:s')
);

// Compare original object with database values
$this->assertNotSame($original->getMessage(), $loadedComment->getMessage());
$this->assertNotSame(
$original->getExpireDate()->format('Y-m-d H:i:s'),
$loadedComment->getExpireDate()->format('Y-m-d H:i:s')
);
}


Expand Down