From 0fb639b1b559ae278aa914ec62951279baab3f5d Mon Sep 17 00:00:00 2001
From: thegreenmilecomposer <elise.engel@accenture.com>
Date: Fri, 7 Nov 2025 13:53:35 +0100
Subject: [PATCH 1/2] fix(backend): published null set to true

---
 packages/backend/src/resolvers/comment.resolver.ts | 1 +
 packages/backend/src/resolvers/trainer.resolver.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/backend/src/resolvers/comment.resolver.ts b/packages/backend/src/resolvers/comment.resolver.ts
index f67702ef..88300f9b 100644
--- a/packages/backend/src/resolvers/comment.resolver.ts
+++ b/packages/backend/src/resolvers/comment.resolver.ts
@@ -70,6 +70,7 @@ export const commentResolver: GqlResolvers<AuthenticatedContext> = {
         ? {
             ...report,
             comments: report?.comments.map((com) => {
+              if (com.published == null) com.published = true
               if (com.published === false) {
                 return com
               } else {
diff --git a/packages/backend/src/resolvers/trainer.resolver.ts b/packages/backend/src/resolvers/trainer.resolver.ts
index c95245b5..97089cfa 100644
--- a/packages/backend/src/resolvers/trainer.resolver.ts
+++ b/packages/backend/src/resolvers/trainer.resolver.ts
@@ -35,6 +35,7 @@ export const trainerResolver: GqlResolvers<TrainerContext> = {
         ? {
             ...report,
             comments: report?.comments.map((com) => {
+              if (com.published == null) com.published = true
               if (com.published === false) {
                 return com
               } else {

From 76d4a55460fc0648ee219f53d82b8889e361df4f Mon Sep 17 00:00:00 2001
From: Julian-Wogersien <julian.wogersien@accenture.com>
Date: Mon, 17 Nov 2025 11:06:41 +0100
Subject: [PATCH 2/2] chore: clean

---
 .../backend/src/resolvers/comment.resolver.ts | 49 ++-----------------
 .../backend/src/resolvers/trainer.resolver.ts | 47 +-----------------
 2 files changed, 5 insertions(+), 91 deletions(-)

diff --git a/packages/backend/src/resolvers/comment.resolver.ts b/packages/backend/src/resolvers/comment.resolver.ts
index 88300f9b..b8193357 100644
--- a/packages/backend/src/resolvers/comment.resolver.ts
+++ b/packages/backend/src/resolvers/comment.resolver.ts
@@ -66,58 +66,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 == null) com.published = true
-              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 }) => {
diff --git a/packages/backend/src/resolvers/trainer.resolver.ts b/packages/backend/src/resolvers/trainer.resolver.ts
index 97089cfa..62648903 100644
--- a/packages/backend/src/resolvers/trainer.resolver.ts
+++ b/packages/backend/src/resolvers/trainer.resolver.ts
@@ -31,54 +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 == null) com.published = true
-              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: {