nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity

fix(appointments): slot generation deviation for increments that don't fit modulo 

Signed-off-by: Anna Larch <anna@nextcloud.com>
This commit is contained in:
Anna Larch 2024-03-07 13:27:48 +01:00
parent 4fbd39cf3e
commit 0176063a82
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Service/Appointments/AvailabilityGenerator.php
View File

@ -70,8 +70,8 @@ class AvailabilityGenerator {
// when the user opens the page at 10:17.
// But only do this when the time isn't already a "pretty" time
if ($earliestStart % $config->getIncrement() !== 0) {
$roundTo = (int)round(($config->getIncrement()) / 300) * 300;
$earliestStart = (int)ceil($earliestStart / $roundTo) * $roundTo;
$roundTo = (int)(round(($config->getIncrement()) / 300) * 300);
$earliestStart = (int)(ceil($earliestStart / $roundTo) * $roundTo);
}
$latestEnd = min(

42
tests/php/unit/Service/Appointments/AvailabilityGeneratorTest.php
View File

@ -119,6 +119,48 @@ class AvailabilityGeneratorTest extends TestCase {
);
}
public function testNoAvailabilityQuarterHourIncrementsFourtyFiveMinutesLenght(): void {
$config = new AppointmentConfig();
$config->setLength(2700); // 45 minutes
$config->setIncrement(900); // 15 minutes
$config->setAvailability(null);
$this->timeFactory->expects(self::once())
->method('getTime')
->willReturn(1709546400);
$sdate = new \DateTime('2024-03-04 10:00');
$edate = new \DateTime('2024-03-04 10:45');
$slots = $this->generator->generate($config, $sdate->getTimestamp(), $edate->getTimestamp());
self::assertCount(1, $slots);
self::assertEquals(0, ($slots[0]->getStart() % $config->getIncrement()));
self::assertEquals(45 * 60, ($slots[0]->getEnd() - $slots[0]->getStart()));
self::assertEquals(
[new Interval(1709546400, 1709549100)],
$slots,
);
}
public function testNoAvailabilityZeroTo2700QuarterHourIncrementsFourtyFiveMinutesLenght(): void {
$config = new AppointmentConfig();
$config->setLength(2700); // 45 minutes
$config->setIncrement(900); // 15 minutes
$config->setAvailability(null);
$slots = $this->generator->generate($config, 0, 2700);
self::assertCount(1, $slots);
self::assertEquals(0, $slots[0]->getStart() % 2700);
self::assertEquals(45 * 60, ($slots[0]->getEnd() - $slots[0]->getStart()));
self::assertEquals(
[new Interval(0, 45 * 60)],
$slots,
);
}
public function testNoAvailabilitySetRoundWithRealLifeTimesUgly(): void {
$config = new AppointmentConfig();
$config->setLength(900);