jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Configurable rate rounding (#5734)

Browse Source 
* added invoice hydration of the issuer object
* added "rate calculator" mode
* new config to select rounding mode
* replace static calls with dependency injection
This commit is contained in:
Kevin Papst
2025-12-16 16:47:46 +01:00
committed by GitHub
parent 07ac6c308f
commit 595b5f4b25
43 changed files with 876 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tests/Timesheet/Calculator/RateCalculatorTest.php
View File

@@ -18,7 +18,7 @@ use App\Entity\ProjectRate;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Entity\UserPreference;
use App\Repository\TimesheetRepository;
use App\Tests\Mocks\RateServiceFactory;
use App\Timesheet\Calculator\RateCalculator;
use App\Timesheet\RateService;
use PHPUnit\Framework\Attributes\CoversClass;
@@ -28,14 +28,11 @@ use PHPUnit\Framework\TestCase;
#[CoversClass(RateCalculator::class)]
class RateCalculatorTest extends TestCase
{
protected function getRateRepositoryMock(array $rates = []): TimesheetRepository
private function getRateService(array $rules = [], array $rates = []): RateService
{
$mock = $this->getMockBuilder(TimesheetRepository::class)->disableOriginalConstructor()->getMock();
if (!empty($rates)) {
$mock->expects($this->any())->method('findMatchingRates')->willReturn($rates);
}
$factory = new RateServiceFactory($this);
return $mock;
return $factory->create($rules, $rates);
}
private function assertRateByTimesheetHourlyRate(int $duration, float $hourlyRate, float $rate): void
@@ -47,7 +44,7 @@ class RateCalculatorTest extends TestCase
$record->setActivity(new Activity());
$record->setUser($this->getTestUser());
$sut = new RateCalculator(new RateService([], $this->getRateRepositoryMock()));
$sut = new RateCalculator($this->getRateService());
$sut->calculate($record, []);
self::assertEquals($rate, $record->getRate());
}
@@ -55,9 +52,9 @@ class RateCalculatorTest extends TestCase
public function testCalculateWithTimesheetHourlyRate(): void
{
$this->assertRateByTimesheetHourlyRate(1800, 100, 50);
$this->assertRateByTimesheetHourlyRate(400, 100, 11);
$this->assertRateByTimesheetHourlyRate(1234, 100, 34);
$this->assertRateByTimesheetHourlyRate(2739, 100, 76);
$this->assertRateByTimesheetHourlyRate(400, 100, 11.1111);
$this->assertRateByTimesheetHourlyRate(1234, 100, 34.2778);
$this->assertRateByTimesheetHourlyRate(2739, 100, 76.0833);
}
public function testCalculateWithTimesheetFixedRate(): void
@@ -71,7 +68,7 @@ class RateCalculatorTest extends TestCase
$record->setActivity(new Activity());
$record->setUser($this->getTestUser());
$sut = new RateCalculator(new RateService([], $this->getRateRepositoryMock()));
$sut = new RateCalculator($this->getRateService());
$sut->calculate($record, []);
self::assertEquals(10, $record->getRate());
}
@@ -112,22 +109,22 @@ class RateCalculatorTest extends TestCase
#[DataProvider('getRateTestData')]
public function testRates(
$expectedRate,
$expectedInternalRate,
$duration,
$userRate,
$userInternalRate,
$timesheetHourly,
$timesheetFixed,
$activityRate,
$activityInternal,
$activityIsFixed,
$projectRate,
$projectInternal,
$projectIsFixed,
$customerRate,
$customerInternal,
$customerIsFixed
float $expectedRate,
float $expectedInternalRate,
int $duration,
float $userRate,
?float $userInternalRate,
?float $timesheetHourly,
?float $timesheetFixed,
?float $activityRate,
?float $activityInternal,
bool $activityIsFixed,
?float $projectRate,
?float $projectInternal,
bool $projectIsFixed,
?float $customerRate,
?float $customerInternal,
bool $customerIsFixed
) {
$customer = new Customer('foo');
@@ -178,7 +175,7 @@ class RateCalculatorTest extends TestCase
$rates[] = $rate;
}
$sut = new RateCalculator(new RateService([], $this->getRateRepositoryMock($rates)));
$sut = new RateCalculator($this->getRateService([], $rates));
$sut->calculate($timesheet, []);
self::assertEquals($expectedRate, $timesheet->getRate());
self::assertEquals($expectedInternalRate, $timesheet->getInternalRate());
@@ -207,7 +204,7 @@ class RateCalculatorTest extends TestCase
self::assertEquals(0, $record->getRate());
$sut = new RateCalculator(new RateService([], $this->getRateRepositoryMock()));
$sut = new RateCalculator($this->getRateService());
$sut->calculate($record, []);
self::assertEquals(0, $record->getRate());
}
@@ -216,7 +213,7 @@ class RateCalculatorTest extends TestCase
* Uses the hourly rate from user_preferences to calculate the rate.
*/
#[DataProvider('getRuleDefinitions')]
public function testCalculateWithRulesByUsersHourlyRate($duration, $rules, $expectedRate): void
public function testCalculateWithRulesByUsersHourlyRate(int $duration, array $rules, float $expectedRate): void
{
$end = new \DateTime('12:00:00', new \DateTimeZone('UTC'));
$start = clone $end;
@@ -232,7 +229,7 @@ class RateCalculatorTest extends TestCase
$record->setEnd($end);
$sut = new RateCalculator(new RateService($rules, $this->getRateRepositoryMock()));
$sut = new RateCalculator($this->getRateService($rules));
$sut->calculate($record, []);
self::assertEquals($expectedRate, $record->getRate());
@@ -247,7 +244,7 @@ class RateCalculatorTest extends TestCase
[
31837, // 31824 = 8,84
[],
663
663.2708
],
[
31837, // 31824 = 8,84
@@ -261,7 +258,7 @@ class RateCalculatorTest extends TestCase
'factor' => 1.5
],
],
1326 // 8,84 * 75 (see user) * 2
1326.5417
],
[
31837, // 31824 = 8,84
@@ -275,7 +272,7 @@ class RateCalculatorTest extends TestCase
'factor' => 1.5
],
],
2320.5 // 75 * 8,84 * 3,5
2321.4479
],
];
}