option to move entries from one entity to another upon deletion (#409)

src/Repository/ActivityRepository.php

@@ -15,6 +15,7 @@ use App\Entity\Timesheet;
 use App\Entity\User;
 use App\Model\ActivityStatistic;
 use App\Repository\Query\ActivityQuery;
+use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Pagerfanta\Pagerfanta;
@@ -183,6 +184,11 @@ class ActivityRepository extends AbstractRepository
             $qb->setParameter('customer', $query->getCustomer());
         }
 
+        if (!empty($query->getIgnoredEntities())) {
+            $qb->andWhere('a.id NOT IN(:ignored)');
+            $qb->setParameter('ignored', $query->getIgnoredEntities());
+        }
+
         $or = $qb->expr()->orX();
 
         // this must always be the last part before the or
@@ -204,4 +210,38 @@ class ActivityRepository extends AbstractRepository
 
         return $this->getBaseQueryResult($qb, $query);
     }
+
+    /**
+     * @param Activity $delete
+     * @param Activity|null $replace
+     * @throws \Doctrine\ORM\ORMException
+     * @throws \Doctrine\ORM\OptimisticLockException
+     */
+    public function deleteActivity(Activity $delete, ?Activity $replace = null)
+    {
+        $em = $this->getEntityManager();
+        $em->beginTransaction();
+
+        try {
+            if (null !== $replace) {
+                $qb = $em->createQueryBuilder();
+                $query = $qb
+                    ->update(Timesheet::class, 't')
+                    ->set('t.activity', ':replace')
+                    ->where('t.activity = :delete')
+                    ->setParameter('delete', $delete)
+                    ->setParameter('replace', $replace)
+                    ->getQuery();
+
+                $result = $query->execute();
+            }
+
+            $em->remove($delete);
+            $em->flush();
+            $em->commit();
+        } catch (ORMException $ex) {
+            $em->rollback();
+            throw $ex;
+        }
+    }
 }

src/Repository/CustomerRepository.php

@@ -15,6 +15,7 @@ use App\Entity\Project;
 use App\Entity\Timesheet;
 use App\Model\CustomerStatistic;
 use App\Repository\Query\CustomerQuery;
+use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Pagerfanta\Pagerfanta;
@@ -121,6 +122,43 @@ class CustomerRepository extends AbstractRepository
             $qb->andWhere('c.visible = 0');
         }
 
+        if (!empty($query->getIgnoredEntities())) {
+            $qb->andWhere('c.id NOT IN(:ignored)');
+            $qb->setParameter('ignored', $query->getIgnoredEntities());
+        }
+
         return $this->getBaseQueryResult($qb, $query);
     }
+
+    /**
+     * @param Customer $delete
+     * @param Customer|null $replace
+     * @throws \Doctrine\ORM\ORMException
+     */
+    public function deleteCustomer(Customer $delete, ?Customer $replace = null)
+    {
+        $em = $this->getEntityManager();
+        $em->beginTransaction();
+
+        try {
+            if (null !== $replace) {
+                $qb = $em->createQueryBuilder();
+                $qb
+                    ->update(Project::class, 'p')
+                    ->set('p.customer', ':replace')
+                    ->where('p.customer = :delete')
+                    ->setParameter('delete', $delete)
+                    ->setParameter('replace', $replace)
+                    ->getQuery()
+                    ->execute();
+            }
+
+            $em->remove($delete);
+            $em->flush();
+            $em->commit();
+        } catch (ORMException $ex) {
+            $em->rollback();
+            throw $ex;
+        }
+    }
 }

src/Repository/ProjectRepository.php

@@ -15,6 +15,7 @@ use App\Entity\Project;
 use App\Entity\Timesheet;
 use App\Model\ProjectStatistic;
 use App\Repository\Query\ProjectQuery;
+use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Pagerfanta\Pagerfanta;
@@ -131,6 +132,53 @@ class ProjectRepository extends AbstractRepository
                 ->setParameter('customer', $query->getCustomer());
         }
 
