#12 added getNextNumber test #9 status values updated in fixtures #3 …

…added 'getNextNumber" method
siwapp · Feb 13, 2012 · 0441446 · 0441446
1 parent e5d72ee
commit 0441446
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 20 deletions.
diff --git a/src/Siwapp/CoreBundle/Entity/AbstractInvoice.php b/src/Siwapp/CoreBundle/Entity/AbstractInvoice.php
@@ -141,7 +141,7 @@ class AbstractInvoice
     /**
      * @var smallint $status
      *
-     * @ORM\Column(name="status", type="smallint", nullable="true")
+     * @ORM\Column(name="status", type="smallint", nullable="true", columnDefinition="SMALLINT NULL DEFAULT 0")
      */
     private $status;
 

diff --git a/src/Siwapp/CoreBundle/Tests/Model/SiwappBaseTest.php b/src/Siwapp/CoreBundle/Tests/Model/SiwappBaseTest.php
@@ -11,6 +11,7 @@ class SiwappBaseTest extends \PHPUnit_Framework_TestCase
     protected $em;
 
     protected $_tax_repo;
+    protected $_serie_repo;
     protected $_invoice_repo;
     protected $_recurring_invoice_repo;
     protected $_estimate_repo;
@@ -52,6 +53,13 @@ protected function getRepo($repo_name)
                 }
                 return $this->_tax_repo;
                 break;
