Fix last report at (#147)

Author: idormenco

server/src/api/mentorship-request/controllers/mentorship-request.js

@@ -53,13 +53,15 @@ module.exports = createCoreController(
       // Add `lastReport` field based on user.reports
       const withLastReport = sanitizedEntities.map((entity) => {
         const reports = entity.user?.reports || [];
-        const lastReportAt = reports.length
-          ? reports[reports.length - 1]
-          : null;
+        const lastReport = reports.length ? reports[reports.length - 1] : null;
 
+        console.log(lastReport);
         return {
           ...entity,
-          lastReportAt: lastReportAt ? lastReport.createdAt : null,
+          user: {
+            ...entity.user,
+            lastReportAt: lastReport ? lastReport.createdAt : null,
+          },
         };
       });
 
@@ -98,11 +100,14 @@ module.exports = createCoreController(
 
       const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
       const reports = sanitizedEntity.user?.reports || [];
-      const lastReportAt = reports.length ? reports[reports.length - 1] : null;
+      const lastReport = reports.length ? reports[reports.length - 1] : null;
 
       return {
         ...sanitizedEntity,
-        lastReportAt: lastReportAt ? lastReport.createdAt : null,
+        user: {
+          ...sanitizedEntity.user,
+          lastReportAt: lastReport ? lastReport.createdAt : null,
+        },
       };
     },
   })