Activity persistance bugfixes

Author: markus-moser

src/ActivityStore/MariaDb.php

@@ -87,7 +87,7 @@ public function updateActivityStoreEntry(ActivityStoreEntryInterface $entry, $up
             $this->saveActivityStoreEntry($entry, $activity);
         }
 
-        throw new \Exception('related activity not found - updating attributes failed');
+        $this->saveActivityStoreEntry($entry);
     }
 
     protected function saveActivityStoreEntry(ActivityStoreEntryInterface $entry, ActivityInterface $activity = null)
@@ -99,18 +99,23 @@ protected function saveActivityStoreEntry(ActivityStoreEntryInterface $entry, Ac
         unset($data['attributes']);
         if (!is_null($activity)) {
             $data['attributes'] = $this->getActivityAttributeDataAsDynamicColumnInsert($activity);
+            $data['type'] = $db->quote($activity->cmfGetType());
+            $data['implementationClass'] = $db->quote(get_class($activity));
+        } else {
+            $data['type'] = $db->quote($data['type']);
+            $data['implementationClass'] = $db->quote($data['implementationClass']);
         }
 
-        $data['type'] = $db->quote($activity->cmfGetType());
-        $data['implementationClass'] = $db->quote(get_class($activity));
         $data['a_id'] = $db->quote($data['a_id']);
 
         if ($activity instanceof ActivityExternalIdInterface) {
             $data['a_id'] = $db->quote($activity->getId());
         }
 
+        $data['customerId'] = !is_null($activity) ? $activity->getCustomer()->getId() : $entry->getCustomerId();
+
         $md5Data = [
-            'customerId' => $activity->getCustomer()->getId(),
+            'customerId' => $data['customerId'],
             'type' => $data['type'],
             'implementationClass' => $data['implementationClass'],
             'o_id' => $data['o_id'],

src/Model/ActivityList/DefaultMariaDbActivityList/Dao.php

@@ -128,7 +128,11 @@ protected function addConditions(Db\ZendCompatibility\QueryBuilder $select)
         $condition = $this->model->getCondition();
 
         if ($condition) {
-            $select->where($condition, $this->model->getConditionVariables());
+            if($conditionVariables = $this->model->getConditionVariables()) {
+                $select->where($condition, $conditionVariables);
+            } else {
+                $select->where($condition);
+            }
         }
 
         return $this;

src/Model/ActivityStoreEntry/DefaultActivityStoreEntry.php

@@ -319,7 +319,10 @@ public function getData()
     public function save($updateAttributes = false)
     {
         $relatedItem = $this->getRelatedItem();
-        $relatedItem->setCustomer($this->getCustomer());
-        \Pimcore::getContainer()->get('cmf.activity_store')->updateActivityStoreEntry($this, $updateAttributes);
+        if($relatedItem) {
+            $relatedItem->setCustomer($this->getCustomer());
+        }
+
+        \Pimcore::getContainer()->get('cmf.activity_store')->updateActivityStoreEntry($this, $relatedItem ? $updateAttributes : false);
     }
 }