refactor(backend): improve join call events logic

litespace-org · Dec 2, 2024 · 9bbbc92 · 9bbbc92
1 parent 9a01806
commit 9bbbc92
Show file tree

Hide file tree

Showing 10 changed files with 191 additions and 221 deletions.
diff --git a/apps/nova/src/components/Chat/MessageGroup.tsx b/apps/nova/src/components/Chat/MessageGroup.tsx
diff --git a/apps/nova/src/components/UpcomingLessons/Content.tsx b/apps/nova/src/components/UpcomingLessons/Content.tsx
@@ -16,11 +16,7 @@ export const Content: React.FC<ContentProps> = ({ query }) => {
   const canceled = useCallback(
     (item: Lessons[0], tutor: ILesson.PopuldatedMember) => {
       if (!item.lesson.canceledBy && !item.lesson.canceledBy) return null;
-      if (
-        item.lesson.canceledBy === tutor.userId ||
-        item.call.canceledBy === tutor.userId
-      )
-        return "tutor";
+      if (item.lesson.canceledBy === tutor.userId) return "tutor";
       return "student";
     },
     []
@@ -51,8 +47,8 @@ export const Content: React.FC<ContentProps> = ({ query }) => {
         return (
           <LessonCard
             key={item.lesson.id}
-            start={item.call.start}
-            duration={item.call.duration}
+            start={item.lesson.start}
+            duration={item.lesson.duration}
             onJoin={() => console.log("join")}
             onCancel={() => console.log("canceled")}
             onRebook={() => console.log("rebook")}

diff --git a/packages/models/src/calls.ts b/packages/models/src/calls.ts
@@ -38,7 +38,10 @@ export class Calls {
     callId,
     userId,
     tx,
-  }: WithOptionalTx<{ callId: number; userId: number }>): Promise<ICall.Member> {
+  }: WithOptionalTx<{
+    callId: number;
+    userId: number;
+  }>): Promise<ICall.Member> {
     const rows = await this.builder(tx)
       .members.insert({
         call_id: callId,

diff --git a/packages/models/tests/calls.test.ts b/packages/models/tests/calls.test.ts
@@ -27,8 +27,8 @@ describe(nameof(Calls), () => {
       expect(await calls.findCallMembers([call.id])).to.be.of.length(0);
 
       const member = await calls.addMember({
-        call: call.id,
-        user: tutor.id,
+        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);
@@ -44,15 +44,15 @@ describe(nameof(Calls), () => {
       expect(await calls.findCallMembers([call.id])).to.be.of.length(0);
 
       await calls.addMember({
-        call: call.id,
-        user: tutor.id,
+        callId: call.id,
+        userId: tutor.id,
       });
 
       expect(await calls.findCallMembers([call.id])).to.be.of.length(1);
 
       await calls.removeMember({
-        call: call.id,
-        user: tutor.id,
+        callId: call.id,
+        userId: tutor.id,
       });
 
       expect(await calls.findCallMembers([call.id])).to.be.of.length(0);

diff --git a/packages/models/tsconfig.json b/packages/models/tsconfig.json
@@ -6,12 +6,12 @@
     "strict": true,
     "baseUrl": "./",
     "skipLibCheck": true,
-    "module": "ESNext",
+    "module": "nodenext",
     "declaration": true,
     "declarationDir": "types",
     "sourceMap": true,
     "outDir": "dist",
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "allowSyntheticDefaultImports": true,
     "emitDeclarationOnly": true,
     "resolveJsonModule": true,

diff --git a/packages/types/src/call.ts b/packages/types/src/call.ts
@@ -73,3 +73,5 @@ export type FindUserCallsApiResponse = {
   calls: Self[];
   members: Record<string, PopuldatedMember[]>;
 };
+
+export type Type = "lesson" | "interview";
diff --git a/packages/types/src/wss.ts b/packages/types/src/wss.ts
@@ -1,4 +1,4 @@
-import { IMessage, IRule, ITutor, Server } from "@/index";
+import { IMessage, IRule, ITutor, Server, ICall } from "@/index";
 
 /**
  * Events emitted by the client
@@ -37,6 +37,9 @@ export enum ServerEvent {
   MemberJoinedCall = "MemberJoinedCallId",
   MemberLeftCall = "MemberLeftCallId",
 
+  /**
+   * @deprecated
+   */
   UserJoinedCall = "UserJoinedCall",
   UserSharedScreen = "UserSharedScreen",
   UserStatusChanged = "UserStatusChanged",
@@ -81,7 +84,10 @@ export type ClientEventsMap = {
   [ClientEvent.ToggleCamera]: EventCallback<{ call: number; camera: boolean }>;
   [ClientEvent.ToggleMic]: EventCallback<{ call: number; mic: boolean }>;
   [ClientEvent.UserTyping]: EventCallback<{ roomId: number }>;
-  [ClientEvent.JoinCall]: EventCallback<{ callId: number }>;
+  [ClientEvent.JoinCall]: EventCallback<{
+    callId: number;
+    type: ICall.Type;
+  }>;
   [ClientEvent.LeaveCall]: EventCallback<{ callId: number }>;
 };
 
@@ -98,8 +104,8 @@ export type ServerEventsMap = {
 
   [ServerEvent.UserJoinedCall]: EventCallback<{ peerId: string }>;
 
-  [ServerEvent.MemberJoinedCall]: EventCallback<{ memberId: number }>;
-  [ServerEvent.MemberLeftCall]: EventCallback<{ memberId: number }>;
+  [ServerEvent.MemberJoinedCall]: EventCallback<{ userId: number }>;
+  [ServerEvent.MemberLeftCall]: EventCallback<{ userId: number }>;
 
   [ServerEvent.CameraToggled]: EventCallback<{ user: number; camera: boolean }>;
   [ServerEvent.MicToggled]: EventCallback<{ user: number; mic: boolean }>;

diff --git a/services/server/fixtures/api.ts b/services/server/fixtures/api.ts
@@ -35,7 +35,6 @@ export class Api {
   static async forUser(role: IUser.Role) {
     const email = faker.internet.email();
     const password = faker.internet.password();
-    // NOTE: should be db.createUser
     await db.user({ role, email, password });
     return await Api.fromCredentials(email, password);
   }