Skip to content

Commit

Permalink
isWorkingDay fix
Browse files Browse the repository at this point in the history
  • Loading branch information
yurikuzn committed Feb 29, 2024
1 parent 5988642 commit 0dd34df
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 2 deletions.
2 changes: 1 addition & 1 deletion application/Espo/Tools/WorkingTime/CalendarUtility.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function isWorkingDay(DateTime $time): bool
->withTimezone($this->calendar->getTimezone())
->withTime(0, 0, 0);

return $this->extractor->extractAllDay($this->calendar, $point, $point->modify('+1 day')) !== [];
return $this->extractor->extractAllDay($this->calendar, $point, $point->modify('+0 seconds')) !== [];
}

public function hasWorkingTime(DateTime $from, DateTime $to): bool
Expand Down
58 changes: 58 additions & 0 deletions tests/integration/Espo/Tools/WorkingTime/UtilityTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM – Open Source CRM application.
* Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
* Website: https://www.espocrm.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU Affero General Public License version 3.
*
* In accordance with Section 7(b) of the GNU Affero General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/

namespace tests\integration\Espo\Tools\WorkingTime;

use Espo\Core\Field\DateTime;
use Espo\Entities\WorkingTimeCalendar;
use Espo\Tools\WorkingTime\CalendarUtilityFactory;
use tests\integration\Core\BaseTestCase;

class UtilityTest extends BaseTestCase
{
public function testUtility(): void
{
$em = $this->getEntityManager();

$calendar = $em->createEntity(WorkingTimeCalendar::ENTITY_TYPE);

$user = $this->createUser('test');
$user->set('workingTimeCalendarId', $calendar->getId());
$em->saveEntity($user);

$utility = $this->getInjectableFactory()
->create(CalendarUtilityFactory::class)
->createForUser($user);

$this->assertTrue($utility->isWorkingDay(DateTime::fromString('2024-02-23 00:00')));
$this->assertFalse($utility->isWorkingDay(DateTime::fromString('2024-02-24 00:00')));
$this->assertFalse($utility->isWorkingDay(DateTime::fromString('2024-02-25 00:00')));
$this->assertTrue($utility->isWorkingDay(DateTime::fromString('2024-02-26 00:00')));
}
}
2 changes: 1 addition & 1 deletion tests/unit/Espo/Tools/WorkingTime/CalendarUtilityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function testHasWorkingDay1(): void
$time = DateTime::fromString('2023-01-01 01:01:01');

$from = DateTime::fromString('2023-01-01 00:00:00');
$to = DateTime::fromString('2023-01-02 00:00:00');
$to = DateTime::fromString('2023-01-01 00:00:00');

$this->extractor
->expects($this->any())
Expand Down

0 comments on commit 0dd34df

Please sign in to comment.