refactor: rebuild displayComment endpoit

VirtusLab-Open-Source · Jul 17, 2023 · cf3d830 · cf3d830
1 parent 0be2b6d
commit cf3d830
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 26 deletions.
diff --git a/admin/src/pages/DashboardPage/components/LatestComments/index.tsx b/admin/src/pages/DashboardPage/components/LatestComments/index.tsx
@@ -104,9 +104,13 @@ const LatestComments = ({ config }) => {
     },
   };
 
+  console.log(result)
+
   const emptyContent = _q ? 'search' : 'comments';
 
+  const unreadedComments = result ? result.filter(entity => entity.displayedBy.length === 0).length : null;
 
+  const subtitle = <Typography variant='omega' fontSize='20px'>You have {unreadedComments} unreaded comments</Typography>;
 
   return canAccess ? (
         <Layout>
@@ -117,6 +121,8 @@ const LatestComments = ({ config }) => {
               <PanelLayout>
                 <StyledHeader>
                 <Typography variant='beta' fontSize='30px'>Latest Comments</Typography>
+                <br/>
+                {subtitle}
                 </StyledHeader>
                   {!isEmpty(result) ? (
                       <Table colCount={COL_COUNT} rowCount={result.length}>

diff --git a/content-types/comment.ts b/content-types/comment.ts
@@ -95,7 +95,7 @@ export default {
     },
     displayedBy: {
       type: "relation",
-      relation: "oneToMany",
+      relation: "manyToMany",
       target: "plugin::users-permissions.user",
       configurable: false
     }

diff --git a/server/controllers/admin.ts b/server/controllers/admin.ts
@@ -276,7 +276,7 @@ const controllers: IControllerAdmin = {
   ): ThrowablePromisedResponse<Comment> {
 
     const { params = {}, request } = ctx;
-    const { body }: ToBeFixed = request;
+    const { body }: StrapiAdminUser = request;
     const { id } = parseParams(params);
 
     try {
@@ -289,23 +289,6 @@ const controllers: IControllerAdmin = {
     }
   },
 
-  async displayComment(
-    ctx: StrapiRequestContext<never>
-  ): ThrowablePromisedResponse<Comment> {
-
-    const { params = {}, request } = ctx;
-    const { body }: StrapiAdminUser = request;
-    const { id } = parseParams(params);
-
-    try {
-      return await this.getService<IServiceAdmin>().displayComment(
-        id,
-        body.displayedBy,
-      );
-    } catch (e) {
-      throw throwError(ctx, e);
-    }
-  },
 
   async approveComment(
     ctx: StrapiRequestContext<never>,
@@ -328,6 +311,25 @@ const controllers: IControllerAdmin = {
       throw throwError(ctx, e);
     }
   },
+
+
+  async displayComment(
+    ctx: StrapiRequestContext<never>
+  ): ThrowablePromisedResponse<Comment> {
+
+    const { params = {}, request } = ctx;
+    const { body }:ToBeFixed = request;
+    const { id } = parseParams(params);
+
+    try {
+      return await this.getService<IServiceAdmin>().displayComment(
+        id,
+        body
+      );
+    } catch (e) {
+      throw throwError(ctx, e);
+    }
+  },
 };
 
 export default controllers;
diff --git a/server/services/admin.ts b/server/services/admin.ts
@@ -33,7 +33,7 @@ import {
   getModelUid,
   getRelatedGroups,
   filterOurResolvedReports,
-  getAuthorName,
+  getAuthorName
 } from "./utils/functions";
 import { APPROVAL_STATUS, REGEX } from "./../utils/constants";
 
@@ -189,6 +189,7 @@ export = ({ strapi }: StrapiContext): IServiceAdmin => ({
               resolved: false,
             },
           },
+          displayedBy: true,
         },
       });
     const total = await strapi.db.query<Comment>(getModelUid("comment")).count({
@@ -738,17 +739,67 @@ export = ({ strapi }: StrapiContext): IServiceAdmin => ({
   async displayComment(
     this: IServiceAdmin,
     id: Id,
-    body: ToBeFixed,
+    body: string,
   ): Promise<Comment> {
+
+    const defaultAuthorUserPopulate = this.getDefaultAuthorPopulate();
+
+    const reportsPopulation = {
+      reports: {
+        where: {
+          resolved: false,
+        },
+      },
+    };
+
+    const defaultPopulate = {
+      populate: {
+        authorUser: defaultAuthorUserPopulate,
+        threadOf: {
+          populate: {
+            authorUser: defaultAuthorUserPopulate,
+            ...reportsPopulation,
+          },
+        },
+        ...reportsPopulation,
+        displayedBy: true
+      },
+    };
+
+    const entity = await strapi.db
+      .query<Comment>(getModelUid("comment"))
+      .findOne({
+        where: { id },
+        ...defaultPopulate,
+      });
+
+    if (!entity) {
+      throw new PluginError(404, "Not found");
+    }
+
+    const user: StrapiAdminUser = await strapi.plugins['users-permissions'].services.user.fetch({ id: body });
+
+    if (!user) {
+      throw new PluginError(404, "Not found");
+    }
+
+    const isUserExistingInRelation = entity.displayedBy?.findIndex( user => user.id === body);
+
+    if ( isUserExistingInRelation !== -1) {
+      throw new PluginError(403, "User is already existing in this relation field");
+    }
+
+    const updatedDisplayedBy = entity.displayedBy?.push(user);
+
     const displayComment = await strapi.db
       .query<Comment>(getModelUid("comment"))
       .update({
         where: { id },
-        data: {
-          displayedBy: body
-        }
+        data: { displayedBy: updatedDisplayedBy}
+
       });
-    return this.getCommonService().sanitizeCommentEntity(displayComment);
+
+      return this.getCommonService().sanitizeCommentEntity(displayComment);
   },
 
   // Recognize Strapi User fields possible to populate

diff --git a/types/services.d.ts b/types/services.d.ts
@@ -152,7 +152,7 @@ export interface IServiceAdmin {
     | undefined;
   postComment(threadId: Id, body: string, author: StrapiAdminUser): Promise<Comment>;
   updateComment(id: Id, body: string): Promise<Comment>;
-  displayComment(id: Id, body: StrapiAdminUser): Promise<Comment>;
+  displayComment(id: Id, body: Id): Promise<Comment>;
 }
 
 export interface IServiceClient {