Merge pull request #381 from lara-learning/chore/clean

Chore/clean

Author: Julian-Wogersien

packages/backend/src/resolvers/comment.resolver.ts

@@ -70,57 +70,15 @@ export const commentResolver: GqlResolvers<AuthenticatedContext> = {
     createCommentOnReport: async (_parent, { id, text, traineeId }, { currentUser }) => {
       const report = await reportById(id)
 
-      const reportCleaned = report
-        ? {
-            ...report,
-            comments: report?.comments.map((com) => {
-              if (com.published === false) {
-                return com
-              } else {
-                return {
-                  ...com,
-                  published: true,
-                }
-              }
-            }),
-            days: report?.days.map((day) => ({
-              ...day,
-              entries: day.entries.map((entry) => ({
-                ...entry,
-                comments: entry.comments.map((com) => {
-                  if (com.published === false) {
-                    return com
-                  } else {
-                    return {
-                      ...com,
-                      published: true,
-                    }
-                  }
-                }),
-              })),
-              comments: day.comments.map((com) => {
-                if (com.published === false) {
-                  return com
-                } else {
-                  return {
-                    ...com,
-                    published: true,
-                  }
-                }
-              }),
-            })),
-          }
-        : undefined
-
-      if (reportCleaned?.traineeId !== traineeId) {
+      if (report?.traineeId !== traineeId) {
         throw new GraphQLError(t('errors.missingReport', currentUser.language))
       }
 
       return createCommentOnCommentable({
-        commentable: reportCleaned,
+        commentable: report,
         text,
         currentUser,
-        report: reportCleaned,
+        report: report,
       })
     },
     updateCommentOnDay: async (_parent, { id, text, traineeId, commentId }, { currentUser }) => {

packages/backend/src/resolvers/trainer.resolver.ts

@@ -31,53 +31,11 @@ export const trainerResolver: GqlResolvers<TrainerContext> = {
 
       const report = await reportByYearAndWeek(year, week, trainee.id)
 
-      const reportCleaned = report
-        ? {
-            ...report,
-            comments: report?.comments.map((com) => {
-              if (com.published === false) {
-                return com
-              } else {
-                return {
-                  ...com,
-                  published: true,
-                }
-              }
-            }),
-            days: report?.days.map((day) => ({
-              ...day,
-              entries: day.entries.map((entry) => ({
-                ...entry,
-                comments: entry.comments.map((com) => {
-                  if (com.published === false) {
-                    return com
-                  } else {
-                    return {
-                      ...com,
-                      published: true,
-                    }
-                  }
-                }),
-              })),
-              comments: day.comments.map((com) => {
-                if (com.published === false) {
-                  return com
-                } else {
-                  return {
-                    ...com,
-                    published: true,
-                  }
-                }
-              }),
-            })),
-          }
-        : undefined
-
-      if (!reportCleaned || reportCleaned.traineeId !== trainee.id) {
+      if (!report || report.traineeId !== trainee.id) {
         throw new GraphQLError(t('errors.missingReport'))
       }
 
-      return reportCleaned
+      return report
     },
   },
   Mutation: {