From 2eaa01b34e6ac14d212021431d14bd314d247d74 Mon Sep 17 00:00:00 2001
From: DasProffi <felix.thape@gmail.com>
Date: Mon, 26 Aug 2024 18:17:41 +0200
Subject: [PATCH] feat: add user and organization service and wrap services

---
 tasks/components/cards/TaskCard.tsx           |   5 +-
 tasks/components/layout/PatientDetails.tsx    |   4 +-
 tasks/components/layout/PatientList.tsx       |   9 +-
 tasks/components/layout/TaskDetailView.tsx    |  19 +-
 tasks/components/selects/TaskStatusSelect.tsx |  10 +-
 tasks/mutations/bed_mutations.ts              |  16 +-
 .../mutations/offline/services/bed_service.ts |  35 ++-
 .../offline/services/organization_service.tsx | 232 ++++++++++++++++++
 .../offline/services/patient_service.ts       |   3 +
 .../offline/services/task_service.ts          | 157 ++++++------
 .../offline/services/user_service.ts          | 114 +++++++++
 .../offline/services/ward_service.ts          |   8 +-
 tasks/mutations/offline/value_store.ts        |  28 ++-
 .../organization_member_mutations.ts          |   4 +-
 tasks/mutations/organization_mutations.ts     |  28 +--
 tasks/mutations/patient_mutations.ts          |  31 +--
 .../mutations/property/property_mutations.ts  |  12 +-
 .../property/property_value_mutations.ts      |   6 +-
 tasks/mutations/room_mutations.ts             |  12 +-
 tasks/mutations/task_mutations.ts             |  46 ++--
 tasks/mutations/task_template_mutations.ts    |  28 +--
 tasks/mutations/user_mutations.ts             |   4 +-
 tasks/mutations/ward_mutations.ts             |  14 +-
 tasks/utils/grpc.ts                           |  68 +++--
 24 files changed, 658 insertions(+), 235 deletions(-)
 create mode 100644 tasks/mutations/offline/services/organization_service.tsx
 create mode 100644 tasks/mutations/offline/services/user_service.ts

diff --git a/tasks/components/cards/TaskCard.tsx b/tasks/components/cards/TaskCard.tsx
index 146dc113..56be2a1a 100644
--- a/tasks/components/cards/TaskCard.tsx
+++ b/tasks/components/cards/TaskCard.tsx
@@ -3,12 +3,11 @@ import { Card, type CardProps } from '@helpwave/common/components/Card'
 import { ProgressIndicator } from '@helpwave/common/components/ProgressIndicator'
 import { Span } from '@helpwave/common/components/Span'
 import { LockIcon } from 'lucide-react'
-import { TaskStatus } from '@helpwave/proto-ts/services/task_svc/v1/task_svc_pb'
 import type { Languages } from '@helpwave/common/hooks/useLanguage'
 import { useTranslation, type PropsForTranslation } from '@helpwave/common/hooks/useTranslation'
 import { Avatar } from '@helpwave/common/components/Avatar'
-import type { TaskDTO } from '@/mutations/task_mutations'
 import { useUserQuery } from '@/mutations/user_mutations'
