From 159bbbfb1ff4cb71c59efc82a65da26f917f3c17 Mon Sep 17 00:00:00 2001
From: Felix Thape <felix.thape@gmail.com>
Date: Sun, 6 Aug 2023 11:37:54 +0200
Subject: [PATCH 1/5] feat: reenable duedate field

---
 pnpm-lock.yaml                             |  7 ++
 tasks/components/layout/TaskDetailView.tsx | 67 ++++++++++++++-----
 tasks/mutations/task_mutations.ts          | 77 +++++++++++++++-------
 tasks/package.json                         |  1 +
 tasks/utils/timeConversion.ts              | 31 +++++++++
 5 files changed, 143 insertions(+), 40 deletions(-)
 create mode 100644 tasks/utils/timeConversion.ts

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 48e52cc2..e070d522 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -225,6 +225,9 @@ importers:
       '@twind/preset-typography':
         specifier: 1.0.7
         version: 1.0.7(@twind/core@1.1.3)(typescript@5.1.6)
+      '@types/google-protobuf':
+        specifier: ^3.15.6
+        version: 3.15.6
       cookies-next:
         specifier: 2.1.2
         version: 2.1.2
@@ -4507,6 +4510,10 @@ packages:
     resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
     dev: true
 
+  /@types/google-protobuf@3.15.6:
+    resolution: {integrity: sha512-pYVNNJ+winC4aek+lZp93sIKxnXt5qMkuKmaqS3WGuTq0Bw1ZDYNBgzG5kkdtwcv+GmYJGo3yEg6z2cKKAiEdw==}
+    dev: false
+
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
diff --git a/tasks/components/layout/TaskDetailView.tsx b/tasks/components/layout/TaskDetailView.tsx
index fac7cfad..04bde1b8 100644
--- a/tasks/components/layout/TaskDetailView.tsx
+++ b/tasks/components/layout/TaskDetailView.tsx
@@ -14,22 +14,25 @@ import { TaskTemplateListColumn } from '../TaskTemplateListColumn'
 import { Input } from '@helpwave/common/components/user_input/Input'
 import type { Languages } from '@helpwave/common/hooks/useLanguage'
 import type { TaskTemplateDTO } from '../../mutations/task_template_mutations'
-import {
-  usePersonalTaskTemplateQuery,
-  useWardTaskTemplateQuery
-} from '../../mutations/task_template_mutations'
+import { usePersonalTaskTemplateQuery, useWardTaskTemplateQuery } from '../../mutations/task_template_mutations'
 import { useAuth } from '../../hooks/useAuth'
 import { useRouter } from 'next/router'
 import type { TaskDTO } from '../../mutations/task_mutations'
 import {
   emptyTask,
   useSubTaskAddMutation,
-  useTaskCreateMutation, useTaskDeleteMutation,
+  useTaskCreateMutation,
+  useTaskDeleteMutation,
   useTaskQuery,
+  useTaskToDoneMutation,
+  useTaskToInProgressMutation,
+  useTaskToToDoMutation,
   useTaskUpdateMutation
 } from '../../mutations/task_mutations'
 import { useEffect, useState } from 'react'
 import { LoadingAnimation } from '@helpwave/common/components/LoadingAnimation'
