diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2023-05-03 10:26:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 10:26:28 +0200 |
| commit | ef87dfc478c53c293cb09756201f2ea9dd2b67b1 (patch) | |
| tree | 3cbda586a273ede9de33dd5fd5274b8fde168651 | |
| parent | 8873960bcfd9df8433faa5754b65ae3f2e55c1c7 (diff) | |
| parent | 5ed6722dd2f7570f10733cc9043d39f6bc20c6c8 (diff) | |
| download | nextcloud-server-ef87dfc478c53c293cb09756201f2ea9dd2b67b1.tar.gz nextcloud-server-ef87dfc478c53c293cb09756201f2ea9dd2b67b1.zip | |
Merge pull request #33106 from nextcloud/feature/update-expire-date
Update expire_date column of table comments
| -rw-r--r-- | lib/private/Comments/Manager.php | 3 | ||||
| -rw-r--r-- | tests/lib/Comments/ManagerTest.php | 30 |
2 files changed, 30 insertions, 3 deletions
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index c5fb4ebfe34..117318fb278 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -1351,7 +1351,8 @@ class Manager implements ICommentsManager { ->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())); diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php index bc1692a5958..5fa1beee374 100644 --- a/tests/lib/Comments/ManagerTest.php +++ b/tests/lib/Comments/ManagerTest.php @@ -516,15 +516,41 @@ class ManagerTest extends TestCase { ->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') + ); } |