ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Map stacks to VTODO and link them as parent entries

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-03-07 11:48:35 +01:00
parent fc58439d2e
commit 08097ea65f
7 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/DAV/Calendar.php
View File

@@ -27,7 +27,9 @@ use OCA\DAV\CalDAV\Plugin;
use OCA\DAV\DAV\Sharing\IShareable;
use OCA\Deck\Db\Board;
use OCA\Deck\Db\Card;
use OCA\Deck\Db\Stack;
use OCA\Deck\Service\CardService;
use OCA\Deck\Service\StackService;
use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;
use Sabre\DAV\PropPatch;
@@ -62,9 +64,14 @@ class Calendar extends ExternalCalendar implements IShareable {
if ($board) {
/** @var CardService cardService */
/** @var CardService $cardService */
$cardService = \OC::$server->query(CardService::class);
$this->children = $cardService->findCalendarEntries($board->getId());
/** @var StackService $stackService */
$stackService = \OC::$server->query(StackService::class);
$this->children = array_merge(
$cardService->findCalendarEntries($board->getId()),
$stackService->findCalendarEntries($board->getId())
);
} else {
$this->children = [];
}
@@ -120,8 +127,8 @@ class Calendar extends ExternalCalendar implements IShareable {
*/
function calendarQuery(array $filters) {
// In a real implementation this should actually filter
return array_map(function (Card $card) {
return $card->getId() . '.ics';
return array_map(function ($card) {
return $card->getCalendarPrefix() . '-' . $card->getId() . '.ics';
}, $this->children);
}
@@ -140,7 +147,7 @@ class Calendar extends ExternalCalendar implements IShareable {
$card = array_values(array_filter(
$this->children,
function ($card) use (&$name) {
return $card->getId() . '.ics' === $name;
return $card->getCalendarPrefix() . '-' . $card->getId() . '.ics' === $name;
}
));
if (count($card) > 0) {
@@ -153,8 +160,8 @@ class Calendar extends ExternalCalendar implements IShareable {
* @inheritDoc
*/
function getChildren() {
$childNames = array_map(function (Card $card) {
return $card->getId() . '.ics';
$childNames = array_map(function ($card) {
return $card->getCalendarPrefix() . '-' . $card->getId() . '.ics';
}, $this->children);
$children = [];
@@ -173,7 +180,7 @@ class Calendar extends ExternalCalendar implements IShareable {
return count(array_filter(
$this->children,
function ($card) use (&$name) {
return $card->getId() . '.ics' === $name;
return $card->getCalendarPrefix() . '-' . $card->getId() . '.ics' === $name;
}
)) > 0;
}

12
lib/DAV/CalendarObject.php
View File

@@ -36,7 +36,7 @@ class CalendarObject implements \Sabre\CalDAV\ICalendarObject, \Sabre\DAVACL\IAC
/**
* @var Card
*/
private $card;
private $sourceItem;
/**
* CalendarObject constructor.
@@ -44,10 +44,10 @@ class CalendarObject implements \Sabre\CalDAV\ICalendarObject, \Sabre\DAVACL\IAC
* @param Calendar $calendar
* @param string $name
*/
public function __construct(Calendar $calendar, string $name, Card $card = null) {
public function __construct(Calendar $calendar, string $name, $sourceItem = null) {
$this->calendar = $calendar;
$this->name = $name;
$this->card = $card;
$this->sourceItem = $sourceItem;
}
/**
@@ -96,8 +96,8 @@ class CalendarObject implements \Sabre\CalDAV\ICalendarObject, \Sabre\DAVACL\IAC
* @inheritDoc
*/
function get() {
if ($this->card) {
return $this->card->getCalendarObject()->serialize();
if ($this->sourceItem) {
return $this->sourceItem->getCalendarObject()->serialize();
}
}
@@ -147,6 +147,6 @@ class CalendarObject implements \Sabre\CalDAV\ICalendarObject, \Sabre\DAVACL\IAC
* @inheritDoc
*/
function getLastModified() {
return $this->card->getLastModified();
return $this->sourceItem->getLastModified();
}
}