From dd440c6b0fe1a4d2c201406a873865be119cd751 Mon Sep 17 00:00:00 2001
From: "M. E. Abdelsalam" <mo.ehab150@gmail.com>
Date: Tue, 24 Dec 2024 22:17:18 +0200
Subject: [PATCH 1/2] refactor: calls table and corresponding tables have been
 dropped; call is replaced with session_id.

---
 apps/nova/src/components/Call/GhostView.tsx   |   2 +-
 .../src/components/Interviews/Interview.tsx   |   2 +-
 apps/nova/src/components/Lessons/Lesson.tsx   |   2 +-
 .../PendingInterview/index.tsx                |  10 +-
 .../Interview/ScheduledInterview/index.tsx    |  10 +-
 apps/nova/src/hooks/call.ts                   |  16 +-
 apps/nova/src/pages/Call.tsx                  |  38 +--
 packages/atlas/src/atlas.ts                   |   6 +-
 packages/atlas/src/call.ts                    |  19 --
 packages/atlas/src/chat.ts                    |   4 +-
 packages/atlas/src/session.ts                 |  12 +
 packages/auth/src/middleware.ts               |   5 +-
 packages/headless/package.json                |   4 +-
 .../headless/src/{calls.ts => sessions.ts}    | 132 ++++----
 packages/models/fixtures/db.ts                |  13 +-
 .../models/migrations/1716146586880_setup.js  |  22 +-
 packages/models/scripts/seed.ts               |  23 +-
 packages/models/src/cache/call.ts             |  68 ----
 packages/models/src/cache/index.ts            |   6 +-
 packages/models/src/cache/peer.ts             |  16 +-
 packages/models/src/cache/session.ts          |  70 ++++
 packages/models/src/calls.ts                  | 303 ------------------
 packages/models/src/index.ts                  |   1 -
 packages/models/src/interviews.ts             |  55 +++-
 packages/models/src/lessons.ts                |  68 ++--
 packages/models/src/lib/utils.ts              |  12 +
 packages/models/tests/cache/call.test.ts      |  62 ----
 packages/models/tests/cache/peer.test.ts      |  20 +-
 packages/models/tests/cache/session.test.ts   |  69 ++++
 packages/models/tests/calls.test.ts           | 137 --------
 packages/models/tests/lessons.test.ts         |   2 +-
 packages/sol/package.json                     |  11 +-
 packages/sol/src/ghost.ts                     |   8 +-
 packages/sol/src/index.ts                     |   1 +
 packages/sol/src/session.ts                   |  12 +
 packages/types/src/api.ts                     |   2 +-
 packages/types/src/call.ts                    |  79 -----
 packages/types/src/index.ts                   |   2 +-
 packages/types/src/interview.ts               |  19 +-
 packages/types/src/lesson.ts                  |   8 +-
 packages/types/src/peer.ts                    |   6 +-
 packages/types/src/room.ts                    |   2 +-
 packages/types/src/session.ts                 |  37 +++
 packages/types/src/user.ts                    |   2 +-
 packages/types/src/wss.ts                     |  32 +-
 services/server/fixtures/db.ts                |  14 +-
 services/server/fixtures/shared.ts            |   3 -
 services/server/fixtures/wss.ts               |  10 +-
 services/server/src/handlers/call.ts          |  67 ----
 services/server/src/handlers/chat.ts          |  27 +-
 services/server/src/handlers/interview.ts     |   8 +-
 services/server/src/handlers/invoice.ts       |   2 -
 services/server/src/handlers/lesson.ts        |   8 +-
 services/server/src/handlers/peer.ts          |  22 +-
 services/server/src/handlers/session.ts       |  67 ++++
 services/server/src/index.ts                  |   2 +-
 services/server/src/lib/error.ts              |   2 +-
 .../server/src/lib/{call.ts => session.ts}    |  22 +-
 services/server/src/lib/utils.ts              |   5 -
 .../server/src/middleware/accessControl.ts    |   6 +-
 services/server/src/routes/call.ts            |   9 -
 services/server/src/routes/chat.ts            |   2 +-
 services/server/src/routes/index.ts           |   4 +-
 services/server/src/routes/session.ts         |   9 +
 services/server/src/validation/utils.ts       |   2 +
 .../server/src/wss/handlers/connection.ts     |  37 +--
 services/server/src/wss/handlers/index.ts     |   6 +-
 .../server/src/wss/handlers/inputDevices.ts   |  14 +-
 services/server/src/wss/handlers/peer.ts      |  28 +-
 services/server/src/wss/handlers/session.ts   | 100 ++++++
 services/server/src/wss/utils.ts              |   4 +-
 services/server/tests/api/call.test.ts        |  66 ----
 services/server/tests/api/user.test.ts        |   3 +-
 services/server/tests/wss/call.test.ts        |  24 +-
 74 files changed, 804 insertions(+), 1199 deletions(-)
 delete mode 100644 packages/atlas/src/call.ts
 create mode 100644 packages/atlas/src/session.ts
 rename packages/headless/src/{calls.ts => sessions.ts} (90%)
 delete mode 100644 packages/models/src/cache/call.ts
 create mode 100644 packages/models/src/cache/session.ts
 delete mode 100644 packages/models/src/calls.ts
 create mode 100644 packages/models/src/lib/utils.ts
 delete mode 100644 packages/models/tests/cache/call.test.ts
 create mode 100644 packages/models/tests/cache/session.test.ts
 delete mode 100644 packages/models/tests/calls.test.ts
 create mode 100644 packages/sol/src/session.ts
 delete mode 100644 packages/types/src/call.ts
 create mode 100644 packages/types/src/session.ts
 delete mode 100644 services/server/src/handlers/call.ts
 create mode 100644 services/server/src/handlers/session.ts
 rename services/server/src/lib/{call.ts => session.ts} (83%)
 delete mode 100644 services/server/src/lib/utils.ts
 delete mode 100644 services/server/src/routes/call.ts
 create mode 100644 services/server/src/routes/session.ts
 create mode 100644 services/server/src/wss/handlers/session.ts
 delete mode 100644 services/server/tests/api/call.test.ts

diff --git a/apps/nova/src/components/Call/GhostView.tsx b/apps/nova/src/components/Call/GhostView.tsx
index 292edb45..5b5b1ef7 100644
--- a/apps/nova/src/components/Call/GhostView.tsx
+++ b/apps/nova/src/components/Call/GhostView.tsx
@@ -1,6 +1,6 @@
 import { useFormatMessage } from "@litespace/luna/hooks/intl";
 import { Typography } from "@litespace/luna/Typography";
-import { RemoteStream } from "@litespace/headless/calls";
+import { RemoteStream } from "@litespace/headless/sessions";
 import { isEmpty } from "lodash";
 import React from "react";
 import UserMedia from "@/components/Call/UserMedia";
