From 36c73b5336c49ac7ee1a042aa468757ffb3b2a52 Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Sat, 5 May 2018 20:48:37 -0400
Subject: [PATCH 1/8] Adding improved synchronization process

---
 Annotations/SyncParent.php                | 17 +++++
 EventListener/DoctrineEventSubscriber.php | 93 ++++++++++-------------
 Interfaces/SyncEntityInterface.php        |  6 ++
 Service/SyncService.php                   |  2 +-
 4 files changed, 63 insertions(+), 55 deletions(-)
 create mode 100755 Annotations/SyncParent.php
 create mode 100755 Interfaces/SyncEntityInterface.php

diff --git a/Annotations/SyncParent.php b/Annotations/SyncParent.php
new file mode 100755
index 0000000..1886d34
--- /dev/null
+++ b/Annotations/SyncParent.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace NTI\SyncBundle\Annotations;
+use Doctrine\Common\Annotations\Annotation\Required;
+
+/**
+ * Class SyncParent
+ * @package NTI\SyncBundle\Annotations
+ * @Annotation
+ */
+class SyncParent {
+    /**
+     * @var string
+     * @Required()
+     */
+    public $getter;
+}
\ No newline at end of file
diff --git a/EventListener/DoctrineEventSubscriber.php b/EventListener/DoctrineEventSubscriber.php
index 2b274bb..f9e3984 100755
--- a/EventListener/DoctrineEventSubscriber.php
+++ b/EventListener/DoctrineEventSubscriber.php
@@ -2,10 +2,15 @@
 
 namespace NTI\SyncBundle\EventListener;
 
+use AppBundle\Entity\Empanada\Empanada;
+use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\OnFlushEventArgs;
+use Doctrine\ORM\UnitOfWork;
+use NTI\SyncBundle\Annotations\SyncParent;
+use NTI\SyncBundle\Interfaces\SyncEntityInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class DoctrineEventSubscriber implements EventSubscriber
@@ -13,7 +18,8 @@ class DoctrineEventSubscriber implements EventSubscriber
     private $container;
     private $syncService;
 