+import { GetPatientDetailsResponse } from '@helpwave/proto-ts/proto/services/task_svc/v1/patient_svc_pb'
+import TaskStatus = GetPatientDetailsResponse.TaskStatus
 
 type TaskDetailViewTranslation = {
   close: string,
@@ -119,6 +122,9 @@ export const TaskDetailView = ({
 
   const updateTaskMutation = useTaskUpdateMutation()
   const deleteTaskMutation = useTaskDeleteMutation(onClose)
+  const toToDoMutation = useTaskToToDoMutation()
+  const toInProgressMutation = useTaskToInProgressMutation()
+  const toDoneMutation = useTaskToDoneMutation()
 
   useEffect(() => {
     if (data) {
@@ -149,6 +155,7 @@ export const TaskDetailView = ({
     return <LoadingAnimation />
   }
 
+  console.log(data, data?.dueDate)
   return (
     <div className={tw('relative flex flex-row h-[628px]')}>
       {isCreating && (
@@ -214,8 +221,8 @@ export const TaskDetailView = ({
             }}/>
           </div>
           <div className={tw('flex flex-col justify-between min-w-[250px]')}>
-            <div className={tw('flex flex-col gap-y-4 hidden')}>
-              <div>
+            <div className={tw('flex flex-col gap-y-4')}>
+              <div className={tw('hidden')} /* TODO enable later */ >
                 <label><Span type="labelMedium">{translation.assignee}</Span></label>
                 <Select
                   value={task.assignee}
@@ -232,20 +239,46 @@ export const TaskDetailView = ({
               </div>
               <div>
                 <label><Span type="labelMedium">{translation.dueDate}</Span></label>
-                <Input
-                  value={formatDate(task.dueDate)}
-                  type="datetime-local"
-                  onChange={value => {
-                    const dueDate = new Date(value)
-                    setTask({ ...task, dueDate })
-                  }}
-                />
+                <div className={tw('flex flex-row items-center gap-x-2')}>
+                  <Input
+                    value={task.dueDate ? formatDate(task.dueDate) : ''}
+                    type="datetime-local"
+                    onChange={value => {
+                      const dueDate = new Date(value)
+                      setTask({ ...task, dueDate })
+                      // Maybe add some auto save here after a validation
+                    }}
+                  />
+                  <Button
+                    onClick={() => setTask({ ...task, dueDate: undefined })}
+                    variant="textButton"
+                    color="negative"
+                    disabled={!task.dueDate}
+                  >
+                    <X size={24}/>
+                  </Button>
+                </div>
               </div>
               <div>
                 <label><Span type="labelMedium">{translation.status}</Span></label>
-                <TaskStatusSelect value={task.status} onChange={status => setTask({ ...task, status })}/>
+                <TaskStatusSelect value={task.status} onChange={status => {
+                  switch (status) {
+                    case TaskStatus.TASK_STATUS_TODO:
+                      toToDoMutation.mutate(task.id)
+                      break
+                    case TaskStatus.TASK_STATUS_IN_PROGRESS:
+                      toInProgressMutation.mutate(task.id)
+                      break
+                    case TaskStatus.TASK_STATUS_DONE:
+                      toDoneMutation.mutate(task.id)
+                      break
+                    default:
+                      break
+                  }
+                  setTask({ ...task, status })
+                }}/>
               </div>
-              <div>
+              <div className={tw('hidden')} /* TODO enable later */>
                 <label><Span type="labelMedium">{translation.visibility}</Span></label>
                 <Select
                   value={task.isPublicVisible}
diff --git a/tasks/mutations/task_mutations.ts b/tasks/mutations/task_mutations.ts
index 4069cd2c..c39b2bc4 100644
--- a/tasks/mutations/task_mutations.ts
+++ b/tasks/mutations/task_mutations.ts
@@ -20,6 +20,7 @@ import type { GetTasksByPatientSortedByStatusResponse } from '@helpwave/proto-ts
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { noop } from '@helpwave/common/components/user_input/Input'
 import { roomOverviewsQueryKey, roomsQueryKey } from './room_mutations'
+import { dateToTimestampOptional, timestampToDateOptional } from '../utils/timeConversion'
 
 export type SubTaskDTO = {
   id: string,
@@ -38,7 +39,7 @@ export type TaskDTO = {
   notes: string,
   status: TaskStatus,
   subtasks: SubTaskDTO[],
-  dueDate: Date,
+  dueDate?: Date,
   creationDate?: Date,
   isPublicVisible: boolean
 }
@@ -99,7 +100,7 @@ export const useTaskQuery = (taskID: string | undefined) => {
         notes: res.getDescription(),
         isPublicVisible: res.getPublic(),
         assignee: res.getAssignedUserId(),
-        dueDate: new Date(), // TODO replace later
+        dueDate: timestampToDateOptional(res.getDueAt()),
         subtasks: res.getSubtasksList().map(subtask => ({
           id: subtask.getId(),
           name: subtask.getName(),
@@ -128,7 +129,6 @@ export const useTasksByPatientQuery = (patientID: string | undefined) => {
       const res = await taskService.getTasksByPatient(req, getAuthenticatedGrpcMetadata())
 
       if (!res.getTasksList()) {
-        // TODO some check whether request was successful
         console.error('TasksByPatient query failed')
       }
 
@@ -139,7 +139,7 @@ export const useTasksByPatientQuery = (patientID: string | undefined) => {
         notes: task.getDescription(),
         isPublicVisible: task.getPublic(),
         assignee: task.getAssignedUserId(),
-        dueDate: new Date(), // TODO replace later
+        dueDate: timestampToDateOptional(task.getDueAt()),
         subtasks: task.getSubtasksList().map(subtask => ({
           id: subtask.getId(),
           name: subtask.getName(),
@@ -168,7 +168,6 @@ export const useTasksByPatientSortedByStatusQuery = (patientID: string | undefin
       const res = await taskService.getTasksByPatientSortedByStatus(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
-        // TODO some check whether request was successful
         console.error('TasksByPatientSortedByStatus query failed')
       }
 
@@ -179,7 +178,7 @@ export const useTasksByPatientSortedByStatusQuery = (patientID: string | undefin
         notes: task.getDescription(),
         isPublicVisible: task.getPublic(),
         assignee: task.getAssignedUserId(),
-        dueDate: new Date(), // TODO replace later
+        dueDate: timestampToDateOptional(task.getDueAt()),
         subtasks: task.getSubtasksList().map(subtask => ({
           id: subtask.getId(),
           name: subtask.getName(),
@@ -211,11 +210,13 @@ export const useTaskCreateMutation = (callback: (task: TaskDTO) => void = noop,
       const res = await taskService.createTask(req, getAuthenticatedGrpcMetadata())
       const newTask = { ...task, id: res.getId() }
 
-      queryClient.refetchQueries([tasksQueryKey]).then()
-      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
       callback(newTask)
       return newTask
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+    }
   })
 }
 
@@ -228,6 +229,8 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
       updateTask.setId(task.id)
       updateTask.setDescription(task.notes)
       updateTask.setName(task.name)
+      updateTask.setDueAt(dateToTimestampOptional(task.dueDate))
+      updateTask.setPublic(task.isPublicVisible)
 
       const getTask = new GetTaskRequest()
       const removeSubtask = new RemoveSubTaskRequest()
@@ -280,11 +283,13 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
 
       await taskService.updateTask(updateTask, getAuthenticatedGrpcMetadata())
 
-      queryClient.refetchQueries([tasksQueryKey]).then()
-      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
       callback()
       return updateTask.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+    }
   })
 }
 
@@ -296,11 +301,13 @@ export const useTaskDeleteMutation = (callback: () => void = noop) => {
       req.setId(taskID)
       await taskService.deleteTask(req, getAuthenticatedGrpcMetadata())
 
-      queryClient.refetchQueries([tasksQueryKey, sortedTasksByPatientQueryKey]).then()
-      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
       callback()
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey, sortedTasksByPatientQueryKey]).then()
+      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+    }
   })
 }
 
@@ -311,11 +318,14 @@ export const useTaskToToDoMutation = (callback: () => void = noop) => {
       const req = new TaskToToDoRequest()
       req.setId(taskID)
       await taskService.taskToToDo(req, getAuthenticatedGrpcMetadata())
-      queryClient.refetchQueries([tasksQueryKey]).then()
-      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+
       callback()
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+    }
   })
 }
 
@@ -326,11 +336,14 @@ export const useTaskToInProgressMutation = (callback: () => void = noop) => {
       const req = new TaskToInProgressRequest()
       req.setId(taskID)
       await taskService.taskToInProgress(req, getAuthenticatedGrpcMetadata())
-      queryClient.refetchQueries([tasksQueryKey]).then()
-      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+
       callback()
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+    }
   })
 }
 
@@ -341,11 +354,14 @@ export const useTaskToDoneMutation = (callback: () => void = noop) => {
       const req = new TaskToDoneRequest()
       req.setId(taskID)
       await taskService.taskToDone(req, getAuthenticatedGrpcMetadata())
-      queryClient.refetchQueries([tasksQueryKey]).then()
-      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+
       callback()
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+      queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
+    }
   })
 }
 
@@ -369,10 +385,13 @@ export const useSubTaskAddMutation = (callback: (subtask: SubTaskDTO) => void =
         name: subtask.name,
         isDone: subtask.isDone,
       }
-      queryClient.refetchQueries([tasksQueryKey]).then()
+
       callback(newSubtask)
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+    }
   })
 }
 
@@ -385,10 +404,13 @@ export const useSubTaskUpdateMutation = (callback: (subtask: SubTaskDTO) => void
       req.setName(subtask.name)
       await taskService.updateSubTask(req, getAuthenticatedGrpcMetadata())
       const newSubtask: SubTaskDTO = { ...subtask }
-      queryClient.refetchQueries([tasksQueryKey]).then()
+
       callback(newSubtask)
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+    }
   })
 }
 