+import type { TaskDTO } from '@/mutations/types/task'
 
 type TaskCardTranslation = {
   assigned: string
@@ -38,7 +37,7 @@ export const TaskCard = ({
 }: PropsForTranslation<TaskCardTranslation, TaskCardProps>) => {
   const translation = useTranslation(defaultTaskCardTranslations, overwriteTranslation)
   const progress = task.subtasks.length === 0 ? 1 : task.subtasks.filter(value => value.isDone).length / task.subtasks.length
-  const isOverDue = task.dueDate && task.dueDate < new Date() && task.status !== TaskStatus.TASK_STATUS_DONE
+  const isOverDue = task.dueDate && task.dueDate < new Date() && task.status !== 'done'
 
   const { data: assignee } = useUserQuery(task.assignee)
 
diff --git a/tasks/components/layout/PatientDetails.tsx b/tasks/components/layout/PatientDetails.tsx
index 7d542641..898991c5 100644
--- a/tasks/components/layout/PatientDetails.tsx
+++ b/tasks/components/layout/PatientDetails.tsx
@@ -7,7 +7,6 @@ import { Textarea } from '@helpwave/common/components/user-input/Textarea'
 import { ToggleableInput } from '@helpwave/common/components/user-input/ToggleableInput'
 import useSaveDelay from '@helpwave/common/hooks/useSaveDelay'
 import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'
-import { TaskStatus } from '@helpwave/proto-ts/services/task_svc/v1/task_svc_pb'
 import { ColumnTitle } from '../ColumnTitle'
 import { TasksKanbanBoard } from './TasksKanbanBoard'
 import { WardOverviewContext } from '@/pages/ward/[wardId]'
@@ -24,6 +23,7 @@ import { PatientDischargeModal } from '@/components/modals/PatientDischargeModal
 import { TaskDetailModal } from '@/components/modals/TaskDetailModal'
 import { RoomBedSelect } from '@/components/selects/RoomBedSelect'
 import { PropertyList } from '@/components/layout/property/PropertyList'
+import type { TaskStatus } from '@/mutations/types/task'
 
 type PatientDetailTranslation = {
   patientDetails: string,
@@ -208,7 +208,7 @@ export const PatientDetail = ({
             patientId={newPatient.id}
             editedTaskId={taskId}
             onEditTask={task => {
-              setInitialTaskStatus(task.status === TaskStatus.TASK_STATUS_DONE ? TaskStatus.TASK_STATUS_TODO : task.status)
+              setInitialTaskStatus(task.status === 'done' ? 'todo' : task.status)
               setTaskId(task.id)
             }}
           />
diff --git a/tasks/components/layout/PatientList.tsx b/tasks/components/layout/PatientList.tsx
index cf5eadc7..b7c344b0 100644
--- a/tasks/components/layout/PatientList.tsx
+++ b/tasks/components/layout/PatientList.tsx
@@ -38,7 +38,8 @@ type PatientListTranslation = {
   deleteDescriptionText: string,
   addPatient: string,
   search: string,
-  bed: string
+  bed: string,
+  otherWard: string
 }
 
 const defaultPatientListTranslations: Record<Languages, PatientListTranslation> = {
@@ -56,6 +57,7 @@ const defaultPatientListTranslations: Record<Languages, PatientListTranslation>
     addPatient: 'Add Patient',
     search: 'Search',
     bed: 'Bed',
+    otherWard: 'Other Ward',
   },
   de: {
     patients: 'Patienten',
@@ -71,6 +73,7 @@ const defaultPatientListTranslations: Record<Languages, PatientListTranslation>
     addPatient: 'Patient hinzufügen',
     search: 'Suchen',
     bed: 'Bett',
+    otherWard: 'Andere Station',
   }
 }
 
@@ -120,7 +123,9 @@ export const PatientList = ({
   const [dischargingPatient, setDischargingPatient] = useState<PatientMinimalDTO>()
   const [deletePatient, setDeletePatient] = useState<PatientMinimalDTO>()
 
-  const activeLabelText = (patient: PatientWithBedAndRoomDTO) => `${patient.room.name} - ${patient.bed.name}`
+  const activeLabelText = (patient: PatientWithBedAndRoomDTO) => patient.room.wardId === wardId
+    ? `${patient.room.name} - ${patient.bed.name}`
+    : translation.otherWard
 
   const filteredActive = !data ? [] : MultiSearchWithMapping(search, data.active, value => [value.name, activeLabelText(value)])
   const filteredUnassigned = !data ? [] : SimpleSearchWithMapping(search, data.unassigned, value => value.name)
diff --git a/tasks/components/layout/TaskDetailView.tsx b/tasks/components/layout/TaskDetailView.tsx
index fddd7a2c..14ee155e 100644
--- a/tasks/components/layout/TaskDetailView.tsx
+++ b/tasks/components/layout/TaskDetailView.tsx
@@ -15,7 +15,6 @@ import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAnd
 import { ConfirmDialog } from '@helpwave/common/components/modals/ConfirmDialog'
 import { ModalHeader } from '@helpwave/common/components/modals/Modal'
 import { formatDateTime } from '@helpwave/common/util/date'
-import { TaskStatus } from '@helpwave/proto-ts/services/task_svc/v1/task_svc_pb'
 import { TaskTemplateListColumn } from '../TaskTemplateListColumn'
 import { SubtaskView } from '../SubtaskView'
 import { TaskVisibilitySelect } from '@/components/selects/TaskVisibilitySelect'
@@ -27,7 +26,6 @@ import {
 } from '@/mutations/task_template_mutations'
 import { useAuth } from '@/hooks/useAuth'
 import {
-  emptyTask,
   useAssignTaskToUserMutation,
   useSubTaskAddMutation,
   useTaskCreateMutation,
@@ -37,11 +35,12 @@ import {
   useTaskToInProgressMutation,
   useTaskToToDoMutation,
   useTaskUpdateMutation,
-  useUnassignTaskToUserMutation,
-  type TaskDTO
+  useUnassignTaskToUserMutation
 } from '@/mutations/task_mutations'
 import { type WardWithOrganizationIdDTO, useWardQuery } from '@/mutations/ward_mutations'
 import { AssigneeSelect } from '@/components/selects/AssigneeSelect'
+import type { TaskDTO, TaskStatus } from '@/mutations/types/task'
+import { emptyTask } from '@/mutations/types/task'
 
 type TaskDetailViewTranslation = {
   close: string,
@@ -224,17 +223,17 @@ const TaskDetailViewSidebar = ({
         <label><Span type="labelMedium">{translation.status}</Span></label>
         <TaskStatusSelect
           value={task.status}
-          removeOptions={isCreating ? [TaskStatus.TASK_STATUS_DONE] : []}
+          removeOptions={isCreating ? ['done'] : []}
           onChange={(status) => {
             if (!isCreating) {
               switch (status) {
-                case TaskStatus.TASK_STATUS_TODO:
+                case 'todo':
                   toToDoMutation.mutate(task.id)
                   break
-                case TaskStatus.TASK_STATUS_IN_PROGRESS:
+                case 'inProgress':
                   toInProgressMutation.mutate(task.id)
                   break
-                case TaskStatus.TASK_STATUS_DONE:
+                case 'done':
                   toDoneMutation.mutate(task.id)
                   break
                 default:
@@ -322,7 +321,7 @@ export const TaskDetailView = ({
 
   const [task, setTask] = useState<TaskDTO>({
     ...emptyTask,
-    status: initialStatus ?? TaskStatus.TASK_STATUS_TODO
+    status: initialStatus ?? 'todo'
   })
 
   const addSubtaskMutation = useSubTaskAddMutation(taskId)
@@ -375,7 +374,7 @@ export const TaskDetailView = ({
             <Button color="negative" onClick={() => setIsShowingDeleteDialog(true)}>
               {translation.delete}
             </Button>
-            {task.status !== TaskStatus.TASK_STATUS_DONE && (
+            {task.status !== 'done' && (
               <Button color="positive" onClick={() => {
                 toDoneMutation.mutate(task.id)
                 onClose()
diff --git a/tasks/components/selects/TaskStatusSelect.tsx b/tasks/components/selects/TaskStatusSelect.tsx
index 90073e13..8f790057 100644
--- a/tasks/components/selects/TaskStatusSelect.tsx
+++ b/tasks/components/selects/TaskStatusSelect.tsx
@@ -1,6 +1,6 @@
 import { Select, type SelectProps } from '@helpwave/common/components/user-input/Select'
 import { useTranslation, type PropsForTranslation } from '@helpwave/common/hooks/useTranslation'
-import { TaskStatus } from '@helpwave/proto-ts/services/task_svc/v1/task_svc_pb'
+import type { TaskStatus } from '@/mutations/types/task'
 
 type TaskStatusSelectTranslation = {
   unscheduled: string,
@@ -43,10 +43,10 @@ export const TaskStatusSelect = ({
   ...selectProps
 }: PropsForTranslation<TaskStatusSelectTranslation, TaskStatusSelectProps>) => {
   const translation = useTranslation(defaultTaskStatusSelectTranslation, overwriteTranslation)
-  const defaultOptions = [
-    { value: TaskStatus.TASK_STATUS_TODO, label: translation.unscheduled },
-    { value: TaskStatus.TASK_STATUS_IN_PROGRESS, label: translation.inProgress },
-    { value: TaskStatus.TASK_STATUS_DONE, label: translation.done }
+  const defaultOptions: {value: TaskStatus, label: string}[] = [
+    { value: 'todo', label: translation.unscheduled },
+    { value: 'inProgress', label: translation.inProgress },
+    { value: 'done', label: translation.done }
   ]
 
   const filteredOptions = defaultOptions.filter(defaultValue => !removeOptions?.find(value2 => value2 === defaultValue.value))
diff --git a/tasks/mutations/bed_mutations.ts b/tasks/mutations/bed_mutations.ts
index bb9315f3..2a28890b 100644
--- a/tasks/mutations/bed_mutations.ts
+++ b/tasks/mutations/bed_mutations.ts
@@ -8,7 +8,7 @@ import {
 import { roomOverviewsQueryKey, roomsQueryKey } from './room_mutations'
 import type { PatientDTO, PatientMinimalDTO, PatientWithTasksNumberDTO } from './patient_mutations'
 import { wardsQueryKey } from './ward_mutations'
-import { bedService, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
+import { APIServices, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
 
 export type BedMinimalDTO = {
   id: string,
@@ -59,7 +59,7 @@ export const useBedQuery = (bedId: string | undefined) => {
       if (bedId) {
         req.setId(bedId)
       }
-      const res = await bedService.getBed(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.bed.getBed(req, getAuthenticatedGrpcMetadata())
 
       const bed: BedWithRoomId = {
         id: res.getId(),
@@ -79,7 +79,7 @@ export const useBedCreateMutation = () => {
       const req = new CreateBedRequest()
       req.setRoomId(bed.roomId)
       req.setName(bed.name)
-      const res = await bedService.createBed(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.bed.createBed(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.log('error in BedCreate')
@@ -88,7 +88,7 @@ export const useBedCreateMutation = () => {
       return { id: res.getId(), name: bed.name }
     },
     onSuccess: () => {
-      queryClient.refetchQueries([bedService]).then()
+      queryClient.refetchQueries([bedQueryKey]).then()
       queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
       queryClient.refetchQueries([wardsQueryKey]).then()
     },
@@ -104,7 +104,7 @@ export const useBedUpdateMutation = () => {
       req.setName(bed.name)
       req.setRoomId(bed.roomId)
 
-      const res = await bedService.updateBed(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.bed.updateBed(req, getAuthenticatedGrpcMetadata())
 
       const obj = res.toObject() // TODO: what is the type of this?
 
@@ -115,7 +115,7 @@ export const useBedUpdateMutation = () => {
       return obj
     },
     onSuccess: () => {
-      queryClient.refetchQueries([bedService]).then()
+      queryClient.refetchQueries([APIServices.bed]).then()
       queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
     },
   })
@@ -128,7 +128,7 @@ export const useBedDeleteMutation = () => {
       const req = new DeleteBedRequest()
       req.setId(bedId)
 
-      const res = await bedService.deleteBed(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.bed.deleteBed(req, getAuthenticatedGrpcMetadata())
 
       const obj = res.toObject() // TODO: what is the type of this?
 
@@ -139,7 +139,7 @@ export const useBedDeleteMutation = () => {
       return obj
     },
     onSuccess: () => {
-      queryClient.refetchQueries([bedService]).then()
+      queryClient.refetchQueries([APIServices.bed]).then()
       queryClient.refetchQueries([roomsQueryKey, roomOverviewsQueryKey]).then()
       queryClient.refetchQueries([wardsQueryKey]).then()
     },
diff --git a/tasks/mutations/offline/services/bed_service.ts b/tasks/mutations/offline/services/bed_service.ts
index 5401e64f..0a239139 100644
--- a/tasks/mutations/offline/services/bed_service.ts
+++ b/tasks/mutations/offline/services/bed_service.ts
@@ -8,8 +8,7 @@ import type {
   GetBedsByRoomRequest,
   GetBedsRequest,
   UpdateBedRequest
-  ,
-  GetBedByPatientResponse
+
 } from '@helpwave/proto-ts/services/task_svc/v1/bed_svc_pb'
 import {
   BulkCreateBedsResponse,
@@ -19,11 +18,15 @@ import {
   GetBedsByRoomResponse,
   GetBedsResponse,
   UpdateBedResponse
+  ,
+  GetBedByPatientResponse
 } from '@helpwave/proto-ts/services/task_svc/v1/bed_svc_pb'
 import { BedServicePromiseClient } from '@helpwave/proto-ts/services/task_svc/v1/bed_svc_grpc_web_pb'
 import { range } from '@helpwave/common/util/array'
 import { OfflineValueStore } from '@/mutations/offline/value_store'
 import type { BedWithRoomId } from '@/mutations/bed_mutations'
+import { PatientOfflineService } from '@/mutations/offline/services/patient_service'
+import { RoomOfflineService } from '@/mutations/offline/services/room_service'
 
 export const BedOfflineService = {
   find: (id: string): BedWithRoomId | undefined => {
@@ -63,7 +66,10 @@ export const BedOfflineService = {
   delete: (id: string) => {
     const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
     valueStore.beds = valueStore.beds.filter(value => value.id !== id)
-    // TODO cascade and unassign patients
+    const patient = PatientOfflineService.findByBed(id)
+    if (patient) {
+      PatientOfflineService.unassignBed(patient.id)
+    }
   }
 }
 
@@ -105,10 +111,25 @@ export class BedOfflineServicePromiseClient extends BedServicePromiseClient {
       .setBedsList(list)
   }
 
-  async getBedByPatient(__: GetBedByPatientRequest, _?: Metadata): Promise<GetBedByPatientResponse> {
-    // const patientId = request.getPatientId()
-    throw Error('Not implemented') // TODO implement
-    // return new GetBedByPatientResponse()
+  async getBedByPatient(request: GetBedByPatientRequest, _?: Metadata): Promise<GetBedByPatientResponse> {
+    const patient = PatientOfflineService.find(request.getPatientId())
+    if (!patient) {
+      throw Error(`GetBedByPatient: Could not find patient with id ${request.getPatientId()}`)
+    }
+    if (!patient.bedId) {
+      return new GetBedByPatientResponse()
+    }
+    const bed = BedOfflineService.find(patient.bedId)
+    if (!bed) {
+      return new GetBedByPatientResponse()
+    }
+    const room = RoomOfflineService.findRoom(bed.roomId)
+    if (!room) {
+      return new GetBedByPatientResponse()
+    }
+    return new GetBedByPatientResponse()
+      .setBed(new GetBedByPatientResponse.Bed().setId(bed.id).setName(bed.name))
+      .setRoom(new GetBedByPatientResponse.Room().setId(room.id).setName(room.id).setWardId(room.wardId))
   }
 
   async createBed(request: CreateBedRequest, _?: Metadata): Promise<CreateBedResponse> {
diff --git a/tasks/mutations/offline/services/organization_service.tsx b/tasks/mutations/offline/services/organization_service.tsx
new file mode 100644
index 00000000..bdaff2b5
--- /dev/null
+++ b/tasks/mutations/offline/services/organization_service.tsx
@@ -0,0 +1,232 @@
+import type { Metadata } from 'grpc-web'
+import { OrganizationServicePromiseClient } from '@helpwave/proto-ts/services/user_svc/v1/organization_svc_grpc_web_pb'
+import type {
+  CreateOrganizationRequest,
+  GetMembersByOrganizationRequest,
+  GetOrganizationRequest,
+  GetOrganizationsByUserRequest,
+  GetOrganizationsForUserRequest,
+  CreateOrganizationForUserRequest,
+  UpdateOrganizationRequest,
+  DeleteOrganizationRequest,
+  GetInvitationsByOrganizationRequest,
+  InviteMemberRequest,
+  InviteMemberResponse,
+  GetInvitationsByUserRequest,
+  RevokeInvitationRequest,
+  AcceptInvitationRequest,
+  DeclineInvitationRequest, AddMemberRequest, RemoveMemberRequest, AddMemberResponse, RemoveMemberResponse
+} from '@helpwave/proto-ts/services/user_svc/v1/organization_svc_pb'
+import {
+  AcceptInvitationResponse,
+  CreateOrganizationForUserResponse,
+  CreateOrganizationResponse, DeclineInvitationResponse,
+  DeleteOrganizationResponse,
+  GetInvitationsByOrganizationResponse, GetInvitationsByUserResponse,
+  GetMembersByOrganizationResponse,
+  GetOrganizationMember,
+  GetOrganizationResponse,
+  GetOrganizationsByUserResponse,
+  GetOrganizationsForUserResponse, RevokeInvitationResponse,
+  UpdateOrganizationResponse
+} from '@helpwave/proto-ts/services/user_svc/v1/organization_svc_pb'
+import { OfflineValueStore } from '@/mutations/offline/value_store'
+import type { OrganizationMinimalDTO } from '@/mutations/organization_mutations'
+import { UserOfflineService } from '@/mutations/offline/services/user_service'
+import { WardOfflineService } from '@/mutations/offline/services/ward_service'
+
+type OrganizationUpdate = Omit<OrganizationMinimalDTO, 'isPersonal'>
+
+export const OrganizationOfflineService = {
+  find: (id: string): OrganizationMinimalDTO | undefined => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    // TODO check organization
+    return valueStore.organizations.find(value => value.id === id)
+  },
+  findOrganizations: (): OrganizationMinimalDTO[] => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    // TODO check organization
+    return valueStore.organizations
+  },
+  create: (organization: OrganizationMinimalDTO) => {
+    OfflineValueStore.getInstance().organizations.push(organization)
+  },
+  update: (organization: OrganizationUpdate) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+
+    let found = false
+
+    // TODO check organization
+    valueStore.organizations = valueStore.organizations.map(value => {
+      if (value.id === organization.id) {
+        found = true
+        return {
+          ...value,
+          ...organization
+        }
+      }
+      return value
+    })
+
+    if (!found) {
+      throw Error(`UpdateOrganization: Could not find organization with id ${organization.id}`)
+    }
+  },
+  delete: (organizationId: string) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    valueStore.organizations = valueStore.organizations.filter(value => value.id !== organizationId)
+    const wards = WardOfflineService.findWards(organizationId)
+    wards.forEach(ward => WardOfflineService.delete(ward.id))
+  }
+}
+
+export class OrganizationOfflineServicePromiseClient extends OrganizationServicePromiseClient {
+  async getOrganization(request: GetOrganizationRequest, _?: Metadata): Promise<GetOrganizationResponse> {
+    const organization = OrganizationOfflineService.find(request.getId())
+    if (!organization) {
+      throw Error(`GetOrganization: Could not find organization with id ${request.getId()}`)
+    }
+    const members = UserOfflineService.findUsers().map(user => new GetOrganizationMember().setUserId(user.id))
+    return new GetOrganizationResponse()
+      .setId(organization.id)
+      .setShortName(organization.shortName)
+      .setLongName(organization.longName)
+      .setAvatarUrl(organization.avatarURL)
+      .setContactEmail(organization.email)
+      .setIsPersonal(organization.isPersonal)
+      .setMembersList(members)
+  }
+
+  async getOrganizationsByUser(_: GetOrganizationsByUserRequest, __?: Metadata): Promise<GetOrganizationsByUserResponse> {
+    // TODO use user id of request
+    const organizations = OrganizationOfflineService.findOrganizations().map(org =>
+      new GetOrganizationsByUserResponse.Organization()
+        .setId(org.id)
+        .setShortName(org.shortName)
+        .setLongName(org.longName)
+        .setContactEmail(org.email)
+        .setIsPersonal(org.isPersonal)
+        .setAvatarUrl(org.avatarURL)
+        .setMembersList(UserOfflineService.findUsers().map(user => new GetOrganizationsByUserResponse.Organization.Member().setUserId(user.id))))
+    return new GetOrganizationsByUserResponse().setOrganizationsList(organizations)
+  }
+
+  async getOrganizationsForUser(_: GetOrganizationsForUserRequest, __?: Metadata): Promise<GetOrganizationsForUserResponse> {
+    const organizations = OrganizationOfflineService.findOrganizations().map(org =>
+      new GetOrganizationsByUserResponse.Organization()
+        .setId(org.id)
+        .setShortName(org.shortName)
+        .setLongName(org.longName)
+        .setContactEmail(org.email)
+        .setIsPersonal(org.isPersonal)
+        .setAvatarUrl(org.avatarURL)
+        .setMembersList(UserOfflineService.findUsers().map(user => new GetOrganizationsForUserResponse.Organization.Member().setUserId(user.id))))
+    return new GetOrganizationsForUserResponse().setOrganizationsList(organizations)
+  }
+
+  async getMembersByOrganization(request: GetMembersByOrganizationRequest, __?: Metadata): Promise<GetMembersByOrganizationResponse> {
+    const organization = OrganizationOfflineService.find(request.getId())
+    if (!organization) {
+      throw Error(`GetMembersByOrganization: Could not find organization with id ${request.getId()}`)
+    }
+    const members = UserOfflineService.findUsers().map(user => new GetMembersByOrganizationResponse.Member()
+      .setUserId(user.id)
+      .setEmail(user.email)
+      .setNickname(user.nickName)
+      .setAvatarUrl(user.avatarURL))
+    return new GetMembersByOrganizationResponse().setMembersList(members)
+  }
+
+  async createOrganization(request: CreateOrganizationRequest, _?: Metadata): Promise<CreateOrganizationResponse> {
+    const newOrganization: OrganizationMinimalDTO = {
+      id: Math.random().toString(),
+      shortName: request.getShortName(),
+      longName: request.getLongName(),
+      avatarURL: 'https://helpwave.de/favicon.ico',
+      email: request.getContactEmail(),
+      isPersonal: request.getIsPersonal(),
+      isVerified: true
+    }
+
+    OrganizationOfflineService.create(newOrganization)
+
+    return new CreateOrganizationResponse().setId(newOrganization.id)
+  }
+
+  async createOrganizationForUser(request: CreateOrganizationForUserRequest, _?: Metadata): Promise<CreateOrganizationForUserResponse> {
+    const newOrganization: OrganizationMinimalDTO = {
+      id: Math.random().toString(),
+      shortName: request.getShortName(),
+      longName: request.getLongName(),
+      avatarURL: 'https://helpwave.de/favicon.ico',
+      email: request.getContactEmail(),
+      isPersonal: request.getIsPersonal(),
+      isVerified: true
+    }
+
+    OrganizationOfflineService.create(newOrganization)
+
+    return new CreateOrganizationForUserResponse().setId(newOrganization.id)
+  }
+
+  async updateOrganization(request: UpdateOrganizationRequest, _?: Metadata): Promise<UpdateOrganizationResponse> {
+    const update: OrganizationUpdate = {
+      id: request.getId(),
+      shortName: request.getShortName(),
+      longName: request.getLongName(),
+      email: request.getContactEmail(),
+      isVerified: request.getIsPersonal(),
+      avatarURL: request.getAvatarUrl(),
+    }
+    OrganizationOfflineService.update(update)
+    return new UpdateOrganizationResponse()
+  }
+
+  async deleteOrganization(request: DeleteOrganizationRequest, _?: Metadata): Promise<DeleteOrganizationResponse> {
+    OrganizationOfflineService.delete(request.getId())
+    return new DeleteOrganizationResponse()
+  }
+
+  async getInvitationsByOrganization(__: GetInvitationsByOrganizationRequest, _?: Metadata): Promise<GetInvitationsByOrganizationResponse> {
+    // TODO update this
+    return new GetInvitationsByOrganizationResponse().setInvitationsList([])
+  }
+
+  async getInvitationsByUser(__: GetInvitationsByUserRequest, _?: Metadata): Promise<GetInvitationsByUserResponse> {
+    // TODO update this
+    return new GetInvitationsByUserResponse().setInvitationsList([])
+  }
+
+  async inviteMember(__: InviteMemberRequest, _?: Metadata): Promise<InviteMemberResponse> {
+    // TODO update this
+    throw Error('Not implemented')
+    // return new InviteMemberResponse()
+  }
+
+  async revokeInvitation(__: RevokeInvitationRequest, _?: Metadata): Promise<RevokeInvitationResponse> {
+    // TODO update this
+    return new RevokeInvitationResponse()
+  }
+
+  async acceptInvitation(__: AcceptInvitationRequest, _?: Metadata): Promise<AcceptInvitationResponse> {
+    // TODO update this
+    return new AcceptInvitationResponse()
+  }
+
+  async declineInvitation(__: DeclineInvitationRequest, _?: Metadata): Promise<DeclineInvitationResponse> {
+    // TODO update this
+    return new DeclineInvitationResponse()
+  }
+
+  async addMember(__: AddMemberRequest, _?: Metadata): Promise<AddMemberResponse> {
+    // TODO update this
+    throw Error('Not implemented')
+    // return new AddMemberResponse()
+  }
+
+  removeMember(__: RemoveMemberRequest, _?: Metadata): Promise<RemoveMemberResponse> {
+    // TODO update this
+    throw Error('Not implemented')
+    // return new RemoveMemberResponse()
+  }
+}
diff --git a/tasks/mutations/offline/services/patient_service.ts b/tasks/mutations/offline/services/patient_service.ts
index 622be6ad..7717291c 100644
--- a/tasks/mutations/offline/services/patient_service.ts
+++ b/tasks/mutations/offline/services/patient_service.ts
@@ -91,6 +91,7 @@ export const PatientOfflineService = {
         return {
           ...value,
           isDischarged,
+          bedId: isDischarged ? undefined : value.bedId,
         }
       }
       return value
@@ -147,6 +148,8 @@ export const PatientOfflineService = {
   deletePatient: (id: string) => {
     const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
     valueStore.patients = valueStore.patients.filter(value => value.id !== id)
+    const tasks = TaskOfflineService.findTasks(id)
+    tasks.forEach(task => TaskOfflineService.delete(task.id))
   }
 }
 
diff --git a/tasks/mutations/offline/services/task_service.ts b/tasks/mutations/offline/services/task_service.ts
index 10cdbdc7..42cae1aa 100644
--- a/tasks/mutations/offline/services/task_service.ts
+++ b/tasks/mutations/offline/services/task_service.ts
@@ -1,67 +1,100 @@
 import type { Metadata } from 'grpc-web'
 import { TaskServicePromiseClient } from '@helpwave/proto-ts/services/task_svc/v1/task_svc_grpc_web_pb'
 import type {
+  AddSubTaskRequest,
+  AssignTaskToUserRequest,
   CreateTaskRequest,
   DeleteTaskRequest,
+  GetAssignedTasksRequest,
   GetTaskRequest,
   GetTasksByPatientRequest,
-  UpdateTaskRequest,
-  GetAssignedTasksRequest,
   GetTasksByPatientSortedByStatusRequest,
-  TaskToToDoRequest,
-  TaskToInProgressRequest,
-  TaskToDoneRequest,
   PublishTaskRequest,
-  UnpublishTaskResponse,
-  UnpublishTaskRequest,
-  AssignTaskToUserRequest,
+  RemoveSubTaskRequest,
+  SubTaskToDoneRequest,
+  SubTaskToToDoRequest,
+  TaskToDoneRequest,
+  TaskToInProgressRequest,
+  TaskToToDoRequest,
   UnassignTaskFromUserRequest,
-  AddSubTaskRequest,
-  UpdateSubTaskRequest, RemoveSubTaskRequest, SubTaskToToDoRequest, SubTaskToDoneRequest
+  UnpublishTaskRequest,
+  UnpublishTaskResponse,
+  UpdateSubTaskRequest,
+  UpdateTaskRequest
 } from '@helpwave/proto-ts/services/task_svc/v1/task_svc_pb'
 import {
+  AddSubTaskResponse,
+  AssignTaskToUserResponse,
   CreateTaskResponse,
   DeleteTaskResponse,
   GetAssignedTasksResponse,
   GetTaskResponse,
   GetTasksByPatientResponse,
-  UpdateTaskResponse,
   GetTasksByPatientSortedByStatusResponse,
-  TaskToToDoResponse,
-  TaskToInProgressResponse,
-  TaskToDoneResponse,
   PublishTaskResponse,
-  AssignTaskToUserResponse,
+  RemoveSubTaskResponse,
+  SubTaskToDoneResponse,
+  SubTaskToToDoResponse,
+  TaskToDoneResponse,
+  TaskToInProgressResponse,
+  TaskToToDoResponse,
   UnassignTaskFromUserResponse,
-  AddSubTaskResponse,
   UpdateSubTaskResponse,
-  RemoveSubTaskResponse, SubTaskToToDoResponse, SubTaskToDoneResponse
+  UpdateTaskResponse
 } from '@helpwave/proto-ts/services/task_svc/v1/task_svc_pb'
 import type { SubTaskValueStore, TaskValueStore } from '@/mutations/offline/value_store'
 import { OfflineValueStore } from '@/mutations/offline/value_store'
 import { GRPCConverter } from '@/mutations/util'
 import type { SubTaskDTO, TaskStatus } from '@/mutations/types/task'
+import { PatientOfflineService } from '@/mutations/offline/services/patient_service'
 
 type TaskValueStoreUpdate = Omit<TaskValueStore, 'subtasks' | 'status' | 'creationDate' | 'patientId' | 'assigneeId' | 'creatorId' | 'isPublicVisible'>
 
 type SubTaskValueStoreUpdate = Omit<SubTaskDTO, 'isDone'>
 
+export const SubTaskOfflineService = {
+  find: (id: string) : SubTaskValueStore | undefined => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    // TODO check organization
+    return valueStore.subTasks.find(value => value.id === id)
+  },
+  findSubTasks: (taskId?: string) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    return valueStore.subTasks.filter(value => !taskId && value.taskId === taskId)
+  },
+  create: (taskId: string, subTask: SubTaskValueStore) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    valueStore.subTasks.push(subTask)
+  },
+  update: (subTask: SubTaskValueStoreUpdate) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    valueStore.subTasks = valueStore.subTasks.map(value => value.id === subTask.id ? { ...value, ...subTask } : value)
+  },
+  updateStatus: (subTaskId: string, isDone: boolean) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    valueStore.subTasks = valueStore.subTasks.map(value => value.id === subTaskId ? {
+      ...value,
+      isDone
+    } : value)
+  },
+  delete: (subTaskId: string) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    valueStore.subTasks = valueStore.subTasks.filter(value => subTaskId !== value.id)
+  }
+}
+
 export const TaskOfflineService = {
-  findTask: (id: string): TaskValueStore => {
+  find: (id: string): TaskValueStore | undefined => {
     const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
     // TODO check organization
-    const task = valueStore.tasks.find(value => value.id === id)
-    if (!task) {
-      throw Error(`FindTask: Could not find task with id ${id}`)
-    }
-    return task
+    return valueStore.tasks.find(value => value.id === id)
   },
   findTasks: (patientId?: string): TaskValueStore[] => {
     const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
     // TODO check organization
     return valueStore.tasks.filter(value => !patientId || value.patientId === patientId)
   },
-  addTask: (task: TaskValueStore) => {
+  create: (task: TaskValueStore) => {
     const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
     return valueStore.tasks.push(task)
   },
@@ -106,58 +139,30 @@ export const TaskOfflineService = {
       task1.isPublicVisible = isPublic
     })
   },
-  deleteTaskStorage: (id: string) => {
+  delete: (id: string) => {
     const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
     valueStore.tasks = valueStore.tasks.filter(value => value.id !== id)
+    const subTasks = SubTaskOfflineService.findSubTasks(id)
+    subTasks.forEach(subTask => SubTaskOfflineService.delete(subTask.id))
   },
 }
 
-export const SubTaskOfflineService = {
-  findSubTask: (id: string) => {
-    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
-    // TODO check organization
-    const subTask = valueStore.subTasks.find(value => value.id === id)
-    if (!subTask) {
-      throw Error(`FindSubTask: Could not find subtask with id ${id}`)
-    }
-    return subTask
-  },
-
-  findSubTasks: (taskId?: string) => {
-    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
-    return valueStore.subTasks.filter(value => !taskId && value.taskId === taskId)
-  },
-  addSubTaskValueStore: (taskId: string, subTask: SubTaskValueStore) => {
-    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
-    valueStore.subTasks.push(subTask)
-  },
-  updateSubTaskValueStore: (subTask: SubTaskValueStoreUpdate) => {
-    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
-    valueStore.subTasks = valueStore.subTasks.map(value => value.id === subTask.id ? { ...value, ...subTask } : value)
-  },
-  updateSubTaskStatus: (subTaskId: string, isDone: boolean) => {
-    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
-    valueStore.subTasks = valueStore.subTasks.map(value => value.id === subTaskId ? {
-      ...value,
-      isDone
-    } : value)
-  },
-  removeSubTaskValueStore: (subTaskId: string) => {
-    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
-    valueStore.subTasks = valueStore.subTasks.filter(value => subTaskId !== value.id)
-  }
-}
-
 export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
   async getTask(request: GetTaskRequest, _?: Metadata): Promise<GetTaskResponse> {
-    const task = TaskOfflineService.findTask(request.getId())
-
+    const task = TaskOfflineService.find(request.getId())
+    if (!task) {
+      throw Error(`FindTask: Could not find task with id ${request.getId()}`)
+    }
     const list = SubTaskOfflineService.findSubTasks(task.id).map(subtask => new GetTaskResponse.SubTask()
       .setId(subtask.id)
       .setName(subtask.name)
       .setDone(subtask.isDone)
       .setCreatedBy('CreatorId') // TODO fix TaskOfflineService
     )
+    const patient = PatientOfflineService.find(task.patientId)
+    if (!patient) {
+      throw Error(`FindTask: Could not find patient with id ${task.patientId} for task`)
+    }
 
     const res = new GetTaskResponse()
       .setId(task.id)
@@ -167,7 +172,7 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
       .setStatus(GRPCConverter.taskStatusToGrpc(task.status))
       .setDueAt(task.dueDate ? GRPCConverter.dateToTimestamp(task.dueDate) : undefined)
       .setCreatedBy(task.creatorId)
-      .setPatient() // TODO set TaskOfflineService
+      .setPatient(new GetTaskResponse.Patient().setId(patient.id).setName(patient.name))
       .setSubtasksList(list)
       .setOrganizationId('organization') // TODO fix TaskOfflineService
 
@@ -188,7 +193,7 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
         .setStatus(GRPCConverter.taskStatusToGrpc(task.status))
         .setDueAt(task.dueDate ? GRPCConverter.dateToTimestamp(task.dueDate) : undefined)
         .setCreatedBy(task.creatorId)
-        .setPatientId(request.getPatientId()) // TODO set TaskOfflineService
+        .setPatientId(request.getPatientId())
         .setSubtasksList(SubTaskOfflineService.findSubTasks(task.id).map(subtask => new GetTaskResponse.SubTask()
           .setId(subtask.id)
           .setName(subtask.name)
@@ -215,7 +220,7 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
         .setPublic(task.isPublicVisible)
         .setDueAt(task.dueDate ? GRPCConverter.dateToTimestamp(task.dueDate) : undefined)
         .setCreatedBy(task.creatorId)
-        .setPatientId(request.getPatientId()) // TODO set TaskOfflineService
+        .setPatientId(request.getPatientId())
         .setSubtasksList(SubTaskOfflineService.findSubTasks(task.id).map(subtask => new GetTaskResponse.SubTask()
           .setId(subtask.id)
           .setName(subtask.name)
@@ -240,6 +245,10 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
   async getAssignedTasks(_: GetAssignedTasksRequest, __?: Metadata): Promise<GetAssignedTasksResponse> {
     const tasks = TaskOfflineService.findTasks() // TODO filter by assignee
     const list = tasks.map(task => {
+      const patient = PatientOfflineService.find(task.patientId)
+      if (!patient) {
+        throw Error(`GetAssignedTasks: Could not find patient with id ${task.patientId} for task with id ${task.id}`)
+      }
       const res = new GetAssignedTasksResponse.Task()
         .setId(task.id)
         .setName(task.name)
@@ -248,7 +257,7 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
         .setStatus(GRPCConverter.taskStatusToGrpc(task.status))
         .setDueAt(task.dueDate ? GRPCConverter.dateToTimestamp(task.dueDate) : undefined)
         .setCreatedBy(task.creatorId)
-        .setPatient() // TODO set TaskOfflineService
+        .setPatient(new GetAssignedTasksResponse.Task.Patient().setId(patient.id).setName(patient.name))
         .setSubtasksList(SubTaskOfflineService.findSubTasks(task.id).map(subtask => new GetTaskResponse.SubTask()
           .setId(subtask.id)
           .setName(subtask.name)
@@ -276,7 +285,7 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
       isPublicVisible: request.getPublic(),
     }
 
-    TaskOfflineService.addTask(newTask)
+    TaskOfflineService.create(newTask)
 
     return new CreateTaskResponse().setId(newTask.id)
   }
@@ -330,7 +339,7 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
   }
 
   async deleteTask(request: DeleteTaskRequest, _?: Metadata): Promise<DeleteTaskResponse> {
-    TaskOfflineService.deleteTaskStorage(request.getId())
+    TaskOfflineService.delete(request.getId())
     return new DeleteTaskResponse()
   }
 
@@ -342,7 +351,7 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
       isDone: request.getDone()
     }
 
-    SubTaskOfflineService.addSubTaskValueStore(request.getTaskId(), subtask)
+    SubTaskOfflineService.create(request.getTaskId(), subtask)
     return new AddSubTaskResponse()
   }
 
@@ -351,22 +360,22 @@ export class TaskOfflineServicePromiseClient extends TaskServicePromiseClient {
       id: request.getId(),
       name: request.getName()
     }
-    SubTaskOfflineService.updateSubTaskValueStore(update)
+    SubTaskOfflineService.update(update)
     return new UpdateSubTaskResponse()
   }
 
   async subTaskToToDo(request: SubTaskToToDoRequest, _?: Metadata): Promise<SubTaskToToDoResponse> {
-    SubTaskOfflineService.updateSubTaskStatus(request.getId(), true)
+    SubTaskOfflineService.updateStatus(request.getId(), true)
     return new SubTaskToToDoResponse()
   }
 
   async subTaskToDone(request: SubTaskToDoneRequest, _?: Metadata): Promise<SubTaskToDoneResponse> {
-    SubTaskOfflineService.updateSubTaskStatus(request.getId(), false)
+    SubTaskOfflineService.updateStatus(request.getId(), false)
     return new SubTaskToDoneResponse()
   }
 
   async removeSubTask(request: RemoveSubTaskRequest, _?: Metadata): Promise<RemoveSubTaskResponse> {
-    SubTaskOfflineService.removeSubTaskValueStore(request.getId())
+    SubTaskOfflineService.delete(request.getId())
     return new RemoveSubTaskResponse()
   }
 }
diff --git a/tasks/mutations/offline/services/user_service.ts b/tasks/mutations/offline/services/user_service.ts
new file mode 100644
index 00000000..27ba30a2
--- /dev/null
+++ b/tasks/mutations/offline/services/user_service.ts
@@ -0,0 +1,114 @@
+import type { Metadata } from 'grpc-web'
+import { UserServicePromiseClient } from '@helpwave/proto-ts/services/user_svc/v1/user_svc_grpc_web_pb'
+import type {
+  CreateUserRequest,
+  ReadPublicProfileRequest,
+  ReadSelfRequest
+  , UpdateUserRequest
+} from '@helpwave/proto-ts/services/user_svc/v1/user_svc_pb'
+import {
+  CreateUserResponse,
+  ReadPublicProfileResponse,
+  ReadSelfOrganization,
+  ReadSelfResponse, UpdateUserResponse
+} from '@helpwave/proto-ts/services/user_svc/v1/user_svc_pb'
+import type { UserValueStore } from '@/mutations/offline/value_store'
+import { OfflineValueStore } from '@/mutations/offline/value_store'
+import { OrganizationOfflineService } from '@/mutations/offline/services/organization_service'
+
+type UserUpdate = Pick<UserValueStore, 'id'>
+
+export const UserOfflineService = {
+  self: (): UserValueStore => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    if (valueStore.users.length === 0) {
+      throw Error('Make sure there exists at least one user in the users store')
+    }
+    return valueStore.users[0]!
+  },
+  find: (id: string): UserValueStore | undefined => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    // TODO check user
+    return valueStore.users.find(value => value.id === id)
+  },
+  findUsers: (): UserValueStore[] => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    // TODO check user
+    return valueStore.users
+  },
+  create: (user: UserValueStore) => {
+    OfflineValueStore.getInstance().users.push(user)
+  },
+  update: (user: UserUpdate) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+
+    let found = false
+
+    // TODO check user
+    valueStore.users = valueStore.users.map(value => {
+      if (value.id === user.id) {
+        found = true
+        return {
+          ...value,
+          ...user
+        }
+      }
+      return value
+    })
+
+    if (!found) {
+      throw Error(`UpdateUser: Could not find user with id ${user.id}`)
+    }
+  },
+  delete: (userId: string) => {
+    const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
+    valueStore.users = valueStore.users.filter(value => value.id !== userId)
+  }
+}
+
+export class UserOfflineServicePromiseClient extends UserServicePromiseClient {
+  async readPublicProfile(request: ReadPublicProfileRequest, _?: Metadata): Promise<ReadPublicProfileResponse> {
+    const user = UserOfflineService.find(request.getId())
+    if (!user) {
+      throw Error(`ReadPublicProfile: Could not find user with id ${request.getId()}`)
+    }
+    return new ReadPublicProfileResponse()
+      .setId(user.id)
+      .setName(user.name)
+      .setNickname(user.nickName)
+      .setAvatarUrl(user.avatarURL)
+  }
+
+  async readSelf(_: ReadSelfRequest, __?: Metadata): Promise<ReadSelfResponse> {
+    const user = UserOfflineService.self()
+
+    return new ReadSelfResponse()
+      .setId(user.id)
+      .setName(user.name)
+      .setNickname(user.nickName)
+      .setAvatarUrl(user.avatarURL)
+      .setOrganizationsList(OrganizationOfflineService.findOrganizations().map(org => new ReadSelfOrganization().setId(org.id)))
+  }
+
+  async createUser(request: CreateUserRequest, _?: Metadata): Promise<CreateUserResponse> {
+    const newUser: UserValueStore = {
+      id: Math.random().toString(),
+      name: request.getName(),
+      nickName: request.getNickname(),
+      email: request.getEmail(),
+      avatarURL: 'https://helpwave.de/favicon.ico',
+    }
+
+    UserOfflineService.create(newUser)
+
+    return new CreateUserResponse().setId(newUser.id)
+  }
+
+  async updateUser(request: UpdateUserRequest, _?: Metadata): Promise<UpdateUserResponse> {
+    const update: UserUpdate = {
+      id: request.getId(),
+    }
+    UserOfflineService.update(update)
+    return new UpdateUserResponse()
+  }
+}
diff --git a/tasks/mutations/offline/services/ward_service.ts b/tasks/mutations/offline/services/ward_service.ts
index 5b22768e..229dfd3d 100644
--- a/tasks/mutations/offline/services/ward_service.ts
+++ b/tasks/mutations/offline/services/ward_service.ts
@@ -41,10 +41,12 @@ export const WardOfflineService = {
     }
     return ward
   },
-  findWards: (): WardWithOrganizationIdDTO[] => {
+  findWards: (organizationId?: string): WardWithOrganizationIdDTO[] => {
     const valueStore: OfflineValueStore = OfflineValueStore.getInstance()
-    // TODO check organization
-    return valueStore.wards
+    if (!organizationId) {
+      return valueStore.wards
+    }
+    return valueStore.wards.filter(value => value.organizationId === organizationId)
   },
   create: (ward: WardWithOrganizationIdDTO) => {
     OfflineValueStore.getInstance().wards.push(ward)
diff --git a/tasks/mutations/offline/value_store.ts b/tasks/mutations/offline/value_store.ts
index bd167c88..34a1c29b 100644
--- a/tasks/mutations/offline/value_store.ts
+++ b/tasks/mutations/offline/value_store.ts
@@ -6,6 +6,7 @@ import type { RoomWithWardId } from '@/mutations/room_mutations'
 import type { BedWithRoomId } from '@/mutations/bed_mutations'
 import type { SubTaskDTO, TaskDTO } from '@/mutations/types/task'
 import type { TaskTemplateDTO } from '@/mutations/task_template_mutations'
+import type { OrganizationMinimalDTO, OrgMember } from '@/mutations/organization_mutations'
 
 const initialProperties: Property[] = [
   {
@@ -130,15 +131,32 @@ const initialAttachedProperties: AttachedProperty[] = [
     subjectId: '1',
   },
 ]
+const initialOrganizations: OrganizationMinimalDTO[] = [
+  {
+    id: 'organization',
+    email: 'test@helpwave.de',
+    shortName: 'hw-test',
+    longName: 'helpwave test organizations',
+    avatarURL: 'https://helpwave.de/favicon.ico',
+    isPersonal: true,
+    isVerified: true,
+  }
+]
+const initialMembers: UserValueStore[] = [
+  { id: 'user1', name: 'You', nickName: 'You', email: 'test@helpwave.de', avatarURL: 'https://helpwave.de/favicon.ico' },
+  { id: 'user2', name: 'Max', nickName: 'Max', email: 'test@helpwave.de', avatarURL: 'https://helpwave.de/favicon.ico' },
+  { id: 'user3', name: 'John', nickName: 'Doe', email: 'test@helpwave.de', avatarURL: 'https://helpwave.de/favicon.ico' },
+  { id: 'user4', name: 'Testine Test', nickName: 'Testine', email: 'test@helpwave.de', avatarURL: 'https://helpwave.de/favicon.ico' },
+]
 const initialWards: WardWithOrganizationIdDTO[] = [
   {
     id: 'ward1',
-    organizationId: 'organization1',
+    organizationId: 'organization',
     name: 'Intensive Care'
   },
   {
     id: 'ward2',
-    organizationId: 'organization1',
+    organizationId: 'organization',
     name: 'Radiology'
   }
 ]
@@ -238,10 +256,16 @@ export type TaskTemplateSubTaskValueStore = {
   creatorId: string
 }
 
+export type UserValueStore = Omit<OrgMember, 'role'> & {
+  nickName: string
+}
+
 export class OfflineValueStore {
   private static instance: OfflineValueStore
   properties: Property[] = initialProperties
   attachedProperties: AttachedProperty[] = initialAttachedProperties
+  organizations: OrganizationMinimalDTO[] = initialOrganizations
+  users: UserValueStore[] = initialMembers
   wards: WardWithOrganizationIdDTO[] = initialWards
   rooms: RoomWithWardId[] = initialRooms
   beds: BedWithRoomId[] = initialBeds
diff --git a/tasks/mutations/organization_member_mutations.ts b/tasks/mutations/organization_member_mutations.ts
index 05276058..01100976 100644
--- a/tasks/mutations/organization_member_mutations.ts
+++ b/tasks/mutations/organization_member_mutations.ts
@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query'
 import { GetMembersByOrganizationRequest } from '@helpwave/proto-ts/services/user_svc/v1/organization_svc_pb'
-import { getAuthenticatedGrpcMetadata, organizationService } from '../utils/grpc'
+import { APIServices, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
 
 // TODO replace later
 export const enum Role {
@@ -33,7 +33,7 @@ export const useMembersByOrganizationQuery = (organizationId: string | undefined
       const req = new GetMembersByOrganizationRequest()
       req.setId(organizationId)
 
-      const res = await organizationService.getMembersByOrganization(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.getMembersByOrganization(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('error in MembersByOrganization')
diff --git a/tasks/mutations/organization_mutations.ts b/tasks/mutations/organization_mutations.ts
index e3203053..596fdfde 100644
--- a/tasks/mutations/organization_mutations.ts
+++ b/tasks/mutations/organization_mutations.ts
@@ -17,7 +17,7 @@ import {
 } from '@helpwave/proto-ts/services/user_svc/v1/organization_svc_pb'
 import { noop } from '@helpwave/common/util/noop'
 import { Role } from './organization_member_mutations'
-import { getAuthenticatedGrpcMetadata, organizationService } from '@/utils/grpc'
+import { APIServices, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
 
 export const organizationQueryKey = 'organizations'
 export const invitationsQueryKey = 'invitations'
@@ -96,7 +96,7 @@ export const useOrganizationQuery = (organizationId: string | undefined) => {
         req.setId(organizationId)
       }
 
-      const res = await organizationService.getOrganization(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.getOrganization(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('error in Organization')
@@ -124,7 +124,7 @@ export const useOrganizationsForUserQuery = () => {
     queryFn: async () => {
       const req = new GetOrganizationsForUserRequest()
 
-      const res = await organizationService.getOrganizationsForUser(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.getOrganizationsForUser(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('OrganizationsByUser failed')
@@ -161,7 +161,7 @@ export const useInvitationsByUserQuery = (state?: InvitationState) => {
       if (state) {
         req.setState(state)
       }
-      const res = await organizationService.getInvitationsByUser(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.getInvitationsByUser(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('error in InvitationsByUser')
@@ -195,7 +195,7 @@ export const useInvitationsByOrganizationQuery = (organizationId: string | undef
       if (organizationId) {
         req.setOrganizationId(organizationId)
       }
-      const res = await organizationService.getInvitationsByOrganization(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.getInvitationsByOrganization(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('error in OrganizationCreate')
@@ -221,7 +221,7 @@ export const useOrganizationCreateMutation = () => {
       req.setShortName(organization.shortName)
       req.setIsPersonal(organization.isPersonal)
       req.setContactEmail(organization.email)
-      const res = await organizationService.createOrganization(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.createOrganization(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         throw new Error('error in OrganizationCreate')
@@ -246,7 +246,7 @@ export const useOrganizationUpdateMutation = () => {
       req.setIsPersonal(organization.isPersonal)
       req.setAvatarUrl(organization.avatarURL)
       req.setContactEmail(organization.email)
-      const res = await organizationService.updateOrganization(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.updateOrganization(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         throw new Error('error in OrganizationUpdate')
@@ -266,7 +266,7 @@ export const useOrganizationDeleteMutation = () => {
     mutationFn: async (organizationId: string) => {
       const req = new DeleteOrganizationRequest()
       req.setId(organizationId)
-      const res = await organizationService.deleteOrganization(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.deleteOrganization(req, getAuthenticatedGrpcMetadata())
 
       const obj = res.toObject() // TODO: what is the type of this?
 
@@ -288,7 +288,7 @@ export const useInviteDeclineMutation = () => {
     mutationFn: async (inviteId: string) => {
       const req = new DeclineInvitationRequest()
       req.setInvitationId(inviteId)
-      const res = await organizationService.declineInvitation(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.declineInvitation(req, getAuthenticatedGrpcMetadata())
 
       const obj = res.toObject() // TODO: what is the type of this?
 
@@ -310,7 +310,7 @@ export const useInviteRevokeMutation = () => {
     mutationFn: async (inviteId: string) => {
       const req = new RevokeInvitationRequest()
       req.setInvitationId(inviteId)
-      const res = await organizationService.revokeInvitation(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.revokeInvitation(req, getAuthenticatedGrpcMetadata())
 
       const obj = res.toObject() // TODO: what is the type of this?
 
@@ -342,7 +342,7 @@ export const useInviteMemberMutation = (organizationId: string, callback: (invit
       req.setEmail(invite.email)
       req.setOrganizationId(organizationId)
 
-      const res = await organizationService.inviteMember(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.inviteMember(req, getAuthenticatedGrpcMetadata())
 
       if (!res.getId()) {
         throw new Error('InviteMember failed')
@@ -363,7 +363,7 @@ export const useInviteAcceptMutation = () => {
     mutationFn: async (inviteId: string) => {
       const req = new AcceptInvitationRequest()
       req.setInvitationId(inviteId)
-      const res = await organizationService.acceptInvitation(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.acceptInvitation(req, getAuthenticatedGrpcMetadata())
       const obj = res.toObject()
 
       if (!obj) {
@@ -386,7 +386,7 @@ export const useAddMemberMutation = (organizationId: string) => { // TODO: unuse
       req.setId(organizationId)
       req.setUserId(userId)
 
-      const res = await organizationService.addMember(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.addMember(req, getAuthenticatedGrpcMetadata())
       const obj = res.toObject() // TODO: what is the type of this?
 
       if (!obj) {
@@ -409,7 +409,7 @@ export const useRemoveMemberMutation = (organizationId: string) => {
       req.setId(organizationId)
       req.setUserId(userId)
 
-      const res = await organizationService.removeMember(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.organization.removeMember(req, getAuthenticatedGrpcMetadata())
       const obj = res.toObject() // TODO: what is the type of this?
 
       if (!obj) {
diff --git a/tasks/mutations/patient_mutations.ts b/tasks/mutations/patient_mutations.ts
index 3290968f..417f1e6a 100644
--- a/tasks/mutations/patient_mutations.ts
+++ b/tasks/mutations/patient_mutations.ts
@@ -15,7 +15,7 @@ import {
 } from '@helpwave/proto-ts/services/task_svc/v1/patient_svc_pb'
 import { noop } from '@helpwave/common/util/noop'
 import type { BedWithPatientId } from './bed_mutations'
-import { patientService, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
+import { APIServices, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
 import { roomOverviewsQueryKey, roomsQueryKey, type RoomWithMinimalBedAndPatient } from '@/mutations/room_mutations'
 import type { TaskDTO, TaskMinimalDTO } from '@/mutations/types/task'
 import { GRPCConverter } from '@/mutations/util'
@@ -54,7 +54,7 @@ export const emptyPatientMinimal: PatientMinimalDTO = {
 }
 
 export type PatientWithBedAndRoomDTO = PatientMinimalDTO & {
-  room: { id: string, name: string },
+  room: { id: string, name: string, wardId: string },
   bed: { id: string, name: string }
 }
 
@@ -103,7 +103,7 @@ export const usePatientDetailsQuery = (patientId: string | undefined) => {
       const req = new GetPatientDetailsRequest()
       req.setId(patientId)
 
-      const res = await patientService.getPatientDetails(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.getPatientDetails(req, getAuthenticatedGrpcMetadata())
 
       if (!res.getId()) {
         throw new Error('create room failed')
@@ -141,7 +141,7 @@ export const usePatientsByWardQuery = (wardId: string) => {
     queryFn: async () => {
       const req = new GetPatientsByWardRequest()
       req.setWardId(wardId)
-      const res = await patientService.getPatientsByWard(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.getPatientsByWard(req, getAuthenticatedGrpcMetadata())
 
       const patients: PatientWithBedIdDTO[] = res.getPatientsList().map((patient) => ({
         id: patient.getId(),
@@ -162,7 +162,7 @@ export const usePatientAssignmentByWardQuery = (wardId: string) => {
     queryFn: async () => {
       const req = new GetPatientAssignmentByWardRequest()
       req.setWardId(wardId)
-      const res = await patientService.getPatientAssignmentByWard(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.getPatientAssignmentByWard(req, getAuthenticatedGrpcMetadata())
 
       const rooms: RoomWithMinimalBedAndPatient[] = res.getRoomsList().map((room) => ({
         id: room.getId(),
@@ -205,7 +205,7 @@ export const usePatientListQuery = (organisationId?: string, wardId?: string) =>
       if (wardId) {
         req.setWardId(wardId)
       }
-      const res = await patientService.getPatientList(req, getAuthenticatedGrpcMetadata(organisationId))
+      const res = await APIServices.patient.getPatientList(req, getAuthenticatedGrpcMetadata(organisationId))
 
       const patientList: PatientListDTO = {
         active: res.getActiveList().map(value => {
@@ -228,7 +228,8 @@ export const usePatientListQuery = (organisationId?: string, wardId?: string) =>
             },
             room: {
               id: room?.getId() ?? '',
-              name: room?.getName() ?? ''
+              name: room?.getName() ?? '',
+              wardId: room?.getWardId() ?? ''
             }
           })
         }),
@@ -252,7 +253,7 @@ export const useRecentPatientsQuery = () => {
     queryKey: [patientsQueryKey],
     queryFn: async () => {
       const req = new GetRecentPatientsRequest()
-      const res = await patientService.getRecentPatients(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.getRecentPatients(req, getAuthenticatedGrpcMetadata())
 
       const patients: RecentPatientDTO[] = []
       for (const patient of res.getRecentPatientsList()) {
@@ -284,7 +285,7 @@ export const usePatientCreateMutation = (organisationId: string) => {
       const req = new CreatePatientRequest()
       req.setNotes(patient.note)
       req.setHumanReadableIdentifier(patient.name)
-      const res = await patientService.createPatient(req, getAuthenticatedGrpcMetadata(organisationId))
+      const res = await APIServices.patient.createPatient(req, getAuthenticatedGrpcMetadata(organisationId))
 
       const id = res.getId()
 
@@ -310,7 +311,7 @@ export const usePatientUpdateMutation = () => {
       req.setNotes(patient.note)
       req.setHumanReadableIdentifier(patient.name)
 
-      const res = await patientService.updatePatient(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.updatePatient(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         throw new Error('error in PatientUpdate')
@@ -332,7 +333,7 @@ export const usePatientDischargeMutation = (callback: () => void = noop) => {
       const req = new DischargePatientRequest()
       req.setId(patientId)
 
-      const res = await patientService.dischargePatient(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.dischargePatient(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         throw new Error('error in PatientDischarge')
@@ -356,7 +357,7 @@ export const useAssignBedMutation = (callback: (bed: BedWithPatientId) => void =
       req.setId(bed.patientId)
       req.setBedId(bed.id)
 
-      const res = await patientService.assignBed(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.assignBed(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         throw new Error('assign bed request failed')
@@ -379,7 +380,7 @@ export const useUnassignMutation = (callback: () => void = noop) => {
       const req = new UnassignBedRequest()
       req.setId(patientId)
 
-      const res = await patientService.unassignBed(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.unassignBed(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         throw new Error('assign bed request failed')
@@ -402,7 +403,7 @@ export const useDeletePatientMutation = () => {
       const req = new DeletePatientRequest()
       req.setId(patientId)
 
-      const res = await patientService.deletePatient(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.deletePatient(req, getAuthenticatedGrpcMetadata())
 
       return res.toObject()
     },
@@ -420,7 +421,7 @@ export const useReadmitPatientMutation = (callback: (patientId: string) => void
       const req = new ReadmitPatientRequest()
       req.setPatientId(patientId)
 
-      const res = await patientService.readmitPatient(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.patient.readmitPatient(req, getAuthenticatedGrpcMetadata())
 
       callback(patientId)
       return res.toObject()
diff --git a/tasks/mutations/property/property_mutations.ts b/tasks/mutations/property/property_mutations.ts
index 562ab9fa..aac90cdf 100644
--- a/tasks/mutations/property/property_mutations.ts
+++ b/tasks/mutations/property/property_mutations.ts
@@ -7,7 +7,7 @@ import {
   UpdatePropertyRequest
 } from '@helpwave/proto-ts/services/property_svc/v1/property_svc_pb'
 import { FieldType } from '@helpwave/proto-ts/services/property_svc/v1/types_pb'
-import { getAuthenticatedGrpcMetadata, propertyService } from '@/utils/grpc'
+import { getAuthenticatedGrpcMetadata, APIServices } from '@/utils/grpc'
 import type { Property, SelectOption, SubjectType } from '@/mutations/property/common'
 import {
   fieldTypeMapperFromGRPC,
@@ -25,7 +25,7 @@ export const usePropertyListQuery = (subjectType?: SubjectType) => {
       if (subjectType) {
         req.setSubjectType(subjectTypeMapperToGRPC(subjectType))
       }
-      const result = await propertyService.getPropertiesBySubjectType(req, getAuthenticatedGrpcMetadata())
+      const result = await APIServices.property.getPropertiesBySubjectType(req, getAuthenticatedGrpcMetadata())
       return result.getPropertiesList().filter(value => value.getFieldType() !== FieldType.FIELD_TYPE_UNSPECIFIED).map(property => {
         const selectData = property.getSelectData()
         if (!selectData) {
@@ -66,7 +66,7 @@ export const usePropertyQuery = (id?: string) => {
       const req = new GetPropertyRequest()
       req.setId(id)
 
-      const result = await propertyService.getProperty(req, getAuthenticatedGrpcMetadata())
+      const result = await APIServices.property.getProperty(req, getAuthenticatedGrpcMetadata())
 
       const selectData = result.getSelectData()
       if (!selectData) {
@@ -121,7 +121,7 @@ export const usePropertyCreateMutation = (callback: (property: Property) => void
       }))
       req.setSelectData(selectDataVal)
 
-      const result = await propertyService.createProperty(req, getAuthenticatedGrpcMetadata())
+      const result = await APIServices.property.createProperty(req, getAuthenticatedGrpcMetadata())
 
       const id = result.getPropertyId()
 
@@ -164,7 +164,7 @@ export const usePropertyUpdateMutation = (callback: (property: Property) => void
       */
       req.setSelectData(selectDataVal)
 
-      const result = await propertyService.updateProperty(req, getAuthenticatedGrpcMetadata())
+      const result = await APIServices.property.updateProperty(req, getAuthenticatedGrpcMetadata())
       if (!result.toObject()) {
         throw Error('usePropertyUpdateMutation: error in result')
       }
@@ -213,7 +213,7 @@ export const usePropertyChangeSelectOptionMutation = (callback: () => void = noo
       selectDataVal.setUpsertOptionsList([...updateList, ...createList])
       req.setSelectData(selectDataVal)
 
-      const result = await propertyService.updateProperty(req, getAuthenticatedGrpcMetadata())
+      const result = await APIServices.property.updateProperty(req, getAuthenticatedGrpcMetadata())
       if (!result.toObject()) {
         throw Error('usePropertyUpdateOrAddSelectDataMutation: error in result')
       }
diff --git a/tasks/mutations/property/property_value_mutations.ts b/tasks/mutations/property/property_value_mutations.ts
index 292ee759..2686cdd5 100644
--- a/tasks/mutations/property/property_value_mutations.ts
+++ b/tasks/mutations/property/property_value_mutations.ts
@@ -14,7 +14,7 @@ import {
   propertyQueryKey,
   propertyValuesQueryKey
 } from '@/mutations/property/common'
-import { getAuthenticatedGrpcMetadata, propertyValueService } from '@/utils/grpc'
+import { getAuthenticatedGrpcMetadata, APIServices } from '@/utils/grpc'
 import { GRPCConverter } from '@/mutations/util'
 
 export const usePropertyWithValueListQuery = (subjectId: string | undefined, subjectType: SubjectType, wardId?: string) => {
@@ -39,7 +39,7 @@ export const usePropertyWithValueListQuery = (subjectId: string | undefined, sub
         console.warn("PropertyWithValueListQuery: subjectType patient isn't supported in production yet.")
       }
 
-      const res = await propertyValueService.getAttachedPropertyValues(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.propertyValues.getAttachedPropertyValues(req, getAuthenticatedGrpcMetadata())
 
       const results: DisplayableAttachedProperty[] = res.getValuesList().map(result => {
         const dateValue: ProtoDate | undefined = result.getDateValue()
@@ -86,7 +86,7 @@ export const useAttachedPropertyMutation = <T extends AttachedProperty>(callback
       req.setDateTimeValue(GRPCConverter.dateToTimestamp(property.value.dateTimeValue))
       req.setSelectValue(property.value.singleSelectValue)
 
-      await propertyValueService.attachPropertyValue(req, getAuthenticatedGrpcMetadata())
+      await APIServices.propertyValues.attachPropertyValue(req, getAuthenticatedGrpcMetadata())
 
       const newProperty: T = {
         ...property,
diff --git a/tasks/mutations/room_mutations.ts b/tasks/mutations/room_mutations.ts
index d1290ad2..c295d18f 100644
--- a/tasks/mutations/room_mutations.ts
+++ b/tasks/mutations/room_mutations.ts
@@ -9,7 +9,7 @@ import {
 import { noop } from '@helpwave/common/util/noop'
 import type { BedDTO, BedWithPatientWithTasksNumberDTO, BedWithMinimalPatientDTO } from './bed_mutations'
 import { wardsQueryKey } from './ward_mutations'
-import { getAuthenticatedGrpcMetadata, roomService } from '@/utils/grpc'
+import { APIServices, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
 
 export const roomsQueryKey = 'rooms'
 
@@ -49,7 +49,7 @@ export const useRoomQuery = (roomId?: string) => {
       if (roomId) {
         req.setId(roomId)
       }
-      const res = await roomService.getRoom(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.room.getRoom(req, getAuthenticatedGrpcMetadata())
 
       const room: RoomDTO = {
         id: res.getId(),
@@ -75,7 +75,7 @@ export const useRoomOverviewsQuery = (wardId: string | undefined) => {
       if (wardId) {
         req.setId(wardId)
       }
-      const res = await roomService.getRoomOverviewsByWard(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.room.getRoomOverviewsByWard(req, getAuthenticatedGrpcMetadata())
 
       const rooms: RoomOverviewDTO[] = res.getRoomsList().map((room) => ({
         id: room.getId(),
@@ -108,7 +108,7 @@ export const useRoomUpdateMutation = (callback: (room: RoomMinimalDTO) => void)
       const req = new UpdateRoomRequest()
       req.setId(room.id)
       req.setName(room.name)
-      const res = await roomService.updateRoom(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.room.updateRoom(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('error in RoomUpdate')
@@ -130,7 +130,7 @@ export const useRoomCreateMutation = (callback: (room: RoomMinimalDTO) => void =
       const req = new CreateRoomRequest()
       req.setWardId(wardId)
       req.setName(room.name)
-      const res = await roomService.createRoom(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.room.createRoom(req, getAuthenticatedGrpcMetadata())
 
       if (!res.getId()) {
         console.error('RoomCreate failed')
@@ -153,7 +153,7 @@ export const useRoomDeleteMutation = (callback: () => void = noop) => {
     mutationFn: async (roomId: string) => {
       const req = new DeleteRoomRequest()
       req.setId(roomId)
-      const res = await roomService.deleteRoom(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.room.deleteRoom(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('RoomDelete failed')
diff --git a/tasks/mutations/task_mutations.ts b/tasks/mutations/task_mutations.ts
index 4e6bd4eb..51435133 100644
--- a/tasks/mutations/task_mutations.ts
+++ b/tasks/mutations/task_mutations.ts
@@ -20,7 +20,7 @@ import {
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { noop } from '@helpwave/common/util/noop'
 import { roomOverviewsQueryKey, roomsQueryKey } from './room_mutations'
-import { getAuthenticatedGrpcMetadata, taskService } from '@/utils/grpc'
+import { getAuthenticatedGrpcMetadata, APIServices } from '@/utils/grpc'
 import type { CreateSubTaskDTO, SortedTasks, SubTaskDTO, TaskDTO, TaskStatus } from '@/mutations/types/task'
 import { emptySortedTasks, emptyTask } from '@/mutations/types/task'
 import { GRPCConverter } from '@/mutations/util'
@@ -39,7 +39,7 @@ export const useTaskQuery = (taskId: string | undefined) => {
       const req = new GetTaskRequest()
       req.setId(taskId)
 
-      const res = await taskService.getTask(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.task.getTask(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('TasksByPatient query failed')
@@ -79,7 +79,7 @@ export const useTasksByPatientQuery = (patientId: string | undefined) => {
       const req = new GetTasksByPatientRequest()
       req.setPatientId(patientId)
 
-      const res = await taskService.getTasksByPatient(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.task.getTasksByPatient(req, getAuthenticatedGrpcMetadata())
 
       if (!res.getTasksList()) {
         console.error('TasksByPatient query failed')
@@ -121,7 +121,7 @@ export const useTasksByPatientSortedByStatusQuery = (patientId: string | undefin
       const req = new GetTasksByPatientSortedByStatusRequest()
       req.setPatientId(patientId)
 
-      const res = await taskService.getTasksByPatientSortedByStatus(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.task.getTasksByPatientSortedByStatus(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('TasksByPatientSortedByStatus query failed')
@@ -168,7 +168,7 @@ export const useTaskCreateMutation = (callback: (task: TaskDTO) => void = noop,
       req.setInitialStatus(GRPCConverter.taskStatusToGrpc(task.status))
       req.setDueAt(task.dueDate ? GRPCConverter.dateToTimestamp(task.dueDate) : undefined)
 
-      const res = await taskService.createTask(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.task.createTask(req, getAuthenticatedGrpcMetadata())
       const newTask = { ...task, id: res.getId() }
 
       callback(newTask)
@@ -198,7 +198,7 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
 
       getTask.setId(task.id)
 
-      const taskResponse = await taskService.getTask(getTask, getAuthenticatedGrpcMetadata())
+      const taskResponse = await APIServices.task.getTask(getTask, getAuthenticatedGrpcMetadata())
       const subtasksResponse = taskResponse.getSubtasksList()
       const taskSubtasks = task.subtasks
 
@@ -206,7 +206,7 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
       const subtasksToDelete = subtasksResponse.filter(subtask => !taskSubtasks.some(taskSubtask => taskSubtask.id === subtask.getId()))
       for (const subtask of subtasksToDelete) {
         removeSubtask.setId(subtask.getId())
-        await taskService.removeSubTask(removeSubtask, getAuthenticatedGrpcMetadata())
+        await APIServices.task.removeSubTask(removeSubtask, getAuthenticatedGrpcMetadata())
       }
 
       const updateSubtask = new UpdateSubTaskRequest()
@@ -222,7 +222,7 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
           createSubTask.setTaskId(task.id)
           createSubTask.setDone(subtask.isDone)
 
-          const res = await taskService.addSubTask(createSubTask, getAuthenticatedGrpcMetadata())
+          const res = await APIServices.task.addSubTask(createSubTask, getAuthenticatedGrpcMetadata())
           subtask.id = res.getId()
 
           continue
@@ -230,19 +230,19 @@ export const useTaskUpdateMutation = (callback: () => void = noop) => {
 
         if (subtask.isDone) {
           subTaskToDone.setId(subtask.id)
-          await taskService.subTaskToDone(subTaskToDone, getAuthenticatedGrpcMetadata())
+          await APIServices.task.subTaskToDone(subTaskToDone, getAuthenticatedGrpcMetadata())
         } else {
           subTaskToDo.setId(subtask.id)
-          await taskService.subTaskToToDo(subTaskToDo, getAuthenticatedGrpcMetadata())
+          await APIServices.task.subTaskToToDo(subTaskToDo, getAuthenticatedGrpcMetadata())
         }
 
         updateSubtask.setName(subtask.name)
         updateSubtask.setId(subtask.id)
 
-        await taskService.updateSubTask(updateSubtask, getAuthenticatedGrpcMetadata())
+        await APIServices.task.updateSubTask(updateSubtask, getAuthenticatedGrpcMetadata())
       }
 
-      await taskService.updateTask(updateTask, getAuthenticatedGrpcMetadata())
+      await APIServices.task.updateTask(updateTask, getAuthenticatedGrpcMetadata())
 
       callback()
       return updateTask.toObject()
@@ -260,7 +260,7 @@ export const useTaskDeleteMutation = (callback: () => void = noop) => {
     mutationFn: async (taskId: string) => {
       const req = new DeleteTaskRequest()
       req.setId(taskId)
-      await taskService.deleteTask(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.deleteTask(req, getAuthenticatedGrpcMetadata())
 
       callback()
       return req.toObject()
@@ -278,7 +278,7 @@ export const useTaskToToDoMutation = (callback: () => void = noop) => {
     mutationFn: async (taskId: string) => {
       const req = new TaskToToDoRequest()
       req.setId(taskId)
-      await taskService.taskToToDo(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.taskToToDo(req, getAuthenticatedGrpcMetadata())
 
       callback()
       return req.toObject()
@@ -296,7 +296,7 @@ export const useTaskToInProgressMutation = (callback: () => void = noop) => {
     mutationFn: async (taskId: string) => {
       const req = new TaskToInProgressRequest()
       req.setId(taskId)
-      await taskService.taskToInProgress(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.taskToInProgress(req, getAuthenticatedGrpcMetadata())
 
       callback()
       return req.toObject()
@@ -314,7 +314,7 @@ export const useTaskToDoneMutation = (callback: () => void = noop) => {
     mutationFn: async (taskId: string) => {
       const req = new TaskToDoneRequest()
       req.setId(taskId)
-      await taskService.taskToDone(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.taskToDone(req, getAuthenticatedGrpcMetadata())
 
       callback()
       return req.toObject()
@@ -339,7 +339,7 @@ export const useSubTaskAddMutation = (taskId: string | undefined, callback: (sub
       req.setName(subtask.name)
       req.setTaskId(usedTaskId)
       req.setDone(subtask.isDone)
-      const res = await taskService.addSubTask(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.task.addSubTask(req, getAuthenticatedGrpcMetadata())
 
       const newSubtask: SubTaskDTO = {
         id: res.getId(),
@@ -363,7 +363,7 @@ export const useSubTaskUpdateMutation = (callback: (subtask: SubTaskDTO) => void
       const req = new UpdateSubTaskRequest()
       req.setId(subtask.id)
       req.setName(subtask.name)
-      await taskService.updateSubTask(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.updateSubTask(req, getAuthenticatedGrpcMetadata())
       const newSubtask: SubTaskDTO = { ...subtask }
 
       callback(newSubtask)
@@ -381,7 +381,7 @@ export const useSubTaskDeleteMutation = (callback: () => void = noop) => {
     mutationFn: async (subtaskId: string) => {
       const req = new RemoveSubTaskRequest()
       req.setId(subtaskId)
-      await taskService.removeSubTask(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.removeSubTask(req, getAuthenticatedGrpcMetadata())
 
       callback()
       return req.toObject()
@@ -398,7 +398,7 @@ export const useSubTaskToToDoMutation = (callback: () => void = noop) => {
     mutationFn: async (subtaskId: string) => {
       const req = new SubTaskToToDoRequest()
       req.setId(subtaskId)
-      await taskService.subTaskToToDo(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.subTaskToToDo(req, getAuthenticatedGrpcMetadata())
 
       callback()
       return req.toObject()
@@ -415,7 +415,7 @@ export const useSubTaskToDoneMutation = (callback: () => void = noop) => {
     mutationFn: async (subtaskId: string) => {
       const req = new SubTaskToDoneRequest()
       req.setId(subtaskId)
-      await taskService.subTaskToDone(req, getAuthenticatedGrpcMetadata())
+      await APIServices.task.subTaskToDone(req, getAuthenticatedGrpcMetadata())
 
       callback()
       return req.toObject()
@@ -433,7 +433,7 @@ export const useAssignTaskToUserMutation = (callback: () => void = noop) => {
       const req = new AssignTaskToUserRequest()
       req.setId(taskAndUser.taskId)
       req.setUserId(taskAndUser.userId)
-      const res = await taskService.assignTaskToUser(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.task.assignTaskToUser(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('error in AssignTaskToUser')
@@ -454,7 +454,7 @@ export const useUnassignTaskToUserMutation = (callback: () => void = noop) => {
     mutationFn: async (taskId: string) => {
       const req = new UnassignTaskFromUserRequest()
       req.setId(taskId)
-      const res = await taskService.unassignTaskFromUser(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.task.unassignTaskFromUser(req, getAuthenticatedGrpcMetadata())
 
       if (!res.toObject()) {
         console.error('error in UnAssignTaskToUser')
diff --git a/tasks/mutations/task_template_mutations.ts b/tasks/mutations/task_template_mutations.ts
index 94603acb..2336885b 100644
--- a/tasks/mutations/task_template_mutations.ts
+++ b/tasks/mutations/task_template_mutations.ts
@@ -8,10 +8,10 @@ import {
   GetAllTaskTemplatesByCreatorRequest,
   GetAllTaskTemplatesByWardRequest, UpdateTaskTemplateRequest, UpdateTaskTemplateSubTaskRequest
 } from '@helpwave/proto-ts/services/task_svc/v1/task_template_svc_pb'
-import type { SubTaskDTO } from './task_mutations'
-import { getAuthenticatedGrpcMetadata, taskTemplateService } from '@/utils/grpc'
+import { getAuthenticatedGrpcMetadata, APIServices } from '@/utils/grpc'
 import type { TaskTemplateFormType } from '@/pages/templates'
-import SubTask = CreateTaskTemplateRequest.SubTask // TODO: what even is this syntax???
+import SubTask = CreateTaskTemplateRequest.SubTask
+import type { SubTaskDTO } from '@/mutations/types/task' // TODO: what even is this syntax???
 
 export type TaskTemplateDTO = {
   wardId?: string,
@@ -36,7 +36,7 @@ export const useWardTaskTemplateQuery = (wardId?: string, onSuccess: (data: Task
       if (wardId !== undefined) {
         const req = new GetAllTaskTemplatesByWardRequest()
         req.setWardId(wardId)
-        const res = await taskTemplateService.getAllTaskTemplatesByWard(req, getAuthenticatedGrpcMetadata())
+        const res = await APIServices.taskTemplates.getAllTaskTemplatesByWard(req, getAuthenticatedGrpcMetadata())
         wardTaskTemplates = res.getTemplatesList().map((template) => ({
           id: template.getId(),
           wardId,
@@ -78,7 +78,7 @@ export const useAllTaskTemplatesByCreator = ({
         const req = new GetAllTaskTemplatesByCreatorRequest()
         req.setCreatedBy(createdBy)
         req.setPrivateOnly(onlyPrivate)
-        const res = await taskTemplateService.getAllTaskTemplatesByCreator(req, getAuthenticatedGrpcMetadata())
+        const res = await APIServices.taskTemplates.getAllTaskTemplatesByCreator(req, getAuthenticatedGrpcMetadata())
 
         personalTaskTemplates = res.getTemplatesList().map((template) => ({
           id: template.getId(),
@@ -125,7 +125,7 @@ export const useUpdateMutation = (queryKey: QueryKey, setTemplate: (taskTemplate
             continue
           }
           deleteSubtaskTaskTemplate.setId(id)
-          await taskTemplateService.deleteTaskTemplateSubTask(deleteSubtaskTaskTemplate, getAuthenticatedGrpcMetadata())
+          await APIServices.taskTemplates.deleteTaskTemplateSubTask(deleteSubtaskTaskTemplate, getAuthenticatedGrpcMetadata())
         }
       }
 
@@ -135,7 +135,7 @@ export const useUpdateMutation = (queryKey: QueryKey, setTemplate: (taskTemplate
           createSubTaskTemplate.setName(subtask.name)
           createSubTaskTemplate.setTaskTemplateId(taskTemplate.id)
 
-          const res = await taskTemplateService.createTaskTemplateSubTask(createSubTaskTemplate, getAuthenticatedGrpcMetadata())
+          const res = await APIServices.taskTemplates.createTaskTemplateSubTask(createSubTaskTemplate, getAuthenticatedGrpcMetadata())
           subtask.id = res.getId()
 
           continue
@@ -145,11 +145,11 @@ export const useUpdateMutation = (queryKey: QueryKey, setTemplate: (taskTemplate
         updateSubtaskTemplate.setName(subtask.name)
         updateSubtaskTemplate.setSubtaskId(subtask.id)
 
-        await taskTemplateService.updateTaskTemplateSubTask(updateSubtaskTemplate, getAuthenticatedGrpcMetadata())
+        await APIServices.taskTemplates.updateTaskTemplateSubTask(updateSubtaskTemplate, getAuthenticatedGrpcMetadata())
       }
 
       // update task template
-      const res = await taskTemplateService.updateTaskTemplate(updateTaskTemplate, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.taskTemplates.updateTaskTemplate(updateTaskTemplate, getAuthenticatedGrpcMetadata())
       const newTaskTemplate: TaskTemplateDTO = { ...taskTemplate, ...res }
 
       templateForm.deletedSubtaskIds = []
@@ -191,7 +191,7 @@ export const useCreateMutation = (wardId: string, queryKey: QueryKey, setTemplat
         createTaskTemplate.setWardId(wardId)
       }
 
-      const res = await taskTemplateService.createTaskTemplate(createTaskTemplate, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.taskTemplates.createTaskTemplate(createTaskTemplate, getAuthenticatedGrpcMetadata())
       const newTaskTemplate: TaskTemplateDTO = { ...taskTemplate, ...res }
 
       setTemplate(newTaskTemplate)
@@ -217,7 +217,7 @@ export const useDeleteMutation = (queryKey: QueryKey, setTemplate: (task?: TaskT
     mutationFn: async (taskTemplate: TaskTemplateDTO) => {
       const deleteTaskTemplate = new DeleteTaskTemplateRequest()
       deleteTaskTemplate.setId(taskTemplate.id)
-      await taskTemplateService.deleteTaskTemplate(deleteTaskTemplate, getAuthenticatedGrpcMetadata())
+      await APIServices.taskTemplates.deleteTaskTemplate(deleteTaskTemplate, getAuthenticatedGrpcMetadata())
 
       setTemplate(undefined)
     },
@@ -244,7 +244,7 @@ export const useSubTaskTemplateDeleteMutation = (callback: () => void = noop) =>
     mutationFn: async (subtaskId: string) => {
       const deleteSubtaskTaskTemplate = new DeleteTaskTemplateSubTaskRequest()
       deleteSubtaskTaskTemplate.setId(subtaskId)
-      await taskTemplateService.deleteTaskTemplateSubTask(deleteSubtaskTaskTemplate, getAuthenticatedGrpcMetadata())
+      await APIServices.taskTemplates.deleteTaskTemplateSubTask(deleteSubtaskTaskTemplate, getAuthenticatedGrpcMetadata())
       queryClient.refetchQueries(['personalTaskTemplates']).then()
       callback()
       return deleteSubtaskTaskTemplate.toObject()
@@ -262,7 +262,7 @@ export const useSubTaskTemplateUpdateMutation = (callback: (subtask: SubTaskDTO)
       const updateSubtaskTemplate = new UpdateTaskTemplateSubTaskRequest()
       updateSubtaskTemplate.setName(subtask.name)
       updateSubtaskTemplate.setSubtaskId(subtask.id)
-      await taskTemplateService.updateTaskTemplateSubTask(updateSubtaskTemplate, getAuthenticatedGrpcMetadata())
+      await APIServices.taskTemplates.updateTaskTemplateSubTask(updateSubtaskTemplate, getAuthenticatedGrpcMetadata())
       const newSubtask: SubTaskDTO = { ...subtask }
       queryClient.refetchQueries(['wardTaskTemplates']).then()
       callback(newSubtask)
@@ -281,7 +281,7 @@ export const useSubTaskTemplateAddMutation = (taskTemplateId: string) => {
       const createSubTaskTemplate = new CreateTaskTemplateSubTaskRequest()
       createSubTaskTemplate.setName(subtask.name)
       createSubTaskTemplate.setTaskTemplateId(taskTemplateId)
-      await taskTemplateService.createTaskTemplateSubTask(createSubTaskTemplate, getAuthenticatedGrpcMetadata())
+      await APIServices.taskTemplates.createTaskTemplateSubTask(createSubTaskTemplate, getAuthenticatedGrpcMetadata())
 
       queryClient.refetchQueries(['wardTaskTemplates']).then()
       return createSubTaskTemplate.toObject()
diff --git a/tasks/mutations/user_mutations.ts b/tasks/mutations/user_mutations.ts
index 3a637c7a..11822ea3 100644
--- a/tasks/mutations/user_mutations.ts
+++ b/tasks/mutations/user_mutations.ts
@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query'
 import { ReadPublicProfileRequest } from '@helpwave/proto-ts/services/user_svc/v1/user_svc_pb'
-import { getAuthenticatedGrpcMetadata, userService } from '../utils/grpc'
+import { APIServices, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
 
 const userQueryKey = 'user'
 
@@ -16,7 +16,7 @@ export const useUserQuery = (userId: string|undefined) => {
       const req = new ReadPublicProfileRequest()
       req.setId(userId)
 
-      const res = await userService.readPublicProfile(req, getAuthenticatedGrpcMetadata())
+      const res = await APIServices.user.readPublicProfile(req, getAuthenticatedGrpcMetadata())
       return res.toObject()
     },
   })
diff --git a/tasks/mutations/ward_mutations.ts b/tasks/mutations/ward_mutations.ts
index f3ce60f8..19414c9e 100644
--- a/tasks/mutations/ward_mutations.ts
+++ b/tasks/mutations/ward_mutations.ts
@@ -8,7 +8,7 @@ import {
   UpdateWardRequest
 } from '@helpwave/proto-ts/services/task_svc/v1/ward_svc_pb'
 import { noop } from '@helpwave/common/util/noop'
-import { getAuthenticatedGrpcMetadata, wardService } from '@/utils/grpc'
+import { APIServices, getAuthenticatedGrpcMetadata } from '@/utils/grpc'
 
 export const wardsQueryKey = 'wards'
 
@@ -67,7 +67,7 @@ export const useWardOverviewsQuery = (organisationId?: string) => {
     queryKey: [wardsQueryKey, organisationId],
     queryFn: async () => {
       const req = new GetWardOverviewsRequest()
-      const res = await wardService.getWardOverviews(req, getAuthenticatedGrpcMetadata(organisationId))
+      const res = await APIServices.ward.getWardOverviews(req, getAuthenticatedGrpcMetadata(organisationId))
 
       const wards: WardOverviewDTO[] = res.getWardsList().map((ward) => ({
         id: ward.getId(),
@@ -94,7 +94,7 @@ export const useWardDetailsQuery = (wardId?: string, organizationId?: string) =>
 
       const req = new GetWardDetailsRequest()
       req.setId(wardId)
-      const res = await wardService.getWardDetails(req, getAuthenticatedGrpcMetadata(organizationId))
+      const res = await APIServices.ward.getWardDetails(req, getAuthenticatedGrpcMetadata(organizationId))
 
       return {
         id: res.getId(),
@@ -125,7 +125,7 @@ export const useWardQuery = (id: string, organisationId?: string) => useQuery({
   queryFn: async (): Promise<WardWithOrganizationIdDTO> => {
     const req = new GetWardRequest()
     req.setId(id)
-    const res = await wardService.getWard(req, getAuthenticatedGrpcMetadata(organisationId))
+    const res = await APIServices.ward.getWard(req, getAuthenticatedGrpcMetadata(organisationId))
 
     if (!res.toObject()) {
       console.error('error in Ward query')
@@ -146,7 +146,7 @@ export const useWardUpdateMutation = (organisationId?: string, callback: (ward:
       const req = new UpdateWardRequest()
       req.setId(ward.id)
       req.setName(ward.name)
-      await wardService.updateWard(req, getAuthenticatedGrpcMetadata(organisationId))
+      await APIServices.ward.updateWard(req, getAuthenticatedGrpcMetadata(organisationId))
 
       callback(ward)
     },
@@ -162,7 +162,7 @@ export const useWardCreateMutation = (organisationId?: string, callback: (ward:
     mutationFn: async (ward: WardMinimalDTO) => {
       const createWardRequest = new CreateWardRequest()
       createWardRequest.setName(ward.name)
-      const res = await wardService.createWard(createWardRequest, getAuthenticatedGrpcMetadata(organisationId))
+      const res = await APIServices.ward.createWard(createWardRequest, getAuthenticatedGrpcMetadata(organisationId))
       const newWard: WardMinimalDTO = {
         ...ward,
         id: res.getId()
@@ -182,7 +182,7 @@ export const useWardDeleteMutation = (organisationId?: string, callback: () => v
     mutationFn: async (wardId: string) => {
       const req = new DeleteWardRequest()
       req.setId(wardId)
-      await wardService.deleteWard(req, getAuthenticatedGrpcMetadata(organisationId))
+      await APIServices.ward.deleteWard(req, getAuthenticatedGrpcMetadata(organisationId))
 
       callback()
     },
diff --git a/tasks/utils/grpc.ts b/tasks/utils/grpc.ts
index 0a0b9670..7212b486 100644
--- a/tasks/utils/grpc.ts
+++ b/tasks/utils/grpc.ts
@@ -28,6 +28,8 @@ import { BedOfflineServicePromiseClient } from '@/mutations/offline/services/bed
 import { PatientOfflineServicePromiseClient } from '@/mutations/offline/services/patient_service'
 import { TaskOfflineServicePromiseClient } from '@/mutations/offline/services/task_service'
 import { TaskTemplateOfflineServicePromiseClient } from '@/mutations/offline/services/task_template_service'
+import { UserOfflineServicePromiseClient } from '@/mutations/offline/services/user_service'
+import { OrganizationOfflineServicePromiseClient } from '@/mutations/offline/services/organization_service'
 
 const taskSvcBaseUrl = `${getConfig().apiUrl}/task-svc`
 const userSvcBaseUrl = `${getConfig().apiUrl}/user-svc`
@@ -36,34 +38,46 @@ const propertySvcBaseUrl = `${getConfig().apiUrl}/property-svc`
 // TODO make this configurable
 export const isOfflineMode = true
 
-// TODO: Implement something like a service registry
-export const wardService = isOfflineMode
-  ? new WardOfflineServicePromiseClient(taskSvcBaseUrl)
-  : new WardServicePromiseClient(taskSvcBaseUrl)
-export const roomService = isOfflineMode
-  ? new RoomOfflineServicePromiseClient(taskSvcBaseUrl)
-  : new RoomServicePromiseClient(taskSvcBaseUrl)
-export const bedService = isOfflineMode
-  ? new BedOfflineServicePromiseClient(taskSvcBaseUrl)
-  : new BedServicePromiseClient(taskSvcBaseUrl)
-export const patientService = isOfflineMode
-  ? new PatientOfflineServicePromiseClient(taskSvcBaseUrl)
-  : new PatientServicePromiseClient(taskSvcBaseUrl)
-export const taskService = isOfflineMode
-  ? new TaskOfflineServicePromiseClient(taskSvcBaseUrl)
-  : new TaskServicePromiseClient(taskSvcBaseUrl)
-export const taskTemplateService = isOfflineMode
-  ? new TaskTemplateOfflineServicePromiseClient(taskSvcBaseUrl)
-  : new TaskTemplateServicePromiseClient(taskSvcBaseUrl)
-export const propertyService = isOfflineMode
-  ? new PropertyOfflineServicePromiseClient(propertySvcBaseUrl)
-  : new PropertyServicePromiseClient(propertySvcBaseUrl)
+type APIServicesType = {
+  organization: OrganizationOfflineServicePromiseClient,
+  user: UserServicePromiseClient,
+  ward: WardServicePromiseClient,
+  room: RoomServicePromiseClient,
+  bed: BedServicePromiseClient,
+  patient: PatientServicePromiseClient,
+  task: TaskServicePromiseClient,
+  taskTemplates: TaskTemplateServicePromiseClient,
+  property: PropertyServicePromiseClient,
+  propertyValues: PropertyValueServicePromiseClient
+}
+
+const offlineServices: APIServicesType = {
+  organization: new OrganizationOfflineServicePromiseClient(userSvcBaseUrl),
+  user: new UserOfflineServicePromiseClient(userSvcBaseUrl),
+  ward: new WardOfflineServicePromiseClient(taskSvcBaseUrl),
+  room: new RoomOfflineServicePromiseClient(taskSvcBaseUrl),
+  bed: new BedOfflineServicePromiseClient(taskSvcBaseUrl),
+  patient: new PatientOfflineServicePromiseClient(taskSvcBaseUrl),
+  task: new TaskOfflineServicePromiseClient(taskSvcBaseUrl),
+  taskTemplates: new TaskTemplateOfflineServicePromiseClient(taskSvcBaseUrl),
+  property: new PropertyOfflineServicePromiseClient(propertySvcBaseUrl),
+  propertyValues: new PropertyValueOfflineServicePromiseClient(propertySvcBaseUrl),
+}
+
+const onlineServices: APIServicesType = {
+  organization: new OrganizationServicePromiseClient(userSvcBaseUrl),
+  user: new UserServicePromiseClient(userSvcBaseUrl),
+  ward: new WardServicePromiseClient(taskSvcBaseUrl),
+  room: new RoomServicePromiseClient(taskSvcBaseUrl),
+  bed: new BedServicePromiseClient(taskSvcBaseUrl),
+  patient: new PatientServicePromiseClient(taskSvcBaseUrl),
+  task: new TaskServicePromiseClient(taskSvcBaseUrl),
+  taskTemplates: new TaskTemplateServicePromiseClient(taskSvcBaseUrl),
+  property: new PropertyServicePromiseClient(propertySvcBaseUrl),
+  propertyValues: new PropertyValueServicePromiseClient(propertySvcBaseUrl),
+}
 
-export const propertyValueService = isOfflineMode
-  ? new PropertyValueOfflineServicePromiseClient(propertySvcBaseUrl)
-  : new PropertyValueServicePromiseClient(propertySvcBaseUrl)
-export const organizationService = new OrganizationServicePromiseClient(userSvcBaseUrl)
-export const userService = new UserServicePromiseClient(userSvcBaseUrl)
+export const APIServices: APIServicesType = isOfflineMode ? offlineServices : onlineServices
 
 type AuthenticatedGrpcMetadata = {
   Authorization: string,