From 4c6f82a350ba5a6741035ac37061f8f9c7056d93 Mon Sep 17 00:00:00 2001
From: MAwaisMansoor <awaismansoor4444@gmail.com>
Date: Wed, 23 Mar 2022 09:58:38 +0000
Subject: [PATCH] refactored code

---
 .../src/modules/classroom/classroom.service.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/api/src/modules/classroom/classroom.service.ts b/apps/api/src/modules/classroom/classroom.service.ts
index 5b4d97a..2cb4a52 100644
--- a/apps/api/src/modules/classroom/classroom.service.ts
+++ b/apps/api/src/modules/classroom/classroom.service.ts
@@ -30,6 +30,12 @@ export default class ClassroomService {
     })
   }
 
+  getMemberInAction(classroomId: string, userId: string) {
+    return this.prismaService.classroomMember.findUnique({
+      where: { classroomId, userId },
+    })
+  }
+
   async getClassroomInviteCode(classroomId: string, user: User) {
     const memberRecord = await this.getClassroomById(classroomId).members({
       where: { userId: user.id },
@@ -119,12 +125,10 @@ export default class ClassroomService {
     classroomId: string,
     userId: string,
     memberId: string,
-    role: string) {
+    role: ClassroomRole) {
 
     //get user from the classroom
-    const memberInAction = await this.prismaService.classroomMember.findUnique({
-      where: { classroomId, userId },
-    })
+    const memberInAction = this.getMemberInAction(classroomId, userId)
 
     //check if user exists in the classroom
     if (!memberInAction) {
@@ -155,7 +159,7 @@ export default class ClassroomService {
     //update member role
     return this.prismaService.classroomMember.update({
       where: { classroomId, userId },
-      data: { classroomRole: role.toUpperCase() },
+      data: { classroomRole: role },
     })
   }
 
@@ -165,9 +169,7 @@ export default class ClassroomService {
     memberId: string) {
 
     //get member who tries to remove someone from the classroom
-    const memberInAction = await this.prismaService.classroomMember.findUnique({
-      where: { classroomId, userId },
-    })
+    const memberInAction = this.getMemberInAction(classroomId, userId)
 
     //check if member exists in the classroom
     if (!memberInAction) {