@@ -399,10 +421,13 @@ export const useSubTaskDeleteMutation = (callback: () => void = noop) => {
       const req = new RemoveSubTaskRequest()
       req.setId(subtaskID)
       await taskService.removeSubTask(req, getAuthenticatedGrpcMetadata())
-      queryClient.refetchQueries([tasksQueryKey]).then()
+
       callback()
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+    }
   })
 }
 
@@ -413,10 +438,13 @@ export const useSubTaskToToDoMutation = (callback: () => void = noop) => {
       const req = new SubTaskToToDoRequest()
       req.setId(subtaskID)
       await taskService.subTaskToToDo(req, getAuthenticatedGrpcMetadata())
-      queryClient.refetchQueries([tasksQueryKey]).then()
+
       callback()
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+    }
   })
 }
 
@@ -427,9 +455,12 @@ export const useSubTaskToDoneMutation = (callback: () => void = noop) => {
       const req = new SubTaskToDoneRequest()
       req.setId(subtaskID)
       await taskService.subTaskToDone(req, getAuthenticatedGrpcMetadata())
-      queryClient.refetchQueries([tasksQueryKey]).then()
+
       callback()
       return req.toObject()
     },
+    onSuccess: () => {
+      queryClient.refetchQueries([tasksQueryKey]).then()
+    }
   })
 }