+        if (!empty($query->getIgnoredEntities())) {
+            $qb->andWhere('p.id NOT IN(:ignored)');
+            $qb->setParameter('ignored', $query->getIgnoredEntities());
+        }
+
         return $this->getBaseQueryResult($qb, $query);
     }
+
+    /**
+     * @param Project $delete
+     * @param Project|null $replace
+     * @throws \Doctrine\ORM\ORMException
+     */
+    public function deleteProject(Project $delete, ?Project $replace = null)
+    {
+        $em = $this->getEntityManager();
+        $em->beginTransaction();
+
+        try {
+            if (null !== $replace) {
+                $qb = $em->createQueryBuilder();
+                $qb
+                    ->update(Timesheet::class, 't')
+                    ->set('t.project', ':replace')
+                    ->where('t.project = :delete')
+                    ->setParameter('delete', $delete)
+                    ->setParameter('replace', $replace)
+                    ->getQuery()
+                    ->execute();
+
+                $qb = $em->createQueryBuilder();
+                $qb
+                    ->update(Activity::class, 'a')
+                    ->set('a.project', ':replace')
+                    ->where('a.project = :delete')
+                    ->setParameter('delete', $delete)
+                    ->setParameter('replace', $replace)
+                    ->getQuery()
+                    ->execute();
+            }
+
+            $em->remove($delete);
+            $em->flush();
+            $em->commit();
+        } catch (ORMException $ex) {
+            $em->rollback();
+            throw $ex;
+        }
+    }
 }

src/Repository/Query/CustomerQuery.php

@@ -9,9 +9,34 @@
 
 namespace App\Repository\Query;
 
+use App\Entity\Customer;
+
 /**
  * Can be used for advanced queries with the: CustomerRepository
  */
 class CustomerQuery extends VisibilityQuery
 {
+    /**
+     * @var array
+     */
+    protected $ignored = [];
+
+    /**
+     * @param Customer|int $customer
+     * @return $this
+     */
+    public function addIgnoredEntity($customer)
+    {
+        $this->ignored[] = $customer;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getIgnoredEntities()
+    {
+        return $this->ignored;
+    }
 }

src/Repository/Query/ProjectQuery.php

@@ -21,6 +21,30 @@ class ProjectQuery extends VisibilityQuery
      */
     protected $customer;
 
+    /**
+     * @var array
+     */
+    protected $ignored = [];
+
+    /**
+     * @param mixed $entity
+     * @return $this
+     */
+    public function addIgnoredEntity($entity)
+    {
+        $this->ignored[] = $entity;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getIgnoredEntities()
+    {
+        return $this->ignored;
+    }
+
     /**
      * @return Customer|int
      */

src/Repository/TimesheetRepository.php

@@ -291,6 +291,7 @@ class TimesheetRepository extends AbstractRepository
             $qb->andWhere('t.begin >= :begin')
                 ->setParameter('begin', $query->getBegin());
         }
+
         if (null !== $query->getEnd()) {
             $qb->andWhere('t.end <= :end')
                 ->setParameter('end', $query->getEnd());
@@ -299,12 +300,16 @@ class TimesheetRepository extends AbstractRepository
         if (null !== $query->getActivity()) {
             $qb->andWhere('t.activity = :activity')
                 ->setParameter('activity', $query->getActivity());
-        } elseif (null !== $query->getProject()) {
-            $qb->andWhere('t.project = :project')
-                ->setParameter('project', $query->getProject());
-        } elseif (null !== $query->getCustomer()) {
-            $qb->andWhere('p.customer = :customer')
-                ->setParameter('customer', $query->getCustomer());
+        }
+
+        if (null === $query->getActivity() || null === $query->getActivity()->getProject()) {
+            if (null !== $query->getProject()) {
+                $qb->andWhere('t.project = :project')
+                    ->setParameter('project', $query->getProject());
+            } elseif (null !== $query->getCustomer()) {
+                $qb->andWhere('p.customer = :customer')
+                    ->setParameter('customer', $query->getCustomer());
+            }
         }
 
         return $this->getBaseQueryResult($qb, $query);