bugfix: address and proxy class

KejawenLab · Nov 18, 2017 · c9c0863 · c9c0863
1 parent e42547e
commit c9c0863
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 26 deletions.
diff --git a/.php_cs.cache b/.php_cs.cache
diff --git a/src/Component/Address/Service/DefaultAddressChecker.php b/src/Component/Address/Service/DefaultAddressChecker.php
@@ -2,6 +2,7 @@
 
 namespace KejawenLab\Application\SemartHris\Component\Address\Service;
 
+use Doctrine\Common\Util\ClassUtils;
 use KejawenLab\Application\SemartHris\Component\Address\Model\AddressInterface;
 use KejawenLab\Application\SemartHris\Component\Address\Repository\AddressRepositoryFactory;
 
@@ -32,7 +33,8 @@ public function unsetDefaultExcept(AddressInterface $address): void
             return;
         }
 
-        $repository = $this->addressRepositoryFactory->getRepositoryFor(get_class($address));
+        $realClass = ClassUtils::getRealClass(get_class($address));
+        $repository = $this->addressRepositoryFactory->getRepositoryFor($realClass);
         $repository->unsetDefaultExcept($address);
 
         $addressable = $address->getAddressable();
@@ -47,7 +49,8 @@ public function unsetDefaultExcept(AddressInterface $address): void
      */
     public function setRandomDefault(AddressInterface $address): void
     {
-        $repository = $this->addressRepositoryFactory->getRepositoryFor(get_class($address));
+        $realClass = ClassUtils::getRealClass(get_class($address));
+        $repository = $this->addressRepositoryFactory->getRepositoryFor($realClass);
         $newDefault = $repository->setRandomDefault();
 
         $addressable = $address->getAddressable();

diff --git a/src/Repository/AddressRepositoryTrait.php b/src/Repository/AddressRepositoryTrait.php
@@ -7,30 +7,12 @@
 use KejawenLab\Application\SemartHris\Component\Address\Model\Addressable;
 use KejawenLab\Application\SemartHris\Component\Address\Model\AddressInterface;
 use KejawenLab\Application\SemartHris\Util\StringUtil;
-use KejawenLab\Application\SemartHris\Util\UuidUtil;
 
 /**
  * @author Muhamad Surya Iksanudin <[email protected]>
  */
 trait AddressRepositoryTrait
 {
-    /**
-     * @param AddressInterface $address
-     */
-    public function unsetDefaultExcept(AddressInterface $address): void
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->entityManager->createQueryBuilder();
-        $queryBuilder->from($this->getAddressClass(), 'o');
-        $queryBuilder->update();
-        $queryBuilder->set('o.defaultAddress', $queryBuilder->expr()->literal(false));
-        if ($address->getId() && UuidUtil::isValid($address->getId())) {
-            $queryBuilder->andWhere($queryBuilder->expr()->neq('o.id', $queryBuilder->expr()->literal($address->getId())));
-        }
-
-        $queryBuilder->getQuery()->execute();
-    }
-
     public function setRandomDefault(): AddressInterface
     {
         /** @var AddressInterface $other */

diff --git a/src/Repository/CompanyRepository.php b/src/Repository/CompanyRepository.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
+use KejawenLab\Application\SemartHris\Component\Address\Model\AddressInterface;
 use KejawenLab\Application\SemartHris\Component\Address\Repository\AddressRepositoryInterface;
 use KejawenLab\Application\SemartHris\Component\Company\Model\CompanyAddressInterface;
 use KejawenLab\Application\SemartHris\Component\Company\Model\CompanyInterface;
@@ -73,6 +74,33 @@ public function findAddress(string $companyAddressId): ? CompanyAddressInterface
         return $this->entityManager->getRepository($this->getAddressClass())->find($companyAddressId);
     }
 
+    /**
+     * @param AddressInterface $address
+     */
+    public function unsetDefaultExcept(AddressInterface $address): void
+    {/** @var CompanyAddressInterface $address */
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $this->entityManager->createQueryBuilder();
+        $queryBuilder->from($this->getAddressClass(), 'o');
+        $queryBuilder->update();
+        $queryBuilder->set('o.defaultAddress', $queryBuilder->expr()->literal(false));
+
+        $company = $address->getCompany();
+        if ($company && UuidUtil::isValid($company->getId())) {
+            $queryBuilder->andWhere($queryBuilder->expr()->eq('o.company', $queryBuilder->expr()->literal($company->getId())));
+        }
+
+        if (UuidUtil::isValid($address->getId())) {
+            $queryBuilder->andWhere($queryBuilder->expr()->neq('o.id', $queryBuilder->expr()->literal($address->getId())));
+        }
+
+        $queryBuilder->getQuery()->execute();
+
+        $address->setDefaultAddress(true);
+        $this->entityManager->persist($address);
+        $this->entityManager->flush();
+    }
+
     /**
      * @param null|string $sortField
      * @param null|string $sortDirection

diff --git a/src/Repository/EmployeeRepository.php b/src/Repository/EmployeeRepository.php
@@ -3,6 +3,7 @@
 namespace KejawenLab\Application\SemartHris\Repository;
 
 use Doctrine\ORM\QueryBuilder;
+use KejawenLab\Application\SemartHris\Component\Address\Model\AddressInterface;
 use KejawenLab\Application\SemartHris\Component\Address\Repository\AddressRepositoryInterface;
 use KejawenLab\Application\SemartHris\Component\Company\Model\CompanyInterface;
 use KejawenLab\Application\SemartHris\Component\Contract\Repository\ContractableRepositoryInterface;
@@ -101,6 +102,29 @@ public function findByCompany(string $companyId): array
         return $queryBuilder->getQuery()->getResult();
     }
 
+    /**
+     * @param AddressInterface $address
+     */
+    public function unsetDefaultExcept(AddressInterface $address): void
+    {/** @var EmployeeAddressInterface $address */
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $this->entityManager->createQueryBuilder();
+        $queryBuilder->from($this->getAddressClass(), 'o');
+        $queryBuilder->update();
+        $queryBuilder->set('o.defaultAddress', $queryBuilder->expr()->literal(false));
+
+        $employee = $address->getEmployee();
+        if ($employee && UuidUtil::isValid($employee->getId())) {
+            $queryBuilder->andWhere($queryBuilder->expr()->eq('o.employee', $queryBuilder->expr()->literal($employee->getId())));
+        }
+
+        if (UuidUtil::isValid($address->getId())) {
+            $queryBuilder->andWhere($queryBuilder->expr()->neq('o.id', $queryBuilder->expr()->literal($address->getId())));
+        }
+
+        $queryBuilder->getQuery()->execute();
+    }
+
     /**
      * @param string $id
      *

diff --git a/src/Security/Provider/UserProvider.php b/src/Security/Provider/UserProvider.php
@@ -2,6 +2,7 @@
 
 namespace KejawenLab\Application\SemartHris\Security\Provider;
 
+use Doctrine\Common\Util\ClassUtils;
 use KejawenLab\Application\SemartHris\Component\User\Model\UserInterface as BaseUser;
 use KejawenLab\Application\SemartHris\Component\User\Repository\UserRepositoryInterface;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
@@ -52,8 +53,9 @@ public function loadUserByUsername($username)
      */
     public function refreshUser(UserInterface $user)
     {
-        if (!$this->supportsClass(get_class($user))) {
-            throw new UnsupportedUserException(sprintf('Object class "%s" is not supported', get_class($user)));
+        $realClass = ClassUtils::getRealClass(get_class($user));
+        if (!$this->supportsClass($realClass)) {
+            throw new UnsupportedUserException(sprintf('Object class "%s" is not supported', $realClass));
         }
 
         return $this->userRepository->findByUsername($user->getUsername());

diff --git a/templates/app/company/address.html.twig b/templates/app/company/address.html.twig
@@ -103,7 +103,7 @@
                 var toggleRequest = $.ajax({ type: "GET", url: toggleUrl, data: {} });
 
                 toggleRequest.done(function() {
-                    window.location.reload();
+                    window.location.reload(true);
                 });
 
                 toggleRequest.fail(function() {

diff --git a/templates/app/company/department.html.twig b/templates/app/company/department.html.twig
@@ -103,7 +103,7 @@
                 var toggleRequest = $.ajax({ type: "GET", url: toggleUrl, data: {} });
 
                 toggleRequest.done(function() {
-                    window.location.reload();
+                    window.location.reload(true);
                 });
 
                 toggleRequest.fail(function() {

diff --git a/templates/app/employee/address.html.twig b/templates/app/employee/address.html.twig
@@ -108,7 +108,7 @@
                 var toggleRequest = $.ajax({ type: "GET", url: toggleUrl, data: {} });
 
                 toggleRequest.done(function() {
-                    window.location.reload();
+                    window.location.reload(true);
                 });
 
                 toggleRequest.fail(function() {