diff --git a/tasks/package.json b/tasks/package.json
index 15bde9e4..95fb048d 100644
--- a/tasks/package.json
+++ b/tasks/package.json
@@ -22,6 +22,7 @@
     "@twind/preset-tailwind": "1.1.4",
     "@twind/preset-tailwind-forms": "1.1.2",
     "@twind/preset-typography": "1.0.7",
+    "@types/google-protobuf": "^3.15.6",
     "cookies-next": "2.1.2",
     "google-protobuf": "3.21.2",
     "grpc-web": "1.4.2",
diff --git a/tasks/utils/timeConversion.ts b/tasks/utils/timeConversion.ts
new file mode 100644
index 00000000..42090912
--- /dev/null
+++ b/tasks/utils/timeConversion.ts
@@ -0,0 +1,31 @@
+import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb'
+
+export const timestampToDate = (timestamp: Timestamp): Date => {
+  const seconds = timestamp.getSeconds()
+  const nanos = timestamp.getNanos()
+
+  const milliseconds = seconds * 1000 + nanos / 1e6
+
+  return new Date(milliseconds)
+}
+
+export const timestampToDateOptional = (timestamp?: Timestamp): Date | undefined => {
+  if (timestamp) {
+    return timestampToDate(timestamp)
+  }
+  return undefined
+}
+
+export const dateToTimestamp = (date: Date): Timestamp => {
+  const timestamp = new Timestamp()
+  timestamp.setSeconds(Math.floor(date.getTime() / 1000)) // Convert to seconds
+  timestamp.setNanos(date.getMilliseconds() * 1e6) // Convert milliseconds to nanoseconds
+  return timestamp
+}
+
+export const dateToTimestampOptional = (date?: Date): Timestamp | undefined => {
+  if (date) {
+    return dateToTimestamp(date)
+  }
+  return undefined
+}

From 7a4454a4d81cebe4eb35afd40627530d92fe1e46 Mon Sep 17 00:00:00 2001
From: DasProffi <felix.thape@gmail.com>
Date: Tue, 8 Aug 2023 22:49:24 +0200
Subject: [PATCH 2/5] feat: remove delete duedate for now and update proto

---
 pnpm-lock.yaml                             | 8 ++++----
 tasks/components/layout/TaskDetailView.tsx | 3 ++-
 tasks/package.json                         | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e070d522..08a3f867 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -199,8 +199,8 @@ importers:
         specifier: workspace:*
         version: link:../lib
       '@helpwave/proto-ts':
