diff options
author | Georg Ehrke <developer@georgehrke.com> | 2020-05-07 17:32:56 +0300 |
---|---|---|
committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-05-08 13:05:55 +0300 |
commit | d1909526fc47e0973e9b1507f991b1992c7e0dcc (patch) | |
tree | 2bca271ab744873c0487b2c4f8b4f12cffd643e4 /apps/contactsinteraction | |
parent | 76334c4c9094aaa2c95d068490ac4427d5bb786b (diff) |
Implement ctag and etag in ContactsInteraction
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps/contactsinteraction')
-rw-r--r-- | apps/contactsinteraction/lib/AddressBook.php | 5 | ||||
-rw-r--r-- | apps/contactsinteraction/lib/Card.php | 2 | ||||
-rw-r--r-- | apps/contactsinteraction/lib/Db/RecentContactMapper.php | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/apps/contactsinteraction/lib/AddressBook.php b/apps/contactsinteraction/lib/AddressBook.php index e8479cb186a..3e581c93021 100644 --- a/apps/contactsinteraction/lib/AddressBook.php +++ b/apps/contactsinteraction/lib/AddressBook.php @@ -130,8 +130,8 @@ class AddressBook extends ExternalAddressBook implements IACL { /** * @inheritDoc */ - public function getLastModified() { - throw new NotImplemented(); + public function getLastModified(): ?int { + return $this->mapper->findLastUpdatedForUserId($this->getUid()); } /** @@ -149,6 +149,7 @@ class AddressBook extends ExternalAddressBook implements IACL { 'principaluri' => $this->principalUri, '{DAV:}displayname' => $this->l10n->t('Recently contacted'), '{' . Plugin::NS_OWNCLOUD . '}read-only' => true, + '{' . \OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($this->getLastModified() ?? 0), ]; } diff --git a/apps/contactsinteraction/lib/Card.php b/apps/contactsinteraction/lib/Card.php index 6285025f1eb..2cacd7ad546 100644 --- a/apps/contactsinteraction/lib/Card.php +++ b/apps/contactsinteraction/lib/Card.php @@ -95,7 +95,7 @@ class Card implements ICard, IACL { * @inheritDoc */ public function getETag(): ?string { - return null; + return '"' . md5((string) $this->getLastModified()) . '"'; } /** diff --git a/apps/contactsinteraction/lib/Db/RecentContactMapper.php b/apps/contactsinteraction/lib/Db/RecentContactMapper.php index 18a5bf6cedc..19cd30ea701 100644 --- a/apps/contactsinteraction/lib/Db/RecentContactMapper.php +++ b/apps/contactsinteraction/lib/Db/RecentContactMapper.php @@ -104,6 +104,30 @@ class RecentContactMapper extends QBMapper { return $this->findEntities($select); } + /** + * @param string $uid + * @return int|null + */ + public function findLastUpdatedForUserId(string $uid):?int { + $qb = $this->db->getQueryBuilder(); + + $select = $qb + ->select('last_contact') + ->from($this->getTableName()) + ->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid))) + ->orderBy('last_contact', 'DESC') + ->setMaxResults(1); + + $cursor = $select->execute(); + $row = $cursor->fetch(); + + if ($row === false) { + return null; + } + + return (int)$row['last_contact']; + } + public function cleanUp(int $olderThan): void { $qb = $this->db->getQueryBuilder(); |