Refactor: Repository queries fixed to group by creation date + remove…

…d dependency on gedmo
Intracto · May 5, 2015 · 3a0584e · 3a0584e
1 parent 3990732
commit 3a0584e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 phpunit.xml
 vendor
 composer.lock
-composer.phar
+composer.phar
+bin
+.idea
diff --git a/Entity/SmartCode.php b/Entity/SmartCode.php
@@ -3,7 +3,6 @@
 namespace Intracto\SmartCodeBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
  * @ORM\Entity(repositoryClass="Intracto\SmartCodeBundle\Repository\SmartCodeRepository")
@@ -81,7 +80,6 @@ class SmartCode implements SmartCodeInterface
      * Creation time.
      *
      * @ORM\Column(type="datetime")
-     * @Gedmo\Timestampable(on="create")
      *
      * @var \DateTime
      */

diff --git a/Generator/SmartCodeGenerator.php b/Generator/SmartCodeGenerator.php
@@ -27,9 +27,11 @@ public function __construct(EntityManagerInterface $manager)
     public function generate(PayloadInterface $payload, SmartCodeOptions $options)
     {
         $codes = array();
+        $now = new \DateTime();
 
         for ($i = 0, $amount = $options->getAmount(); $i < $amount; $i++) {
             $smartCode = new SmartCode($payload);
+            $smartCode->setCreatedAt($now);
             $smartCode->setCode($this->generateUniqueCode());
             $smartCode->setUsageLimit($options->getUsageLimit());
             $smartCode->setExpiresAt($options->getExpiresAt());

diff --git a/Repository/SmartCodeRepository.php b/Repository/SmartCodeRepository.php
@@ -7,7 +7,7 @@
 
 class SmartCodeRepository extends EntityRepository
 {
-    public function findAllCreationGroupsForPayload(PayloadInterface $payload)
+    public function findAllCreationDatesForPayload(PayloadInterface $payload)
     {
         return $this->getEntityManager()
             ->createQuery(
@@ -21,18 +21,18 @@ public function findAllCreationGroupsForPayload(PayloadInterface $payload)
             ->getResult();
     }
 
-    public function findAllByCreationGroup(\DateTime $creationGroup, PayloadInterface $payload)
+    public function findAllByCreationDate(\DateTime $creationDate, PayloadInterface $payload)
     {
         return $this->getEntityManager()
             ->createQuery(
                 'SELECT sc
                  FROM SmartCodeBundle:SmartCode sc
-                 WHERE sc.createdAt = :creationGroup
+                 WHERE sc.createdAt = :creationDate
                  AND sc.payload = :payload
                  ORDER BY sc.id ASC'
             )
             ->setParameter('payload', $payload)
-            ->setParameter('creationGroup', $creationGroup)
+            ->setParameter('creationDate', $creationDate)
             ->getResult();
     }
 }
diff --git a/composer.json b/composer.json
@@ -15,8 +15,7 @@
     "require": {
         "php":                             ">=5.3.9",        
         "doctrine/orm":                    "~2.2",
-        "symfony/framework-bundle":        "~2.1",
-        "stof/doctrine-extensions-bundle": "~1.1",
+        "symfony/framework-bundle":        "~2.1"
     },
 
     "config": {