Fixed integration with Google Calendar

inshopgroup · Aug 22, 2019 · 083b091 · 083b091
1 parent 489544b
commit 083b091
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/EventListener/TaskListener.php b/src/EventListener/TaskListener.php
@@ -66,8 +66,13 @@ public function postUpdate(LifecycleEventArgs $eventArgs): void
                 $changes = $unitOfWork->getEntityChangeSet($entity);
 
                 if (array_key_exists('assignee', $changes)) {
-                    $this->googleClient->deleteEvent($entity, $changes['assignee'][0]);
-                    $this->googleClient->insertEvent($entity, $changes['assignee'][1]);
+                    if ($changes['assignee'][0]) {
+                        $this->googleClient->deleteEvent($entity, $changes['assignee'][0]);
+                    }
+
+                    if ($changes['assignee'][1]) {
+                        $this->googleClient->insertEvent($entity, $changes['assignee'][1]);
+                    }
                 } else {
                     $this->googleClient->updateEvent($entity, $entity->getAssignee());
                 }

diff --git a/src/Service/GoogleClient.php b/src/Service/GoogleClient.php
@@ -115,11 +115,11 @@ public function getCalendars(): \Google_Service_Calendar_CalendarList
     /**
      * @param Task $task
      * @param User $user
-     * @return \Google_Service_Calendar_Event
+     * @return \Google_Service_Calendar_Event|null
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\OptimisticLockException
      */
-    public function insertEvent(Task $task, User $user): \Google_Service_Calendar_Event
+    public function insertEvent(Task $task, User $user): ?\Google_Service_Calendar_Event
     {
         if (!$user->getIsGoogleSyncEnabled() || !$user->getGoogleCalendarId()) {
             return null;