From caebc01a9f1900188329e286f952cd9dda15c7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 11 Aug 2023 18:20:08 +0200 Subject: [PATCH] fix: Map card assignments through mapping config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Service/Importer/Systems/DeckJsonService.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Service/Importer/Systems/DeckJsonService.php b/lib/Service/Importer/Systems/DeckJsonService.php index d2c622154..4de3ec459 100644 --- a/lib/Service/Importer/Systems/DeckJsonService.php +++ b/lib/Service/Importer/Systems/DeckJsonService.php @@ -77,6 +77,11 @@ class DeckJsonService extends ABoardImportService { } public function mapMember($uid): ?string { + $ownerMap = $this->mapOwner($uid); + if ($ownerMap !== $uid) { + return $ownerMap; + } + $uidCandidate = isset($this->members[$uid]) ? $this->members[$uid]?->getUID() ?? null : null; if ($uidCandidate) { return $uidCandidate; @@ -104,7 +109,7 @@ class DeckJsonService extends ABoardImportService { foreach ($sourceCard->assignedUsers as $idMember) { $assignment = new Assignment(); $assignment->setCardId($this->cards[$sourceCard->id]->getId()); - $assignment->setParticipant($idMember->participant->uid); + $assignment->setParticipant($this->mapMember($idMember->participant->uid ?? $idMember->participant)); $assignment->setType($idMember->participant->type); $assignments[$sourceCard->id][] = $assignment; }