Refactor/fix user

src/main/java/com/petmatz/api/chatting/ChatController.java

@@ -7,8 +7,8 @@
 import com.petmatz.domain.chatting.ChatMessageService;
 import com.petmatz.domain.chatting.ChatRoomService;
 import com.petmatz.domain.chatting.dto.ChatMessageInfo;
-import com.petmatz.domain.user.service.UserService;
 import com.petmatz.domain.user.info.UserInfo;
+import com.petmatz.domain.user.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;

src/main/java/com/petmatz/api/chatting/MatchingController.java → src/main/java/com/petmatz/api/chatting/ChatRoomController.java

@@ -17,7 +17,7 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/match")
-public class MatchingController {
+public class ChatRoomController {
 
     private final ChatRoomService chatRoomService;
     private final JwtExtractProvider jwtExtractProvider;

src/main/java/com/petmatz/api/global/ImageErrorApi.java

@@ -3,7 +3,6 @@
 import com.petmatz.api.global.dto.ImageErrorRequest;
 import com.petmatz.api.global.dto.ImgType;
 import com.petmatz.domain.pet.PetService;
-//import com.petmatz.domain.user.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;

src/main/java/com/petmatz/api/global/exception/GlobalExceptionHandler.java

@@ -3,7 +3,6 @@
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.common.exception.BaseErrorCode;
 import com.petmatz.common.exception.ErrorReason;
-import com.petmatz.domain.user.exception.UserErrorCode;
 import com.petmatz.domain.user.exception.UserException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/com/petmatz/api/pet/PetController.java

@@ -2,16 +2,15 @@
 
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.global.dto.S3ImgDataResponse;
-import com.petmatz.api.pet.dto.PetRegisterNoRequest;
 import com.petmatz.api.pet.dto.PetInfoResponse;
+import com.petmatz.api.pet.dto.PetRegisterNoRequest;
 import com.petmatz.api.pet.dto.PetRequest;
 import com.petmatz.api.pet.dto.PetUpdateRequest;
 import com.petmatz.common.security.jwt.JwtExtractProvider;
 import com.petmatz.domain.global.S3ImgDataInfo;
 import com.petmatz.domain.pet.PetService;
 import com.petmatz.domain.pet.dto.OpenApiPetInfo;
 import com.petmatz.domain.user.component.UserUtils;
-import com.petmatz.domain.user.service.UserService;
 import com.petmatz.domain.user.entity.User;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/petmatz/api/sosboard/dto/LegercySosBoardResponse.java

@@ -1,10 +1,11 @@
 package com.petmatz.api.sosboard.dto;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.petmatz.api.pet.dto.PetResponse;
 import com.petmatz.domain.sosboard.PaymentType;
+import com.petmatz.domain.sosboard.dto.LegercySosBoardInfo;
 import com.petmatz.domain.sosboard.entity.PetSosBoard;
 import com.petmatz.domain.sosboard.entity.SosBoard;
-import com.petmatz.domain.sosboard.dto.LegercySosBoardInfo;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/petmatz/api/sosboard/dto/SosBoardCreateRequest.java

@@ -2,10 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.petmatz.api.pet.dto.PetResponse;
-import com.petmatz.domain.sosboard.PaymentType;
-import com.petmatz.domain.sosboard.dto.LegercySosBoardInfo;
 import com.petmatz.domain.sosboard.dto.SosBoardCreateInfo;
-import com.petmatz.domain.user.entity.User;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

src/main/java/com/petmatz/api/sosboard/dto/SosBoardPetResponse.java

@@ -1,6 +1,5 @@
 package com.petmatz.api.sosboard.dto;
 
-import com.petmatz.domain.sosboard.dto.SosBoardInfoList;
 import com.petmatz.domain.sosboard.dto.SosBoardPetInfo;
 import lombok.Builder;
 

src/main/java/com/petmatz/api/sosboard/dto/SosBoardResponse.java

@@ -1,12 +1,8 @@
 package com.petmatz.api.sosboard.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.petmatz.domain.pet.entity.Pet;
 import com.petmatz.domain.sosboard.PaymentType;
 import com.petmatz.domain.sosboard.dto.SosBoardInfo;
-import com.petmatz.domain.sosboard.dto.SosBoardPet;
-import com.petmatz.domain.sosboard.entity.SosBoard;
-import com.petmatz.domain.user.entity.User;
 import lombok.Builder;
 
 import java.time.LocalDateTime;

src/main/java/com/petmatz/api/sosboard/dto/SpecificSosBoardResponse.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.petmatz.domain.sosboard.PaymentType;
-import com.petmatz.domain.sosboard.dto.SosBoardPetInfo;
 import com.petmatz.domain.sosboard.dto.SpecificSosBoardInfo;
 import lombok.Builder;
 

src/main/java/com/petmatz/api/user/controller/AuthController.java

@@ -2,17 +2,14 @@
 
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.user.request.CheckCertificationRequestDto;
-import com.petmatz.api.user.request.DeleteIdRequestDto;
 import com.petmatz.api.user.request.SignInRequestDto;
 import com.petmatz.api.user.request.SignUpRequestDto;
-import com.petmatz.domain.user.entity.User;
-import com.petmatz.domain.user.response.*;
+import com.petmatz.domain.user.response.SignInResponseDto;
+import com.petmatz.domain.user.response.SignUpResponse;
 import com.petmatz.domain.user.service.AuthService;
-import com.petmatz.user.common.LogInResponseDto;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/petmatz/api/user/controller/EmailController.java

@@ -2,11 +2,9 @@
 
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.user.request.EmailCertificationRequestDto;
-import com.petmatz.domain.user.response.EmailCertificationResponseDto;
 import com.petmatz.domain.user.service.EmailService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/petmatz/api/user/controller/JwtController.java

@@ -4,7 +4,6 @@
 import com.petmatz.common.security.jwt.JwtManager;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseCookie;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/petmatz/api/user/controller/LocationController.java

@@ -6,7 +6,6 @@
 import com.petmatz.domain.user.service.LocationService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/petmatz/api/user/controller/PageController.java

@@ -2,10 +2,10 @@
 
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.user.request.EditMyProfileRequestDto;
-import com.petmatz.domain.user.service.PageService;
 import com.petmatz.domain.user.response.EditMyProfileResponseDto;
 import com.petmatz.domain.user.response.GetMyProfileResponseDto;
 import com.petmatz.domain.user.response.GetOtherProfileResponseDto;
+import com.petmatz.domain.user.service.PageService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/petmatz/api/user/controller/PasswordController.java

@@ -3,12 +3,9 @@
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.user.request.RepasswordRequestDto;
 import com.petmatz.api.user.request.SendRepasswordRequestDto;
-import com.petmatz.domain.user.response.RepasswordResponseDto;
-import com.petmatz.domain.user.response.SendRepasswordResponseDto;
 import com.petmatz.domain.user.service.PasswordService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/petmatz/api/user/controller/RecommendController.java

@@ -3,11 +3,9 @@
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.user.request.UpdateRecommendationRequestDto;
 import com.petmatz.domain.user.response.GetRecommendationResponseDto;
-import com.petmatz.domain.user.response.UpdateRecommendationResponseDto;
 import com.petmatz.domain.user.service.RecommendService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController

src/main/java/com/petmatz/common/config/FailedAuthenticationEntryPoint.java

@@ -14,8 +14,6 @@ public class FailedAuthenticationEntryPoint implements AuthenticationEntryPoint
 
     @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
-        System.out.println("request.getRequestURI() :: " + request.getRequestURI());
-        System.out.println("request.getQueryString() :: " + request.getQueryString());
         response.setContentType("application/json");
         response.setStatus(HttpServletResponse.SC_FORBIDDEN); // 403 상태 반환
         response.getWriter().write("{\"code\":\"NP\",\"message\":\"No Permission.\"}"); // 인증 실패 메시지

src/main/java/com/petmatz/common/config/WebSecurityConfig.java

@@ -2,9 +2,6 @@
 
 import com.petmatz.common.security.filter.JwtAuthenticationFilter;
 import com.petmatz.common.security.handler.OAuthSuccessHandler;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,17 +11,13 @@
 import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
 import org.springframework.security.config.annotation.web.configurers.HttpBasicConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
-import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-import java.io.IOException;
-
 @Configuration
 @EnableWebSecurity
 @RequiredArgsConstructor

src/main/java/com/petmatz/common/security/filter/JwtAuthenticationFilter.java

@@ -1,7 +1,6 @@
 package com.petmatz.common.security.filter;
 
 import com.petmatz.common.security.jwt.JwtManager;
-import com.petmatz.common.security.jwt.JwtProvider;
 import com.petmatz.domain.user.constant.LoginRole;
 import com.petmatz.domain.user.entity.User;
 import com.petmatz.domain.user.repository.UserRepository;

src/main/java/com/petmatz/common/security/handler/OAuthSuccessHandler.java

@@ -1,7 +1,6 @@
 package com.petmatz.common.security.handler;
 
 import com.petmatz.common.security.jwt.JwtManager;
-import com.petmatz.common.security.jwt.JwtProvider;
 import com.petmatz.domain.user.entity.CustomOAuthUser;
 import com.petmatz.domain.user.entity.User;
 import com.petmatz.domain.user.repository.UserRepository;

src/main/java/com/petmatz/common/security/jwt/JwtExtractProviderImpl.java

@@ -1,7 +1,6 @@
 package com.petmatz.common.security.jwt;
 
 import com.petmatz.domain.user.repository.UserRepository;
-import com.petmatz.infra.redis.component.RedisTokenComponent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

src/main/java/com/petmatz/common/security/jwt/JwtManager.java

@@ -11,7 +11,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseCookie;
 import org.springframework.stereotype.Component;
 
 import javax.crypto.SecretKey;

src/main/java/com/petmatz/domain/chatting/ChatMessageService.java

@@ -1,6 +1,5 @@
 package com.petmatz.domain.chatting;
 
-import com.petmatz.api.chatting.dto.ChatReadStatusDirect;
 import com.petmatz.domain.chatting.component.ChatMessageReader;
 import com.petmatz.domain.chatting.component.ChatMessageUpdater;
 import com.petmatz.domain.chatting.docs.ChatReadStatusDocs;
@@ -11,7 +10,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;

src/main/java/com/petmatz/domain/chatting/ChatRoomService.java

@@ -11,10 +11,8 @@
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -48,41 +46,28 @@ public long createdChatRoom(ChatRoomInfo chatRoomInfo) {
         return chatRoomId;
     }
 
-    public List<ChatRoomMetaDataInfo> selectChatRoomList(int pageSize, int startPage, String userEmail) {
+    public List<ChatRoomMetaDataInfo> selectChatRoomList(int pageSize, int startPage, String accountId) {
 
-        List<UserToChatRoomEntity> chatRoomNumber = chatRoomReader.findChatRoomNumber(userEmail);
-        List<String> roomNumberList = chatRoomNumber.stream()
-                .map(chatRoomEntity -> String.valueOf(chatRoomEntity.getChatRoom().getId()))
-                .distinct()
-                .toList();
+        List<Long> chatRoomNumber = chatRoomReader.findChatRoomNumber(accountId);
+        List<UserToChatRoomEntity> userToChatRoomEntities = chatRoomReader.selectChatRoomUserList(chatRoomNumber, accountId);
 
-        Map<String, Integer> unreadCountList = updateMessageStatus(roomNumberList, userEmail, pageSize, startPage);
-        Map<String, IChatUserInfo> userList = getUserList(chatRoomNumber, userEmail);
+        Map<String, Integer> unreadCountList = updateMessageStatus(chatRoomNumber, accountId, pageSize, startPage);
+        Map<String, IChatUserInfo> userList = getUserList(userToChatRoomEntities, accountId);
 
-        return chatRoomMetaDataReader.findChatRoomMetaDataInfo(roomNumberList, unreadCountList, userList);
+        return chatRoomMetaDataReader.findChatRoomMetaDataInfo(chatRoomNumber, unreadCountList, userList);
     }
 
     private Map<String, IChatUserInfo> getUserList(List<UserToChatRoomEntity> chatRoomNumber, String userEmail) {
-        Map<String, IChatUserInfo> userList = new HashMap<>();
-
-        for (UserToChatRoomEntity userToChatRoomEntity : chatRoomNumber) {
-            String chatRoomId = userToChatRoomEntity.getChatRoom().getId().toString();
-
-            // 현재 사용자가 아닌 다른 사용자를 찾기 위한 스트림 사용
-            userToChatRoomEntity.getChatRoom().getParticipants().stream()
-                    .filter(participant -> !participant.getUser().getAccountId().equals(userEmail))
-                    .findFirst() // 첫 번째로 조건을 만족하는 사용자 찾기
-                    .ifPresent(participant -> {
-                        IChatUserInfo userInfo = IChatUserInfo.of(participant.getUser());
-                        userList.put(chatRoomId, userInfo);
-                    });
-        }
-        return userList;
+        return chatRoomNumber.stream()
+                .collect(Collectors.toMap(
+                        userToChatRoomEntity -> userToChatRoomEntity.getChatRoom().getId().toString(), // key: chatRoomId
+                        userToChatRoomEntity -> IChatUserInfo.of(userToChatRoomEntity.getUser()) // value: IChatUserInfo
+                ));
     }
 
-    private Map<String, Integer> updateMessageStatus(List<String> chatRoomNumber,String userEmail, int pageSize, int startPage) {
+    private Map<String, Integer> updateMessageStatus(List<Long> chatRoomNumber,String userEmail, int pageSize, int startPage) {
         Map<String, Integer> unreadCountList = new HashMap<>();
-        for (String roomId : chatRoomNumber) {
+        for (Long roomId : chatRoomNumber) {
             String chatRoomId = String.valueOf(roomId);
             ChatReadStatusDocs chatReadStatusDocs = chatReadStatusReader.selectChatMessageLastStatus(chatRoomId, userEmail);
             LocalDateTime lastReadTimestamp = chatReadStatusDocs.checkLastReadTimestamp();

src/main/java/com/petmatz/domain/chatting/component/ChatDocsAppend.java

@@ -24,7 +24,6 @@ public void init(ChatRoomInfo chatRoomInfo,long chatRoomID) {
         ChatReadStatusDocs caregiverChatReadStatusDocs = createdChatReadStatusDocs(chatRoomInfo.caregiverInfo(),chatRoomID);
         ChatReadStatusDocs entrustedChatReadStatusDocs = createdChatReadStatusDocs(chatRoomInfo.entrustedInfo(),chatRoomID);
 
-
         mongoTemplate.save(caregiverChatReadStatusDocs);
         mongoTemplate.save(entrustedChatReadStatusDocs);
         mongoTemplate.save(chatRoomDocs);

src/main/java/com/petmatz/domain/chatting/component/ChatRoomMetaDataReader.java

@@ -21,8 +21,9 @@ public class ChatRoomMetaDataReader {
     private final MongoTemplate mongoTemplate;
 
     //자기자신이 속한 채팅방의 메타데이터를 전부 조회 및 해당 채팅방의 안읽은 메세지 갯수를 업데이트해서 반환
-    public List<ChatRoomMetaDataInfo> findChatRoomMetaDataInfo(List<String> chatRoomNumbers, Map<String, Integer> unreadCountList, Map<String, IChatUserInfo> userList) {
-        Criteria criteria = Criteria.where("_id").in(chatRoomNumbers);
+    public List<ChatRoomMetaDataInfo> findChatRoomMetaDataInfo(List<Long> chatRoomNumbers, Map<String, Integer> unreadCountList, Map<String, IChatUserInfo> userList) {
+        List<String> chatNumberList = chatRoomNumbers.stream().map(Object::toString).toList();
+        Criteria criteria = Criteria.where("_id").in(chatNumberList);
         Query query = new Query(criteria);
 
         return mongoTemplate.find(query, ChatRoomMetadataDocs.class).stream()

src/main/java/com/petmatz/domain/chatting/component/ChatRoomReader.java

@@ -20,10 +20,12 @@ public class ChatRoomReader {
 
     //TODO 예외처리 해야 함.
     //자기자신이 속한 채팅방을 전부 조회
-    public List<UserToChatRoomEntity> findChatRoomNumber(String userEmail) {
-        Optional<List<UserToChatRoomEntity>> chatRoomEntities = userToChatRoomRepository.findByUser_AccountId(userEmail);
-        System.out.println(chatRoomEntities.get());
-        return chatRoomEntities.get();
+    public List<Long> findChatRoomNumber(String userEmail) {
+        return userToChatRoomRepository.findDistinctByUserAccountId(userEmail);
+    }
+
+    public List<UserToChatRoomEntity> selectChatRoomUserList(List<Long> chatRoomIdList, String accountId) {
+        return userToChatRoomRepository.selectChatRoomUserList(chatRoomIdList, accountId);
     }
 
     public Optional<ChatRoomEntity> selectChatRoom(ChatRoomInfo chatRoomInfo) {