diff --git a/src/main/java/com/hellomeritz/BanWordApplicationRunner.java b/src/main/java/com/hello/BanWordApplicationRunner.java similarity index 87% rename from src/main/java/com/hellomeritz/BanWordApplicationRunner.java rename to src/main/java/com/hello/BanWordApplicationRunner.java index 8fd1bc8..d75c519 100644 --- a/src/main/java/com/hellomeritz/BanWordApplicationRunner.java +++ b/src/main/java/com/hello/BanWordApplicationRunner.java @@ -1,6 +1,6 @@ -package com.hellomeritz; +package com.hello; -import com.hellomeritz.chat.service.BanWordService; +import com.hello.chat.service.BanWordService; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/hellomeritz/HelloConsultantApplication.java b/src/main/java/com/hello/HelloConsultantApplication.java similarity index 93% rename from src/main/java/com/hellomeritz/HelloConsultantApplication.java rename to src/main/java/com/hello/HelloConsultantApplication.java index 87c9f54..01f2941 100644 --- a/src/main/java/com/hellomeritz/HelloConsultantApplication.java +++ b/src/main/java/com/hello/HelloConsultantApplication.java @@ -1,4 +1,4 @@ -package com.hellomeritz; +package com.hello; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/hellomeritz/chat/controller/BanWordController.java b/src/main/java/com/hello/chat/controller/BanWordController.java similarity index 88% rename from src/main/java/com/hellomeritz/chat/controller/BanWordController.java rename to src/main/java/com/hello/chat/controller/BanWordController.java index b770169..8128637 100644 --- a/src/main/java/com/hellomeritz/chat/controller/BanWordController.java +++ b/src/main/java/com/hello/chat/controller/BanWordController.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller; +package com.hello.chat.controller; -import com.hellomeritz.chat.service.BanWordService; +import com.hello.chat.service.BanWordService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PatchMapping; diff --git a/src/main/java/com/hellomeritz/chat/controller/ChatController.java b/src/main/java/com/hello/chat/controller/ChatController.java similarity index 81% rename from src/main/java/com/hellomeritz/chat/controller/ChatController.java rename to src/main/java/com/hello/chat/controller/ChatController.java index baaa6b2..657a5ff 100644 --- a/src/main/java/com/hellomeritz/chat/controller/ChatController.java +++ b/src/main/java/com/hello/chat/controller/ChatController.java @@ -1,11 +1,11 @@ -package com.hellomeritz.chat.controller; +package com.hello.chat.controller; -import com.hellomeritz.chat.controller.dto.request.ChatMessageSttRequest; -import com.hellomeritz.chat.controller.dto.request.ChatMessageTranslateRequest; -import com.hellomeritz.chat.controller.dto.response.ChatMessageSttResponse; -import com.hellomeritz.chat.controller.dto.response.ChatMessageTranslateResponses; -import com.hellomeritz.chat.service.ChatMessageService; -import com.hellomeritz.chat.service.dto.result.ChatMessageSttResult; +import com.hello.chat.controller.dto.request.ChatMessageSttRequest; +import com.hello.chat.controller.dto.request.ChatMessageTranslateRequest; +import com.hello.chat.controller.dto.response.ChatMessageSttResponse; +import com.hello.chat.controller.dto.response.ChatMessageTranslateResponses; +import com.hello.chat.service.ChatMessageService; +import com.hello.chat.service.dto.result.ChatMessageSttResult; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/ChatRoomController.java b/src/main/java/com/hello/chat/controller/ChatRoomController.java similarity index 92% rename from src/main/java/com/hellomeritz/chat/controller/ChatRoomController.java rename to src/main/java/com/hello/chat/controller/ChatRoomController.java index cab7d2e..df2fb58 100644 --- a/src/main/java/com/hellomeritz/chat/controller/ChatRoomController.java +++ b/src/main/java/com/hello/chat/controller/ChatRoomController.java @@ -1,11 +1,11 @@ -package com.hellomeritz.chat.controller; - -import com.hellomeritz.chat.controller.dto.request.*; -import com.hellomeritz.chat.controller.dto.response.*; -import com.hellomeritz.chat.service.ChatService; -import com.hellomeritz.chat.service.dto.param.ChatRoomUserInfoParam; -import com.hellomeritz.chat.service.dto.result.ChatRoomInfoOfConsultantResults; -import com.hellomeritz.chat.service.dto.result.ChatRoomInfoOfForeignerResults; +package com.hello.chat.controller; + +import com.hello.chat.controller.dto.request.*; +import com.hello.chat.controller.dto.response.*; +import com.hello.chat.service.ChatService; +import com.hello.chat.service.dto.param.ChatRoomUserInfoParam; +import com.hello.chat.service.dto.result.ChatRoomInfoOfConsultantResults; +import com.hello.chat.service.dto.result.ChatRoomInfoOfForeignerResults; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatAudioUploadRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatAudioUploadRequest.java similarity index 85% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatAudioUploadRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatAudioUploadRequest.java index c19b17b..867bdca 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatAudioUploadRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatAudioUploadRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatAudioUploadParam; +import com.hello.chat.service.dto.param.ChatAudioUploadParam; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageGetRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatMessageGetRequest.java similarity index 89% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageGetRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatMessageGetRequest.java index bdace1d..7135d5b 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageGetRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatMessageGetRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatMessageGetParam; +import com.hello.chat.service.dto.param.ChatMessageGetParam; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageSttRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatMessageSttRequest.java similarity index 83% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageSttRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatMessageSttRequest.java index 5e28a2d..a2e94ab 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageSttRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatMessageSttRequest.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.service.dto.param.ChatMessageSttParam; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.service.dto.param.ChatMessageSttParam; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageTranslateRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatMessageTranslateRequest.java similarity index 87% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageTranslateRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatMessageTranslateRequest.java index 317f548..b50bd92 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatMessageTranslateRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatMessageTranslateRequest.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.TargetLanguage; -import com.hellomeritz.chat.service.dto.param.ChatMessageTextParam; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.TargetLanguage; +import com.hello.chat.service.dto.param.ChatMessageTextParam; import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomCreateRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomCreateRequest.java similarity index 84% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomCreateRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatRoomCreateRequest.java index bc365b7..bd8e44b 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomCreateRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomCreateRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatRoomCreateParam; +import com.hello.chat.service.dto.param.ChatRoomCreateParam; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomEnterRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomEnterRequest.java similarity index 72% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomEnterRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatRoomEnterRequest.java index 9d8d781..2021a13 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomEnterRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomEnterRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatRoomEnterParam; +import com.hello.chat.service.dto.param.ChatRoomEnterParam; import jakarta.validation.constraints.NotNull; public record ChatRoomEnterRequest( diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomInfoOfConsultantRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomInfoOfConsultantRequest.java similarity index 77% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomInfoOfConsultantRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatRoomInfoOfConsultantRequest.java index d425976..5c95901 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomInfoOfConsultantRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomInfoOfConsultantRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatRoomInfoOfConsultantParam; +import com.hello.chat.service.dto.param.ChatRoomInfoOfConsultantParam; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomInfoOfForeignerRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomInfoOfForeignerRequest.java similarity index 77% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomInfoOfForeignerRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatRoomInfoOfForeignerRequest.java index 2ff452e..28fd0a8 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomInfoOfForeignerRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomInfoOfForeignerRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatRoomInfoOfForeignerParam; +import com.hello.chat.service.dto.param.ChatRoomInfoOfForeignerParam; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomLeaveRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomLeaveRequest.java similarity index 82% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomLeaveRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatRoomLeaveRequest.java index f9e9cf8..e79c046 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomLeaveRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomLeaveRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatRoomLeaveParam; +import com.hello.chat.service.dto.param.ChatRoomLeaveParam; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomPasswordCheckRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomPasswordCheckRequest.java similarity index 75% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomPasswordCheckRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatRoomPasswordCheckRequest.java index da75d63..f92e137 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomPasswordCheckRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomPasswordCheckRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.chat.service.dto.param.ChatRoomPasswordCheckParam; +import com.hello.chat.service.dto.param.ChatRoomPasswordCheckParam; import jakarta.validation.constraints.NotBlank; public record ChatRoomPasswordCheckRequest( diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomPasswordCreateRequest.java b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomPasswordCreateRequest.java similarity index 74% rename from src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomPasswordCreateRequest.java rename to src/main/java/com/hello/chat/controller/dto/request/ChatRoomPasswordCreateRequest.java index 2bb4916..0032d66 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/request/ChatRoomPasswordCreateRequest.java +++ b/src/main/java/com/hello/chat/controller/dto/request/ChatRoomPasswordCreateRequest.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.controller.dto.request; +package com.hello.chat.controller.dto.request; -import com.hellomeritz.global.encryption.PassWord; -import com.hellomeritz.chat.service.dto.param.ChatRoomPasswordCreateParam; +import com.hello.global.encryption.PassWord; +import com.hello.chat.service.dto.param.ChatRoomPasswordCreateParam; import jakarta.validation.constraints.NotBlank; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatAudioUploadResponse.java b/src/main/java/com/hello/chat/controller/dto/response/ChatAudioUploadResponse.java similarity index 71% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatAudioUploadResponse.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatAudioUploadResponse.java index bae2d5a..5c8f5dd 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatAudioUploadResponse.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatAudioUploadResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatAudioUploadResult; +import com.hello.chat.service.dto.result.ChatAudioUploadResult; public record ChatAudioUploadResponse( String audioUrl, diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageGetResponses.java b/src/main/java/com/hello/chat/controller/dto/response/ChatMessageGetResponses.java similarity index 88% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageGetResponses.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatMessageGetResponses.java index 6da28a9..606bf48 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageGetResponses.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatMessageGetResponses.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatMessageGetResults; +import com.hello.chat.service.dto.result.ChatMessageGetResults; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageSttResponse.java b/src/main/java/com/hello/chat/controller/dto/response/ChatMessageSttResponse.java similarity index 74% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageSttResponse.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatMessageSttResponse.java index c46cb79..d849ba6 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageSttResponse.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatMessageSttResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatMessageSttResult; +import com.hello.chat.service.dto.result.ChatMessageSttResult; public record ChatMessageSttResponse( String textBySpeech, diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageTranslateResponses.java b/src/main/java/com/hello/chat/controller/dto/response/ChatMessageTranslateResponses.java similarity index 88% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageTranslateResponses.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatMessageTranslateResponses.java index d62e9fa..873409a 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatMessageTranslateResponses.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatMessageTranslateResponses.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatMessageTranslateResults; +import com.hello.chat.service.dto.result.ChatMessageTranslateResults; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomCreateResponse.java b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomCreateResponse.java similarity index 65% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomCreateResponse.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatRoomCreateResponse.java index c94d5bd..de5d792 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomCreateResponse.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomCreateResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatRoomCreateResult; +import com.hello.chat.service.dto.result.ChatRoomCreateResult; public record ChatRoomCreateResponse( long chatRoomId diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomInfoOfConsultantResponses.java b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomInfoOfConsultantResponses.java similarity index 84% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomInfoOfConsultantResponses.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatRoomInfoOfConsultantResponses.java index f2febc2..5b3341a 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomInfoOfConsultantResponses.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomInfoOfConsultantResponses.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatRoomInfoOfConsultantResult; -import com.hellomeritz.chat.service.dto.result.ChatRoomInfoOfConsultantResults; +import com.hello.chat.service.dto.result.ChatRoomInfoOfConsultantResult; +import com.hello.chat.service.dto.result.ChatRoomInfoOfConsultantResults; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomInfoOfForeignerResponses.java b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomInfoOfForeignerResponses.java similarity index 84% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomInfoOfForeignerResponses.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatRoomInfoOfForeignerResponses.java index b332893..f3e0d67 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomInfoOfForeignerResponses.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomInfoOfForeignerResponses.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatRoomInfoOfForeignerResult; -import com.hellomeritz.chat.service.dto.result.ChatRoomInfoOfForeignerResults; +import com.hello.chat.service.dto.result.ChatRoomInfoOfForeignerResult; +import com.hello.chat.service.dto.result.ChatRoomInfoOfForeignerResults; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomPasswordCheckResponse.java b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomPasswordCheckResponse.java similarity index 79% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomPasswordCheckResponse.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatRoomPasswordCheckResponse.java index f1132ca..17a3a3d 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomPasswordCheckResponse.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomPasswordCheckResponse.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; public record ChatRoomPasswordCheckResponse( Boolean isMyUser diff --git a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomUserInfoResponse.java b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomUserInfoResponse.java similarity index 71% rename from src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomUserInfoResponse.java rename to src/main/java/com/hello/chat/controller/dto/response/ChatRoomUserInfoResponse.java index d6ffd77..c1bd669 100644 --- a/src/main/java/com/hellomeritz/chat/controller/dto/response/ChatRoomUserInfoResponse.java +++ b/src/main/java/com/hello/chat/controller/dto/response/ChatRoomUserInfoResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.controller.dto.response; +package com.hello.chat.controller.dto.response; -import com.hellomeritz.chat.service.dto.result.ChatRoomUserInfoResult; +import com.hello.chat.service.dto.result.ChatRoomUserInfoResult; public record ChatRoomUserInfoResponse( long userId, diff --git a/src/main/java/com/hellomeritz/chat/domain/BanWord.java b/src/main/java/com/hello/chat/domain/BanWord.java similarity index 91% rename from src/main/java/com/hellomeritz/chat/domain/BanWord.java rename to src/main/java/com/hello/chat/domain/BanWord.java index d1fa3c8..cfa8c32 100644 --- a/src/main/java/com/hellomeritz/chat/domain/BanWord.java +++ b/src/main/java/com/hello/chat/domain/BanWord.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.domain; +package com.hello.chat.domain; -import com.hellomeritz.chat.global.SourceLanguage; +import com.hello.chat.global.SourceLanguage; import jakarta.persistence.*; import lombok.Getter; import org.springframework.util.Assert; diff --git a/src/main/java/com/hellomeritz/chat/domain/ChatMessage.java b/src/main/java/com/hello/chat/domain/ChatMessage.java similarity index 97% rename from src/main/java/com/hellomeritz/chat/domain/ChatMessage.java rename to src/main/java/com/hello/chat/domain/ChatMessage.java index 72a0a44..9231bde 100644 --- a/src/main/java/com/hellomeritz/chat/domain/ChatMessage.java +++ b/src/main/java/com/hello/chat/domain/ChatMessage.java @@ -1,7 +1,6 @@ -package com.hellomeritz.chat.domain; +package com.hello.chat.domain; import lombok.Getter; -import org.checkerframework.checker.units.qual.C; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.util.Assert; diff --git a/src/main/java/com/hellomeritz/chat/domain/ChatMessageType.java b/src/main/java/com/hello/chat/domain/ChatMessageType.java similarity index 66% rename from src/main/java/com/hellomeritz/chat/domain/ChatMessageType.java rename to src/main/java/com/hello/chat/domain/ChatMessageType.java index e453498..38ad0a3 100644 --- a/src/main/java/com/hellomeritz/chat/domain/ChatMessageType.java +++ b/src/main/java/com/hello/chat/domain/ChatMessageType.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.domain; +package com.hello.chat.domain; public enum ChatMessageType { AUDIO, diff --git a/src/main/java/com/hellomeritz/chat/domain/ChatRoom.java b/src/main/java/com/hello/chat/domain/ChatRoom.java similarity index 97% rename from src/main/java/com/hellomeritz/chat/domain/ChatRoom.java rename to src/main/java/com/hello/chat/domain/ChatRoom.java index 918e6ae..86a7309 100644 --- a/src/main/java/com/hellomeritz/chat/domain/ChatRoom.java +++ b/src/main/java/com/hello/chat/domain/ChatRoom.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.domain; +package com.hello.chat.domain; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/chat/global/BlockingNoticeMessage.java b/src/main/java/com/hello/chat/global/BlockingNoticeMessage.java similarity index 97% rename from src/main/java/com/hellomeritz/chat/global/BlockingNoticeMessage.java rename to src/main/java/com/hello/chat/global/BlockingNoticeMessage.java index 5e537f5..20f982c 100644 --- a/src/main/java/com/hellomeritz/chat/global/BlockingNoticeMessage.java +++ b/src/main/java/com/hello/chat/global/BlockingNoticeMessage.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global; +package com.hello.chat.global; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/chat/global/SourceLanguage.java b/src/main/java/com/hello/chat/global/SourceLanguage.java similarity index 97% rename from src/main/java/com/hellomeritz/chat/global/SourceLanguage.java rename to src/main/java/com/hello/chat/global/SourceLanguage.java index d0845f6..6810601 100644 --- a/src/main/java/com/hellomeritz/chat/global/SourceLanguage.java +++ b/src/main/java/com/hello/chat/global/SourceLanguage.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global; +package com.hello.chat.global; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/chat/global/TargetLanguage.java b/src/main/java/com/hello/chat/global/TargetLanguage.java similarity index 96% rename from src/main/java/com/hellomeritz/chat/global/TargetLanguage.java rename to src/main/java/com/hello/chat/global/TargetLanguage.java index 9c2d0a8..7e03601 100644 --- a/src/main/java/com/hellomeritz/chat/global/TargetLanguage.java +++ b/src/main/java/com/hello/chat/global/TargetLanguage.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global; +package com.hello.chat.global; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/chat/global/VisaType.java b/src/main/java/com/hello/chat/global/VisaType.java similarity index 95% rename from src/main/java/com/hellomeritz/chat/global/VisaType.java rename to src/main/java/com/hello/chat/global/VisaType.java index 1bf32f2..b04dc77 100644 --- a/src/main/java/com/hellomeritz/chat/global/VisaType.java +++ b/src/main/java/com/hello/chat/global/VisaType.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global; +package com.hello.chat.global; import java.util.Arrays; diff --git a/src/main/java/com/hellomeritz/chat/global/config/MongoConfig.java b/src/main/java/com/hello/chat/global/config/MongoConfig.java similarity index 94% rename from src/main/java/com/hellomeritz/chat/global/config/MongoConfig.java rename to src/main/java/com/hello/chat/global/config/MongoConfig.java index 3fd742f..436e566 100644 --- a/src/main/java/com/hellomeritz/chat/global/config/MongoConfig.java +++ b/src/main/java/com/hello/chat/global/config/MongoConfig.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.config; +package com.hello.chat.global.config; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; diff --git a/src/main/java/com/hellomeritz/chat/global/config/SocketConfig.java b/src/main/java/com/hello/chat/global/config/SocketConfig.java similarity index 92% rename from src/main/java/com/hellomeritz/chat/global/config/SocketConfig.java rename to src/main/java/com/hello/chat/global/config/SocketConfig.java index 9e4df47..1a59b35 100644 --- a/src/main/java/com/hellomeritz/chat/global/config/SocketConfig.java +++ b/src/main/java/com/hello/chat/global/config/SocketConfig.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.global.config; +package com.hello.chat.global.config; -import com.hellomeritz.chat.global.handler.ChatErrorHandler; +import com.hello.chat.global.handler.ChatErrorHandler; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/src/main/java/com/hellomeritz/chat/global/handler/ChatErrorHandler.java b/src/main/java/com/hello/chat/global/handler/ChatErrorHandler.java similarity index 98% rename from src/main/java/com/hellomeritz/chat/global/handler/ChatErrorHandler.java rename to src/main/java/com/hello/chat/global/handler/ChatErrorHandler.java index 59e29f6..46f0ced 100644 --- a/src/main/java/com/hellomeritz/chat/global/handler/ChatErrorHandler.java +++ b/src/main/java/com/hello/chat/global/handler/ChatErrorHandler.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.handler; +package com.hello.chat.global.handler; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/hello/chat/global/stt/SttManager.java b/src/main/java/com/hello/chat/global/stt/SttManager.java new file mode 100644 index 0000000..e513bca --- /dev/null +++ b/src/main/java/com/hello/chat/global/stt/SttManager.java @@ -0,0 +1,9 @@ +package com.hello.chat.global.stt; + +import com.hello.chat.global.stt.dto.SttRequest; +import com.hello.chat.global.stt.dto.SttResponse; + +public interface SttManager { + + SttResponse asyncRecognizeAudio (SttRequest request); +} diff --git a/src/main/java/com/hellomeritz/chat/global/stt/SttManagerHandler.java b/src/main/java/com/hello/chat/global/stt/SttManagerHandler.java similarity index 69% rename from src/main/java/com/hellomeritz/chat/global/stt/SttManagerHandler.java rename to src/main/java/com/hello/chat/global/stt/SttManagerHandler.java index 5b3776c..b766129 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/SttManagerHandler.java +++ b/src/main/java/com/hello/chat/global/stt/SttManagerHandler.java @@ -1,10 +1,7 @@ -package com.hellomeritz.chat.global.stt; +package com.hello.chat.global.stt; -import com.hellomeritz.chat.global.stt.google.SttGoogleManager; -import com.hellomeritz.chat.global.stt.openai.SttWhisperManager; -import com.hellomeritz.chat.global.stt.openai.client.OpenAIClient; -import com.hellomeritz.chat.global.stt.openai.client.OpenAIClientConfig; -import com.hellomeritz.chat.global.uploader.AudioUploader; +import com.hello.chat.global.stt.google.SttGoogleManager; +import com.hello.chat.global.stt.openai.SttWhisperManager; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/src/main/java/com/hellomeritz/chat/global/stt/SttProvider.java b/src/main/java/com/hello/chat/global/stt/SttProvider.java similarity index 56% rename from src/main/java/com/hellomeritz/chat/global/stt/SttProvider.java rename to src/main/java/com/hello/chat/global/stt/SttProvider.java index 32250b2..c0fdde2 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/SttProvider.java +++ b/src/main/java/com/hello/chat/global/stt/SttProvider.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.stt; +package com.hello.chat.global.stt; public enum SttProvider { GOOGLE, diff --git a/src/main/java/com/hellomeritz/chat/global/stt/dto/SttRequest.java b/src/main/java/com/hello/chat/global/stt/dto/SttRequest.java similarity index 63% rename from src/main/java/com/hellomeritz/chat/global/stt/dto/SttRequest.java rename to src/main/java/com/hello/chat/global/stt/dto/SttRequest.java index 90d9216..6f32a32 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/dto/SttRequest.java +++ b/src/main/java/com/hello/chat/global/stt/dto/SttRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.global.stt.dto; +package com.hello.chat.global.stt.dto; -import com.hellomeritz.chat.global.SourceLanguage; +import com.hello.chat.global.SourceLanguage; import org.springframework.web.multipart.MultipartFile; public record SttRequest( diff --git a/src/main/java/com/hellomeritz/chat/global/stt/dto/SttResponse.java b/src/main/java/com/hello/chat/global/stt/dto/SttResponse.java similarity index 72% rename from src/main/java/com/hellomeritz/chat/global/stt/dto/SttResponse.java rename to src/main/java/com/hello/chat/global/stt/dto/SttResponse.java index f7945ed..bfa06d9 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/dto/SttResponse.java +++ b/src/main/java/com/hello/chat/global/stt/dto/SttResponse.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.global.stt.dto; +package com.hello.chat.global.stt.dto; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.domain.ChatMessageType; -import com.hellomeritz.chat.service.dto.param.ChatMessageSttParam; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.domain.ChatMessageType; +import com.hello.chat.service.dto.param.ChatMessageSttParam; public record SttResponse( String textBySpeech diff --git a/src/main/java/com/hellomeritz/chat/global/stt/google/SttGoogleManager.java b/src/main/java/com/hello/chat/global/stt/google/SttGoogleManager.java similarity index 93% rename from src/main/java/com/hellomeritz/chat/global/stt/google/SttGoogleManager.java rename to src/main/java/com/hello/chat/global/stt/google/SttGoogleManager.java index 32a8c0a..49a9a0c 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/google/SttGoogleManager.java +++ b/src/main/java/com/hello/chat/global/stt/google/SttGoogleManager.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.stt.google; +package com.hello.chat.global.stt.google; import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.longrunning.OperationTimedPollAlgorithm; @@ -8,11 +8,11 @@ import com.google.cloud.speech.v1.SpeechSettings; import com.google.api.gax.core.FixedCredentialsProvider; import com.google.cloud.speech.v1.*; -import com.hellomeritz.global.exception.ErrorCode; -import com.hellomeritz.global.exception.custom.SttException; -import com.hellomeritz.chat.global.stt.SttManager; -import com.hellomeritz.chat.global.stt.dto.SttRequest; -import com.hellomeritz.chat.global.stt.dto.SttResponse; +import com.hello.global.exception.ErrorCode; +import com.hello.global.exception.custom.SttException; +import com.hello.chat.global.stt.SttManager; +import com.hello.chat.global.stt.dto.SttRequest; +import com.hello.chat.global.stt.dto.SttResponse; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.threeten.bp.Duration; diff --git a/src/main/java/com/hellomeritz/chat/global/stt/openai/SttWhisperManager.java b/src/main/java/com/hello/chat/global/stt/openai/SttWhisperManager.java similarity index 64% rename from src/main/java/com/hellomeritz/chat/global/stt/openai/SttWhisperManager.java rename to src/main/java/com/hello/chat/global/stt/openai/SttWhisperManager.java index e0db0b5..ccf1ad6 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/openai/SttWhisperManager.java +++ b/src/main/java/com/hello/chat/global/stt/openai/SttWhisperManager.java @@ -1,13 +1,13 @@ -package com.hellomeritz.chat.global.stt.openai; +package com.hello.chat.global.stt.openai; -import com.hellomeritz.chat.global.stt.SttManager; -import com.hellomeritz.chat.global.stt.dto.SttRequest; -import com.hellomeritz.chat.global.stt.dto.SttResponse; -import com.hellomeritz.chat.global.stt.openai.client.OpenAIClient; -import com.hellomeritz.chat.global.stt.openai.client.OpenAIClientConfig; -import com.hellomeritz.chat.global.stt.openai.dto.WhisperTranscriptionRequest; -import com.hellomeritz.chat.global.stt.openai.dto.WhisperTranscriptionResponse; +import com.hello.chat.global.stt.SttManager; +import com.hello.chat.global.stt.dto.SttRequest; +import com.hello.chat.global.stt.dto.SttResponse; +import com.hello.chat.global.stt.openai.client.OpenAIClient; +import com.hello.chat.global.stt.openai.client.OpenAIClientConfig; +import com.hello.chat.global.stt.openai.dto.WhisperTranscriptionRequest; +import com.hello.chat.global.stt.openai.dto.WhisperTranscriptionResponse; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/hellomeritz/chat/global/stt/openai/SttWhisperResponse.java b/src/main/java/com/hello/chat/global/stt/openai/SttWhisperResponse.java similarity index 85% rename from src/main/java/com/hellomeritz/chat/global/stt/openai/SttWhisperResponse.java rename to src/main/java/com/hello/chat/global/stt/openai/SttWhisperResponse.java index 3003d4e..1a60c14 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/openai/SttWhisperResponse.java +++ b/src/main/java/com/hello/chat/global/stt/openai/SttWhisperResponse.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.stt.openai; +package com.hello.chat.global.stt.openai; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/hellomeritz/chat/global/stt/openai/client/OpenAIClient.java b/src/main/java/com/hello/chat/global/stt/openai/client/OpenAIClient.java similarity index 73% rename from src/main/java/com/hellomeritz/chat/global/stt/openai/client/OpenAIClient.java rename to src/main/java/com/hello/chat/global/stt/openai/client/OpenAIClient.java index 1fbd66f..e0adbc5 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/openai/client/OpenAIClient.java +++ b/src/main/java/com/hello/chat/global/stt/openai/client/OpenAIClient.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.global.stt.openai.client; +package com.hello.chat.global.stt.openai.client; -import com.hellomeritz.chat.global.stt.openai.dto.WhisperTranscriptionRequest; -import com.hellomeritz.chat.global.stt.openai.dto.WhisperTranscriptionResponse; +import com.hello.chat.global.stt.openai.dto.WhisperTranscriptionRequest; +import com.hello.chat.global.stt.openai.dto.WhisperTranscriptionResponse; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/hellomeritz/chat/global/stt/openai/client/OpenAIClientConfig.java b/src/main/java/com/hello/chat/global/stt/openai/client/OpenAIClientConfig.java similarity index 95% rename from src/main/java/com/hellomeritz/chat/global/stt/openai/client/OpenAIClientConfig.java rename to src/main/java/com/hello/chat/global/stt/openai/client/OpenAIClientConfig.java index 6e3cdaf..b37df87 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/openai/client/OpenAIClientConfig.java +++ b/src/main/java/com/hello/chat/global/stt/openai/client/OpenAIClientConfig.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.stt.openai.client; +package com.hello.chat.global.stt.openai.client; import feign.Request; import feign.RequestInterceptor; diff --git a/src/main/java/com/hellomeritz/chat/global/stt/openai/dto/WhisperTranscriptionRequest.java b/src/main/java/com/hello/chat/global/stt/openai/dto/WhisperTranscriptionRequest.java similarity index 87% rename from src/main/java/com/hellomeritz/chat/global/stt/openai/dto/WhisperTranscriptionRequest.java rename to src/main/java/com/hello/chat/global/stt/openai/dto/WhisperTranscriptionRequest.java index cdea928..20e761a 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/openai/dto/WhisperTranscriptionRequest.java +++ b/src/main/java/com/hello/chat/global/stt/openai/dto/WhisperTranscriptionRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.stt.openai.dto; +package com.hello.chat.global.stt.openai.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/hellomeritz/chat/global/stt/openai/dto/WhisperTranscriptionResponse.java b/src/main/java/com/hello/chat/global/stt/openai/dto/WhisperTranscriptionResponse.java similarity index 74% rename from src/main/java/com/hellomeritz/chat/global/stt/openai/dto/WhisperTranscriptionResponse.java rename to src/main/java/com/hello/chat/global/stt/openai/dto/WhisperTranscriptionResponse.java index d972b69..b2877d7 100644 --- a/src/main/java/com/hellomeritz/chat/global/stt/openai/dto/WhisperTranscriptionResponse.java +++ b/src/main/java/com/hello/chat/global/stt/openai/dto/WhisperTranscriptionResponse.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.stt.openai.dto; +package com.hello.chat.global.stt.openai.dto; import lombok.Data; diff --git a/src/main/java/com/hellomeritz/chat/global/translator/TranslateProvider.java b/src/main/java/com/hello/chat/global/translator/TranslateProvider.java similarity index 54% rename from src/main/java/com/hellomeritz/chat/global/translator/TranslateProvider.java rename to src/main/java/com/hello/chat/global/translator/TranslateProvider.java index 968b7e8..53c96c8 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/TranslateProvider.java +++ b/src/main/java/com/hello/chat/global/translator/TranslateProvider.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.translator; +package com.hello.chat.global.translator; public enum TranslateProvider { DEEPL, diff --git a/src/main/java/com/hello/chat/global/translator/TranslationRequest.java b/src/main/java/com/hello/chat/global/translator/TranslationRequest.java new file mode 100644 index 0000000..76333ec --- /dev/null +++ b/src/main/java/com/hello/chat/global/translator/TranslationRequest.java @@ -0,0 +1,11 @@ +package com.hello.chat.global.translator; + +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.TargetLanguage; + +public record TranslationRequest( + String contents, + TargetLanguage targetLang, + SourceLanguage sourceLang +) { +} diff --git a/src/main/java/com/hellomeritz/chat/global/translator/TranslationResponse.java b/src/main/java/com/hello/chat/global/translator/TranslationResponse.java similarity index 80% rename from src/main/java/com/hellomeritz/chat/global/translator/TranslationResponse.java rename to src/main/java/com/hello/chat/global/translator/TranslationResponse.java index 5c0f1c6..28f10f3 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/TranslationResponse.java +++ b/src/main/java/com/hello/chat/global/translator/TranslationResponse.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.translator; +package com.hello.chat.global.translator; public record TranslationResponse( String translatedText diff --git a/src/main/java/com/hellomeritz/chat/global/translator/Translator.java b/src/main/java/com/hello/chat/global/translator/Translator.java similarity index 67% rename from src/main/java/com/hellomeritz/chat/global/translator/Translator.java rename to src/main/java/com/hello/chat/global/translator/Translator.java index 938c794..afcd0eb 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/Translator.java +++ b/src/main/java/com/hello/chat/global/translator/Translator.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.translator; +package com.hello.chat.global.translator; public interface Translator { diff --git a/src/main/java/com/hellomeritz/chat/global/translator/TranslatorHandler.java b/src/main/java/com/hello/chat/global/translator/TranslatorHandler.java similarity index 81% rename from src/main/java/com/hellomeritz/chat/global/translator/TranslatorHandler.java rename to src/main/java/com/hello/chat/global/translator/TranslatorHandler.java index 6f46f8d..1d65839 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/TranslatorHandler.java +++ b/src/main/java/com/hello/chat/global/translator/TranslatorHandler.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.global.translator; +package com.hello.chat.global.translator; -import com.hellomeritz.chat.global.translator.deepl.DeeplTranslator; -import com.hellomeritz.chat.global.translator.google.GoogleTranslator; +import com.hello.chat.global.translator.deepl.DeeplTranslator; +import com.hello.chat.global.translator.google.GoogleTranslator; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/src/main/java/com/hellomeritz/chat/global/translator/deepl/DeeplTranslationResponse.java b/src/main/java/com/hello/chat/global/translator/deepl/DeeplTranslationResponse.java similarity index 88% rename from src/main/java/com/hellomeritz/chat/global/translator/deepl/DeeplTranslationResponse.java rename to src/main/java/com/hello/chat/global/translator/deepl/DeeplTranslationResponse.java index 0ffbb62..1a21bfe 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/deepl/DeeplTranslationResponse.java +++ b/src/main/java/com/hello/chat/global/translator/deepl/DeeplTranslationResponse.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.translator.deepl; +package com.hello.chat.global.translator.deepl; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/hellomeritz/chat/global/translator/deepl/DeeplTranslator.java b/src/main/java/com/hello/chat/global/translator/deepl/DeeplTranslator.java similarity index 85% rename from src/main/java/com/hellomeritz/chat/global/translator/deepl/DeeplTranslator.java rename to src/main/java/com/hello/chat/global/translator/deepl/DeeplTranslator.java index bdfc18f..4073a0f 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/deepl/DeeplTranslator.java +++ b/src/main/java/com/hello/chat/global/translator/deepl/DeeplTranslator.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.global.translator.deepl; +package com.hello.chat.global.translator.deepl; -import com.hellomeritz.chat.global.translator.TranslationRequest; -import com.hellomeritz.chat.global.translator.TranslationResponse; -import com.hellomeritz.chat.global.translator.Translator; +import com.hello.chat.global.translator.TranslationRequest; +import com.hello.chat.global.translator.TranslationResponse; +import com.hello.chat.global.translator.Translator; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.*; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/hellomeritz/chat/global/translator/deepl/TranslationText.java b/src/main/java/com/hello/chat/global/translator/deepl/TranslationText.java similarity index 78% rename from src/main/java/com/hellomeritz/chat/global/translator/deepl/TranslationText.java rename to src/main/java/com/hello/chat/global/translator/deepl/TranslationText.java index b873a86..3bb9990 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/deepl/TranslationText.java +++ b/src/main/java/com/hello/chat/global/translator/deepl/TranslationText.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.translator.deepl; +package com.hello.chat.global.translator.deepl; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/hellomeritz/chat/global/translator/google/GoogleTranslator.java b/src/main/java/com/hello/chat/global/translator/google/GoogleTranslator.java similarity index 80% rename from src/main/java/com/hellomeritz/chat/global/translator/google/GoogleTranslator.java rename to src/main/java/com/hello/chat/global/translator/google/GoogleTranslator.java index 47a98b0..c83d4b4 100644 --- a/src/main/java/com/hellomeritz/chat/global/translator/google/GoogleTranslator.java +++ b/src/main/java/com/hello/chat/global/translator/google/GoogleTranslator.java @@ -1,14 +1,14 @@ -package com.hellomeritz.chat.global.translator.google; +package com.hello.chat.global.translator.google; import com.google.auth.oauth2.GoogleCredentials; import com.google.cloud.translate.Translate; import com.google.cloud.translate.TranslateOptions; import com.google.cloud.translate.Translation; -import com.hellomeritz.global.exception.ErrorCode; -import com.hellomeritz.global.exception.custom.TranslateException; -import com.hellomeritz.chat.global.translator.TranslationRequest; -import com.hellomeritz.chat.global.translator.TranslationResponse; -import com.hellomeritz.chat.global.translator.Translator; +import com.hello.global.exception.ErrorCode; +import com.hello.global.exception.custom.TranslateException; +import com.hello.chat.global.translator.TranslationRequest; +import com.hello.chat.global.translator.TranslationResponse; +import com.hello.chat.global.translator.Translator; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/hellomeritz/chat/global/uploader/AudioUploadResponse.java b/src/main/java/com/hello/chat/global/uploader/AudioUploadResponse.java similarity index 62% rename from src/main/java/com/hellomeritz/chat/global/uploader/AudioUploadResponse.java rename to src/main/java/com/hello/chat/global/uploader/AudioUploadResponse.java index d7242c3..ddfec81 100644 --- a/src/main/java/com/hellomeritz/chat/global/uploader/AudioUploadResponse.java +++ b/src/main/java/com/hello/chat/global/uploader/AudioUploadResponse.java @@ -1,9 +1,8 @@ -package com.hellomeritz.chat.global.uploader; +package com.hello.chat.global.uploader; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.domain.ChatMessageType; -import com.hellomeritz.chat.service.dto.param.ChatAudioUploadParam; -import com.hellomeritz.chat.service.dto.param.ChatMessageSttParam; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.domain.ChatMessageType; +import com.hello.chat.service.dto.param.ChatAudioUploadParam; public record AudioUploadResponse( String audioUrl diff --git a/src/main/java/com/hellomeritz/chat/global/uploader/AudioUploader.java b/src/main/java/com/hello/chat/global/uploader/AudioUploader.java similarity index 77% rename from src/main/java/com/hellomeritz/chat/global/uploader/AudioUploader.java rename to src/main/java/com/hello/chat/global/uploader/AudioUploader.java index 2b62651..246a2b8 100644 --- a/src/main/java/com/hellomeritz/chat/global/uploader/AudioUploader.java +++ b/src/main/java/com/hello/chat/global/uploader/AudioUploader.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.uploader; +package com.hello.chat.global.uploader; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/hellomeritz/chat/global/uploader/GcpBucketUploader.java b/src/main/java/com/hello/chat/global/uploader/GcpBucketUploader.java similarity index 97% rename from src/main/java/com/hellomeritz/chat/global/uploader/GcpBucketUploader.java rename to src/main/java/com/hello/chat/global/uploader/GcpBucketUploader.java index a69c420..07d5c0c 100644 --- a/src/main/java/com/hellomeritz/chat/global/uploader/GcpBucketUploader.java +++ b/src/main/java/com/hello/chat/global/uploader/GcpBucketUploader.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.global.uploader; +package com.hello.chat.global.uploader; import com.google.auth.oauth2.GoogleCredentials; import com.google.cloud.storage.*; diff --git a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordJpaRepository.java b/src/main/java/com/hello/chat/repository/banword/BanWordJpaRepository.java similarity index 62% rename from src/main/java/com/hellomeritz/chat/repository/banword/BanWordJpaRepository.java rename to src/main/java/com/hello/chat/repository/banword/BanWordJpaRepository.java index 2b0dc28..9977e89 100644 --- a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordJpaRepository.java +++ b/src/main/java/com/hello/chat/repository/banword/BanWordJpaRepository.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.repository.banword; +package com.hello.chat.repository.banword; -import com.hellomeritz.chat.domain.BanWord; -import com.hellomeritz.chat.global.SourceLanguage; +import com.hello.chat.domain.BanWord; +import com.hello.chat.global.SourceLanguage; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordRepository.java b/src/main/java/com/hello/chat/repository/banword/BanWordRepository.java similarity index 54% rename from src/main/java/com/hellomeritz/chat/repository/banword/BanWordRepository.java rename to src/main/java/com/hello/chat/repository/banword/BanWordRepository.java index 3b415ff..67fc834 100644 --- a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordRepository.java +++ b/src/main/java/com/hello/chat/repository/banword/BanWordRepository.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.repository.banword; +package com.hello.chat.repository.banword; -import com.hellomeritz.chat.domain.BanWord; -import com.hellomeritz.chat.global.SourceLanguage; +import com.hello.chat.domain.BanWord; +import com.hello.chat.global.SourceLanguage; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordRepositoryImpl.java b/src/main/java/com/hello/chat/repository/banword/BanWordRepositoryImpl.java similarity index 81% rename from src/main/java/com/hellomeritz/chat/repository/banword/BanWordRepositoryImpl.java rename to src/main/java/com/hello/chat/repository/banword/BanWordRepositoryImpl.java index 72959f9..4a9f5d3 100644 --- a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordRepositoryImpl.java +++ b/src/main/java/com/hello/chat/repository/banword/BanWordRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.repository.banword; +package com.hello.chat.repository.banword; -import com.hellomeritz.chat.domain.BanWord; -import com.hellomeritz.chat.global.SourceLanguage; +import com.hello.chat.domain.BanWord; +import com.hello.chat.global.SourceLanguage; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordStorage.java b/src/main/java/com/hello/chat/repository/banword/BanWordStorage.java similarity index 81% rename from src/main/java/com/hellomeritz/chat/repository/banword/BanWordStorage.java rename to src/main/java/com/hello/chat/repository/banword/BanWordStorage.java index dddeec9..2f1de70 100644 --- a/src/main/java/com/hellomeritz/chat/repository/banword/BanWordStorage.java +++ b/src/main/java/com/hello/chat/repository/banword/BanWordStorage.java @@ -1,11 +1,9 @@ -package com.hellomeritz.chat.repository.banword; +package com.hello.chat.repository.banword; -import com.hellomeritz.chat.domain.BanWord; -import org.ahocorasick.trie.Emit; +import com.hello.chat.domain.BanWord; import org.ahocorasick.trie.Trie; import org.springframework.stereotype.Component; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntry.java b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntry.java similarity index 64% rename from src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntry.java rename to src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntry.java index b067705..164f830 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntry.java +++ b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntry.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatentry; +package com.hello.chat.repository.chatentry; public record ChatRoomEntry( long userId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryLocalRepository.java b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryLocalRepository.java similarity index 82% rename from src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryLocalRepository.java rename to src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryLocalRepository.java index 4e92b65..7ba9755 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryLocalRepository.java +++ b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryLocalRepository.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.repository.chatentry; +package com.hello.chat.repository.chatentry; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryRepository.java b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryRepository.java similarity index 54% rename from src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryRepository.java rename to src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryRepository.java index ae56fca..e36e019 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryRepository.java +++ b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryRepository.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.repository.chatentry; +package com.hello.chat.repository.chatentry; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryRepositoryImpl.java b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryRepositoryImpl.java similarity index 79% rename from src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryRepositoryImpl.java rename to src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryRepositoryImpl.java index 5c4d5ec..d282d09 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatentry/ChatRoomEntryRepositoryImpl.java +++ b/src/main/java/com/hello/chat/repository/chatentry/ChatRoomEntryRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.repository.chatentry; +package com.hello.chat.repository.chatentry; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryAddRepositoryRequest.java b/src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryAddRepositoryRequest.java similarity index 67% rename from src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryAddRepositoryRequest.java rename to src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryAddRepositoryRequest.java index 2c1b278..e05b46c 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryAddRepositoryRequest.java +++ b/src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryAddRepositoryRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.repository.chatentry.dto; +package com.hello.chat.repository.chatentry.dto; -import com.hellomeritz.chat.repository.chatentry.ChatRoomEntry; +import com.hello.chat.repository.chatentry.ChatRoomEntry; public record ChatRoomEntryAddRepositoryRequest( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryDeleteRepositoryRequest.java b/src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryDeleteRepositoryRequest.java similarity index 64% rename from src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryDeleteRepositoryRequest.java rename to src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryDeleteRepositoryRequest.java index f94abc2..53e7f3c 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryDeleteRepositoryRequest.java +++ b/src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryDeleteRepositoryRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatentry.dto; +package com.hello.chat.repository.chatentry.dto; public record ChatRoomEntryDeleteRepositoryRequest( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryGetSessionRequest.java b/src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryGetSessionRequest.java similarity index 66% rename from src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryGetSessionRequest.java rename to src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryGetSessionRequest.java index 6a0ce21..7051d13 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatentry/dto/ChatRoomEntryGetSessionRequest.java +++ b/src/main/java/com/hello/chat/repository/chatentry/dto/ChatRoomEntryGetSessionRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatentry.dto; +package com.hello.chat.repository.chatentry.dto; public record ChatRoomEntryGetSessionRequest( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageMongoRepository.java b/src/main/java/com/hello/chat/repository/chatmessage/ChatMessageMongoRepository.java similarity index 96% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageMongoRepository.java rename to src/main/java/com/hello/chat/repository/chatmessage/ChatMessageMongoRepository.java index 45207cf..4131359 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageMongoRepository.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/ChatMessageMongoRepository.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.repository.chatmessage; +package com.hello.chat.repository.chatmessage; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.repository.chatmessage.dto.*; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.repository.chatmessage.dto.*; import io.micrometer.common.util.StringUtils; import org.bson.types.ObjectId; import org.springframework.data.domain.Sort; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageRepository.java b/src/main/java/com/hello/chat/repository/chatmessage/ChatMessageRepository.java similarity index 68% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageRepository.java rename to src/main/java/com/hello/chat/repository/chatmessage/ChatMessageRepository.java index 3e21253..c743ae9 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageRepository.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/ChatMessageRepository.java @@ -1,9 +1,7 @@ -package com.hellomeritz.chat.repository.chatmessage; +package com.hello.chat.repository.chatmessage; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.repository.chatmessage.dto.*; - -import java.util.List; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.repository.chatmessage.dto.*; public interface ChatMessageRepository { ChatMessage save(ChatMessage chatMessage); diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageRepositoryImpl.java b/src/main/java/com/hello/chat/repository/chatmessage/ChatMessageRepositoryImpl.java similarity index 86% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageRepositoryImpl.java rename to src/main/java/com/hello/chat/repository/chatmessage/ChatMessageRepositoryImpl.java index 8f74cda..9c47f5d 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/ChatMessageRepositoryImpl.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/ChatMessageRepositoryImpl.java @@ -1,11 +1,9 @@ -package com.hellomeritz.chat.repository.chatmessage; +package com.hello.chat.repository.chatmessage; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.repository.chatmessage.dto.*; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.repository.chatmessage.dto.*; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public class ChatMessageRepositoryImpl implements ChatMessageRepository { diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageGetRepositoryRequest.java b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageGetRepositoryRequest.java similarity index 68% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageGetRepositoryRequest.java rename to src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageGetRepositoryRequest.java index 3cac4d5..916c656 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageGetRepositoryRequest.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageGetRepositoryRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatmessage.dto; +package com.hello.chat.repository.chatmessage.dto; public record ChatMessageGetRepositoryRequest( String nextChatMessageId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageGetRepositoryResponses.java b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageGetRepositoryResponses.java similarity index 85% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageGetRepositoryResponses.java rename to src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageGetRepositoryResponses.java index 8ee45a9..680ee38 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageGetRepositoryResponses.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageGetRepositoryResponses.java @@ -1,7 +1,6 @@ -package com.hellomeritz.chat.repository.chatmessage.dto; +package com.hello.chat.repository.chatmessage.dto; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.service.dto.result.ChatMessageGetResults; +import com.hello.chat.domain.ChatMessage; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageReadRepositoryRequest.java b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageReadRepositoryRequest.java similarity index 62% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageReadRepositoryRequest.java rename to src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageReadRepositoryRequest.java index 505e159..4f18daa 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageReadRepositoryRequest.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageReadRepositoryRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatmessage.dto; +package com.hello.chat.repository.chatmessage.dto; public record ChatMessageReadRepositoryRequest( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryRequest.java b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryRequest.java similarity index 63% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryRequest.java rename to src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryRequest.java index 096387a..f53a501 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryRequest.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatmessage.dto; +package com.hello.chat.repository.chatmessage.dto; public record ChatMessageRecentGetRepositoryRequest( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryResponse.java b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryResponse.java similarity index 81% rename from src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryResponse.java rename to src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryResponse.java index 27d0890..d270ce1 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryResponse.java +++ b/src/main/java/com/hello/chat/repository/chatmessage/dto/ChatMessageRecentGetRepositoryResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.repository.chatmessage.dto; +package com.hello.chat.repository.chatmessage.dto; -import com.hellomeritz.chat.domain.ChatMessage; +import com.hello.chat.domain.ChatMessage; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomJpaRepository.java b/src/main/java/com/hello/chat/repository/chatroom/ChatRoomJpaRepository.java similarity index 79% rename from src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomJpaRepository.java rename to src/main/java/com/hello/chat/repository/chatroom/ChatRoomJpaRepository.java index 21c09b4..d115f93 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomJpaRepository.java +++ b/src/main/java/com/hello/chat/repository/chatroom/ChatRoomJpaRepository.java @@ -1,10 +1,10 @@ -package com.hellomeritz.chat.repository.chatroom; +package com.hello.chat.repository.chatroom; -import com.hellomeritz.chat.domain.ChatRoom; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomPasswordInfo; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomUserInfo; +import com.hello.chat.domain.ChatRoom; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; +import com.hello.chat.repository.chatroom.dto.ChatRoomPasswordInfo; +import com.hello.chat.repository.chatroom.dto.ChatRoomUserInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomRepository.java b/src/main/java/com/hello/chat/repository/chatroom/ChatRoomRepository.java similarity index 55% rename from src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomRepository.java rename to src/main/java/com/hello/chat/repository/chatroom/ChatRoomRepository.java index 2dcee24..110e6cb 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomRepository.java +++ b/src/main/java/com/hello/chat/repository/chatroom/ChatRoomRepository.java @@ -1,10 +1,10 @@ -package com.hellomeritz.chat.repository.chatroom; +package com.hello.chat.repository.chatroom; -import com.hellomeritz.chat.domain.ChatRoom; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomPasswordInfo; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomUserInfo; +import com.hello.chat.domain.ChatRoom; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; +import com.hello.chat.repository.chatroom.dto.ChatRoomPasswordInfo; +import com.hello.chat.repository.chatroom.dto.ChatRoomUserInfo; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomRepositoryImpl.java b/src/main/java/com/hello/chat/repository/chatroom/ChatRoomRepositoryImpl.java similarity index 83% rename from src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomRepositoryImpl.java rename to src/main/java/com/hello/chat/repository/chatroom/ChatRoomRepositoryImpl.java index 955125c..d9b822f 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatroom/ChatRoomRepositoryImpl.java +++ b/src/main/java/com/hello/chat/repository/chatroom/ChatRoomRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.hellomeritz.chat.repository.chatroom; +package com.hello.chat.repository.chatroom; -import com.hellomeritz.chat.domain.ChatRoom; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomPasswordInfo; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomUserInfo; +import com.hello.chat.domain.ChatRoom; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; +import com.hello.chat.repository.chatroom.dto.ChatRoomPasswordInfo; +import com.hello.chat.repository.chatroom.dto.ChatRoomUserInfo; import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomGetInfoOfConsultant.java b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomGetInfoOfConsultant.java similarity index 75% rename from src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomGetInfoOfConsultant.java rename to src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomGetInfoOfConsultant.java index 0e246ff..ccef834 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomGetInfoOfConsultant.java +++ b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomGetInfoOfConsultant.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatroom.dto; +package com.hello.chat.repository.chatroom.dto; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomGetInfoOfForeigner.java b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomGetInfoOfForeigner.java similarity index 58% rename from src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomGetInfoOfForeigner.java rename to src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomGetInfoOfForeigner.java index c3c5d0d..ecf0658 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomGetInfoOfForeigner.java +++ b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomGetInfoOfForeigner.java @@ -1,6 +1,4 @@ -package com.hellomeritz.chat.repository.chatroom.dto; - -import java.time.LocalDateTime; +package com.hello.chat.repository.chatroom.dto; public interface ChatRoomGetInfoOfForeigner { Long getChatRoomId(); diff --git a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomPasswordInfo.java b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomPasswordInfo.java similarity index 64% rename from src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomPasswordInfo.java rename to src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomPasswordInfo.java index 787a034..543bc56 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomPasswordInfo.java +++ b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomPasswordInfo.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatroom.dto; +package com.hello.chat.repository.chatroom.dto; public interface ChatRoomPasswordInfo { String getChatRoomPassword(); diff --git a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomUserInfo.java b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomUserInfo.java similarity index 61% rename from src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomUserInfo.java rename to src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomUserInfo.java index 0cdd82f..ab28c0d 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatroom/dto/ChatRoomUserInfo.java +++ b/src/main/java/com/hello/chat/repository/chatroom/dto/ChatRoomUserInfo.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatroom.dto; +package com.hello.chat.repository.chatroom.dto; public interface ChatRoomUserInfo { Long getForeignerId(); diff --git a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSession.java b/src/main/java/com/hello/chat/repository/chatsession/ChatSession.java similarity index 91% rename from src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSession.java rename to src/main/java/com/hello/chat/repository/chatsession/ChatSession.java index a73c367..804d3dc 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSession.java +++ b/src/main/java/com/hello/chat/repository/chatsession/ChatSession.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.repository.chatsession; +package com.hello.chat.repository.chatsession; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryDeleteRepositoryRequest; import lombok.Getter; import org.springframework.util.Assert; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionLocalRepository.java b/src/main/java/com/hello/chat/repository/chatsession/ChatSessionLocalRepository.java similarity index 82% rename from src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionLocalRepository.java rename to src/main/java/com/hello/chat/repository/chatsession/ChatSessionLocalRepository.java index ad1b91c..ba50295 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionLocalRepository.java +++ b/src/main/java/com/hello/chat/repository/chatsession/ChatSessionLocalRepository.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.repository.chatsession; +package com.hello.chat.repository.chatsession; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionRepository.java b/src/main/java/com/hello/chat/repository/chatsession/ChatSessionRepository.java similarity index 54% rename from src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionRepository.java rename to src/main/java/com/hello/chat/repository/chatsession/ChatSessionRepository.java index 4626c43..dd9a68b 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionRepository.java +++ b/src/main/java/com/hello/chat/repository/chatsession/ChatSessionRepository.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.repository.chatsession; +package com.hello.chat.repository.chatsession; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; public interface ChatSessionRepository { diff --git a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionRepositoryImpl.java b/src/main/java/com/hello/chat/repository/chatsession/ChatSessionRepositoryImpl.java similarity index 80% rename from src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionRepositoryImpl.java rename to src/main/java/com/hello/chat/repository/chatsession/ChatSessionRepositoryImpl.java index d8034eb..cc51e65 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatsession/ChatSessionRepositoryImpl.java +++ b/src/main/java/com/hello/chat/repository/chatsession/ChatSessionRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.repository.chatsession; +package com.hello.chat.repository.chatsession; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/hellomeritz/chat/repository/chatsession/dto/ChatSessionAddRepositoryRequest.java b/src/main/java/com/hello/chat/repository/chatsession/dto/ChatSessionAddRepositoryRequest.java similarity index 52% rename from src/main/java/com/hellomeritz/chat/repository/chatsession/dto/ChatSessionAddRepositoryRequest.java rename to src/main/java/com/hello/chat/repository/chatsession/dto/ChatSessionAddRepositoryRequest.java index e7f978a..a409168 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatsession/dto/ChatSessionAddRepositoryRequest.java +++ b/src/main/java/com/hello/chat/repository/chatsession/dto/ChatSessionAddRepositoryRequest.java @@ -1,7 +1,6 @@ -package com.hellomeritz.chat.repository.chatsession.dto; +package com.hello.chat.repository.chatsession.dto; -import com.hellomeritz.chat.repository.chatentry.ChatRoomEntry; -import com.hellomeritz.chat.repository.chatsession.ChatSession; +import com.hello.chat.repository.chatsession.ChatSession; public record ChatSessionAddRepositoryRequest( String sessionId, diff --git a/src/main/java/com/hellomeritz/chat/repository/chatsession/dto/ChatSessionChangeRepositoryRequest.java b/src/main/java/com/hello/chat/repository/chatsession/dto/ChatSessionChangeRepositoryRequest.java similarity index 63% rename from src/main/java/com/hellomeritz/chat/repository/chatsession/dto/ChatSessionChangeRepositoryRequest.java rename to src/main/java/com/hello/chat/repository/chatsession/dto/ChatSessionChangeRepositoryRequest.java index 5d58aac..3fd74f7 100644 --- a/src/main/java/com/hellomeritz/chat/repository/chatsession/dto/ChatSessionChangeRepositoryRequest.java +++ b/src/main/java/com/hello/chat/repository/chatsession/dto/ChatSessionChangeRepositoryRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.repository.chatsession.dto; +package com.hello.chat.repository.chatsession.dto; public record ChatSessionChangeRepositoryRequest( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/service/BanWordFilter.java b/src/main/java/com/hello/chat/service/BanWordFilter.java similarity index 85% rename from src/main/java/com/hellomeritz/chat/service/BanWordFilter.java rename to src/main/java/com/hello/chat/service/BanWordFilter.java index fbeeacb..c2696c5 100644 --- a/src/main/java/com/hellomeritz/chat/service/BanWordFilter.java +++ b/src/main/java/com/hello/chat/service/BanWordFilter.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service; +package com.hello.chat.service; -import com.hellomeritz.chat.repository.banword.BanWordStorage; +import com.hello.chat.repository.banword.BanWordStorage; import org.ahocorasick.trie.Emit; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/hellomeritz/chat/service/BanWordService.java b/src/main/java/com/hello/chat/service/BanWordService.java similarity index 73% rename from src/main/java/com/hellomeritz/chat/service/BanWordService.java rename to src/main/java/com/hello/chat/service/BanWordService.java index fb2c565..3539cb7 100644 --- a/src/main/java/com/hellomeritz/chat/service/BanWordService.java +++ b/src/main/java/com/hello/chat/service/BanWordService.java @@ -1,9 +1,9 @@ -package com.hellomeritz.chat.service; +package com.hello.chat.service; -import com.hellomeritz.chat.domain.BanWord; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.repository.banword.BanWordRepository; -import com.hellomeritz.chat.repository.banword.BanWordStorage; +import com.hello.chat.domain.BanWord; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.repository.banword.BanWordRepository; +import com.hello.chat.repository.banword.BanWordStorage; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/service/ChatMessageService.java b/src/main/java/com/hello/chat/service/ChatMessageService.java similarity index 81% rename from src/main/java/com/hellomeritz/chat/service/ChatMessageService.java rename to src/main/java/com/hello/chat/service/ChatMessageService.java index 8c83ef0..d043cc4 100644 --- a/src/main/java/com/hellomeritz/chat/service/ChatMessageService.java +++ b/src/main/java/com/hello/chat/service/ChatMessageService.java @@ -1,25 +1,25 @@ -package com.hellomeritz.chat.service; - -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.global.stt.SttManager; -import com.hellomeritz.chat.global.stt.SttManagerHandler; -import com.hellomeritz.chat.global.stt.SttProvider; -import com.hellomeritz.chat.global.stt.dto.SttResponse; -import com.hellomeritz.chat.global.translator.TranslateProvider; -import com.hellomeritz.chat.global.translator.TranslationResponse; -import com.hellomeritz.chat.global.translator.Translator; -import com.hellomeritz.chat.global.translator.TranslatorHandler; -import com.hellomeritz.chat.global.uploader.AudioUploadResponse; -import com.hellomeritz.chat.global.uploader.AudioUploader; -import com.hellomeritz.chat.repository.chatentry.ChatRoomEntryRepository; -import com.hellomeritz.chat.repository.chatmessage.ChatMessageRepository; -import com.hellomeritz.chat.service.dto.param.ChatAudioUploadParam; -import com.hellomeritz.chat.service.dto.param.ChatMessageSttParam; -import com.hellomeritz.chat.service.dto.param.ChatMessageTextParam; -import com.hellomeritz.chat.service.dto.result.ChatAudioUploadResult; -import com.hellomeritz.chat.service.dto.result.ChatMessageSttResult; -import com.hellomeritz.chat.service.dto.result.ChatMessageTranslateResults; -import com.hellomeritz.global.CircuitBreakerBot; +package com.hello.chat.service; + +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.global.stt.SttManager; +import com.hello.chat.global.stt.SttManagerHandler; +import com.hello.chat.global.stt.SttProvider; +import com.hello.chat.global.stt.dto.SttResponse; +import com.hello.chat.global.translator.TranslateProvider; +import com.hello.chat.global.translator.TranslationResponse; +import com.hello.chat.global.translator.Translator; +import com.hello.chat.global.translator.TranslatorHandler; +import com.hello.chat.global.uploader.AudioUploadResponse; +import com.hello.chat.global.uploader.AudioUploader; +import com.hello.chat.repository.chatentry.ChatRoomEntryRepository; +import com.hello.chat.repository.chatmessage.ChatMessageRepository; +import com.hello.chat.service.dto.param.ChatAudioUploadParam; +import com.hello.chat.service.dto.param.ChatMessageSttParam; +import com.hello.chat.service.dto.param.ChatMessageTextParam; +import com.hello.chat.service.dto.result.ChatAudioUploadResult; +import com.hello.chat.service.dto.result.ChatMessageSttResult; +import com.hello.chat.service.dto.result.ChatMessageTranslateResults; +import com.hello.global.CircuitBreakerBot; import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/hellomeritz/chat/service/ChatService.java b/src/main/java/com/hello/chat/service/ChatService.java similarity index 83% rename from src/main/java/com/hellomeritz/chat/service/ChatService.java rename to src/main/java/com/hello/chat/service/ChatService.java index ecbcab5..ce58844 100644 --- a/src/main/java/com/hellomeritz/chat/service/ChatService.java +++ b/src/main/java/com/hello/chat/service/ChatService.java @@ -1,22 +1,22 @@ -package com.hellomeritz.chat.service; - -import com.hellomeritz.chat.domain.ChatRoom; -import com.hellomeritz.chat.repository.chatentry.ChatRoomEntryRepository; -import com.hellomeritz.chat.repository.chatmessage.ChatMessageRepository; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageGetRepositoryResponses; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryResponse; -import com.hellomeritz.chat.repository.chatroom.ChatRoomRepository; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomPasswordInfo; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomUserInfo; -import com.hellomeritz.chat.repository.chatsession.ChatSession; -import com.hellomeritz.chat.repository.chatsession.ChatSessionRepository; -import com.hellomeritz.chat.service.dto.param.*; -import com.hellomeritz.chat.service.dto.result.*; -import com.hellomeritz.member.global.IpSensor; -import com.hellomeritz.global.encryption.PasswordEncoder; -import com.hellomeritz.global.encryption.dto.EncryptionResponse; +package com.hello.chat.service; + +import com.hello.chat.domain.ChatRoom; +import com.hello.chat.repository.chatentry.ChatRoomEntryRepository; +import com.hello.chat.repository.chatmessage.ChatMessageRepository; +import com.hello.chat.repository.chatmessage.dto.ChatMessageGetRepositoryResponses; +import com.hello.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryResponse; +import com.hello.chat.repository.chatroom.ChatRoomRepository; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; +import com.hello.chat.repository.chatroom.dto.ChatRoomPasswordInfo; +import com.hello.chat.repository.chatroom.dto.ChatRoomUserInfo; +import com.hello.chat.repository.chatsession.ChatSession; +import com.hello.chat.repository.chatsession.ChatSessionRepository; +import com.hello.chat.service.dto.param.*; +import com.hello.chat.service.dto.result.*; +import com.hello.member.global.IpSensor; +import com.hello.global.encryption.PasswordEncoder; +import com.hello.global.encryption.dto.EncryptionResponse; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatAudioUploadParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatAudioUploadParam.java similarity index 80% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatAudioUploadParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatAudioUploadParam.java index 10517d5..34aea90 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatAudioUploadParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatAudioUploadParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageGetParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatMessageGetParam.java similarity index 72% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageGetParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatMessageGetParam.java index 74484a6..4b4f46d 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageGetParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatMessageGetParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageGetRepositoryRequest; +import com.hello.chat.repository.chatmessage.dto.ChatMessageGetRepositoryRequest; public record ChatMessageGetParam( long myId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageSttParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatMessageSttParam.java similarity index 80% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageSttParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatMessageSttParam.java index aca5c52..533ca72 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageSttParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatMessageSttParam.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.stt.dto.SttRequest; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.stt.dto.SttRequest; import org.springframework.web.multipart.MultipartFile; public record ChatMessageSttParam( diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageTextParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatMessageTextParam.java similarity index 81% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageTextParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatMessageTextParam.java index ca10226..01b3bb6 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatMessageTextParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatMessageTextParam.java @@ -1,10 +1,10 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.domain.ChatMessageType; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.TargetLanguage; -import com.hellomeritz.chat.global.translator.TranslationRequest; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.domain.ChatMessageType; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.TargetLanguage; +import com.hello.chat.global.translator.TranslationRequest; public record ChatMessageTextParam( String contents, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomCreateParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomCreateParam.java similarity index 60% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomCreateParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomCreateParam.java index d612742..2dc3a97 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomCreateParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomCreateParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; public record ChatRoomCreateParam( long fcId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomEnterParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomEnterParam.java similarity index 66% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomEnterParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomEnterParam.java index 67fd10e..c52ccc8 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomEnterParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomEnterParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageReadRepositoryRequest; +import com.hello.chat.repository.chatmessage.dto.ChatMessageReadRepositoryRequest; public record ChatRoomEnterParam( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomEntryAddParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomEntryAddParam.java similarity index 72% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomEntryAddParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomEntryAddParam.java index 2e0a798..e48f24a 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomEntryAddParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomEntryAddParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; public record ChatRoomEntryAddParam( Long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomInfoOfConsultantParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomInfoOfConsultantParam.java similarity index 64% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomInfoOfConsultantParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomInfoOfConsultantParam.java index f1e4b04..502ad79 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomInfoOfConsultantParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomInfoOfConsultantParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryRequest; +import com.hello.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryRequest; public record ChatRoomInfoOfConsultantParam( long userId diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomInfoOfForeignerParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomInfoOfForeignerParam.java similarity index 64% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomInfoOfForeignerParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomInfoOfForeignerParam.java index feb2039..9c2108a 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomInfoOfForeignerParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomInfoOfForeignerParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryRequest; +import com.hello.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryRequest; public record ChatRoomInfoOfForeignerParam( long userId diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomLeaveParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomLeaveParam.java similarity index 69% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomLeaveParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomLeaveParam.java index 270699b..e1a6f2b 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomLeaveParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomLeaveParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; public record ChatRoomLeaveParam( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomPasswordCheckParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomPasswordCheckParam.java similarity index 74% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomPasswordCheckParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomPasswordCheckParam.java index 6ee60ea..75f1c0e 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomPasswordCheckParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomPasswordCheckParam.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.global.encryption.PassWord; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomPasswordInfo; -import com.hellomeritz.global.encryption.dto.PasswordMatchRequest; +import com.hello.global.encryption.PassWord; +import com.hello.chat.repository.chatroom.dto.ChatRoomPasswordInfo; +import com.hello.global.encryption.dto.PasswordMatchRequest; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomPasswordCreateParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomPasswordCreateParam.java similarity index 72% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomPasswordCreateParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomPasswordCreateParam.java index 9d6c6fa..7d5e7ba 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomPasswordCreateParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomPasswordCreateParam.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.global.encryption.PassWord; -import com.hellomeritz.global.encryption.dto.EncryptionRequest; +import com.hello.global.encryption.PassWord; +import com.hello.global.encryption.dto.EncryptionRequest; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomUserInfoParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatRoomUserInfoParam.java similarity index 79% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomUserInfoParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatRoomUserInfoParam.java index af7ee2c..ced27f9 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatRoomUserInfoParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatRoomUserInfoParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; public record ChatRoomUserInfoParam( long chatRoomId diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatSessionAddParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatSessionAddParam.java similarity index 69% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatSessionAddParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatSessionAddParam.java index 85a1ffe..1fee9b2 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatSessionAddParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatSessionAddParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; public record ChatSessionAddParam( String sessionId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatSessionChangeParam.java b/src/main/java/com/hello/chat/service/dto/param/ChatSessionChangeParam.java similarity index 67% rename from src/main/java/com/hellomeritz/chat/service/dto/param/ChatSessionChangeParam.java rename to src/main/java/com/hello/chat/service/dto/param/ChatSessionChangeParam.java index 26b6269..636879c 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/param/ChatSessionChangeParam.java +++ b/src/main/java/com/hello/chat/service/dto/param/ChatSessionChangeParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.param; +package com.hello.chat.service.dto.param; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; public record ChatSessionChangeParam( Long chatRoomId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatAudioUploadResult.java b/src/main/java/com/hello/chat/service/dto/result/ChatAudioUploadResult.java similarity index 78% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatAudioUploadResult.java rename to src/main/java/com/hello/chat/service/dto/result/ChatAudioUploadResult.java index 468714e..47765cd 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatAudioUploadResult.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatAudioUploadResult.java @@ -1,6 +1,4 @@ -package com.hellomeritz.chat.service.dto.result; - -import com.hellomeritz.chat.domain.ChatMessage; +package com.hello.chat.service.dto.result; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageGetResults.java b/src/main/java/com/hello/chat/service/dto/result/ChatMessageGetResults.java similarity index 77% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageGetResults.java rename to src/main/java/com/hello/chat/service/dto/result/ChatMessageGetResults.java index 03ceacb..a990bdf 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageGetResults.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatMessageGetResults.java @@ -1,10 +1,7 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageGetRepositoryResponses; -import com.hellomeritz.chat.service.dto.param.ChatMessageGetParam; +import com.hello.chat.repository.chatmessage.dto.ChatMessageGetRepositoryResponses; -import java.util.Comparator; import java.util.List; public record ChatMessageGetResults( diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageSttResult.java b/src/main/java/com/hello/chat/service/dto/result/ChatMessageSttResult.java similarity index 89% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageSttResult.java rename to src/main/java/com/hello/chat/service/dto/result/ChatMessageSttResult.java index e9c8cd8..ca51652 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageSttResult.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatMessageSttResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageTranslateResults.java b/src/main/java/com/hello/chat/service/dto/result/ChatMessageTranslateResults.java similarity index 91% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageTranslateResults.java rename to src/main/java/com/hello/chat/service/dto/result/ChatMessageTranslateResults.java index c825820..e1a349a 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatMessageTranslateResults.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatMessageTranslateResults.java @@ -1,8 +1,8 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.global.BlockingNoticeMessage; -import com.hellomeritz.chat.global.SourceLanguage; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.global.BlockingNoticeMessage; +import com.hello.chat.global.SourceLanguage; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomCreateResult.java b/src/main/java/com/hello/chat/service/dto/result/ChatRoomCreateResult.java similarity index 68% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomCreateResult.java rename to src/main/java/com/hello/chat/service/dto/result/ChatRoomCreateResult.java index b1d05e2..bc5aeaf 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomCreateResult.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatRoomCreateResult.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; -import com.hellomeritz.chat.domain.ChatRoom; +import com.hello.chat.domain.ChatRoom; public record ChatRoomCreateResult( long chatRoomId diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomEntryInSessions.java b/src/main/java/com/hello/chat/service/dto/result/ChatRoomEntryInSessions.java similarity index 71% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomEntryInSessions.java rename to src/main/java/com/hello/chat/service/dto/result/ChatRoomEntryInSessions.java index fdece6f..842f6d9 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomEntryInSessions.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatRoomEntryInSessions.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; -import com.hellomeritz.chat.repository.chatsession.ChatSession; +import com.hello.chat.repository.chatsession.ChatSession; public record ChatRoomEntryInSessions( long userId, diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfConsultantResult.java b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfConsultantResult.java similarity index 75% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfConsultantResult.java rename to src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfConsultantResult.java index 70ce661..c9a05f4 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfConsultantResult.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfConsultantResult.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryResponse; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; +import com.hello.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryResponse; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfConsultant; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfConsultantResults.java b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfConsultantResults.java similarity index 92% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfConsultantResults.java rename to src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfConsultantResults.java index 1a036b6..59f71f7 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfConsultantResults.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfConsultantResults.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfForeignerResult.java b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfForeignerResult.java similarity index 75% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfForeignerResult.java rename to src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfForeignerResult.java index a72997d..c2ab7d5 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfForeignerResult.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfForeignerResult.java @@ -1,7 +1,7 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryResponse; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; +import com.hello.chat.repository.chatmessage.dto.ChatMessageRecentGetRepositoryResponse; +import com.hello.chat.repository.chatroom.dto.ChatRoomGetInfoOfForeigner; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfForeignerResults.java b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfForeignerResults.java similarity index 91% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfForeignerResults.java rename to src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfForeignerResults.java index d5c9828..e9002c5 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomInfoOfForeignerResults.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatRoomInfoOfForeignerResults.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomUserInfoResult.java b/src/main/java/com/hello/chat/service/dto/result/ChatRoomUserInfoResult.java similarity index 72% rename from src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomUserInfoResult.java rename to src/main/java/com/hello/chat/service/dto/result/ChatRoomUserInfoResult.java index 66107b6..8e7c4af 100644 --- a/src/main/java/com/hellomeritz/chat/service/dto/result/ChatRoomUserInfoResult.java +++ b/src/main/java/com/hello/chat/service/dto/result/ChatRoomUserInfoResult.java @@ -1,6 +1,6 @@ -package com.hellomeritz.chat.service.dto.result; +package com.hello.chat.service.dto.result; -import com.hellomeritz.chat.repository.chatroom.dto.ChatRoomUserInfo; +import com.hello.chat.repository.chatroom.dto.ChatRoomUserInfo; public record ChatRoomUserInfoResult( Long userId, diff --git a/src/main/java/com/hellomeritz/global/BotRequest.java b/src/main/java/com/hello/global/BotRequest.java similarity index 90% rename from src/main/java/com/hellomeritz/global/BotRequest.java rename to src/main/java/com/hello/global/BotRequest.java index 73d6f5d..4fb6815 100644 --- a/src/main/java/com/hellomeritz/global/BotRequest.java +++ b/src/main/java/com/hello/global/BotRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global; +package com.hello.global; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/hellomeritz/global/CircuitBreakerBot.java b/src/main/java/com/hello/global/CircuitBreakerBot.java similarity index 96% rename from src/main/java/com/hellomeritz/global/CircuitBreakerBot.java rename to src/main/java/com/hello/global/CircuitBreakerBot.java index f4b3371..4cc573c 100644 --- a/src/main/java/com/hellomeritz/global/CircuitBreakerBot.java +++ b/src/main/java/com/hello/global/CircuitBreakerBot.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global; +package com.hello.global; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/hellomeritz/global/CircuitBreakerStateListener.java b/src/main/java/com/hello/global/CircuitBreakerStateListener.java similarity index 92% rename from src/main/java/com/hellomeritz/global/CircuitBreakerStateListener.java rename to src/main/java/com/hello/global/CircuitBreakerStateListener.java index c368a3f..ac95185 100644 --- a/src/main/java/com/hellomeritz/global/CircuitBreakerStateListener.java +++ b/src/main/java/com/hello/global/CircuitBreakerStateListener.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global; +package com.hello.global; import io.github.resilience4j.circuitbreaker.CircuitBreaker; @@ -7,8 +7,6 @@ import io.github.resilience4j.core.registry.EntryReplacedEvent; import io.github.resilience4j.core.registry.RegistryEventConsumer; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; @Slf4j diff --git a/src/main/java/com/hellomeritz/global/WebConfig.java b/src/main/java/com/hello/global/WebConfig.java similarity index 96% rename from src/main/java/com/hellomeritz/global/WebConfig.java rename to src/main/java/com/hello/global/WebConfig.java index 78a15d7..2c54dbb 100644 --- a/src/main/java/com/hellomeritz/global/WebConfig.java +++ b/src/main/java/com/hello/global/WebConfig.java @@ -1,7 +1,7 @@ -package com.hellomeritz.global; +package com.hello.global; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hellomeritz.member.global.IpSensor; +import com.hello.member.global.IpSensor; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/hellomeritz/global/cache/CacheConfig.java b/src/main/java/com/hello/global/cache/CacheConfig.java similarity index 96% rename from src/main/java/com/hellomeritz/global/cache/CacheConfig.java rename to src/main/java/com/hello/global/cache/CacheConfig.java index 9a34a42..085cae0 100644 --- a/src/main/java/com/hellomeritz/global/cache/CacheConfig.java +++ b/src/main/java/com/hello/global/cache/CacheConfig.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.cache; +package com.hello.global.cache; import com.github.benmanes.caffeine.cache.Caffeine; import org.springframework.cache.CacheManager; diff --git a/src/main/java/com/hellomeritz/global/cache/CacheType.java b/src/main/java/com/hello/global/cache/CacheType.java similarity index 92% rename from src/main/java/com/hellomeritz/global/cache/CacheType.java rename to src/main/java/com/hello/global/cache/CacheType.java index 58b334d..c9453d3 100644 --- a/src/main/java/com/hellomeritz/global/cache/CacheType.java +++ b/src/main/java/com/hello/global/cache/CacheType.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.cache; +package com.hello.global.cache; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/global/encryption/PassWord.java b/src/main/java/com/hello/global/encryption/PassWord.java similarity index 97% rename from src/main/java/com/hellomeritz/global/encryption/PassWord.java rename to src/main/java/com/hello/global/encryption/PassWord.java index d10c245..243f2d6 100644 --- a/src/main/java/com/hellomeritz/global/encryption/PassWord.java +++ b/src/main/java/com/hello/global/encryption/PassWord.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.encryption; +package com.hello.global.encryption; import lombok.Getter; import org.springframework.util.Assert; diff --git a/src/main/java/com/hellomeritz/global/encryption/PasswordEncoder.java b/src/main/java/com/hello/global/encryption/PasswordEncoder.java similarity index 89% rename from src/main/java/com/hellomeritz/global/encryption/PasswordEncoder.java rename to src/main/java/com/hello/global/encryption/PasswordEncoder.java index 100f63e..fb22522 100644 --- a/src/main/java/com/hellomeritz/global/encryption/PasswordEncoder.java +++ b/src/main/java/com/hello/global/encryption/PasswordEncoder.java @@ -1,9 +1,9 @@ -package com.hellomeritz.global.encryption; +package com.hello.global.encryption; -import com.hellomeritz.global.encryption.dto.EncryptionResponse; -import com.hellomeritz.global.encryption.dto.SaltRequest; -import com.hellomeritz.global.encryption.dto.EncryptionRequest; -import com.hellomeritz.global.encryption.dto.PasswordMatchRequest; +import com.hello.global.encryption.dto.EncryptionResponse; +import com.hello.global.encryption.dto.SaltRequest; +import com.hello.global.encryption.dto.EncryptionRequest; +import com.hello.global.encryption.dto.PasswordMatchRequest; import org.springframework.stereotype.Component; import javax.crypto.SecretKeyFactory; diff --git a/src/main/java/com/hellomeritz/global/encryption/dto/EncryptionRequest.java b/src/main/java/com/hello/global/encryption/dto/EncryptionRequest.java similarity index 90% rename from src/main/java/com/hellomeritz/global/encryption/dto/EncryptionRequest.java rename to src/main/java/com/hello/global/encryption/dto/EncryptionRequest.java index 89d0ebb..3275676 100644 --- a/src/main/java/com/hellomeritz/global/encryption/dto/EncryptionRequest.java +++ b/src/main/java/com/hello/global/encryption/dto/EncryptionRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.encryption.dto; +package com.hello.global.encryption.dto; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/global/encryption/dto/EncryptionResponse.java b/src/main/java/com/hello/global/encryption/dto/EncryptionResponse.java similarity index 82% rename from src/main/java/com/hellomeritz/global/encryption/dto/EncryptionResponse.java rename to src/main/java/com/hello/global/encryption/dto/EncryptionResponse.java index a8fe15f..4df82a6 100644 --- a/src/main/java/com/hellomeritz/global/encryption/dto/EncryptionResponse.java +++ b/src/main/java/com/hello/global/encryption/dto/EncryptionResponse.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.encryption.dto; +package com.hello.global.encryption.dto; public record EncryptionResponse( String password, diff --git a/src/main/java/com/hellomeritz/global/encryption/dto/PasswordMatchRequest.java b/src/main/java/com/hello/global/encryption/dto/PasswordMatchRequest.java similarity index 74% rename from src/main/java/com/hellomeritz/global/encryption/dto/PasswordMatchRequest.java rename to src/main/java/com/hello/global/encryption/dto/PasswordMatchRequest.java index 7c6423c..7f66e13 100644 --- a/src/main/java/com/hellomeritz/global/encryption/dto/PasswordMatchRequest.java +++ b/src/main/java/com/hello/global/encryption/dto/PasswordMatchRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.encryption.dto; +package com.hello.global.encryption.dto; public record PasswordMatchRequest( char[] inputPassword, diff --git a/src/main/java/com/hellomeritz/global/encryption/dto/SaltRequest.java b/src/main/java/com/hello/global/encryption/dto/SaltRequest.java similarity index 80% rename from src/main/java/com/hellomeritz/global/encryption/dto/SaltRequest.java rename to src/main/java/com/hello/global/encryption/dto/SaltRequest.java index 3b96d0a..c86e89d 100644 --- a/src/main/java/com/hellomeritz/global/encryption/dto/SaltRequest.java +++ b/src/main/java/com/hello/global/encryption/dto/SaltRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.encryption.dto; +package com.hello.global.encryption.dto; public record SaltRequest( String ipAddress, diff --git a/src/main/java/com/hellomeritz/global/event/WebSocketEventHandler.java b/src/main/java/com/hello/global/event/WebSocketEventHandler.java similarity index 90% rename from src/main/java/com/hellomeritz/global/event/WebSocketEventHandler.java rename to src/main/java/com/hello/global/event/WebSocketEventHandler.java index 24048e5..32284b2 100644 --- a/src/main/java/com/hellomeritz/global/event/WebSocketEventHandler.java +++ b/src/main/java/com/hello/global/event/WebSocketEventHandler.java @@ -1,11 +1,10 @@ -package com.hellomeritz.global.event; - -import com.hellomeritz.chat.repository.chatentry.ChatRoomEntry; -import com.hellomeritz.chat.service.ChatService; -import com.hellomeritz.chat.service.dto.param.ChatRoomEntryAddParam; -import com.hellomeritz.chat.service.dto.param.ChatSessionAddParam; -import com.hellomeritz.chat.service.dto.param.ChatSessionChangeParam; -import com.hellomeritz.chat.service.dto.result.ChatRoomEntryInSessions; +package com.hello.global.event; + +import com.hello.chat.service.ChatService; +import com.hello.chat.service.dto.param.ChatRoomEntryAddParam; +import com.hello.chat.service.dto.param.ChatSessionAddParam; +import com.hello.chat.service.dto.param.ChatSessionChangeParam; +import com.hello.chat.service.dto.result.ChatRoomEntryInSessions; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import org.springframework.web.socket.messaging.AbstractSubProtocolEvent; diff --git a/src/main/java/com/hellomeritz/global/exception/ErrorCode.java b/src/main/java/com/hello/global/exception/ErrorCode.java similarity index 97% rename from src/main/java/com/hellomeritz/global/exception/ErrorCode.java rename to src/main/java/com/hello/global/exception/ErrorCode.java index c19d414..7fb6b09 100644 --- a/src/main/java/com/hellomeritz/global/exception/ErrorCode.java +++ b/src/main/java/com/hello/global/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.exception; +package com.hello.global.exception; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/global/exception/ErrorResponse.java b/src/main/java/com/hello/global/exception/ErrorResponse.java similarity index 98% rename from src/main/java/com/hellomeritz/global/exception/ErrorResponse.java rename to src/main/java/com/hello/global/exception/ErrorResponse.java index efed4bf..284928a 100644 --- a/src/main/java/com/hellomeritz/global/exception/ErrorResponse.java +++ b/src/main/java/com/hello/global/exception/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global.exception; +package com.hello.global.exception; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/global/exception/GlobalExceptionHandler.java b/src/main/java/com/hello/global/exception/GlobalExceptionHandler.java similarity index 97% rename from src/main/java/com/hellomeritz/global/exception/GlobalExceptionHandler.java rename to src/main/java/com/hello/global/exception/GlobalExceptionHandler.java index e8159a7..9ac3e2e 100644 --- a/src/main/java/com/hellomeritz/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/hello/global/exception/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package com.hellomeritz.global.exception; +package com.hello.global.exception; import com.fasterxml.jackson.core.JsonProcessingException; -import com.hellomeritz.global.exception.custom.SttException; +import com.hello.global.exception.custom.SttException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.crossstore.ChangeSetPersister; @@ -16,7 +16,7 @@ import org.springframework.validation.BindException; -import static com.hellomeritz.global.exception.ErrorCode.*; +import static com.hello.global.exception.ErrorCode.*; @RequiredArgsConstructor @RestControllerAdvice diff --git a/src/main/java/com/hellomeritz/global/exception/custom/SttException.java b/src/main/java/com/hello/global/exception/custom/SttException.java similarity index 71% rename from src/main/java/com/hellomeritz/global/exception/custom/SttException.java rename to src/main/java/com/hello/global/exception/custom/SttException.java index ab6765f..0fa104c 100644 --- a/src/main/java/com/hellomeritz/global/exception/custom/SttException.java +++ b/src/main/java/com/hello/global/exception/custom/SttException.java @@ -1,6 +1,6 @@ -package com.hellomeritz.global.exception.custom; +package com.hello.global.exception.custom; -import com.hellomeritz.global.exception.ErrorCode; +import com.hello.global.exception.ErrorCode; import lombok.Getter; @Getter diff --git a/src/main/java/com/hellomeritz/global/exception/custom/TranslateException.java b/src/main/java/com/hello/global/exception/custom/TranslateException.java similarity index 72% rename from src/main/java/com/hellomeritz/global/exception/custom/TranslateException.java rename to src/main/java/com/hello/global/exception/custom/TranslateException.java index 30cbeda..730e90d 100644 --- a/src/main/java/com/hellomeritz/global/exception/custom/TranslateException.java +++ b/src/main/java/com/hello/global/exception/custom/TranslateException.java @@ -1,6 +1,6 @@ -package com.hellomeritz.global.exception.custom; +package com.hello.global.exception.custom; -import com.hellomeritz.global.exception.ErrorCode; +import com.hello.global.exception.ErrorCode; import lombok.Getter; @Getter diff --git a/src/main/java/com/hellomeritz/member/controller/ConsultantController.java b/src/main/java/com/hello/member/controller/ConsultantController.java similarity index 75% rename from src/main/java/com/hellomeritz/member/controller/ConsultantController.java rename to src/main/java/com/hello/member/controller/ConsultantController.java index 71ecdc4..c3a04f2 100644 --- a/src/main/java/com/hellomeritz/member/controller/ConsultantController.java +++ b/src/main/java/com/hello/member/controller/ConsultantController.java @@ -1,14 +1,13 @@ -package com.hellomeritz.member.controller; +package com.hello.member.controller; -import com.hellomeritz.member.controller.dto.request.ConsultantLoginRequest; -import com.hellomeritz.member.controller.dto.request.ConsultantSignUpRequest; -import com.hellomeritz.member.controller.dto.response.ConsultantLoginResponse; -import com.hellomeritz.member.controller.dto.response.ConsultantMatchResponse; -import com.hellomeritz.member.controller.dto.response.ConsultantSignUpResponse; -import com.hellomeritz.member.service.MemberService; -import com.hellomeritz.member.service.dto.param.ConsultantLoginParam; -import com.hellomeritz.member.service.dto.param.FinancialConsultantChangeStateParam; -import com.hellomeritz.member.service.dto.result.ConsultantSignUpResult; +import com.hello.member.controller.dto.request.ConsultantLoginRequest; +import com.hello.member.controller.dto.request.ConsultantSignUpRequest; +import com.hello.member.controller.dto.response.ConsultantLoginResponse; +import com.hello.member.controller.dto.response.ConsultantMatchResponse; +import com.hello.member.controller.dto.response.ConsultantSignUpResponse; +import com.hello.member.service.MemberService; +import com.hello.member.service.dto.param.FinancialConsultantChangeStateParam; +import com.hello.member.service.dto.result.ConsultantSignUpResult; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/member/controller/MemberController.java b/src/main/java/com/hello/member/controller/MemberController.java similarity index 88% rename from src/main/java/com/hellomeritz/member/controller/MemberController.java rename to src/main/java/com/hello/member/controller/MemberController.java index 05dad96..7782621 100644 --- a/src/main/java/com/hellomeritz/member/controller/MemberController.java +++ b/src/main/java/com/hello/member/controller/MemberController.java @@ -1,11 +1,11 @@ -package com.hellomeritz.member.controller; +package com.hello.member.controller; -import com.hellomeritz.member.controller.dto.request.ForeignInfoSaveRequest; -import com.hellomeritz.member.controller.dto.response.*; -import com.hellomeritz.member.service.MemberService; -import com.hellomeritz.member.service.dto.param.*; -import com.hellomeritz.member.service.dto.result.FcInfoResult; -import com.hellomeritz.member.service.dto.result.ForeignerInfoResult; +import com.hello.member.controller.dto.request.ForeignInfoSaveRequest; +import com.hello.member.controller.dto.response.*; +import com.hello.member.service.MemberService; +import com.hello.member.service.dto.param.*; +import com.hello.member.service.dto.result.FcInfoResult; +import com.hello.member.service.dto.result.ForeignerInfoResult; import jakarta.validation.Valid; import jakarta.validation.constraints.Positive; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/hellomeritz/member/controller/dto/request/AlarmToFcRequest.java b/src/main/java/com/hello/member/controller/dto/request/AlarmToFcRequest.java similarity index 77% rename from src/main/java/com/hellomeritz/member/controller/dto/request/AlarmToFcRequest.java rename to src/main/java/com/hello/member/controller/dto/request/AlarmToFcRequest.java index 141796b..eed1060 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/request/AlarmToFcRequest.java +++ b/src/main/java/com/hello/member/controller/dto/request/AlarmToFcRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.controller.dto.request; +package com.hello.member.controller.dto.request; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/hellomeritz/member/controller/dto/request/ConsultantLoginRequest.java b/src/main/java/com/hello/member/controller/dto/request/ConsultantLoginRequest.java similarity index 80% rename from src/main/java/com/hellomeritz/member/controller/dto/request/ConsultantLoginRequest.java rename to src/main/java/com/hello/member/controller/dto/request/ConsultantLoginRequest.java index 59d4c33..91637ce 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/request/ConsultantLoginRequest.java +++ b/src/main/java/com/hello/member/controller/dto/request/ConsultantLoginRequest.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.request; +package com.hello.member.controller.dto.request; -import com.hellomeritz.member.service.dto.param.ConsultantLoginParam; +import com.hello.member.service.dto.param.ConsultantLoginParam; import jakarta.validation.constraints.NotBlank; public record ConsultantLoginRequest( diff --git a/src/main/java/com/hellomeritz/member/controller/dto/request/ConsultantSignUpRequest.java b/src/main/java/com/hello/member/controller/dto/request/ConsultantSignUpRequest.java similarity index 85% rename from src/main/java/com/hellomeritz/member/controller/dto/request/ConsultantSignUpRequest.java rename to src/main/java/com/hello/member/controller/dto/request/ConsultantSignUpRequest.java index bed7603..e58c742 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/request/ConsultantSignUpRequest.java +++ b/src/main/java/com/hello/member/controller/dto/request/ConsultantSignUpRequest.java @@ -1,7 +1,7 @@ -package com.hellomeritz.member.controller.dto.request; +package com.hello.member.controller.dto.request; -import com.hellomeritz.global.encryption.PassWord; -import com.hellomeritz.member.service.dto.param.ConsultantSignUpParam; +import com.hello.global.encryption.PassWord; +import com.hello.member.service.dto.param.ConsultantSignUpParam; import jakarta.validation.constraints.NotBlank; public record ConsultantSignUpRequest( diff --git a/src/main/java/com/hellomeritz/member/controller/dto/request/ForeignInfoSaveRequest.java b/src/main/java/com/hello/member/controller/dto/request/ForeignInfoSaveRequest.java similarity index 83% rename from src/main/java/com/hellomeritz/member/controller/dto/request/ForeignInfoSaveRequest.java rename to src/main/java/com/hello/member/controller/dto/request/ForeignInfoSaveRequest.java index ab9861d..7fc90fa 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/request/ForeignInfoSaveRequest.java +++ b/src/main/java/com/hello/member/controller/dto/request/ForeignInfoSaveRequest.java @@ -1,9 +1,9 @@ -package com.hellomeritz.member.controller.dto.request; +package com.hello.member.controller.dto.request; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.VisaType; -import com.hellomeritz.member.domain.BirthDate; -import com.hellomeritz.member.service.dto.param.ForeignInfoSaveParam; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.VisaType; +import com.hello.member.domain.BirthDate; +import com.hello.member.service.dto.param.ForeignInfoSaveParam; import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantLoginResponse.java b/src/main/java/com/hello/member/controller/dto/response/ConsultantLoginResponse.java similarity index 69% rename from src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantLoginResponse.java rename to src/main/java/com/hello/member/controller/dto/response/ConsultantLoginResponse.java index 113a0b5..06ea2d0 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantLoginResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/ConsultantLoginResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.ConsultantLoginResult; +import com.hello.member.service.dto.result.ConsultantLoginResult; public record ConsultantLoginResponse( boolean isMyConsultant, diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantMatchResponse.java b/src/main/java/com/hello/member/controller/dto/response/ConsultantMatchResponse.java similarity index 61% rename from src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantMatchResponse.java rename to src/main/java/com/hello/member/controller/dto/response/ConsultantMatchResponse.java index 78d61ed..a09c301 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantMatchResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/ConsultantMatchResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.ConsultantMatchResult; +import com.hello.member.service.dto.result.ConsultantMatchResult; public record ConsultantMatchResponse( long fcId diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantSignUpResponse.java b/src/main/java/com/hello/member/controller/dto/response/ConsultantSignUpResponse.java similarity index 61% rename from src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantSignUpResponse.java rename to src/main/java/com/hello/member/controller/dto/response/ConsultantSignUpResponse.java index 4f72067..c52007b 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/ConsultantSignUpResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/ConsultantSignUpResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.ConsultantSignUpResult; +import com.hello.member.service.dto.result.ConsultantSignUpResult; public record ConsultantSignUpResponse( long fcId diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/FcInfoGetResponse.java b/src/main/java/com/hello/member/controller/dto/response/FcInfoGetResponse.java similarity index 80% rename from src/main/java/com/hellomeritz/member/controller/dto/response/FcInfoGetResponse.java rename to src/main/java/com/hello/member/controller/dto/response/FcInfoGetResponse.java index 8e2fce7..941a6a2 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/FcInfoGetResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/FcInfoGetResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.FcInfoResult; +import com.hello.member.service.dto.result.FcInfoResult; public record FcInfoGetResponse( Long financialConsultantId, diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignCreateResponse.java b/src/main/java/com/hello/member/controller/dto/response/ForeignCreateResponse.java similarity index 64% rename from src/main/java/com/hellomeritz/member/controller/dto/response/ForeignCreateResponse.java rename to src/main/java/com/hello/member/controller/dto/response/ForeignCreateResponse.java index f690dc9..683de08 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignCreateResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/ForeignCreateResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.ForeignCreateResult; +import com.hello.member.service.dto.result.ForeignCreateResult; public record ForeignCreateResponse( long userId diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignInfoSaveResponse.java b/src/main/java/com/hello/member/controller/dto/response/ForeignInfoSaveResponse.java similarity index 64% rename from src/main/java/com/hellomeritz/member/controller/dto/response/ForeignInfoSaveResponse.java rename to src/main/java/com/hello/member/controller/dto/response/ForeignInfoSaveResponse.java index 444cc5d..1eb055b 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignInfoSaveResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/ForeignInfoSaveResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.ForeignInfoSaveResult; +import com.hello.member.service.dto.result.ForeignInfoSaveResult; public record ForeignInfoSaveResponse( long userId diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignSaveIpAddressResponse.java b/src/main/java/com/hello/member/controller/dto/response/ForeignSaveIpAddressResponse.java similarity index 67% rename from src/main/java/com/hellomeritz/member/controller/dto/response/ForeignSaveIpAddressResponse.java rename to src/main/java/com/hello/member/controller/dto/response/ForeignSaveIpAddressResponse.java index f23dda7..04b37cf 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignSaveIpAddressResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/ForeignSaveIpAddressResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.ForeignSaveIpAddressResult; +import com.hello.member.service.dto.result.ForeignSaveIpAddressResult; public record ForeignSaveIpAddressResponse( String ipAddress diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignerInfoGetResponse.java b/src/main/java/com/hello/member/controller/dto/response/ForeignerInfoGetResponse.java similarity index 80% rename from src/main/java/com/hellomeritz/member/controller/dto/response/ForeignerInfoGetResponse.java rename to src/main/java/com/hello/member/controller/dto/response/ForeignerInfoGetResponse.java index 2fbc4b4..1cc3698 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/ForeignerInfoGetResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/ForeignerInfoGetResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.ForeignerInfoResult; +import com.hello.member.service.dto.result.ForeignerInfoResult; public record ForeignerInfoGetResponse( Long userId, diff --git a/src/main/java/com/hellomeritz/member/controller/dto/response/UserCheckIsFcResponse.java b/src/main/java/com/hello/member/controller/dto/response/UserCheckIsFcResponse.java similarity index 61% rename from src/main/java/com/hellomeritz/member/controller/dto/response/UserCheckIsFcResponse.java rename to src/main/java/com/hello/member/controller/dto/response/UserCheckIsFcResponse.java index 46501d0..509c65f 100644 --- a/src/main/java/com/hellomeritz/member/controller/dto/response/UserCheckIsFcResponse.java +++ b/src/main/java/com/hello/member/controller/dto/response/UserCheckIsFcResponse.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.controller.dto.response; +package com.hello.member.controller.dto.response; -import com.hellomeritz.member.service.dto.result.UserCheckIsFcResult; +import com.hello.member.service.dto.result.UserCheckIsFcResult; public record UserCheckIsFcResponse( boolean isFC diff --git a/src/main/java/com/hellomeritz/member/domain/BirthDate.java b/src/main/java/com/hello/member/domain/BirthDate.java similarity index 97% rename from src/main/java/com/hellomeritz/member/domain/BirthDate.java rename to src/main/java/com/hello/member/domain/BirthDate.java index 80c4afa..11ece04 100644 --- a/src/main/java/com/hellomeritz/member/domain/BirthDate.java +++ b/src/main/java/com/hello/member/domain/BirthDate.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.domain; +package com.hello.member.domain; import jakarta.persistence.Embeddable; import lombok.Getter; diff --git a/src/main/java/com/hellomeritz/member/domain/ConsultationState.java b/src/main/java/com/hello/member/domain/ConsultationState.java similarity index 62% rename from src/main/java/com/hellomeritz/member/domain/ConsultationState.java rename to src/main/java/com/hello/member/domain/ConsultationState.java index f0834a1..7ecb972 100644 --- a/src/main/java/com/hellomeritz/member/domain/ConsultationState.java +++ b/src/main/java/com/hello/member/domain/ConsultationState.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.domain; +package com.hello.member.domain; public enum ConsultationState { AVAILABLE, diff --git a/src/main/java/com/hellomeritz/member/domain/FinancialConsultant.java b/src/main/java/com/hello/member/domain/FinancialConsultant.java similarity index 97% rename from src/main/java/com/hellomeritz/member/domain/FinancialConsultant.java rename to src/main/java/com/hello/member/domain/FinancialConsultant.java index 9feff29..bf5143d 100644 --- a/src/main/java/com/hellomeritz/member/domain/FinancialConsultant.java +++ b/src/main/java/com/hello/member/domain/FinancialConsultant.java @@ -1,6 +1,5 @@ -package com.hellomeritz.member.domain; +package com.hello.member.domain; -import com.hellomeritz.global.encryption.PassWord; import jakarta.persistence.*; import lombok.Getter; import org.springframework.util.Assert; diff --git a/src/main/java/com/hellomeritz/member/domain/Foreigner.java b/src/main/java/com/hello/member/domain/Foreigner.java similarity index 96% rename from src/main/java/com/hellomeritz/member/domain/Foreigner.java rename to src/main/java/com/hello/member/domain/Foreigner.java index 1f3b6ac..f6408fe 100644 --- a/src/main/java/com/hellomeritz/member/domain/Foreigner.java +++ b/src/main/java/com/hello/member/domain/Foreigner.java @@ -1,7 +1,7 @@ -package com.hellomeritz.member.domain; +package com.hello.member.domain; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.VisaType; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.VisaType; import jakarta.persistence.*; import lombok.Getter; import org.springframework.util.Assert; diff --git a/src/main/java/com/hellomeritz/member/global/IpSensor.java b/src/main/java/com/hello/member/global/IpSensor.java similarity index 93% rename from src/main/java/com/hellomeritz/member/global/IpSensor.java rename to src/main/java/com/hello/member/global/IpSensor.java index acf7c58..fadd4a7 100644 --- a/src/main/java/com/hellomeritz/member/global/IpSensor.java +++ b/src/main/java/com/hello/member/global/IpSensor.java @@ -1,10 +1,9 @@ -package com.hellomeritz.member.global; +package com.hello.member.global; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @Configuration diff --git a/src/main/java/com/hellomeritz/member/global/sms/CoolSmsManager.java b/src/main/java/com/hello/member/global/sms/CoolSmsManager.java similarity index 97% rename from src/main/java/com/hellomeritz/member/global/sms/CoolSmsManager.java rename to src/main/java/com/hello/member/global/sms/CoolSmsManager.java index f1582ab..e9ad098 100644 --- a/src/main/java/com/hellomeritz/member/global/sms/CoolSmsManager.java +++ b/src/main/java/com/hello/member/global/sms/CoolSmsManager.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.global.sms; +package com.hello.member.global.sms; import net.nurigo.sdk.NurigoApp; import net.nurigo.sdk.message.model.Message; diff --git a/src/main/java/com/hellomeritz/member/global/sms/SmsAlarmToFcRequest.java b/src/main/java/com/hello/member/global/sms/SmsAlarmToFcRequest.java similarity index 68% rename from src/main/java/com/hellomeritz/member/global/sms/SmsAlarmToFcRequest.java rename to src/main/java/com/hello/member/global/sms/SmsAlarmToFcRequest.java index 7514b98..297e16e 100644 --- a/src/main/java/com/hellomeritz/member/global/sms/SmsAlarmToFcRequest.java +++ b/src/main/java/com/hello/member/global/sms/SmsAlarmToFcRequest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.global.sms; +package com.hello.member.global.sms; public record SmsAlarmToFcRequest( String outgoingPhoneNumber, diff --git a/src/main/java/com/hellomeritz/member/global/sms/SmsManager.java b/src/main/java/com/hello/member/global/sms/SmsManager.java similarity index 80% rename from src/main/java/com/hellomeritz/member/global/sms/SmsManager.java rename to src/main/java/com/hello/member/global/sms/SmsManager.java index 7184139..fb41e36 100644 --- a/src/main/java/com/hellomeritz/member/global/sms/SmsManager.java +++ b/src/main/java/com/hello/member/global/sms/SmsManager.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.global.sms; +package com.hello.member.global.sms; import net.nurigo.sdk.message.response.SingleMessageSentResponse; diff --git a/src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantJapRepository.java b/src/main/java/com/hello/member/repository/fc/FinancialConsultantJapRepository.java similarity index 80% rename from src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantJapRepository.java rename to src/main/java/com/hello/member/repository/fc/FinancialConsultantJapRepository.java index 96f30ca..85f3432 100644 --- a/src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantJapRepository.java +++ b/src/main/java/com/hello/member/repository/fc/FinancialConsultantJapRepository.java @@ -1,11 +1,10 @@ -package com.hellomeritz.member.repository.fc; +package com.hello.member.repository.fc; -import com.hellomeritz.member.domain.FinancialConsultant; +import com.hello.member.domain.FinancialConsultant; import jakarta.persistence.LockModeType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantRepository.java b/src/main/java/com/hello/member/repository/fc/FinancialConsultantRepository.java similarity index 72% rename from src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantRepository.java rename to src/main/java/com/hello/member/repository/fc/FinancialConsultantRepository.java index 0fdb52d..ad0b396 100644 --- a/src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantRepository.java +++ b/src/main/java/com/hello/member/repository/fc/FinancialConsultantRepository.java @@ -1,9 +1,8 @@ -package com.hellomeritz.member.repository.fc; +package com.hello.member.repository.fc; -import com.hellomeritz.member.domain.FinancialConsultant; +import com.hello.member.domain.FinancialConsultant; import java.util.List; -import java.util.Optional; public interface FinancialConsultantRepository { diff --git a/src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantRepositoryImpl.java b/src/main/java/com/hello/member/repository/fc/FinancialConsultantRepositoryImpl.java similarity index 94% rename from src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantRepositoryImpl.java rename to src/main/java/com/hello/member/repository/fc/FinancialConsultantRepositoryImpl.java index 0371412..a62bc21 100644 --- a/src/main/java/com/hellomeritz/member/repository/fc/FinancialConsultantRepositoryImpl.java +++ b/src/main/java/com/hello/member/repository/fc/FinancialConsultantRepositoryImpl.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.repository.fc; +package com.hello.member.repository.fc; -import com.hellomeritz.member.domain.FinancialConsultant; +import com.hello.member.domain.FinancialConsultant; import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/hellomeritz/member/repository/foreign/ForeignJpaRepository.java b/src/main/java/com/hello/member/repository/foreign/ForeignJpaRepository.java similarity index 84% rename from src/main/java/com/hellomeritz/member/repository/foreign/ForeignJpaRepository.java rename to src/main/java/com/hello/member/repository/foreign/ForeignJpaRepository.java index cf8bed6..a6ae5c4 100644 --- a/src/main/java/com/hellomeritz/member/repository/foreign/ForeignJpaRepository.java +++ b/src/main/java/com/hello/member/repository/foreign/ForeignJpaRepository.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.repository.foreign; +package com.hello.member.repository.foreign; -import com.hellomeritz.member.domain.Foreigner; +import com.hello.member.domain.Foreigner; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/hellomeritz/member/repository/foreign/ForeignRepository.java b/src/main/java/com/hello/member/repository/foreign/ForeignRepository.java similarity index 52% rename from src/main/java/com/hellomeritz/member/repository/foreign/ForeignRepository.java rename to src/main/java/com/hello/member/repository/foreign/ForeignRepository.java index 81c1919..bf04f73 100644 --- a/src/main/java/com/hellomeritz/member/repository/foreign/ForeignRepository.java +++ b/src/main/java/com/hello/member/repository/foreign/ForeignRepository.java @@ -1,7 +1,6 @@ -package com.hellomeritz.member.repository.foreign; +package com.hello.member.repository.foreign; -import com.hellomeritz.member.domain.Foreigner; -import org.springframework.data.repository.query.Param; +import com.hello.member.domain.Foreigner; public interface ForeignRepository { diff --git a/src/main/java/com/hellomeritz/member/repository/foreign/ForeignRepositoryImpl.java b/src/main/java/com/hello/member/repository/foreign/ForeignRepositoryImpl.java similarity index 79% rename from src/main/java/com/hellomeritz/member/repository/foreign/ForeignRepositoryImpl.java rename to src/main/java/com/hello/member/repository/foreign/ForeignRepositoryImpl.java index 394e5ac..1811844 100644 --- a/src/main/java/com/hellomeritz/member/repository/foreign/ForeignRepositoryImpl.java +++ b/src/main/java/com/hello/member/repository/foreign/ForeignRepositoryImpl.java @@ -1,8 +1,6 @@ -package com.hellomeritz.member.repository.foreign; +package com.hello.member.repository.foreign; -import com.hellomeritz.member.domain.Foreigner; -import com.hellomeritz.member.repository.foreign.ForeignJpaRepository; -import com.hellomeritz.member.repository.foreign.ForeignRepository; +import com.hello.member.domain.Foreigner; import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/hellomeritz/member/service/MemberService.java b/src/main/java/com/hello/member/service/MemberService.java similarity index 88% rename from src/main/java/com/hellomeritz/member/service/MemberService.java rename to src/main/java/com/hello/member/service/MemberService.java index 71b3594..1ec3437 100644 --- a/src/main/java/com/hellomeritz/member/service/MemberService.java +++ b/src/main/java/com/hello/member/service/MemberService.java @@ -1,16 +1,15 @@ -package com.hellomeritz.member.service; - -import com.hellomeritz.global.cache.CacheType; -import com.hellomeritz.member.domain.FinancialConsultant; -import com.hellomeritz.member.domain.Foreigner; -import com.hellomeritz.member.global.IpSensor; -import com.hellomeritz.global.encryption.PasswordEncoder; -import com.hellomeritz.global.encryption.dto.EncryptionResponse; -import com.hellomeritz.member.global.sms.SmsManager; -import com.hellomeritz.member.repository.fc.FinancialConsultantRepository; -import com.hellomeritz.member.repository.foreign.ForeignRepository; -import com.hellomeritz.member.service.dto.param.*; -import com.hellomeritz.member.service.dto.result.*; +package com.hello.member.service; + +import com.hello.member.domain.FinancialConsultant; +import com.hello.member.domain.Foreigner; +import com.hello.member.global.IpSensor; +import com.hello.global.encryption.PasswordEncoder; +import com.hello.global.encryption.dto.EncryptionResponse; +import com.hello.member.global.sms.SmsManager; +import com.hello.member.repository.fc.FinancialConsultantRepository; +import com.hello.member.repository.foreign.ForeignRepository; +import com.hello.member.service.dto.param.*; +import com.hello.member.service.dto.result.*; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/AlarmToFcParam.java b/src/main/java/com/hello/member/service/dto/param/AlarmToFcParam.java similarity index 79% rename from src/main/java/com/hellomeritz/member/service/dto/param/AlarmToFcParam.java rename to src/main/java/com/hello/member/service/dto/param/AlarmToFcParam.java index d02c7a0..5af1521 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/AlarmToFcParam.java +++ b/src/main/java/com/hello/member/service/dto/param/AlarmToFcParam.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; -import com.hellomeritz.member.global.sms.SmsAlarmToFcRequest; +import com.hello.member.global.sms.SmsAlarmToFcRequest; public record AlarmToFcParam( long chatRoomId, diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/ConsultantLoginParam.java b/src/main/java/com/hello/member/service/dto/param/ConsultantLoginParam.java similarity index 72% rename from src/main/java/com/hellomeritz/member/service/dto/param/ConsultantLoginParam.java rename to src/main/java/com/hello/member/service/dto/param/ConsultantLoginParam.java index 351eca4..4021c9b 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/ConsultantLoginParam.java +++ b/src/main/java/com/hello/member/service/dto/param/ConsultantLoginParam.java @@ -1,8 +1,8 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; -import com.hellomeritz.member.domain.FinancialConsultant; -import com.hellomeritz.global.encryption.dto.EncryptionRequest; -import com.hellomeritz.global.encryption.dto.PasswordMatchRequest; +import com.hello.member.domain.FinancialConsultant; +import com.hello.global.encryption.dto.EncryptionRequest; +import com.hello.global.encryption.dto.PasswordMatchRequest; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/ConsultantSignUpParam.java b/src/main/java/com/hello/member/service/dto/param/ConsultantSignUpParam.java similarity index 73% rename from src/main/java/com/hellomeritz/member/service/dto/param/ConsultantSignUpParam.java rename to src/main/java/com/hello/member/service/dto/param/ConsultantSignUpParam.java index 3001d8e..cf6f17e 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/ConsultantSignUpParam.java +++ b/src/main/java/com/hello/member/service/dto/param/ConsultantSignUpParam.java @@ -1,9 +1,9 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; -import com.hellomeritz.global.encryption.PassWord; -import com.hellomeritz.member.domain.FinancialConsultant; -import com.hellomeritz.global.encryption.dto.EncryptionRequest; -import com.hellomeritz.global.encryption.dto.EncryptionResponse; +import com.hello.global.encryption.PassWord; +import com.hello.member.domain.FinancialConsultant; +import com.hello.global.encryption.dto.EncryptionRequest; +import com.hello.global.encryption.dto.EncryptionResponse; import java.time.LocalDateTime; diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/FinancialConsultantChangeStateParam.java b/src/main/java/com/hello/member/service/dto/param/FinancialConsultantChangeStateParam.java similarity index 81% rename from src/main/java/com/hellomeritz/member/service/dto/param/FinancialConsultantChangeStateParam.java rename to src/main/java/com/hello/member/service/dto/param/FinancialConsultantChangeStateParam.java index 94c4a2f..2b760a7 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/FinancialConsultantChangeStateParam.java +++ b/src/main/java/com/hello/member/service/dto/param/FinancialConsultantChangeStateParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; public record FinancialConsultantChangeStateParam( long fcId diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/FinancialConsultantInfoGetParam.java b/src/main/java/com/hello/member/service/dto/param/FinancialConsultantInfoGetParam.java similarity index 80% rename from src/main/java/com/hellomeritz/member/service/dto/param/FinancialConsultantInfoGetParam.java rename to src/main/java/com/hello/member/service/dto/param/FinancialConsultantInfoGetParam.java index 39aa616..e12ea98 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/FinancialConsultantInfoGetParam.java +++ b/src/main/java/com/hello/member/service/dto/param/FinancialConsultantInfoGetParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; public record FinancialConsultantInfoGetParam( Long userId diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/ForeignInfoSaveParam.java b/src/main/java/com/hello/member/service/dto/param/ForeignInfoSaveParam.java similarity index 59% rename from src/main/java/com/hellomeritz/member/service/dto/param/ForeignInfoSaveParam.java rename to src/main/java/com/hello/member/service/dto/param/ForeignInfoSaveParam.java index 646530e..bc1fc7e 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/ForeignInfoSaveParam.java +++ b/src/main/java/com/hello/member/service/dto/param/ForeignInfoSaveParam.java @@ -1,9 +1,9 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.VisaType; -import com.hellomeritz.member.domain.BirthDate; -import com.hellomeritz.member.domain.Foreigner; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.VisaType; +import com.hello.member.domain.BirthDate; +import com.hello.member.domain.Foreigner; public record ForeignInfoSaveParam( SourceLanguage language, diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/ForeignSaveIpAddressParam.java b/src/main/java/com/hello/member/service/dto/param/ForeignSaveIpAddressParam.java similarity index 79% rename from src/main/java/com/hellomeritz/member/service/dto/param/ForeignSaveIpAddressParam.java rename to src/main/java/com/hello/member/service/dto/param/ForeignSaveIpAddressParam.java index b4ba807..39adbe7 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/ForeignSaveIpAddressParam.java +++ b/src/main/java/com/hello/member/service/dto/param/ForeignSaveIpAddressParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; public record ForeignSaveIpAddressParam( Long userId diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/ForeignerInfoGetParam.java b/src/main/java/com/hello/member/service/dto/param/ForeignerInfoGetParam.java similarity index 77% rename from src/main/java/com/hellomeritz/member/service/dto/param/ForeignerInfoGetParam.java rename to src/main/java/com/hello/member/service/dto/param/ForeignerInfoGetParam.java index 58e239d..f68673d 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/ForeignerInfoGetParam.java +++ b/src/main/java/com/hello/member/service/dto/param/ForeignerInfoGetParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; public record ForeignerInfoGetParam( Long userId diff --git a/src/main/java/com/hellomeritz/member/service/dto/param/UserCheckIsFcParam.java b/src/main/java/com/hello/member/service/dto/param/UserCheckIsFcParam.java similarity index 77% rename from src/main/java/com/hellomeritz/member/service/dto/param/UserCheckIsFcParam.java rename to src/main/java/com/hello/member/service/dto/param/UserCheckIsFcParam.java index 0533d65..e42e579 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/param/UserCheckIsFcParam.java +++ b/src/main/java/com/hello/member/service/dto/param/UserCheckIsFcParam.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.param; +package com.hello.member.service.dto.param; public record UserCheckIsFcParam( Long userId diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/ConsultantLoginResult.java b/src/main/java/com/hello/member/service/dto/result/ConsultantLoginResult.java similarity index 85% rename from src/main/java/com/hellomeritz/member/service/dto/result/ConsultantLoginResult.java rename to src/main/java/com/hello/member/service/dto/result/ConsultantLoginResult.java index c2cce24..6a056fb 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/ConsultantLoginResult.java +++ b/src/main/java/com/hello/member/service/dto/result/ConsultantLoginResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; public record ConsultantLoginResult( boolean isMyConsultant, diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/ConsultantMatchResult.java b/src/main/java/com/hello/member/service/dto/result/ConsultantMatchResult.java similarity index 78% rename from src/main/java/com/hellomeritz/member/service/dto/result/ConsultantMatchResult.java rename to src/main/java/com/hello/member/service/dto/result/ConsultantMatchResult.java index edf7769..35321ab 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/ConsultantMatchResult.java +++ b/src/main/java/com/hello/member/service/dto/result/ConsultantMatchResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; public record ConsultantMatchResult( Long fcId diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/ConsultantSignUpResult.java b/src/main/java/com/hello/member/service/dto/result/ConsultantSignUpResult.java similarity index 77% rename from src/main/java/com/hellomeritz/member/service/dto/result/ConsultantSignUpResult.java rename to src/main/java/com/hello/member/service/dto/result/ConsultantSignUpResult.java index 21a11b0..59bf20f 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/ConsultantSignUpResult.java +++ b/src/main/java/com/hello/member/service/dto/result/ConsultantSignUpResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; public record ConsultantSignUpResult( Long fcId diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/FcInfoResult.java b/src/main/java/com/hello/member/service/dto/result/FcInfoResult.java similarity index 83% rename from src/main/java/com/hellomeritz/member/service/dto/result/FcInfoResult.java rename to src/main/java/com/hello/member/service/dto/result/FcInfoResult.java index f7f9550..d7ff668 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/FcInfoResult.java +++ b/src/main/java/com/hello/member/service/dto/result/FcInfoResult.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; -import com.hellomeritz.member.domain.FinancialConsultant; +import com.hello.member.domain.FinancialConsultant; public record FcInfoResult( Long financialConsultantId, diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignCreateResult.java b/src/main/java/com/hello/member/service/dto/result/ForeignCreateResult.java similarity index 77% rename from src/main/java/com/hellomeritz/member/service/dto/result/ForeignCreateResult.java rename to src/main/java/com/hello/member/service/dto/result/ForeignCreateResult.java index 701197d..76a2d7a 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignCreateResult.java +++ b/src/main/java/com/hello/member/service/dto/result/ForeignCreateResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; public record ForeignCreateResult( Long userId diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignInfoSaveResult.java b/src/main/java/com/hello/member/service/dto/result/ForeignInfoSaveResult.java similarity index 81% rename from src/main/java/com/hellomeritz/member/service/dto/result/ForeignInfoSaveResult.java rename to src/main/java/com/hello/member/service/dto/result/ForeignInfoSaveResult.java index 4868362..5905822 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignInfoSaveResult.java +++ b/src/main/java/com/hello/member/service/dto/result/ForeignInfoSaveResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; public record ForeignInfoSaveResult( Long userId diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignSaveIpAddressResult.java b/src/main/java/com/hello/member/service/dto/result/ForeignSaveIpAddressResult.java similarity index 80% rename from src/main/java/com/hellomeritz/member/service/dto/result/ForeignSaveIpAddressResult.java rename to src/main/java/com/hello/member/service/dto/result/ForeignSaveIpAddressResult.java index ccee726..6cdc5b4 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignSaveIpAddressResult.java +++ b/src/main/java/com/hello/member/service/dto/result/ForeignSaveIpAddressResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; public record ForeignSaveIpAddressResult( String ipAddress diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignerInfoResult.java b/src/main/java/com/hello/member/service/dto/result/ForeignerInfoResult.java similarity index 84% rename from src/main/java/com/hellomeritz/member/service/dto/result/ForeignerInfoResult.java rename to src/main/java/com/hello/member/service/dto/result/ForeignerInfoResult.java index 04cbf89..d1f731a 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/ForeignerInfoResult.java +++ b/src/main/java/com/hello/member/service/dto/result/ForeignerInfoResult.java @@ -1,6 +1,6 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; -import com.hellomeritz.member.domain.Foreigner; +import com.hello.member.domain.Foreigner; public record ForeignerInfoResult( Long userId, diff --git a/src/main/java/com/hellomeritz/member/service/dto/result/UserCheckIsFcResult.java b/src/main/java/com/hello/member/service/dto/result/UserCheckIsFcResult.java similarity index 77% rename from src/main/java/com/hellomeritz/member/service/dto/result/UserCheckIsFcResult.java rename to src/main/java/com/hello/member/service/dto/result/UserCheckIsFcResult.java index 8c72ee0..de3c646 100644 --- a/src/main/java/com/hellomeritz/member/service/dto/result/UserCheckIsFcResult.java +++ b/src/main/java/com/hello/member/service/dto/result/UserCheckIsFcResult.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.service.dto.result; +package com.hello.member.service.dto.result; public record UserCheckIsFcResult( boolean isFC diff --git a/src/main/java/com/hellomeritz/chat/global/stt/SttManager.java b/src/main/java/com/hellomeritz/chat/global/stt/SttManager.java deleted file mode 100644 index 0bd509c..0000000 --- a/src/main/java/com/hellomeritz/chat/global/stt/SttManager.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hellomeritz.chat.global.stt; - -import com.hellomeritz.chat.global.stt.dto.SttRequest; -import com.hellomeritz.chat.global.stt.dto.SttResponse; - -public interface SttManager { - - SttResponse asyncRecognizeAudio (SttRequest request); -} diff --git a/src/main/java/com/hellomeritz/chat/global/translator/TranslationRequest.java b/src/main/java/com/hellomeritz/chat/global/translator/TranslationRequest.java deleted file mode 100644 index d8eaff4..0000000 --- a/src/main/java/com/hellomeritz/chat/global/translator/TranslationRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hellomeritz.chat.global.translator; - -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.TargetLanguage; - -public record TranslationRequest( - String contents, - TargetLanguage targetLang, - SourceLanguage sourceLang -) { -} diff --git a/src/main/resources/static/styles/chat.css b/src/main/resources/static/styles/chat.css index 3bcac5b..c912d1c 100644 --- a/src/main/resources/static/styles/chat.css +++ b/src/main/resources/static/styles/chat.css @@ -1,5 +1,4 @@ .chat-container { - width: 50%; background-color: #f9f9f9; box-shadow: 0 2px 4px rgba(0,0,0,0.1); margin-top: 10px; diff --git a/src/test/java/com/hellomeritz/chat/controller/ChatControllerDocsTest.java b/src/test/java/com/hello/chat/controller/ChatControllerDocsTest.java similarity index 90% rename from src/test/java/com/hellomeritz/chat/controller/ChatControllerDocsTest.java rename to src/test/java/com/hello/chat/controller/ChatControllerDocsTest.java index e20b5e5..dc62c54 100644 --- a/src/test/java/com/hellomeritz/chat/controller/ChatControllerDocsTest.java +++ b/src/test/java/com/hello/chat/controller/ChatControllerDocsTest.java @@ -1,11 +1,11 @@ -package com.hellomeritz.chat.controller; +package com.hello.chat.controller; -import com.hellomeritz.chat.controller.dto.request.ChatMessageSttRequest; -import com.hellomeritz.chat.global.stt.SttProvider; -import com.hellomeritz.chat.service.ChatMessageService; -import com.hellomeritz.chat.service.dto.result.ChatMessageSttResult; -import com.hellomeritz.global.ChatFixture; -import com.hellomeritz.global.RestDocsSupport; +import com.hello.chat.controller.dto.request.ChatMessageSttRequest; +import com.hello.chat.global.stt.SttProvider; +import com.hello.chat.service.ChatMessageService; +import com.hello.chat.service.dto.result.ChatMessageSttResult; +import com.hello.global.ChatFixture; +import com.hello.global.RestDocsSupport; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; diff --git a/src/test/java/com/hellomeritz/chat/controller/ChatControllerTest.java b/src/test/java/com/hello/chat/controller/ChatControllerTest.java similarity index 96% rename from src/test/java/com/hellomeritz/chat/controller/ChatControllerTest.java rename to src/test/java/com/hello/chat/controller/ChatControllerTest.java index 42a6e6d..c6d2a1c 100644 --- a/src/test/java/com/hellomeritz/chat/controller/ChatControllerTest.java +++ b/src/test/java/com/hello/chat/controller/ChatControllerTest.java @@ -1,10 +1,10 @@ -package com.hellomeritz.chat.controller; +package com.hello.chat.controller; -import com.hellomeritz.chat.controller.dto.request.ChatMessageSttRequest; -import com.hellomeritz.chat.controller.dto.request.ChatMessageTranslateRequest; -import com.hellomeritz.chat.global.TargetLanguage; -import com.hellomeritz.global.ChatFixture; -import com.hellomeritz.global.ControllerTestSupport; +import com.hello.chat.controller.dto.request.ChatMessageSttRequest; +import com.hello.chat.controller.dto.request.ChatMessageTranslateRequest; +import com.hello.chat.global.TargetLanguage; +import com.hello.global.ChatFixture; +import com.hello.global.ControllerTestSupport; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hellomeritz/chat/controller/ChatRoomControllerDocsTest.java b/src/test/java/com/hello/chat/controller/ChatRoomControllerDocsTest.java similarity index 98% rename from src/test/java/com/hellomeritz/chat/controller/ChatRoomControllerDocsTest.java rename to src/test/java/com/hello/chat/controller/ChatRoomControllerDocsTest.java index 498b512..aa2cc8a 100644 --- a/src/test/java/com/hellomeritz/chat/controller/ChatRoomControllerDocsTest.java +++ b/src/test/java/com/hello/chat/controller/ChatRoomControllerDocsTest.java @@ -1,9 +1,9 @@ -package com.hellomeritz.chat.controller; +package com.hello.chat.controller; -import com.hellomeritz.chat.service.ChatService; -import com.hellomeritz.chat.service.dto.result.*; -import com.hellomeritz.global.ChatFixture; -import com.hellomeritz.global.RestDocsSupport; +import com.hello.chat.service.ChatService; +import com.hello.chat.service.dto.result.*; +import com.hello.global.ChatFixture; +import com.hello.global.RestDocsSupport; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; diff --git a/src/test/java/com/hellomeritz/chat/controller/ChatRoomControllerTest.java b/src/test/java/com/hello/chat/controller/ChatRoomControllerTest.java similarity index 91% rename from src/test/java/com/hellomeritz/chat/controller/ChatRoomControllerTest.java rename to src/test/java/com/hello/chat/controller/ChatRoomControllerTest.java index b0c7174..45ec939 100644 --- a/src/test/java/com/hellomeritz/chat/controller/ChatRoomControllerTest.java +++ b/src/test/java/com/hello/chat/controller/ChatRoomControllerTest.java @@ -1,12 +1,11 @@ -package com.hellomeritz.chat.controller; +package com.hello.chat.controller; -import com.hellomeritz.chat.controller.dto.request.ChatMessageGetRequest; -import com.hellomeritz.chat.controller.dto.request.ChatRoomCreateRequest; -import com.hellomeritz.chat.controller.dto.request.ChatRoomInfoOfConsultantRequest; -import com.hellomeritz.chat.controller.dto.request.ChatRoomInfoOfForeignerRequest; -import com.hellomeritz.global.ControllerTestSupport; +import com.hello.chat.controller.dto.request.ChatMessageGetRequest; +import com.hello.chat.controller.dto.request.ChatRoomCreateRequest; +import com.hello.chat.controller.dto.request.ChatRoomInfoOfConsultantRequest; +import com.hello.chat.controller.dto.request.ChatRoomInfoOfForeignerRequest; +import com.hello.global.ControllerTestSupport; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.NullSource; import org.junit.jupiter.params.provider.ValueSource; diff --git a/src/test/java/com/hellomeritz/chat/domain/ChatMessageTest.java b/src/test/java/com/hello/chat/domain/ChatMessageTest.java similarity index 98% rename from src/test/java/com/hellomeritz/chat/domain/ChatMessageTest.java rename to src/test/java/com/hello/chat/domain/ChatMessageTest.java index c4acb55..bf58b21 100644 --- a/src/test/java/com/hellomeritz/chat/domain/ChatMessageTest.java +++ b/src/test/java/com/hello/chat/domain/ChatMessageTest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.domain; +package com.hello.chat.domain; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hellomeritz/chat/domain/ChatRoomTest.java b/src/test/java/com/hello/chat/domain/ChatRoomTest.java similarity index 95% rename from src/test/java/com/hellomeritz/chat/domain/ChatRoomTest.java rename to src/test/java/com/hello/chat/domain/ChatRoomTest.java index c892663..1d0ab42 100644 --- a/src/test/java/com/hellomeritz/chat/domain/ChatRoomTest.java +++ b/src/test/java/com/hello/chat/domain/ChatRoomTest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.chat.domain; +package com.hello.chat.domain; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hellomeritz/chat/service/BanWordServiceTest.java b/src/test/java/com/hello/chat/service/BanWordServiceTest.java similarity index 80% rename from src/test/java/com/hellomeritz/chat/service/BanWordServiceTest.java rename to src/test/java/com/hello/chat/service/BanWordServiceTest.java index 5a8e230..01b041f 100644 --- a/src/test/java/com/hellomeritz/chat/service/BanWordServiceTest.java +++ b/src/test/java/com/hello/chat/service/BanWordServiceTest.java @@ -1,10 +1,10 @@ -package com.hellomeritz.chat.service; +package com.hello.chat.service; -import com.hellomeritz.chat.domain.BanWord; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.repository.banword.BanWordRepository; -import com.hellomeritz.chat.repository.banword.BanWordStorage; -import com.hellomeritz.global.BanWordFixture; +import com.hello.chat.domain.BanWord; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.repository.banword.BanWordRepository; +import com.hello.chat.repository.banword.BanWordStorage; +import com.hello.global.BanWordFixture; import org.ahocorasick.trie.Trie; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hellomeritz/chat/service/ChatServiceTest.java b/src/test/java/com/hello/chat/service/ChatServiceTest.java similarity index 89% rename from src/test/java/com/hellomeritz/chat/service/ChatServiceTest.java rename to src/test/java/com/hello/chat/service/ChatServiceTest.java index b2e8219..531b910 100644 --- a/src/test/java/com/hellomeritz/chat/service/ChatServiceTest.java +++ b/src/test/java/com/hello/chat/service/ChatServiceTest.java @@ -1,23 +1,22 @@ -package com.hellomeritz.chat.service; - -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.domain.ChatMessageType; -import com.hellomeritz.chat.domain.ChatRoom; -import com.hellomeritz.chat.global.stt.SttManagerHandler; -import com.hellomeritz.chat.repository.chatentry.ChatRoomEntryRepository; -import com.hellomeritz.chat.repository.chatmessage.ChatMessageRepository; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageGetRepositoryResponses; -import com.hellomeritz.chat.repository.chatroom.ChatRoomRepository; -import com.hellomeritz.chat.repository.chatsession.ChatSessionRepository; -import com.hellomeritz.chat.service.dto.param.*; -import com.hellomeritz.chat.service.dto.result.*; -import com.hellomeritz.global.ChatFixture; -import com.hellomeritz.global.FinancialConsultantFixture; -import com.hellomeritz.global.ForeignFixture; -import com.hellomeritz.member.domain.FinancialConsultant; -import com.hellomeritz.member.domain.Foreigner; -import com.hellomeritz.member.repository.fc.FinancialConsultantRepository; -import com.hellomeritz.member.repository.foreign.ForeignRepository; +package com.hello.chat.service; + +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.domain.ChatRoom; +import com.hello.chat.global.stt.SttManagerHandler; +import com.hello.chat.repository.chatentry.ChatRoomEntryRepository; +import com.hello.chat.repository.chatmessage.ChatMessageRepository; +import com.hello.chat.repository.chatmessage.dto.ChatMessageGetRepositoryResponses; +import com.hello.chat.repository.chatroom.ChatRoomRepository; +import com.hello.chat.repository.chatsession.ChatSessionRepository; +import com.hello.chat.service.dto.param.*; +import com.hello.chat.service.dto.result.*; +import com.hello.global.ChatFixture; +import com.hello.global.FinancialConsultantFixture; +import com.hello.global.ForeignFixture; +import com.hello.member.domain.FinancialConsultant; +import com.hello.member.domain.Foreigner; +import com.hello.member.repository.fc.FinancialConsultantRepository; +import com.hello.member.repository.foreign.ForeignRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/hellomeritz/global/BanWordFixture.java b/src/test/java/com/hello/global/BanWordFixture.java similarity index 58% rename from src/test/java/com/hellomeritz/global/BanWordFixture.java rename to src/test/java/com/hello/global/BanWordFixture.java index 0d0ab1d..0a5a226 100644 --- a/src/test/java/com/hellomeritz/global/BanWordFixture.java +++ b/src/test/java/com/hello/global/BanWordFixture.java @@ -1,7 +1,7 @@ -package com.hellomeritz.global; +package com.hello.global; -import com.hellomeritz.chat.domain.BanWord; -import com.hellomeritz.chat.global.SourceLanguage; +import com.hello.chat.domain.BanWord; +import com.hello.chat.global.SourceLanguage; public class BanWordFixture { diff --git a/src/test/java/com/hellomeritz/global/ChatFixture.java b/src/test/java/com/hello/global/ChatFixture.java similarity index 91% rename from src/test/java/com/hellomeritz/global/ChatFixture.java rename to src/test/java/com/hello/global/ChatFixture.java index 9d3a5ec..2e164a3 100644 --- a/src/test/java/com/hellomeritz/global/ChatFixture.java +++ b/src/test/java/com/hello/global/ChatFixture.java @@ -1,21 +1,21 @@ -package com.hellomeritz.global; - -import com.hellomeritz.chat.controller.dto.request.*; -import com.hellomeritz.chat.controller.dto.response.ChatRoomUserInfoResponse; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.domain.ChatMessageType; -import com.hellomeritz.chat.domain.ChatRoom; -import com.hellomeritz.global.encryption.PassWord; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.TargetLanguage; -import com.hellomeritz.chat.global.stt.SttProvider; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; -import com.hellomeritz.chat.repository.chatmessage.dto.ChatMessageGetRepositoryRequest; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; -import com.hellomeritz.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; -import com.hellomeritz.chat.service.dto.param.*; -import com.hellomeritz.chat.service.dto.result.*; +package com.hello.global; + +import com.hello.chat.controller.dto.request.*; +import com.hello.chat.controller.dto.response.ChatRoomUserInfoResponse; +import com.hello.chat.domain.ChatMessage; +import com.hello.chat.domain.ChatMessageType; +import com.hello.chat.domain.ChatRoom; +import com.hello.global.encryption.PassWord; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.TargetLanguage; +import com.hello.chat.global.stt.SttProvider; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryAddRepositoryRequest; +import com.hello.chat.repository.chatentry.dto.ChatRoomEntryGetSessionRequest; +import com.hello.chat.repository.chatmessage.dto.ChatMessageGetRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionAddRepositoryRequest; +import com.hello.chat.repository.chatsession.dto.ChatSessionChangeRepositoryRequest; +import com.hello.chat.service.dto.param.*; +import com.hello.chat.service.dto.result.*; import java.time.LocalDateTime; import java.util.List; diff --git a/src/test/java/com/hellomeritz/global/ControllerTestSupport.java b/src/test/java/com/hello/global/ControllerTestSupport.java similarity index 72% rename from src/test/java/com/hellomeritz/global/ControllerTestSupport.java rename to src/test/java/com/hello/global/ControllerTestSupport.java index a300bb6..c74313f 100644 --- a/src/test/java/com/hellomeritz/global/ControllerTestSupport.java +++ b/src/test/java/com/hello/global/ControllerTestSupport.java @@ -1,11 +1,10 @@ -package com.hellomeritz.global; +package com.hello.global; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hellomeritz.chat.controller.ChatController; -import com.hellomeritz.chat.controller.ChatRoomController; -import com.hellomeritz.chat.domain.ChatMessage; -import com.hellomeritz.chat.service.ChatMessageService; -import com.hellomeritz.chat.service.ChatService; +import com.hello.chat.controller.ChatController; +import com.hello.chat.controller.ChatRoomController; +import com.hello.chat.service.ChatMessageService; +import com.hello.chat.service.ChatService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/test/java/com/hellomeritz/global/FinancialConsultantFixture.java b/src/test/java/com/hello/global/FinancialConsultantFixture.java similarity index 80% rename from src/test/java/com/hellomeritz/global/FinancialConsultantFixture.java rename to src/test/java/com/hello/global/FinancialConsultantFixture.java index 9878719..0970a4f 100644 --- a/src/test/java/com/hellomeritz/global/FinancialConsultantFixture.java +++ b/src/test/java/com/hello/global/FinancialConsultantFixture.java @@ -1,12 +1,12 @@ -package com.hellomeritz.global; +package com.hello.global; -import com.hellomeritz.member.controller.dto.request.ConsultantLoginRequest; -import com.hellomeritz.member.controller.dto.request.ConsultantSignUpRequest; -import com.hellomeritz.member.domain.FinancialConsultant; -import com.hellomeritz.member.service.dto.result.ConsultantLoginResult; -import com.hellomeritz.member.service.dto.result.ConsultantMatchResult; -import com.hellomeritz.member.service.dto.result.ConsultantSignUpResult; -import com.hellomeritz.member.service.dto.result.FcInfoResult; +import com.hello.member.controller.dto.request.ConsultantLoginRequest; +import com.hello.member.controller.dto.request.ConsultantSignUpRequest; +import com.hello.member.domain.FinancialConsultant; +import com.hello.member.service.dto.result.ConsultantLoginResult; +import com.hello.member.service.dto.result.ConsultantMatchResult; +import com.hello.member.service.dto.result.ConsultantSignUpResult; +import com.hello.member.service.dto.result.FcInfoResult; public class FinancialConsultantFixture { diff --git a/src/test/java/com/hellomeritz/global/ForeignFixture.java b/src/test/java/com/hello/global/ForeignFixture.java similarity index 78% rename from src/test/java/com/hellomeritz/global/ForeignFixture.java rename to src/test/java/com/hello/global/ForeignFixture.java index 0c162eb..c06b112 100644 --- a/src/test/java/com/hellomeritz/global/ForeignFixture.java +++ b/src/test/java/com/hello/global/ForeignFixture.java @@ -1,12 +1,12 @@ -package com.hellomeritz.global; +package com.hello.global; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.VisaType; -import com.hellomeritz.member.controller.dto.request.ForeignInfoSaveRequest; -import com.hellomeritz.member.domain.BirthDate; -import com.hellomeritz.member.domain.Foreigner; -import com.hellomeritz.member.service.dto.param.ForeignerInfoGetParam; -import com.hellomeritz.member.service.dto.result.*; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.VisaType; +import com.hello.member.controller.dto.request.ForeignInfoSaveRequest; +import com.hello.member.domain.BirthDate; +import com.hello.member.domain.Foreigner; +import com.hello.member.service.dto.param.ForeignerInfoGetParam; +import com.hello.member.service.dto.result.*; public class ForeignFixture { diff --git a/src/test/java/com/hellomeritz/global/RestDocsSupport.java b/src/test/java/com/hello/global/RestDocsSupport.java similarity index 97% rename from src/test/java/com/hellomeritz/global/RestDocsSupport.java rename to src/test/java/com/hello/global/RestDocsSupport.java index b26bb66..bd20b5d 100644 --- a/src/test/java/com/hellomeritz/global/RestDocsSupport.java +++ b/src/test/java/com/hello/global/RestDocsSupport.java @@ -1,4 +1,4 @@ -package com.hellomeritz.global; +package com.hello.global; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/hellomeritz/member/controller/ConsultantControllerDocsTest.java b/src/test/java/com/hello/member/controller/ConsultantControllerDocsTest.java similarity index 90% rename from src/test/java/com/hellomeritz/member/controller/ConsultantControllerDocsTest.java rename to src/test/java/com/hello/member/controller/ConsultantControllerDocsTest.java index ede157e..568f153 100644 --- a/src/test/java/com/hellomeritz/member/controller/ConsultantControllerDocsTest.java +++ b/src/test/java/com/hello/member/controller/ConsultantControllerDocsTest.java @@ -1,13 +1,11 @@ -package com.hellomeritz.member.controller; +package com.hello.member.controller; -import com.hellomeritz.global.FinancialConsultantFixture; -import com.hellomeritz.global.ForeignFixture; -import com.hellomeritz.global.RestDocsSupport; -import com.hellomeritz.member.service.MemberService; -import com.hellomeritz.member.service.dto.result.ConsultantLoginResult; -import com.hellomeritz.member.service.dto.result.ConsultantMatchResult; -import com.hellomeritz.member.service.dto.result.ConsultantSignUpResult; -import com.hellomeritz.member.service.dto.result.UserCheckIsFcResult; +import com.hello.global.FinancialConsultantFixture; +import com.hello.global.RestDocsSupport; +import com.hello.member.service.MemberService; +import com.hello.member.service.dto.result.ConsultantLoginResult; +import com.hello.member.service.dto.result.ConsultantMatchResult; +import com.hello.member.service.dto.result.ConsultantSignUpResult; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; diff --git a/src/test/java/com/hellomeritz/member/controller/MemberControllerDocsTest.java b/src/test/java/com/hello/member/controller/MemberControllerDocsTest.java similarity index 95% rename from src/test/java/com/hellomeritz/member/controller/MemberControllerDocsTest.java rename to src/test/java/com/hello/member/controller/MemberControllerDocsTest.java index ac56adc..671f813 100644 --- a/src/test/java/com/hellomeritz/member/controller/MemberControllerDocsTest.java +++ b/src/test/java/com/hello/member/controller/MemberControllerDocsTest.java @@ -1,12 +1,12 @@ -package com.hellomeritz.member.controller; - -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.VisaType; -import com.hellomeritz.global.FinancialConsultantFixture; -import com.hellomeritz.global.ForeignFixture; -import com.hellomeritz.global.RestDocsSupport; -import com.hellomeritz.member.service.MemberService; -import com.hellomeritz.member.service.dto.result.*; +package com.hello.member.controller; + +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.VisaType; +import com.hello.global.FinancialConsultantFixture; +import com.hello.global.ForeignFixture; +import com.hello.global.RestDocsSupport; +import com.hello.member.service.MemberService; +import com.hello.member.service.dto.result.*; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; diff --git a/src/test/java/com/hellomeritz/member/controller/MemberControllerTest.java b/src/test/java/com/hello/member/controller/MemberControllerTest.java similarity index 97% rename from src/test/java/com/hellomeritz/member/controller/MemberControllerTest.java rename to src/test/java/com/hello/member/controller/MemberControllerTest.java index edfa225..c59685f 100644 --- a/src/test/java/com/hellomeritz/member/controller/MemberControllerTest.java +++ b/src/test/java/com/hello/member/controller/MemberControllerTest.java @@ -1,7 +1,7 @@ -package com.hellomeritz.member.controller; +package com.hello.member.controller; -import com.hellomeritz.global.ControllerTestSupport; -import com.hellomeritz.member.controller.dto.request.ForeignInfoSaveRequest; +import com.hello.global.ControllerTestSupport; +import com.hello.member.controller.dto.request.ForeignInfoSaveRequest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hellomeritz/member/domain/BirthDateTest.java b/src/test/java/com/hello/member/domain/BirthDateTest.java similarity index 96% rename from src/test/java/com/hellomeritz/member/domain/BirthDateTest.java rename to src/test/java/com/hello/member/domain/BirthDateTest.java index be15ac0..fd0e516 100644 --- a/src/test/java/com/hellomeritz/member/domain/BirthDateTest.java +++ b/src/test/java/com/hello/member/domain/BirthDateTest.java @@ -1,4 +1,4 @@ -package com.hellomeritz.member.domain; +package com.hello.member.domain; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hellomeritz/member/domain/ForeignerTest.java b/src/test/java/com/hello/member/domain/ForeignerTest.java similarity index 95% rename from src/test/java/com/hellomeritz/member/domain/ForeignerTest.java rename to src/test/java/com/hello/member/domain/ForeignerTest.java index 8aaab4c..d37355a 100644 --- a/src/test/java/com/hellomeritz/member/domain/ForeignerTest.java +++ b/src/test/java/com/hello/member/domain/ForeignerTest.java @@ -1,7 +1,7 @@ -package com.hellomeritz.member.domain; +package com.hello.member.domain; -import com.hellomeritz.chat.global.SourceLanguage; -import com.hellomeritz.chat.global.VisaType; +import com.hello.chat.global.SourceLanguage; +import com.hello.chat.global.VisaType; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hellomeritz/member/service/MemberServiceTest.java b/src/test/java/com/hello/member/service/MemberServiceTest.java similarity index 82% rename from src/test/java/com/hellomeritz/member/service/MemberServiceTest.java rename to src/test/java/com/hello/member/service/MemberServiceTest.java index 712267b..ff30eee 100644 --- a/src/test/java/com/hellomeritz/member/service/MemberServiceTest.java +++ b/src/test/java/com/hello/member/service/MemberServiceTest.java @@ -1,18 +1,18 @@ -package com.hellomeritz.member.service; - -import com.hellomeritz.global.FinancialConsultantFixture; -import com.hellomeritz.global.ForeignFixture; -import com.hellomeritz.member.domain.ConsultationState; -import com.hellomeritz.member.domain.FinancialConsultant; -import com.hellomeritz.member.domain.Foreigner; -import com.hellomeritz.member.repository.fc.FinancialConsultantRepository; -import com.hellomeritz.member.repository.foreign.ForeignRepository; -import com.hellomeritz.member.service.dto.param.FinancialConsultantChangeStateParam; -import com.hellomeritz.member.service.dto.param.FinancialConsultantInfoGetParam; -import com.hellomeritz.member.service.dto.param.ForeignerInfoGetParam; -import com.hellomeritz.member.service.dto.result.ConsultantMatchResult; -import com.hellomeritz.member.service.dto.result.FcInfoResult; -import com.hellomeritz.member.service.dto.result.ForeignerInfoResult; +package com.hello.member.service; + +import com.hello.global.FinancialConsultantFixture; +import com.hello.global.ForeignFixture; +import com.hello.member.domain.ConsultationState; +import com.hello.member.domain.FinancialConsultant; +import com.hello.member.domain.Foreigner; +import com.hello.member.repository.fc.FinancialConsultantRepository; +import com.hello.member.repository.foreign.ForeignRepository; +import com.hello.member.service.dto.param.FinancialConsultantChangeStateParam; +import com.hello.member.service.dto.param.FinancialConsultantInfoGetParam; +import com.hello.member.service.dto.param.ForeignerInfoGetParam; +import com.hello.member.service.dto.result.ConsultantMatchResult; +import com.hello.member.service.dto.result.FcInfoResult; +import com.hello.member.service.dto.result.ForeignerInfoResult; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired;