fix: appointment slots start and end time

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
nextcloud · Nov 16, 2024 · a06a01c · a06a01c
1 parent 9eb17f3
commit a06a01c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/lib/Controller/BookingController.php b/lib/Controller/BookingController.php
@@ -96,15 +96,11 @@ public function getBookableSlots(int $appointmentConfigId,
 			$this->logger->error('Timezone invalid', ['exception' => $e]);
 			return JsonResponse::fail('Invalid time zone', Http::STATUS_UNPROCESSABLE_ENTITY);
 		}
-		$startTimeInTz = (new DateTimeImmutable())
-			->setTimestamp($startTime)
-			->setTimezone($tz)
-			->setTime(0, 0)
+
+		$startTimeInTz = (new DateTimeImmutable("@$startTime", $tz))
 			->getTimestamp();
-		$endTimeInTz = (new DateTimeImmutable())
-			->setTimestamp($startTime)
-			->setTimezone($tz)
-			->setTime(23, 59, 59)
+		$endTimeInTz = (new DateTimeImmutable("@$startTime", $tz))
+			->modify('+1 day')
 			->getTimestamp();
 
 		if ($startTimeInTz > $endTimeInTz) {

diff --git a/tests/php/unit/Controller/BookingControllerTest.php b/tests/php/unit/Controller/BookingControllerTest.php
@@ -108,15 +108,10 @@ protected function setUp():void {
 	public function testGetBookableSlots(): void {
 		$start = time();
 		$tz = new DateTimeZone('Europe/Berlin');
-		$sDT = (new DateTimeImmutable())
-			->setTimestamp($start)
-			->setTimezone($tz)
-			->setTime(0, 0)
+		$sDT = (new DateTimeImmutable("@$start", $tz))
 			->getTimestamp();
-		$eDT = (new DateTimeImmutable())
-			->setTimestamp($start)
-			->setTimezone($tz)
-			->setTime(23, 59, 59)
+		$eDT = (new DateTimeImmutable("@$start", $tz))
+			->modify('+1 day')
 			->getTimestamp();
 
 		$apptConfg = new AppointmentConfig();