From 59e79a306f649bcc0dcead2bd86cc63de7abcfd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Fri, 17 Nov 2023 17:56:17 +0100
Subject: [PATCH] Fix timezone offset in docker deployment

---
 backend/.idea/workspace.xml                   | 58 +++++--------------
 .../api/controller/ScheduleController.java    |  3 +
 docker-compose.yml                            |  5 ++
 3 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index e1c6a0d..f6d5493 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,7 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Edit and Delete in Draggable Scheduler" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix parsing datetime">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../docker-compose.yml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -174,11 +179,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.TaskServiceTest" />
         <item itemvalue="JUnit.ScheduleServiceTest.scheduleNow" />
-        <item itemvalue="JUnit.ScheduleServiceTest.scheduleAdvanced" />
-        <item itemvalue="JUnit.ScheduleServiceTest.editscheduleAdvanced" />
         <item itemvalue="JUnit.ScheduleServiceTest.editBasicSchedule" />
+        <item itemvalue="JUnit.ScheduleServiceTest.editscheduleAdvanced" />
+        <item itemvalue="JUnit.ScheduleServiceTest.scheduleAdvanced" />
+        <item itemvalue="JUnit.TaskServiceTest" />
       </list>
     </recent_temporary>
   </component>
@@ -218,7 +223,6 @@
       <workItem from="1699639316405" duration="9267000" />
       <workItem from="1699684493731" duration="1121000" />
       <workItem from="1699769541677" duration="7576000" />
-      <workItem from="1699898375418" duration="325000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -572,29 +576,15 @@
       <option name="project" value="LOCAL" />
       <updated>1699806194258</updated>
     </task>
-    <task id="LOCAL-00045" summary="Fix parsing datetime (diesmal hoffentlich wirklich)">
-      <option name="closed" value="true" />
-      <created>1699809089060</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1699809089060</updated>
-    </task>
-    <task id="LOCAL-00046" summary="Edit and Delete in Draggable Scheduler">
-      <option name="closed" value="true" />
-      <created>1699824923378</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1699824923378</updated>
-    </task>
-    <option name="localTasksCounter" value="47" />
+    <option name="localTasksCounter" value="45" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="Write simple Testcase for ci/cd" />
+    <MESSAGE value="Deactivate Overall System test (temporarly)" />
     <MESSAGE value="Fix failing test case" />
     <MESSAGE value="TaskgroupRepsitoryTest" />
     <MESSAGE value="TaskgroupRepsitoryTest (+Delete)" />
@@ -618,9 +608,7 @@
     <MESSAGE value="Deploy on docker (not productive yet!)" />
     <MESSAGE value="Fix deleting tasks" />
     <MESSAGE value="Fix parsing datetime" />
-    <MESSAGE value="Fix parsing datetime (diesmal hoffentlich wirklich)" />
-    <MESSAGE value="Edit and Delete in Draggable Scheduler" />
-    <option name="LAST_COMMIT_MESSAGE" value="Edit and Delete in Draggable Scheduler" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix parsing datetime" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -630,31 +618,11 @@
           <line>57</line>
           <option name="timeStamp" value="12" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>98</line>
-          <option name="timeStamp" value="16" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/core/services/TaskService.java</url>
           <line>93</line>
           <option name="timeStamp" value="35" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>83</line>
-          <option name="timeStamp" value="36" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java</url>
-          <line>99</line>
-          <option name="timeStamp" value="37" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java</url>
-          <line>100</line>
-          <option name="timeStamp" value="38" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index 3949347..a4dc771 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -165,6 +165,9 @@ public class ScheduleController {
         }
 
         ServiceResult<AbstractSchedule> scheduleResult = taskScheduleService.scheduleNow(permissionResult.getResult());
+        BasicTaskSchedule basicTaskSchedule = (BasicTaskSchedule) scheduleResult.getResult();
+        System.err.println(basicTaskSchedule.getStartTime());
+        //System.err.println(scheduleResult.getResult().toScheduleInfo());
         if(scheduleResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
             return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
         } else {
diff --git a/docker-compose.yml b/docker-compose.yml
index 60fd69e..84e34d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     container_name: timemanager-db
     environment:
       MYSQL_ROOT_PASSWORD: edkvcjReDxJ9Z8hq
+    ports:
+      - "3306:3306"
   backend:
     build:
       context: ./backend
@@ -21,6 +23,9 @@ services:
     depends_on:
       - "db"
     restart: always
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
   frontend:
     build:
       context: ./frontend