Merge branch 'development' into feature/MB/469/mobile-user-profile-page

bounswe · Nov 26, 2023 · b753df7 · b753df7
2 parents 0408ded + dfa6f63
commit b753df7
Show file tree

Hide file tree

Showing 39 changed files with 3,437 additions and 600 deletions.
diff --git a/ludos/backend/src/controllers/review.controller.ts b/ludos/backend/src/controllers/review.controller.ts
@@ -113,7 +113,10 @@ export class ReviewController {
     @Req() req: AuthorizedRequest,
     @Param('reviewId') reviewId: string,
   ) {
-    const review = await this.reviewService.getReviewById(req.user.id, reviewId);
+    const review = await this.reviewService.getReviewById(
+      req.user.id,
+      reviewId,
+    );
     return review;
   }
 
@@ -129,7 +132,10 @@ export class ReviewController {
     @Req() req: AuthorizedRequest,
     @Param('gameId') gameId: string,
   ) {
-    const reviews = await this.reviewService.getReviewsByGameId(req.user.id, gameId);
+    const reviews = await this.reviewService.getReviewsByGameId(
+      req.user.id,
+      gameId,
+    );
     return reviews;
   }
 }
diff --git a/ludos/backend/src/controllers/user.controller.ts b/ludos/backend/src/controllers/user.controller.ts
@@ -157,7 +157,6 @@ export class UserController {
   public async getUserInfoById(@Req() req: AuthorizedRequest) {
     return await this.userService.getUserInfo(req.user.id);
   }
-
   @HttpCode(200)
   @ApiUnauthorizedResponse({
     description: 'Invalid User',

diff --git a/ludos/backend/src/dtos/post/response/get.response.dto.ts b/ludos/backend/src/dtos/post/response/get.response.dto.ts
@@ -33,7 +33,7 @@ export class PostGetResponseDto {
   tags: string[];
 
   @Expose()
-  @ApiProperty({type: () => UserInOtherResponsesDto})
+  @ApiProperty({ type: () => UserInOtherResponsesDto })
   @Type(() => UserInOtherResponsesDto)
   likedUsers: UserInOtherResponsesDto;
 
@@ -42,7 +42,7 @@ export class PostGetResponseDto {
   numberOfLikes: number;
 
   @Expose()
-  @ApiProperty({type: () => UserInOtherResponsesDto})
+  @ApiProperty({ type: () => UserInOtherResponsesDto })
   @Type(() => UserInOtherResponsesDto)
   dislikedUsers: UserInOtherResponsesDto;
 

diff --git a/ludos/backend/src/dtos/review/response/getInfo.dto.ts b/ludos/backend/src/dtos/review/response/getInfo.dto.ts
@@ -27,4 +27,10 @@ export class ReviewGetInfoResponseDto {
 
   @ApiProperty()
   isBelongToUser: boolean;
+
+  @ApiProperty()
+  isLikedByUser: boolean;
+
+  @ApiProperty()
+  isDislikedByUser: boolean;
 }
diff --git a/ludos/backend/src/entities/user.entity.ts b/ludos/backend/src/entities/user.entity.ts
@@ -1,20 +1,19 @@
+import * as bcrypt from 'bcrypt';
 import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
   BeforeInsert,
   BeforeUpdate,
-  OneToMany,
+  Column,
+  Entity,
   Index,
   ManyToMany,
-  VirtualColumn
+  OneToMany,
+  PrimaryGeneratedColumn,
 } from 'typeorm';
-import * as bcrypt from 'bcrypt';
-import { Game } from './game.entity';
 import { UserType } from '../enums/user-type.enum';
-import { Review } from './review.entity';
+import { Game } from './game.entity';
 import { Post } from './post.entity';
 import { Rating } from './rating.entity';
+import { Review } from './review.entity';
 
 @Entity('users')
 export class User {
@@ -34,11 +33,10 @@ export class User {
   @ManyToMany(() => Game, (game) => game.followerList)
   followedGames: Game[];
 
-  @VirtualColumn({
-    query: (alias) => `SELECT COUNT(*) FROM game_user_follows WHERE "usersId" = ${alias}.id `,
-  })
-  numberOfFollowedGames: number;
-
+  // @VirtualColumn({
+  //   query: (alias) => `SELECT COUNT(*) FROM game_user_follows WHERE "usersId" = ${alias}.id `,
+  // })
+  // numberOfFollowedGames: number;
 
   @Column({ default: false })
   isNotificationEnabled: boolean;
@@ -61,32 +59,31 @@ export class User {
   @OneToMany('Review', 'user')
   reviews: Review[];
 
-  @VirtualColumn({
-    query: (alias) => `SELECT COUNT(*) FROM reviews WHERE "userId" = ${alias}.id `,
-  })
-  numberOfReviews: number;
+  // @VirtualColumn({
+  //   query: (alias) => `SELECT COUNT(*) FROM reviews WHERE "userId" = ${alias}.id `,
+  // })
+  // numberOfReviews: number;
 
   @OneToMany('Post', 'user')
   posts: Post[];
 
-  @VirtualColumn({
-    query: (alias) => `SELECT COUNT(*) FROM posts WHERE "userId" = ${alias}.id `,
-  })
-  numberOfPosts: number;
-
+  // @VirtualColumn({
+  //   query: (alias) => `SELECT COUNT(*) FROM posts WHERE "userId" = ${alias}.id `,
+  // })
+  // numberOfPosts: number;
 
-  @VirtualColumn({
-    query: (alias) => `SELECT COUNT(*) FROM comments WHERE "authorId" = ${alias}.id `,
-  })
-  numberOfComments: number;
+  // @VirtualColumn({
+  //   query: (alias) => `SELECT COUNT(*) FROM comments WHERE "authorId" = ${alias}.id `,
+  // })
+  // numberOfComments: number;
 
   @OneToMany('Rating', 'user')
   ratingList: Rating[];
 
-  @VirtualColumn({
-    query: (alias) => `SELECT COUNT(*) FROM ratings WHERE "userId" = ${alias}.id `,
-  })
-  numberOfRatings: number;
+  // @VirtualColumn({
+  //   query: (alias) => `SELECT COUNT(*) FROM ratings WHERE "userId" = ${alias}.id `,
+  // })
+  // numberOfRatings: number;
 
   @ManyToMany('Review', 'likedUsers')
   likedReviews: Review[];

diff --git a/ludos/backend/src/services/game.service.ts b/ludos/backend/src/services/game.service.ts
@@ -132,7 +132,7 @@ export class GameService {
     const updated = Object.assign(game, gameEditDto);
     await this.gameRepository.save(updated);
   }
-  
+
   async addCompletionDuration(
     userId: string,
     gameId: string,

diff --git a/ludos/backend/src/services/review.service.ts b/ludos/backend/src/services/review.service.ts
@@ -232,12 +232,13 @@ export class ReviewService {
     }
 
     const loggedUser = await this.userRepository.findUserById(userId);
-      if (!loggedUser) {
-        throw new NotFoundException('User Not Found!');
-      }
+    if (!loggedUser) {
+      throw new NotFoundException('User Not Found!');
+    }
 
     const likedUserCount = review.likedUsers.length;
     const dislikedUserCount = review.dislikedUsers.length;
+
     return {
       reviewId: review.id,
       content: review.content,
@@ -247,7 +248,9 @@ export class ReviewService {
       gameId: review.game.id,
       likedUserCount: likedUserCount,
       dislikedUserCount: dislikedUserCount,
-      isBelongToUser: review.user.id == loggedUser.id
+      isBelongToUser: review.user.id == loggedUser.id,
+      isLikedByUser: review.likedUsers.some(user => user.id === userId),
+      isDislikedByUser: review.dislikedUsers.some(user => user.id === userId)
     };
   }
 
@@ -261,9 +264,9 @@ export class ReviewService {
     }
 
     const loggedUser = await this.userRepository.findUserById(userId);
-      if (!loggedUser) {
-        throw new NotFoundException('User Not Found!');
-      }
+    if (!loggedUser) {
+      throw new NotFoundException('User Not Found!');
+    }
 
     const reviews = await this.reviewRepository.findReviewsByGame(game);
 
@@ -276,7 +279,9 @@ export class ReviewService {
       gameId: review.game.id,
       likedUserCount: review.likedUsers.length,
       dislikedUserCount: review.dislikedUsers.length,
-      isBelongToUser: review.user.id == loggedUser.id
+      isBelongToUser: review.user.id == loggedUser.id,
+      isLikedByUser: review.likedUsers.some(user => user.id === userId),
+      isDislikedByUser: review.dislikedUsers.some(user => user.id === userId)
     }));
     return mappedReviews;
   }

diff --git a/ludos/frontend/.eslintrc.js b/ludos/frontend/.eslintrc.js
@@ -32,7 +32,7 @@ module.exports = {
     ],
     "max-len": [
       2,
-      120,
+      1000,
       {
         ignoreStrings: true,
         ignoreTemplateLiterals: true,
@@ -49,10 +49,10 @@ module.exports = {
         children: "never",
       },
     ],
-    "space-infix-ops": ["error", { int32Hint: false }],
-    "import/first": ["error"],
+    "space-infix-ops": ["warn", { int32Hint: false }],
+    "import/first": ["warn"],
     indent: ["warn", 2, { SwitchCase: 1, ObjectExpression: 1 }],
     "object-property-newline": ["warn", { allowAllPropertiesOnSameLine: true }],
-    "no-multi-spaces": ["error", { ignoreEOLComments: true }],
+    "no-multi-spaces": ["warn", { ignoreEOLComments: true }],
   },
 };
diff --git a/ludos/frontend/package-lock.json b/ludos/frontend/package-lock.json
diff --git a/ludos/frontend/package.json b/ludos/frontend/package.json
@@ -19,7 +19,9 @@
     "react-icons": "^4.11.0",
     "react-router-dom": "^6.17.0",
     "react-scripts": "5.0.1",
+    "react-slick": "^0.29.0",
     "react-toastify": "^9.1.3",
+    "slick-carousel": "^1.8.1",
     "web-vitals": "^2.1.4"
   },
   "scripts": {