Tracking lead manipulator

app/bundles/CoreBundle/Controller/JsController.php

@@ -25,6 +25,9 @@ class JsController extends CommonController
      */
     public function indexAction()
     {
+        // Don't store a visitor with this request
+        defined('MAUTIC_NON_TRACKABLE_REQUEST') || define('MAUTIC_NON_TRACKABLE_REQUEST', 1);
+
         $dispatcher = $this->dispatcher;
         $debug      = $this->factory->getKernel()->isDebug();
         $event      = new BuildJsEvent($this->getJsHeader(), $debug);

app/bundles/DynamicContentBundle/Controller/DynamicContentApiController.php

@@ -32,6 +32,9 @@ class DynamicContentApiController extends CommonController
      */
     public function processAction($objectAlias)
     {
+        // Don't store a visitor with this request
+        defined('MAUTIC_NON_TRACKABLE_REQUEST') || define('MAUTIC_NON_TRACKABLE_REQUEST', 1);
+
         $method = $this->request->getMethod();
         if (method_exists($this, $method.'Action')) {
             return $this->{$method.'Action'}($objectAlias);
@@ -42,6 +45,9 @@ public function processAction($objectAlias)
 
     public function getAction($objectAlias)
     {
+        // Don't store a visitor with this request
+        defined('MAUTIC_NON_TRACKABLE_REQUEST') || define('MAUTIC_NON_TRACKABLE_REQUEST', 1);
+
         /** @var LeadModel $model */
         $model = $this->getModel('lead');
         /** @var DynamicContentHelper $helper */

app/bundles/FormBundle/Controller/PublicController.php

@@ -396,6 +396,9 @@ public function previewAction($id = 0)
      */
     public function generateAction()
     {
+        // Don't store a visitor with this request
+        defined('MAUTIC_NON_TRACKABLE_REQUEST') || define('MAUTIC_NON_TRACKABLE_REQUEST', 1);
+
         $formId = InputHelper::int($this->request->get('id'));
 
         $model = $this->getModel('form.form');

app/bundles/FormBundle/Model/SubmissionModel.php

@@ -34,6 +34,7 @@
 use Mautic\FormBundle\Helper\FormFieldHelper;
 use Mautic\FormBundle\Helper\FormUploader;
 use Mautic\FormBundle\Validator\UploadFieldValidator;
+use Mautic\LeadBundle\DataObject\LeadManipulator;
 use Mautic\LeadBundle\Entity\Company;
 use Mautic\LeadBundle\Entity\CompanyChangeLog;
 use Mautic\LeadBundle\Entity\Lead;
@@ -1012,6 +1013,12 @@ protected function createLeadFromSubmit(Form $form, array $leadFieldMatches, $le
         $lead->setLastActive(new \DateTime());
 
         //create a new lead
+        $lead->setManipulator(new LeadManipulator(
+            'form',
+            'submission',
+            $form->getId(),
+            $form->getName()
+        ));
         $this->leadModel->saveEntity($lead, false);
 
         if (!$inKioskMode) {

app/bundles/LeadBundle/Config/config.php

@@ -446,6 +446,13 @@
             'mautic.lead.configbundle.subscriber' => [
                 'class' => Mautic\LeadBundle\EventListener\ConfigSubscriber::class,
             ],
+            'mautic.lead.timeline_events.subscriber' => [
+                'class'     => \Mautic\LeadBundle\EventListener\TimelineEventLogSubscriber::class,
+                'arguments' => [
+                    'translator',
+                    'mautic.lead.repository.lead_event_log',
+                ],
+            ],
         ],
         'forms' => [
             'mautic.form.type.lead' => [
@@ -732,6 +739,13 @@
                     \Mautic\LeadBundle\Entity\Lead::class,
                 ],
             ],
+            'mautic.lead.repository.lead_event_log' => [
+                'class'     => Doctrine\ORM\EntityRepository::class,
+                'factory'   => ['@doctrine.orm.entity_manager', 'getRepository'],
+                'arguments' => [
+                    \Mautic\LeadBundle\Entity\LeadEventLog::class,
+                ],
+            ],
             'mautic.lead.repository.lead_device' => [
                 'class'     => Doctrine\ORM\EntityRepository::class,
                 'factory'   => ['@doctrine.orm.entity_manager', 'getRepository'],

app/bundles/LeadBundle/Controller/LeadController.php

@@ -14,6 +14,7 @@
 use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\CoreBundle\Model\IteratorExportDataModel;
+use Mautic\LeadBundle\DataObject\LeadManipulator;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\LeadModel;
@@ -441,6 +442,12 @@ public function newAction()
                     $model->setFieldValues($lead, $data, true);
 
                     //form is valid so process the data
+                    $lead->setManipulator(new LeadManipulator(
+                        'lead',
+                        'lead',
+                        null,
+                        $this->get('mautic.helper.user')->getUser()->getName()
+                    ));
                     $model->saveEntity($lead);
 
                     if (!empty($companies)) {
@@ -622,6 +629,12 @@ public function editAction($objectId, $ignorePost = false)
                     $model->setFieldValues($lead, $data, true);
 
                     //form is valid so process the data
+                    $lead->setManipulator(new LeadManipulator(
+                        'lead',
+                        'lead',
+                        $objectId,
+                        $this->get('mautic.helper.user')->getUser()->getName()
+                    ));
                     $model->saveEntity($lead, $form->get('buttons')->get('save')->isClicked());
                     $model->modifyCompanies($lead, $companies);
 

app/bundles/LeadBundle/DataObject/LeadManipulator.php

@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * @copyright   2014 Mautic Contributors. All rights reserved
+ * @author      Mautic
+ *
+ * @link        http://mautic.org
+ *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+namespace Mautic\LeadBundle\DataObject;
+
+/**
+ * Class LeadManipulator.
+ */
+class LeadManipulator
+{
+    /**
+     * @var string|null
+     */
+    private $bundleName;
+
+    /**
+     * @var string|null
+     */
+    private $objectName;
+
+    /**
+     * @var int|null
+     */
+    private $objectId;
+
+    /**
+     * @var string|null
+     */
+    private $objectDescription;
+
+    /**
+     * LeadManipulator constructor.
+     *
+     * @param null $bundleName
+     * @param null $objectName
+     * @param null $objectId
+     * @param null $objectDescription
+     */
+    public function __construct($bundleName = null, $objectName = null, $objectId = null, $objectDescription = null)
+    {
+        $this->bundleName        = $bundleName;
+        $this->objectName        = $objectName;
+        $this->objectId          = $objectId;
+        $this->objectDescription = $objectDescription;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBundleName()
+    {
+        return $this->bundleName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getObjectName()
+    {
+        return $this->objectName;
+    }
+
+    /**
+     * @return int
+     */
+    public function getObjectId()
+    {
+        return $this->objectId;
+    }
+
+    public function getObjectDescription()
+    {
+        return $this->objectDescription;
+    }
+}

app/bundles/LeadBundle/Entity/Lead.php

@@ -17,6 +17,7 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
 use Mautic\CoreBundle\Entity\IpAddress;
+use Mautic\LeadBundle\DataObject\LeadManipulator;
 use Mautic\LeadBundle\Model\FieldModel;
 use Mautic\NotificationBundle\Entity\PushID;
 use Mautic\StageBundle\Entity\Stage;
@@ -199,6 +200,11 @@ class Lead extends FormEntity implements CustomFieldEntityInterface
      */
     private $color;
 
+    /**
+     * @var LeadManipulator
+     */
+    private $manipulator = null;
+
     /**
      * Sets if the IP was just created by LeadModel::getCurrentLead().
      *
@@ -1264,6 +1270,14 @@ public function isAnonymous()
         );
     }
 
+    /**
+     * @return bool
+     */
+    public function wasAnonymous()
+    {
+        return $this->dateIdentified == null && $this->isAnonymous() === false;
+    }
+
     /**
      * @return bool
      */
@@ -1286,6 +1300,26 @@ protected function getFirstSocialIdentity()
         return false;
     }
 
+    /**
+     * @param LeadManipulator|null $manipulator
+     *
+     * @return self
+     */
+    public function setManipulator(LeadManipulator $manipulator = null)
+    {
+        $this->manipulator = $manipulator;
+
+        return $this;
+    }
+
+    /**
+     * @return LeadManipulator|null
+     */
+    public function getManipulator()
+    {
+        return $this->manipulator;
+    }
+
     /**
      * @return bool
      */
@@ -1553,7 +1587,7 @@ public function checkAttributionDate()
      */
     public function checkDateIdentified()
     {
-        if ($this->dateIdentified == null && $this->isAnonymous() === false) {
+        if ($this->wasAnonymous()) {
             $this->dateIdentified            = new \DateTime();
             $this->changes['dateIdentified'] = ['', $this->dateIdentified];
         }

app/bundles/LeadBundle/Entity/LeadEventLog.php

@@ -89,6 +89,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->addIndex(['lead_id'], 'lead_id_index')
             ->addIndex(['object', 'object_id'], 'lead_object_index')
             ->addIndex(['bundle', 'object', 'action', 'object_id'], 'lead_timeline_index')
+            ->addIndex(['action'], 'lead_timeline_action_index')
             ->addIndex(['date_added'], 'lead_date_added_index')
             ->addId()
             ->addNullableField('userId', Type::INTEGER, 'user_id')
@@ -101,7 +102,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->addNullableField('properties', Type::JSON_ARRAY);
 
         $builder->createManyToOne('lead', Lead::class)
-            ->addJoinColumn('lead_id', 'id', true, false, 'SET NULL')
+            ->addJoinColumn('lead_id', 'id', true, false, 'CASCADE')
             ->inversedBy('eventLog')
             ->build();
     }