diff --git a/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java b/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java index 9a5c1b7..6dc476a 100644 --- a/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java +++ b/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java @@ -1,6 +1,5 @@ package com.back.catchmate.domain.board.dto; -import com.back.catchmate.domain.enroll.dto.EnrollResponse; import com.back.catchmate.domain.game.dto.GameResponse.GameInfo; import com.back.catchmate.domain.user.dto.UserResponse.UserInfo; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/back/catchmate/domain/board/repository/BoardRepositoryImpl.java b/src/main/java/com/back/catchmate/domain/board/repository/BoardRepositoryImpl.java index 9ea29b5..b056605 100644 --- a/src/main/java/com/back/catchmate/domain/board/repository/BoardRepositoryImpl.java +++ b/src/main/java/com/back/catchmate/domain/board/repository/BoardRepositoryImpl.java @@ -17,7 +17,6 @@ @RequiredArgsConstructor public class BoardRepositoryImpl implements BoardRepositoryCustom { - private final JPAQueryFactory queryFactory; @Override diff --git a/src/main/java/com/back/catchmate/domain/board/service/BoardService.java b/src/main/java/com/back/catchmate/domain/board/service/BoardService.java index 3aa343c..7796aab 100644 --- a/src/main/java/com/back/catchmate/domain/board/service/BoardService.java +++ b/src/main/java/com/back/catchmate/domain/board/service/BoardService.java @@ -1,6 +1,5 @@ package com.back.catchmate.domain.board.service; -import com.back.catchmate.domain.board.dto.BoardResponse; import com.back.catchmate.domain.board.dto.BoardResponse.BoardDeleteInfo; import com.back.catchmate.domain.board.dto.BoardResponse.BoardInfo; import com.back.catchmate.domain.board.dto.BoardResponse.LiftUpStatusInfo; @@ -11,7 +10,7 @@ import java.time.LocalDate; import java.util.List; -import static com.back.catchmate.domain.board.dto.BoardRequest.*; +import static com.back.catchmate.domain.board.dto.BoardRequest.CreateOrUpdateBoardRequest; public interface BoardService { BoardInfo createOrUpdateBoard(Long userId, Long boardId, CreateOrUpdateBoardRequest request); diff --git a/src/main/java/com/back/catchmate/domain/chat/service/ChatServiceImpl.java b/src/main/java/com/back/catchmate/domain/chat/service/ChatServiceImpl.java index a0a5834..2d9971a 100644 --- a/src/main/java/com/back/catchmate/domain/chat/service/ChatServiceImpl.java +++ b/src/main/java/com/back/catchmate/domain/chat/service/ChatServiceImpl.java @@ -60,7 +60,7 @@ public void sendChatMessage(Long chatRoomId, ChatMessageRequest request) { // 채팅방에 알림 전송 (FCM 토픽을 사용) String topic = "chat_room_" + chatRoomId; - fcmService.sendMessageToTopic(topic, "제목 뭘로할지 고민,,,", request.getContent()); + fcmService.sendMessageToTopic(topic, chatRoom.getBoard().getTitle(), request.getContent()); } log.info("Sending message to: {}", destination); diff --git a/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java b/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java index 0932142..7ce2804 100644 --- a/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java +++ b/src/main/java/com/back/catchmate/domain/enroll/controller/EnrollController.java @@ -1,7 +1,6 @@ package com.back.catchmate.domain.enroll.controller; import com.back.catchmate.domain.enroll.dto.EnrollRequest.CreateEnrollRequest; -import com.back.catchmate.domain.enroll.dto.EnrollResponse; import com.back.catchmate.domain.enroll.dto.EnrollResponse.CancelEnrollInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.CreateEnrollInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.EnrollDescriptionInfo; diff --git a/src/main/java/com/back/catchmate/domain/enroll/service/EnrollService.java b/src/main/java/com/back/catchmate/domain/enroll/service/EnrollService.java index f9b9159..cf16c6d 100644 --- a/src/main/java/com/back/catchmate/domain/enroll/service/EnrollService.java +++ b/src/main/java/com/back/catchmate/domain/enroll/service/EnrollService.java @@ -1,7 +1,6 @@ package com.back.catchmate.domain.enroll.service; import com.back.catchmate.domain.enroll.dto.EnrollRequest.CreateEnrollRequest; -import com.back.catchmate.domain.enroll.dto.EnrollResponse; import com.back.catchmate.domain.enroll.dto.EnrollResponse.CancelEnrollInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.CreateEnrollInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.EnrollDescriptionInfo; diff --git a/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java b/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java index 865d950..a0199fb 100644 --- a/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java +++ b/src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java @@ -10,9 +10,9 @@ import com.back.catchmate.domain.chat.service.ChatService; import com.back.catchmate.domain.enroll.converter.EnrollConverter; import com.back.catchmate.domain.enroll.dto.EnrollRequest.CreateEnrollRequest; -import com.back.catchmate.domain.enroll.dto.EnrollResponse; import com.back.catchmate.domain.enroll.dto.EnrollResponse.CancelEnrollInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.CreateEnrollInfo; +import com.back.catchmate.domain.enroll.dto.EnrollResponse.EnrollDescriptionInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.NewEnrollCountInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.PagedEnrollReceiveInfo; import com.back.catchmate.domain.enroll.dto.EnrollResponse.PagedEnrollRequestInfo; @@ -26,8 +26,6 @@ import com.back.catchmate.domain.user.repository.UserRepository; import com.back.catchmate.global.error.ErrorCode; import com.back.catchmate.global.error.exception.BaseException; -import com.google.firebase.messaging.FirebaseMessaging; -import com.google.firebase.messaging.FirebaseMessagingException; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -35,8 +33,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import static com.back.catchmate.domain.chat.dto.ChatRequest.ChatMessageRequest.MessageType; @@ -249,7 +245,7 @@ public UpdateEnrollInfo rejectEnroll(Long enrollId, Long userId) throws IOExcept } @Override - public EnrollResponse.EnrollDescriptionInfo getEnrollDescriptionById(Long boardId, Long userId) { + public EnrollDescriptionInfo getEnrollDescriptionById(Long boardId, Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND)); diff --git a/src/main/java/com/back/catchmate/domain/game/entity/Game.java b/src/main/java/com/back/catchmate/domain/game/entity/Game.java index 1c24994..306c31f 100644 --- a/src/main/java/com/back/catchmate/domain/game/entity/Game.java +++ b/src/main/java/com/back/catchmate/domain/game/entity/Game.java @@ -1,17 +1,15 @@ package com.back.catchmate.domain.game.entity; -import com.back.catchmate.domain.board.entity.Board; import com.back.catchmate.domain.club.entity.Club; import com.back.catchmate.global.entity.BaseTimeEntity; import jakarta.persistence.Column; -import jakarta.persistence.Id; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; @@ -21,8 +19,6 @@ import lombok.ToString; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; @Entity @Getter diff --git a/src/main/java/com/back/catchmate/domain/notification/service/FCMService.java b/src/main/java/com/back/catchmate/domain/notification/service/FCMService.java index e350c61..3f20a7d 100644 --- a/src/main/java/com/back/catchmate/domain/notification/service/FCMService.java +++ b/src/main/java/com/back/catchmate/domain/notification/service/FCMService.java @@ -2,10 +2,6 @@ import com.back.catchmate.domain.enroll.entity.AcceptStatus; import com.back.catchmate.domain.notification.dto.FCMMessageRequest; -import com.back.catchmate.domain.topic.dto.TopicRequest.TopicSubscribeRequest; -import com.back.catchmate.domain.topic.dto.TopicRequest.TopicUnsubscribeRequest; -import com.back.catchmate.domain.user.entity.User; -import com.back.catchmate.domain.user.repository.UserRepository; import com.back.catchmate.global.error.ErrorCode; import com.back.catchmate.global.error.exception.BaseException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -27,7 +23,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.util.Collections; @@ -42,7 +37,6 @@ public class FCMService { @Value("${fcm.firebase_api_uri}") private String FIREBASE_ALARM_SEND_API_URI; - private final UserRepository userRepository; private final ObjectMapper objectMapper; // Firebase로 부터 Access Token을 가져오는 메서드 diff --git a/src/main/java/com/back/catchmate/domain/topic/controller/TopicController.java b/src/main/java/com/back/catchmate/domain/topic/controller/TopicController.java deleted file mode 100644 index 8e6b1b3..0000000 --- a/src/main/java/com/back/catchmate/domain/topic/controller/TopicController.java +++ /dev/null @@ -1,39 +0,0 @@ -//package com.back.catchmate.domain.topic.controller; -// -//import com.back.catchmate.domain.notification.dto.NotificationResponse; -//import com.back.catchmate.domain.notification.service.FCMService; -//import com.back.catchmate.domain.topic.dto.TopicRequest; -//import com.back.catchmate.domain.topic.dto.TopicRequest.TopicSubscribeRequest; -//import com.back.catchmate.domain.topic.dto.TopicRequest.TopicUnsubscribeRequest; -//import com.back.catchmate.global.dto.StateResponse; -//import com.back.catchmate.global.jwt.JwtValidation; -//import io.swagger.v3.oas.annotations.Operation; -//import io.swagger.v3.oas.annotations.tags.Tag; -//import lombok.RequiredArgsConstructor; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestBody; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//@Tag(name = "구독 관련 API") -//@RestController -//@RequiredArgsConstructor -//@RequestMapping("/topics") -//public class TopicController { -// private final FCMService fcmService; -// -// @PostMapping("/subscribe") -// @Operation(summary = "특정 채팅방 구독 API", description = "알림을 받기 위해 내가 접속한 채팅방 ID를 구독하는 API 입니다.") -// public void subscribeToTopic(@JwtValidation Long userId, -// @RequestBody TopicSubscribeRequest request) { -// return fcmService.subscribeToTopic(userId, request); -// } -// -// @GetMapping("/receive/{notificationId}") -// @Operation(summary = "특정 채팅방 구독 취소 API", description = "내가 접속한 채팅방 ID를 구독 취소하는 API 입니다.") -// public void unsubscribeFromTopic(@JwtValidation Long userId, -// @RequestBody TopicUnsubscribeRequest request) { -// return fcmService.unsubscribeToTopic(userId, request); -// } -//} diff --git a/src/main/java/com/back/catchmate/domain/topic/dto/TopicRequest.java b/src/main/java/com/back/catchmate/domain/topic/dto/TopicRequest.java deleted file mode 100644 index 5feb5f7..0000000 --- a/src/main/java/com/back/catchmate/domain/topic/dto/TopicRequest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.back.catchmate.domain.topic.dto; - -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -public abstract class TopicRequest { - @Getter - @Builder - @NoArgsConstructor - @AllArgsConstructor - public static class TopicSubscribeRequest { - @NotNull - private String topic; - } - - @Getter - @Builder - @NoArgsConstructor - @AllArgsConstructor - public static class TopicUnsubscribeRequest { - @NotNull - private String topic; - } -} diff --git a/src/main/java/com/back/catchmate/domain/user/entity/User.java b/src/main/java/com/back/catchmate/domain/user/entity/User.java index 10ed63e..5367630 100644 --- a/src/main/java/com/back/catchmate/domain/user/entity/User.java +++ b/src/main/java/com/back/catchmate/domain/user/entity/User.java @@ -1,7 +1,6 @@ package com.back.catchmate.domain.user.entity; import com.back.catchmate.domain.board.entity.Board; -import com.back.catchmate.domain.board.entity.BookMark; import com.back.catchmate.domain.chat.entity.UserChatRoom; import com.back.catchmate.domain.club.entity.Club; import com.back.catchmate.domain.enroll.entity.Enroll; @@ -9,7 +8,16 @@ import com.back.catchmate.global.entity.BaseTimeEntity; import com.back.catchmate.global.error.ErrorCode; import com.back.catchmate.global.error.exception.BaseException; -import jakarta.persistence.*; +import jakarta.persistence.Id; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/back/catchmate/global/config/LoggingAspect.java b/src/main/java/com/back/catchmate/global/config/LoggingAspect.java index 5d8f115..e8e297c 100644 --- a/src/main/java/com/back/catchmate/global/config/LoggingAspect.java +++ b/src/main/java/com/back/catchmate/global/config/LoggingAspect.java @@ -9,8 +9,6 @@ import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.context.annotation.Scope; -import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.stereotype.Component; import java.lang.reflect.Method; diff --git a/src/main/java/com/back/catchmate/global/config/MongodbConfig.java b/src/main/java/com/back/catchmate/global/config/MongodbConfig.java index 41ca244..a2c9423 100644 --- a/src/main/java/com/back/catchmate/global/config/MongodbConfig.java +++ b/src/main/java/com/back/catchmate/global/config/MongodbConfig.java @@ -1,14 +1,9 @@ package com.back.catchmate.global.config; -import com.mongodb.reactivestreams.client.MongoClient; -import com.mongodb.reactivestreams.client.MongoClients; -import com.mongodb.reactivestreams.client.MongoDatabase; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; import org.springframework.data.mongodb.core.convert.MappingMongoConverter; diff --git a/src/main/java/com/back/catchmate/global/handler/StompHandler.java b/src/main/java/com/back/catchmate/global/handler/StompHandler.java deleted file mode 100644 index 0aeecb9..0000000 --- a/src/main/java/com/back/catchmate/global/handler/StompHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.back.catchmate.global.handler; - -import com.back.catchmate.global.jwt.JwtService; -import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpHeaders; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.simp.stomp.StompCommand; -import org.springframework.messaging.simp.stomp.StompHeaderAccessor; -import org.springframework.messaging.support.ChannelInterceptor; - -@Configuration -@RequiredArgsConstructor -public class StompHandler implements ChannelInterceptor { - - private final JwtService jwtService; - - @Override - public Message preSend(Message message, MessageChannel channel) { - StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message); - - return message; - } -}