From 8bb0ddb96237273cae8882969b19f934283efc42 Mon Sep 17 00:00:00 2001
From: Michal Feher <feher@studiotem.com>
Date: Wed, 30 Apr 2025 16:04:39 +0200
Subject: [PATCH] no message

---
 .../Services/Office365/Office365Service.php   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/be/app/Services/Office365/Office365Service.php b/be/app/Services/Office365/Office365Service.php
index 59af4e0..6f8b005 100644
--- a/be/app/Services/Office365/Office365Service.php
+++ b/be/app/Services/Office365/Office365Service.php
@@ -86,8 +86,8 @@ class Office365Service
             $blockerToInsert['user_id']              = $user->id;
             $blockerToInsert['name']                 = $blocker['subject'];
             $blockerToInsert['type']                 = "office365_blocker";
-            $blockerToInsert['start']                = $blocker['start']['dateTime'];
-            $blockerToInsert['end']                  = $blocker['end']['dateTime'];
+            $blockerToInsert['start']                = Carbon::parse($blocker['start']['dateTime'])->setTimezone('Europe/Bratislava');
+            $blockerToInsert['end']                  = Carbon::parse($blocker['end']['dateTime'])->setTimezone('Europe/Bratislava');
             $blockerToInsert['approved']             = 1;
             $blockerToInsert['created_at']           = Carbon::now()->toDateTimeString();
             $blockerToInsert['updated_at']           = Carbon::now()->toDateTimeString();
@@ -168,8 +168,8 @@ class Office365Service
                         'user_id'              => $user->id,
                         'name'                 => $editedBlocker['subject'],
                         'type'                 => "office365_blocker",
-                        'start'                => $editedBlocker['start']['dateTime'],
-                        'end'                  => $editedBlocker['end']['dateTime'],
+                        'start'                => Carbon::parse($editedBlocker['start']['dateTime'])->setTimezone('Europe/Bratislava'),
+                        'end'                  => Carbon::parse($editedBlocker['end']['dateTime'])->setTimezone('Europe/Bratislava'),
                         'approved'             => 1,
                         'created_at'           => Carbon::now()->toDateTimeString(),
                         'updated_at'           => Carbon::now()->toDateTimeString()
@@ -179,8 +179,8 @@ class Office365Service
                 $blocker->update([
                     'office365_change_key' => $editedBlocker['changeKey'],
                     'name'                 => $editedBlocker['subject'],
-                    'start'                => $editedBlocker['start']['dateTime'],
-                    'end'                  => $editedBlocker['end']['dateTime'],
+                    'start'                => Carbon::parse($editedBlocker['start']['dateTime'])->setTimezone('Europe/Bratislava'),
+                    'end'                  => Carbon::parse($editedBlocker['end']['dateTime'])->setTimezone('Europe/Bratislava'),
                     'updated_at'           => Carbon::now()->toDateTimeString(),
                 ]);
             }
@@ -259,8 +259,8 @@ class Office365Service
             $subtask->syncTimeblocks([
                 [
                     'sub_task_id' => $subtask->id,
-                    'start'       => $newSubtask['start']['dateTime'],
-                    'end'         => $newSubtask['end']['dateTime'],
+                    'start'       => Carbon::parse($newSubtask['start']['dateTime'])->setTimezone('Europe/Bratislava'),
+                    'end'         => Carbon::parse($newSubtask['end']['dateTime'])->setTimezone('Europe/Bratislava'),
                     'is_finished' => 0,
                 ]
             ]);
@@ -347,12 +347,12 @@ class Office365Service
             $oldTimeblock = $subtask->timeblocks->first();
 
             // ak sa zmenilo trvanie alebo casy subtasku, tak sa updatne aj timeblock
-            if ($oldTimeblock['start'] != $editedSubtask['start']['dateTime'] || $oldTimeblock['end'] != $editedSubtask['end']['dateTime']) {
+            if ($oldTimeblock['start'] != Carbon::parse($editedSubtask['start']['dateTime'])->setTimezone('Europe/Bratislava') || $oldTimeblock['end'] != Carbon::parse($editedSubtask['end']['dateTime'])->setTimezone('Europe/Bratislava')) {
                 $subtask->syncTimeblocks([
                     [
                         'sub_task_id' => $subtask->id,
-                        'start'       => $editedSubtask['start']['dateTime'],
-                        'end'         => $editedSubtask['end']['dateTime'],
+                        'start'       => Carbon::parse($editedSubtask['start']['dateTime'])->setTimezone('Europe/Bratislava'),
+                        'end'         => Carbon::parse($editedSubtask['end']['dateTime'])->setTimezone('Europe/Bratislava'),
                         'is_finished' => 0,
                     ]
                 ]);