-    public function __construct(ContainerInterface $container) {
+    public function __construct(ContainerInterface $container)
+    {
         $this->container = $container;
         $this->syncService = $this->container->get('nti.sync');
     }
@@ -28,72 +34,51 @@ public function getSubscribedEvents()
 
     public function onFlush(OnFlushEventArgs $args)
     {
+
         $em = $args->getEntityManager();
         $uow = $em->getUnitOfWork();
 
-        $somethingChanged = false;
-
-        $identityMap = $uow->getIdentityMap();
-
-        // ehhehehehee LOL
-        $deletedEntities = count($uow->getScheduledEntityDeletions()) > 0;
-        $insertedEntities = count($uow->getScheduledEntityInsertions()) > 0;
-
-        foreach($identityMap as $map) {
-            foreach($map as $object) {
-                $changes = $uow->getEntityChangeSet($object);
-                if(count($changes) > 1 || (count($changes) > 0 && !isset($changes["lastTimestamp"]) && !isset($changes["lastLogin"]))) {
-                    $somethingChanged = true;
-                    break;
-                }
-            }
-
-            if($somethingChanged) {
-                break;
+        foreach ($uow->getScheduledEntityUpdates() as $entity) {
+            // Check if the entity should be synchronized
+            if (!($entity instanceof SyncEntityInterface)) {
+                continue;
             }
+            $this->processEntity($em, $entity);
         }
 
-        if($deletedEntities || $insertedEntities)
-            $somethingChanged = true;
-
-        foreach ($uow->getScheduledEntityUpdates() as $keyEntity => $entity) {
-            $changes = $uow->getEntityChangeSet($entity);
-
-            if(count($changes) == 1 && isset($changes["lastTimestamp"]) && !isset($changes["lastLogin"]) && !$somethingChanged) {
-                $oid = spl_object_hash($entity);
-                $uow->clearEntityChangeSet($oid);
-            } else {
-                $this->handleEntityChange($em, $entity);
-            }
-        }
+    }
 
-        foreach ($uow->getScheduledEntityInsertions() as $keyEntity => $entity) {
-            $this->handleEntityChange($em, $entity);
-        }
+    public function preRemove(LifecycleEventArgs $args)
+    {
 
     }
 
-    public function preRemove(LifecycleEventArgs $args) {
-        $entity = $args->getEntity();
-        $class = get_class($entity);
-        $id = null;
+    private function processEntity(EntityManagerInterface $em, $entity)
+    {
+        $uow = $em->getUnitOfWork();
 
-        if(method_exists($entity, 'getId')) {
-            $id = $entity->getId();
-        }
+        $timestamp = time();
 
-        $this->syncService->addToDeleteSyncState($class, $id);
-    }
+        // Check if this class itself has a lastTimestamp
+        if(method_exists($entity, 'setLastTimestamp')) {
+            $entity->setLastTimestamp($timestamp);
+            $uow->computeChangeSet($em->getClassMetadata(get_class($entity)), $entity);
+        }
 
-    private function handleEntityChange(EntityManagerInterface $em, $entity) {
-        if(method_exists($entity, 'getLastTimestamp')) {
-            $timestamp = $entity->getLastTimestamp() ?? time();
-        } else {
-            $timestamp = time();
+        // Check if there are any relationships that should notified
+        $annotationReader = new AnnotationReader();
+        $reflection = new \ReflectionClass(get_class($entity));
+
+        /** @var \ReflectionProperty $property */
+        foreach ($reflection->getProperties() as $property) {
+            /** @var SyncParent $annotation */
+            if (null !== ($annotation = $annotationReader->getPropertyAnnotation($property, SyncParent::class))) {
+                $getter = $annotation->getter;
+                $parent = $entity->$getter();
+                if($parent instanceof SyncEntityInterface) {
+                    $this->processEntity($em, $parent);
+                }
+            }
         }
-        $class = get_class($entity);
-        $this->syncService->updateSyncState($em, $class, $timestamp);
     }
-
-
 }
diff --git a/Interfaces/SyncEntityInterface.php b/Interfaces/SyncEntityInterface.php
new file mode 100755
index 0000000..3b54861
--- /dev/null
+++ b/Interfaces/SyncEntityInterface.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace NTI\SyncBundle\Interfaces;
+
+interface SyncEntityInterface {
+}
\ No newline at end of file
diff --git a/Service/SyncService.php b/Service/SyncService.php
index 004ce9c..54a3b1d 100755
--- a/Service/SyncService.php
+++ b/Service/SyncService.php
@@ -80,7 +80,7 @@ public function getFromMappings($mappings) {
                 'changes' => $result["data"],
                 'deletes' => json_decode($this->container->get('jms_serializer')->serialize($deletes, 'json'), true),
                 'newItems' => json_decode($this->container->get('jms_serializer')->serialize($newItems, 'json'), true),
-		'failedItems' => json_decode($this->container->get('jms_serializer')->serialize($failedItems, 'json'), true),
+		        'failedItems' => json_decode($this->container->get('jms_serializer')->serialize($failedItems, 'json'), true),
                 SyncState::REAL_LAST_TIMESTAMP => $result[SyncState::REAL_LAST_TIMESTAMP],
             );
         }

From cf38cabba40aae7ff7469221009ff3f1f0c5f822 Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Tue, 8 May 2018 06:20:24 -0400
Subject: [PATCH 2/8] Working with deleted entities

---
 Annotations/SyncEntity.php                  |  13 ++
 Entity/SyncFailedItemState.php              |   2 +-
 Entity/SyncMapping.php                      |   2 +-
 EventListener/DoctrineEventSubscriber.php   |  84 -------------
 EventSubscriber/DoctrineEventSubscriber.php | 125 ++++++++++++++++++++
 Interfaces/SyncEntityInterface.php          |   6 -
 Resources/config/services.yml               |   2 +-
 Service/SyncService.php                     |  38 +-----
 8 files changed, 144 insertions(+), 128 deletions(-)
 create mode 100755 Annotations/SyncEntity.php
 mode change 100644 => 100755 Entity/SyncFailedItemState.php
 mode change 100644 => 100755 Entity/SyncMapping.php
 delete mode 100755 EventListener/DoctrineEventSubscriber.php
 create mode 100755 EventSubscriber/DoctrineEventSubscriber.php
 delete mode 100755 Interfaces/SyncEntityInterface.php

diff --git a/Annotations/SyncEntity.php b/Annotations/SyncEntity.php
new file mode 100755
index 0000000..1786a19
--- /dev/null
+++ b/Annotations/SyncEntity.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace NTI\SyncBundle\Annotations;
+use Doctrine\Common\Annotations\Annotation\Required;
+
+/**
+ * Class SyncParent
+ * @package NTI\SyncBundle\Annotations
+ * @Annotation
+ */
+class SyncEntity {
+
+}
\ No newline at end of file
diff --git a/Entity/SyncFailedItemState.php b/Entity/SyncFailedItemState.php
old mode 100644
new mode 100755
index 7088247..4d4fcd9
--- a/Entity/SyncFailedItemState.php
+++ b/Entity/SyncFailedItemState.php
@@ -54,7 +54,7 @@ class SyncFailedItemState {
     /**
      * @var string
      *
-     * @ORM\Column(name="errors", columnDefinition="TEXT", length=65535, nullable=true)
+     * @ORM\Column(name="errors", type="text", nullable=true)
      */
     private $errors;
 
diff --git a/Entity/SyncMapping.php b/Entity/SyncMapping.php
old mode 100644
new mode 100755
index 04ac4d2..ab4ca91
--- a/Entity/SyncMapping.php
+++ b/Entity/SyncMapping.php
@@ -38,7 +38,7 @@ class SyncMapping
     /**
      * @var string
      *
-     * @ORM\Column(name="sync_service", type="string", length=255, nullable=false)
+     * @ORM\Column(name="sync_service", type="string", length=255, nullable=true)
      */
     private $syncService;
 
diff --git a/EventListener/DoctrineEventSubscriber.php b/EventListener/DoctrineEventSubscriber.php
deleted file mode 100755
index f9e3984..0000000
--- a/EventListener/DoctrineEventSubscriber.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace NTI\SyncBundle\EventListener;
-
-use AppBundle\Entity\Empanada\Empanada;
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\EventSubscriber;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Event\LifecycleEventArgs;
-use Doctrine\ORM\Event\OnFlushEventArgs;
-use Doctrine\ORM\UnitOfWork;
-use NTI\SyncBundle\Annotations\SyncParent;
-use NTI\SyncBundle\Interfaces\SyncEntityInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-class DoctrineEventSubscriber implements EventSubscriber
-{
-    private $container;
-    private $syncService;
-
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-        $this->syncService = $this->container->get('nti.sync');
-    }
-
-    public function getSubscribedEvents()
-    {
-        return array(
-            'onFlush',
-            'preRemove',
-        );
-    }
-
-    public function onFlush(OnFlushEventArgs $args)
-    {
-
-        $em = $args->getEntityManager();
-        $uow = $em->getUnitOfWork();
-
-        foreach ($uow->getScheduledEntityUpdates() as $entity) {
-            // Check if the entity should be synchronized
-            if (!($entity instanceof SyncEntityInterface)) {
-                continue;
-            }
-            $this->processEntity($em, $entity);
-        }
-
-    }
-
-    public function preRemove(LifecycleEventArgs $args)
-    {
-
-    }
-
-    private function processEntity(EntityManagerInterface $em, $entity)
-    {
-        $uow = $em->getUnitOfWork();
-
-        $timestamp = time();
-
-        // Check if this class itself has a lastTimestamp
-        if(method_exists($entity, 'setLastTimestamp')) {
-            $entity->setLastTimestamp($timestamp);
-            $uow->computeChangeSet($em->getClassMetadata(get_class($entity)), $entity);
-        }
-
-        // Check if there are any relationships that should notified
-        $annotationReader = new AnnotationReader();
-        $reflection = new \ReflectionClass(get_class($entity));
-
-        /** @var \ReflectionProperty $property */
-        foreach ($reflection->getProperties() as $property) {
-            /** @var SyncParent $annotation */
-            if (null !== ($annotation = $annotationReader->getPropertyAnnotation($property, SyncParent::class))) {
-                $getter = $annotation->getter;
-                $parent = $entity->$getter();
-                if($parent instanceof SyncEntityInterface) {
-                    $this->processEntity($em, $parent);
-                }
-            }
-        }
-    }
-}
diff --git a/EventSubscriber/DoctrineEventSubscriber.php b/EventSubscriber/DoctrineEventSubscriber.php
new file mode 100755
index 0000000..0f58359
--- /dev/null
+++ b/EventSubscriber/DoctrineEventSubscriber.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace NTI\SyncBundle\EventSubscriber;
+
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\EventSubscriber;
+use Doctrine\Common\Util\ClassUtils;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Event\OnFlushEventArgs;
+use Doctrine\ORM\PersistentCollection;
+use NTI\SyncBundle\Annotations\SyncEntity;
+use NTI\SyncBundle\Annotations\SyncParent;
+use NTI\SyncBundle\Entity\SyncMapping;
+use NTI\SyncBundle\Entity\SyncState;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class DoctrineEventSubscriber implements EventSubscriber
+{
+    private $container;
+    private $syncService;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+        $this->syncService = $this->container->get('nti.sync');
+    }
+
+    public function getSubscribedEvents()
+    {
+        return array(
+            'onFlush',
+        );
+    }
+
+    public function onFlush(OnFlushEventArgs $args)
+    {
+
+        $em = $args->getEntityManager();
+        $uow = $em->getUnitOfWork();
+
+        foreach ($uow->getScheduledEntityUpdates() as $entity) {
+            $this->processEntity($em, $entity);
+        }
+
+        foreach ($uow->getScheduledEntityInsertions() as $entity) {
+            $this->processEntity($em, $entity);
+        }
+
+        foreach ($uow->getScheduledEntityDeletions() as $entity) {
+            $this->processEntity($em, $entity);
+            $this->container->get('nti.sync')->addToDeleteSyncState(ClassUtils::getClass($entity), $entity->getId());
+        }
+
+        /** @var PersistentCollection $collectionUpdate */
+        foreach ($uow->getScheduledCollectionUpdates() as $collectionUpdate) {
+            foreach($collectionUpdate as $entity) {
+                $this->processEntity($em, $entity);
+            }
+        }
+
+        /** @var PersistentCollection $collectionDeletion */
+        foreach($uow->getScheduledCollectionDeletions() as $collectionDeletion) {
+            foreach($collectionDeletion as $entity) {
+                $this->processEntity($em, $entity);
+                $this->container->get('nti.sync')->addToDeleteSyncState(ClassUtils::getClass($entity), $entity->getId());
+            }
+        }
+
+    }
+
+    private function processEntity(EntityManagerInterface $em, $entity)
+    {
+
+        $reflection = new \ReflectionClass(ClassUtils::getClass($entity));
+        $annotationReader = new AnnotationReader();
+        $syncEntityAnnotation = $annotationReader->getClassAnnotation($reflection, SyncEntity::class);
+        // Check if the entity should be synchronized
+        if (!$syncEntityAnnotation) {
+            return;
+        }
+
+        $uow = $em->getUnitOfWork();
+        $timestamp = time();
+
+        // Update the mapping's sync state if exists
+        $mapping = $em->getRepository(SyncMapping::class)->findOneBy(array("class" => get_class($entity)));
+        if($mapping) {
+            $syncState = $em->getRepository(SyncState::class)->findOneBy(array("mapping" => $mapping));
+            if(!$syncState) {
+                $syncState = new SyncState();
+                $syncState->setMapping($mapping);
+                $em->persist($syncState);
+            }
+            $syncState->setTimestamp($timestamp);
+            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(SyncState::class), $syncState);
+        }
+
+        // Check if this class itself has a lastTimestamp
+        if(method_exists($entity, 'setLastTimestamp')) {
+            $entity->setLastTimestamp($timestamp);
+            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(get_class($entity)), $entity);
+        }
+
+        // Notify relationships
+        /** @var \ReflectionProperty $property */
+        foreach ($reflection->getProperties() as $property) {
+
+            /** @var SyncParent $annotation */
+            if (null !== ($annotation = $annotationReader->getPropertyAnnotation($property, SyncParent::class))) {
+                $getter = $annotation->getter;
+                $parent = $entity->$getter();
+                dump($parent);
+                die;
+                // Using ClassUtils as $parent is actually a Proxy of the class
+                $reflrectionParent = new \ReflectionClass(ClassUtils::getClass($parent));
+                $syncParentAnnotation = $annotationReader->getClassAnnotation($reflrectionParent, SyncEntity::class);
+                if(!$syncParentAnnotation) {
+                    continue;
+                }
+                $this->processEntity($em, $parent);
+            }
+        }
+    }
+}
diff --git a/Interfaces/SyncEntityInterface.php b/Interfaces/SyncEntityInterface.php
deleted file mode 100755
index 3b54861..0000000
--- a/Interfaces/SyncEntityInterface.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-namespace NTI\SyncBundle\Interfaces;
-
-interface SyncEntityInterface {
-}
\ No newline at end of file
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 212e162..e065d6d 100755
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -1,6 +1,6 @@
 services:
     nti.sync.doctrine.listener:
-        class: NTI\SyncBundle\EventListener\DoctrineEventSubscriber
+        class: NTI\SyncBundle\EventSubscriber\DoctrineEventSubscriber
         arguments: ["@service_container"]
         tags:
             - { name: doctrine.event_subscriber, connection: default }
diff --git a/Service/SyncService.php b/Service/SyncService.php
index 54a3b1d..7a7129e 100755
--- a/Service/SyncService.php
+++ b/Service/SyncService.php
@@ -5,6 +5,7 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use NTI\SyncBundle\Entity\SyncDeleteState;
+use NTI\SyncBundle\Entity\SyncFailedItemState;
 use NTI\SyncBundle\Entity\SyncMapping;
 use NTI\SyncBundle\Entity\SyncNewItemState;
 use NTI\SyncBundle\Entity\SyncState;
@@ -62,10 +63,7 @@ public function getFromMappings($mappings) {
 
             $deletes = $this->em->getRepository(SyncDeleteState::class)->findFromTimestamp($mappingName, $timestamp);
             $newItems = $this->em->getRepository(SyncNewItemState::class)->findFromTimestampAndMapping($mappingName, $timestamp);
-	    /**
-             * Failed Items Synchronization
-             */
-            $failedItems = $this->em->getRepository('NTISyncBundle:SyncFailedItemState')->findFromTimestampAndMapping($mappingName, $timestamp);
+            $failedItems = $this->em->getRepository(SyncFailedItemState::class)->findFromTimestampAndMapping($mappingName, $timestamp);
 
             /** @var SyncRepositoryInterface $repository */
             $repository = $this->em->getRepository($syncMapping->getClass());
@@ -88,30 +86,6 @@ public function getFromMappings($mappings) {
         return $changes;
     }
 
-    public function updateSyncState(EntityManagerInterface $em, $class, $timestamp) {
-
-        $mapping = $em->getRepository(SyncMapping::class)->findOneBy(array("class" => $class));
-        if(!$mapping) {
-            return;
-        }
-
-        $syncState = $em->getRepository(SyncState::class)->findOneBy(array("mapping" => $mapping));
-
-        $uow = $em->getUnitOfWork();
-
-        if(!$syncState) {
-            $syncState = new SyncState();
-            $syncState->setMapping($mapping);
-            $syncState->setTimestamp($timestamp);
-            $em->persist($syncState);
-            $uow->computeChangeSet($em->getClassMetadata(SyncState::class), $syncState);
-        } else {
-            $syncState->setTimestamp($timestamp);
-            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(SyncState::class), $syncState);
-        }
-
-    }
-
     /**
      * Create a new SyncDeleteState for the given class/id
      *
@@ -122,6 +96,7 @@ public function addToDeleteSyncState($class, $id) {
 
         $this->em = $this->container->get('doctrine')->getManager();
 
+        /** @var SyncMapping $mapping */
         $mapping = $this->em->getRepository(SyncMapping::class)->findOneBy(array("class" => $class));
         if(!$mapping) {
             return;
@@ -133,12 +108,5 @@ public function addToDeleteSyncState($class, $id) {
         $deleteEntry->setTimestamp(time());
 
         $this->em->persist($deleteEntry);
-
-        try {
-            $this->em->flush();
-        } catch (\Exception $ex) {
-            error_log("Unable to register deletion of object: " . $class . " with ID " . $id);
-            error_log($ex->getMessage());
-        }
     }
 }