+            case 'serie':
+                if(!$this->_serie_repo)
+                {
+                    $this->_serie_repo = $this->em->getRepository('SiwappCoreBundle:Serie');
+                }
+                return $this->_serie_repo;
+                break;
             case 'invoice':
                 if(!$this->_invoice_repo)
                 {

diff --git a/src/Siwapp/InvoiceBundle/DataFixtures/invoices.yml b/src/Siwapp/InvoiceBundle/DataFixtures/invoices.yml
@@ -1,6 +1,6 @@
 Invoice:
   Invoice_1:
-    draft: false
+    status: 1  # closed
     sent_by_email: false
     Serie: Serie_2
     number: 1
@@ -17,7 +17,7 @@ Invoice:
     created_at: '2009-04-17 09:45:36'
     updated_at: '2009-08-25 10:27:12'
   Invoice_2:
-    draft: false
+    status: 2 # open
     sent_by_email: false
     Serie: Serie_1
     number: 1
@@ -34,7 +34,7 @@ Invoice:
     created_at: '2009-04-17 09:45:36'
     updated_at: '2009-08-25 10:27:12'
   Invoice_3:
-    draft: true
+    status: 0 # draft
     sent_by_email: false
     Serie: Serie_2
     customer_name: 'Western Gas & Electric'
@@ -50,7 +50,7 @@ Invoice:
     created_at: '2009-04-17 09:45:36'
     updated_at: '2009-08-25 10:27:12'
   Invoice_4:
-    draft: false
+    status: 3 # overdue
     sent_by_email: false
     Serie: Serie_3
     number: 1
@@ -67,7 +67,7 @@ Invoice:
     created_at: '2009-04-17 09:45:36'
     updated_at: '2009-08-25 10:27:12'
   Invoice_5:
-    draft: true
+    status: 0 # draft
     sent_by_email: false
     Serie: Serie_3
     customer_name: '123 Warehousing'
@@ -100,7 +100,7 @@ Invoice:
     created_at: '2009-04-17 09:45:36'
     updated_at: '2009-08-25 10:27:12'
   Invoice_7:
-    draft: false
+    status: 1 # closed
     sent_by_email: false
     Serie: Serie_1
     number: 3
@@ -117,7 +117,7 @@ Invoice:
     created_at: '2009-04-17 09:45:36'
     updated_at: '2009-08-25 10:27:13'
   Invoice_8:
-    draft: false
+    status: 2 # opened
     sent_by_email: false
     Serie: Serie_1
     number: 4
@@ -134,7 +134,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:13'
   Invoice_9:
-    draft: false
+    status: 3 # overdue
     sent_by_email: false
     Serie: Serie_2
     number: 2
@@ -151,7 +151,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:13'
   Invoice_10:
-    draft: false
+    status: 1 # closed
     sent_by_email: false
     Serie: Serie_3
     number: 2
@@ -168,7 +168,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:13'
   Invoice_11:
-    draft: false
+    status: 2 # opened
     sent_by_email: false
     Serie: Serie_3
     number: 3
@@ -185,7 +185,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:13'
   Invoice_12:
-    draft: false
+    status: 2 # opened
     sent_by_email: false
     Serie: Serie_3
     number: 4
@@ -202,7 +202,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:14'
   Invoice_13:
-    draft: false
+    status: 2 #opened
     sent_by_email: false
     Serie: Serie_2
     number: 3
@@ -219,7 +219,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:14'
   Invoice_14:
-    draft: true
+    status: 0  # draft
     sent_by_email: false
     Serie: Serie_1
     customer_name: 'Fake Brothers'
@@ -235,7 +235,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:14'
   Invoice_15:
-    draft: false
+    status: 1 # closed
     sent_by_email: false
     Serie: Serie_1
     number: 5
@@ -252,7 +252,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:14'
   Invoice_16:
-    draft: false
+    status: 2 # opened
     sent_by_email: false
     Serie: Serie_1
     number: 6
@@ -269,7 +269,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:14'
   Invoice_17:
-    draft: false
+    status: 3 # overdue
     sent_by_email: false
     Serie: Serie_3
     number: 5
@@ -286,7 +286,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:15'
   Invoice_18:
-    draft: false
+    status: 2 # opened
     sent_by_email: false
     Serie: Serie_1
     number: 7
@@ -304,7 +304,7 @@ Invoice:
     created_at: '2009-04-17 09:45:37'
     updated_at: '2009-08-25 10:27:15'
   Invoice_19:
-    draft: false
+    status: 1 # closed
     sent_by_email: false
     Serie: Serie_2
     number: 4
@@ -321,7 +321,7 @@ Invoice:
     created_at: '2009-04-17 09:45:38'
     updated_at: '2009-08-25 10:27:15'
   Invoice_20:
-    draft: false
+    status: 1 # closed
     sent_by_email: false
     Serie: Serie_1
     number: 8

diff --git a/src/Siwapp/InvoiceBundle/Repository/InvoiceRepository.php b/src/Siwapp/InvoiceBundle/Repository/InvoiceRepository.php
@@ -6,6 +6,9 @@
 
 use Siwapp\CoreBundle\Repository\AbstractInvoiceRepository;
 
+use Siwapp\InvoiceBundle\Entity\Invoice;
+
+
 /**
  * InvoiceRepository
  *
@@ -14,4 +17,24 @@
  */
 class InvoiceRepository extends AbstractInvoiceRepository
 {
+    /** 
+     * getNextNumber
+     * Obtain the next numer available for the provided series
+     * @param \Siwapp\CoreBundle\Entity\Serie @serie
+     * @return integer
+     */
+    public function getNextNumber($serie)
+    {
+        $em = $this->getEntityManager();
+        $number = $em->createQuery('SELECT MAX(i.number)  
+            FROM \Siwapp\InvoiceBundle\Entity\Invoice i  JOIN i.serie s
+            WHERE i.status!=:draft AND i.serie=:serie')
+            ->setParameters(array(
+                                  'draft'=>Invoice::DRAFT, 
+                                  'serie'=>$serie))
+            ->getSingleScalarResult();
+
+        return $number ? intval($number) + 1: $serie->getFirstNumber();
+
+    }
 }
diff --git a/src/Siwapp/InvoiceBundle/Tests/Model/InvoiceTest.php b/src/Siwapp/InvoiceBundle/Tests/Model/InvoiceTest.php
@@ -50,6 +50,21 @@ public function testTrial()
         $this->assertEquals($test_invoice->getGrossAmount(),6903.01);
 
         // TODO: check number generation
+        $internet_serie = $this->getRepo('serie')->findOneBy(array('name'=>'Internet'));
+        $design_serie = $this->getRepo('serie')->findOneBy(array('name'=>'Design'));
+        $others_serie = $this->getRepo('serie')->findOneBy(array('name'=>'Others'));
+        $this->assertEquals(
+            $this->getRepo('invoice')->getNextNumber($internet_serie),
+            9
+                            );
+        $this->assertEquals(
+            $this->getRepo('invoice')->getNextNumber($design_serie),
+            5
+                            );
+        $this->assertEquals(
+            $this->getRepo('invoice')->getNextNumber($others_serie),
+            6
+                            );
 
         // TODO: check that when changing series, the number changes