Merge pull request #239 from aXenDeveloper/forum/stats

feat(forum): Add stats to forum item
VitNode · Mar 1, 2024 · 0bbfab6 · 0bbfab6
2 parents a9531cf + 9a66625
commit 0bbfab6
Show file tree

Hide file tree

Showing 39 changed files with 1,319 additions and 1,115 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -64,10 +64,10 @@
     "@types/archiver": "^6.0.2",
     "@types/bcrypt": "^5.0.2",
     "@types/busboy": "^1.5.3",
-    "@types/cookie-parser": "^1.4.6",
+    "@types/cookie-parser": "^1.4.7",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.11.22",
+    "@types/node": "^20.11.24",
     "@types/object-path": "^0.11.4",
     "@types/pg": "^8.11.2",
     "@types/supertest": "^6.0.2",

diff --git a/backend/schema.gql b/backend/schema.gql
@@ -49,7 +49,6 @@ type CreateForumForumsObj {
   description: [TextLanguage!]!
   id: Int!
   name: [TextLanguage!]!
-  parent: ShowForumForums
   position: Int!
 }
 
@@ -184,6 +183,7 @@ type Query {
   admin__forum_forums__show(
     cursor: Int
     first: Int
+    ids: [Int!]
     last: Int
     parent_id: Int
     search: String
@@ -464,23 +464,13 @@ type ShowCoreThemesObj {
   pageInfo: PageInfo!
 }
 
-type ShowForumForums {
-  _count: ShowForumForumsCounts!
-  created: Int!
-  description: [TextLanguage!]!
-  id: Int!
-  name: [TextLanguage!]!
-  position: Int!
-}
-
 type ShowForumForumsAdmin {
   _count: ShowForumForumsCounts!
   children: [ChildrenShowForumForums!]!
   created: Int!
   description: [TextLanguage!]!
   id: Int!
   name: [TextLanguage!]!
-  parent: ShowForumForums
   permissions: PermissionsForumForumsAdmin!
   position: Int!
 }
@@ -491,24 +481,24 @@ type ShowForumForumsAdminObj {
 }
 
 type ShowForumForumsCounts {
-  children: Int!
   posts: Int!
   topics: Int!
+  total_posts: Int!
+  total_topics: Int!
 }
 
 type ShowForumForumsObj {
-  edges: [ShowForumForumsWithParent!]!
+  edges: [ShowForumForumsWithChildren!]!
   pageInfo: PageInfo!
 }
 
-type ShowForumForumsWithParent {
+type ShowForumForumsWithChildren {
   _count: ShowForumForumsCounts!
   children: [ChildrenShowForumForums!]!
   created: Int!
   description: [TextLanguage!]!
   id: Int!
   name: [TextLanguage!]!
-  parent: ShowForumForums
   permissions: PermissionsForumForums!
   position: Int!
 }

diff --git a/backend/src/apps/admin/forum/forum.module.ts b/backend/src/apps/admin/forum/forum.module.ts
@@ -11,6 +11,8 @@ import { EditForumForumsService } from "./forums/edit/edit.service";
 import { DeleteForumForumsResolver } from "./forums/delete/delete.resolver";
 import { DeleteForumForumsService } from "./forums/delete/delete.service";
 
+import { ForumsForumModule } from "@/apps/forum/forums/forums.module";
+
 @Module({
   providers: [
     CreateForumForumsService,
@@ -23,6 +25,7 @@ import { DeleteForumForumsService } from "./forums/delete/delete.service";
     EditForumForumsService,
     DeleteForumForumsResolver,
     DeleteForumForumsService
-  ]
+  ],
+  imports: [ForumsForumModule]
 })
 export class AdminForumModule {}
diff --git a/backend/src/apps/admin/forum/forums/create/create.service.ts b/backend/src/apps/admin/forum/forums/create/create.service.ts
@@ -94,18 +94,7 @@ export class CreateForumForumsService {
       with: {
         name: true,
         description: true,
-        permissions: true,
-        parent: {
-          with: {
-            name: true,
-            description: true,
-            topics: {
-              with: {
-                posts: true
-              }
-            }
-          }
-        }
+        permissions: true
       }
     });
 
@@ -116,24 +105,12 @@ export class CreateForumForumsService {
     return {
       ...forum,
       _count: {
-        children: 0,
         topics: 0,
-        posts: 0
+        posts: 0,
+        total_posts: 0,
+        total_topics: 0
       },
-      children: [],
-      parent: forum.parent
-        ? {
-            ...forum.parent,
-            _count: {
-              children: 0,
-              topics: forum.parent.topics.length,
-              posts: forum.parent.topics.reduce(
-                (acc, item) => acc + item.posts.length,
-                0
-              )
-            }
-          }
-        : null
+      children: []
     };
   }
 }
diff --git a/backend/src/apps/admin/forum/forums/create/dto/create.obj.ts b/backend/src/apps/admin/forum/forums/create/dto/create.obj.ts
@@ -1,8 +1,9 @@
 import { ObjectType, OmitType } from "@nestjs/graphql";
 
-import { ShowForumForumsWithParent } from "../../../../../forum/forums/show/dto/show.obj";
+import { ShowForumForumsWithChildren } from "../../../../../forum/forums/show/dto/show.obj";
 
 @ObjectType()
