Improve/정우진

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendDeleteBean.java

@@ -0,0 +1,24 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendDeleteSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByEmailSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Request.FriendRequestDTO;
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FriendDeleteBean {
+    private final FriendDeleteSmallBean friendDeleteSmallBean;
+    private final UserGetByEmailSmallBean userGetByEmailSmallBean;
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+
+    public StateResponseDTO exec(FriendRequestDTO friendRequestDTO) {
+        UserDAO userDAO = userGetByIdSmallBean.exec(friendRequestDTO.getUserId());
+        UserDAO friendDAO = userGetByEmailSmallBean.exec(friendRequestDTO.getFriendEmail());
+        return friendDeleteSmallBean.exec(userDAO, friendDAO);
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendListBean.java

@@ -0,0 +1,32 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendListByRecentSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendListByTimeSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Response.FriendListResponseDTO;
+import com.example.jsgamesbackendmain.Model.ENUM.FriendSort;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class FriendListBean {
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+    private final FriendListByRecentSmallBean friendListByRecentSmallBean;
+    private final FriendListByTimeSmallBean friendListByTimeSmallBean;
+
+    public List<FriendListResponseDTO> exec(String userId, Integer page, Integer size, FriendSort sort) {
+        UserDAO user = userGetByIdSmallBean.exec(userId);
+        List<FriendListResponseDTO> friendListResponseDTOS;
+        if (sort == FriendSort.RECENT) {
+            friendListResponseDTOS = friendListByRecentSmallBean.exec(user, page, size);
+        } else {
+            friendListResponseDTOS = friendListByTimeSmallBean.exec(user, page, size);
+        }
+
+        return friendListResponseDTOS;
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendRequestAcceptBean.java

@@ -0,0 +1,33 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendFindSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendRequestDeleteSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendSaveSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByEmailSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Request.FriendRequestDTO;
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestAcceptBean {
+    private final FriendRequestDeleteSmallBean friendRequestDeleteSmallBean;
+    private final UserGetByEmailSmallBean userGetByEmailSmallBean;
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+    private final FriendSaveSmallBean friendSaveSmallBean;
+    private final FriendFindSmallBean friendFindSmallBean;
+
+    public StateResponseDTO exec(FriendRequestDTO friendRequestDTO) {
+        UserDAO user = userGetByIdSmallBean.exec(friendRequestDTO.getUserId());
+        UserDAO friend = userGetByEmailSmallBean.exec(friendRequestDTO.getFriendEmail());
+        friendFindSmallBean.exec(friend.getUserId(), user.getUserId());
+        friendRequestDeleteSmallBean.exec(friend.getUserId(), friendRequestDTO.getUserId());
+        friendSaveSmallBean.exec(user, friend);
+        friendSaveSmallBean.exec(friend, user);
+
+        return StateResponseDTO.builder().state(true).build();
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendRequestBean.java

@@ -0,0 +1,21 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendRequestSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByEmailSmallBean;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Request.FriendRequestDTO;
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestBean {
+
+    private final FriendRequestSmallBean friendRequestSmallBean;
+    private final UserGetByEmailSmallBean userGetByEmailSmallBean;
+
+    public StateResponseDTO exec(FriendRequestDTO friendRequestDTO) {
+        String friendId = userGetByEmailSmallBean.exec(friendRequestDTO.getFriendEmail()).getUserId();
+        return friendRequestSmallBean.exec(friendRequestDTO.getUserId(), friendId);
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendRequestDeleteBean.java

@@ -0,0 +1,19 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendRequestDeleteSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByEmailSmallBean;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Request.FriendRequestDTO;
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestDeleteBean {
+    private final FriendRequestDeleteSmallBean friendRequestDeleteSmallBean;
+    private final UserGetByEmailSmallBean userGetByEmailSmallBean;
+
+    public StateResponseDTO exec(FriendRequestDTO friendRequestDTO) {
+        return friendRequestDeleteSmallBean.exec(friendRequestDTO.getUserId(), userGetByEmailSmallBean.exec(friendRequestDTO.getFriendEmail()).getUserId());
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendRequestListBean.java

@@ -0,0 +1,35 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendRequestListSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.FriendRequestDAO;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Response.FriendRequestListResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestListBean {
+    private final FriendRequestListSmallBean friendRequestListSmallBean;
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+
+    public List<FriendRequestListResponseDTO> exec(String userId, Integer page, Integer size) {
+        List<FriendRequestDAO> friendRequestDAOS = friendRequestListSmallBean.exec(userId, page, size);
+
+
+        return friendRequestDAOS.stream()
+                .map(friendRequestDAO -> FriendRequestListResponseDTO.builder()
+                        .friendEmail(userGetByIdSmallBean.exec(friendRequestDAO.getFriendId()).getEmail())
+                        .friendName(userGetByIdSmallBean.exec(friendRequestDAO.getFriendId()).getNickname())
+                        .friendProfile(userGetByIdSmallBean.exec(friendRequestDAO.getFriendId()).getProfileImageURL())
+                        .friendStatus(friendRequestDAO.getState())
+                        .createdAt(friendRequestDAO.getCreatedAt())
+                        .build())
+                .collect(Collectors.toList());
+
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendRequestRejectionBean.java

@@ -0,0 +1,19 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendRequestRejectionSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByEmailSmallBean;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Request.FriendRequestDTO;
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestRejectionBean {
+    private final FriendRequestRejectionSmallBean friendRequestRejectionSmallBean;
+    private final UserGetByEmailSmallBean userGetByEmailSmallBean;
+
+    public StateResponseDTO exec(FriendRequestDTO friendRequestDTO) {
+        return friendRequestRejectionSmallBean.exec(friendRequestDTO.getUserId(), userGetByEmailSmallBean.exec(friendRequestDTO.getFriendEmail()).getUserId());
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/FriendBean/FriendRequestedListBean.java

@@ -0,0 +1,32 @@
+package com.example.jsgamesbackendmain.Bean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean.FriendRequestedListSmallBean;
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserGetByIdSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.FriendRequestDAO;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Response.FriendRequestListResponseDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestedListBean {
+    private final FriendRequestedListSmallBean friendRequestedListSmallBean;
+    private final UserGetByIdSmallBean userGetByIdSmallBean;
+
+    public List<FriendRequestListResponseDTO> exec(String userId, Integer page, Integer size) {
+        List<FriendRequestDAO> friendRequestDAOS = friendRequestedListSmallBean.exec(userId, page, size);
+
+        return friendRequestDAOS.stream()
+                .map(friendRequestDAO -> FriendRequestListResponseDTO.builder()
+                        .friendEmail(userGetByIdSmallBean.exec(friendRequestDAO.getUserId()).getEmail())
+                        .friendName(userGetByIdSmallBean.exec(friendRequestDAO.getUserId()).getNickname())
+                        .friendProfile(userGetByIdSmallBean.exec(friendRequestDAO.getUserId()).getProfileImageURL())
+                        .friendStatus(friendRequestDAO.getState())
+                        .createdAt(friendRequestDAO.getCreatedAt())
+                        .build())
+                .collect(Collectors.toList());
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/SmallBean/FriendBean/FriendDeleteSmallBean.java

@@ -0,0 +1,20 @@
+package com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean;
+
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import com.example.jsgamesbackendmain.Repository.FriendRepository;
+import com.example.jsgamesbackendmain.Repository.FriendRequestRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FriendDeleteSmallBean {
+    private final FriendRepository friendRepository;
+
+    public StateResponseDTO exec(UserDAO userDAO, UserDAO friendDAO) {
+        friendRepository.deleteByUserAndFriend(userDAO, friendDAO);
+        friendRepository.deleteByUserAndFriend(friendDAO, userDAO);
+        return StateResponseDTO.builder().state(true).build();
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/SmallBean/FriendBean/FriendFindSmallBean.java

@@ -0,0 +1,22 @@
+package com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean;
+
+import com.example.jsgamesbackendmain.Controller.ExceptionControll.FailException;
+import com.example.jsgamesbackendmain.Model.DAO.FriendRequestDAO;
+import com.example.jsgamesbackendmain.Repository.FriendRequestRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+@Component
+@RequiredArgsConstructor
+public class FriendFindSmallBean {
+    private final FriendRequestRepository friendRequestRepository;
+
+    public void exec(String userId, String friendId) {
+        Optional<FriendRequestDAO> friendRequestDAO = friendRequestRepository.findByUserIdAndFriendId(userId, friendId);
+        if(!friendRequestDAO.isPresent()) {
+            throw new FailException("헤당 친구요청이 없습니다.");
+        }
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/SmallBean/FriendBean/FriendListByRecentSmallBean.java

@@ -0,0 +1,43 @@
+package com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserRecentPlayTimeSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.FriendDAO;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Response.FriendListResponseDTO;
+import com.example.jsgamesbackendmain.Repository.FriendRepository;
+import com.example.jsgamesbackendmain.Repository.LogRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@RequiredArgsConstructor
+public class FriendListByRecentSmallBean {
+    private final FriendRepository friendRepository;
+    private final UserRecentPlayTimeSmallBean userRecentPlayTimeSmallBean;
+
+    public List<FriendListResponseDTO> exec(UserDAO user, Integer page, Integer size) {
+        // 페이지와 크기를 이용하여 pageable 객체 생성
+        Pageable pageable = PageRequest.of(page, size);
+
+        // 현재 사용자의 친구 목록 가져오기
+        List<FriendDAO> friendDAOS = friendRepository.findByUserOrderByCreatedAtDesc(user, pageable).toList();
+
+        // 각 친구의 최근 게임 플레이 시간을 찾고 정렬하기
+        return friendDAOS.stream().map(friendDAO -> FriendListResponseDTO.builder()
+                .friendEmail(friendDAO.getFriend().getEmail())
+                .friendName(friendDAO.getFriend().getNickname())
+                .friendProfile(friendDAO.getFriend().getProfileImageURL())
+                .parentMajor(friendDAO.getFriend().getParentMajor())
+                .major(friendDAO.getFriend().getMajor())
+                .createdAt(friendDAO.getCreatedAt())
+                .recentPlay(userRecentPlayTimeSmallBean.exec(friendDAO.getFriend()))
+                .build()).collect(Collectors.toList());
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/SmallBean/FriendBean/FriendListByTimeSmallBean.java

@@ -0,0 +1,34 @@
+package com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean;
+
+import com.example.jsgamesbackendmain.Bean.SmallBean.UserBean.UserRecentPlayTimeSmallBean;
+import com.example.jsgamesbackendmain.Model.DAO.FriendDAO;
+import com.example.jsgamesbackendmain.Model.DAO.UserDAO;
+import com.example.jsgamesbackendmain.Model.DTO.Friend.Response.FriendListResponseDTO;
+import com.example.jsgamesbackendmain.Repository.FriendRepository;
+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 FriendListByTimeSmallBean {
+    private final FriendRepository friendRepository;
+    private final UserRecentPlayTimeSmallBean userRecentPlayTimeSmallBean;
+
+    public List<FriendListResponseDTO> exec(UserDAO user, Integer page, Integer size) {
+        List<FriendDAO> friendDAOS = friendRepository.findByUserOrderByCreatedAtDesc(user, PageRequest.of(page, size)).toList();
+
+        return friendDAOS.stream().map(friendDAO -> FriendListResponseDTO.builder()
+                .friendEmail(friendDAO.getFriend().getEmail())
+                .friendName(friendDAO.getFriend().getNickname())
+                .friendProfile(friendDAO.getFriend().getProfileImageURL())
+                .parentMajor(friendDAO.getFriend().getParentMajor())
+                .major(friendDAO.getFriend().getMajor())
+                .createdAt(friendDAO.getCreatedAt())
+                .recentPlay(userRecentPlayTimeSmallBean.exec(friendDAO.getFriend()))
+                .build()).collect(Collectors.toList());
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/SmallBean/FriendBean/FriendRequestDeleteSmallBean.java

@@ -0,0 +1,17 @@
+package com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean;
+
+import com.example.jsgamesbackendmain.Model.DTO.StateResponseDTO;
+import com.example.jsgamesbackendmain.Repository.FriendRequestRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestDeleteSmallBean {
+    private final FriendRequestRepository friendRequestRepository;
+
+    public StateResponseDTO exec(String userId, String friendId) {
+        friendRequestRepository.deleteByUserIdAndFriendId(userId, friendId);
+        return StateResponseDTO.builder().state(true).build();
+    }
+}

src/main/java/com/example/jsgamesbackendmain/Bean/SmallBean/FriendBean/FriendRequestListSmallBean.java

@@ -0,0 +1,22 @@
+package com.example.jsgamesbackendmain.Bean.SmallBean.FriendBean;
+
+import com.example.jsgamesbackendmain.Model.DAO.FriendRequestDAO;
+import com.example.jsgamesbackendmain.Repository.FriendRequestRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class FriendRequestListSmallBean {
+    private final FriendRequestRepository friendRequestRepository;
+
+    public List<FriendRequestDAO> exec(String userId, Integer page, Integer size) {
+        PageRequest request = PageRequest.of(page, size);
+        Page<FriendRequestDAO> friendRequestDAOS = friendRequestRepository.findByUserIdOrderByCreatedAtDesc(userId, request);
+        return friendRequestDAOS.toList();
+    }
+}