Imporve_version_2.6 deploy

src/main/java/com/example/jsgamesbackendmain/Bean/GameBean/GameGetBean.java

@@ -19,13 +19,13 @@ public class GameGetBean {
 
     public GameGetByGameIdResponseDTO exec(Long gameId) {
 
-        GameDAO gameDAO = gameGetSmallBean.exec(gameId);
+        GameDAO findGame = gameGetSmallBean.exec(gameId);
 
-        gameViewCountUpdateSmallBean.exec(gameDAO);
+        gameViewCountUpdateSmallBean.exec(findGame);
 
         //Review 평균 가져오기
-        Double starAvg = reviewGetAvgStarByGameIdSmallBean.exec(gameDAO.getGameId());
+        Double starAvg = reviewGetAvgStarByGameIdSmallBean.exec(findGame);
 
-        return GameGetByGameIdResponseDTO.of(gameDAO, starAvg);
+        return GameGetByGameIdResponseDTO.of(findGame, starAvg);
     }
 }

src/main/java/com/example/jsgamesbackendmain/Bean/GameBean/GameGetListByPlayedUser.java

@@ -1,22 +1,30 @@
 package com.example.jsgamesbackendmain.Bean.GameBean;
 
 import com.example.jsgamesbackendmain.Bean.SmallBean.GameBean.GameGetListByPlayedUserSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
 import com.example.jsgamesbackendmain.Model.DTO.Game.Response.GameListResponseDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
 @RequiredArgsConstructor
 public class GameGetListByPlayedUser {
 
     private final GameGetListByPlayedUserSmallBean gameGetListByPlayedUserSmallBean;
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
 
-    public List<GameListResponseDTO> exec(String userId, Long page, Long size) {
-        PageRequest request = PageRequest.of(page.intValue(), size.intValue());
+    public List<GameListResponseDTO> exec(String userId, Integer page, Integer size) {
+        PageRequest request = PageRequest.of(page, size);
 
-        return gameGetListByPlayedUserSmallBean.exec(userId, request);
+        UserDAO findUser = userGetByIdSmallBean.exec(userId);
+
+        return gameGetListByPlayedUserSmallBean.exec(findUser, request)
+                .stream().map(GameListResponseDTO::of)
+                .collect(Collectors.toList());
     }
 }

src/main/java/com/example/jsgamesbackendmain/Bean/GameBean/GameListBean.java

@@ -1,42 +1,47 @@
 package com.example.jsgamesbackendmain.Bean.GameBean;
 
+import com.example.jsgamesbackendmain.Bean.SmallBean.GameBean.GameListOrderByCreateAtSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.GameBean.GameListOrderByLogCountDescSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.GameBean.GameListOrderByReviewCountSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.GameBean.GameListOrderByViewCountSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.GameDAO;
 import com.example.jsgamesbackendmain.Model.DTO.Game.Response.GameListResponseDTO;
-import com.example.jsgamesbackendmain.Repository.GameRepository;
+import com.example.jsgamesbackendmain.Model.ENUM.GameSort;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Component
 @RequiredArgsConstructor
 public class GameListBean {
-    private final GameRepository gameRepository;
-
-    public List<GameListResponseDTO> exec() {
-        return gameRepository.findAll()
-                .stream()
-                .map(GameListResponseDTO::of)
-                .collect(Collectors.toList());
-    }
-
-    public List<GameListResponseDTO> exec(Long page, Long size) {
-        PageRequest pageRequest = PageRequest.of(page.intValue(), size.intValue());
-
-        return gameRepository.findAllByOrderByViewCountDescGameIdAsc(pageRequest).toList()
-                .stream()
-                .map(GameListResponseDTO::of)
-                .collect(Collectors.toList());
-    }
-
-    public List<GameListResponseDTO> exec(Long userId, Long page, Long size) {
-        PageRequest pageRequest = PageRequest.of(page.intValue(), size.intValue());
-
-        return gameRepository.findAllByOrderByViewCountDescGameIdAsc(pageRequest)
-                .toList()
-                .stream()
-                .map(GameListResponseDTO::of)
-                .collect(Collectors.toList());
+    private final GameListOrderByViewCountSmallBean gameListOrderByViewCountSmallBean;
+    private final GameListOrderByLogCountDescSmallBean gameListOrderByLogCountDescSmallBean;
+    private final GameListOrderByCreateAtSmallBean gameListOrderByCreateAtSmallBean;
+    private final GameListOrderByReviewCountSmallBean gameListOrderByReviewCountSmallBean;
+
+    public List<GameListResponseDTO> exec(Integer page, Integer size, GameSort sort) {
+        PageRequest pageRequest = PageRequest.of(page, size);
+
+        Page<GameDAO> gamePageList = null;
+
+        switch (sort) {
+            case VIEW_COUNT:
+                gamePageList = gameListOrderByViewCountSmallBean.exec(pageRequest);
+                break;
+            case LOG_COUNT:
+                gamePageList = gameListOrderByLogCountDescSmallBean.exec(pageRequest);
+                break;
+            case RECENT:
+                gamePageList = gameListOrderByCreateAtSmallBean.exec(pageRequest);
+                break;
+            case REVIEW_COUNT:
+                gamePageList = gameListOrderByReviewCountSmallBean.exec(pageRequest);
+                break;
+        }
+
+        return GameListResponseDTO.listOf(gamePageList);
     }
 }

src/main/java/com/example/jsgamesbackendmain/Bean/GameBean/GamePostBean.java

@@ -1,7 +1,10 @@
 package com.example.jsgamesbackendmain.Bean.GameBean;
 
-import com.example.jsgamesbackendmain.Model.DTO.Game.GameDTO;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.GameDAO;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
 import com.example.jsgamesbackendmain.Model.DTO.Game.Request.GameCreateRequestDTO;
+import com.example.jsgamesbackendmain.Model.DTO.Game.Response.GameCreateResultDTO;
 import com.example.jsgamesbackendmain.Repository.GameRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -10,7 +13,14 @@
 @RequiredArgsConstructor
 public class GamePostBean {
     private final GameRepository gameRepository;
-    public GameDTO exec(GameCreateRequestDTO gameCreateRequestDTO) {
-        return GameDTO.of(gameRepository.save(gameCreateRequestDTO.toDAO()));
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+    public GameCreateResultDTO exec(GameCreateRequestDTO gameCreateRequestDTO) {
+        UserDAO findUser = userGetByIdSmallBean.exec(gameCreateRequestDTO.getUserId());
+
+        GameDAO newGame = gameCreateRequestDTO.toDAO();
+
+        newGame.setUser(findUser);
+
+        return GameCreateResultDTO.of(gameRepository.save(newGame));
     }
 }

src/main/java/com/example/jsgamesbackendmain/Bean/HelpfulBean/HelpfulDeleteBean.java

@@ -1,6 +1,10 @@
 package com.example.jsgamesbackendmain.Bean.HelpfulBean;
 
 import com.example.jsgamesbackendmain.Bean.SmallBean.HelpfulBean.HelpfulDeleteSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.ReviewBean.ReviewGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.ReviewDAO;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
 import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -9,9 +13,14 @@
 @RequiredArgsConstructor
 public class HelpfulDeleteBean {
     private final HelpfulDeleteSmallBean helpfulDeleteSmallBean;
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+    private final ReviewGetByIdSmallBean reviewGetByIdSmallBean;
 
     public StateResponseDTO exec(String userId, Long reviewId) {
-        helpfulDeleteSmallBean.exec(userId, reviewId);
+        UserDAO findUser = userGetByIdSmallBean.exec(userId);
+        ReviewDAO findReview = reviewGetByIdSmallBean.exec(reviewId);
+
+        helpfulDeleteSmallBean.exec(findUser, findReview);
         return new StateResponseDTO(true);
     }
 }

src/main/java/com/example/jsgamesbackendmain/Bean/HelpfulBean/HelpfulGetBean.java

@@ -1,6 +1,10 @@
 package com.example.jsgamesbackendmain.Bean.HelpfulBean;
 
 import com.example.jsgamesbackendmain.Bean.SmallBean.HelpfulBean.HelpfulGetSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.ReviewBean.ReviewGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.ReviewDAO;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
 import com.example.jsgamesbackendmain.Model.DTO.Helpful.HelpfulGetResponseDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -9,9 +13,14 @@
 @RequiredArgsConstructor
 public class HelpfulGetBean {
     private final HelpfulGetSmallBean helpfulGetSmallBean;
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+    private final ReviewGetByIdSmallBean reviewGetByIdSmallBean;
 
     public HelpfulGetResponseDTO exec(String userId, Long reviewId) {
-        boolean exec = helpfulGetSmallBean.exec(userId, reviewId);
+        UserDAO findUser = userGetByIdSmallBean.exec(userId);
+        ReviewDAO findReview = reviewGetByIdSmallBean.exec(reviewId);
+
+        boolean exec = helpfulGetSmallBean.exec(findUser, findReview);
 
 
         return HelpfulGetResponseDTO.builder()

src/main/java/com/example/jsgamesbackendmain/Bean/HelpfulBean/HelpfulPostBean.java

@@ -1,6 +1,10 @@
 package com.example.jsgamesbackendmain.Bean.HelpfulBean;
 
 import com.example.jsgamesbackendmain.Bean.SmallBean.HelpfulBean.HelpfulPostSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.ReviewBean.ReviewGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.ReviewDAO;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
 import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -10,6 +14,7 @@
 public class HelpfulPostBean {
     private final HelpfulPostSmallBean helpfulPostSmallBean;
     public StateResponseDTO exec(String userId, Long reviewId) {
+
         helpfulPostSmallBean.exec(userId, reviewId);
         return new StateResponseDTO(true);
     }

src/main/java/com/example/jsgamesbackendmain/Bean/ImageBean/S3SetImageBean.java

@@ -0,0 +1,17 @@
+package com.example.jsgamesbackendmain.Bean.ImageBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.ImageBean.S3SetSmallBean;
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class S3SetImageBean {
+    private final S3SetSmallBean s3SetSmallBean;
+
+    public StateResponseDTO exec() {
+        s3SetSmallBean.exec();
+        return new StateResponseDTO(true);
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/LogBean/LogGetByGamIdUserIdBean.java

@@ -29,7 +29,7 @@ public LogGetByGameIdUserIdResponseDTO exec(Long gameId, String userId) {
         UserDAO userDAO = userGetByIdSmallBean.exec(userId);
 
         // LogDAO 조회
-        LogDAO logDAO = logGetByGameIdUserIdSmallBean.exec(gameDAO, userId);
+        LogDAO logDAO = logGetByGameIdUserIdSmallBean.exec(gameDAO, userDAO);
 
         // rank 조회
         Long rank = logGetRankSmallBean.exec(gameDAO, logDAO);

src/main/java/com/example/jsgamesbackendmain/Bean/LogBean/LogGetByGameIdBean.java

@@ -3,11 +3,13 @@
 import com.example.jsgamesbackendmain.Bean.SmallBean.GameBean.GameGetSmallBean;
 import com.example.jsgamesbackendmain.Bean.SmallBean.LogBean.LogGetByGameSmallBean;
 import com.example.jsgamesbackendmain.Model.DAO.GameDAO;
+import com.example.jsgamesbackendmain.Model.DAO.LogDAO;
 import com.example.jsgamesbackendmain.Model.DTO.Log.Response.LogGetByGameIdResponseDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
 @RequiredArgsConstructor
@@ -20,7 +22,9 @@ public List<LogGetByGameIdResponseDTO> exec(Long gameId, Integer page, Integer s
 
         GameDAO gameDAO = gameGetSmallBean.exec(gameId);
 
-        return logGetByGameSmallBean.exec(gameDAO, page, size);
+        return logGetByGameSmallBean.exec(gameDAO, page, size).stream()
+                .map(LogGetByGameIdResponseDTO::of)
+                .collect(Collectors.toList());
     }
 
 }

src/main/java/com/example/jsgamesbackendmain/Bean/LogBean/LogGetByUserIdBean.java

@@ -16,7 +16,7 @@ public class LogGetByUserIdBean {
 
     private final UserGetByIdSmallBean userValidationSmallBean;
 
-    public List<LogGetByUserIdResponseDTO> exec(String userId, Long page, Long size) {
+    public List<LogGetByUserIdResponseDTO> exec(String userId, Integer page, Integer size) {
 
         //userId 유효성 확인
         UserDAO user = userValidationSmallBean.exec(userId);

src/main/java/com/example/jsgamesbackendmain/Bean/LogBean/LogPostBean.java

@@ -32,25 +32,23 @@ public class LogPostBean {
 
     public LogPostResponseDTO exec(LogPostRequestDTO logPostRequestDTO) {
         // game found
-        GameDAO game = gameGetSmallBean.exec(logPostRequestDTO.getGameId());
+        GameDAO findGame = gameGetSmallBean.exec(logPostRequestDTO.getGameId());
 
         // user found
-        UserDAO user = userValidationSmallBean.exec(logPostRequestDTO.getUserId());
-
-        // get top log
-        Optional<LogGetByGameIdResponseDTO> preTopLog = logGetByGameSmallBean.exec(game, 0, 1).stream().findAny();
+        UserDAO findUser = userValidationSmallBean.exec(logPostRequestDTO.getUserId());
 
         // log save
-        LogDAO savedLogDAO = logSaveSmallBean.exec(logPostRequestDTO.toDAO());
+        LogDAO newLog = logPostRequestDTO.toDAO();
+        newLog.setGame(findGame);
+        newLog.setUser(findUser);
+        LogDAO savedLog = logSaveSmallBean.exec(newLog);
 
-        // get top log
-        Optional<LogGetByGameIdResponseDTO> nextTopLog = logGetByGameSmallBean.exec(game, 0, 1).stream().findAny();
 
         // log catch top change
-        Boolean isChange = logCatchTopChange.exec(preTopLog, nextTopLog);
+        Boolean isChange = logCatchTopChange.exec(findGame);
         // 여기서 이벤트 처리하면 됨!!!!!
 
-        return LogPostResponseDTO.of(savedLogDAO, user);
+        return LogPostResponseDTO.of(savedLog);
     }
 
 }

src/main/java/com/example/jsgamesbackendmain/Bean/RankBean/RankGetBean.java

@@ -17,7 +17,7 @@ public class RankGetBean {
     private final RankGetTop100SmallBean rankGetTop100SmallBean;
     private final RankLastUpdatedSmallBean rankLastUpdatedSmallBean;
 
-    public RankGetResponseDTO exec(Long page, Long size) {
+    public RankGetResponseDTO exec(Integer page, Integer size) {
         // RankTop100 DAO to Rank
 
         return RankGetResponseDTO

src/main/java/com/example/jsgamesbackendmain/Bean/RankBean/RankGetByMajorBean.java

@@ -13,11 +13,11 @@ public class RankGetByMajorBean {
     private final RankMajorLastUpdatedSmallBean rankMajorLastUpdatedSmallBean;
     private final RankGetByMajorSmallBean rankGetByMajorSmallBean;
 
-    public RankByMajorGetResponseDTO exec(Major major) {
+    public RankByMajorGetResponseDTO exec(Integer page, Integer size, Major major) {
         return RankByMajorGetResponseDTO
                 .builder()
                 .lastUpdated(rankMajorLastUpdatedSmallBean.getLastUpdated())
-                .rankList(rankGetByMajorSmallBean.exec(major))
+                .rankList(rankGetByMajorSmallBean.exec(page, size, major))
                 .build();
     }
 }

src/main/java/com/example/jsgamesbackendmain/Bean/ReviewBean/ReviewGetMyReviewBean.java

@@ -3,6 +3,7 @@
 import com.example.jsgamesbackendmain.Bean.SmallBean.GameBean.GameGetSmallBean;
 import com.example.jsgamesbackendmain.Bean.SmallBean.ReviewBean.ReviewGetByUserIdAndGameIdSmallBean;
 import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.GameDAO;
 import com.example.jsgamesbackendmain.Model.DAO.ReviewDAO;
 import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
 import com.example.jsgamesbackendmain.Model.DTO.Review.Response.ReviewGetByGameIdResponseDTO;
@@ -18,12 +19,12 @@ public class ReviewGetMyReviewBean {
 
     public ReviewGetByGameIdResponseDTO exec(Long gameId, String userId) {
 
-        UserDAO user = userGetByIdSmallBean.exec(userId);
+        UserDAO findUser = userGetByIdSmallBean.exec(userId);
 
-        gameGetSmallBean.exec(gameId);
+        GameDAO findGame = gameGetSmallBean.exec(gameId);
 
-        ReviewDAO dao = reviewGetByUserIdAndGameIdSmallBean.exec(userId, gameId);
+        ReviewDAO findReview = reviewGetByUserIdAndGameIdSmallBean.exec(findUser, findGame);
 
-        return ReviewGetByGameIdResponseDTO.of(dao, user);
+        return ReviewGetByGameIdResponseDTO.of(findReview);
     }
 }