-export class CreateForumForumsObj extends OmitType(ShowForumForumsWithParent, [
-  "permissions"
-] as const) {}
+export class CreateForumForumsObj extends OmitType(
+  ShowForumForumsWithChildren,
+  ["permissions"] as const
+) {}
diff --git a/backend/src/apps/admin/forum/forums/edit/edit.service.ts b/backend/src/apps/admin/forum/forums/edit/edit.service.ts
@@ -14,10 +14,14 @@ import {
   forum_forums_permissions
 } from "../../database/schema/forums";
 import { TextLanguageInput } from "@/types/database/text-language.type";
+import { StatsShowForumForumsService } from "@/apps/forum/forums/show/stats.service";
 
 @Injectable()
 export class EditForumForumsService {
-  constructor(private databaseService: DatabaseService) {}
+  constructor(
+    private databaseService: DatabaseService,
+    private statsService: StatsShowForumForumsService
+  ) {}
 
   protected updateName = async ({
     id,
@@ -227,23 +231,7 @@ export class EditForumForumsService {
         with: {
           name: true,
           description: true,
-          permissions: true,
-          parent: {
-            with: {
-              name: true,
-              description: true,
-              topics: {
-                with: {
-                  posts: true
-                }
-              }
-            }
-          },
-          topics: {
-            with: {
-              posts: true
-            }
-          }
+          permissions: true
         }
       });
 
@@ -252,47 +240,30 @@ export class EditForumForumsService {
       with: {
         name: true,
         description: true,
-        permissions: true,
-        topics: {
-          with: {
-            posts: true
-          }
-        }
+        permissions: true
       }
     });
 
+    const stats = await this.statsService.stats({ forumId: id });
+
     return {
       ...dataUpdate,
       _count: {
-        children: children.length,
-        topics: dataUpdate.topics.length,
-        posts: dataUpdate.topics.reduce(
-          (acc, item) => acc + item.posts.length,
-          0
-        )
+        ...stats
       },
-      children: children.map(item => ({
-        ...item,
-        children: [],
-        _count: {
-          children: 0,
-          posts: item.topics.reduce((acc, item) => acc + item.posts.length, 0),
-          topics: item.topics.length
-        }
-      })),
-      parent: dataUpdate.parent
-        ? {
-            ...dataUpdate.parent,
+      children: await Promise.all(
+        children.map(async item => {
+          const stats = await this.statsService.stats({ forumId: item.id });
+
+          return {
+            ...item,
+            children: [],
             _count: {
-              children: 0,
-              posts: dataUpdate.parent.topics.reduce(
-                (acc, item) => acc + item.posts.length,
-                0
-              ),
-              topics: dataUpdate.parent.topics.length
+              ...stats
             }
-          }
-        : null
+          };
+        })
+      )
     };
   }
 }
diff --git a/backend/src/apps/admin/forum/forums/show/dto/show.args.ts b/backend/src/apps/admin/forum/forums/show/dto/show.args.ts
diff --git a/backend/src/apps/admin/forum/forums/show/dto/show.obj.ts b/backend/src/apps/admin/forum/forums/show/dto/show.obj.ts
@@ -1,6 +1,6 @@
 import { Field, Int, ObjectType, OmitType } from "@nestjs/graphql";
 
-import { ShowForumForumsWithParent } from "../../../../../forum/forums/show/dto/show.obj";
+import { ShowForumForumsWithChildren } from "../../../../../forum/forums/show/dto/show.obj";
 import { PageInfo } from "@/types/database/pagination.type";
 
 @ObjectType()
@@ -40,9 +40,10 @@ export class PermissionsForumForumsAdmin {
 }
 
 @ObjectType()
-export class ShowForumForumsAdmin extends OmitType(ShowForumForumsWithParent, [
-  "permissions"
-] as const) {
+export class ShowForumForumsAdmin extends OmitType(
+  ShowForumForumsWithChildren,
+  ["permissions"] as const
+) {
   @Field(() => PermissionsForumForumsAdmin)
   permissions: PermissionsForumForumsAdmin;
 }

diff --git a/backend/src/apps/admin/forum/forums/show/show.resolver.ts b/backend/src/apps/admin/forum/forums/show/show.resolver.ts
@@ -3,9 +3,9 @@ import { UseGuards } from "@nestjs/common";
 
 import { ShowForumForumsAdminService } from "./show.service";
 import { ShowForumForumsAdminObj } from "./dto/show.obj";
-import { ShowForumForumsAdminArgs } from "./dto/show.args";
 
 import { AdminAuthGuards } from "@/utils/guards/admin-auth.guards";
+import { ShowForumForumsArgs } from "@/apps/forum/forums/show/dto/show.args";
 
 @Resolver()
 export class ShowForumForumsAdminResolver {
@@ -14,7 +14,7 @@ export class ShowForumForumsAdminResolver {
   @Query(() => ShowForumForumsAdminObj)
   @UseGuards(AdminAuthGuards)
   async admin__forum_forums__show(
-    @Args() args: ShowForumForumsAdminArgs
+    @Args() args: ShowForumForumsArgs
   ): Promise<ShowForumForumsAdminObj> {
     return await this.service.show(args);
   }