From 112de243327288761ba53c4ec9fbf6b306ec3c65 Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Thu, 10 May 2018 10:07:27 -0400
Subject: [PATCH 3/8] Removing dump

---
 EventSubscriber/DoctrineEventSubscriber.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/EventSubscriber/DoctrineEventSubscriber.php b/EventSubscriber/DoctrineEventSubscriber.php
index 0f58359..b8f2865 100755
--- a/EventSubscriber/DoctrineEventSubscriber.php
+++ b/EventSubscriber/DoctrineEventSubscriber.php
@@ -110,8 +110,6 @@ private function processEntity(EntityManagerInterface $em, $entity)
             if (null !== ($annotation = $annotationReader->getPropertyAnnotation($property, SyncParent::class))) {
                 $getter = $annotation->getter;
                 $parent = $entity->$getter();
-                dump($parent);
-                die;
                 // Using ClassUtils as $parent is actually a Proxy of the class
                 $reflrectionParent = new \ReflectionClass(ClassUtils::getClass($parent));
                 $syncParentAnnotation = $annotationReader->getClassAnnotation($reflrectionParent, SyncEntity::class);

From 3694219e7209a32e7737777374101bfcf86bc053 Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Mon, 21 May 2018 09:11:19 -0400
Subject: [PATCH 4/8] Changing get_class to avoid proxies

---
 .gitignore                                  |   1 +
 .idea/SyncBundle.iml                        |  10 +
 .idea/misc.xml                              |   6 +
 .idea/modules.xml                           |   8 +
 .idea/vcs.xml                               |   6 +
 .idea/workspace.xml                         | 196 ++++++++++++++++++++
 EventSubscriber/DoctrineEventSubscriber.php |   4 +-
 7 files changed, 229 insertions(+), 2 deletions(-)
 create mode 100755 .idea/SyncBundle.iml
 create mode 100755 .idea/misc.xml
 create mode 100755 .idea/modules.xml
 create mode 100755 .idea/vcs.xml
 create mode 100755 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index 3a2a5ba..a6a6a28 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 # Backup entities generated with doctrine:generate:entities command
 **/Entity/*~
 
+./.idea
diff --git a/.idea/SyncBundle.iml b/.idea/SyncBundle.iml
new file mode 100755
index 0000000..940f6f9
--- /dev/null
+++ b/.idea/SyncBundle.iml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100755
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100755
index 0000000..549aacb
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/SyncBundle.iml" filepath="$PROJECT_DIR$/.idea/SyncBundle.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100755
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100755
index 0000000..5661775
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="203a2646-7fb4-4daa-81cd-e16b1a375654" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Controller/SyncController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/SyncController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Entity/SyncState.php" beforeDir="false" afterPath="$PROJECT_DIR$/Entity/SyncState.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php" beforeDir="false" afterPath="$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Images/SynchronizationProcess-Client.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/Images/SynchronizationProcess-Client.PNG" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Images/SynchronizationProcess-PushPull.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/Images/SynchronizationProcess-PushPull.PNG" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Images/SynchronizationProcess-Server.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/Images/SynchronizationProcess-Server.PNG" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Interfaces/SyncRepositoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/Interfaces/SyncRepositoryInterface.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Interfaces/SyncServiceInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/Interfaces/SyncServiceInterface.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Repository/SyncDeleteStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncDeleteStateRepository.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Repository/SyncFailedItemStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncFailedItemStateRepository.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Repository/SyncNewItemStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncNewItemStateRepository.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Repository/SyncStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncStateRepository.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Resources/config/routing.yml" beforeDir="false" afterPath="$PROJECT_DIR$/Resources/config/routing.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Resources/config/services.yml" beforeDir="false" afterPath="$PROJECT_DIR$/Resources/config/services.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Service/SyncService.php" beforeDir="false" afterPath="$PROJECT_DIR$/Service/SyncService.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="DoctrineEventSubscriber.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="720">
+              <caret line="86" column="107" selection-start-line="86" selection-start-column="107" selection-end-line="86" selection-end-column="107" />
+              <caret line="101" column="92" selection-start-line="101" selection-start-column="92" selection-end-line="101" selection-end-column="92" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php" />
+        <option value="$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1936" />
+    <option name="height" value="1056" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="SyncBundle" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SyncBundle" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="SyncBundle" type="b2602c69:ProjectViewProjectNode" />
+              <item name="SyncBundle" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="EventSubscriber" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="203a2646-7fb4-4daa-81cd-e16b1a375654" name="Default" comment="" />
+      <created>1523390869087</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1523390869087</updated>
+      <workItem from="1523390870856" duration="601000" />
+      <workItem from="1526908157027" duration="98000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="699000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info active="true" anchor="right" content_ui="combo" id="Project" order="4" sideWeight="0.49420443" visible="true" weight="0.18283582" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.20442571" />
+      <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
+      <window_info anchor="bottom" id="Database Changes" order="10" />
+      <window_info anchor="bottom" id="Version Control" order="13" weight="0.32982087" />
+      <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Terminal" order="11" />
+      <window_info anchor="bottom" id="RNConsole" />
+      <window_info anchor="right" id="Favorites" order="5" sideWeight="0.5057956" side_tool="true" weight="0.21588486" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Run" order="4" />
+      <window_info anchor="bottom" id="Message" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Command Line Tools Console" order="12" weight="0.32921812" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="Database Console" order="0" weight="0.7239199" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.78925186" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="18" column="5" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
+          <folding>
+            <element signature="e#48#84#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
+          <folding>
+            <element signature="e#48#84#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="720">
+          <caret line="86" column="107" selection-start-line="86" selection-start-column="107" selection-end-line="86" selection-end-column="107" />
+          <caret line="101" column="92" selection-start-line="101" selection-start-column="92" selection-end-line="101" selection-end-column="92" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/EventSubscriber/DoctrineEventSubscriber.php b/EventSubscriber/DoctrineEventSubscriber.php
index b8f2865..8e2dac6 100755
--- a/EventSubscriber/DoctrineEventSubscriber.php
+++ b/EventSubscriber/DoctrineEventSubscriber.php
@@ -84,7 +84,7 @@ private function processEntity(EntityManagerInterface $em, $entity)
         $timestamp = time();
 
         // Update the mapping's sync state if exists
-        $mapping = $em->getRepository(SyncMapping::class)->findOneBy(array("class" => get_class($entity)));
+        $mapping = $em->getRepository(SyncMapping::class)->findOneBy(array("class" => ClassUtils::getClass($entity)));
         if($mapping) {
             $syncState = $em->getRepository(SyncState::class)->findOneBy(array("mapping" => $mapping));
             if(!$syncState) {
@@ -99,7 +99,7 @@ private function processEntity(EntityManagerInterface $em, $entity)
         // Check if this class itself has a lastTimestamp
         if(method_exists($entity, 'setLastTimestamp')) {
             $entity->setLastTimestamp($timestamp);
-            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(get_class($entity)), $entity);
+            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(ClassUtils::getClass($entity)), $entity);
         }
 
         // Notify relationships

From ef7234b0dba86bcec803f90dfff848344a827cf5 Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Mon, 21 May 2018 09:11:33 -0400
Subject: [PATCH 5/8] Removing .idea folder

---
 .idea/SyncBundle.iml |  10 ---
 .idea/misc.xml       |   6 --
 .idea/modules.xml    |   8 --
 .idea/vcs.xml        |   6 --
 .idea/workspace.xml  | 196 -------------------------------------------
 5 files changed, 226 deletions(-)
 delete mode 100755 .idea/SyncBundle.iml
 delete mode 100755 .idea/misc.xml
 delete mode 100755 .idea/modules.xml
 delete mode 100755 .idea/vcs.xml
 delete mode 100755 .idea/workspace.xml

diff --git a/.idea/SyncBundle.iml b/.idea/SyncBundle.iml
deleted file mode 100755
index 940f6f9..0000000
--- a/.idea/SyncBundle.iml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100755
index 28a804d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100755
index 549aacb..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/SyncBundle.iml" filepath="$PROJECT_DIR$/.idea/SyncBundle.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100755
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100755
index 5661775..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="203a2646-7fb4-4daa-81cd-e16b1a375654" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/SyncController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/SyncController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Entity/SyncState.php" beforeDir="false" afterPath="$PROJECT_DIR$/Entity/SyncState.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php" beforeDir="false" afterPath="$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Images/SynchronizationProcess-Client.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/Images/SynchronizationProcess-Client.PNG" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Images/SynchronizationProcess-PushPull.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/Images/SynchronizationProcess-PushPull.PNG" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Images/SynchronizationProcess-Server.PNG" beforeDir="false" afterPath="$PROJECT_DIR$/Images/SynchronizationProcess-Server.PNG" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Interfaces/SyncRepositoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/Interfaces/SyncRepositoryInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Interfaces/SyncServiceInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/Interfaces/SyncServiceInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Repository/SyncDeleteStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncDeleteStateRepository.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Repository/SyncFailedItemStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncFailedItemStateRepository.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Repository/SyncNewItemStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncNewItemStateRepository.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Repository/SyncStateRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/Repository/SyncStateRepository.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Resources/config/routing.yml" beforeDir="false" afterPath="$PROJECT_DIR$/Resources/config/routing.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Resources/config/services.yml" beforeDir="false" afterPath="$PROJECT_DIR$/Resources/config/services.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Service/SyncService.php" beforeDir="false" afterPath="$PROJECT_DIR$/Service/SyncService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
-    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="DoctrineEventSubscriber.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="720">
-              <caret line="86" column="107" selection-start-line="86" selection-start-column="107" selection-end-line="86" selection-end-column="107" />
-              <caret line="101" column="92" selection-start-line="101" selection-start-column="92" selection-end-line="101" selection-end-column="92" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php" />
-        <option value="$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1056" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="SyncBundle" type="b2602c69:ProjectViewProjectNode" />
-              <item name="SyncBundle" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="SyncBundle" type="b2602c69:ProjectViewProjectNode" />
-              <item name="SyncBundle" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="EventSubscriber" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="203a2646-7fb4-4daa-81cd-e16b1a375654" name="Default" comment="" />
-      <created>1523390869087</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1523390869087</updated>
-      <workItem from="1523390870856" duration="601000" />
-      <workItem from="1526908157027" duration="98000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="699000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" anchor="right" content_ui="combo" id="Project" order="4" sideWeight="0.49420443" visible="true" weight="0.18283582" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.20442571" />
-      <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
-      <window_info anchor="bottom" id="Database Changes" order="10" />
-      <window_info anchor="bottom" id="Version Control" order="13" weight="0.32982087" />
-      <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Terminal" order="11" />
-      <window_info anchor="bottom" id="RNConsole" />
-      <window_info anchor="right" id="Favorites" order="5" sideWeight="0.5057956" side_tool="true" weight="0.21588486" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Run" order="4" />
-      <window_info anchor="bottom" id="Message" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Command Line Tools Console" order="12" weight="0.32921812" />
-      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
-      <window_info anchor="bottom" id="Database Console" order="0" weight="0.7239199" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.78925186" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="18" column="5" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
-          <folding>
-            <element signature="e#48#84#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/EventListener/DoctrineEventSubscriber.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
-          <folding>
-            <element signature="e#48#84#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/EventSubscriber/DoctrineEventSubscriber.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="720">
-          <caret line="86" column="107" selection-start-line="86" selection-start-column="107" selection-end-line="86" selection-end-column="107" />
-          <caret line="101" column="92" selection-start-line="101" selection-start-column="92" selection-end-line="101" selection-end-column="92" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file

From 0548505809513d18d13829c919fe6048980b63cf Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Sun, 27 May 2018 19:29:14 -0400
Subject: [PATCH 6/8] Added computeChangeSet to deleted items

---
 Service/SyncService.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Service/SyncService.php b/Service/SyncService.php
index 7a7129e..6d55d43 100755
--- a/Service/SyncService.php
+++ b/Service/SyncService.php
@@ -108,5 +108,7 @@ public function addToDeleteSyncState($class, $id) {
         $deleteEntry->setTimestamp(time());
 
         $this->em->persist($deleteEntry);
+        $uow = $this->em->getUnitOfWork();
+        $uow->computeChangeSet($this->em->getClassMetadata(SyncDeleteState::class), $deleteEntry);
     }
 }

From fdd26decb6fd7be0c62bbd190e620378a1021567 Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Sun, 27 May 2018 19:58:55 -0400
Subject: [PATCH 7/8] Added entity state verification

---
 EventSubscriber/DoctrineEventSubscriber.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/EventSubscriber/DoctrineEventSubscriber.php b/EventSubscriber/DoctrineEventSubscriber.php
index 8e2dac6..ae38a46 100755
--- a/EventSubscriber/DoctrineEventSubscriber.php
+++ b/EventSubscriber/DoctrineEventSubscriber.php
@@ -9,6 +9,7 @@
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\PersistentCollection;
+use Doctrine\ORM\UnitOfWork;
 use NTI\SyncBundle\Annotations\SyncEntity;
 use NTI\SyncBundle\Annotations\SyncParent;
 use NTI\SyncBundle\Entity\SyncMapping;
@@ -93,13 +94,17 @@ private function processEntity(EntityManagerInterface $em, $entity)
                 $em->persist($syncState);
             }
             $syncState->setTimestamp($timestamp);
-            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(SyncState::class), $syncState);
+            if($uow->getEntityState($syncState) == UnitOfWork::STATE_MANAGED) {
+                $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(SyncState::class), $syncState);
+            }
         }
 
         // Check if this class itself has a lastTimestamp
         if(method_exists($entity, 'setLastTimestamp')) {
             $entity->setLastTimestamp($timestamp);
-            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(ClassUtils::getClass($entity)), $entity);
+            if($uow->getEntityState($entity) == UnitOfWork::STATE_MANAGED) {
+                $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(ClassUtils::getClass($entity)), $entity);
+            }
         }
 
         // Notify relationships

From a992791c02eb273d08c2c7da1b05d86030f0eab9 Mon Sep 17 00:00:00 2001
From: Benjamin Vison <benjamin@syneteksolutions.com>
Date: Wed, 27 Jun 2018 16:41:32 +0000
Subject: [PATCH 8/8] Added fix for bug when deleting entities

---
 EventSubscriber/DoctrineEventSubscriber.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/EventSubscriber/DoctrineEventSubscriber.php b/EventSubscriber/DoctrineEventSubscriber.php
index ae38a46..c06d84d 100755
--- a/EventSubscriber/DoctrineEventSubscriber.php
+++ b/EventSubscriber/DoctrineEventSubscriber.php
@@ -49,8 +49,9 @@ public function onFlush(OnFlushEventArgs $args)
         }
 
         foreach ($uow->getScheduledEntityDeletions() as $entity) {
-            $this->processEntity($em, $entity);
+            $this->processEntity($em, $entity, true);
             $this->container->get('nti.sync')->addToDeleteSyncState(ClassUtils::getClass($entity), $entity->getId());
+
         }
 
         /** @var PersistentCollection $collectionUpdate */
@@ -63,14 +64,14 @@ public function onFlush(OnFlushEventArgs $args)
         /** @var PersistentCollection $collectionDeletion */
         foreach($uow->getScheduledCollectionDeletions() as $collectionDeletion) {
             foreach($collectionDeletion as $entity) {
-                $this->processEntity($em, $entity);
+                $this->processEntity($em, $entity, true);
                 $this->container->get('nti.sync')->addToDeleteSyncState(ClassUtils::getClass($entity), $entity->getId());
             }
         }
 
     }
 
-    private function processEntity(EntityManagerInterface $em, $entity)
+    private function processEntity(EntityManagerInterface $em, $entity, $deleting = false)
     {
 
         $reflection = new \ReflectionClass(ClassUtils::getClass($entity));
@@ -100,11 +101,9 @@ private function processEntity(EntityManagerInterface $em, $entity)
         }
 
         // Check if this class itself has a lastTimestamp
-        if(method_exists($entity, 'setLastTimestamp')) {
+        if(!$deleting && method_exists($entity, 'setLastTimestamp')) {
             $entity->setLastTimestamp($timestamp);
-            if($uow->getEntityState($entity) == UnitOfWork::STATE_MANAGED) {
-                $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(ClassUtils::getClass($entity)), $entity);
-            }
+            $uow->recomputeSingleEntityChangeSet($em->getClassMetadata(ClassUtils::getClass($entity)), $entity);
         }
 
         // Notify relationships