Merge pull request #228 from aXenDeveloper/forum/edit

feat: Add edit dialog for forum in AdminCP

backend/src/admin/forum/forum.module.ts

@@ -6,6 +6,8 @@ import { ChangePositionForumForumsResolver } from "./forums/change_position/chan
 import { ChangePositionForumForumsService } from "./forums/change_position/change_position.service";
 import { ShowForumForumsAdminResolver } from "./forums/show/show.resolver";
 import { ShowForumForumsAdminService } from "./forums/show/show.service";
+import { EditForumForumsResolver } from "./forums/edit/edit.resolver";
+import { EditForumForumsService } from "./forums/edit/edit.service";
 
 @Module({
   providers: [
@@ -14,7 +16,9 @@ import { ShowForumForumsAdminService } from "./forums/show/show.service";
     ChangePositionForumForumsResolver,
     ChangePositionForumForumsService,
     ShowForumForumsAdminResolver,
-    ShowForumForumsAdminService
+    ShowForumForumsAdminService,
+    EditForumForumsResolver,
+    EditForumForumsService
   ]
 })
 export class AdminForumModule {}

backend/src/admin/forum/forums/change_position/change_position.service.ts

@@ -27,8 +27,8 @@ export class ChangePositionForumForumsService {
     const allChildrenParent =
       await this.databaseService.db.query.forum_forums.findMany({
         where: (table, { eq }) =>
-          parent_id === null
-            ? isNull(table.parent_id)
+          !parent_id
+            ? isNull(table.parent_id ?? null)
             : eq(table.parent_id, parent_id),
         orderBy: (table, { asc }) => asc(table.position)
       });

backend/src/admin/forum/forums/create/create.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from "@nestjs/common";
-import { count, eq } from "drizzle-orm";
 
 import { CreateForumForumsArgs } from "./dto/create.args";
 import { CreateForumForumsObj } from "./dto/create.obj";
@@ -85,10 +84,7 @@ export class CreateForumForumsService {
         permissions.groups.map(item => ({
           forum_id: data[0].id,
           group_id: item.id,
-          can_create: item.create,
-          can_read: item.read,
-          can_reply: item.reply,
-          can_view: item.view
+          ...item
         }))
       );
     }
@@ -98,33 +94,23 @@ export class CreateForumForumsService {
       with: {
         name: true,
         description: true,
-        permissions: true
+        permissions: true,
+        parent: {
+          with: {
+            name: true,
+            description: true
+          }
+        }
       }
     });
 
     if (!forum) {
       throw new NotFoundError("Forum");
     }
 
-    const parent = await this.databaseService.db.query.forum_forums.findFirst({
-      where: (table, { eq }) => eq(table.id, parent_id || null),
-      with: {
-        name: true,
-        description: true,
-        permissions: true
-      }
-    });
-
-    const countParentChildren = await this.databaseService.db
-      .select({ count: count() })
-      .from(forum_forums)
-      .where(eq(forum_forums.parent_id, parent_id || null));
-
     return {
       ...forum,
-      children: [],
-      _count: { children: 0 },
-      parent: { ...parent, _count: { children: countParentChildren[0].count } }
+      children: []
     };
   }
 }

backend/src/admin/forum/forums/create/dto/create.args.ts

@@ -14,20 +14,20 @@ class GroupsPermissionsCreateForumForums {
   id: number;
 
   @Field(() => Boolean)
-  view: boolean;
+  can_view: boolean;
 
   @Field(() => Boolean)
-  read: boolean;
+  can_read: boolean;
 
   @Field(() => Boolean)
-  create: boolean;
+  can_create: boolean;
 
   @Field(() => Boolean)
-  reply: boolean;
+  can_reply: boolean;
 }
 
 @InputType()
-class PermissionsCreateForumForums {
+export class PermissionsCreateForumForums {
   @Field(() => Boolean)
   can_all_view: boolean;
 

backend/src/admin/forum/forums/edit/dto/edit.args.ts

@@ -0,0 +1,9 @@
+import { ArgsType, Field, Int } from "@nestjs/graphql";
+
+import { CreateForumForumsArgs } from "../../create/dto/create.args";
+
+@ArgsType()
+export class EditForumForumsArgs extends CreateForumForumsArgs {
+  @Field(() => Int)
+  id: number;
+}

backend/src/admin/forum/forums/edit/edit.resolver.ts

@@ -0,0 +1,21 @@
+import { Args, Mutation, Resolver } from "@nestjs/graphql";
+import { UseGuards } from "@nestjs/common";
+
+import { EditForumForumsService } from "./edit.service";
+import { CreateForumForumsObj } from "../create/dto/create.obj";
+import { EditForumForumsArgs } from "./dto/edit.args";
+
+import { AdminAuthGuards } from "@/utils/guards/admin-auth.guards";
+
+@Resolver()
+export class EditForumForumsResolver {
+  constructor(private readonly service: EditForumForumsService) {}
+
+  @Mutation(() => CreateForumForumsObj)
+  @UseGuards(AdminAuthGuards)
+  async admin__forum_forums__edit(
+    @Args() args: EditForumForumsArgs
+  ): Promise<CreateForumForumsObj> {
+    return await this.service.edit(args);
+  }
+}