correctly detect non enriched activities and skip them during view rendering

Author: tbarbugli

src/GetStream/StreamLaravel/Enrich.php

@@ -51,11 +51,6 @@ private function retrieveObjects($references)
                 $with = $content_type_model->activityLazyLoading;
             }
             $fetched = $this->fromDb($content_type_model, array_keys($content_ids), $with);
-            if (count($fetched) < count(array_keys($content_ids))) {
-                $missing_ids = array_values(array_diff(array_keys($content_ids), array_keys($fetched)));
-                $pretty_ids = var_export($missing_ids, true);
-                throw new MissingDataException("Some data in this feed is not in the database: model: {$content_type} ids:{$pretty_ids}");
-            }
             $objects[$content_type] = $fetched;
         }
         return $objects;
@@ -74,16 +69,18 @@ private function injectObjects(&$activities, $objects)
     {
         foreach ($activities as $key => $activity) {
             foreach ($this->fields as $field) {
-                if (!array_key_exists($field, $activity))
+                if (!isset($activity[$field]))
                     continue;
                 $value = $activity[$field];
                 $reference = explode(':', $value);
-                if (!array_key_exists($reference[0], $objects))
+                if (!array_key_exists($reference[0], $objects)) {
                     $activity->trackNotEnrichedField($reference[0], $reference[1]);
                     continue;
-                if (!array_key_exists($reference[1], $objects[$reference[0]]))
+                }
+                if (!array_key_exists($reference[1], $objects[$reference[0]])) {
                     $activity->trackNotEnrichedField($reference[0], $reference[1]);
                     continue;
+                }
                 $activities[$key][$field] = $objects[$reference[0]][$reference[1]];
             }
         }

src/views/render_activity.blade.php

@@ -1,13 +1,17 @@
-@if (isset($prefix))
-    @if (array_key_exists('activities', $activity))
-        @include("aggregated_activity.{$prefix}_{$activity['verb']}", array('activity'=>$activity))
+@if ($activity->enriched())
+    @if (isset($prefix))
+        @if (array_key_exists('activities', $activity))
+            @include("aggregated_activity.{$prefix}_{$activity['verb']}", array('activity'=>$activity))
+        @else
+            @include("/activity.{$prefix}_{$activity['verb']}", array('activity'=>$activity))
+        @endif
     @else
-        @include("/activity.{$prefix}_{$activity['verb']}", array('activity'=>$activity))
+        @if (array_key_exists('activities', $activity))
+            @include("aggregated_activity.{$activity['verb']}", array('activity'=>$activity))
+        @else
+            @include("/activity.{$activity['verb']}", array('activity'=>$activity))
+        @endif
     @endif
 @else
-    @if (array_key_exists('activities', $activity))
-        @include("aggregated_activity.{$activity['verb']}", array('activity'=>$activity))
-    @else
-        @include("/activity.{$activity['verb']}", array('activity'=>$activity))
-    @endif
+    {{ ''; Log::warning('The activity could not be rendered, the following field/refs could not be enriched:', $activity->getNotEnrichedData()); }}
 @endif