@magmamath/students-features 0.2.1 → 0.2.3

package/src/features/feedback/model/teacherFeedback.model.ts

@@ -10,7 +10,6 @@ import {
 import {
   CommentsEntity,
   GetCommentsByIdProps,
-  GetCommentsByIdResponse,
   Locale,
   TeacherComment,
   UpdateCommentSeenStatusProps,
@@ -31,20 +30,28 @@ type TeacherFeedbackModelProps = {
   }
 }
 
+type CommentsMap = Map<string, Record<string, CommentsEntity>>
+
 export class TeacherFeedbackModel {
   $assignmentId: StoreWritable<string>
   $currentProblemId: StoreWritable<string>
   $locale: StoreWritable<Locale | null>
 
   setCommentsSeen = createEvent<{ ids: string[]; currentProblemId: string; assignmentId: string }>()
-  $comments = createStore<Map<string, Record<string, CommentsEntity>>>(new Map())
+  $comments = createStore<CommentsMap>(new Map())
 
   setIsOpened = createEvent<boolean>()
   $isOpened = restore(this.setIsOpened, false)
   setIsVisible = createEvent<boolean>()
   $isVisible = restore(this.setIsVisible, false)
 
-  getCommentsByAssignmentIdFx: Effect<GetCommentsByIdProps, GetCommentsByIdResponse>
+  getCommentsByAssignmentIdFx: Effect<
+    GetCommentsByIdProps,
+    {
+      data: Record<string, { comments: TeacherComment[] }>
+      assignmentId: string
+    }
+  >
   updateCommentSeenFx: Effect<UpdateCommentSeenStatusProps, void>
 
   sockets = {
@@ -53,7 +60,7 @@ export class TeacherFeedbackModel {
   }
 
   constructor({ api, credits }: TeacherFeedbackModelProps) {
-    this.getCommentsByAssignmentIdFx = createEffect(async ({ id }: GetCommentsByIdProps) => {
+    this.getCommentsByAssignmentIdFx = createEffect(async ({ id }: { id: string }) => {
       const response = await api.getCommentsByAssignmentId({ id })
       return {
         data: response,
@@ -195,9 +202,10 @@ export class TeacherFeedbackModel {
             : feedback.unreadMessagesCount,
         }
 
+        const isOpen = this.$isOpened.getState()
+
         if (updatedFeedback.comments.length === 0) {
           const updatedAssignmentComments = { ...assignmentComments }
-          const isOpen = this.$isOpened.getState()
 
           if (!isOpen) {
             delete updatedAssignmentComments[payload.problemId]
@@ -207,11 +215,11 @@ export class TeacherFeedbackModel {
               updatedState.delete(assignmentId)
               return updatedState
             }
-          }
-
-          updatedAssignmentComments[payload.problemId] = {
-            ...updatedFeedback,
-            comments: [getEmptyComment(payload.problemId, this.$locale.getState())],
+          } else {
+            updatedAssignmentComments[payload.problemId] = {
+              ...updatedFeedback,
+              comments: [getEmptyComment(payload.problemId, this.$locale.getState())],
+            }
           }
 
           const updatedState = new Map(state)

package/src/features/feedback/types/teacherFeedback.types.ts

@@ -1,9 +1,4 @@
 export type GetCommentsByIdProps = { id: string }
-export type GetCommentsByIdResponse = {
-  data: Record<string, { comments: TeacherComment[] }>
-  assignmentId: string
-}
-
 export type UpdateCommentSeenStatusProps = { ids: string[] }
 
 export type TeacherComment = {