-        specifier: 0.19.0-d9220d1.0
-        version: 0.19.0-d9220d1.0
+        specifier: 0.19.2-c36625f.0
+        version: 0.19.2-c36625f.0
       '@radix-ui/react-checkbox':
         specifier: 1.0.4
         version: 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.17)(react-dom@18.2.0)(react@18.2.0)
@@ -2057,8 +2057,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@helpwave/proto-ts@0.19.0-d9220d1.0:
-    resolution: {integrity: sha512-BkXWu+IAFM2r+8rWs6pIA8L46PhvMj8pC3FVICDuABIxRLgZKWI+xnDc0a8o1i/EU7lXR5NvLVHIkZItUopDPw==}
+  /@helpwave/proto-ts@0.19.2-c36625f.0:
+    resolution: {integrity: sha512-QlUSVenotdCd5tnzWdcbXblxlQh7Z0UdTH//0P7c2H1xiHzjG2YGPphzBlaZXnXN21BrMK4q/99gzEAohaLE5w==}
     dev: false
 
   /@humanwhocodes/config-array@0.11.10:
diff --git a/tasks/components/layout/TaskDetailView.tsx b/tasks/components/layout/TaskDetailView.tsx
index 04bde1b8..c5b21930 100644
--- a/tasks/components/layout/TaskDetailView.tsx
+++ b/tasks/components/layout/TaskDetailView.tsx
@@ -155,7 +155,6 @@ export const TaskDetailView = ({
     return <LoadingAnimation />
   }
 
-  console.log(data, data?.dueDate)
   return (
     <div className={tw('relative flex flex-row h-[628px]')}>
       {isCreating && (
@@ -249,6 +248,7 @@ export const TaskDetailView = ({
                       // Maybe add some auto save here after a validation
                     }}
                   />
+                  { /* TODO reenable when backend has implemented a remove duedate
                   <Button
                     onClick={() => setTask({ ...task, dueDate: undefined })}
                     variant="textButton"
@@ -257,6 +257,7 @@ export const TaskDetailView = ({
                   >
                     <X size={24}/>
                   </Button>
+                  */ }
                 </div>
               </div>
               <div>
diff --git a/tasks/package.json b/tasks/package.json
index 95fb048d..71a07e55 100644
--- a/tasks/package.json
+++ b/tasks/package.json
@@ -13,7 +13,7 @@
     "@dnd-kit/sortable": "7.0.2",
     "@headlessui/react": "1.7.16",
     "@helpwave/common": "workspace:*",
-    "@helpwave/proto-ts": "0.19.0-d9220d1.0",
+    "@helpwave/proto-ts": "0.19.2-c36625f.0",
     "@radix-ui/react-checkbox": "1.0.4",
     "@tanstack/react-query": "4.32.0",
     "@tanstack/react-table": "8.9.3",

From 33ca1f5797a6606f675647a1c3704196833d4603 Mon Sep 17 00:00:00 2001
From: DasProffi <felix.thape@gmail.com>
Date: Mon, 14 Aug 2023 03:10:07 +0200
Subject: [PATCH 3/5] refactor: improve code style

---
 tasks/mutations/task_mutations.ts | 10 +++++-----
 tasks/utils/timeConversion.ts     | 16 ++--------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/tasks/mutations/task_mutations.ts b/tasks/mutations/task_mutations.ts
index c39b2bc4..480d7e1f 100644
--- a/tasks/mutations/task_mutations.ts
+++ b/tasks/mutations/task_mutations.ts
@@ -20,7 +20,7 @@ import type { GetTasksByPatientSortedByStatusResponse } from '@helpwave/proto-ts
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { noop } from '@helpwave/common/components/user_input/Input'
 import { roomOverviewsQueryKey, roomsQueryKey } from './room_mutations'
-import { dateToTimestampOptional, timestampToDateOptional } from '../utils/timeConversion'
+import { dateToTimestamp, timestampToDate } from '../utils/timeConversion'
 
 export type SubTaskDTO = {
   id: string,
@@ -100,7 +100,7 @@ export const useTaskQuery = (taskID: string | undefined) => {
         notes: res.getDescription(),
         isPublicVisible: res.getPublic(),
         assignee: res.getAssignedUserId(),
-        dueDate: timestampToDateOptional(res.getDueAt()),
+        dueDate: res.getDueAt() ? timestampToDate(res.getDueAt()) : undefined,
         subtasks: res.getSubtasksList().map(subtask => ({
           id: subtask.getId(),
           name: subtask.getName(),
@@ -139,7 +139,7 @@ export const useTasksByPatientQuery = (patientID: string | undefined) => {
         notes: task.getDescription(),
         isPublicVisible: task.getPublic(),
         assignee: task.getAssignedUserId(),
-        dueDate: timestampToDateOptional(task.getDueAt()),
+        dueDate: task.getDueAt() ? timestampToDate(task.getDueAt()) : undefined,
         subtasks: task.getSubtasksList().map(subtask => ({
           id: subtask.getId(),
           name: subtask.getName(),
@@ -178,7 +178,7 @@ export const useTasksByPatientSortedByStatusQuery = (patientID: string | undefin
         notes: task.getDescription(),
         isPublicVisible: task.getPublic(),
         assignee: task.getAssignedUserId(),
-        dueDate: timestampToDateOptional(task.getDueAt()),
+        dueDate: task.getDueAt() ? timestampToDate(task.getDueAt()) : undefined,
         subtasks: task.getSubtasksList().map(subtask => ({
           id: subtask.getId(),
           name: subtask.getName(),
@@ -229,7 +229,7 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
       updateTask.setId(task.id)
       updateTask.setDescription(task.notes)
       updateTask.setName(task.name)
-      updateTask.setDueAt(dateToTimestampOptional(task.dueDate))
+      updateTask.setDueAt(task.dueDate ? dateToTimestamp(task.dueDate) : undefined)
       updateTask.setPublic(task.isPublicVisible)
 
       const getTask = new GetTaskRequest()
diff --git a/tasks/utils/timeConversion.ts b/tasks/utils/timeConversion.ts
index 42090912..e7941e22 100644
--- a/tasks/utils/timeConversion.ts
+++ b/tasks/utils/timeConversion.ts
@@ -9,23 +9,11 @@ export const timestampToDate = (timestamp: Timestamp): Date => {
   return new Date(milliseconds)
 }
 
-export const timestampToDateOptional = (timestamp?: Timestamp): Date | undefined => {
-  if (timestamp) {
-    return timestampToDate(timestamp)
-  }
-  return undefined
-}
-
 export const dateToTimestamp = (date: Date): Timestamp => {
   const timestamp = new Timestamp()
+
   timestamp.setSeconds(Math.floor(date.getTime() / 1000)) // Convert to seconds
   timestamp.setNanos(date.getMilliseconds() * 1e6) // Convert milliseconds to nanoseconds
-  return timestamp
-}
 
-export const dateToTimestampOptional = (date?: Date): Timestamp | undefined => {
-  if (date) {
-    return dateToTimestamp(date)
-  }
-  return undefined
+  return timestamp
 }

From 08a3077992d845b8f4c7c2d021fa333fee7dc406 Mon Sep 17 00:00:00 2001
From: DasProffi <felix.thape@gmail.com>
Date: Mon, 14 Aug 2023 03:13:58 +0200
Subject: [PATCH 4/5] chore: merge and update protos

---
 pnpm-lock.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c4bc9b64..99a8c1ce 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -231,6 +231,9 @@ importers:
       '@twind/preset-typography':
         specifier: 1.0.7
         version: 1.0.7(@twind/core@1.1.3)(typescript@5.1.6)
+      '@types/google-protobuf':
+        specifier: ^3.15.6
+        version: 3.15.6
       cookies-next:
         specifier: 2.1.2
         version: 2.1.2
@@ -4710,6 +4713,10 @@ packages:
     resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
     dev: true
 
+  /@types/google-protobuf@3.15.6:
+    resolution: {integrity: sha512-pYVNNJ+winC4aek+lZp93sIKxnXt5qMkuKmaqS3WGuTq0Bw1ZDYNBgzG5kkdtwcv+GmYJGo3yEg6z2cKKAiEdw==}
+    dev: false
+
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:

From 8df1b884d1ea962efa8df9f3ba5f0bf0b3994a63 Mon Sep 17 00:00:00 2001
From: DasProffi <felix.thape@gmail.com>
Date: Mon, 14 Aug 2023 04:08:47 +0200
Subject: [PATCH 5/5] fix: fix failing type check

---
 tasks/mutations/task_mutations.ts | 67 +++++++++++++++++--------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/tasks/mutations/task_mutations.ts b/tasks/mutations/task_mutations.ts
index 480d7e1f..f9020a57 100644
--- a/tasks/mutations/task_mutations.ts
+++ b/tasks/mutations/task_mutations.ts
@@ -93,6 +93,7 @@ export const useTaskQuery = (taskID: string | undefined) => {
         console.error('TasksByPatient query failed')
       }
 
+      const dueAt = res.getDueAt()
       const task: TaskDTO = {
         id: res.getId(),
         name: res.getName(),
@@ -100,7 +101,7 @@ export const useTaskQuery = (taskID: string | undefined) => {
         notes: res.getDescription(),
         isPublicVisible: res.getPublic(),
         assignee: res.getAssignedUserId(),
-        dueDate: res.getDueAt() ? timestampToDate(res.getDueAt()) : undefined,
+        dueDate: dueAt ? timestampToDate(dueAt) : undefined,
         subtasks: res.getSubtasksList().map(subtask => ({
           id: subtask.getId(),
           name: subtask.getName(),
@@ -132,23 +133,26 @@ export const useTasksByPatientQuery = (patientID: string | undefined) => {
         console.error('TasksByPatient query failed')
       }
 
-      const tasks: TaskDTO[] = res.getTasksList().map(task => ({
-        id: task.getId(),
-        name: task.getName(),
-        status: task.getStatus(),
-        notes: task.getDescription(),
-        isPublicVisible: task.getPublic(),
-        assignee: task.getAssignedUserId(),
-        dueDate: task.getDueAt() ? timestampToDate(task.getDueAt()) : undefined,
-        subtasks: task.getSubtasksList().map(subtask => ({
-          id: subtask.getId(),
-          name: subtask.getName(),
-          isDone: subtask.getDone()
-        }))
-      }))
+      const tasks: TaskDTO[] = res.getTasksList().map(task => {
+        const dueAt = task.getDueAt()
+        return {
+          id: task.getId(),
+          name: task.getName(),
+          status: task.getStatus(),
+          notes: task.getDescription(),
+          isPublicVisible: task.getPublic(),
+          assignee: task.getAssignedUserId(),
+          dueDate: dueAt ? timestampToDate(dueAt) : undefined,
+          subtasks: task.getSubtasksList().map(subtask => ({
+            id: subtask.getId(),
+            name: subtask.getName(),
+            isDone: subtask.getDone()
+          }))
+        }
+      })
 
       return tasks
-    },
+    }
   })
 }
 
@@ -171,20 +175,23 @@ export const useTasksByPatientSortedByStatusQuery = (patientID: string | undefin
         console.error('TasksByPatientSortedByStatus query failed')
       }
 
-      const mapping = (task: GetTasksByPatientSortedByStatusResponse.Task, status: TaskStatus) => ({
-        id: task.getId(),
-        name: task.getName(),
-        status,
-        notes: task.getDescription(),
-        isPublicVisible: task.getPublic(),
-        assignee: task.getAssignedUserId(),
-        dueDate: task.getDueAt() ? timestampToDate(task.getDueAt()) : undefined,
-        subtasks: task.getSubtasksList().map(subtask => ({
-          id: subtask.getId(),
-          name: subtask.getName(),
-          isDone: subtask.getDone()
-        }))
-      })
+      const mapping = (task: GetTasksByPatientSortedByStatusResponse.Task, status: TaskStatus) => {
+        const dueAt = task.getDueAt()
+        return {
+          id: task.getId(),
+          name: task.getName(),
+          status,
+          notes: task.getDescription(),
+          isPublicVisible: task.getPublic(),
+          assignee: task.getAssignedUserId(),
+          dueDate: dueAt ? timestampToDate(dueAt) : undefined,
+          subtasks: task.getSubtasksList().map(subtask => ({
+            id: subtask.getId(),
+            name: subtask.getName(),
+            isDone: subtask.getDone()
+          }))
+        }
+      }
 
       const tasks: SortedTasks = {
         [TaskStatus.TASK_STATUS_TODO]: res.getTodoList().map(value => mapping(value, TaskStatus.TASK_STATUS_TODO)),