diff --git a/apps/nova/src/components/Interviews/Interview.tsx b/apps/nova/src/components/Interviews/Interview.tsx
index f9382a42..d72077f9 100644
--- a/apps/nova/src/components/Interviews/Interview.tsx
+++ b/apps/nova/src/components/Interviews/Interview.tsx
@@ -97,7 +97,7 @@ const Interview: React.FC<{
 
       <div className="flex flex-row gap-2 mt-4">
         {upcoming ? (
-          <Link to={Route.Call.replace(":id", interview.ids.call.toString())}>
+          <Link to={Route.Call.replace(":id", interview.ids.session)}>
             <Button size={sm ? ButtonSize.Small : ButtonSize.Tiny}>
               {!started
                 ? intl.formatMessage(
diff --git a/apps/nova/src/components/Lessons/Lesson.tsx b/apps/nova/src/components/Lessons/Lesson.tsx
index 40b8121e..6ad1c6c3 100644
--- a/apps/nova/src/components/Lessons/Lesson.tsx
+++ b/apps/nova/src/components/Lessons/Lesson.tsx
@@ -142,7 +142,7 @@ const Lesson: React.FC<
 
       <div className="flex flex-row gap-2 mt-4">
         {upcoming ? (
-          <Link to={Route.Call.replace(":id", lesson.callId.toString())}>
+          <Link to={Route.Call.replace(":id", lesson.sessionId)}>
             <Button size={sm ? ButtonSize.Small : ButtonSize.Tiny}>
               {inprogress
                 ? intl("page.lessons.lesson.join.inprogress", {
diff --git a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
index 26433314..483ff0ec 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
@@ -6,15 +6,15 @@ import {
 } from "@litespace/luna/Button";
 import { asFullAssetUrl } from "@litespace/luna/backend";
 import { useFormatMessage } from "@litespace/luna/hooks/intl";
-import { ICall } from "@litespace/types";
+import { ISession } from "@litespace/types";
 import React from "react";
 import { Link } from "react-router-dom";
 import { Route } from "@/types/routes";
 
 const PendingInterview: React.FC<{
-  interviewer: ICall.PopuldatedMember;
-  call: ICall.Self;
-}> = ({ interviewer, call }) => {
+  interviewer: ISession.PopuldatedMember;
+  session: ISession.Self;
+}> = ({ interviewer, session }) => {
   const intl = useFormatMessage();
   return (
     <div>
@@ -57,7 +57,7 @@ const PendingInterview: React.FC<{
           </p>
 
           <div className="flex flex-row gap-4 mt-6">
-            <Link to={Route.Call.replace(":id", call.id.toString())}>
+            <Link to={Route.Call.replace(":id", session.sessionId)}>
               <Button
                 size={ButtonSize.Small}
                 type={ButtonType.Main}
diff --git a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx
index c174c82f..b1cc49de 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx
@@ -1,14 +1,14 @@
 import { destructureInterviewStatus } from "@litespace/sol/interview";
-import { ICall, IInterview } from "@litespace/types";
+import { ISession, IInterview } from "@litespace/types";
 import React, { useMemo } from "react";
 import PendingInterview from "@/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview";
 import PassedInterview from "@/components/TutorOnboardingSteps/Interview/ScheduledInterview/PassedInterview";
 
 const ScheduledInterview: React.FC<{
   interview: IInterview.Self;
-  call: ICall.Self;
-  members: ICall.PopuldatedMember[];
-}> = ({ interview, call, members }) => {
+  session: ISession.Self;
+  members: ISession.PopuldatedMember[];
+}> = ({ interview, session, members }) => {
   // todo: handle canceled and rejected
   const { pending, passed, rejected, canceled } = useMemo(
     () => destructureInterviewStatus(interview.status),
@@ -25,7 +25,7 @@ const ScheduledInterview: React.FC<{
   return (
     <div>
       {pending && interviewer ? (
-        <PendingInterview interviewer={interviewer} call={call} />
+        <PendingInterview interviewer={interviewer} session={session} />
       ) : passed && interviewer ? (
         <PassedInterview
           feedback={interview.feedback.interviewer}
diff --git a/apps/nova/src/hooks/call.ts b/apps/nova/src/hooks/call.ts
index 22b558c0..ffa1edb4 100644
--- a/apps/nova/src/hooks/call.ts
+++ b/apps/nova/src/hooks/call.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState, useRef } from "react";
 import { isPermissionDenied, safe } from "@/lib/error";
 import { MediaConnection } from "peerjs";
 import peer from "@/lib/peer";
-import { Wss } from "@litespace/types";
+import { ISession, Wss } from "@litespace/types";
 import hark from "hark";
 import { useToast } from "@litespace/luna/Toast";
 import { useFormatMessage } from "@litespace/luna/hooks/intl";
@@ -235,7 +235,7 @@ function useStreamState(stream: MediaStream | null) {
 
 export function useCallEvents(
   stream: MediaStream | null,
-  call: number | null,
+  session: ISession.Id | null,
   mate?: number
 ) {
   const [mateVideo, setMateVideo] = useState<boolean>(false);
@@ -245,18 +245,18 @@ export function useCallEvents(
 
   const notifyCameraToggle = useCallback(
     (camera: boolean) => {
-      if (!call || !socket) return;
-      socket.emit(Wss.ClientEvent.ToggleCamera, { call, camera });
+      if (!session || !socket) return;
+      socket.emit(Wss.ClientEvent.ToggleCamera, { session, camera });
     },
-    [call, socket]
+    [session, socket]
   );
 
   const notifyMicToggle = useCallback(
     (mic: boolean) => {
-      if (!call || !socket) return;
-      socket.emit(Wss.ClientEvent.ToggleMic, { call, mic });
+      if (!session || !socket) return;
+      socket.emit(Wss.ClientEvent.ToggleMic, { session, mic });
     },
-    [call, socket]
+    [session, socket]
   );
 
   const onCameraToggle = useCallback(
diff --git a/apps/nova/src/pages/Call.tsx b/apps/nova/src/pages/Call.tsx
index bb22f14f..99951434 100644
--- a/apps/nova/src/pages/Call.tsx
+++ b/apps/nova/src/pages/Call.tsx
@@ -16,13 +16,13 @@ import cn from "classnames";
 // import Messages from "@/components/Chat/Messages";
 import { orNull, orUndefined } from "@litespace/sol/utils";
 import {
-  useCallMembers,
+  useSessionMembers,
   // useCall,
-  useCallV2,
-  useFindCallRoomById,
+  useSessionV2,
+  useFindSessionRoomById,
   useFullScreen,
   usePeerIds,
-} from "@litespace/headless/calls";
+} from "@litespace/headless/sessions";
 import { useDisplayRecorder } from "@litespace/headless/recorder";
 import { isGhost } from "@/lib/ghost";
 import CallView, { CallViewProps } from "@/components/Call/CallView";
@@ -32,8 +32,8 @@ import Video from "@litespace/assets/Video";
 import Microphone from "@litespace/assets/Microphone";
 import VideoSlash from "@litespace/assets/VideoSlash";
 import MicrophoneSlash from "@litespace/assets/MicrophoneSlash";
-import { ICall } from "@litespace/types";
 import { useUser } from "@litespace/headless/context/user";
+import { ISession } from "@litespace/types";
 // import GhostView from "@/components/Call/GhostView";
 
 const Call: React.FC = () => {
@@ -41,28 +41,22 @@ const Call: React.FC = () => {
   // const chat = useRender();
   // const intl = useFormatMessage();
   // const mediaQueries = useMediaQueries();
-  const { id, type } = useParams<{ id: string; type: ICall.Type }>();
+  const { id } = useParams<{ id: ISession.Id }>();
   // const { isFullScreen, toggleFullScreen, ref } = useFullScreen();
 
-  const callId = useMemo(() => {
-    const call = Number(id);
-    if (!id || Number.isNaN(call)) return null;
-    return call;
+  const { sessionId } = useMemo(() => {
+    return { sessionId: id || null };
   }, [id]);
 
-  const ctype = useMemo(() => {
-    if (type != "lesson" && type != "interview") return null;
-    return type;
-  }, [type]);
 
-  const callRoom = useFindCallRoomById(!isGhost ? callId : null);
+  const callRoom = useFindSessionRoomById(!isGhost ? sessionId : null);
 
   const mateInfo = useMemo(() => {
     if (!callRoom.data) return;
     return callRoom.data.members.find((member) => member.id !== user?.id);
   }, [callRoom.data, user?.id]);
 
-  const members = useCallMembers(callId, ctype);
+  const members = useSessionMembers(sessionId);
   useEffect(() => console.log("In App members: ", members), [members]);
 
   // const messages = useMemo(
@@ -127,17 +121,17 @@ const Call: React.FC = () => {
   const peers = usePeerIds(
     useMemo(
       () => ({
-        callId,
+        sessionId,
         isGhost,
         mateUserId: orNull(mateInfo?.id),
         role: orNull(user?.role),
         disableGhost: false,
       }),
-      [callId, mateInfo?.id, user?.role]
+      [sessionId, mateInfo?.id, user?.role]
     )
   );
 
-  const onCloseCall = useCallback(() => {
+  const onCloseSession = useCallback(() => {
     // peers.ghost.refetch();
     // peers.tutor.refetch();
   }, []);
@@ -152,16 +146,16 @@ const Call: React.FC = () => {
   });
   */
 
-  const { userMedia, mateStream, mateScreenStream, ghostStreams } = useCallV2(
+  const { userMedia, mateStream, mateScreenStream, ghostStreams } = useSessionV2(
     useMemo(
       () => ({
         isGhost,
         ghostPeerId: orNull(peers.ghost.data),
         tutorPeerId: orNull(peers.tutor.data),
         userId: orNull(user?.id),
-        onCloseCall,
+        onCloseSession,
       }),
-      [onCloseCall, peers.ghost.data, peers.tutor.data, user?.id]
+      [onCloseSession, peers.ghost.data, peers.tutor.data, user?.id]
     )
   );
 
diff --git a/packages/atlas/src/atlas.ts b/packages/atlas/src/atlas.ts
index ab2aaa06..9dfbd6b0 100644
--- a/packages/atlas/src/atlas.ts
+++ b/packages/atlas/src/atlas.ts
@@ -1,7 +1,7 @@
 import { User } from "@/user";
 import { Auth } from "@/auth";
 import { Backend } from "@litespace/types";
-import { Call } from "@/call";
+import { Session } from "@/session";
 import { Plan } from "@/plan";
 import { Coupon } from "@/coupon";
 import { Invite } from "@/invite";
@@ -23,7 +23,7 @@ import { Peer } from "@/peer";
 export class Atlas {
   public readonly user: User;
   public readonly auth: Auth;
-  public readonly call: Call;
+  public readonly session: Session;
   public readonly plan: Plan;
   public readonly coupon: Coupon;
   public readonly invite: Invite;
@@ -44,7 +44,7 @@ export class Atlas {
   constructor(backend: Backend, token: AuthToken | null) {
     this.user = new User(backend, token);
     this.auth = new Auth(backend, token);
-    this.call = new Call(backend, token);
+    this.session = new Session(backend, token);
     this.plan = new Plan(backend, token);
     this.coupon = new Coupon(backend, token);
     this.invite = new Invite(backend, token);
diff --git a/packages/atlas/src/call.ts b/packages/atlas/src/call.ts
deleted file mode 100644
index 75496a33..00000000
--- a/packages/atlas/src/call.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Base } from "@/base";
-import { ICall } from "@litespace/types";
-
-export class Call extends Base {
-  async findUserCalls(id: number): Promise<ICall.FindUserCallsApiResponse> {
-    return await this.get({ route: `/api/v1/call/list/user/${id}` });
-  }
-
-  async findById(id: number): Promise<ICall.FindCallByIdApiResponse> {
-    return await this.get({ route: `/api/v1/call/${id}` });
-  }
-
-  async findCallMembers(
-    id: number,
-    type: ICall.Type
-  ): Promise<ICall.FindCallMembersApiResponse> {
-    return await this.get({ route: `/api/v1/call/${id}/${type}/members` });
-  }
-}
diff --git a/packages/atlas/src/chat.ts b/packages/atlas/src/chat.ts
index 9a345b3d..03a9266f 100644
--- a/packages/atlas/src/chat.ts
+++ b/packages/atlas/src/chat.ts
@@ -41,8 +41,8 @@ export class Chat extends Base {
     return await this.get({ route: `/api/v1/chat/room/members/${room}` });
   }
 
-  async findCallRoom(call: number): Promise<IRoom.FindCallRoomApiResponse> {
-    return await this.get({ route: `/api/v1/chat/room/call/${call}` });
+  async findSessionRoom(session: string): Promise<IRoom.FindSessionRoomApiResponse> {
+    return await this.get({ route: `/api/v1/chat/room/session/${session}` });
   }
 
   async updateRoom(
diff --git a/packages/atlas/src/session.ts b/packages/atlas/src/session.ts
new file mode 100644
index 00000000..842c7a73
--- /dev/null
+++ b/packages/atlas/src/session.ts
@@ -0,0 +1,12 @@
+import { Base } from "@/base";
+import { ISession } from "@litespace/types";
+
+export class Session extends Base {
+  async findUserSessions(userId: number): Promise<ISession.FindUserSessionsApiResponse> {
+    return await this.get({ route: `/api/v1/session/list/user/${userId}` });
+  }
+
+  async findSessionMembers(sessionId: string): Promise<ISession.FindSessionMembersApiResponse> {
+    return await this.get({ route: `/api/v1/session/${sessionId}/members` });
+  }
+}
diff --git a/packages/auth/src/middleware.ts b/packages/auth/src/middleware.ts
index 5b7361c7..8ecd4e70 100644
--- a/packages/auth/src/middleware.ts
+++ b/packages/auth/src/middleware.ts
@@ -5,7 +5,6 @@ import { users } from "@litespace/models";
 import { safe } from "@litespace/sol/error";
 import { asGhost } from "@litespace/sol/ghost";
 import { isAdmin } from "@/authorization";
-import { IUser } from "@litespace/types";
 
 export function authMiddleware({
   jwtSecret,
@@ -24,9 +23,7 @@ export function authMiddleware({
       if (type === "Basic") {
         const data = Buffer.from(token, "base64").toString("utf-8");
         const [username, password] = data.split(":");
-        const call = Number(username);
-        const valid = !Number.isNaN(call) && password === ghostPassword;
-        if (valid) req.user = asGhost(call);
+        if (password === ghostPassword) req.user = asGhost(username);
       }
 
       if (type === "Bearer") {
diff --git a/packages/headless/package.json b/packages/headless/package.json
index a840fc56..af5b86a4 100644
--- a/packages/headless/package.json
+++ b/packages/headless/package.json
@@ -21,7 +21,7 @@
     "./topic": "./dist/topic.js",
     "./query": "./dist/query.js",
     "./constants": "./dist/constants/index.js",
-    "./calls": "./dist/calls.js",
+    "./sessions": "./dist/sessions.js",
     "./invoices": "./dist/invoices.js",
     "./lessons": "./dist/lessons.js",
     "./interviews": "./dist/interviews.js",
@@ -47,7 +47,7 @@
     "./rating": "./dist/rating.js",
     "./query": "./dist/query.js",
     "./constants": "./dist/constants/index.js",
-    "./calls": "./dist/calls.js",
+    "./sessions": "./dist/sessions.js",
     "./interviews": "./dist/interviews.js",
     "./invoices": "./dist/invoices.js",
     "./lessons": "./dist/lessons.js",
diff --git a/packages/headless/src/calls.ts b/packages/headless/src/sessions.ts
similarity index 90%
rename from packages/headless/src/calls.ts
rename to packages/headless/src/sessions.ts
index bc048875..bf5d7382 100644
--- a/packages/headless/src/calls.ts
+++ b/packages/headless/src/sessions.ts
@@ -1,4 +1,4 @@
-import { ICall, IPeer, IRoom, IUser, Void, Wss } from "@litespace/types";
+import { ISession, IPeer, IRoom, IUser, Void, Wss } from "@litespace/types";
 import { useQuery, UseQueryResult } from "@tanstack/react-query";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useAtlas } from "@/atlas/index";
@@ -20,19 +20,19 @@ declare module "peerjs" {
   }
 }
 
-export function useFindCallRoomById(
-  callId: number | null
-): UseQueryResult<IRoom.FindCallRoomApiResponse | null, Error> {
+export function useFindSessionRoomById(
+  sessionId: string | null
+): UseQueryResult<IRoom.FindSessionRoomApiResponse | null, Error> {
   const atlas = useAtlas();
 
-  const findCallRoom = useCallback(async () => {
-    if (!callId) return null;
-    return await atlas.chat.findCallRoom(callId);
-  }, [atlas.chat, callId]);
+  const findSessionRoom = useCallback(async () => {
+    if (!sessionId) return null;
+    return await atlas.chat.findSessionRoom(sessionId);
+  }, [atlas.chat, sessionId]);
 
   return useQuery({
-    queryFn: findCallRoom,
-    queryKey: ["find-call-room"],
+    queryFn: findSessionRoom,
+    queryKey: ["find-session-room"],
   });
 }
 
@@ -176,13 +176,13 @@ export type RemoteStream = {
   peer: string;
 };
 
-export function useCall({
-  call,
+export function useSession({
+  session,
   userId,
   mateUserId,
   isGhost,
 }: {
-  call?: number;
+  session?: ISession.Id;
   userId?: number;
   mateUserId?: number;
   isGhost?: boolean;
@@ -236,14 +236,14 @@ export function useCall({
   const userSpeaking = useSpeaking(mediaConnection, userMediaStream);
   const mateSpeaking = useSpeaking(mediaConnection, mateMediaStream);
   const { mateAudio, mateVideo, notifyCameraToggle, notifyMicToggle } =
-    useCallEvents(orUndefined(mateMediaStream), call, mateUserId);
+    useCallEvents(orUndefined(mateMediaStream), session, mateUserId);
 
   const acknowledgePeer = useCallback(
     (peerId: string) => {
-      if (!call || !socket) return;
-      socket.emit(Wss.ClientEvent.PeerOpened, { peerId, callId: call });
+      if (!session || !socket) return;
+      socket.emit(Wss.ClientEvent.PeerOpened, { peerId, sessionId: session });
     },
-    [call, socket]
+    [session, socket]
   );
 
   const addStream = useCallback(
@@ -338,7 +338,7 @@ export function useCall({
     ]
   );
 
-  const onJoinCall = useCallback(
+  const onJoinSession = useCallback(
     ({ peerId }: { peerId: string }) => {
       setTimeout(() => {
         // shared my stream with the connected peer
@@ -379,11 +379,11 @@ export function useCall({
 
   useEffect(() => {
     if (!socket) return;
-    socket.on(Wss.ServerEvent.UserJoinedCall, onJoinCall);
+    socket.on(Wss.ServerEvent.UserJoinedSession, onJoinSession);
     return () => {
-      socket.off(Wss.ServerEvent.UserJoinedCall, onJoinCall);
+      socket.off(Wss.ServerEvent.UserJoinedSession, onJoinSession);
     };
-  }, [onJoinCall, socket]);
+  }, [onJoinSession, socket]);
 
   useEffect(() => {
     if (peer.id) acknowledgePeer(peer.id);
@@ -618,7 +618,7 @@ function useStreamState(stream?: MediaStream) {
 
 export function useCallEvents(
   mateStream?: MediaStream,
-  call?: number,
+  session?: ISession.Id,
   mateUserId?: number
 ) {
   const [mateVideo, setMateVideo] = useState<boolean>(false);
@@ -628,18 +628,18 @@ export function useCallEvents(
 
   const notifyCameraToggle = useCallback(
     (camera: boolean) => {
-      if (!call || !socket) return;
-      socket.emit(Wss.ClientEvent.ToggleCamera, { call, camera });
+      if (!session || !socket) return;
+      socket.emit(Wss.ClientEvent.ToggleCamera, { session, camera });
     },
-    [call, socket]
+    [session, socket]
   );
 
   const notifyMicToggle = useCallback(
     (mic: boolean) => {
-      if (!call || !socket) return;
-      socket.emit(Wss.ClientEvent.ToggleMic, { call, mic });
+      if (!session || !socket) return;
+      socket.emit(Wss.ClientEvent.ToggleMic, { session, mic });
     },
-    [call, socket]
+    [session, socket]
   );
 
   const onCameraToggle = useCallback(
@@ -704,13 +704,13 @@ export function useFindPeerId(payload?: IPeer.FindPeerIdApiQuery) {
 
 export function usePeerIds({
   isGhost,
-  callId,
+  sessionId,
   role,
   mateUserId,
   disableGhost = false,
 }: {
   isGhost: boolean;
-  callId: number | null;
+  sessionId: string | null;
   role: IUser.Role | null;
   mateUserId: number | null;
   disableGhost?: boolean;
@@ -718,9 +718,9 @@ export function usePeerIds({
   const findGhostPeerIdQuery = useMemo(():
     | IPeer.FindPeerIdApiQuery
     | undefined => {
-    if (isGhost || !callId || disableGhost) return;
-    return { type: IPeer.PeerType.Ghost, call: callId };
-  }, [callId, disableGhost, isGhost]);
+    if (isGhost || !sessionId || disableGhost) return;
+    return { type: IPeer.PeerType.Ghost, session: sessionId };
+  }, [sessionId, disableGhost, isGhost]);
 
   const findTutorPeerIdQuery = useMemo(():
     | IPeer.FindPeerIdApiQuery
@@ -754,18 +754,18 @@ type GhostStream = {
   call: MediaConnection;
 };
 
-export function useCallV2({
+export function useSessionV2({
   isGhost,
   tutorPeerId,
   ghostPeerId,
   userId,
-  onCloseCall,
+  onCloseSession,
 }: {
   isGhost: boolean;
   tutorPeerId: string | null;
   ghostPeerId: string | null;
   userId: number | null;
-  onCloseCall: Void;
+  onCloseSession: Void;
 }) {
   const peer = usePeer();
   const userMedia = useUserMedia();
@@ -902,12 +902,12 @@ export function useCallV2({
          * called on the student side.
          */
         call.on("close", () => {
-          onCloseCall();
+          onCloseSession();
           if (!screen) setMateStream(null);
         });
       }, 3_000);
     },
-    [onCloseCall, peer, userId]
+    [onCloseSession, peer, userId]
   );
 
   useEffect(() => {
@@ -1011,16 +1011,15 @@ export function useFullScreen<T extends Element>() {
 /*
  * Send an HTTP request to retrieve the current members of a call
  */
-export function useFindCallMembers(
-  callId: number | null,
-  callType: ICall.Type | null
-): UseQueryResult<ICall.FindCallMembersApiResponse | null, Error> {
+export function useFindSessionMembers(
+  sessionId: string | null
+): UseQueryResult<ISession.FindSessionMembersApiResponse | null, Error> {
   const atlas = useAtlas();
 
   const findCallMembers = useCallback(async () => {
-    if (!callId || !callType) return null;
-    return await atlas.call.findCallMembers(callId, callType);
-  }, [atlas.call, callId, callType]);
+    if (!sessionId) return null;
+    return await atlas.session.findSessionMembers(sessionId);
+  }, [atlas.session, sessionId]);
 
   return useQuery({
     queryFn: findCallMembers,
@@ -1029,21 +1028,20 @@ export function useFindCallMembers(
 }
 
 // a shorthand for some ServerEvent Callback type
-type CallEventsCallback = ServerEventsMap[ServerEvent.MemberJoinedCall];
+type CallEventsCallback = ServerEventsMap[ServerEvent.MemberJoinedSession];
 
 /*
  * Real-time call members state.
  */
-export function useCallMembers(
-  callId: number | null,
-  callType: ICall.Type | null
+export function useSessionMembers(
+  sessionId: ISession.Id | null
 ): number[] {
   const [members, setMembers] = useState<number[]>([]);
 
   const socket = useSocket();
 
   // get the initial list by an http request
-  const query = useFindCallMembers(callId, callType);
+  const query = useFindSessionMembers(sessionId);
 
   useEffect(() => {
     if (query.data && query.isFetching && query.isError) setMembers(query.data);
@@ -1062,32 +1060,32 @@ export function useCallMembers(
   );
 
   // define react callbacks
-  const joinCall = useCallback(() => {
-    if (!socket || !callId || !callType) return;
-    socket.emit(Wss.ClientEvent.JoinCall, { callId, type: callType });
-  }, [socket, callId, callType]);
+  const joinSession = useCallback(() => {
+    if (!socket || !sessionId) return;
+    socket.emit(Wss.ClientEvent.JoinSession, { sessionId });
+  }, [socket, sessionId]);
 
-  const leaveCall = useCallback(() => {
-    if (!socket || !callId || !callType) return;
-    socket.emit(Wss.ClientEvent.LeaveCall, { callId });
-  }, [socket, callId, callType]);
+  const leaveSession = useCallback(() => {
+    if (!socket || !sessionId) return;
+    socket.emit(Wss.ClientEvent.LeaveSession, { sessionId });
+  }, [socket, sessionId]);
 
   useEffect(() => {
     // listen to wss events to modify members list accordingly
     if (!socket) return;
-    socket.on(Wss.ServerEvent.MemberJoinedCall, onMemberJoinWssCallback);
-    socket.on(Wss.ServerEvent.MemberLeftCall, onMemberLeaveWssCallback);
-    joinCall();
+    socket.on(Wss.ServerEvent.MemberJoinedSession, onMemberJoinWssCallback);
+    socket.on(Wss.ServerEvent.MemberLeftSession, onMemberLeaveWssCallback);
+    joinSession();
     return () => {
-      socket.off(Wss.ServerEvent.MemberJoinedCall);
-      socket.off(Wss.ServerEvent.MemberLeftCall);
-      leaveCall();
+      socket.off(Wss.ServerEvent.MemberJoinedSession);
+      socket.off(Wss.ServerEvent.MemberLeftSession);
+      leaveSession();
     };
   }, [
-    callId,
+    sessionId,
     socket,
-    joinCall,
-    leaveCall,
+    joinSession,
+    leaveSession,
     onMemberLeaveWssCallback,
     onMemberJoinWssCallback,
   ]);
diff --git a/packages/models/fixtures/db.ts b/packages/models/fixtures/db.ts
index 3828178a..9a3698b9 100644
--- a/packages/models/fixtures/db.ts
+++ b/packages/models/fixtures/db.ts
@@ -1,5 +1,4 @@
 import {
-  calls,
   hashPassword,
   interviews,
   knex,
@@ -27,6 +26,7 @@ import { Knex } from "knex";
 import dayjs from "@/lib/dayjs";
 import { Time } from "@litespace/sol/time";
 import { availabilitySlots } from "@/availabilitySlot";
+import { randomUUID } from "crypto";
 
 export async function flush() {
   await knex.transaction(async (tx) => {
@@ -37,8 +37,6 @@ export async function flush() {
     await rooms.builder(tx).members.del();
     await rooms.builder(tx).rooms.del();
     await interviews.builder(tx).del();
-    await calls.builder(tx).members.del();
-    await calls.builder(tx).calls.del();
     await lessons.builder(tx).members.del();
     await lessons.builder(tx).lessons.del();
     await interviews.builder(tx).del();
@@ -116,9 +114,8 @@ const or = {
     if (!id) return await tutorManager().then((tutorManager) => tutorManager.id);
     return id;
   },
-  async callId(id?: number): Promise<number> {
-    if (!id) return await calls.create().then((call) => call.id);
-    return id;
+  async sessionId(type: ISession.Type): Promise<ISession.Id> {
+    return `${type}:${randomUUID()}`;
   },
   async ruleId(id?: number): Promise<number> {
     if (!id) return await rule().then((rule) => rule.id);
@@ -145,7 +142,7 @@ export async function lesson(
     const tutor = await or.tutorId(payload?.tutor);
     const student = await or.studentId(payload?.student);
     const data = await lessons.create({
-      call: await or.callId(payload?.call),
+      session: await or.sessionId("lesson"),
       start:
         payload?.timing === "future"
           ? faker.date.future().toISOString()
@@ -171,7 +168,7 @@ export async function interview(payload: Partial<IInterview.CreatePayload>) {
   return await interviews.create({
     interviewer: await or.tutorManagerId(payload.interviewer),
     interviewee: await or.tutorId(payload.interviewee),
-    call: await or.callId(payload.call),
+    session: await or.sessionId("interview"),
     rule: await or.ruleId(payload.rule),
     start: or.start(payload.start),
   });
diff --git a/packages/models/migrations/1716146586880_setup.js b/packages/models/migrations/1716146586880_setup.js
index b3567bbd..51273459 100644
--- a/packages/models/migrations/1716146586880_setup.js
+++ b/packages/models/migrations/1716146586880_setup.js
@@ -18,17 +18,6 @@ exports.up = (pgm) => {
     "tutor-manager",
     "studio",
   ]);
-  pgm.createType("call_event", ["join", "leave"]);
-  pgm.createType("call_recording_status", [
-    "idle",
-    "recording",
-    "recorded",
-    "queued",
-    "empty",
-    "processing",
-    "processed",
-    "processing-failed",
-  ]);
   pgm.createType("user_gender", ["male", "female"]);
   pgm.createType("plan_cycle", ["month", "quarter", "biannual", "year"]);
   pgm.createType("interview_status", [
@@ -143,7 +132,7 @@ exports.up = (pgm) => {
     duration: { type: "SMALLINT", notNull: true },
     price: { type: "INT", notNull: true },
     rule_id: { type: "SERIAL", references: "rules(id)", notNull: true },
-    call_id: { type: "SERIAL", notNull: true, reference: "calls(id)" },
+    session_id: { type: "VARCHAR(50)", notNull: true, primaryKey: true },
     canceled_by: { type: "INT", references: "users(id)", default: null },
     canceled_at: { type: "TIMESTAMP", default: null },
     created_at: { type: "TIMESTAMP", notNull: true },
@@ -162,7 +151,7 @@ exports.up = (pgm) => {
     interviewee_id: { type: "SERIAL", notNull: true, references: "users(id)" },
     interviewer_feedback: { type: "TEXT", default: null },
     interviewee_feedback: { type: "TEXT", default: null },
-    call_id: { type: "SERIAL", notNull: true, reference: "calls(id)" },
+    session_id: { type: "TEXT", notNull: true, primaryKey: true },
     rule_id: { type: "SERIAL", references: "rules(id)", notNull: true },
     note: { type: "TEXT", default: null },
     level: { type: "INT", default: null },
@@ -363,7 +352,6 @@ exports.up = (pgm) => {
   });
 
   // indexes
-  pgm.createIndex("calls", "id");
   pgm.createIndex("lessons", "id");
   pgm.createIndex("rules", "id");
   pgm.createIndex("availability_slots", "id");
@@ -402,7 +390,6 @@ exports.down = (pgm) => {
   pgm.dropIndex("gifts", "id", { ifExists: true });
   pgm.dropIndex("ratings", "id", { ifExists: true });
   pgm.dropIndex("lessons", "id", { ifExists: true });
-  pgm.dropIndex("calls", "id", { ifExists: true });
   pgm.dropIndex("rules", "id", { ifExists: true });
   pgm.dropIndex("tutors", "id", { ifExists: true });
   pgm.dropIndex("users", "id", { ifExists: true });
@@ -427,9 +414,6 @@ exports.down = (pgm) => {
   pgm.dropTable("interviews", { ifExists: true });
   pgm.dropTable("lesson_members", { ifExists: true });
   pgm.dropTable("lessons", { ifExists: true });
-  pgm.dropTable("call_events", { ifExists: true });
-  pgm.dropTable("call_members", { ifExists: true });
-  pgm.dropTable("calls", { ifExists: true });
   pgm.dropTable("rules", { ifExists: true });
   pgm.dropTable("tutors", { ifExists: true });
   pgm.dropTable("users", { ifExists: true });
@@ -438,9 +422,7 @@ exports.down = (pgm) => {
   pgm.dropType("user_role", { ifExists: true });
   pgm.dropType("user_gender", { ifExists: true });
   pgm.dropType("plan_cycle", { ifExists: true });
-  pgm.dropType("call_event", { ifExists: true });
   pgm.dropType("interview_status", { ifExists: true });
-  pgm.dropType("call_recording_status", { ifExists: true });
   pgm.dropType("withdraw_method", { ifExists: true });
   pgm.dropType("invoice_status", { ifExists: true });
 };
diff --git a/packages/models/scripts/seed.ts b/packages/models/scripts/seed.ts
index e5851505..e01d7a79 100644
--- a/packages/models/scripts/seed.ts
+++ b/packages/models/scripts/seed.ts
@@ -4,7 +4,6 @@ import {
   tutors,
   ratings,
   rules,
-  calls,
   plans,
   coupons,
   invites,
@@ -20,7 +19,6 @@ import {
   topics,
 } from "@litespace/models";
 import {
-  ICall,
   IInterview,
   ILesson,
   IUser,
@@ -38,6 +36,7 @@ import utc from "dayjs/plugin/utc";
 import { faker } from "@faker-js/faker/locale/ar";
 import { faker as fakerEn } from "@faker-js/faker/locale/en";
 import "colors";
+import { randomUUID } from "crypto";
 
 dayjs.extend(utc);
 
@@ -331,19 +330,6 @@ async function main(): Promise<void> {
       .toISOString();
   }
 
-  function randomCallRecordingStatus(): ICall.RecordingStatus {
-    return sample([
-      ICall.RecordingStatus.Empty,
-      ICall.RecordingStatus.Idle,
-      ICall.RecordingStatus.Processed,
-      ICall.RecordingStatus.Processing,
-      ICall.RecordingStatus.ProcessingFailed,
-      ICall.RecordingStatus.Queued,
-      ICall.RecordingStatus.Recorded,
-      ICall.RecordingStatus.Recording,
-    ])!;
-  }
-
   const methods = [
     IWithdrawMethod.Type.Wallet,
     IWithdrawMethod.Type.Bank,
@@ -376,11 +362,10 @@ async function main(): Promise<void> {
     start: string;
   }) {
     return await knex.transaction(async (tx: Knex.Transaction) => {
-      const call = await calls.create(tx);
       const duration = sample([ILesson.Duration.Short, ILesson.Duration.Long]);
 
       const { lesson } = await lessons.create({
-        call: call.id,
+        session: `lesson:${randomUUID()}`,
         tutor: tutorId,
         student: student.id,
         price: calculateLessonPrice(price.scale(100), duration),
@@ -422,10 +407,8 @@ async function main(): Promise<void> {
 
   for (const tutor of addedTutors) {
     await knex.transaction(async (tx: Knex.Transaction) => {
-      const call = await calls.create(tx);
-
       const interview = await interviews.create({
-        call: call.id,
+        session: `interview:${randomUUID()}`,
         interviewee: tutor.id,
         interviewer: tutorManager.id,
         start: randomStart(),
diff --git a/packages/models/src/cache/call.ts b/packages/models/src/cache/call.ts
deleted file mode 100644
index a0b2ba36..00000000
--- a/packages/models/src/cache/call.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { CacheBase } from "@/cache/base";
-
-export class Call extends CacheBase {
-  private readonly prefixes = {
-    call: "call",
-    user: "user:call",
-  };
-  private ttl = 60 * 60; // 1 hour
-
-  withTtl(ttl: number): Call {
-    this.ttl = ttl;
-    return this;
-  }
-
-  async addMember({ callId, userId }: { callId: number; userId: number }) {
-    const callKey = this.asCallKey(callId);
-    const userKey = this.asUserKey(userId);
-    await this.client
-      .multi()
-      .sAdd(callKey, this.encode(userId))
-      .set(userKey, this.encode(callId))
-      .expire(callKey, this.ttl)
-      .expire(userKey, this.ttl)
-      .exec();
-  }
-
-  async removeMember({ callId, userId }: { callId: number; userId: number }) {
-    await this.client
-      .multi()
-      .sRem(this.asCallKey(callId), userId.toString())
-      .del(this.asUserKey(userId))
-      .exec();
-  }
-
-  async removeMemberByUserId(userId: number): Promise<number | null> {
-    const result = await this.client.get(this.asUserKey(userId));
-    if (!result) return null;
-    const callId = this.decode(result) as number;
-    await this.removeMember({ callId, userId });
-    return callId;
-  }
-
-  async getMembers(callId: number): Promise<number[]> {
-    const result = await this.client.sMembers(this.asCallKey(callId));
-    return result.map((value) => this.decode(value));
-  }
-
-  async isMember({
-    callId,
-    userId,
-  }: {
-    callId: number;
-    userId: number;
-  }): Promise<boolean> {
-    return await this.client.sIsMember(
-      this.asCallKey(callId),
-      this.encode(userId)
-    );
-  }
-
-  private asCallKey(callId: number): string {
-    return `${this.prefixes.call}:${callId}`;
-  }
-
-  private asUserKey(userId: number): string {
-    return `${this.prefixes.user}:${userId}`;
-  }
-}
diff --git a/packages/models/src/cache/index.ts b/packages/models/src/cache/index.ts
index fe88d06b..b97b0b4c 100644
--- a/packages/models/src/cache/index.ts
+++ b/packages/models/src/cache/index.ts
@@ -2,13 +2,13 @@ import { createClient } from "redis";
 import { Tutors } from "@/cache/tutors";
 import { RedisClient } from "@/cache/base";
 import { Peer } from "@/cache/peer";
-import { Call } from "@/cache/call";
+import { Session } from "@/cache/session";
 import { OnlineStatus } from "@/cache/onlineStatus";
 
 export class Cache {
   public tutors: Tutors;
   public peer: Peer;
-  public call: Call;
+  public session: Session;
   public onlineStatus: OnlineStatus;
   private readonly client: RedisClient;
 
@@ -17,7 +17,7 @@ export class Cache {
     this.client = client;
     this.tutors = new Tutors(client);
     this.peer = new Peer(client);
-    this.call = new Call(client);
+    this.session = new Session(client);
     this.onlineStatus = new OnlineStatus(client);
   }
 
diff --git a/packages/models/src/cache/peer.ts b/packages/models/src/cache/peer.ts
index 43866d16..3721a70a 100644
--- a/packages/models/src/cache/peer.ts
+++ b/packages/models/src/cache/peer.ts
@@ -10,8 +10,8 @@ export class Peer extends CacheBase {
     });
   }
 
-  async setGhostPeerId(call: number, peer: string) {
-    await this.client.set(this.asGhostField(call), peer, {
+  async setGhostPeerId(session: string, peer: string) {
+    await this.client.set(this.asGhostField(session), peer, {
       EX: this.ttl,
     });
   }
@@ -20,23 +20,23 @@ export class Peer extends CacheBase {
     return await this.client.get(this.asUserField(user));
   }
 
-  async getGhostPeerId(call: number): Promise<string | null> {
-    return await this.client.get(this.asGhostField(call));
+  async getGhostPeerId(session: string): Promise<string | null> {
+    return await this.client.get(this.asGhostField(session));
   }
 
   async removeUserPeerId(user: number) {
     await this.client.del(this.asUserField(user));
   }
 
-  async removeGhostPeerId(call: number) {
-    await this.client.del(this.asGhostField(call));
+  async removeGhostPeerId(session: string) {
+    await this.client.del(this.asGhostField(session));
   }
 
   asUserField(user: number): string {
     return [this.prefix, user].join(":");
   }
 
-  asGhostField(call: number): string {
-    return [this.prefix, "ghost", call].join(":");
+  asGhostField(session: string): string {
+    return [this.prefix, "ghost", session].join(":");
   }
 }
diff --git a/packages/models/src/cache/session.ts b/packages/models/src/cache/session.ts
new file mode 100644
index 00000000..54a54069
--- /dev/null
+++ b/packages/models/src/cache/session.ts
@@ -0,0 +1,70 @@
+import { CacheBase } from "@/cache/base";
+import { asSessionId } from "@/lib/utils";
+import { ISession } from "@litespace/types";
+
+export class Session extends CacheBase {
+  private readonly prefixes = {
+    session: "session",
+    user: "user:session",
+  };
+  private ttl = 60 * 60; // 1 hour
+
+  withTtl(ttl: number): Session {
+    this.ttl = ttl;
+    return this;
+  }
+
+  async addMember({ sessionId, userId }: { sessionId: ISession.Id; userId: number }) {
+    const sessionKey = this.asSessionKey(sessionId);
+    const userKey = this.asUserKey(userId);
+    await this.client
+      .multi()
+      .sAdd(sessionKey, this.encode(userId))
+      .set(userKey, this.encode(sessionId))
+      .expire(sessionKey, this.ttl)
+      .expire(userKey, this.ttl)
+      .exec();
+  }
+
+  async removeMember({ sessionId, userId }: { sessionId: ISession.Id; userId: number }) {
+    await this.client
+      .multi()
+      .sRem(this.asSessionKey(sessionId), userId.toString())
+      .del(this.asUserKey(userId))
+      .exec();
+  }
+
+  async removeMemberByUserId(userId: number): Promise<string | null> {
+    const result = await this.client.get(this.asUserKey(userId));
+    if (!result) return null;
+    const sessionId = asSessionId(this.decode(result));
+    await this.removeMember({ sessionId, userId });
+    return sessionId;
+  }
+
+  async getMembers(sessionId: ISession.Id): Promise<number[]> {
+    const result = await this.client.sMembers(this.asSessionKey(sessionId));
+    return result.map((value) => this.decode(value));
+  }
+
+  async isMember({
+    sessionId,
+    userId,
+  }: {
+    sessionId: ISession.Id;
+    userId: number;
+  }): Promise<boolean> {
+    return await this.client.sIsMember(
+      this.asSessionKey(sessionId),
+      this.encode(userId)
+    );
+  }
+
+  private asSessionKey(sessionId: string): string {
+    return `${this.prefixes.session}:${sessionId}`;
+  }
+
+  private asUserKey(userId: number): string {
+    return `${this.prefixes.user}:${userId}`;
+  }
+}
diff --git a/packages/models/src/calls.ts b/packages/models/src/calls.ts
deleted file mode 100644
index 455279b3..00000000
--- a/packages/models/src/calls.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-import {
-  addSqlMinutes,
-  aggArrayOrder,
-  column,
-  countRows,
-  knex,
-  WithOptionalTx,
-  withSkippablePagination,
-} from "@/query";
-import { first, isEmpty, sortBy } from "lodash";
-import { ICall, IFilter, Paginated } from "@litespace/types";
-import { Knex } from "knex";
-import { users } from "@/users";
-import dayjs from "@/lib/dayjs";
-import { lessons } from "@/lessons";
-import { interviews } from "@/interviews";
-
-export class Calls {
-  tables = { calls: "calls", members: "call_members" } as const;
-  columns = {
-    calls: (value: keyof ICall.Row) => column(value, this.tables.calls),
-    members: (value: keyof ICall.MemberRow) =>
-      column(value, this.tables.members),
-  };
-
-  rows: { calls: Record<keyof ICall.Row, string> } = {
-    calls: {
-      id: this.columns.calls("id"),
-      recording_status: this.columns.calls("recording_status"),
-      processing_time: this.columns.calls("processing_time"),
-      created_at: this.columns.calls("created_at"),
-      updated_at: this.columns.calls("updated_at"),
-    },
-  } as const;
-
-  async create(tx?: Knex.Transaction): Promise<ICall.Self> {
-    const now = dayjs.utc().toDate();
-    const rows = await this.builder(tx)
-      .calls.insert({ created_at: now, updated_at: now })
-      .returning("*");
-
-    const row = first(rows);
-    if (!row) throw new Error("Call not found; should never happen");
-    return this.from(row);
-  }
-
-  async addMember({
-    callId,
-    userId,
-    tx,
-  }: WithOptionalTx<{
-    callId: number;
-    userId: number;
-  }>): Promise<ICall.Member> {
-    const rows = await this.builder(tx)
-      .members.insert({
-        call_id: callId,
-        user_id: userId,
-      })
-      .returning("*");
-
-    const row = first(rows);
-    if (!row) throw new Error("Call member not found; should never happen");
-    return this.asMember(row);
-  }
-
-  async removeMember({
-    callId,
-    userId,
-    tx,
-  }: WithOptionalTx<{ userId: number; callId: number }>): Promise<void> {
-    await this.builder(tx)
-      .members.where(this.columns.members("call_id"), callId)
-      .andWhere(this.columns.members("user_id"), userId)
-      .delete();
-  }
-
-  async update({
-    ids,
-    payload,
-    tx,
-  }: {
-    ids: number[];
-    payload: ICall.UpdatePayload;
-    tx?: Knex.Transaction;
-  }): Promise<void> {
-    const now = dayjs.utc().toDate();
-    await this.builder(tx)
-      .calls.update({
-        recording_status: payload.recordingStatus,
-        processing_time: payload.processingTime,
-        updated_at: now,
-      })
-      .whereIn(this.columns.calls("id"), ids);
-  }
-
-  async findCallsByRecordingStatus(
-    status: ICall.RecordingStatus,
-    tx?: Knex.Transaction
-  ): Promise<ICall.Self[]> {
-    const rows = await this.builder(tx)
-      .calls.select(this.rows.calls)
-      .where(this.columns.calls("recording_status"), status);
-    return rows.map((row) => this.from(row));
-  }
-
-  async findById(
-    id: number,
-    tx?: Knex.Transaction
-  ): Promise<ICall.Self | null> {
-    const rows = await this.builder(tx)
-      .calls.select("*")
-      .where(this.columns.calls("id"), id);
-    const row = first(rows);
-    if (!row) return null;
-    return this.from(row);
-  }
-
-  async findByIds(ids: number[], tx?: Knex.Transaction): Promise<ICall.Self[]> {
-    const rows = await this.builder(tx)
-      .calls.select("*")
-      .whereIn(this.columns.calls("id"), ids);
-    return rows.map((row) => this.from(row));
-  }
-
-  async findCallMembers(
-    callIds: number[],
-    tx?: Knex.Transaction
-  ): Promise<ICall.PopuldatedMember[]> {
-    const selectRow: Record<keyof ICall.PopuldatedMemberRow, string> = {
-      call_id: this.columns.members("call_id"),
-      user_id: users.column("id"),
-      name: users.column("name"),
-      image: users.column("image"),
-      role: users.column("role"),
-    };
-
-    const rows = await users
-      .builder(tx)
-      .select<ICall.PopuldatedMemberRow[]>(selectRow)
-      .join(
-        this.tables.members,
-        this.columns.members("user_id"),
-        users.column("id")
-      )
-      .whereIn(this.columns.members("call_id"), callIds);
-
-    return rows.map((row) => this.asPopulatedMember(row));
-  }
-
-  /**
-   * @param users list of user ids
-   * @param after ISO UTC datetime - All calls after this date will be included (inclusive)
-   * @param before ISO UTC datetime - All calls before this date will be included (inclusive)
-   */
-  async find({
-    users = [],
-    after,
-    before,
-    tx,
-    ...pagination
-  }: IFilter.SkippablePagination &
-    WithOptionalTx<{
-      users?: number[];
-      after?: string;
-      before?: string;
-    }>): Promise<Paginated<ICall.Self>> {
-    const selectColumns: Record<keyof ICall.Row, string> = {
-      id: this.columns.calls("id"),
-      recording_status: this.columns.calls("recording_status"),
-      processing_time: this.columns.calls("processing_time"),
-      created_at: this.columns.calls("created_at"),
-      updated_at: this.columns.calls("updated_at"),
-    };
-
-    const baseBuilder = this.builder(tx)
-      .calls.select<ICall.Row[]>(selectColumns)
-      .fullOuterJoin(
-        lessons.table.lessons,
-        lessons.columns.lessons("call_id"),
-        calls.columns.calls("id")
-      )
-      .fullOuterJoin(
-        lessons.table.members,
-        lessons.columns.members("lesson_id"),
-        lessons.columns.lessons("id")
-      )
-      .fullOuterJoin(
-        interviews.table,
-        interviews.column("call_id"),
-        calls.columns.calls("id")
-      )
-      .groupBy(this.columns.calls("id"));
-
-    if (!isEmpty(users))
-      baseBuilder.where((builder) => {
-        builder
-          .whereIn(lessons.columns.members("user_id"), users)
-          .orWhereIn(interviews.column("interviewer_id"), users)
-          .orWhereIn(interviews.column("interviewee_id"), users);
-      });
-
-    if (after)
-      baseBuilder.where((builder) => {
-        builder
-          .andWhere(
-            addSqlMinutes(
-              lessons.columns.lessons("start"),
-              lessons.columns.lessons("duration")
-            ),
-            ">=",
-            dayjs.utc(after).toDate()
-          )
-          .orWhere(
-            interviews.column("start"),
-            ">=",
-            // todo: unmatic this number (30 minutes)
-            dayjs.utc(after).subtract(30, "minutes").toDate()
-          );
-      });
-
-    if (before)
-      baseBuilder.where((builder) => {
-        builder
-          .andWhere(
-            addSqlMinutes(
-              lessons.columns.lessons("start"),
-              lessons.columns.lessons("duration")
-            ),
-            "<=",
-            dayjs.utc(before).toDate()
-          )
-          .orWhere(
-            interviews.column("start"),
-            "<=",
-            // todo: unmatic this number (30 minutes)
-            dayjs.utc(before).subtract(30, "minutes")
-          );
-      });
-
-    const total = await countRows(baseBuilder.clone(), {
-      column: this.columns.calls("id"),
-    });
-
-    const rows = await withSkippablePagination(baseBuilder.clone(), pagination);
-
-    return { list: rows.map((row) => this.from(row)), total };
-  }
-
-  /**
-   * @deprecated should be removed because of the new data models.
-   */
-  async findCallByMembers(members: number[], tx?: Knex.Transaction) {
-    // todo: add other call attrs
-    const rows: Pick<ICall.MemberRow, "call_id">[] = await this.builder(tx)
-      .members.select("call_id")
-      .groupBy("call_id")
-      .havingRaw(aggArrayOrder(this.columns.members("user_id")), [
-        sortBy(members),
-      ]);
-
-    const row = first(rows);
-    if (!row) return null;
-    return row.call_id;
-  }
-
-  from(row: ICall.Row): ICall.Self {
-    return {
-      id: row.id,
-      recordingStatus: row.recording_status,
-      processingTime: row.processing_time,
-      createdAt: row.created_at.toISOString(),
-      updatedAt: row.updated_at.toISOString(),
-    };
-  }
-
-  asMember(row: ICall.MemberRow): ICall.Member {
-    return { userId: row.user_id, callId: row.call_id };
-  }
-
-  asPopulatedMember(row: ICall.PopuldatedMemberRow): ICall.PopuldatedMember {
-    return {
-      callId: row.call_id,
-      userId: row.user_id,
-      name: row.name,
-      image: row.image,
-      role: row.role,
-    };
-  }
-
-  builder(tx?: Knex.Transaction) {
-    return {
-      calls: tx
-        ? tx<ICall.Row>(this.tables.calls).clone()
-        : knex<ICall.Row>(this.tables.calls).clone(),
-      members: tx
-        ? tx<ICall.MemberRow>(this.tables.members).clone()
-        : knex<ICall.MemberRow>(this.tables.members).clone(),
-    };
-  }
-}
-
-export const calls = new Calls();
diff --git a/packages/models/src/index.ts b/packages/models/src/index.ts
index 71c67175..d52b615a 100644
--- a/packages/models/src/index.ts
+++ b/packages/models/src/index.ts
@@ -1,4 +1,3 @@
-export { calls } from "@/calls";
 export { coupons } from "@/coupons";
 export { interviews } from "@/interviews";
 export { invites } from "@/invites";
diff --git a/packages/models/src/interviews.ts b/packages/models/src/interviews.ts
index fcaea7cc..cf07736c 100644
--- a/packages/models/src/interviews.ts
+++ b/packages/models/src/interviews.ts
@@ -1,4 +1,4 @@
-import { IFilter, IInterview, Paginated } from "@litespace/types";
+import { IFilter, IInterview, ISession, Paginated } from "@litespace/types";
 import {
   column,
   countRows,
@@ -9,6 +9,7 @@ import {
 import { first, isEmpty } from "lodash";
 import dayjs from "@/lib/dayjs";
 import { Knex } from "knex";
+import { users } from "@/users";
 
 export class Interviews {
   readonly table = "interviews" as const;
@@ -21,7 +22,7 @@ export class Interviews {
     interviewer_feedback: this.column("interviewer_feedback"),
     interviewee_feedback: this.column("interviewee_feedback"),
     rule_id: this.column("rule_id"),
-    call_id: this.column("call_id"),
+    session_id: this.column("session_id"),
     note: this.column("note"),
     level: this.column("level"),
     status: this.column("status"),
@@ -42,7 +43,7 @@ export class Interviews {
         start: dayjs.utc(payload.start).toDate(),
         interviewer_id: payload.interviewer,
         interviewee_id: payload.interviewee,
-        call_id: payload.call,
+        session_id: payload.session,
         rule_id: payload.rule,
         created_at: now,
         updated_at: now,
@@ -104,8 +105,37 @@ export class Interviews {
     return await this.findOneBy("id", id);
   }
 
-  async findByCallId(id: number): Promise<IInterview.Self | null> {
-    return await this.findOneBy("call_id", id);
+  async findBySessionId(id: ISession.Id): Promise<IInterview.Self | null> {
+    return await this.findOneBy("session_id", id);
+  }
+
+  async findSessionMembers(
+    sessionId: string,
+    tx?: Knex.Transaction
+  ): Promise<ISession.PopuldatedMember[]> {
+    const select: Record<keyof ISession.PopuldatedMemberRow, string> = {
+      user_id: users.column("id"),
+      session_id: this.columns.session_id,
+      name: users.column("name"),
+      image: users.column("image"),
+      role: users.column("role"),
+    };
+
+    const rows: ISession.PopuldatedMemberRow[] = await this.builder(tx)
+      .select<ISession.PopuldatedMemberRow[]>(select)
+      .join(
+        users.table,
+        users.column("id"),
+        this.column("interviewer_id")
+      )
+      .join(
+        users.table,
+        users.column("id"),
+        this.column("interviewee_id")
+      )
+      .where(this.column("session_id"), sessionId);
+
+    return rows.map((row) => this.asSessionPopulatedMember(row));
   }
 
   async findByInterviewee(id: number): Promise<IInterview.Self[]> {
@@ -188,8 +218,9 @@ export class Interviews {
         interviewer: row.interviewer_id,
         interviewee: row.interviewee_id,
         rule: row.rule_id,
-        call: row.call_id,
+        session: row.session_id,
       },
+      sessionId: row.session_id,
       feedback: {
         interviewer: row.interviewer_feedback,
         interviewee: row.interviewee_feedback,
@@ -206,6 +237,18 @@ export class Interviews {
     };
   }
 
+  asSessionPopulatedMember(
+    row: ISession.PopuldatedMemberRow
+  ): ISession.PopuldatedMember {
+    return {
+      sessionId: row.session_id,
+      userId: row.user_id,
+      name: row.name,
+      image: row.image,
+      role: row.role,
+    };
+  }
+
   builder(tx?: Knex.Transaction) {
     return tx
       ? tx<IInterview.Row>(this.table).clone()
diff --git a/packages/models/src/lessons.ts b/packages/models/src/lessons.ts
index 8731bb22..c567d87f 100644
--- a/packages/models/src/lessons.ts
+++ b/packages/models/src/lessons.ts
@@ -1,4 +1,4 @@
-import { IFilter, ILesson, NumericString, Paginated } from "@litespace/types";
+import { IFilter, ILesson, ISession, NumericString, Paginated } from "@litespace/types";
 import { Knex } from "knex";
 import dayjs from "@/lib/dayjs";
 import { concat, first, isEmpty, orderBy } from "lodash";
@@ -13,7 +13,6 @@ import {
   WithTx,
   withSkippablePagination,
 } from "@/query";
-import { calls } from "@/calls";
 import zod from "zod";
 
 type SearchFilter = {
@@ -83,7 +82,7 @@ export class Lessons {
       duration: this.columns.lessons("duration"),
       price: this.columns.lessons("price"),
       rule_id: this.columns.lessons("rule_id"),
-      call_id: this.columns.lessons("call_id"),
+      session_id: this.columns.lessons("session_id"),
       canceled_by: this.columns.lessons("canceled_by"),
       canceled_at: this.columns.lessons("canceled_at"),
       created_at: this.columns.lessons("created_at"),
@@ -103,7 +102,7 @@ export class Lessons {
         start: dayjs.utc(payload.start).toDate(),
         duration: payload.duration,
         rule_id: payload.rule,
-        call_id: payload.call,
+        session_id: payload.session,
         price: payload.price,
         created_at: now,
         updated_at: now,
@@ -164,8 +163,8 @@ export class Lessons {
     return rows.map((row) => this.from(row));
   }
 
-  async findByCallId(id: number): Promise<ILesson.Self | null> {
-    return await this.findOneBy("call_id", id);
+  async findBySessionId(id: ISession.Id): Promise<ILesson.Self | null> {
+    return await this.findOneBy("session_id", id);
   }
 
   async findById(id: number): Promise<ILesson.Self | null> {
@@ -197,6 +196,36 @@ export class Lessons {
     return rows.map((row) => this.asPopulatedMember(row));
   }
 
+  async findSessionMembers(
+    sessionId: string,
+    tx?: Knex.Transaction
+  ): Promise<ISession.PopuldatedMember[]> {
+    const select: Record<keyof ISession.PopuldatedMemberRow, string> = {
+      user_id: users.column("id"),
+      session_id: this.columns.lessons("session_id"),
+      name: users.column("name"),
+      image: users.column("image"),
+      role: users.column("role"),
+    };
+
+    const rows: ISession.PopuldatedMemberRow[] = await users
+      .builder(tx)
+      .select<ISession.PopuldatedMemberRow[]>(select)
+      .join(
+        this.table.members,
+        this.columns.members("user_id"),
+        users.column("id")
+      )
+      .join(
+        this.table.lessons,
+        this.columns.lessons("id"),
+        this.columns.members("lesson_id")
+      )
+      .where(this.columns.lessons("session_id"), sessionId)
+
+    return rows.map((row) => this.asSessionPopulatedMember(row));
+  }
+
   async findLessonsByMembers(
     members: number[],
     tx?: Knex.Transaction
@@ -281,12 +310,7 @@ export class Lessons {
     users,
     tx,
   }: AggregateParams) {
-    const base = this.builder(tx)
-      .lessons.join(
-        calls.tables.calls,
-        calls.columns.calls("id"),
-        this.columns.lessons("call_id")
-      )
+    const base = this.builder(tx).lessons
       .sum(column, { as: "total" });
 
     const filter: SearchFilter = {
@@ -317,11 +341,7 @@ export class Lessons {
     distinct = false,
     ...filter
   }: AggregateParams & { distinct?: boolean }) {
-    const base = this.builder(tx).lessons.join(
-      calls.tables.calls,
-      calls.columns.calls("id"),
-      this.columns.lessons("call_id")
-    );
+    const base = this.builder(tx).lessons;
 
     const countQueryBuilder = this.applySearchFilter(base, filter);
     return await countRows(countQueryBuilder, { column, distinct });
@@ -533,7 +553,7 @@ export class Lessons {
       duration: row.duration,
       price: row.price,
       ruleId: row.rule_id,
-      callId: row.call_id,
+      sessionId: row.session_id,
       canceledBy: row.canceled_by,
       canceledAt: row.canceled_at ? row.canceled_at.toISOString() : null,
       createdAt: row.created_at.toISOString(),
@@ -557,6 +577,18 @@ export class Lessons {
     };
   }
 
+  asSessionPopulatedMember(
+    row: ISession.PopuldatedMemberRow
+  ): ISession.PopuldatedMember {
+    return {
+      sessionId: row.session_id,
+      userId: row.user_id,
+      name: row.name,
+      image: row.image,
+      role: row.role,
+    };
+  }
+
   builder(tx?: Knex.Transaction): Builder {
     return {
       lessons: tx
diff --git a/packages/models/src/lib/utils.ts b/packages/models/src/lib/utils.ts
new file mode 100644
index 00000000..ae3cfffd
--- /dev/null
+++ b/packages/models/src/lib/utils.ts
@@ -0,0 +1,12 @@
+import { ISession } from "@litespace/types";
+import { randomUUID } from "crypto";
+
+export function asSessionId(id: string) {
+  if (!id.startsWith("lesson:") && !id.startsWith("interview:"))
+    throw Error("Invalid session id.")
+  return id as ISession.Id;
+}
+
+export function genSessionId(type: ISession.Type): ISession.Id {
+  return `${type}:${randomUUID()}`;
+}
diff --git a/packages/models/tests/cache/call.test.ts b/packages/models/tests/cache/call.test.ts
deleted file mode 100644
index 82558baf..00000000
--- a/packages/models/tests/cache/call.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { cache } from "@fixtures/cache";
-import { expect } from "chai";
-
-describe("Testing cache/call functions", () => {
-  beforeAll(async () => {
-    await cache.connect();
-  });
-
-  afterAll(async () => {
-    await cache.disconnect();
-  });
-
-  beforeEach(async () => {
-    await cache.flush();
-  });
-
-  it("should add/retrieve members to/from the cache", async () => {
-    await cache.call.addMember({ callId: 1, userId: 1 });
-    await cache.call.addMember({ callId: 1, userId: 2 });
-    await cache.call.addMember({ callId: 2, userId: 3 });
-
-    const res1 = await cache.call.getMembers(1);
-    expect(res1).to.have.length(2);
-    expect(res1).to.contains(1);
-    expect(res1).to.contains(2);
-
-    const res2 = await cache.call.getMembers(2);
-    expect(res2).to.have.length(1);
-    expect(res2).to.contains(3);
-  });
-
-  it("should NOT add (duplicate) the same user to the same call twice", async () => {
-    await cache.call.addMember({ callId: 1, userId: 1 });
-    await cache.call.addMember({ callId: 1, userId: 1 });
-
-    const res = await cache.call.getMembers(1);
-    expect(res).to.have.length(1);
-  });
-
-  it("should remove member from the cache", async () => {
-    await cache.call.addMember({ callId: 1, userId: 1 });
-    await cache.call.addMember({ callId: 1, userId: 2 });
-
-    await cache.call.removeMemberByUserId(1);
-
-    const res = await cache.call.getMembers(1);
-    expect(res).to.deep.eq([2]);
-  });
-
-  it("should check if a specific member exists in the cache", async () => {
-    await cache.call.addMember({ callId: 1, userId: 1 });
-    await cache.call.addMember({ callId: 1, userId: 2 });
-
-    const res1 = await cache.call.isMember({ callId: 1, userId: 1 });
-    const res2 = await cache.call.isMember({ callId: 1, userId: 3 });
-    const res3 = await cache.call.isMember({ callId: 2, userId: 2 });
-
-    expect(res1).to.true;
-    expect(res2).to.false;
-    expect(res3).to.false;
-  });
-});
diff --git a/packages/models/tests/cache/peer.test.ts b/packages/models/tests/cache/peer.test.ts
index 65b3f08b..931024e6 100644
--- a/packages/models/tests/cache/peer.test.ts
+++ b/packages/models/tests/cache/peer.test.ts
@@ -1,4 +1,5 @@
 import { cache } from "@fixtures/cache";
+import { genSessionId } from "@litespace/sol";
 import { expect } from "chai";
 
 describe("Testing cache/peer functions", () => {
@@ -21,19 +22,21 @@ describe("Testing cache/peer functions", () => {
   });
 
   it("should set/retrieve ghost peer id in/from the cache", async () => {
-    await cache.peer.setGhostPeerId(1, "testing");
-    const res = await cache.peer.getGhostPeerId(1);
+    const sessId = genSessionId('lesson');
+    await cache.peer.setGhostPeerId(sessId, "testing");
+    const res = await cache.peer.getGhostPeerId(sessId);
     expect(res).to.eq("testing");
   });
 
   it("should NOT exist overridding between the ghost and the user", async () => {
-    await cache.peer.setGhostPeerId(1, "dump");
+    const sessId = genSessionId('lesson');
+    await cache.peer.setGhostPeerId(sessId, "dump");
     // checking if user overrides the ghost or vice versa
     await cache.peer.setUserPeerId(1, "user testing");
-    await cache.peer.setGhostPeerId(1, "ghost testing");
+    await cache.peer.setGhostPeerId(sessId, "ghost testing");
 
     const res1 = await cache.peer.getUserPeerId(1);
-    const res2 = await cache.peer.getGhostPeerId(1);
+    const res2 = await cache.peer.getGhostPeerId(sessId);
 
     expect(res1).to.eq("user testing");
     expect(res2).to.eq("ghost testing");
@@ -47,9 +50,10 @@ describe("Testing cache/peer functions", () => {
   });
 
   it("should remove ghost peer id from the cache", async () => {
-    await cache.peer.setGhostPeerId(1, "testing");
-    await cache.peer.removeGhostPeerId(1);
-    const res = await cache.peer.getGhostPeerId(1);
+    const sessId = genSessionId('lesson');
+    await cache.peer.setGhostPeerId(sessId, "testing");
+    await cache.peer.removeGhostPeerId(sessId);
+    const res = await cache.peer.getGhostPeerId(sessId);
     expect(res).to.eq(null);
   });
 });
diff --git a/packages/models/tests/cache/session.test.ts b/packages/models/tests/cache/session.test.ts
new file mode 100644
index 00000000..61b02cb6
--- /dev/null
+++ b/packages/models/tests/cache/session.test.ts
@@ -0,0 +1,69 @@
+import { cache } from "@fixtures/cache";
+import { genSessionId } from "@/lib/utils";
+import { expect } from "chai";
+
+describe("Testing cache/session functions", () => {
+  beforeAll(async () => {
+    await cache.connect();
+  });
+
+  afterAll(async () => {
+    await cache.disconnect();
+  });
+
+  beforeEach(async () => {
+    await cache.flush();
+  });
+
+  it("should add/retrieve members to/from the cache", async () => {
+    const session1 = genSessionId("lesson");
+    const session2 = genSessionId("lesson");
+
+    await cache.session.addMember({ sessionId: session1, userId: 1 });
+    await cache.session.addMember({ sessionId: session1, userId: 2 });
+    await cache.session.addMember({ sessionId: session2, userId: 3 });
+
+    const res1 = await cache.session.getMembers(session1);
+    expect(res1).to.have.length(2);
+    expect(res1).to.contains(1);
+    expect(res1).to.contains(2);
+
+    const res2 = await cache.session.getMembers(session2);
+    expect(res2).to.have.length(1);
+    expect(res2).to.contains(3);
+  });
+
+  it("should NOT add (duplicate) the same user to the same call twice", async () => {
+    const sessionId = genSessionId("lesson");
+    await cache.session.addMember({ sessionId, userId: 1 });
+    await cache.session.addMember({ sessionId, userId: 1 });
+
+    const res = await cache.session.getMembers(sessionId);
+    expect(res).to.have.length(1);
+  });
+
+  it("should remove member from the cache", async () => {
+    const sessionId = genSessionId("lesson");
+    await cache.session.addMember({ sessionId, userId: 1 });
+    await cache.session.addMember({ sessionId, userId: 2 });
+
+    await cache.session.removeMemberByUserId(1);
+
+    const res = await cache.session.getMembers(sessionId);
+    expect(res).to.deep.eq([2]);
+  });
+
+  it("should check if a specific member exists in the cache", async () => {
+    const sessionId = genSessionId("lesson");
+    await cache.session.addMember({ sessionId, userId: 1 });
+    await cache.session.addMember({ sessionId, userId: 2 });
+
+    const res1 = await cache.session.isMember({ sessionId, userId: 1 });
+    const res2 = await cache.session.isMember({ sessionId, userId: 3 });
+    const res3 = await cache.session.isMember({ sessionId: genSessionId("lesson"), userId: 2 });
+
+    expect(res1).to.true;
+    expect(res2).to.false;
+    expect(res3).to.false;
+  });
+});
diff --git a/packages/models/tests/calls.test.ts b/packages/models/tests/calls.test.ts
deleted file mode 100644
index b11b14cf..00000000
--- a/packages/models/tests/calls.test.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { calls, Calls } from "@/calls";
-import fixtures, { flush } from "@fixtures/db";
-import { nameof } from "@litespace/sol/utils";
-import { expect } from "chai";
-import dayjs from "@/lib/dayjs";
-
-describe(nameof(Calls), () => {
-  beforeEach(async () => {
-    return await flush();
-  });
-
-  describe(nameof(calls.create), () => {
-    it("should insert new call row", async () => {
-      const call = await calls.create();
-      expect(dayjs.utc(call.createdAt).isValid()).to.be.true;
-      expect(dayjs.utc(call.updatedAt).isValid()).to.be.true;
-      expect(call.processingTime).to.be.eq(null);
-      expect(call.recordingStatus).to.be.eq("idle");
-    });
-  });
-
-  describe(nameof(calls.addMember), () => {
-    it("should add member to the call", async () => {
-      const call = await calls.create();
-      const tutor = await fixtures.tutor();
-
-      expect(await calls.findCallMembers([call.id])).to.be.of.length(0);
-
-      const member = await calls.addMember({
-        callId: call.id,
-        userId: tutor.id,
-      });
-      expect(await calls.findCallMembers([call.id])).to.be.of.length(1);
-      expect(member.callId).to.be.eq(call.id);
-      expect(member.userId).to.be.eq(tutor.id);
-    });
-  });
-
-  describe(nameof(calls.removeMember), () => {
-    it("should remove member from the call", async () => {
-      const call = await calls.create();
-      const tutor = await fixtures.tutor();
-
-      expect(await calls.findCallMembers([call.id])).to.be.of.length(0);
-
-      await calls.addMember({
-        callId: call.id,
-        userId: tutor.id,
-      });
-
-      expect(await calls.findCallMembers([call.id])).to.be.of.length(1);
-
-      await calls.removeMember({
-        callId: call.id,
-        userId: tutor.id,
-      });
-
-      expect(await calls.findCallMembers([call.id])).to.be.of.length(0);
-    });
-  });
-
-  describe(nameof(calls.find), () => {
-    it("should retrieve list of calls for specific user", async () => {
-      const tutor = await fixtures.tutor();
-      const lesson = await fixtures.lesson({
-        tutor: tutor.id,
-      });
-
-      const interview = await fixtures.interview({
-        interviewee: tutor.id,
-      });
-
-      const result = await calls.find({
-        users: [tutor.id],
-        full: true,
-      });
-      expect(result.list.length).to.be.eq(2);
-      expect(result.list.map((call) => call.id)).to.be.deep.eq([
-        lesson.lesson.callId,
-        interview.ids.call,
-      ]);
-    });
-
-    it("should filter calls between two dates", async () => {
-      const tutor = await fixtures.tutor();
-
-      const firstLesson = await fixtures.lesson({
-        tutor: tutor.id,
-        start: dayjs.utc().subtract(1, "hour").toISOString(),
-        duration: 30,
-      });
-
-      const secondLesson = await fixtures.lesson({
-        tutor: tutor.id,
-        start: dayjs.utc().add(30, "minutes").toISOString(),
-        duration: 30,
-      });
-
-      const tests = [
-        {
-          after: dayjs.utc().toISOString(),
-          count: 1,
-        },
-        {
-          after: dayjs.utc().subtract(45, "minutes").toISOString(),
-          count: 2,
-        },
-        {
-          after: dayjs.utc().add(1, "hour").toISOString(),
-          count: 0,
-        },
-        {
-          after: dayjs.utc().add(45, "minute").toISOString(),
-          count: 1,
-        },
-        {
-          before: dayjs.utc().toISOString(),
-          count: 1,
-        },
-        {
-          before: dayjs.utc().add(1, "day").toISOString(),
-          count: 2,
-        },
-      ];
-
-      for (const test of tests) {
-        const result = await calls.find({
-          users: [tutor.id],
-          full: true,
-          after: test.after,
-          before: test.before,
-        });
-        expect(result.list.length).to.be.eq(test.count);
-      }
-    });
-  });
-});
diff --git a/packages/models/tests/lessons.test.ts b/packages/models/tests/lessons.test.ts
index 166e8ff8..f7586def 100644
--- a/packages/models/tests/lessons.test.ts
+++ b/packages/models/tests/lessons.test.ts
@@ -1,7 +1,7 @@
 import { lessons } from "@/index";
 import { expect } from "chai";
 import fixtures, { MakeLessonsReturn } from "@fixtures/db";
-import { ILesson, ITutor, IUser } from "@litespace/types";
+import { ILesson, ITutor } from "@litespace/types";
 import { price } from "@litespace/sol/value";
 import { nameof } from "@litespace/sol/utils";
 import { concat, entries, first, sum } from "lodash";
diff --git a/packages/sol/package.json b/packages/sol/package.json
index 8228ab3a..ab2b37bb 100644
--- a/packages/sol/package.json
+++ b/packages/sol/package.json
@@ -96,6 +96,10 @@
     "./verification": {
       "import": "./dist/esm/verification.js",
       "require": "./dist/cjs/verification.js"
+    },
+    "./session": {
+      "import": "./dist/esm/session.js",
+      "require": "./dist/cjs/session.js"
     }
   },
   "react-native": {
@@ -124,20 +128,21 @@
     "babel-jest": "^29.7.0",
     "chai": "^5.1.1",
     "jest": "^29.7.0",
+    "lodash": "^4.17.21",
+    "npm-watch": "^0.13.0",
+    "rrule": "^2.8.1",
     "ts-jest": "^29.2.4",
     "ts-patch": "^3.2.1",
     "typescript": "^5.4.5",
     "typescript-eslint": "^8.0.1",
     "typescript-transform-paths": "^3.5.2",
-    "npm-watch": "^0.13.0",
-    "lodash": "^4.17.21",
-    "rrule": "^2.8.1",
     "xss": "^1.0.15"
   },
   "dependencies": {
     "@litespace/types": "workspace:^",
     "dayjs": "^1.11.13",
     "rrule": "^2.8.1",
+    "uuid": "^11.0.3",
     "zod": "^3.23.8"
   },
   "peerDependencies": {
diff --git a/packages/sol/src/ghost.ts b/packages/sol/src/ghost.ts
index 7c45d322..1d5f75df 100644
--- a/packages/sol/src/ghost.ts
+++ b/packages/sol/src/ghost.ts
@@ -2,10 +2,10 @@ import { IUser } from "@litespace/types";
 
 export const GHOST_USERNAME_PREFIX = "ghost:";
 
-export function asGhost(call: number): IUser.Ghost {
-  return `${GHOST_USERNAME_PREFIX}${call}`;
+export function asGhost(session: string): IUser.Ghost {
+  return `${GHOST_USERNAME_PREFIX}${session}`;
 }
 
-export function getGhostCall(ghost: IUser.Ghost): number {
-  return Number(ghost.replace(GHOST_USERNAME_PREFIX, ""));
+export function getGhostSession(ghost: IUser.Ghost): string {
+  return ghost.replace(GHOST_USERNAME_PREFIX, "");
 }
diff --git a/packages/sol/src/index.ts b/packages/sol/src/index.ts
index 5394d816..5a40244e 100644
--- a/packages/sol/src/index.ts
+++ b/packages/sol/src/index.ts
@@ -13,4 +13,5 @@ export * from "@/constants";
 export * from "@/utils";
 export * from "@/user";
 export * from "@/interview";
+export * from "@/session";
 export * from "@/verification";
diff --git a/packages/sol/src/session.ts b/packages/sol/src/session.ts
new file mode 100644
index 00000000..46262f70
--- /dev/null
+++ b/packages/sol/src/session.ts
@@ -0,0 +1,12 @@
+import { ISession } from "@litespace/types";
+import { v4 as uuidv4 } from 'uuid';
+
+export function asSessionId(id: string) {
+  if (!id.startsWith("lesson:") && !id.startsWith("interview:"))
+    throw Error("Invalid session id.")
+  return id as ISession.Id;
+}
+
+export function genSessionId(type: ISession.Type): ISession.Id {
+  return `${type}:${uuidv4()}`;
+}
diff --git a/packages/types/src/api.ts b/packages/types/src/api.ts
index 850f6276..ac0046a4 100644
--- a/packages/types/src/api.ts
+++ b/packages/types/src/api.ts
@@ -11,7 +11,7 @@ export enum ApiError {
   BusyTutorManager = "busy-tutor-manager",
   Unexpected = "unexpected",
   NotFound = "not-found",
-  CallNotFound = "call-not-found",
+  SessionNotFound = "session-not-found",
   UserNotFound = "user-not-found",
   TutorNotFound = "tutor-not-found",
   StudentNotFound = "student-not-found",
diff --git a/packages/types/src/call.ts b/packages/types/src/call.ts
deleted file mode 100644
index a38c8e8b..00000000
--- a/packages/types/src/call.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { IUser } from "@/index";
-
-export enum RecordingStatus {
-  Idle = "idle",
-  Recording = "recording",
-  Recorded = "recorded",
-  Queued = "queued",
-  Empty = "empty",
-  Processing = "processing",
-  Processed = "processed",
-  ProcessingFailed = "processing-failed",
-}
-
-export type Row = {
-  id: number;
-  recording_status: RecordingStatus;
-  processing_time: number | null;
-  created_at: Date;
-  updated_at: Date;
-};
-
-export type Self = {
-  id: number;
-  recordingStatus: RecordingStatus;
-  processingTime: number | null;
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type MemberRow = {
-  user_id: number;
-  call_id: number;
-};
-
-export type Member = {
-  userId: number;
-  callId: number;
-};
-
-export type PopuldatedMemberRow = {
-  call_id: number;
-  user_id: number;
-  name: IUser.Row["name"];
-  image: IUser.Row["image"];
-  role: IUser.Role;
-};
-
-export type PopuldatedMember = {
-  callId: number;
-  userId: number;
-  name: IUser.Self["name"];
-  image: IUser.Self["image"];
-  role: IUser.Role;
-};
-
-export type UpdatePayload = {
-  recordingStatus?: RecordingStatus;
-  processingTime?: number;
-};
-
-/**
- * @deprecated should be removed
- */
-export type FindCallByIdApiResponse = {
-  call: Self;
-  members: PopuldatedMember[];
-};
-
-/**
- * @deprecated should be removed
- */
-export type FindUserCallsApiResponse = {
-  calls: Self[];
-  members: Record<string, PopuldatedMember[]>;
-};
-
-export type FindCallMembersApiResponse = number[];
-
-export type Type = "lesson" | "interview";
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index a8ae35e8..b084bc00 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -4,7 +4,7 @@ export * as ISubscription from "@/subscription";
 export * as IRoom from "@/room";
 export * as IRating from "@/rating";
 export * as IMessage from "@/message";
-export * as ICall from "@/call";
+export * as ISession from "@/session";
 export * as IPlan from "@/plan";
 export * as ICoupon from "@/coupon";
 export * as IInvite from "@/invite";
diff --git a/packages/types/src/interview.ts b/packages/types/src/interview.ts
index c926f8f4..b1f9a456 100644
--- a/packages/types/src/interview.ts
+++ b/packages/types/src/interview.ts
@@ -1,4 +1,4 @@
-import { ICall, IFilter, IInterview, Paginated } from ".";
+import { ISession, IFilter, IInterview, Paginated } from ".";
 import { InfiniteData, UseInfiniteQueryResult } from "@tanstack/react-query";
 
 export enum Status {
@@ -22,9 +22,12 @@ export type Self = {
      * The interviewee id (the id of the tutor)
      */
     interviewee: number;
-    call: number;
     rule: number;
+    session: ISession.Id; /** @deprecated */
   };
+  // sessionId has to be extracted from ids to be compatible with ILesson.Self 
+  // as ISession.Self is either a lesson.self or interview.self
+  sessionId: ISession.Id;
   /**
    * ISO UTC datetime.
    */
@@ -53,7 +56,7 @@ export type Row = {
   interviewer_feedback: string | null;
   interviewee_feedback: string | null;
   rule_id: number;
-  call_id: number;
+  session_id: ISession.Id;
   note: string | null;
   level: number | null;
   status: Status;
@@ -69,7 +72,7 @@ export type CreatePayload = {
    * ISO UTC datetime.
    */
   start: string;
-  call: number;
+  session: ISession.Id;
   rule: number;
   interviewer: number;
   interviewee: number;
@@ -128,8 +131,8 @@ export type FindPagedInterviewsProps = {
     InfiniteData<
       Paginated<{
         interview: IInterview.Self;
-        call: ICall.Self;
-        members: ICall.PopuldatedMember[];
+        session: ISession.Self;
+        members: ISession.PopuldatedMember[];
       }>,
       unknown
     >,
@@ -138,8 +141,8 @@ export type FindPagedInterviewsProps = {
   list:
     | {
         interview: IInterview.Self;
-        call: ICall.Self;
-        members: ICall.PopuldatedMember[];
+        session: ISession.Self;
+        members: ISession.PopuldatedMember[];
       }[]
     | null;
   more: () => void;
diff --git a/packages/types/src/lesson.ts b/packages/types/src/lesson.ts
index 7a208434..52f2eb67 100644
--- a/packages/types/src/lesson.ts
+++ b/packages/types/src/lesson.ts
@@ -1,4 +1,4 @@
-import { ICall, IFilter, IUser, Paginated } from "@/index";
+import { ISession, IFilter, IUser, Paginated } from "@/index";
 
 export type Row = {
   id: number;
@@ -6,7 +6,7 @@ export type Row = {
   duration: number;
   price: number;
   rule_id: number;
-  call_id: number;
+  session_id: ISession.Id;
   canceled_by: number | null;
   canceled_at: Date | null;
   created_at: Date;
@@ -30,7 +30,7 @@ export type Self = {
    */
   price: number;
   ruleId: number;
-  callId: number;
+  sessionId: ISession.Id;
   /**
    * ID of the member who canceled the lesson.
    */
@@ -91,7 +91,7 @@ export type CreatePayload = {
   tutor: number;
   student: number;
   rule: number;
-  call: number;
+  session: ISession.Id;
   /**
    * Lesson price scaled to the power of 2.
    */
diff --git a/packages/types/src/peer.ts b/packages/types/src/peer.ts
index f818e27c..f63f14e5 100644
--- a/packages/types/src/peer.ts
+++ b/packages/types/src/peer.ts
@@ -1,10 +1,10 @@
 export type RegisterPeerIdApiPayload = {
   peer: string;
-  call?: number;
+  session?: string;
 };
 
 export type DeletePeerIdApiQurey = {
-  call?: number;
+  session?: string;
 };
 
 export enum PeerType {
@@ -19,7 +19,7 @@ export type FindPeerIdApiQuery =
     }
   | {
       type: PeerType.Ghost;
-      call: number;
+      session: string; // has to be string so zod check can pass
     };
 
 export type FindPeerIdApiResponse = {
diff --git a/packages/types/src/room.ts b/packages/types/src/room.ts
index a925718c..0b56fe82 100644
--- a/packages/types/src/room.ts
+++ b/packages/types/src/room.ts
@@ -87,7 +87,7 @@ export type FindRoomByMembersApiResponse = { room: number };
 
 export type FindRoomMembersApiResponse = PopulatedMember[];
 
-export type FindCallRoomApiResponse = {
+export type FindSessionRoomApiResponse = {
   room: number;
   members: PopulatedMember[];
 };
diff --git a/packages/types/src/session.ts b/packages/types/src/session.ts
new file mode 100644
index 00000000..ca76718a
--- /dev/null
+++ b/packages/types/src/session.ts
@@ -0,0 +1,37 @@
+import { IInterview, ILesson, IUser } from "@/index";
+
+export type Row = ILesson.Row | IInterview.Row;
+
+export type Self = ILesson.Self | IInterview.Self;
+
+export type Type = "lesson" | "interview";
+export type Id = `${Type}:${string}`;
+
+export type MemberRow = {
+  user_id: number;
+  session_id: Id;
+};
+
+export type Member = {
+  userId: number;
+  sessionId: Id;
+};
+
+export type PopuldatedMemberRow = {
+  session_id: Id;
+  user_id: number;
+  name: IUser.Row["name"];
+  image: IUser.Row["image"];
+  role: IUser.Role;
+};
+
+export type PopuldatedMember = {
+  sessionId: Id;
+  userId: number;
+  name: IUser.Self["name"];
+  image: IUser.Self["image"];
+  role: IUser.Role;
+};
+
+export type FindSessionMembersApiResponse = number[];
+export type FindUserSessionsApiResponse = Id[];
diff --git a/packages/types/src/user.ts b/packages/types/src/user.ts
index b29c9c94..e3e784e2 100644
--- a/packages/types/src/user.ts
+++ b/packages/types/src/user.ts
@@ -221,4 +221,4 @@ export type FindPublicStudentStatsApiResponse = {
   upcomingLessonCount: number;
 };
 
-export type Ghost = `ghost:${number}`;
+export type Ghost = `ghost:${string}`;
diff --git a/packages/types/src/wss.ts b/packages/types/src/wss.ts
index 9c99bd4b..16d5dd8e 100644
--- a/packages/types/src/wss.ts
+++ b/packages/types/src/wss.ts
@@ -1,4 +1,4 @@
-import { IMessage, IRule, ITutor, Server, ICall } from "@/index";
+import { IMessage, IRule, ISession, ITutor, Server } from "@/index";
 
 /**
  * Events emitted by the client
@@ -9,8 +9,8 @@ export enum ClientEvent {
   UpdateMessage = "UpdateMessage",
   DeleteMessage = "DeleteMessage",
   MarkMessageAsRead = "MarkMessageAsRead",
-  JoinCall = "JoinCall",
-  LeaveCall = "LeaveCall",
+  JoinSession = "JoinSession",
+  LeaveSession = "LeaveSession",
   /**
    * @deprecated
    */
@@ -35,13 +35,14 @@ export enum ServerEvent {
 
   MessageRead = "MessageRead",
 
-  MemberJoinedCall = "MemberJoinedCallId",
-  MemberLeftCall = "MemberLeftCallId",
+  MemberJoinedSession = "MemberJoinedSessionId",
+  MemberLeftSession = "MemberLeftSessionId",
+
+  UserJoinedSession = "UserJoinedSession",
 
   /**
    * @deprecated
    */
-  UserJoinedCall = "UserJoinedCall",
   UserSharedScreen = "UserSharedScreen",
   UserStatusChanged = "UserStatusChanged",
   UserTyping = "UserTyping",
@@ -103,18 +104,15 @@ export type ClientEventsMap = {
   [ClientEvent.DeleteMessage]: EventCallback<{ id: number }>;
   [ClientEvent.MarkMessageAsRead]: EventCallback<{ id: number }>;
 
-  [ClientEvent.PeerOpened]: EventCallback<{ callId: number; peerId: string }>;
+  [ClientEvent.PeerOpened]: EventCallback<{ sessionId: ISession.Id; peerId: string }>;
   [ClientEvent.RegisterPeer]: EventCallback<{ peer: string }>;
 
-  [ClientEvent.ToggleCamera]: EventCallback<{ call: number; camera: boolean }>;
-  [ClientEvent.ToggleMic]: EventCallback<{ call: number; mic: boolean }>;
+  [ClientEvent.ToggleCamera]: EventCallback<{ session: ISession.Id; camera: boolean }>;
+  [ClientEvent.ToggleMic]: EventCallback<{ session: ISession.Id; mic: boolean }>;
 
   [ClientEvent.UserTyping]: EventCallback<{ roomId: number }>;
-  [ClientEvent.JoinCall]: EventCallback<{
-    callId: number;
-    type: ICall.Type;
-  }>;
-  [ClientEvent.LeaveCall]: EventCallback<{ callId: number }>;
+  [ClientEvent.JoinSession]: EventCallback<{ sessionId: ISession.Id }>;
+  [ClientEvent.LeaveSession]: EventCallback<{ sessionId: ISession.Id }>;
 };
 
 /**
@@ -129,10 +127,10 @@ export type ServerEventsMap = {
   }>;
   [ServerEvent.RoomMessageRead]: EventCallback<{ userId: number }>;
 
-  [ServerEvent.UserJoinedCall]: EventCallback<{ peerId: string }>;
+  [ServerEvent.UserJoinedSession]: EventCallback<{ peerId: string }>;
 
-  [ServerEvent.MemberJoinedCall]: EventCallback<{ userId: number }>;
-  [ServerEvent.MemberLeftCall]: EventCallback<{ userId: number }>;
+  [ServerEvent.MemberJoinedSession]: EventCallback<{ userId: number }>;
+  [ServerEvent.MemberLeftSession]: EventCallback<{ userId: number }>;
 
   [ServerEvent.CameraToggled]: EventCallback<{ user: number; camera: boolean }>;
   [ServerEvent.MicToggled]: EventCallback<{ user: number; mic: boolean }>;
diff --git a/services/server/fixtures/db.ts b/services/server/fixtures/db.ts
index 22b6a51a..41bf3cdb 100644
--- a/services/server/fixtures/db.ts
+++ b/services/server/fixtures/db.ts
@@ -1,5 +1,4 @@
 import {
-  calls,
   hashPassword,
   interviews,
   knex,
@@ -20,6 +19,7 @@ import {
   IUser,
   IRating,
   IMessage,
+  ISession,
 } from "@litespace/types";
 import { faker } from "@faker-js/faker/locale/ar";
 import { entries, range, sample } from "lodash";
@@ -28,6 +28,7 @@ import { Time } from "@litespace/sol/time";
 export { faker } from "@faker-js/faker/locale/ar";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
+import { randomUUID } from "crypto";
 
 dayjs.extend(utc);
 
@@ -39,8 +40,6 @@ export async function flush() {
     await rooms.builder(tx).members.del();
     await rooms.builder(tx).rooms.del();
     await interviews.builder(tx).del();
-    await calls.builder(tx).members.del();
-    await calls.builder(tx).calls.del();
     await lessons.builder(tx).members.del();
     await lessons.builder(tx).lessons.del();
     await interviews.builder(tx).del();
@@ -121,9 +120,8 @@ const or = {
     if (!id) return await tutorManager().then((tutorManager) => tutorManager.id);
     return id;
   },
-  async callId(id?: number): Promise<number> {
-    if (!id) return await calls.create().then((call) => call.id);
-    return id;
+  async sessionId(type: "lesson" | "interview"): Promise<ISession.Id> {
+    return `${type}:${randomUUID()}`;
   },
   async ruleId(id?: number): Promise<number> {
     if (!id) return await rule().then((rule) => rule.id);
@@ -150,7 +148,7 @@ export async function lesson(
     const tutor = await or.tutorId(payload?.tutor);
     const student = await or.studentId(payload?.student);
     const data = await lessons.create({
-      call: await or.callId(payload?.call),
+      session: await or.sessionId("lesson"),
       start:
         payload?.timing === "future"
           ? faker.date.future().toISOString()
@@ -176,7 +174,7 @@ export async function interview(payload: Partial<IInterview.CreatePayload>) {
   return await interviews.create({
     interviewer: await or.tutorManagerId(payload.interviewer),
     interviewee: await or.tutorId(payload.interviewee),
-    call: await or.callId(payload.call),
+    session: await or.sessionId("interview"),
     rule: await or.ruleId(payload.rule),
     start: or.start(payload.start),
   });
diff --git a/services/server/fixtures/shared.ts b/services/server/fixtures/shared.ts
index 47445478..000cd50b 100644
--- a/services/server/fixtures/shared.ts
+++ b/services/server/fixtures/shared.ts
@@ -5,7 +5,6 @@ import {
   messages,
   rooms,
   interviews,
-  calls,
   rules,
   lessons,
   ratings,
@@ -45,8 +44,6 @@ export async function flush() {
     await rooms.builder(tx).members.del();
     await rooms.builder(tx).rooms.del();
     await interviews.builder(tx).del();
-    await calls.builder(tx).members.del();
-    await calls.builder(tx).calls.del();
     await lessons.builder(tx).members.del();
     await lessons.builder(tx).lessons.del();
     await rules.builder(tx).del();
diff --git a/services/server/fixtures/wss.ts b/services/server/fixtures/wss.ts
index 2eb8c50a..2a7f5eba 100644
--- a/services/server/fixtures/wss.ts
+++ b/services/server/fixtures/wss.ts
@@ -1,6 +1,6 @@
 import { io, Socket } from "socket.io-client";
 import { sockets } from "@litespace/atlas";
-import { Backend, ICall, Wss } from "@litespace/types";
+import { Backend, ISession, Wss } from "@litespace/types";
 
 export class ClientSocket {
   public readonly client: Socket<Wss.ServerEventsMap, Wss.ClientEventsMap>;
@@ -16,12 +16,12 @@ export class ClientSocket {
     return this.emit( Wss.ClientEvent.UserTyping, { roomId });
   }
 
-  joinCall(callId: number, type: ICall.Type) {
-    return this.emit(Wss.ClientEvent.JoinCall, { callId, type });
+  joinSession(sessionId: ISession.Id) {
+    this.client.emit(Wss.ClientEvent.JoinSession, { sessionId });
   }
 
-  leaveCall(callId: number) {
-    return this.emit(Wss.ClientEvent.LeaveCall, { callId });
+  leaveSession(sessionId: ISession.Id) {
+    this.client.emit(Wss.ClientEvent.LeaveSession, { sessionId });
   }
 
   sendMessage(roomId: number, text: string) {
diff --git a/services/server/src/handlers/call.ts b/services/server/src/handlers/call.ts
deleted file mode 100644
index f5d7dc77..00000000
--- a/services/server/src/handlers/call.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { calls } from "@litespace/models";
-import { NextFunction, Request, Response } from "express";
-import safeRequest from "express-async-handler";
-import { id, withNamedId } from "@/validation/utils";
-import { forbidden, notfound } from "@/lib/error";
-import { isAdmin, isGhost, isUser } from "@litespace/auth";
-import { canJoinCall } from "@/lib/call";
-import { cache } from "@/lib/cache";
-import { ICall } from "@litespace/types";
-import zod from "zod";
-
-const types = ["lesson", "interview"] as const satisfies ICall.Type[];
-
-export const findCallMembersParams = zod.object({
-  callId: id,
-  callType: zod.enum(types),
-});
-
-async function findCallById(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const allowed = isUser(user) || isGhost(user);
-  if (!allowed) return next(forbidden());
-
-  const { callId } = withNamedId("callId").parse(req.params);
-  const [call, members] = await Promise.all([
-    calls.findById(callId),
-    calls.findCallMembers([callId]),
-  ]);
-  if (!call) return next(notfound.call());
-
-  const member =
-    isUser(user) && members.map((member) => member.userId).includes(user.id);
-  const eligible = member || isAdmin(req.user) || isGhost(user);
-  if (!eligible) next(forbidden());
-
-  res.status(200).json({ call, members });
-}
-
-async function findCallMembers(
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  const user = req.user;
-  const allowed = isUser(user);
-  if (!allowed) return next(forbidden());
-
-  const { callId, callType } = findCallMembersParams.parse(req.params);
-
-  const canJoin = await canJoinCall({
-    userId: user.id,
-    callType,
-    callId,
-  });
-
-  const eligible = canJoin || isAdmin(user);
-  if (!eligible) return next(forbidden());
-
-  const members = await cache.call.getMembers(callId);
-  const response: ICall.FindCallMembersApiResponse = members;
-  res.status(200).json(response);
-}
-
-export default {
-  findCallById: safeRequest(findCallById),
-  findCallMembers: safeRequest(findCallMembers),
-};
diff --git a/services/server/src/handlers/chat.ts b/services/server/src/handlers/chat.ts
index 8fa06808..94f0c3d4 100644
--- a/services/server/src/handlers/chat.ts
+++ b/services/server/src/handlers/chat.ts
@@ -1,4 +1,4 @@
-import { calls, messages, rooms, users } from "@litespace/models";
+import { interviews, lessons, messages, rooms, users } from "@litespace/models";
 import { NextFunction, Request, Response } from "express";
 import safeRequest from "express-async-handler";
 import { isEmpty } from "lodash";
@@ -10,6 +10,7 @@ import {
   pageNumber,
   jsonBoolean,
   pageSize,
+  sessionId,
 } from "@/validation/utils";
 import { empty, exists, forbidden, notfound } from "@/lib/error";
 import {
@@ -22,6 +23,7 @@ import {
 } from "@litespace/auth";
 import { IMessage, IRoom } from "@litespace/types";
 import { asFindUserRoomsApiRecord } from "@/lib/chat";
+import { asSessionId } from "@litespace/sol";
 
 const createRoomPayload = zod.object({ userId: id });
 const findRoomByMembersPayload = zod.object({ members: zod.array(id) });
@@ -38,6 +40,8 @@ const updateRoomPayload = zod.object({
   muted: zod.optional(zod.boolean()),
 });
 
+const findSessionRoomParams = zod.object({ sessionId: sessionId });
+
 async function createRoom(req: Request, res: Response, next: NextFunction) {
   const currentUser = req.user;
   const allowed = isUser(currentUser);
@@ -153,19 +157,22 @@ async function findRoomByMembers(
 /**
  *  @deprecated You can find room by members
  */
-async function findCallRoom(req: Request, res: Response, next: NextFunction) {
+async function findSessionRoom(req: Request, res: Response, next: NextFunction) {
   const user = req.user;
   const allowed = isUser(user) || isGhost(user);
   if (!allowed) return next(forbidden());
 
-  const { call } = withNamedId("call").parse(req.params);
-  const userCall = await calls.findById(call);
-  if (!userCall) return next(notfound.call());
+  const { sessionId } = findSessionRoomParams.parse(req.params);
+  const sessionType = sessionId.split(":")[0];
+  const model = sessionType === "lesson" ? lessons : interviews;
+
+  const foundSession = await model.findBySessionId(asSessionId(sessionId));
+  if (!foundSession) return next(notfound.session());
 
-  const callMembers = await calls.findCallMembers([userCall.id]);
-  if (isEmpty(callMembers)) return next(notfound.call());
+  const sessionMembers = await model.findSessionMembers(sessionId);
+  if (isEmpty(sessionMembers)) return next(notfound.session());
 
-  const memberIds = callMembers.map((member) => member.userId);
+  const memberIds = sessionMembers.map((member) => member.userId);
   const isMember = isUser(user) && memberIds.includes(user.id);
   const eligible = isMember || isAdmin(user) || isGhost(user);
   if (!eligible) return next(forbidden());
@@ -176,7 +183,7 @@ async function findCallRoom(req: Request, res: Response, next: NextFunction) {
   const roomMembers = await rooms.findRoomMembers({ roomIds: [room] });
   if (isEmpty(roomMembers)) return next(notfound.base());
 
-  const response: IRoom.FindCallRoomApiResponse = {
+  const response: IRoom.FindSessionRoomApiResponse = {
     room,
     members: roomMembers,
   } as const;
@@ -235,6 +242,6 @@ export default {
   findUserRooms: safeRequest(findUserRooms),
   findRoomByMembers: safeRequest(findRoomByMembers),
   findRoomMembers: safeRequest(findRoomMembers),
-  findCallRoom: safeRequest(findCallRoom),
+  findSessionRoom: safeRequest(findSessionRoom),
   updateRoom: safeRequest(updateRoom),
 };
diff --git a/services/server/src/handlers/interview.ts b/services/server/src/handlers/interview.ts
index 915d8294..08c02551 100644
--- a/services/server/src/handlers/interview.ts
+++ b/services/server/src/handlers/interview.ts
@@ -7,7 +7,6 @@ import {
 } from "@/lib/error";
 import { canBeInterviewed } from "@/lib/interview";
 import {
-  calls,
   interviews,
   rules,
   users,
@@ -32,8 +31,9 @@ import safeRequest from "express-async-handler";
 import zod from "zod";
 import { isAdmin, isTutorManager, isSuperAdmin, isTutor } from "@litespace/auth";
 import { isEqual } from "lodash";
-import { canBook } from "@/lib/call";
+import { canBook } from "@/lib/session";
 import { platformConfig } from "@/constants";
+import { genSessionId } from "@litespace/sol";
 
 const INTERVIEW_DURATION = 30;
 
@@ -105,12 +105,10 @@ async function createInterview(
   if (!room) await rooms.create(members);
 
   const interview = await knex.transaction(async (tx) => {
-    const call = await calls.create(tx);
-
     const interview = await interviews.create({
       interviewer: interviewerId,
       interviewee: intervieweeId,
-      call: call.id,
+      session: genSessionId("interview"),
       rule: rule.id,
       start,
       tx,
diff --git a/services/server/src/handlers/invoice.ts b/services/server/src/handlers/invoice.ts
index 41a4ad76..c0c0c538 100644
--- a/services/server/src/handlers/invoice.ts
+++ b/services/server/src/handlers/invoice.ts
@@ -11,14 +11,12 @@ import { uploadSingle } from "@/lib/media";
 import { ApiContext } from "@/types/api";
 import {
   bank,
-  id,
   ids,
   invoiceStatus,
   jsonBoolean,
   orderDirection,
   pageNumber,
   pageSize,
-  pagination,
   withdrawMethod,
   withNamedId,
 } from "@/validation/utils";
diff --git a/services/server/src/handlers/lesson.ts b/services/server/src/handlers/lesson.ts
index b397d8f7..7e1c7c54 100644
--- a/services/server/src/handlers/lesson.ts
+++ b/services/server/src/handlers/lesson.ts
@@ -11,7 +11,7 @@ import {
 } from "@/validation/utils";
 import { bad, busyTutor, forbidden, notfound } from "@/lib/error";
 import { ILesson, IRule, IUser, Wss } from "@litespace/types";
-import { calls, lessons, rules, users, knex, rooms } from "@litespace/models";
+import { lessons, rules, users, knex, rooms } from "@litespace/models";
 import { Knex } from "knex";
 import safeRequest from "express-async-handler";
 import { ApiContext } from "@/types/api";
@@ -21,8 +21,9 @@ import { unpackRules } from "@litespace/sol/rule";
 import { isAdmin, isStudent, isUser } from "@litespace/auth";
 import { platformConfig } from "@/constants";
 import dayjs from "@/lib/dayjs";
-import { canBook } from "@/lib/call";
+import { canBook } from "@/lib/session";
 import { concat, isEqual } from "lodash";
+import { genSessionId } from "@litespace/sol";
 
 const createLessonPayload = zod.object({
   tutorId: id,
@@ -85,14 +86,13 @@ function create(context: ApiContext) {
 
       const { lesson } = await knex.transaction(
         async (tx: Knex.Transaction) => {
-          const call = await calls.create(tx);
           const lesson = await lessons.create({
             tutor: payload.tutorId,
             student: user.id,
             start: payload.start,
             duration: payload.duration,
             rule: payload.ruleId,
-            call: call.id,
+            session: genSessionId("lesson"),
             price,
             tx,
           });
diff --git a/services/server/src/handlers/peer.ts b/services/server/src/handlers/peer.ts
index 6f59bfc0..836e3be1 100644
--- a/services/server/src/handlers/peer.ts
+++ b/services/server/src/handlers/peer.ts
@@ -1,6 +1,6 @@
 import { cache } from "@/lib/cache";
 import { bad, forbidden } from "@/lib/error";
-import { id, string } from "@/validation/utils";
+import { id, sessionId, string } from "@/validation/utils";
 import { isGhost, isStudent, isTutor } from "@litespace/auth";
 import { IPeer } from "@litespace/types";
 import { NextFunction, Request, Response } from "express";
@@ -9,11 +9,11 @@ import zod from "zod";
 
 const registerPeerIdPayload = zod.object({
   peer: string,
-  call: zod.optional(id),
+  session: zod.optional(sessionId),
 });
 
 const deletePeerIdQuery = zod.object({
-  call: zod.optional(id),
+  session: zod.optional(sessionId),
 });
 
 const findPeerIdApiQuery = zod.union([
@@ -23,7 +23,7 @@ const findPeerIdApiQuery = zod.union([
   }),
   zod.object({
     type: zod.literal(IPeer.PeerType.Ghost),
-    call: id,
+    session: sessionId,
   }),
 ]);
 
@@ -37,10 +37,10 @@ async function registerPeerId(req: Request, res: Response, next: NextFunction) {
   const allowed = ghost || tutor;
   if (!allowed) return next(forbidden());
 
-  const { peer, call }: IPeer.RegisterPeerIdApiPayload =
+  const { peer, session }: IPeer.RegisterPeerIdApiPayload =
     registerPeerIdPayload.parse(req.body);
-  if (ghost && !call) return next(bad());
-  if (ghost && call) await cache.peer.setGhostPeerId(call, peer);
+  if (ghost && !session) return next(bad());
+  if (ghost && session) await cache.peer.setGhostPeerId(session, peer);
   if (tutor) await cache.peer.setUserPeerId(user.id, peer);
   res.status(200).send();
 }
@@ -55,11 +55,11 @@ async function deletePeerId(req: Request, res: Response, next: NextFunction) {
   const allowed = ghost || tutor;
   if (!allowed) return next(forbidden());
 
-  const { call }: IPeer.DeletePeerIdApiQurey = deletePeerIdQuery.parse(
+  const { session }: IPeer.DeletePeerIdApiQurey = deletePeerIdQuery.parse(
     req.query
   );
-  if (ghost && !call) return next(bad());
-  if (ghost && call) await cache.peer.removeGhostPeerId(call);
+  if (ghost && !session) return next(bad());
+  if (ghost && session) await cache.peer.removeGhostPeerId(session);
   if (tutor) await cache.peer.removeUserPeerId(user.id);
 
   res.status(200).send();
@@ -74,7 +74,7 @@ async function findPeerId(req: Request, res: Response, next: NextFunction) {
   const peer =
     query.type === IPeer.PeerType.Tutor
       ? await cache.peer.getUserPeerId(query.tutor)
-      : await cache.peer.getGhostPeerId(query.call);
+      : await cache.peer.getGhostPeerId(query.session);
 
   const response: IPeer.FindPeerIdApiResponse = { peer };
   res.status(200).json(response);
diff --git a/services/server/src/handlers/session.ts b/services/server/src/handlers/session.ts
new file mode 100644
index 00000000..969f64e8
--- /dev/null
+++ b/services/server/src/handlers/session.ts
@@ -0,0 +1,67 @@
+import { NextFunction, Request, Response } from "express";
+import safeRequest from "express-async-handler";
+import { forbidden, notfound } from "@/lib/error";
+import { isAdmin, isGhost, isUser } from "@litespace/auth";
+import { canJoinSession } from "@/lib/session";
+import { cache } from "@/lib/cache";
+import { ISession } from "@litespace/types";
+import zod from "zod";
+import { sessionId } from "@/validation/utils";
+import { interviews, lessons } from "@litespace/models";
+import { asSessionId } from "@litespace/sol";
+
+export const findSessionByIdParams = zod.object({ sessionId: sessionId });
+export const findSessionMembersParams = zod.object({ sessionId: sessionId });
+
+async function findSessionById(req: Request, res: Response, next: NextFunction) {
+  const user = req.user;
+  const allowed = isUser(user) || isGhost(user);
+  if (!allowed) return next(forbidden());
+
+  const { sessionId } = findSessionByIdParams.parse(req.params);
+  const sessionType = sessionId.split(":")[0]; // lesson or interview
+
+  const model = sessionType === "lesson" ? lessons : interviews;
+
+  const [session, members] = await Promise.all([
+    model.findBySessionId(asSessionId(sessionId)),
+    model.findSessionMembers(sessionId),
+  ]);
+  if (!session) return next(notfound.session());
+
+  const member =
+    isUser(user) && members.map((member) => member.userId).includes(user.id);
+  const eligible = member || isAdmin(req.user) || isGhost(user);
+  if (!eligible) next(forbidden());
+
+  res.status(200).json({ session, members });
+}
+
+async function findSessionMembers(
+  req: Request,
+  res: Response,
+  next: NextFunction
+) {
+  const user = req.user;
+  const allowed = isUser(user);
+  if (!allowed) return next(forbidden());
+
+  const { sessionId } = findSessionMembersParams.parse(req.params);
+
+  const canJoin = await canJoinSession({
+    userId: user.id,
+    sessionId,
+  });
+
+  const eligible = canJoin || isAdmin(user);
+  if (!eligible) return next(forbidden());
+
+  const members = await cache.session.getMembers(asSessionId(sessionId));
+  const response: ISession.FindSessionMembersApiResponse = members;
+  res.status(200).json(response);
+}
+
+export default {
+  findSessionById: safeRequest(findSessionById),
+  findSessionMembers: safeRequest(findSessionMembers),
+};
diff --git a/services/server/src/index.ts b/services/server/src/index.ts
index ea69aca8..8253c965 100644
--- a/services/server/src/index.ts
+++ b/services/server/src/index.ts
@@ -73,7 +73,7 @@ app.use(
 app.use("/api/v1/auth", routes.auth);
 app.use("/api/v1/user", routes.user(context));
 app.use("/api/v1/rule", routes.rule(context));
-app.use("/api/v1/call", routes.call);
+app.use("/api/v1/session", routes.session);
 app.use("/api/v1/lesson", routes.lesson(context));
 app.use("/api/v1/interview", routes.interview);
 app.use("/api/v1/rating", routes.rating);
diff --git a/services/server/src/lib/error.ts b/services/server/src/lib/error.ts
index f11ff7cf..ead6f91f 100644
--- a/services/server/src/lib/error.ts
+++ b/services/server/src/lib/error.ts
@@ -85,7 +85,7 @@ export const notfound = {
   rule: () => error(ApiError.RuleNotFound, "Rule not found", 404),
   tutor: () => error(ApiError.TutorNotFound, "Tutor not found", 404),
   student: () => error(ApiError.StudentNotFound, "Student not found", 404),
-  call: () => error(ApiError.CallNotFound, "Call not found", 404),
+  session: () => error(ApiError.SessionNotFound, "Session not found", 404),
   lesson: () => error(ApiError.LessonNotFound, "Lesson not found", 404),
   room: () => error(ApiError.RoomNotFound, "Room not found", 404),
   roomMembers: () =>
diff --git a/services/server/src/lib/call.ts b/services/server/src/lib/session.ts
similarity index 83%
rename from services/server/src/lib/call.ts
rename to services/server/src/lib/session.ts
index 4ce5d724..5f2646f7 100644
--- a/services/server/src/lib/call.ts
+++ b/services/server/src/lib/session.ts
@@ -1,14 +1,15 @@
 import { unpackRules } from "@litespace/sol/rule";
-import { ICall, IInterview, ILesson, IRule, IUser } from "@litespace/types";
+import { ISession, IInterview, ILesson, IRule } from "@litespace/types";
 import { concat, isEmpty } from "lodash";
 import dayjs from "@/lib/dayjs";
 import { platformConfig } from "@/constants";
 import { interviews, lessons } from "@litespace/models";
 import { INTERVIEW_DURATION } from "@litespace/sol";
+import { asSessionId } from "@litespace/sol";
 
 // todo: impl: each tutor can have interview each 3 months.
-export function canBeInterviewed(calls: ICall.Self[]): boolean {
-  if (isEmpty(calls)) return true;
+export function canBeInterviewed(sessions: ISession.Self[]): boolean {
+  if (isEmpty(sessions)) return true;
   return false;
 }
 
@@ -63,19 +64,18 @@ export function canBook({
 }
 
 // todo: write tests
-export async function canJoinCall({
+export async function canJoinSession({
   userId,
-  callId,
-  callType,
+  sessionId,
 }: {
   userId: number;
-  callId: number;
-  callType: ICall.Type;
+  sessionId: string;
 }) {
   const now = dayjs.utc();
+  const sessionType = sessionId.split(":")[0];
 
-  if (callType === "lesson") {
-    const lesson = await lessons.findByCallId(callId);
+  if (sessionType === "lesson") {
+    const lesson = await lessons.findBySessionId(asSessionId(sessionId));
     if (!lesson) return false;
 
     const start = dayjs.utc(lesson.start);
@@ -91,7 +91,7 @@ export async function canJoinCall({
     return true;
   }
 
-  const interview = await interviews.findByCallId(callId);
+  const interview = await interviews.findBySessionId(asSessionId(sessionId));
   if (!interview) return false;
 
   const start = dayjs.utc(interview.start);
diff --git a/services/server/src/lib/utils.ts b/services/server/src/lib/utils.ts
deleted file mode 100644
index 80514ca8..00000000
--- a/services/server/src/lib/utils.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { values } from "lodash";
-
-export function isValuedObject<T extends object>(object: T): boolean {
-  return values(object).some((value) => value !== undefined);
-}
diff --git a/services/server/src/middleware/accessControl.ts b/services/server/src/middleware/accessControl.ts
index 64d106cc..8d9850d5 100644
--- a/services/server/src/middleware/accessControl.ts
+++ b/services/server/src/middleware/accessControl.ts
@@ -307,15 +307,15 @@ const policies: Array<Policy> = [
     route: "(/)api/v1/slot/:id(/)",
     methods: ["DELETE"],
   },
-  // calls
+  // sessions
   {
     roles: [student, tutor],
-    route: "(/)api/v1/call(/)",
+    route: "(/)api/v1/session(/)",
     methods: ["POST"],
   },
   {
     roles: [regAdmin, owner],
-    route: "(/)api/v1/call/tutor/interviews/:id(/)",
+    route: "(/)api/v1/session/tutor/interviews/:id(/)",
     methods: ["GET"],
   },
   // interviews
diff --git a/services/server/src/routes/call.ts b/services/server/src/routes/call.ts
deleted file mode 100644
index d11ec5f8..00000000
--- a/services/server/src/routes/call.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Router } from "express";
-import call from "@/handlers/call";
-
-const router = Router();
-
-router.get("/:callId", call.findCallById);
-router.get("/:callId/:callType/members", call.findCallMembers);
-
-export default router;
diff --git a/services/server/src/routes/chat.ts b/services/server/src/routes/chat.ts
index b6a04587..a4050bf4 100644
--- a/services/server/src/routes/chat.ts
+++ b/services/server/src/routes/chat.ts
@@ -8,7 +8,7 @@ router.get("/list/rooms/:userId", chat.findUserRooms);
 router.get("/list/:roomId/messages", chat.findRoomMessages);
 router.get("/room/by/members/", chat.findRoomByMembers);
 router.get("/room/members/:roomId", chat.findRoomMembers);
-router.get("/room/call/:call", chat.findCallRoom);
+router.get("/room/session/:sessionId", chat.findSessionRoom);
 router.put("/room/:roomId", chat.updateRoom);
 
 export default router;
diff --git a/services/server/src/routes/index.ts b/services/server/src/routes/index.ts
index 93beba26..303b93b0 100644
--- a/services/server/src/routes/index.ts
+++ b/services/server/src/routes/index.ts
@@ -1,5 +1,5 @@
 import user from "@/routes/user";
-import call from "@/routes/call";
+import session from "@/routes/session";
 import interview from "@/routes/interview";
 import rating from "@/routes/rating";
 import chat from "@/routes/chat";
@@ -24,7 +24,7 @@ export default {
   invoice,
   rule,
   withdrawMethod,
-  call,
+  session,
   plan,
   chat,
   rating,
diff --git a/services/server/src/routes/session.ts b/services/server/src/routes/session.ts
new file mode 100644
index 00000000..947bebe2
--- /dev/null
+++ b/services/server/src/routes/session.ts
@@ -0,0 +1,9 @@
+import { Router } from "express";
+import session from "@/handlers/session";
+
+const router = Router();
+
+router.get("/:sessionId", session.findSessionById);
+router.get("/:sessionId/members", session.findSessionMembers);
+
+export default router;
diff --git a/services/server/src/validation/utils.ts b/services/server/src/validation/utils.ts
index 5a11e34e..a7f677e2 100644
--- a/services/server/src/validation/utils.ts
+++ b/services/server/src/validation/utils.ts
@@ -18,6 +18,8 @@ export const id = zod.coerce.number({ message: "Invalid id" }).positive();
 
 export const ids = zod.array(id);
 
+export const sessionId = zod.string().startsWith("lesson:").or(zod.string().startsWith("interview:"))
+
 export const password = zod
   .string({ message: "Invalid password" })
   .regex(passwordRegex, "Password doesn't meet the requirements");
diff --git a/services/server/src/wss/handlers/connection.ts b/services/server/src/wss/handlers/connection.ts
index 6955f4f5..1602cf7e 100644
--- a/services/server/src/wss/handlers/connection.ts
+++ b/services/server/src/wss/handlers/connection.ts
@@ -2,12 +2,12 @@ import { isAdmin, isGhost, isStudent, isTutor } from "@litespace/auth";
 import { dayjs, logger, safe } from "@litespace/sol";
 import { Wss } from "@litespace/types";
 import { WssHandler } from "@/wss/handlers/base";
-import { calls, rooms } from "@litespace/models";
+import { interviews, lessons, rooms } from "@litespace/models";
 import { background } from "@/workers";
 import { PartentPortMessage, PartentPortMessageType } from "@/workers/messages";
-import { asCallRoomId, asChatRoomId } from "@/wss/utils";
+import { asSessionRoomId, asChatRoomId } from "@/wss/utils";
 import { cache } from "@/lib/cache";
-import { getGhostCall } from "@litespace/sol/ghost";
+import { getGhostSession } from "@litespace/sol/ghost";
 
 const stdout = logger("wss");
 
@@ -41,7 +41,7 @@ export class Connection extends WssHandler {
       this.announceStatus({ userId: user.id, online: false });
 
       await this.deregisterPeer();
-      await this.removeUserFromCalls();
+      await this.removeUserFromSessions();
     });
     if (error instanceof Error) stdout.error(error.message);
   }
@@ -87,15 +87,17 @@ export class Connection extends WssHandler {
       if (isStudent(this.user)) this.socket.join(Wss.Room.TutorsCache);
       if (isAdmin(this.user)) this.socket.join(Wss.Room.ServerStats);
 
-      // todo: get user calls from cache
-      const callsList = await calls.find({
+      // todo: get user sessions from cache
+      const lessonsSessions = (await lessons.find({
         users: [user.id],
         full: true,
         after: dayjs.utc().startOf("day").toISOString(),
         before: dayjs.utc().add(1, "day").toISOString(),
-      });
+      })).list.map(lesson => lesson.sessionId);
 
-      this.socket.join(callsList.list.map((call) => asCallRoomId(call.id)));
+      this.socket.join([...lessonsSessions, ...interviewsSessions].map(
+        (session) => asSessionRoomId(session))
+      );
     });
 
     if (error instanceof Error) stdout.error(error.message);
@@ -113,23 +115,22 @@ export class Connection extends WssHandler {
     stdout.info(`Deregister peer for: ${display}`);
 
     if (isGhost(user))
-      return await cache.peer.removeGhostPeerId(getGhostCall(user));
+      return await cache.peer.removeGhostPeerId(getGhostSession(user));
     if (isTutor(user)) await cache.peer.removeUserPeerId(user.id);
   }
 
-  private async removeUserFromCalls() {
+  private async removeUserFromSessions() {
     const user = this.user;
     if (isGhost(user)) return;
 
-    const callId = await cache.call.removeMemberByUserId(user.id);
-    if (!callId) return;
+    const sessionId = await cache.session.removeMemberByUserId(user.id);
+    if (!sessionId) return;
 
-    // notify members that a member has left the call
+    // notify members that a member has left the session
     this.socket.broadcast
-      .to(asCallRoomId(callId))
-      .emit(
-        Wss.ServerEvent.MemberLeftCall, 
-        { userId: user.id },
-      );
+      .to(asSessionRoomId(sessionId))
+      .emit(Wss.ServerEvent.MemberLeftSession, {
+        userId: user.id,
+      });
   }
 }
diff --git a/services/server/src/wss/handlers/index.ts b/services/server/src/wss/handlers/index.ts
index e72b2c44..1159f477 100644
--- a/services/server/src/wss/handlers/index.ts
+++ b/services/server/src/wss/handlers/index.ts
@@ -1,7 +1,7 @@
 import { Socket } from "socket.io";
 import { IUser } from "@litespace/types";
 
-import { Call } from "@/wss/handlers/call";
+import { Session } from "@/wss/handlers/session";
 import { Connection } from "@/wss/handlers/connection";
 import { Messages } from "@/wss/handlers/message";
 import { Peer } from "@/wss/handlers/peer";
@@ -9,14 +9,14 @@ import { InputDevices } from "./inputDevices";
 
 export class WssHandlers {
   public readonly connection: Connection;
-  public readonly call: Call;
+  public readonly session: Session;
   public readonly messages: Messages;
   public readonly peer: Peer;
   public readonly inputDevices: InputDevices;
 
   constructor(socket: Socket, user: IUser.Self | IUser.Ghost) {
     this.connection = new Connection(socket, user).init();
-    this.call = new Call(socket, user).init();
+    this.session = new Session(socket, user).init();
     this.messages = new Messages(socket, user).init();
     this.peer = new Peer(socket, user);
     this.inputDevices = new InputDevices(socket, user).init();
diff --git a/services/server/src/wss/handlers/inputDevices.ts b/services/server/src/wss/handlers/inputDevices.ts
index aec39bfd..514517f5 100644
--- a/services/server/src/wss/handlers/inputDevices.ts
+++ b/services/server/src/wss/handlers/inputDevices.ts
@@ -1,12 +1,12 @@
 import { logger, safe } from "@litespace/sol";
 import { isGhost } from "@litespace/auth";
 import { Wss } from "@litespace/types";
-import { id, boolean } from "@/validation/utils";
+import { boolean, sessionId } from "@/validation/utils";
 import { WssHandler } from "@/wss/handlers/base";
 import zod from "zod";
 
-const toggleCameraPayload = zod.object({ call: id, camera: boolean });
-const toggleMicPayload = zod.object({ call: id, mic: boolean });
+const toggleCameraPayload = zod.object({ session: sessionId, camera: boolean });
+const toggleMicPayload = zod.object({ session: sessionId, mic: boolean });
 
 const stdout = logger("wss");
 
@@ -24,9 +24,9 @@ export class InputDevices extends WssHandler {
     const error = safe(async () => {
       const user = this.user;
       if (isGhost(user)) return;
-      const { call, camera } = toggleCameraPayload.parse(data);
+      const { session, camera } = toggleCameraPayload.parse(data);
       // todo: add validation
-      this.broadcast(Wss.ServerEvent.CameraToggled, call.toString(), {
+      this.broadcast(Wss.ServerEvent.CameraToggled, session, {
         user: user.id,
         camera,
       });
@@ -38,9 +38,9 @@ export class InputDevices extends WssHandler {
     const error = safe(async () => {
       const user = this.user;
       if (isGhost(user)) return;
-      const { call, mic } = toggleMicPayload.parse(data);
+      const { session, mic } = toggleMicPayload.parse(data);
       // todo: add validation
-      this.broadcast(Wss.ServerEvent.MicToggled, call.toString(), {
+      this.broadcast(Wss.ServerEvent.MicToggled, session, {
         user: user.id,
         mic,
       });
diff --git a/services/server/src/wss/handlers/peer.ts b/services/server/src/wss/handlers/peer.ts
index 6e15a0c6..3b8667ef 100644
--- a/services/server/src/wss/handlers/peer.ts
+++ b/services/server/src/wss/handlers/peer.ts
@@ -1,15 +1,14 @@
-import { logger, safe } from "@litespace/sol";
-import { calls } from "@litespace/models";
+import { asSessionId, logger, safe } from "@litespace/sol";
 import { isGhost, isTutor, isUser } from "@litespace/auth";
 import { Wss } from "@litespace/types";
-import { getGhostCall } from "@litespace/sol/ghost";
+import { getGhostSession } from "@litespace/sol/ghost";
 import { cache } from "@/lib/cache";
-import { id, string } from "@/validation/utils";
+import { sessionId, string } from "@/validation/utils";
 import { WssHandler } from "@/wss/handlers/base";
 import zod from "zod";
 import { isEmpty } from "lodash";
 
-const peerPayload = zod.object({ callId: id, peerId: string });
+const peerPayload = zod.object({ sessionId: sessionId, peerId: string });
 const registerPeerPayload = zod.object({ peer: zod.string() });
 
 const stdout = logger("wss");
@@ -20,25 +19,20 @@ const stdout = logger("wss");
 export class Peer extends WssHandler {
   async peerOpened(data: unknown) {
     const error = await safe(async () => {
-      const { callId, peerId } = peerPayload.parse(data);
+      const { sessionId, peerId } = peerPayload.parse(data);
       const user = this.user;
 
-      const members = await calls.findCallMembers([callId]);
-      if (isEmpty(members)) return;
+      const memberIds = await cache.session.getMembers(asSessionId(sessionId));
+      if (isEmpty(memberIds)) return;
 
-      const memberIds = members.map((member) => member.userId);
       const isMember = isUser(user) && memberIds.includes(user.id);
       const allowed = isMember || isGhost(this.user);
       if (!allowed) return;
 
-      this.socket.join(callId.toString());
+      this.socket.join(sessionId);
       this.socket
-        .to(callId.toString())
-        .emit(
-          Wss.ServerEvent.UserJoinedCall, 
-          { peerId }, 
-          () => {}
-        );
+        .to(sessionId)
+        .emit(Wss.ServerEvent.UserJoinedSession, { peerId });
     });
     if (error instanceof Error) stdout.error(error.message);
   }
@@ -51,7 +45,7 @@ export class Peer extends WssHandler {
       stdout.info(`Register peer: ${peer} for ${id}`);
 
       if (isGhost(user))
-        await cache.peer.setGhostPeerId(getGhostCall(user), peer);
+        await cache.peer.setGhostPeerId(getGhostSession(user), peer);
       if (isTutor(user)) await cache.peer.setUserPeerId(user.id, peer);
 
       // notify peers to refetch the peer id if needed
diff --git a/services/server/src/wss/handlers/session.ts b/services/server/src/wss/handlers/session.ts
new file mode 100644
index 00000000..710a915d
--- /dev/null
+++ b/services/server/src/wss/handlers/session.ts
@@ -0,0 +1,100 @@
+import { cache } from "@/lib/cache";
+import { canJoinSession } from "@/lib/session";
+import { isGhost } from "@litespace/auth";
+import { asSessionId, logger, safe } from "@litespace/sol";
+import { Wss } from "@litespace/types";
+import { WssHandler } from "@/wss/handlers/base";
+import { asSessionRoomId } from "@/wss/utils";
+
+import zod from "zod";
+import { sessionId } from "@/validation/utils";
+
+const stdout = logger("wss");
+
+const onJoinSessionPayload = zod.object({ sessionId: sessionId });
+const onLeaveSessionPayload = zod.object({ sessionId: sessionId });
+
+export class Session extends WssHandler {
+  public init(): Session {
+    this.socket.on(Wss.ClientEvent.JoinSession, this.onJoinSession.bind(this));
+    this.socket.on(Wss.ClientEvent.LeaveSession, this.onLeaveSession.bind(this));
+    return this;
+  }
+
+  /*
+   *  This event listener will be called whenever a user
+   *  joins a session. For instance, when
+   *  users are joining a lesson, or a tutor is joining an
+   *  interview.
+   */
+  async onJoinSession(data: unknown) {
+    const result = await safe(async () => {
+      const { sessionId } = onJoinSessionPayload.parse(data);
+
+      const user = this.user;
+      // todo: add ghost as a member of the session
+      if (!user) return stdout.error("user undefined!");
+      if (isGhost(user)) return stdout.warning("Unsupported");
+
+      stdout.info(`User ${user.id} is joining session ${sessionId}.`);
+
+      const canJoin = await canJoinSession({
+        userId: user.id,
+        sessionId,
+      });
+
+      if (!canJoin) throw Error("Forbidden");
+
+      // add user to the session by adding its id in the cache
+      await cache.session.addMember({ userId: user.id, sessionId: asSessionId(sessionId) });
+      this.socket.join(asSessionRoomId(sessionId));
+
+      stdout.info(`User ${user.id} has joined session ${sessionId}.`);
+
+      // TODO: retrieve user data (ISession.PopulatedMember) from the database
+      // discuss with the team if shall we retrieve it from postgres,
+      // or store it in redis in the first place.
+
+      // notify members that a new member has joined the session
+      // NOTE: the user notifies himself as well that he successfully joined the session.
+      this.broadcast(
+        Wss.ServerEvent.MemberJoinedSession,
+        asSessionRoomId(sessionId),
+        { userId: user.id } // TODO: define the payload struct type in the types package
+      );
+    });
+    if (result instanceof Error) stdout.error(result.message);
+  }
+
+  /*
+   *  This event listener will be called whenever a user
+   *  leaves a session. For instance, when users are leaving
+   *  a lesson, or a tutor is leaving an interview.
+   */
+  async onLeaveSession(data: unknown) {
+    const result = await safe(async () => {
+      const { sessionId } = onLeaveSessionPayload.parse(data);
+
+      const user = this.user;
+      if (isGhost(user)) return;
+
+      stdout.info(`User ${user.id} is leaving session ${sessionId}.`);
+
+      // remove user from the session by removing its id from the cache
+      await cache.session.removeMember({
+        userId: user.id,
+        sessionId: asSessionId(sessionId),
+      });
+
+      stdout.info(`User ${user.id} has left session ${sessionId}.`);
+
+      // notify members that a member has left the session
+      this.socket.broadcast
+        .to(asSessionRoomId(sessionId))
+        .emit(Wss.ServerEvent.MemberLeftSession, {
+          userId: user.id,
+        });
+    });
+    if (result instanceof Error) stdout.error(result.message);
+  }
+}
diff --git a/services/server/src/wss/utils.ts b/services/server/src/wss/utils.ts
index 86a11d9e..ecc9eb8e 100644
--- a/services/server/src/wss/utils.ts
+++ b/services/server/src/wss/utils.ts
@@ -1,5 +1,5 @@
-export function asCallRoomId(callId: number) {
-  return `call:${callId}`;
+export function asSessionRoomId(sessionId: string) {
+  return `session:${sessionId}`;
 }
 
 export function asChatRoomId(roomId: number) {
diff --git a/services/server/tests/api/call.test.ts b/services/server/tests/api/call.test.ts
deleted file mode 100644
index 971fafa9..00000000
--- a/services/server/tests/api/call.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Api, unexpectedApiSuccess } from "@fixtures/api";
-import fixtures from "@fixtures/db";
-import { flush } from "@fixtures/shared";
-import { calls } from "@litespace/models";
-import { expect } from "chai";
-import { cache } from "@/lib/cache";
-
-describe("/api/v1/call", () => {
-  beforeAll(async () => {
-    await cache.connect();
-  });
-
-  afterAll(async () => {
-    await cache.disconnect();
-  });
-
-  beforeEach(async () => {
-    await flush();
-    await cache.flush();
-  });
-
-  it("should retrieve call by callId", async () => {
-    // insert data in the database
-    const call = await calls.create();
-
-    // send request to the api
-    const adminApi = await Api.forSuperAdmin();
-    const res = await adminApi.atlas.call.findById(call.id);
-
-    // test results
-    expect(res.call).deep.equal(call);
-  });
-
-  it("should retrieve call members by callId", async () => {
-    // insert data in the database
-    const call = await calls.create();
-    const tutor = await fixtures.tutor();
-    await cache.call.addMember({
-      callId: call.id,
-      userId: tutor.id,
-    });
-
-    // send request to the api
-    const adminApi = await Api.forSuperAdmin();
-    const membersIds = await adminApi.atlas.call.findCallMembers(
-      call.id,
-      "lesson"
-    );
-
-    // test results
-    expect(membersIds).to.have.length(1);
-    expect(membersIds).to.contain(tutor.id);
-  });
-
-  it("should NOT retrieve call data for an uneligable user", async () => {
-    // insert data in the database
-    const call = await calls.create();
-
-    // send request to the api & test the response
-    const studentApi = await Api.forStudent();
-    await studentApi.atlas.call
-      .findById(call.id)
-      .then(unexpectedApiSuccess)
-      .catch((error) => expect(error.message).to.be.eq("Unauthorized access"));
-  });
-});
diff --git a/services/server/tests/api/user.test.ts b/services/server/tests/api/user.test.ts
index 3e4c035a..0bdb19b1 100644
--- a/services/server/tests/api/user.test.ts
+++ b/services/server/tests/api/user.test.ts
@@ -373,7 +373,8 @@ describe("/api/v1/user/", () => {
         canceled: true,
       });
 
-      const res = await studentApi.atlas.user.findPublicStudentStats();
+      const res = await safe(async () => studentApi.atlas.user.findPublicStudentStats());
+      if (res instanceof Error) throw res;
       
       expect(res.tutorCount).to.eq(2);
       expect(res.totalLearningTime).to.eq(lesson1.lesson.duration);
diff --git a/services/server/tests/wss/call.test.ts b/services/server/tests/wss/call.test.ts
index 230ef1bd..06a52d76 100644
--- a/services/server/tests/wss/call.test.ts
+++ b/services/server/tests/wss/call.test.ts
@@ -36,7 +36,7 @@ describe("calls test suite", () => {
     student = await studentApi.findCurrentUser();
   });
 
-  it("should broadcast the event when the user join the call", async () => {
+  it("should broadcast the event when the user join a session", async () => {
     const now = dayjs();
 
     const rule = await tutorApi.atlas.rule.create({
@@ -69,22 +69,22 @@ describe("calls test suite", () => {
     const tutorSocket = new ClientSocket(tutor.token);
     const studentSocket = new ClientSocket(student.token);
 
-    const studentResult = studentSocket.wait(Wss.ServerEvent.MemberJoinedCall);
-    tutorSocket.joinCall(lesson.callId, "lesson");
+    const studentResult = studentSocket.wait(Wss.ServerEvent.MemberJoinedSession);
+    tutorSocket.joinSession(lesson.sessionId);
 
     const { userId } = await studentResult;
 
-    const callMembersIds = await cache.call.getMembers(lesson.callId);
+    const callMembersIds = await cache.session.getMembers(lesson.sessionId);
     expect(callMembersIds).to.be.of.length(1);
     expect(callMembersIds[0]).to.be.eq(tutor.user.id);
     expect(userId).to.be.eq(tutor.user.id);
 
-    const tutorResult = tutorSocket.wait(Wss.ServerEvent.MemberJoinedCall);
-    studentSocket.joinCall(lesson.callId, "lesson");
+    const tutorResult = tutorSocket.wait(Wss.ServerEvent.MemberJoinedSession);
+    studentSocket.joinSession(lesson.sessionId);
 
     const { userId: studentId } = await tutorResult;
-    const callMembersIdsSecondSnapshot = await cache.call.getMembers(
-      lesson.callId
+    const callMembersIdsSecondSnapshot = await cache.session.getMembers(
+      lesson.sessionId
     );
     expect(callMembersIdsSecondSnapshot).to.be.of.length(2);
     expect(
@@ -132,8 +132,8 @@ describe("calls test suite", () => {
     const tutorSocket = new ClientSocket(newTutor.token);
     const studentSocket = new ClientSocket(student.token);
 
-    const result = studentSocket.wait(Wss.ServerEvent.MemberJoinedCall);
-    tutorSocket.joinCall(lesson.callId, "lesson");
+    const result = studentSocket.wait(Wss.ServerEvent.MemberJoinedSession);
+    tutorSocket.joinSession(lesson.sessionId);
 
     await result
       .then(() => expect(false))
@@ -177,8 +177,8 @@ describe("calls test suite", () => {
     const tutorSocket = new ClientSocket(newTutor.token);
     const studentSocket = new ClientSocket(student.token);
 
-    const result = studentSocket.wait(Wss.ServerEvent.MemberJoinedCall);
-    tutorSocket.joinCall(lesson.callId, "lesson");
+    const result = studentSocket.wait(Wss.ServerEvent.MemberJoinedSession);
+    tutorSocket.joinSession(lesson.sessionId);
 
     await result
       .then(() => expect(false))

From bf1fde6ee87a6ba3fc4cae88fa4aa94ef2df9f86 Mon Sep 17 00:00:00 2001
From: "M. E. Abdelsalam" <mo.ehab150@gmail.com>
Date: Wed, 25 Dec 2024 17:40:20 +0200
Subject: [PATCH 2/2] removed: deprecated or no more necessary code has been
 removed.

---
 README.md                                     |   2 +-
 .../PendingInterview/index.tsx                |  13 +-
 .../Interview/ScheduledInterview/index.tsx    |  11 +-
 .../TutorOnboardingSteps/Interview/index.tsx  |   1 -
 .../components/TutorOnboardingSteps/index.tsx |   5 +-
 apps/nova/src/pages/Call.tsx                  |  39 +-
 packages/atlas/src/atlas.ts                   |   6 -
 packages/atlas/src/chat.ts                    |   4 -
 packages/atlas/src/peer.ts                    |  24 --
 packages/atlas/src/session.ts                 |  12 -
 packages/headless/src/sessions.ts             | 167 +-------
 packages/models/fixtures/db.ts                |   1 +
 .../models/migrations/1716146586880_setup.js  |  30 +-
 packages/models/src/interviews.ts             |  43 --
 packages/models/src/lessons.ts                |  42 --
 packages/models/tests/cache/session.test.ts   |   2 +-
 packages/types/src/index.ts                   |   1 -
 packages/types/src/interview.ts               |  33 +-
 packages/types/src/peer.ts                    |  27 --
 packages/types/src/session.ts                 |  35 --
 pnpm-lock.yaml                                |  47 ++-
 services/server/fixtures/db.ts                |   2 +-
 services/server/src/handlers/chat.ts          |  45 +-
 services/server/src/handlers/peer.ts          |  87 ----
 services/server/src/handlers/session.ts       |  67 ---
 services/server/src/index.ts                  |   2 -
 services/server/src/lib/session.ts            |   8 +-
 .../server/src/middleware/accessControl.ts    | 389 ------------------
 services/server/src/routes/chat.ts            |   1 -
 services/server/src/routes/index.ts           |   4 -
 services/server/src/routes/peer.ts            |  10 -
 services/server/src/routes/session.ts         |   9 -
 services/server/src/wss/handlers/call.ts      | 105 -----
 .../server/src/wss/handlers/connection.ts     |   7 +-
 services/server/src/wss/handlers/index.ts     |   3 -
 .../server/src/wss/handlers/inputDevices.ts   |  19 +-
 services/server/src/wss/handlers/peer.ts      |  55 ---
 .../wss/{call.test.ts => session.test.ts}     |  16 +-
 38 files changed, 103 insertions(+), 1271 deletions(-)
 delete mode 100644 packages/atlas/src/peer.ts
 delete mode 100644 packages/atlas/src/session.ts
 delete mode 100644 packages/types/src/peer.ts
 delete mode 100644 services/server/src/handlers/peer.ts
 delete mode 100644 services/server/src/handlers/session.ts
 delete mode 100644 services/server/src/middleware/accessControl.ts
 delete mode 100644 services/server/src/routes/peer.ts
 delete mode 100644 services/server/src/routes/session.ts
 delete mode 100644 services/server/src/wss/handlers/call.ts
 delete mode 100644 services/server/src/wss/handlers/peer.ts
 rename services/server/tests/wss/{call.test.ts => session.test.ts} (90%)

diff --git a/README.md b/README.md
index 931fd708..79f3acce 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
   - `apps/dashboard` - LiteSpace admin dashboard.
   - `apps/mobile` - LiteSpace mobile app.
   - `apps/nebula` - LiteSpace landing page.
-  - `apps/nova` - LiteSpace main web platform.
+  - `apps/nova` - LiteSpace main web platform. 
 
 # Project Setup
 
diff --git a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
index 483ff0ec..82c0591c 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
@@ -2,19 +2,16 @@ import {
   Button,
   ButtonType,
   ButtonSize,
-  ButtonVariant,
 } from "@litespace/luna/Button";
 import { asFullAssetUrl } from "@litespace/luna/backend";
 import { useFormatMessage } from "@litespace/luna/hooks/intl";
-import { ISession } from "@litespace/types";
+import { IInterview, IRoom } from "@litespace/types";
 import React from "react";
-import { Link } from "react-router-dom";
-import { Route } from "@/types/routes";
 
 const PendingInterview: React.FC<{
-  interviewer: ISession.PopuldatedMember;
-  session: ISession.Self;
-}> = ({ interviewer, session }) => {
+  interviewer: IRoom.PopulatedMember;
+  interview: IInterview.Self;
+}> = ({ interviewer }) => {
   const intl = useFormatMessage();
   return (
     <div>
@@ -57,6 +54,7 @@ const PendingInterview: React.FC<{
           </p>
 
           <div className="flex flex-row gap-4 mt-6">
+            {/*
             <Link to={Route.Call.replace(":id", session.sessionId)}>
               <Button
                 size={ButtonSize.Small}
@@ -66,6 +64,7 @@ const PendingInterview: React.FC<{
                 {intl("global.labels.go")}
               </Button>
             </Link>
+            */}
             <Button size={ButtonSize.Small} type={ButtonType.Error}>
               {intl("global.labels.cancel")}
             </Button>
diff --git a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx
index b1cc49de..25cc8b55 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/index.tsx
@@ -1,14 +1,13 @@
 import { destructureInterviewStatus } from "@litespace/sol/interview";
-import { ISession, IInterview } from "@litespace/types";
+import { IInterview, IRoom } from "@litespace/types";
 import React, { useMemo } from "react";
 import PendingInterview from "@/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview";
 import PassedInterview from "@/components/TutorOnboardingSteps/Interview/ScheduledInterview/PassedInterview";
 
 const ScheduledInterview: React.FC<{
   interview: IInterview.Self;
-  session: ISession.Self;
-  members: ISession.PopuldatedMember[];
-}> = ({ interview, session, members }) => {
+  members: IRoom.PopulatedMember[];
+}> = ({ interview, members }) => {
   // todo: handle canceled and rejected
   const { pending, passed, rejected, canceled } = useMemo(
     () => destructureInterviewStatus(interview.status),
@@ -17,7 +16,7 @@ const ScheduledInterview: React.FC<{
 
   const interviewer = useMemo(() => {
     return (
-      members.find((member) => member.userId === interview.ids.interviewer) ||
+      members.find((member) => member.id === interview.ids.interviewer) ||
       null
     );
   }, [interview.ids.interviewer, members]);
@@ -25,7 +24,7 @@ const ScheduledInterview: React.FC<{
   return (
     <div>
       {pending && interviewer ? (
-        <PendingInterview interviewer={interviewer} session={session} />
+        <PendingInterview interviewer={interviewer} interview={interview} />
       ) : passed && interviewer ? (
         <PassedInterview
           feedback={interview.feedback.interviewer}
diff --git a/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx
index 2ce4becd..f1b72c81 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx
@@ -6,7 +6,6 @@ import RawHtml from "@/components/TutorOnboardingSteps/RawHtml";
 // import ScheduledInterview from "@/components/TutorOnboardingSteps/Interview/ScheduledInterview";
 
 const Interview: React.FC<{
-  interviews: IInterview.FindPagedInterviewsProps;
   current: Element<IInterview.FindInterviewsApiResponse["list"]> | null;
 }> = ({ current }) => {
   // const onScheduleSuccess = useCallback(() => {
diff --git a/apps/nova/src/components/TutorOnboardingSteps/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/index.tsx
index 86af132e..a45ce790 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/index.tsx
@@ -6,11 +6,10 @@ import { Element, IInterview } from "@litespace/types";
 
 const TutorOnboardingSteps: React.FC<{
   step: number;
-  interviews: IInterview.FindPagedInterviewsProps;
   current: Element<IInterview.FindInterviewsApiResponse["list"]> | null;
-}> = ({ step, interviews, current }) => {
+}> = ({ step, current }) => {
   if (step === TutorOnboardingStep.Interview)
-    return <Interview interviews={interviews} current={current} />;
+    return <Interview current={current} />;
   if (step === TutorOnboardingStep.Media) return <MediaShot />;
   if (step === TutorOnboardingStep.Profile) return "todo";
   return null;
diff --git a/apps/nova/src/pages/Call.tsx b/apps/nova/src/pages/Call.tsx
index 99951434..30308278 100644
--- a/apps/nova/src/pages/Call.tsx
+++ b/apps/nova/src/pages/Call.tsx
@@ -9,19 +9,17 @@ import {
 // import { useMediaQueries } from "@litespace/luna/hooks/media";
 // import { useRender } from "@litespace/luna/hooks/common";
 // import { useFormatMessage } from "@litespace/luna/hooks/intl";
-import { useParams } from "react-router-dom";
 import cn from "classnames";
 // import { useFullScreen } from "@/hooks/call";
 // import Media from "@/components/Call/Media";
 // import Messages from "@/components/Chat/Messages";
 import { orNull, orUndefined } from "@litespace/sol/utils";
 import {
-  useSessionMembers,
-  // useCall,
+  //useSessionMembers,
+  //usePeerIds,
   useSessionV2,
-  useFindSessionRoomById,
+  //useFindSessionRoomById,
   useFullScreen,
-  usePeerIds,
 } from "@litespace/headless/sessions";
 import { useDisplayRecorder } from "@litespace/headless/recorder";
 import { isGhost } from "@/lib/ghost";
@@ -33,7 +31,6 @@ import Microphone from "@litespace/assets/Microphone";
 import VideoSlash from "@litespace/assets/VideoSlash";
 import MicrophoneSlash from "@litespace/assets/MicrophoneSlash";
 import { useUser } from "@litespace/headless/context/user";
-import { ISession } from "@litespace/types";
 // import GhostView from "@/components/Call/GhostView";
 
 const Call: React.FC = () => {
@@ -41,23 +38,10 @@ const Call: React.FC = () => {
   // const chat = useRender();
   // const intl = useFormatMessage();
   // const mediaQueries = useMediaQueries();
-  const { id } = useParams<{ id: ISession.Id }>();
   // const { isFullScreen, toggleFullScreen, ref } = useFullScreen();
 
-  const { sessionId } = useMemo(() => {
-    return { sessionId: id || null };
-  }, [id]);
-
-
-  const callRoom = useFindSessionRoomById(!isGhost ? sessionId : null);
-
-  const mateInfo = useMemo(() => {
-    if (!callRoom.data) return;
-    return callRoom.data.members.find((member) => member.id !== user?.id);
-  }, [callRoom.data, user?.id]);
-
-  const members = useSessionMembers(sessionId);
-  useEffect(() => console.log("In App members: ", members), [members]);
+  //const members = useSessionMembers(sessionId);
+  //useEffect(() => console.log("In App members: ", members), [members]);
 
   // const messages = useMemo(
   //   () =>
@@ -118,6 +102,7 @@ const Call: React.FC = () => {
 
   const fullScreen = useFullScreen<HTMLDivElement>();
 
+  /*
   const peers = usePeerIds(
     useMemo(
       () => ({
@@ -130,6 +115,7 @@ const Call: React.FC = () => {
       [sessionId, mateInfo?.id, user?.role]
     )
   );
+  */
 
   const onCloseSession = useCallback(() => {
     // peers.ghost.refetch();
@@ -150,12 +136,12 @@ const Call: React.FC = () => {
     useMemo(
       () => ({
         isGhost,
-        ghostPeerId: orNull(peers.ghost.data),
-        tutorPeerId: orNull(peers.tutor.data),
+        ghostPeerId: orNull("ghost"), // TODO: pass peers.ghost.data
+        tutorPeerId: orNull("ghost"), // TODO: pass peers.tutor.data
         userId: orNull(user?.id),
         onCloseSession,
       }),
-      [onCloseSession, peers.ghost.data, peers.tutor.data, user?.id]
+      [onCloseSession, user?.id]
     )
   );
 
@@ -177,7 +163,7 @@ const Call: React.FC = () => {
           screen: mateScreenStream,
         },
         speaking: true,
-        name: orUndefined(mateInfo?.name),
+        name: undefined // orUndefined(mateInfo?.name),
       },
       fullScreen: {
         enabled: fullScreen.enabled,
@@ -189,7 +175,6 @@ const Call: React.FC = () => {
       fullScreen.enabled,
       fullScreen.exit,
       fullScreen.start,
-      mateInfo?.name,
       mateScreenStream,
       mateStream,
       user?.name,
@@ -302,12 +287,14 @@ const Call: React.FC = () => {
               /*
                * TODO: replace this by members views
                */
+              /*
               <div>
                 <h1>Joined members</h1>
                 {members.map((m) => (
                   <label className="mx-1">-{m}-</label>
                 ))}
               </div>
+              */
             }
 
             {/* <Button
diff --git a/packages/atlas/src/atlas.ts b/packages/atlas/src/atlas.ts
index 9dfbd6b0..b18436e2 100644
--- a/packages/atlas/src/atlas.ts
+++ b/packages/atlas/src/atlas.ts
@@ -1,7 +1,6 @@
 import { User } from "@/user";
 import { Auth } from "@/auth";
 import { Backend } from "@litespace/types";
-import { Session } from "@/session";
 import { Plan } from "@/plan";
 import { Coupon } from "@/coupon";
 import { Invite } from "@/invite";
@@ -18,12 +17,10 @@ import { Invoice } from "@/invoice";
 import { Topic } from "@/topic";
 import { AuthToken } from "@/client";
 import { Cache } from "@/cache";
-import { Peer } from "@/peer";
 
 export class Atlas {
   public readonly user: User;
   public readonly auth: Auth;
-  public readonly session: Session;
   public readonly plan: Plan;
   public readonly coupon: Coupon;
   public readonly invite: Invite;
@@ -39,12 +36,10 @@ export class Atlas {
   public readonly invoice: Invoice;
   public readonly cache: Cache;
   public readonly topic: Topic;
-  public readonly peer: Peer;
 
   constructor(backend: Backend, token: AuthToken | null) {
     this.user = new User(backend, token);
     this.auth = new Auth(backend, token);
-    this.session = new Session(backend, token);
     this.plan = new Plan(backend, token);
     this.coupon = new Coupon(backend, token);
     this.invite = new Invite(backend, token);
@@ -60,6 +55,5 @@ export class Atlas {
     this.invoice = new Invoice(backend, token);
     this.cache = new Cache(backend, token);
     this.topic = new Topic(backend, token);
-    this.peer = new Peer(backend, token);
   }
 }
diff --git a/packages/atlas/src/chat.ts b/packages/atlas/src/chat.ts
index 03a9266f..e42afa0c 100644
--- a/packages/atlas/src/chat.ts
+++ b/packages/atlas/src/chat.ts
@@ -41,10 +41,6 @@ export class Chat extends Base {
     return await this.get({ route: `/api/v1/chat/room/members/${room}` });
   }
 
-  async findSessionRoom(session: string): Promise<IRoom.FindSessionRoomApiResponse> {
-    return await this.get({ route: `/api/v1/chat/room/session/${session}` });
-  }
-
   async updateRoom(
     room: number,
     payload: IRoom.UpdateRoomApiPayload
diff --git a/packages/atlas/src/peer.ts b/packages/atlas/src/peer.ts
deleted file mode 100644
index 920fc0b2..00000000
--- a/packages/atlas/src/peer.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Base } from "@/base";
-import { IPeer } from "@litespace/types";
-
-export class Peer extends Base {
-  /**
-   * @deprecated we will use web sockets to register peer ids
-   */
-  async register(payload: IPeer.RegisterPeerIdApiPayload) {
-    await this.post({ route: "/api/v1/peer", payload });
-  }
-
-  /**
-   * @deprecated we will use web sockets to de-register peer ids
-   */
-  async delete(payload: IPeer.DeletePeerIdApiQurey) {
-    await this.del({ route: "/api/v1/peer", payload });
-  }
-
-  async findPeerId(
-    payload: IPeer.FindPeerIdApiQuery
-  ): Promise<IPeer.FindPeerIdApiResponse> {
-    return this.get({ route: "/api/v1/peer", payload });
-  }
-}
diff --git a/packages/atlas/src/session.ts b/packages/atlas/src/session.ts
deleted file mode 100644
index 842c7a73..00000000
--- a/packages/atlas/src/session.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Base } from "@/base";
-import { ISession } from "@litespace/types";
-
-export class Session extends Base {
-  async findUserSessions(userId: number): Promise<ISession.FindUserSessionsApiResponse> {
-    return await this.get({ route: `/api/v1/session/list/user/${userId}` });
-  }
-
-  async findSessionMembers(sessionId: string): Promise<ISession.FindSessionMembersApiResponse> {
-    return await this.get({ route: `/api/v1/session/${sessionId}/members` });
-  }
-}
diff --git a/packages/headless/src/sessions.ts b/packages/headless/src/sessions.ts
index bf5d7382..6beb8656 100644
--- a/packages/headless/src/sessions.ts
+++ b/packages/headless/src/sessions.ts
@@ -1,15 +1,11 @@
-import { ISession, IPeer, IRoom, IUser, Void, Wss } from "@litespace/types";
-import { useQuery, UseQueryResult } from "@tanstack/react-query";
+import { ISession, Void, Wss } from "@litespace/types";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useAtlas } from "@/atlas/index";
 import { safe } from "@litespace/sol/error";
 import { useSocket } from "@/socket";
 import { usePeer } from "@/peer";
 import { MediaConnection } from "peerjs";
 import { orUndefined } from "@litespace/sol/utils";
-import { QueryKey } from "@/constants";
 import zod from "zod";
-import { ServerEvent, ServerEventsMap } from "@litespace/types/dist/esm/wss";
 
 declare module "peerjs" {
   export interface CallOption {
@@ -20,22 +16,6 @@ declare module "peerjs" {
   }
 }
 
-export function useFindSessionRoomById(
-  sessionId: string | null
-): UseQueryResult<IRoom.FindSessionRoomApiResponse | null, Error> {
-  const atlas = useAtlas();
-
-  const findSessionRoom = useCallback(async () => {
-    if (!sessionId) return null;
-    return await atlas.chat.findSessionRoom(sessionId);
-  }, [atlas.chat, sessionId]);
-
-  return useQuery({
-    queryFn: findSessionRoom,
-    queryKey: ["find-session-room"],
-  });
-}
-
 export function isPermissionDenied(error: Error): boolean {
   return (
     error.name === "NotAllowedError" &&
@@ -364,9 +344,7 @@ export function useSession({
         // call.on("stream", setMateMediaStream);
         call.on("stream", (stream: MediaStream) => addStream(call, stream));
         call.on("close", () => onMediaConnectionClose(call));
-      }, 3000);
-    },
-    [
+      }, 3000); }, [
       onMediaConnectionClose,
       addMediaConnection,
       addStream,
@@ -680,62 +658,6 @@ export function useCallEvents(
   };
 }
 
-// todo: move to peer.ts
-export function useFindPeerId(payload?: IPeer.FindPeerIdApiQuery) {
-  const atlas = useAtlas();
-
-  const findPeerId = useCallback(async () => {
-    if (!payload) return null;
-    const result = await atlas.peer.findPeerId(payload);
-    if (result.peer === null) throw new Error("Peer not found");
-    return result.peer;
-  }, [atlas.peer, payload]);
-
-  return useQuery({
-    queryFn: findPeerId,
-    queryKey: [QueryKey.FindPeerId, payload],
-    retryDelay: (attempt) => {
-      if (attempt <= 10) return 2_000;
-      return Math.min(1_000 * 2 ** attempt, 30_000);
-    },
-    enabled: !!payload,
-  });
-}
-
-export function usePeerIds({
-  isGhost,
-  sessionId,
-  role,
-  mateUserId,
-  disableGhost = false,
-}: {
-  isGhost: boolean;
-  sessionId: string | null;
-  role: IUser.Role | null;
-  mateUserId: number | null;
-  disableGhost?: boolean;
-}) {
-  const findGhostPeerIdQuery = useMemo(():
-    | IPeer.FindPeerIdApiQuery
-    | undefined => {
-    if (isGhost || !sessionId || disableGhost) return;
-    return { type: IPeer.PeerType.Ghost, session: sessionId };
-  }, [sessionId, disableGhost, isGhost]);
-
-  const findTutorPeerIdQuery = useMemo(():
-    | IPeer.FindPeerIdApiQuery
-    | undefined => {
-    const allowed =
-      role === IUser.Role.Student || role === IUser.Role.TutorManager;
-    if (isGhost || !mateUserId || !allowed) return;
-    return { type: IPeer.PeerType.Tutor, tutor: mateUserId };
-  }, [isGhost, mateUserId, role]);
-
-  const ghostPeerId = useFindPeerId(findGhostPeerIdQuery);
-  const tutorPeerId = useFindPeerId(findTutorPeerIdQuery);
-  return { ghost: ghostPeerId, tutor: tutorPeerId };
-}
-
 const ghostCallMetadata = zod.object({
   userId: zod.number().positive().int(),
   screen: zod.boolean(),
@@ -1007,88 +929,3 @@ export function useFullScreen<T extends Element>() {
     exit,
   };
 }
-
-/*
- * Send an HTTP request to retrieve the current members of a call
- */
-export function useFindSessionMembers(
-  sessionId: string | null
-): UseQueryResult<ISession.FindSessionMembersApiResponse | null, Error> {
-  const atlas = useAtlas();
-
-  const findCallMembers = useCallback(async () => {
-    if (!sessionId) return null;
-    return await atlas.session.findSessionMembers(sessionId);
-  }, [atlas.session, sessionId]);
-
-  return useQuery({
-    queryFn: findCallMembers,
-    queryKey: [QueryKey.FindCallMembers],
-  });
-}
-
-// a shorthand for some ServerEvent Callback type
-type CallEventsCallback = ServerEventsMap[ServerEvent.MemberJoinedSession];
-
-/*
- * Real-time call members state.
- */
-export function useSessionMembers(
-  sessionId: ISession.Id | null
-): number[] {
-  const [members, setMembers] = useState<number[]>([]);
-
-  const socket = useSocket();
-
-  // get the initial list by an http request
-  const query = useFindSessionMembers(sessionId);
-
-  useEffect(() => {
-    if (query.data && query.isFetching && query.isError) setMembers(query.data);
-  }, [query.data, query.isError, query.isFetching]);
-
-  // define WSS events callbacks
-  const onMemberJoinWssCallback: CallEventsCallback = useCallback((payload) => {
-    setMembers((prev) => [...prev, payload.userId]);
-  }, []);
-
-  const onMemberLeaveWssCallback: CallEventsCallback = useCallback(
-    (payload) => {
-      setMembers((prev) => prev.filter((id) => id !== payload.userId));
-    },
-    []
-  );
-
-  // define react callbacks
-  const joinSession = useCallback(() => {
-    if (!socket || !sessionId) return;
-    socket.emit(Wss.ClientEvent.JoinSession, { sessionId });
-  }, [socket, sessionId]);
-
-  const leaveSession = useCallback(() => {
-    if (!socket || !sessionId) return;
-    socket.emit(Wss.ClientEvent.LeaveSession, { sessionId });
-  }, [socket, sessionId]);
-
-  useEffect(() => {
-    // listen to wss events to modify members list accordingly
-    if (!socket) return;
-    socket.on(Wss.ServerEvent.MemberJoinedSession, onMemberJoinWssCallback);
-    socket.on(Wss.ServerEvent.MemberLeftSession, onMemberLeaveWssCallback);
-    joinSession();
-    return () => {
-      socket.off(Wss.ServerEvent.MemberJoinedSession);
-      socket.off(Wss.ServerEvent.MemberLeftSession);
-      leaveSession();
-    };
-  }, [
-    sessionId,
-    socket,
-    joinSession,
-    leaveSession,
-    onMemberLeaveWssCallback,
-    onMemberJoinWssCallback,
-  ]);
-
-  return members;
-}
diff --git a/packages/models/fixtures/db.ts b/packages/models/fixtures/db.ts
index 9a3698b9..a2693f43 100644
--- a/packages/models/fixtures/db.ts
+++ b/packages/models/fixtures/db.ts
@@ -19,6 +19,7 @@ import {
   IUser,
   IRating,
   IMessage,
+  ISession,
 } from "@litespace/types";
 import { faker } from "@faker-js/faker/locale/ar";
 import { entries, range, sample } from "lodash";
diff --git a/packages/models/migrations/1716146586880_setup.js b/packages/models/migrations/1716146586880_setup.js
index 51273459..35a8cf5c 100644
--- a/packages/models/migrations/1716146586880_setup.js
+++ b/packages/models/migrations/1716146586880_setup.js
@@ -98,34 +98,6 @@ exports.up = (pgm) => {
     updated_at: { type: "TIMESTAMP", notNull: true },
   });
 
-  pgm.createTable("calls", {
-    id: { type: "SERIAL", primaryKey: true, unique: true, notNull: true },
-    recording_status: {
-      type: "call_recording_status",
-      notNull: true,
-      default: "idle",
-    },
-    processing_time: { type: "INT", default: null },
-    created_at: { type: "TIMESTAMP", notNull: true },
-    updated_at: { type: "TIMESTAMP", notNull: true },
-  });
-
-  pgm.createTable(
-    "call_members",
-    {
-      call_id: { type: "SERIAL", notNull: true, references: "calls(id)" },
-      user_id: { type: "SERIAL", notNull: true, references: "users(id)" },
-    },
-    { constraints: { primaryKey: ["call_id", "user_id"] } }
-  );
-
-  pgm.createTable("call_events", {
-    call_id: { type: "SERIAL", notNull: true, references: "calls(id)" },
-    user_id: { type: "SERIAL", notNull: true, references: "users(id)" },
-    event_type: { type: "call_event", notNull: true },
-    created_at: { type: "TIMESTAMP", notNull: true },
-  });
-
   pgm.createTable("lessons", {
     id: { type: "SERIAL", primaryKey: true, notNull: true, unique: true },
     start: { type: "TIMESTAMP", notNull: true },
@@ -416,7 +388,7 @@ exports.down = (pgm) => {
   pgm.dropTable("lessons", { ifExists: true });
   pgm.dropTable("rules", { ifExists: true });
   pgm.dropTable("tutors", { ifExists: true });
-  pgm.dropTable("users", { ifExists: true });
+  pgm.dropTable("users", { ifExists: true, cascade: true });
 
   // types
   pgm.dropType("user_role", { ifExists: true });
diff --git a/packages/models/src/interviews.ts b/packages/models/src/interviews.ts
index cf07736c..4aadad6a 100644
--- a/packages/models/src/interviews.ts
+++ b/packages/models/src/interviews.ts
@@ -9,7 +9,6 @@ import {
 import { first, isEmpty } from "lodash";
 import dayjs from "@/lib/dayjs";
 import { Knex } from "knex";
-import { users } from "@/users";
 
 export class Interviews {
   readonly table = "interviews" as const;
@@ -109,35 +108,6 @@ export class Interviews {
     return await this.findOneBy("session_id", id);
   }
 
-  async findSessionMembers(
-    sessionId: string,
-    tx?: Knex.Transaction
-  ): Promise<ISession.PopuldatedMember[]> {
-    const select: Record<keyof ISession.PopuldatedMemberRow, string> = {
-      user_id: users.column("id"),
-      session_id: this.columns.session_id,
-      name: users.column("name"),
-      image: users.column("image"),
-      role: users.column("role"),
-    };
-
-    const rows: ISession.PopuldatedMemberRow[] = await this.builder(tx)
-      .select<ISession.PopuldatedMemberRow[]>(select)
-      .join(
-        users.table,
-        users.column("id"),
-        this.column("interviewer_id")
-      )
-      .join(
-        users.table,
-        users.column("id"),
-        this.column("interviewee_id")
-      )
-      .where(this.column("session_id"), sessionId);
-
-    return rows.map((row) => this.asSessionPopulatedMember(row));
-  }
-
   async findByInterviewee(id: number): Promise<IInterview.Self[]> {
     return await this.findManyBy("interviewee_id", id);
   }
@@ -220,7 +190,6 @@ export class Interviews {
         rule: row.rule_id,
         session: row.session_id,
       },
-      sessionId: row.session_id,
       feedback: {
         interviewer: row.interviewer_feedback,
         interviewee: row.interviewee_feedback,
@@ -237,18 +206,6 @@ export class Interviews {
     };
   }
 
-  asSessionPopulatedMember(
-    row: ISession.PopuldatedMemberRow
-  ): ISession.PopuldatedMember {
-    return {
-      sessionId: row.session_id,
-      userId: row.user_id,
-      name: row.name,
-      image: row.image,
-      role: row.role,
-    };
-  }
-
   builder(tx?: Knex.Transaction) {
     return tx
       ? tx<IInterview.Row>(this.table).clone()
diff --git a/packages/models/src/lessons.ts b/packages/models/src/lessons.ts
index c567d87f..2dc69086 100644
--- a/packages/models/src/lessons.ts
+++ b/packages/models/src/lessons.ts
@@ -196,36 +196,6 @@ export class Lessons {
     return rows.map((row) => this.asPopulatedMember(row));
   }
 
-  async findSessionMembers(
-    sessionId: string,
-    tx?: Knex.Transaction
-  ): Promise<ISession.PopuldatedMember[]> {
-    const select: Record<keyof ISession.PopuldatedMemberRow, string> = {
-      user_id: users.column("id"),
-      session_id: this.columns.lessons("session_id"),
-      name: users.column("name"),
-      image: users.column("image"),
-      role: users.column("role"),
-    };
-
-    const rows: ISession.PopuldatedMemberRow[] = await users
-      .builder(tx)
-      .select<ISession.PopuldatedMemberRow[]>(select)
-      .join(
-        this.table.members,
-        this.columns.members("user_id"),
-        users.column("id")
-      )
-      .join(
-        this.table.lessons,
-        this.columns.lessons("id"),
-        this.columns.members("lesson_id")
-      )
-      .where(this.columns.lessons("session_id"), sessionId)
-
-    return rows.map((row) => this.asSessionPopulatedMember(row));
-  }
-
   async findLessonsByMembers(
     members: number[],
     tx?: Knex.Transaction
@@ -577,18 +547,6 @@ export class Lessons {
     };
   }
 
-  asSessionPopulatedMember(
-    row: ISession.PopuldatedMemberRow
-  ): ISession.PopuldatedMember {
-    return {
-      sessionId: row.session_id,
-      userId: row.user_id,
-      name: row.name,
-      image: row.image,
-      role: row.role,
-    };
-  }
-
   builder(tx?: Knex.Transaction): Builder {
     return {
       lessons: tx
diff --git a/packages/models/tests/cache/session.test.ts b/packages/models/tests/cache/session.test.ts
index 61b02cb6..fb0337b3 100644
--- a/packages/models/tests/cache/session.test.ts
+++ b/packages/models/tests/cache/session.test.ts
@@ -33,7 +33,7 @@ describe("Testing cache/session functions", () => {
     expect(res2).to.contains(3);
   });
 
-  it("should NOT add (duplicate) the same user to the same call twice", async () => {
+  it("should NOT add (duplicate) the same user to the same session twice", async () => {
     const sessionId = genSessionId("lesson");
     await cache.session.addMember({ sessionId, userId: 1 });
     await cache.session.addMember({ sessionId, userId: 1 });
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index b084bc00..4d9166a4 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -23,7 +23,6 @@ export * as IInvoice from "@/invoice";
 export * as IAsset from "@/asset";
 export * as ITopic from "@/topic";
 export * as Server from "@/server";
-export * as IPeer from "@/peer";
 export * from "@/api";
 export * from "@/utils";
 export * from "@/api";
diff --git a/packages/types/src/interview.ts b/packages/types/src/interview.ts
index b1f9a456..a90ae0ea 100644
--- a/packages/types/src/interview.ts
+++ b/packages/types/src/interview.ts
@@ -1,5 +1,4 @@
-import { ISession, IFilter, IInterview, Paginated } from ".";
-import { InfiniteData, UseInfiniteQueryResult } from "@tanstack/react-query";
+import { ISession, IFilter } from ".";
 
 export enum Status {
   Pending = "pending",
@@ -23,11 +22,8 @@ export type Self = {
      */
     interviewee: number;
     rule: number;
-    session: ISession.Id; /** @deprecated */
+    session: ISession.Id;
   };
-  // sessionId has to be extracted from ids to be compatible with ILesson.Self 
-  // as ISession.Self is either a lesson.self or interview.self
-  sessionId: ISession.Id;
   /**
    * ISO UTC datetime.
    */
@@ -122,28 +118,3 @@ export type FindInterviewsApiQuery = IFilter.Pagination & {
   signed?: boolean;
   signers?: number[];
 };
-
-/**
- * @deprecated should be removed
- */
-export type FindPagedInterviewsProps = {
-  query: UseInfiniteQueryResult<
-    InfiniteData<
-      Paginated<{
-        interview: IInterview.Self;
-        session: ISession.Self;
-        members: ISession.PopuldatedMember[];
-      }>,
-      unknown
-    >,
-    Error
-  >;
-  list:
-    | {
-        interview: IInterview.Self;
-        session: ISession.Self;
-        members: ISession.PopuldatedMember[];
-      }[]
-    | null;
-  more: () => void;
-};
diff --git a/packages/types/src/peer.ts b/packages/types/src/peer.ts
deleted file mode 100644
index f63f14e5..00000000
--- a/packages/types/src/peer.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export type RegisterPeerIdApiPayload = {
-  peer: string;
-  session?: string;
-};
-
-export type DeletePeerIdApiQurey = {
-  session?: string;
-};
-
-export enum PeerType {
-  Tutor = "tutor",
-  Ghost = "ghost",
-}
-
-export type FindPeerIdApiQuery =
-  | {
-      type: PeerType.Tutor;
-      tutor: number;
-    }
-  | {
-      type: PeerType.Ghost;
-      session: string; // has to be string so zod check can pass
-    };
-
-export type FindPeerIdApiResponse = {
-  peer: string | null;
-};
diff --git a/packages/types/src/session.ts b/packages/types/src/session.ts
index ca76718a..90df372a 100644
--- a/packages/types/src/session.ts
+++ b/packages/types/src/session.ts
@@ -1,37 +1,2 @@
-import { IInterview, ILesson, IUser } from "@/index";
-
-export type Row = ILesson.Row | IInterview.Row;
-
-export type Self = ILesson.Self | IInterview.Self;
-
 export type Type = "lesson" | "interview";
 export type Id = `${Type}:${string}`;
-
-export type MemberRow = {
-  user_id: number;
-  session_id: Id;
-};
-
-export type Member = {
-  userId: number;
-  sessionId: Id;
-};
-
-export type PopuldatedMemberRow = {
-  session_id: Id;
-  user_id: number;
-  name: IUser.Row["name"];
-  image: IUser.Row["image"];
-  role: IUser.Role;
-};
-
-export type PopuldatedMember = {
-  sessionId: Id;
-  userId: number;
-  name: IUser.Self["name"];
-  image: IUser.Self["image"];
-  role: IUser.Role;
-};
-
-export type FindSessionMembersApiResponse = number[];
-export type FindUserSessionsApiResponse = Id[];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 512f3916..002971e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,7 +40,7 @@ importers:
         version: 5.0.10
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5)
+        version: 10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@4.9.5)
       vercel:
         specifier: ^34.2.7
         version: 34.4.0(@swc/core@1.9.3(@swc/helpers@0.5.13))
@@ -1210,6 +1210,9 @@ importers:
       rrule:
         specifier: ^2.8.1
         version: 2.8.1
+      uuid:
+        specifier: ^11.0.3
+        version: 11.0.3
       zod:
         specifier: ^3.23.8
         version: 3.23.8
@@ -1234,7 +1237,7 @@ importers:
         version: 5.1.2
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@22.10.1)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5))
+        version: 29.7.0(@types/node@20.17.9)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@20.17.9)(typescript@5.4.5))
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
@@ -1243,7 +1246,7 @@ importers:
         version: 0.13.0
       ts-jest:
         specifier: ^29.2.4
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@22.10.1)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@20.17.9)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@20.17.9)(typescript@5.4.5)))(typescript@5.4.5)
       ts-patch:
         specifier: ^3.2.1
         version: 3.2.1
@@ -12126,6 +12129,10 @@ packages:
     resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
 
+  uuid@11.0.3:
+    resolution: {integrity: sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==}
+    hasBin: true
+
   uuid@3.3.2:
     resolution: {integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==}
     deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
@@ -19674,7 +19681,7 @@ snapshots:
       '@typescript-eslint/parser': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5)
       eslint: 9.16.0(jiti@1.21.6)
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.16.0(jiti@1.21.6))
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
       eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6))
       eslint-plugin-jsx-a11y: 6.10.2(eslint@9.16.0(jiti@1.21.6))
       eslint-plugin-react: 7.37.2(eslint@9.16.0(jiti@1.21.6))
@@ -19722,13 +19729,13 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.16.0(jiti@1.21.6)):
+  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.3.7(supports-color@5.5.0)
       enhanced-resolve: 5.17.1
       eslint: 9.16.0(jiti@1.21.6)
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6))
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
       fast-glob: 3.3.2
       get-tsconfig: 4.8.1
       is-bun-module: 1.3.0
@@ -19752,14 +19759,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6)):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5)
       eslint: 9.16.0(jiti@1.21.6)
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.16.0(jiti@1.21.6))
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
     transitivePeerDependencies:
       - supports-color
 
@@ -19803,7 +19810,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.16.0(jiti@1.21.6)
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6))
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
       hasown: 2.0.2
       is-core-module: 2.15.1
       is-glob: 4.0.3
@@ -25342,6 +25349,26 @@ snapshots:
     optionalDependencies:
       '@swc/core': 1.9.3(@swc/helpers@0.5.13)
 
+  ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@4.9.5):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 22.10.1
+      acorn: 8.14.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.9.5
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    optionalDependencies:
+      '@swc/core': 1.9.3(@swc/helpers@0.5.13)
+
   ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
@@ -25650,6 +25677,8 @@ snapshots:
 
   utils-merge@1.0.1: {}
 
+  uuid@11.0.3: {}
+
   uuid@3.3.2: {}
 
   uuid@7.0.3: {}
diff --git a/services/server/fixtures/db.ts b/services/server/fixtures/db.ts
index 41bf3cdb..83dd27d3 100644
--- a/services/server/fixtures/db.ts
+++ b/services/server/fixtures/db.ts
@@ -120,7 +120,7 @@ const or = {
     if (!id) return await tutorManager().then((tutorManager) => tutorManager.id);
     return id;
   },
-  async sessionId(type: "lesson" | "interview"): Promise<ISession.Id> {
+  async sessionId(type: ISession.Type): Promise<ISession.Id> {
     return `${type}:${randomUUID()}`;
   },
   async ruleId(id?: number): Promise<number> {
diff --git a/services/server/src/handlers/chat.ts b/services/server/src/handlers/chat.ts
index 94f0c3d4..fe80c5de 100644
--- a/services/server/src/handlers/chat.ts
+++ b/services/server/src/handlers/chat.ts
@@ -1,4 +1,4 @@
-import { interviews, lessons, messages, rooms, users } from "@litespace/models";
+import { messages, rooms, users } from "@litespace/models";
 import { NextFunction, Request, Response } from "express";
 import safeRequest from "express-async-handler";
 import { isEmpty } from "lodash";
@@ -10,12 +10,10 @@ import {
   pageNumber,
   jsonBoolean,
   pageSize,
-  sessionId,
 } from "@/validation/utils";
 import { empty, exists, forbidden, notfound } from "@/lib/error";
 import {
   isAdmin,
-  isGhost,
   isTutorManager,
   isStudent,
   isTutor,
@@ -23,7 +21,6 @@ import {
 } from "@litespace/auth";
 import { IMessage, IRoom } from "@litespace/types";
 import { asFindUserRoomsApiRecord } from "@/lib/chat";
-import { asSessionId } from "@litespace/sol";
 
 const createRoomPayload = zod.object({ userId: id });
 const findRoomByMembersPayload = zod.object({ members: zod.array(id) });
@@ -40,8 +37,6 @@ const updateRoomPayload = zod.object({
   muted: zod.optional(zod.boolean()),
 });
 
-const findSessionRoomParams = zod.object({ sessionId: sessionId });
-
 async function createRoom(req: Request, res: Response, next: NextFunction) {
   const currentUser = req.user;
   const allowed = isUser(currentUser);
@@ -154,43 +149,6 @@ async function findRoomByMembers(
   res.status(200).json({ room });
 }
 
-/**
- *  @deprecated You can find room by members
- */
-async function findSessionRoom(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const allowed = isUser(user) || isGhost(user);
-  if (!allowed) return next(forbidden());
-
-  const { sessionId } = findSessionRoomParams.parse(req.params);
-  const sessionType = sessionId.split(":")[0];
-  const model = sessionType === "lesson" ? lessons : interviews;
-
-  const foundSession = await model.findBySessionId(asSessionId(sessionId));
-  if (!foundSession) return next(notfound.session());
-
-  const sessionMembers = await model.findSessionMembers(sessionId);
-  if (isEmpty(sessionMembers)) return next(notfound.session());
-
-  const memberIds = sessionMembers.map((member) => member.userId);
-  const isMember = isUser(user) && memberIds.includes(user.id);
-  const eligible = isMember || isAdmin(user) || isGhost(user);
-  if (!eligible) return next(forbidden());
-
-  const room = await rooms.findRoomByMembers(memberIds);
-  if (!room) return next(notfound.base());
-
-  const roomMembers = await rooms.findRoomMembers({ roomIds: [room] });
-  if (isEmpty(roomMembers)) return next(notfound.base());
-
-  const response: IRoom.FindSessionRoomApiResponse = {
-    room,
-    members: roomMembers,
-  } as const;
-
-  res.status(200).json(response);
-}
-
 async function findRoomMembers(
   req: Request,
   res: Response,
@@ -242,6 +200,5 @@ export default {
   findUserRooms: safeRequest(findUserRooms),
   findRoomByMembers: safeRequest(findRoomByMembers),
   findRoomMembers: safeRequest(findRoomMembers),
-  findSessionRoom: safeRequest(findSessionRoom),
   updateRoom: safeRequest(updateRoom),
 };
diff --git a/services/server/src/handlers/peer.ts b/services/server/src/handlers/peer.ts
deleted file mode 100644
index 836e3be1..00000000
--- a/services/server/src/handlers/peer.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { cache } from "@/lib/cache";
-import { bad, forbidden } from "@/lib/error";
-import { id, sessionId, string } from "@/validation/utils";
-import { isGhost, isStudent, isTutor } from "@litespace/auth";
-import { IPeer } from "@litespace/types";
-import { NextFunction, Request, Response } from "express";
-import safeRequest from "express-async-handler";
-import zod from "zod";
-
-const registerPeerIdPayload = zod.object({
-  peer: string,
-  session: zod.optional(sessionId),
-});
-
-const deletePeerIdQuery = zod.object({
-  session: zod.optional(sessionId),
-});
-
-const findPeerIdApiQuery = zod.union([
-  zod.object({
-    type: zod.literal(IPeer.PeerType.Tutor),
-    tutor: id,
-  }),
-  zod.object({
-    type: zod.literal(IPeer.PeerType.Ghost),
-    session: sessionId,
-  }),
-]);
-
-/**
- * @deprecated should be removed in favor of registering the peer id using web sockets.
- */
-async function registerPeerId(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const ghost = isGhost(user);
-  const tutor = isTutor(user);
-  const allowed = ghost || tutor;
-  if (!allowed) return next(forbidden());
-
-  const { peer, session }: IPeer.RegisterPeerIdApiPayload =
-    registerPeerIdPayload.parse(req.body);
-  if (ghost && !session) return next(bad());
-  if (ghost && session) await cache.peer.setGhostPeerId(session, peer);
-  if (tutor) await cache.peer.setUserPeerId(user.id, peer);
-  res.status(200).send();
-}
-
-/**
- * @deprecated should be removed in favor of de-registering the peer id using web sockets.
- */
-async function deletePeerId(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const ghost = isGhost(user);
-  const tutor = isTutor(user);
-  const allowed = ghost || tutor;
-  if (!allowed) return next(forbidden());
-
-  const { session }: IPeer.DeletePeerIdApiQurey = deletePeerIdQuery.parse(
-    req.query
-  );
-  if (ghost && !session) return next(bad());
-  if (ghost && session) await cache.peer.removeGhostPeerId(session);
-  if (tutor) await cache.peer.removeUserPeerId(user.id);
-
-  res.status(200).send();
-}
-
-async function findPeerId(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const allowed = isStudent(user) || isTutor(user);
-  if (!allowed) return next(forbidden());
-
-  const query: IPeer.FindPeerIdApiQuery = findPeerIdApiQuery.parse(req.query);
-  const peer =
-    query.type === IPeer.PeerType.Tutor
-      ? await cache.peer.getUserPeerId(query.tutor)
-      : await cache.peer.getGhostPeerId(query.session);
-
-  const response: IPeer.FindPeerIdApiResponse = { peer };
-  res.status(200).json(response);
-}
-
-export default {
-  registerPeerId: safeRequest(registerPeerId),
-  deletePeerId: safeRequest(deletePeerId),
-  findPeerId: safeRequest(findPeerId),
-};
diff --git a/services/server/src/handlers/session.ts b/services/server/src/handlers/session.ts
deleted file mode 100644
index 969f64e8..00000000
--- a/services/server/src/handlers/session.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { NextFunction, Request, Response } from "express";
-import safeRequest from "express-async-handler";
-import { forbidden, notfound } from "@/lib/error";
-import { isAdmin, isGhost, isUser } from "@litespace/auth";
-import { canJoinSession } from "@/lib/session";
-import { cache } from "@/lib/cache";
-import { ISession } from "@litespace/types";
-import zod from "zod";
-import { sessionId } from "@/validation/utils";
-import { interviews, lessons } from "@litespace/models";
-import { asSessionId } from "@litespace/sol";
-
-export const findSessionByIdParams = zod.object({ sessionId: sessionId });
-export const findSessionMembersParams = zod.object({ sessionId: sessionId });
-
-async function findSessionById(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const allowed = isUser(user) || isGhost(user);
-  if (!allowed) return next(forbidden());
-
-  const { sessionId } = findSessionByIdParams.parse(req.params);
-  const sessionType = sessionId.split(":")[0]; // lesson or interview
-
-  const model = sessionType === "lesson" ? lessons : interviews;
-
-  const [session, members] = await Promise.all([
-    model.findBySessionId(asSessionId(sessionId)),
-    model.findSessionMembers(sessionId),
-  ]);
-  if (!session) return next(notfound.session());
-
-  const member =
-    isUser(user) && members.map((member) => member.userId).includes(user.id);
-  const eligible = member || isAdmin(req.user) || isGhost(user);
-  if (!eligible) next(forbidden());
-
-  res.status(200).json({ session, members });
-}
-
-async function findSessionMembers(
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  const user = req.user;
-  const allowed = isUser(user);
-  if (!allowed) return next(forbidden());
-
-  const { sessionId } = findSessionMembersParams.parse(req.params);
-
-  const canJoin = await canJoinSession({
-    userId: user.id,
-    sessionId,
-  });
-
-  const eligible = canJoin || isAdmin(user);
-  if (!eligible) return next(forbidden());
-
-  const members = await cache.session.getMembers(asSessionId(sessionId));
-  const response: ISession.FindSessionMembersApiResponse = members;
-  res.status(200).json(response);
-}
-
-export default {
-  findSessionById: safeRequest(findSessionById),
-  findSessionMembers: safeRequest(findSessionMembers),
-};
diff --git a/services/server/src/index.ts b/services/server/src/index.ts
index 8253c965..7a04ea1c 100644
--- a/services/server/src/index.ts
+++ b/services/server/src/index.ts
@@ -73,7 +73,6 @@ app.use(
 app.use("/api/v1/auth", routes.auth);
 app.use("/api/v1/user", routes.user(context));
 app.use("/api/v1/rule", routes.rule(context));
-app.use("/api/v1/session", routes.session);
 app.use("/api/v1/lesson", routes.lesson(context));
 app.use("/api/v1/interview", routes.interview);
 app.use("/api/v1/rating", routes.rating);
@@ -88,7 +87,6 @@ app.use("/api/v1/topic", routes.topic);
 app.use("/api/v1/withdraw-method/", routes.withdrawMethod);
 app.use("/api/v1/asset", routes.asset);
 app.use("/api/v1/cache", routes.cache);
-app.use("/api/v1/peer", routes.peer);
 app.use(errorHandler);
 
 server.listen(serverConfig.port, serverConfig.host, () =>
diff --git a/services/server/src/lib/session.ts b/services/server/src/lib/session.ts
index 5f2646f7..b4331aa9 100644
--- a/services/server/src/lib/session.ts
+++ b/services/server/src/lib/session.ts
@@ -1,6 +1,6 @@
 import { unpackRules } from "@litespace/sol/rule";
-import { ISession, IInterview, ILesson, IRule } from "@litespace/types";
-import { concat, isEmpty } from "lodash";
+import { IInterview, ILesson, IRule } from "@litespace/types";
+import { concat, first, isEmpty } from "lodash";
 import dayjs from "@/lib/dayjs";
 import { platformConfig } from "@/constants";
 import { interviews, lessons } from "@litespace/models";
@@ -8,7 +8,7 @@ import { INTERVIEW_DURATION } from "@litespace/sol";
 import { asSessionId } from "@litespace/sol";
 
 // todo: impl: each tutor can have interview each 3 months.
-export function canBeInterviewed(sessions: ISession.Self[]): boolean {
+export function canBeInterviewed(sessions: IInterview.Self[]): boolean {
   if (isEmpty(sessions)) return true;
   return false;
 }
@@ -72,7 +72,7 @@ export async function canJoinSession({
   sessionId: string;
 }) {
   const now = dayjs.utc();
-  const sessionType = sessionId.split(":")[0];
+  const sessionType = first(sessionId.split(":"));
 
   if (sessionType === "lesson") {
     const lesson = await lessons.findBySessionId(asSessionId(sessionId));
diff --git a/services/server/src/middleware/accessControl.ts b/services/server/src/middleware/accessControl.ts
deleted file mode 100644
index 8d9850d5..00000000
--- a/services/server/src/middleware/accessControl.ts
+++ /dev/null
@@ -1,389 +0,0 @@
-import { IUser } from "@litespace/types";
-import UrlPattern from "url-pattern";
-import { isProduction } from "@/constants";
-import "colors";
-
-const owner = "owner";
-const authorized = "authorized";
-const unauthorized = "unauthorized";
-const superAdmin = IUser.Role.SuperAdmin;
-const regAdmin = IUser.Role.RegularAdmin;
-const tutorManager = IUser.Role.TutorManager;
-const tutor = IUser.Role.Tutor;
-const student = IUser.Role.Student;
-const provider = IUser.Role.Studio;
-
-export type Role = `${IUser.Role}` | "owner" | "unauthorized" | "authorized";
-export type Method = "POST" | "GET" | "PUT" | "DELETE";
-
-function roleMatch(requestRole: Role, policyRoles: Role[], isOwner?: boolean) {
-  const own = policyRoles.includes(owner) && !!isOwner;
-  const authorized =
-    policyRoles.includes("authorized") && requestRole !== "unauthorized";
-  const unauthorized = policyRoles.includes("unauthorized");
-  const exact = policyRoles.includes(requestRole);
-  return authorized || unauthorized || exact || own;
-}
-
-export function routeMatch(
-  url: string,
-  pattern: string,
-  ignore?: { key: string; value: string }
-): boolean {
-  const urlPattern = new UrlPattern(pattern);
-  const match = urlPattern.match(url) as Record<string, string> | null;
-  if (match === null) return false;
-  if (!ignore) return true;
-  return match[ignore.key] !== ignore.value;
-}
-
-function methodMatch(
-  requestMethod: Method,
-  policyMethods: Array<Method | "*">
-): boolean {
-  return policyMethods.includes(requestMethod) || policyMethods.includes("*");
-}
-
-type Policy = {
-  roles: Role[];
-  route: string;
-  methods: Array<Method | "*">;
-  ignore?: { key: string; value: string };
-};
-
-const policies: Array<Policy> = [
-  {
-    roles: [superAdmin],
-    route: "/*",
-    methods: ["*"],
-  },
-  {
-    roles: [authorized],
-    route: "/assets/*",
-    methods: ["GET"],
-  },
-  // use
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/user(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [tutor],
-    route: "(/)api/v1/user/interviewer/select(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, tutorManager],
-    route: "(/)api/v1/user/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/user/:id(/)",
-    methods: ["PUT"],
-    ignore: { key: "id", value: "me" },
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/user/me(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/user/tutor/meta/:tutorId(/)",
-    methods: ["GET"],
-  },
-  // tutors
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/tutor(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/tutor/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/tutor/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, tutor],
-    route: "(/)api/v1/tutor/:id(/)",
-    methods: ["DELETE"],
-  },
-  {
-    roles: [regAdmin, tutorManager, provider],
-    route: "(/)api/v1/tutor/media/*",
-    methods: ["GET"],
-  },
-  // coupons routes
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/coupon(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/coupon/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/coupon/code/:code(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/coupon/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/coupon/:id(/)",
-    methods: ["PUT", "DELETE"],
-  },
-  // invites routes
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/invite(/*)",
-    methods: ["*"],
-  },
-  // plans routes
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/plan(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/plan/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/plan/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/plan/:id(/)",
-    methods: ["PUT", "DELETE"],
-  },
-  // ratings routes
-  {
-    roles: [tutor, student],
-    route: "(/)api/v1/rating(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/rating/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/rating/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, owner],
-    route: "(/)api/v1/rating/list/rater/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/rating/list/ratee/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [owner],
-    route: "(/)api/v1/rating/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin, owner],
-    route: "(/)api/v1/rating/:id(/)",
-    methods: ["DELETE"],
-  },
-  // reports routes
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/:id(/)",
-    methods: ["DELETE"],
-  },
-  // report replies routes
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/reply/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply/report/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/reply/:id(/)",
-    methods: ["DELETE"],
-  },
-  // slots
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "me" },
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/me(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/slot/list/discrete/:userId(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin, tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["DELETE"],
-  },
-  // sessions
-  {
-    roles: [student, tutor],
-    route: "(/)api/v1/session(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin, owner],
-    route: "(/)api/v1/session/tutor/interviews/:id(/)",
-    methods: ["GET"],
-  },
-  // interviews
-  {
-    roles: [tutor],
-    route: "(/)api/v1/interview(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/interview/list/:userId(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [owner],
-    route: "(/)api/v1/interview/:interviewId(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [owner],
-    route: "(/)api/v1/interview/:id(/)",
-    methods: ["PUT"],
-  },
-  // subscriptions
-  {
-    roles: [student],
-    route: "(/)api/v1/subscription(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/subscription/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, student],
-    route: "(/)api/v1/subscription/:id(/)",
-    methods: ["GET", "PUT", "DELETE"],
-  },
-];
-
-export function enforce(request: {
-  role: Role;
-  route: string;
-  method: Method;
-  isOwner?: boolean;
-}): boolean {
-  for (const policy of policies) {
-    if (
-      roleMatch(request.role, policy.roles, request.isOwner) &&
-      routeMatch(request.route, policy.route, policy.ignore) &&
-      methodMatch(request.method, policy.methods)
-    ) {
-      if (!isProduction)
-        console.log(
-          [
-            "Access Control: ",
-            ` ↳ Matched policy: ${policy.roles.join(
-              ", "
-            )} - ${policy.methods.join(", ")} - ${policy.route}`,
-            ` ↳ Request: ${request.role} - ${request.method} ${
-              request.route
-            } - owner(${!!request.isOwner})`,
-          ].join("\n").cyan
-        );
-      return true;
-    }
-  }
-
-  return false;
-}
diff --git a/services/server/src/routes/chat.ts b/services/server/src/routes/chat.ts
index a4050bf4..52441a9f 100644
--- a/services/server/src/routes/chat.ts
+++ b/services/server/src/routes/chat.ts
@@ -8,7 +8,6 @@ router.get("/list/rooms/:userId", chat.findUserRooms);
 router.get("/list/:roomId/messages", chat.findRoomMessages);
 router.get("/room/by/members/", chat.findRoomByMembers);
 router.get("/room/members/:roomId", chat.findRoomMembers);
-router.get("/room/session/:sessionId", chat.findSessionRoom);
 router.put("/room/:roomId", chat.updateRoom);
 
 export default router;
diff --git a/services/server/src/routes/index.ts b/services/server/src/routes/index.ts
index 303b93b0..10e57379 100644
--- a/services/server/src/routes/index.ts
+++ b/services/server/src/routes/index.ts
@@ -1,5 +1,4 @@
 import user from "@/routes/user";
-import session from "@/routes/session";
 import interview from "@/routes/interview";
 import rating from "@/routes/rating";
 import chat from "@/routes/chat";
@@ -16,7 +15,6 @@ import withdrawMethod from "@/routes/withdrawMethod";
 import auth from "@/routes/auth";
 import topic from "@/routes/topic";
 import cache from "@/routes/cache";
-import peer from "@/routes/peer";
 
 export default {
   user,
@@ -24,7 +22,6 @@ export default {
   invoice,
   rule,
   withdrawMethod,
-  session,
   plan,
   chat,
   rating,
@@ -37,5 +34,4 @@ export default {
   auth,
   topic,
   cache,
-  peer,
 };
diff --git a/services/server/src/routes/peer.ts b/services/server/src/routes/peer.ts
deleted file mode 100644
index cb2ea150..00000000
--- a/services/server/src/routes/peer.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import peer from "@/handlers/peer";
-import { Router } from "express";
-
-const router = Router();
-
-router.post("/", peer.registerPeerId);
-router.delete("/", peer.deletePeerId);
-router.get("/", peer.findPeerId);
-
-export default router;
diff --git a/services/server/src/routes/session.ts b/services/server/src/routes/session.ts
deleted file mode 100644
index 947bebe2..00000000
--- a/services/server/src/routes/session.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Router } from "express";
-import session from "@/handlers/session";
-
-const router = Router();
-
-router.get("/:sessionId", session.findSessionById);
-router.get("/:sessionId/members", session.findSessionMembers);
-
-export default router;
diff --git a/services/server/src/wss/handlers/call.ts b/services/server/src/wss/handlers/call.ts
deleted file mode 100644
index af7ddc6d..00000000
--- a/services/server/src/wss/handlers/call.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { cache } from "@/lib/cache";
-import { canJoinCall } from "@/lib/call";
-import { isGhost } from "@litespace/auth";
-import { logger, safe } from "@litespace/sol";
-import { ICall, Wss } from "@litespace/types";
-import { WssHandler } from "@/wss/handlers/base";
-import { asCallRoomId } from "@/wss/utils";
-
-import zod from "zod";
-
-const callTypes = ["lesson", "interview"] as const satisfies ICall.Type[];
-const stdout = logger("wss");
-
-const onJoinCallPayload = zod.object({
-  callId: zod.number(),
-  type: zod.enum(callTypes),
-});
-const onLeaveCallPayload = zod.object({ callId: zod.number() });
-
-export class Call extends WssHandler {
-  public init(): Call {
-    this.socket.on(Wss.ClientEvent.JoinCall, this.onJoinCall.bind(this));
-    this.socket.on(Wss.ClientEvent.LeaveCall, this.onLeaveCall.bind(this));
-    return this;
-  }
-
-  /*
-   *  This event listener will be called whenever a user
-   *  joins a call. For instance, when
-   *  users are joining a lesson, or a tutor is joining an
-   *  interview.
-   */
-  async onJoinCall(data: unknown) {
-    const result = await safe(async () => {
-      const { callId, type } = onJoinCallPayload.parse(data);
-
-      const user = this.user;
-      // todo: add ghost as a member of the call
-      if (!user) return stdout.error("user undefined!");
-      if (isGhost(user)) return stdout.warning("Unsupported");
-
-      stdout.info(`User ${user.id} is joining call ${callId}.`);
-
-      const canJoin = await canJoinCall({
-        userId: user.id,
-        callType: type,
-        callId,
-      });
-
-      if (!canJoin) throw Error("Forbidden");
-
-      // add user to the call by inserting row to call_members relation
-      await cache.call.addMember({ userId: user.id, callId: callId });
-      this.socket.join(asCallRoomId(callId));
-
-      stdout.info(`User ${user.id} has joined call ${callId}.`);
-
-      // TODO: retrieve user data (ICall.PopulatedMember) from the database
-      // discuss with the team if shall we retrieve it from postgres,
-      // or store it in redis in the first place.
-
-      // notify members that a new member has joined the call
-      // NOTE: the user notifies himself as well that he successfully joined the call.
-      this.broadcast(
-        Wss.ServerEvent.MemberJoinedCall,
-        asCallRoomId(callId),
-        { userId: user.id }, // TODO: define the payload struct type in the types package
-        () => {}
-      );
-    });
-    if (result instanceof Error) stdout.error(result.message);
-  }
-
-  /*
-   *  This event listener will be called whenever a user
-   *  leaves a call. For instance, when users are leaving
-   *  a lesson, or a tutor is leaving an interview.
-   */
-  async onLeaveCall(data: unknown) {
-    const result = await safe(async () => {
-      const { callId } = onLeaveCallPayload.parse(data);
-
-      const user = this.user;
-      if (isGhost(user)) return;
-
-      stdout.info(`User ${user.id} is leaving call ${callId}.`);
-
-      // remove user from the call by deleting the corresponding row from call_members relation
-      await cache.call.removeMember({
-        userId: user.id,
-        callId: callId,
-      });
-
-      stdout.info(`User ${user.id} has left call ${callId}.`);
-
-      // notify members that a member has left the call
-      this.socket.broadcast
-        .to(asCallRoomId(callId))
-        .emit(Wss.ServerEvent.MemberLeftCall, {
-          userId: user.id,
-        }, () => {});
-    });
-    if (result instanceof Error) stdout.error(result.message);
-  }
-}
diff --git a/services/server/src/wss/handlers/connection.ts b/services/server/src/wss/handlers/connection.ts
index 1602cf7e..7168b8d0 100644
--- a/services/server/src/wss/handlers/connection.ts
+++ b/services/server/src/wss/handlers/connection.ts
@@ -73,6 +73,7 @@ export class Connection extends WssHandler {
     });
   }
 
+  // TODO: put some more thought on this function implementaion details
   private async joinRooms() {
     const error = await safe(async () => {
       const user = this.user;
@@ -87,7 +88,7 @@ export class Connection extends WssHandler {
       if (isStudent(this.user)) this.socket.join(Wss.Room.TutorsCache);
       if (isAdmin(this.user)) this.socket.join(Wss.Room.ServerStats);
 
-      // todo: get user sessions from cache
+      // TODO: get user sessions from cache
       const lessonsSessions = (await lessons.find({
         users: [user.id],
         full: true,
@@ -95,6 +96,10 @@ export class Connection extends WssHandler {
         before: dayjs.utc().add(1, "day").toISOString(),
       })).list.map(lesson => lesson.sessionId);
 
+      const interviewsSessions = (await interviews.find({
+        users: [user.id],
+      })).list.map(interview => interview.ids.session);
+
       this.socket.join([...lessonsSessions, ...interviewsSessions].map(
         (session) => asSessionRoomId(session))
       );
diff --git a/services/server/src/wss/handlers/index.ts b/services/server/src/wss/handlers/index.ts
index 1159f477..811d039a 100644
--- a/services/server/src/wss/handlers/index.ts
+++ b/services/server/src/wss/handlers/index.ts
@@ -4,21 +4,18 @@ import { IUser } from "@litespace/types";
 import { Session } from "@/wss/handlers/session";
 import { Connection } from "@/wss/handlers/connection";
 import { Messages } from "@/wss/handlers/message";
-import { Peer } from "@/wss/handlers/peer";
 import { InputDevices } from "./inputDevices";
 
 export class WssHandlers {
   public readonly connection: Connection;
   public readonly session: Session;
   public readonly messages: Messages;
-  public readonly peer: Peer;
   public readonly inputDevices: InputDevices;
 
   constructor(socket: Socket, user: IUser.Self | IUser.Ghost) {
     this.connection = new Connection(socket, user).init();
     this.session = new Session(socket, user).init();
     this.messages = new Messages(socket, user).init();
-    this.peer = new Peer(socket, user);
     this.inputDevices = new InputDevices(socket, user).init();
   }
 }
diff --git a/services/server/src/wss/handlers/inputDevices.ts b/services/server/src/wss/handlers/inputDevices.ts
index 514517f5..866e7776 100644
--- a/services/server/src/wss/handlers/inputDevices.ts
+++ b/services/server/src/wss/handlers/inputDevices.ts
@@ -4,6 +4,7 @@ import { Wss } from "@litespace/types";
 import { boolean, sessionId } from "@/validation/utils";
 import { WssHandler } from "@/wss/handlers/base";
 import zod from "zod";
+import { asSessionRoomId } from "../utils";
 
 const toggleCameraPayload = zod.object({ session: sessionId, camera: boolean });
 const toggleMicPayload = zod.object({ session: sessionId, mic: boolean });
@@ -26,10 +27,11 @@ export class InputDevices extends WssHandler {
       if (isGhost(user)) return;
       const { session, camera } = toggleCameraPayload.parse(data);
       // todo: add validation
-      this.broadcast(Wss.ServerEvent.CameraToggled, session, {
-        user: user.id,
-        camera,
-      });
+      this.broadcast(
+        Wss.ServerEvent.CameraToggled, 
+        asSessionRoomId(session), 
+        { user: user.id, camera }
+      );
     });
     if (error instanceof Error) stdout.error(error.message);
   }
@@ -40,10 +42,11 @@ export class InputDevices extends WssHandler {
       if (isGhost(user)) return;
       const { session, mic } = toggleMicPayload.parse(data);
       // todo: add validation
-      this.broadcast(Wss.ServerEvent.MicToggled, session, {
-        user: user.id,
-        mic,
-      });
+      this.broadcast(
+        Wss.ServerEvent.MicToggled, 
+        asSessionRoomId(session),
+        { user: user.id, mic }
+      );
     });
     if (error instanceof Error) stdout.error(error.message);
   }
diff --git a/services/server/src/wss/handlers/peer.ts b/services/server/src/wss/handlers/peer.ts
deleted file mode 100644
index 3b8667ef..00000000
--- a/services/server/src/wss/handlers/peer.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { asSessionId, logger, safe } from "@litespace/sol";
-import { isGhost, isTutor, isUser } from "@litespace/auth";
-import { Wss } from "@litespace/types";
-import { getGhostSession } from "@litespace/sol/ghost";
-import { cache } from "@/lib/cache";
-import { sessionId, string } from "@/validation/utils";
-import { WssHandler } from "@/wss/handlers/base";
-import zod from "zod";
-import { isEmpty } from "lodash";
-
-const peerPayload = zod.object({ sessionId: sessionId, peerId: string });
-const registerPeerPayload = zod.object({ peer: zod.string() });
-
-const stdout = logger("wss");
-
-/**
- * @deprecated should be removed in favor of the new call-cache-based design.
- */
-export class Peer extends WssHandler {
-  async peerOpened(data: unknown) {
-    const error = await safe(async () => {
-      const { sessionId, peerId } = peerPayload.parse(data);
-      const user = this.user;
-
-      const memberIds = await cache.session.getMembers(asSessionId(sessionId));
-      if (isEmpty(memberIds)) return;
-
-      const isMember = isUser(user) && memberIds.includes(user.id);
-      const allowed = isMember || isGhost(this.user);
-      if (!allowed) return;
-
-      this.socket.join(sessionId);
-      this.socket
-        .to(sessionId)
-        .emit(Wss.ServerEvent.UserJoinedSession, { peerId });
-    });
-    if (error instanceof Error) stdout.error(error.message);
-  }
-
-  async registerPeer(data: unknown) {
-    const result = await safe(async () => {
-      const { peer } = registerPeerPayload.parse(data);
-      const user = this.user;
-      const id = isGhost(user) ? user : user.email;
-      stdout.info(`Register peer: ${peer} for ${id}`);
-
-      if (isGhost(user))
-        await cache.peer.setGhostPeerId(getGhostSession(user), peer);
-      if (isTutor(user)) await cache.peer.setUserPeerId(user.id, peer);
-
-      // notify peers to refetch the peer id if needed
-    });
-    if (result instanceof Error) stdout.error(result.message);
-  }
-}
diff --git a/services/server/tests/wss/call.test.ts b/services/server/tests/wss/session.test.ts
similarity index 90%
rename from services/server/tests/wss/call.test.ts
rename to services/server/tests/wss/session.test.ts
index 06a52d76..570442a4 100644
--- a/services/server/tests/wss/call.test.ts
+++ b/services/server/tests/wss/session.test.ts
@@ -10,7 +10,7 @@ import { unpackRules } from "@litespace/sol/rule";
 import { expect } from "chai";
 import { cache } from "@/lib/cache";
 
-describe("calls test suite", () => {
+describe("sessions test suite", () => {
   let tutor: IUser.LoginApiResponse;
   let student: IUser.LoginApiResponse;
 
@@ -74,21 +74,21 @@ describe("calls test suite", () => {
 
     const { userId } = await studentResult;
 
-    const callMembersIds = await cache.session.getMembers(lesson.sessionId);
-    expect(callMembersIds).to.be.of.length(1);
-    expect(callMembersIds[0]).to.be.eq(tutor.user.id);
+    const sessionMembersIds = await cache.session.getMembers(lesson.sessionId);
+    expect(sessionMembersIds).to.be.of.length(1);
+    expect(sessionMembersIds[0]).to.be.eq(tutor.user.id);
     expect(userId).to.be.eq(tutor.user.id);
 
     const tutorResult = tutorSocket.wait(Wss.ServerEvent.MemberJoinedSession);
     studentSocket.joinSession(lesson.sessionId);
 
     const { userId: studentId } = await tutorResult;
-    const callMembersIdsSecondSnapshot = await cache.session.getMembers(
+    const sessionMembersIdsSecondSnapshot = await cache.session.getMembers(
       lesson.sessionId
     );
-    expect(callMembersIdsSecondSnapshot).to.be.of.length(2);
+    expect(sessionMembersIdsSecondSnapshot).to.be.of.length(2);
     expect(
-      callMembersIdsSecondSnapshot.map((memberId) => memberId)
+      sessionMembersIdsSecondSnapshot.map((memberId) => memberId)
     ).to.be.members([student.user.id, tutor.user.id]);
 
     expect(studentId).to.be.eq(student.user.id);
@@ -143,7 +143,7 @@ describe("calls test suite", () => {
     studentSocket.client.disconnect();
   });
 
-  it("should NOT broadcast when user tries to join a call before its start", async () => {
+  it("should NOT broadcast when user tries to join a session before its start", async () => {
     const now = dayjs();
     const rule = await tutorApi.atlas.rule.create({
       start: now.add(1, "day").utc().startOf("day").toISOString(),