Merge pull request #6 from adrianodias8/#5_prevent_errors_if_items_do…

…nt_exist #5 prevent errors if items dont exist
adrianodias8 · Mar 31, 2020 · 96f0da5 · 96f0da5
2 parents 76048d9 + eeacbf5
commit 96f0da5
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 19 deletions.
diff --git a/modules/entity_activity_tracker_group/src/Plugin/CreditGroupBase.php b/modules/entity_activity_tracker_group/src/Plugin/CreditGroupBase.php
@@ -70,7 +70,11 @@ protected function getRelatedEntity(ContentEntityInterface $entity) {
       case 'comment':
         if (isset($this->pluginDefinition['credit_related'])) {
           if ($this->pluginDefinition['credit_related'] == 'group') {
-            $group_contents = $this->entityTypeManager->getStorage('group_content')->loadByEntity($entity->getCommentedEntity());
+            $node = $entity->getCommentedEntity();
+            if (empty($node)) {
+              return FALSE;
+            }
+            $group_contents = $this->entityTypeManager->getStorage('group_content')->loadByEntity($node);
             if ($group_content = reset($group_contents)) {
               return $this->getGroup($group_content);
             }
@@ -79,9 +83,17 @@ protected function getRelatedEntity(ContentEntityInterface $entity) {
             }
           }
           if ($this->pluginDefinition['credit_related'] == 'group_content') {
-            $group_contents = $this->entityTypeManager->getStorage('group_content')->loadByEntity($entity->getCommentedEntity());
-            $group_content = reset($group_contents);
-            return $group_content;
+            $node = $entity->getCommentedEntity();
+            if (empty($node)) {
+              return FALSE;
+            }
+            $group_contents = $this->entityTypeManager->getStorage('group_content')->loadByEntity($node);
+            if ($group_content = reset($group_contents)) {
+              return $group_content;
+            }
+            else {
+              return FALSE;
+            }
           }
         }
         break;
@@ -107,9 +119,15 @@ protected function getRelatedEntity(ContentEntityInterface $entity) {
    *   Group Content entity.
    */
   protected function getGroup(GroupContentInterface $group_content) {
-    // Since we have a group_conent we can get the group.
+    // Since we have a group_content we can get the group.
     $group = $group_content->getGroup();
 
+    // Prevent further execution if no group was found.
+    if (empty($group)) {
+      \Drupal::logger('entity_activity_tracker')->error($this->t("Couldn't find Group!"));
+      return FALSE;
+    }
+
     // Now we must find a tracker that matches the group
     // since a tracker is needed to create activity records.
     $properties = [
@@ -123,7 +141,7 @@ protected function getGroup(GroupContentInterface $group_content) {
     // Do something if there is a Tracker for group where content was created.
     if ($group_tracker) {
       // I NEED TO THINK HOW TO HANDLE MULTIPLE.
-      // SINCE WE DONT ALLOW A NODE BE PART OF 2 DIFERENT GROUPS ITS OK FOR NOW.
+      // SINCE WE DONT ALLOW A NODE BE PART OF 2 DIFFERENT GROUPS ITS OK FOR NOW.
       return $group;
     }
 

diff --git a/modules/entity_activity_tracker_group/src/Plugin/CreditGroupMembershipBase.php b/modules/entity_activity_tracker_group/src/Plugin/CreditGroupMembershipBase.php
@@ -19,6 +19,13 @@ protected function getRelatedEntity(ContentEntityInterface $entity) {
     if ($group_content_related_entity = parent::getRelatedEntity($entity)) {
       $group = $this->getGroup($group_content_related_entity);
 
+      // Prevent further execution if no group was found.
+      if (empty($group)) {
+
+        \Drupal::logger('entity_activity_tracker')->error($this->t("Couldn't find Group!"));
+        return FALSE;
+      }
+
       // Get the membership.
       $author_memberships = $this->entityTypeManager->getStorage('group_content')->loadByEntity($entity->getOwner());
       foreach ($author_memberships as $author_membership) {

diff --git a/modules/entity_activity_tracker_user/src/Plugin/ActivityProcessor/UserCreate.php b/modules/entity_activity_tracker_user/src/Plugin/ActivityProcessor/UserCreate.php
@@ -51,7 +51,9 @@ public function processActivity(Event $event) {
       case ActivityEventInterface::ENTITY_DELETE:
         /** @var \Drupal\entity_activity_tracker\ActivityRecord $activity_record */
         $activity_record = $this->activityRecordStorage->getActivityRecordByEntity($event->getEntity());
-        $this->activityRecordStorage->deleteActivityRecord($activity_record);
+        if ($activity_record) {
+          $this->activityRecordStorage->deleteActivityRecord($activity_record);
+        }
         break;
 
       case ActivityEventInterface::TRACKER_DELETE:

diff --git a/src/EventSubscriber/ActivitySubscriber.php b/src/EventSubscriber/ActivitySubscriber.php
@@ -92,7 +92,7 @@ public function scheduleDecay(CronEvent $event) {
   public function dispatchActivityEvent(Event $event) {
     // TODO: IMPROVE THIS FIRST CONDITION!!
     if (in_array($event->getEntity()->getEntityTypeId(), EntityActivityTrackerInterface::ALLOWED_ENTITY_TYPES)) {
-      // Dispatch curresponding activity event.
+      // Dispatch corresponding activity event.
       $this->activityEventDispatcher->dispatchActivityEvent($event);
 
       // TODO: Think a way to hook this. to let other modules play.

diff --git a/src/Plugin/ActivityProcessor/EntityCreate.php b/src/Plugin/ActivityProcessor/EntityCreate.php
@@ -124,7 +124,9 @@ public function processActivity(Event $event) {
       case ActivityEventInterface::ENTITY_DELETE:
         /** @var \Drupal\entity_activity_tracker\ActivityRecord $activity_record */
         $activity_record = $this->activityRecordStorage->getActivityRecordByEntity($event->getEntity());
-        $this->activityRecordStorage->deleteActivityRecord($activity_record);
+        if ($activity_record) {
+          $this->activityRecordStorage->deleteActivityRecord($activity_record);
+        }
         break;
 
       case ActivityEventInterface::TRACKER_DELETE:
@@ -160,4 +162,18 @@ protected function getExistingEntities(EntityActivityTrackerInterface $tracker)
 
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function canProcess(Event $event) {
+    // This should change since doesn't make sense to store Entity in event to then
+    // load it again.
+    $entity = $event->getEntity();
+    $exists = $this->entityTypeManager->getStorage($entity->getEntityTypeId())->load($entity->id());
+    if (empty($exists) && $event->getDispatcherType() == ActivityEventInterface::ENTITY_INSERT) {
+      return ActivityProcessorInterface::SKIP;
+    }
+    return ActivityProcessorInterface::PROCESS;
+  }
+
 }
diff --git a/src/Plugin/ActivityProcessor/EntityEdit.php b/src/Plugin/ActivityProcessor/EntityEdit.php
@@ -109,4 +109,18 @@ public function processActivity(Event $event) {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function canProcess(Event $event) {
+    // This should change since doesn't make sense to store Entity in event to then
+    // load it again.
+    $entity = $event->getEntity();
+    $exists = $this->entityTypeManager->getStorage($entity->getEntityTypeId())->load($entity->id());
+    if (empty($exists)) {
+      return ActivityProcessorInterface::SKIP;
+    }
+    return ActivityProcessorInterface::PROCESS;
+  }
+
 }
diff --git a/src/Plugin/ActivityProcessorBase.php b/src/Plugin/ActivityProcessorBase.php
@@ -79,7 +79,7 @@ public function processActivity(Event $event) {
    * Let plugins decide if can process.
    */
   public function canProcess(Event $event) {
-    // By default we will tell to ActivityProcessorQueue to allways process.
+    // By default we will tell to ActivityProcessorQueue to always process.
     return ActivityProcessorInterface::PROCESS;
   }
 

diff --git a/src/Plugin/ActivityProcessorCreditRelatedBase.php b/src/Plugin/ActivityProcessorCreditRelatedBase.php
@@ -3,6 +3,7 @@
 namespace Drupal\entity_activity_tracker\Plugin;
 
 use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\entity_activity_tracker\Event\ActivityEventInterface;
 use Drupal\entity_activity_tracker\Event\EntityActivityInsertEvent;
 use Symfony\Component\EventDispatcher\Event;
 
@@ -28,19 +29,17 @@ public function getSummary() {
    */
   public function processActivity(Event $event) {
     $dispatcher_type = $event->getDispatcherType();
-    switch ($dispatcher_type) {
-      case EntityActivityInsertEvent::ENTITY_INSERT:
 
-        /** @var \Drupal\Core\Entity\ContentEntityInterface $entity*/
+    switch ($dispatcher_type) {
+      case ActivityEventInterface::ENTITY_INSERT:
         $entity = $event->getEntity();
-
         // Get related entity.
         if ($related_entity = $this->getRelatedEntity($entity)) {
           $this->creditRelated($related_entity);
         }
         break;
 
-      case EntityActivityInsertEvent::TRACKER_CREATE:
+      case ActivityEventInterface::TRACKER_CREATE:
         // Iterate all already existing entities and credit related.
         foreach ($this->getExistingEntities($event->getTracker()) as $existing_entity) {
           // Get related entity.
@@ -49,7 +48,16 @@ public function processActivity(Event $event) {
           }
         }
         break;
+
+      case ActivityEventInterface::TRACKER_DELETE:
+        $tracker = $event->getTracker();
+        // Get ActivityRecords from this tracker.
+        foreach ($this->activityRecordStorage->getActivityRecords($tracker->getTargetEntityType(), $tracker->getTargetEntityBundle()) as $activity_record) {
+          $this->activityRecordStorage->deleteActivityRecord($activity_record);
+        }
+        break;
     }
+
   }
 
   /**
@@ -87,7 +95,7 @@ public function canProcess(Event $event) {
 
           // Get related entity.
           if ($related_entity = $this->getRelatedEntity($existing_entity)) {
-            // If we get a related entity we load the actibity record.
+            // If we get a related entity we load the activity record.
             // This will return false if related record doesn't exit.
             $related_records[] = $this->activityRecordStorage->getActivityRecordByEntity($related_entity);
           }
@@ -98,14 +106,17 @@ public function canProcess(Event $event) {
           return ActivityProcessorInterface::SKIP;
         }
         elseif (!in_array(FALSE, $related_records, TRUE)) {
-          // All related records needed exitst.
+          // All related records needed exist.
           return ActivityProcessorInterface::PROCESS;
         }
         else {
-          // Not all related records needed exitst.
+          // Not all related records needed exist.
           return ActivityProcessorInterface::SCHEDULE;
         }
         break;
+
+      default:
+        return ActivityProcessorInterface::PROCESS;
     }
   }
 
@@ -124,7 +135,9 @@ protected function getRelatedEntity(ContentEntityInterface $entity) {
             return $entity->getCommentedEntity();
           }
           if ($this->pluginDefinition['credit_related'] == 'user') {
-            return $entity->getOwner();
+            $user = $entity->getOwner();
+            // Prevent schedule for anonymous users.
+            return $user->id() != 0 ? $user : FALSE;
           }
         }
         break;