diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java b/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java index 2a58dd5..2ac829f 100644 --- a/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java @@ -1,8 +1,6 @@ package com.meetup.teame.backend.domain.activity.entity; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; -import com.meetup.teame.backend.domain.experience.entity.ExperienceType; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import com.meetup.teame.backend.domain.like.entity.ActivityLike; import com.meetup.teame.backend.domain.personality.Personality; import jakarta.persistence.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/controller/ChatRoomController.java b/src/main/java/com/meetup/teame/backend/domain/chatting/controller/ChatRoomController.java similarity index 91% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/controller/ChatRoomController.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/controller/ChatRoomController.java index 5c6e32b..1c5026b 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/controller/ChatRoomController.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/controller/ChatRoomController.java @@ -1,11 +1,10 @@ -package com.meetup.teame.backend.domain.chatroom.controller; +package com.meetup.teame.backend.domain.chatting.controller; -import com.meetup.teame.backend.domain.chatroom.dto.response.ReadDirectChatRoomsRes; -import com.meetup.teame.backend.domain.chatroom.dto.response.ReadGroupChatRoomsRes; -import com.meetup.teame.backend.domain.chatroom.service.ChatRoomService; +import com.meetup.teame.backend.domain.chatting.dto.response.ReadDirectChatRoomsRes; +import com.meetup.teame.backend.domain.chatting.dto.response.ReadGroupChatRoomsRes; +import com.meetup.teame.backend.domain.chatting.service.ChatRoomService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/DirectChatRoomRes.java b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/DirectChatRoomRes.java similarity index 92% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/DirectChatRoomRes.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/DirectChatRoomRes.java index 81b2dad..767d3e6 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/DirectChatRoomRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/DirectChatRoomRes.java @@ -1,8 +1,8 @@ -package com.meetup.teame.backend.domain.chatroom.dto.response; +package com.meetup.teame.backend.domain.chatting.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; -import com.meetup.teame.backend.domain.chatroom.entity.Appointment; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.Appointment; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; import com.meetup.teame.backend.domain.chatting.entity.document.ChatMessage; import com.meetup.teame.backend.domain.user.entity.User; import lombok.AccessLevel; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/GroupChatRoomRes.java b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/GroupChatRoomRes.java similarity index 88% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/GroupChatRoomRes.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/GroupChatRoomRes.java index 9109ab0..75328f1 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/GroupChatRoomRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/GroupChatRoomRes.java @@ -1,9 +1,8 @@ -package com.meetup.teame.backend.domain.chatroom.dto.response; +package com.meetup.teame.backend.domain.chatting.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; -import com.meetup.teame.backend.domain.chatroom.entity.Appointment; -import com.meetup.teame.backend.domain.chatroom.entity.ChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.Appointment; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import com.meetup.teame.backend.domain.chatting.entity.document.ChatMessage; import lombok.AccessLevel; import lombok.AllArgsConstructor; @@ -11,7 +10,6 @@ import lombok.Getter; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.Locale; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/ReadDirectChatRoomsRes.java b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/ReadDirectChatRoomsRes.java similarity index 91% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/ReadDirectChatRoomsRes.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/ReadDirectChatRoomsRes.java index 8ee3c0c..fe32cde 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/ReadDirectChatRoomsRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/ReadDirectChatRoomsRes.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.chatroom.dto.response; +package com.meetup.teame.backend.domain.chatting.dto.response; import com.meetup.teame.backend.domain.user.entity.User; import lombok.AccessLevel; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/ReadGroupChatRoomsRes.java b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/ReadGroupChatRoomsRes.java similarity index 91% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/ReadGroupChatRoomsRes.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/ReadGroupChatRoomsRes.java index eb91e72..f8f5793 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/dto/response/ReadGroupChatRoomsRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/dto/response/ReadGroupChatRoomsRes.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.chatroom.dto.response; +package com.meetup.teame.backend.domain.chatting.dto.response; import com.meetup.teame.backend.domain.user.entity.User; import lombok.AccessLevel; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/Appointment.java b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/Appointment.java similarity index 88% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/entity/Appointment.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/entity/Appointment.java index 6db0631..253b6f0 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/Appointment.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/Appointment.java @@ -1,11 +1,10 @@ -package com.meetup.teame.backend.domain.chatroom.entity; +package com.meetup.teame.backend.domain.chatting.entity; import jakarta.persistence.Embeddable; import lombok.*; import org.hibernate.annotations.Comment; import java.time.LocalDate; -import java.time.LocalDateTime; @Embeddable diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/ChatRoom.java b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/ChatRoom.java similarity index 96% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/entity/ChatRoom.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/entity/ChatRoom.java index 4cfb725..1cedffe 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/ChatRoom.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/ChatRoom.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.chatroom.entity; +package com.meetup.teame.backend.domain.chatting.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/DirectChatRoom.java b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/DirectChatRoom.java similarity index 95% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/entity/DirectChatRoom.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/entity/DirectChatRoom.java index d85245e..9c202bb 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/DirectChatRoom.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/DirectChatRoom.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.chatroom.entity; +package com.meetup.teame.backend.domain.chatting.entity; import com.meetup.teame.backend.domain.experience.entity.Experience; import com.meetup.teame.backend.domain.user.entity.User; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/GroupChatRoom.java b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/GroupChatRoom.java similarity index 92% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/entity/GroupChatRoom.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/entity/GroupChatRoom.java index eb2a9f4..038397e 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/GroupChatRoom.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/GroupChatRoom.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.chatroom.entity; +package com.meetup.teame.backend.domain.chatting.entity; import com.meetup.teame.backend.domain.activity.entity.Activity; import jakarta.persistence.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/UserChatRoom.java b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/UserChatRoom.java similarity index 93% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/entity/UserChatRoom.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/entity/UserChatRoom.java index 2be0f26..6a9cd8f 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/entity/UserChatRoom.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/entity/UserChatRoom.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.chatroom.entity; +package com.meetup.teame.backend.domain.chatting.entity; import com.meetup.teame.backend.domain.user.entity.User; import jakarta.persistence.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/ChatRoomRepository.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/ChatRoomRepository.java similarity index 53% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/ChatRoomRepository.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/ChatRoomRepository.java index 9415ae6..30ba45f 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/ChatRoomRepository.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/ChatRoomRepository.java @@ -1,6 +1,6 @@ -package com.meetup.teame.backend.domain.chatroom.repository; +package com.meetup.teame.backend.domain.chatting.repository; -import com.meetup.teame.backend.domain.chatroom.entity.ChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.ChatRoom; import org.springframework.data.jpa.repository.JpaRepository; public interface ChatRoomRepository extends JpaRepository{ diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/DirectChatRoomRepository.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/DirectChatRoomRepository.java similarity index 51% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/DirectChatRoomRepository.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/DirectChatRoomRepository.java index e624fff..c61619d 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/DirectChatRoomRepository.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/DirectChatRoomRepository.java @@ -1,10 +1,8 @@ -package com.meetup.teame.backend.domain.chatroom.repository; +package com.meetup.teame.backend.domain.chatting.repository; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.repository.custom.DirectChatRoomRepositoryCustom; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.repository.custom.DirectChatRoomRepositoryCustom; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; - public interface DirectChatRoomRepository extends JpaRepository, DirectChatRoomRepositoryCustom { } diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/GroupChatRoomRepository.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/GroupChatRoomRepository.java similarity index 55% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/GroupChatRoomRepository.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/GroupChatRoomRepository.java index c4f58b2..1b8f408 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/GroupChatRoomRepository.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/GroupChatRoomRepository.java @@ -1,8 +1,7 @@ -package com.meetup.teame.backend.domain.chatroom.repository; +package com.meetup.teame.backend.domain.chatting.repository; -import com.meetup.teame.backend.domain.activity.entity.Activity; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; -import com.meetup.teame.backend.domain.chatroom.repository.custom.GroupChatRoomRepositoryCustom; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.repository.custom.GroupChatRoomRepositoryCustom; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/UserChatRoomRepository.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/UserChatRoomRepository.java similarity index 64% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/UserChatRoomRepository.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/UserChatRoomRepository.java index c7a882e..77056e9 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/UserChatRoomRepository.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/UserChatRoomRepository.java @@ -1,6 +1,6 @@ -package com.meetup.teame.backend.domain.chatroom.repository; +package com.meetup.teame.backend.domain.chatting.repository; -import com.meetup.teame.backend.domain.chatroom.entity.UserChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.UserChatRoom; import org.springframework.data.jpa.repository.JpaRepository; public interface UserChatRoomRepository extends JpaRepository { diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/DirectChatRoomRepositoryCustom.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/DirectChatRoomRepositoryCustom.java similarity index 68% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/DirectChatRoomRepositoryCustom.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/DirectChatRoomRepositoryCustom.java index db13a20..583e093 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/DirectChatRoomRepositoryCustom.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/DirectChatRoomRepositoryCustom.java @@ -1,7 +1,6 @@ -package com.meetup.teame.backend.domain.chatroom.repository.custom; +package com.meetup.teame.backend.domain.chatting.repository.custom; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; import com.meetup.teame.backend.domain.user.entity.User; import java.util.List; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/DirectChatRoomRepositoryImpl.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/DirectChatRoomRepositoryImpl.java similarity index 86% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/DirectChatRoomRepositoryImpl.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/DirectChatRoomRepositoryImpl.java index 5071635..2be3120 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/DirectChatRoomRepositoryImpl.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/DirectChatRoomRepositoryImpl.java @@ -1,6 +1,6 @@ -package com.meetup.teame.backend.domain.chatroom.repository.custom; +package com.meetup.teame.backend.domain.chatting.repository.custom; -import com.meetup.teame.backend.domain.chatroom.entity.*; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; import com.meetup.teame.backend.domain.user.entity.User; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; @@ -9,9 +9,8 @@ import java.util.List; import java.util.Optional; -import static com.meetup.teame.backend.domain.chatroom.entity.QDirectChatRoom.directChatRoom; -import static com.meetup.teame.backend.domain.chatroom.entity.QGroupChatRoom.groupChatRoom; -import static com.meetup.teame.backend.domain.chatroom.entity.QUserChatRoom.userChatRoom; +import static com.meetup.teame.backend.domain.chatting.entity.QDirectChatRoom.directChatRoom; +import static com.meetup.teame.backend.domain.chatting.entity.QUserChatRoom.userChatRoom; import static com.meetup.teame.backend.domain.user.entity.QUser.user; @RequiredArgsConstructor diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/GroupChatRoomRepositoryCustom.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/GroupChatRoomRepositoryCustom.java similarity index 67% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/GroupChatRoomRepositoryCustom.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/GroupChatRoomRepositoryCustom.java index 0faca42..5a1dc14 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/GroupChatRoomRepositoryCustom.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/GroupChatRoomRepositoryCustom.java @@ -1,7 +1,6 @@ -package com.meetup.teame.backend.domain.chatroom.repository.custom; +package com.meetup.teame.backend.domain.chatting.repository.custom; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import com.meetup.teame.backend.domain.user.entity.User; import java.util.List; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/GroupChatRoomRepositoryImpl.java b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/GroupChatRoomRepositoryImpl.java similarity index 81% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/GroupChatRoomRepositoryImpl.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/GroupChatRoomRepositoryImpl.java index aab0f55..b7b1ac4 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/repository/custom/GroupChatRoomRepositoryImpl.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/repository/custom/GroupChatRoomRepositoryImpl.java @@ -1,10 +1,6 @@ -package com.meetup.teame.backend.domain.chatroom.repository.custom; +package com.meetup.teame.backend.domain.chatting.repository.custom; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.QGroupChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.QUserChatRoom; -import com.meetup.teame.backend.domain.user.entity.QUser; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import com.meetup.teame.backend.domain.user.entity.User; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; @@ -12,8 +8,8 @@ import java.time.LocalDate; import java.util.List; -import static com.meetup.teame.backend.domain.chatroom.entity.QGroupChatRoom.groupChatRoom; -import static com.meetup.teame.backend.domain.chatroom.entity.QUserChatRoom.userChatRoom; +import static com.meetup.teame.backend.domain.chatting.entity.QGroupChatRoom.groupChatRoom; +import static com.meetup.teame.backend.domain.chatting.entity.QUserChatRoom.userChatRoom; import static com.meetup.teame.backend.domain.user.entity.QUser.user; @RequiredArgsConstructor diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/service/ChatRoomService.java b/src/main/java/com/meetup/teame/backend/domain/chatting/service/ChatRoomService.java similarity index 89% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/service/ChatRoomService.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/service/ChatRoomService.java index 8f039f4..c31faa7 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/service/ChatRoomService.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/service/ChatRoomService.java @@ -1,18 +1,18 @@ -package com.meetup.teame.backend.domain.chatroom.service; +package com.meetup.teame.backend.domain.chatting.service; import com.meetup.teame.backend.domain.activity.entity.Activity; import com.meetup.teame.backend.domain.activity.repository.ActivityRepository; import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider; -import com.meetup.teame.backend.domain.chatroom.dto.response.DirectChatRoomRes; -import com.meetup.teame.backend.domain.chatroom.dto.response.GroupChatRoomRes; -import com.meetup.teame.backend.domain.chatroom.dto.response.ReadDirectChatRoomsRes; -import com.meetup.teame.backend.domain.chatroom.dto.response.ReadGroupChatRoomsRes; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.UserChatRoom; -import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository; -import com.meetup.teame.backend.domain.chatroom.repository.GroupChatRoomRepository; -import com.meetup.teame.backend.domain.chatroom.repository.UserChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.dto.response.DirectChatRoomRes; +import com.meetup.teame.backend.domain.chatting.dto.response.GroupChatRoomRes; +import com.meetup.teame.backend.domain.chatting.dto.response.ReadDirectChatRoomsRes; +import com.meetup.teame.backend.domain.chatting.dto.response.ReadGroupChatRoomsRes; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.UserChatRoom; +import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.repository.GroupChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.repository.UserChatRoomRepository; import com.meetup.teame.backend.domain.chatting.entity.document.ChatMessage; import com.meetup.teame.backend.domain.chatting.repository.ChattingRepository; import com.meetup.teame.backend.domain.experience.entity.Experience; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatting/service/ChattingService.java b/src/main/java/com/meetup/teame/backend/domain/chatting/service/ChattingService.java index a9db9ee..b1b08dd 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatting/service/ChattingService.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/service/ChattingService.java @@ -1,9 +1,9 @@ package com.meetup.teame.backend.domain.chatting.service; -import com.meetup.teame.backend.domain.chatroom.entity.Appointment; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.repository.ChatRoomRepository; -import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.entity.Appointment; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.repository.ChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository; import com.meetup.teame.backend.domain.chatting.dto.request.AppointmentChatMessageReq; import com.meetup.teame.backend.domain.chatting.dto.request.EmoticonChatMessageReq; import com.meetup.teame.backend.domain.chatting.dto.request.TextChatMessageReq; @@ -21,7 +21,6 @@ import com.meetup.teame.backend.global.exception.ExceptionContent; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatroom/service/LastAppointmentScheduler.java b/src/main/java/com/meetup/teame/backend/domain/chatting/service/LastAppointmentScheduler.java similarity index 86% rename from src/main/java/com/meetup/teame/backend/domain/chatroom/service/LastAppointmentScheduler.java rename to src/main/java/com/meetup/teame/backend/domain/chatting/service/LastAppointmentScheduler.java index 01463d6..59a2f28 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatroom/service/LastAppointmentScheduler.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/service/LastAppointmentScheduler.java @@ -1,9 +1,9 @@ -package com.meetup.teame.backend.domain.chatroom.service; +package com.meetup.teame.backend.domain.chatting.service; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; -import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository; -import com.meetup.teame.backend.domain.chatroom.repository.GroupChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.repository.GroupChatRoomRepository; import com.meetup.teame.backend.domain.review.entity.Review; import com.meetup.teame.backend.domain.review.repository.ReviewRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/meetup/teame/backend/domain/experience/entity/Experience.java b/src/main/java/com/meetup/teame/backend/domain/experience/entity/Experience.java index 269a6f5..13406f2 100644 --- a/src/main/java/com/meetup/teame/backend/domain/experience/entity/Experience.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/entity/Experience.java @@ -1,13 +1,12 @@ package com.meetup.teame.backend.domain.experience.entity; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; import com.meetup.teame.backend.domain.user.dto.request.MyExperienceReq; import com.meetup.teame.backend.domain.user.entity.User; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.Comment; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.UpdateTimestamp; import java.time.LocalDateTime; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/entity/Review.java b/src/main/java/com/meetup/teame/backend/domain/review/entity/Review.java index ac68b2a..d75ab00 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/entity/Review.java +++ b/src/main/java/com/meetup/teame/backend/domain/review/entity/Review.java @@ -1,7 +1,6 @@ package com.meetup.teame.backend.domain.review.entity; -import com.meetup.teame.backend.domain.chatroom.entity.Appointment; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.Appointment; import com.meetup.teame.backend.domain.experience.entity.Experience; import com.meetup.teame.backend.domain.experience.entity.ExperienceType; import com.meetup.teame.backend.domain.user.entity.User; diff --git a/src/main/java/com/meetup/teame/backend/domain/user/dto/response/AppointmentRes.java b/src/main/java/com/meetup/teame/backend/domain/user/dto/response/AppointmentRes.java index a874db1..54a2976 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/dto/response/AppointmentRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/dto/response/AppointmentRes.java @@ -1,9 +1,7 @@ package com.meetup.teame.backend.domain.user.dto.response; -import com.meetup.teame.backend.domain.activity.entity.Activity; -import com.meetup.teame.backend.domain.chatroom.entity.Appointment; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import lombok.*; import java.time.LocalDate; diff --git a/src/main/java/com/meetup/teame/backend/domain/user/dto/response/ReadCalenderRes.java b/src/main/java/com/meetup/teame/backend/domain/user/dto/response/ReadCalenderRes.java index 157d7da..5a56ca7 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/dto/response/ReadCalenderRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/dto/response/ReadCalenderRes.java @@ -1,7 +1,7 @@ package com.meetup.teame.backend.domain.user.dto.response; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import lombok.*; import java.util.ArrayList; diff --git a/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java b/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java index 2562a8c..2f590b1 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java @@ -1,8 +1,7 @@ package com.meetup.teame.backend.domain.user.entity; -import com.meetup.teame.backend.domain.chatroom.entity.ChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom; -import com.meetup.teame.backend.domain.chatroom.entity.UserChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; +import com.meetup.teame.backend.domain.chatting.entity.UserChatRoom; import com.meetup.teame.backend.domain.personality.Personality; import com.meetup.teame.backend.domain.experience.entity.Experience; import com.meetup.teame.backend.domain.like.entity.ActivityLike; diff --git a/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java b/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java index 41d94a4..d3f99ea 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java @@ -1,15 +1,13 @@ package com.meetup.teame.backend.domain.user.service; import com.meetup.teame.backend.domain.activity.dto.response.ActivitySummaryRes; -import com.meetup.teame.backend.domain.activity.entity.Activity; import com.meetup.teame.backend.domain.activity.repository.ActivityRepository; import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider; import com.meetup.teame.backend.domain.auth.oauth.dto.CreateUserRequest; -import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository; -import com.meetup.teame.backend.domain.chatroom.repository.GroupChatRoomRepository; -import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom; +import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.repository.GroupChatRoomRepository; +import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import com.meetup.teame.backend.domain.experience.entity.Experience; -import com.meetup.teame.backend.domain.experience.entity.ExperienceType; import com.meetup.teame.backend.domain.experience.repository.ExperienceRepository; import com.meetup.teame.backend.domain.like.repository.ActivityLikeRepository; import com.meetup.teame.backend.domain.personality.Personality;