allow increasing invoice numbers per day (#2433)
This commit is contained in:
@@ -15,6 +15,7 @@ use App\Entity\Project;
|
||||
use App\Invoice\InvoiceFilename;
|
||||
use App\Invoice\InvoiceModel;
|
||||
use App\Invoice\NumberGenerator\DateNumberGenerator;
|
||||
use App\Repository\InvoiceRepository;
|
||||
use App\Repository\Query\InvoiceQuery;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
@@ -29,7 +30,7 @@ class InvoiceFilenameTest extends TestCase
|
||||
$template = new InvoiceTemplate();
|
||||
|
||||
$model = new InvoiceModel(new DebugFormatter());
|
||||
$model->setNumberGenerator(new DateNumberGenerator());
|
||||
$model->setNumberGenerator($this->getNumberGeneratorSut());
|
||||
$model->setTemplate($template);
|
||||
$model->setCustomer($customer);
|
||||
|
||||
@@ -71,4 +72,15 @@ class InvoiceFilenameTest extends TestCase
|
||||
$sut = new InvoiceFilename($model);
|
||||
self::assertEquals($datePrefix . '-ss_n_--Demo_ProjecT1', $sut->getFilename());
|
||||
}
|
||||
|
||||
private function getNumberGeneratorSut()
|
||||
{
|
||||
$repository = $this->createMock(InvoiceRepository::class);
|
||||
$repository
|
||||
->expects($this->any())
|
||||
->method('hasInvoice')
|
||||
->willReturn(false);
|
||||
|
||||
return new DateNumberGenerator($repository);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ namespace App\Tests\Invoice\NumberGenerator;
|
||||
|
||||
use App\Invoice\InvoiceModel;
|
||||
use App\Invoice\NumberGenerator\DateNumberGenerator;
|
||||
use App\Repository\InvoiceRepository;
|
||||
use App\Tests\Invoice\DebugFormatter;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
@@ -19,12 +20,47 @@ use PHPUnit\Framework\TestCase;
|
||||
*/
|
||||
class DateNumberGeneratorTest extends TestCase
|
||||
{
|
||||
private function getSut(bool $hasInitialInvoice, bool $followingInvoices)
|
||||
{
|
||||
$repository = $this->createMock(InvoiceRepository::class);
|
||||
$repository
|
||||
->expects($this->any())
|
||||
->method('hasInvoice')
|
||||
->willReturnCallback(function ($number) use ($hasInitialInvoice, $followingInvoices) {
|
||||
if (stripos($number, '-') === false) {
|
||||
return $hasInitialInvoice;
|
||||
}
|
||||
|
||||
return $followingInvoices;
|
||||
});
|
||||
|
||||
return new DateNumberGenerator($repository);
|
||||
}
|
||||
|
||||
public function testGetInvoiceNumber()
|
||||
{
|
||||
$sut = new DateNumberGenerator();
|
||||
$sut = $this->getSut(false, false);
|
||||
$sut->setModel(new InvoiceModel(new DebugFormatter()));
|
||||
|
||||
$this->assertEquals(date('ymd'), $sut->getInvoiceNumber());
|
||||
$this->assertEquals('date', $sut->getId());
|
||||
}
|
||||
|
||||
public function testGetInvoiceNumberWithExisting()
|
||||
{
|
||||
$sut = $this->getSut(true, false);
|
||||
$sut->setModel(new InvoiceModel(new DebugFormatter()));
|
||||
|
||||
$this->assertEquals(date('ymd-01'), $sut->getInvoiceNumber());
|
||||
$this->assertEquals('date', $sut->getId());
|
||||
}
|
||||
|
||||
public function testGetInvoiceNumberWithManyExisting()
|
||||
{
|
||||
$sut = $this->getSut(true, true);
|
||||
$sut->setModel(new InvoiceModel(new DebugFormatter()));
|
||||
|
||||
$this->assertEquals(date('ymd-99'), $sut->getInvoiceNumber());
|
||||
$this->assertEquals('date', $sut->getId());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ use App\Invoice\InvoiceFormatter;
|
||||
use App\Invoice\InvoiceModel;
|
||||
use App\Invoice\NumberGenerator\DateNumberGenerator;
|
||||
use App\Invoice\Renderer\AbstractRenderer;
|
||||
use App\Repository\InvoiceRepository;
|
||||
use App\Repository\Query\InvoiceQuery;
|
||||
|
||||
trait RendererTestTrait
|
||||
@@ -228,7 +229,7 @@ trait RendererTestTrait
|
||||
|
||||
$model->setCalculator($calculator);
|
||||
|
||||
$numberGenerator = new DateNumberGenerator();
|
||||
$numberGenerator = $this->getNumberGeneratorSut();
|
||||
$numberGenerator->setModel($model);
|
||||
|
||||
$model->setNumberGenerator($numberGenerator);
|
||||
@@ -236,6 +237,17 @@ trait RendererTestTrait
|
||||
return $model;
|
||||
}
|
||||
|
||||
private function getNumberGeneratorSut()
|
||||
{
|
||||
$repository = $this->createMock(InvoiceRepository::class);
|
||||
$repository
|
||||
->expects($this->any())
|
||||
->method('hasInvoice')
|
||||
->willReturn(false);
|
||||
|
||||
return new DateNumberGenerator($repository);
|
||||
}
|
||||
|
||||
protected function getInvoiceModelOneEntry(): InvoiceModel
|
||||
{
|
||||
$user = new User();
|
||||
@@ -301,7 +313,7 @@ trait RendererTestTrait
|
||||
|
||||
$model->setCalculator($calculator);
|
||||
|
||||
$numberGenerator = new DateNumberGenerator();
|
||||
$numberGenerator = $this->getNumberGeneratorSut();
|
||||
$numberGenerator->setModel($model);
|
||||
|
||||
$model->setNumberGenerator($numberGenerator);
|
||||
|
||||
@@ -92,7 +92,7 @@ class ServiceInvoiceTest extends TestCase
|
||||
$sut = $this->getSut([]);
|
||||
|
||||
$sut->addCalculator(new DefaultCalculator());
|
||||
$sut->addNumberGenerator(new DateNumberGenerator());
|
||||
$sut->addNumberGenerator($this->getNumberGeneratorSut());
|
||||
$sut->addRenderer(
|
||||
new TwigRenderer(
|
||||
$this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock()
|
||||
@@ -132,7 +132,7 @@ class ServiceInvoiceTest extends TestCase
|
||||
|
||||
$sut = $this->getSut([]);
|
||||
$sut->addCalculator(new DefaultCalculator());
|
||||
$sut->addNumberGenerator(new DateNumberGenerator());
|
||||
$sut->addNumberGenerator($this->getNumberGeneratorSut());
|
||||
|
||||
$model = $sut->createModel($query);
|
||||
|
||||
@@ -152,10 +152,21 @@ class ServiceInvoiceTest extends TestCase
|
||||
|
||||
$sut = $this->getSut([]);
|
||||
$sut->addCalculator(new DefaultCalculator());
|
||||
$sut->addNumberGenerator(new DateNumberGenerator());
|
||||
$sut->addNumberGenerator($this->getNumberGeneratorSut());
|
||||
|
||||
$model = $sut->createModel($query);
|
||||
|
||||
self::assertEquals('de', $model->getTemplate()->getLanguage());
|
||||
}
|
||||
|
||||
private function getNumberGeneratorSut()
|
||||
{
|
||||
$repository = $this->createMock(InvoiceRepository::class);
|
||||
$repository
|
||||
->expects($this->any())
|
||||
->method('hasInvoice')
|
||||
->willReturn(false);
|
||||
|
||||
return new DateNumberGenerator($repository);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user