Merge pull request #162 from plezanje-net/fix-comments-guest

Fix bug where comments are not shown if not logged in.
plezanje-net · Aug 27, 2023 · c59e747 · c59e747
2 parents 831c01d + e33b29f
commit c59e747
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 40 deletions.
diff --git a/src/crags/loaders/route-comments.loader.ts b/src/crags/loaders/route-comments.loader.ts
@@ -1,30 +1,18 @@
 import DataLoader from 'dataloader';
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { Comment } from '../entities/comment.entity';
 import { CommentsService } from '../services/comments.service';
 import { NestDataLoader } from '../../core/interceptors/data-loader.interceptor';
-import { CONTEXT } from '@nestjs/graphql';
-import { User } from '../../users/entities/user.entity';
 
 @Injectable()
 export class RouteCommentsLoader implements NestDataLoader<string, Comment[]> {
-  currentUser: User = null;
-
-  constructor(
-    private readonly commentsService: CommentsService,
-    @Inject(CONTEXT) private context: any,
-  ) {
-    this.currentUser = this.context.req.user;
-  }
+  constructor(private readonly commentsService: CommentsService) {}
 
   generateDataLoader(): DataLoader<string, Comment[]> {
     return new DataLoader<string, Comment[]>(async (keys) => {
-      const comments = await this.commentsService.find(
-        {
-          routeIds: keys.map((k) => k),
-        },
-        this.currentUser,
-      );
+      const comments = await this.commentsService.find({
+        routeIds: keys.map((k) => k),
+      });
 
       const routeComments: { [key: string]: Comment[] } = {};
 

diff --git a/src/crags/resolvers/crags.resolver.ts b/src/crags/resolvers/crags.resolver.ts
@@ -189,16 +189,10 @@ export class CragsResolver {
 
   @ResolveField('comments', () => [Comment])
   @UseGuards(UserAuthGuard)
-  async getComments(
-    @Parent() crag: Crag,
-    @CurrentUser() currentUser: User,
-  ): Promise<Comment[]> {
-    const comments = await this.commentsService.find(
-      {
-        cragId: crag.id,
-      },
-      currentUser,
-    );
+  async getComments(@Parent() crag: Crag): Promise<Comment[]> {
+    const comments = await this.commentsService.find({
+      cragId: crag.id,
+    });
 
     return comments;
   }

diff --git a/src/crags/services/comments.service.ts b/src/crags/services/comments.service.ts
@@ -86,10 +86,7 @@ export class CommentsService {
     return this.commentsRepository.remove(comment).then(() => true);
   }
 
-  async find(
-    params: FindCommentsInput = {},
-    currentUser: User,
-  ): Promise<Comment[]> {
+  async find(params: FindCommentsInput = {}): Promise<Comment[]> {
     const options: FindManyOptions = {
       order: {},
       where: {},
@@ -111,15 +108,6 @@ export class CommentsService {
       options.where['type'] = params.type;
     }
 
-    if (!currentUser) {
-      options.relations = {
-        crag: true,
-      };
-      options.where['crag'] = {
-        isHidden: false,
-      };
-    }
-
     options.order = { created: 'DESC' };
 
     let comments = await this.commentsRepository.find(options);