Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed: [doc generation] fix summary budget

Browse Source
This commit is contained in:
Julien Fastré 2023-02-07 16:22:26 +01:00
parent 5830c3e177
commit d8af7d455e
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
View File

@ -150,7 +150,7 @@ final class SummaryBudget implements SummaryBudgetInterface
switch ($kind) { switch ($kind) {
case 'charge': case 'charge':
foreach ($rows as $row) { foreach ($rows as $row) {
$chargeKind = $this->chargeKindRepository->findOneByKind($row['kind_id']); $chargeKind = $this->chargeKindRepository->find($row['kind_id']);
if (null === $chargeKind) { if (null === $chargeKind) {
throw new RuntimeException('charge kind not found: ' . $row['kind_id']); throw new RuntimeException('charge kind not found: ' . $row['kind_id']);
@ -166,7 +166,7 @@ final class SummaryBudget implements SummaryBudgetInterface
case 'resource': case 'resource':
foreach ($rows as $row) { foreach ($rows as $row) {
$resourceKind = $this->resourceKindRepository->findOneByKind($row['kind_id']); $resourceKind = $this->resourceKindRepository->find($row['kind_id']);
if (null === $resourceKind) { if (null === $resourceKind) {
throw new RuntimeException('charge kind not found: ' . $row['kind_id']); throw new RuntimeException('charge kind not found: ' . $row['kind_id']);

11
src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
View File

@ -43,7 +43,7 @@ final class SummaryBudgetTest extends TestCase
[ [
'sum' => 250.0, 'sum' => 250.0,
'comment' => '', 'comment' => '',
'kind_id' => 'rental', 'kind_id' => 1, // kind: rental
], ],
]); ]);
$queryCharges->setParameters(Argument::type('array')) $queryCharges->setParameters(Argument::type('array'))
@ -57,7 +57,7 @@ final class SummaryBudgetTest extends TestCase
[ [
'sum' => 1500.0, 'sum' => 1500.0,
'comment' => '', 'comment' => '',
'kind_id' => 'salary', 'kind_id' => 2, // kind: 'salary',
], ],
]); ]);
$queryResources->setParameters(Argument::type('array')) $queryResources->setParameters(Argument::type('array'))
@ -84,6 +84,7 @@ final class SummaryBudgetTest extends TestCase
$rental = (new ChargeKind())->setKind('rental')->setName(['fr' => 'Rental']), $rental = (new ChargeKind())->setKind('rental')->setName(['fr' => 'Rental']),
$other = (new ChargeKind())->setKind('other')->setName(['fr' => 'Other']), $other = (new ChargeKind())->setKind('other')->setName(['fr' => 'Other']),
]); ]);
$chargeRepository->find(1)->willReturn($rental);
$chargeRepository->findOneByKind('rental')->willReturn($rental); $chargeRepository->findOneByKind('rental')->willReturn($rental);
$chargeRepository->findOneByKind('other')->willReturn($other); $chargeRepository->findOneByKind('other')->willReturn($other);
@ -92,6 +93,7 @@ final class SummaryBudgetTest extends TestCase
$salary = (new ResourceKind())->setKind('salary')->setName(['fr' => 'Salary']), $salary = (new ResourceKind())->setKind('salary')->setName(['fr' => 'Salary']),
$misc = (new ResourceKind())->setKind('misc')->setName(['fr' => 'Misc']), $misc = (new ResourceKind())->setKind('misc')->setName(['fr' => 'Misc']),
]); ]);
$resourceRepository->find(2)->willReturn($salary);
$resourceRepository->findOneByKind('salary')->willReturn($salary); $resourceRepository->findOneByKind('salary')->willReturn($salary);
$resourceRepository->findOneByKind('misc')->willReturn($misc); $resourceRepository->findOneByKind('misc')->willReturn($misc);
@ -108,8 +110,9 @@ final class SummaryBudgetTest extends TestCase
$household = new Household(); $household = new Household();
$householdReflection = new \ReflectionClass($household); $householdReflection = new \ReflectionClass($household);
$householdReflection->getProperty('id')->setAccessible(true); $householdId = $householdReflection->getProperty('id');
$householdReflection->getProperty('id')->setValue($household, 1); $householdId->setAccessible(true);
$householdId->setValue($household, 1);
$householdMember = (new HouseholdMember())->setPerson($person) $householdMember = (new HouseholdMember())->setPerson($person)
->setStartDate(new \DateTimeImmutable('1 month ago')) ->setStartDate(new \DateTimeImmutable('1 month ago'))
; ;