Skip to content

Commit

Permalink
Merge pull request #11 from byeolhaha/feat/1
Browse files Browse the repository at this point in the history 
style : 패키지 명 변경
  • Loading branch information
@byeolhaha
byeolhaha authored May 13, 2024
2 parents 46bb02c + c7567e5 commit 30656a3
Show file tree
Hide file tree
Showing 211 changed files with 614 additions and 652 deletions.
4 changes: 2 additions & 2 deletions ...hellomeritz/BanWordApplicationRunner.java → ...a/com/hello/BanWordApplicationRunner.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...llomeritz/HelloConsultantApplication.java → ...com/hello/HelloConsultantApplication.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz;
package com.hello;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
4 changes: 2 additions & 2 deletions ...tz/chat/controller/BanWordController.java → ...lo/chat/controller/BanWordController.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 7 additions & 7 deletions ...eritz/chat/controller/ChatController.java → ...hello/chat/controller/ChatController.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
16 changes: 8 additions & 8 deletions ...z/chat/controller/ChatRoomController.java → ...o/chat/controller/ChatRoomController.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...r/dto/request/ChatAudioUploadRequest.java → ...r/dto/request/ChatAudioUploadRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...er/dto/request/ChatMessageGetRequest.java → ...er/dto/request/ChatMessageGetRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...er/dto/request/ChatMessageSttRequest.java → ...er/dto/request/ChatMessageSttRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions .../request/ChatMessageTranslateRequest.java → .../request/ChatMessageTranslateRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...er/dto/request/ChatRoomCreateRequest.java → ...er/dto/request/ChatRoomCreateRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...ler/dto/request/ChatRoomEnterRequest.java → ...ler/dto/request/ChatRoomEnterRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 2 additions & 2 deletions ...uest/ChatRoomInfoOfConsultantRequest.java → ...uest/ChatRoomInfoOfConsultantRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...quest/ChatRoomInfoOfForeignerRequest.java → ...quest/ChatRoomInfoOfForeignerRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...ler/dto/request/ChatRoomLeaveRequest.java → ...ler/dto/request/ChatRoomLeaveRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...request/ChatRoomPasswordCheckRequest.java → ...request/ChatRoomPasswordCheckRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
6 changes: 3 additions & 3 deletions ...equest/ChatRoomPasswordCreateRequest.java → ...equest/ChatRoomPasswordCreateRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...dto/response/ChatAudioUploadResponse.java → ...dto/response/ChatAudioUploadResponse.java
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...dto/response/ChatMessageGetResponses.java → ...dto/response/ChatMessageGetResponses.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions .../dto/response/ChatMessageSttResponse.java → .../dto/response/ChatMessageSttResponse.java
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...sponse/ChatMessageTranslateResponses.java → ...sponse/ChatMessageTranslateResponses.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../dto/response/ChatRoomCreateResponse.java → .../dto/response/ChatRoomCreateResponse.java
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...se/ChatRoomInfoOfConsultantResponses.java → ...se/ChatRoomInfoOfConsultantResponses.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...nse/ChatRoomInfoOfForeignerResponses.java → ...nse/ChatRoomInfoOfForeignerResponses.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...sponse/ChatRoomPasswordCheckResponse.java → ...sponse/ChatRoomPasswordCheckResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.controller.dto.response;
package com.hello.chat.controller.dto.response;

public record ChatRoomPasswordCheckResponse(
Boolean isMyUser
Expand Down
4 changes: 2 additions & 2 deletions ...to/response/ChatRoomUserInfoResponse.java → ...to/response/ChatRoomUserInfoResponse.java
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions .../com/hellomeritz/chat/domain/BanWord.java → ...n/java/com/hello/chat/domain/BanWord.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 1 addition & 2 deletions .../hellomeritz/chat/domain/ChatMessage.java → ...va/com/hello/chat/domain/ChatMessage.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lomeritz/chat/domain/ChatMessageType.java → ...om/hello/chat/domain/ChatMessageType.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.domain;
package com.hello.chat.domain;

public enum ChatMessageType {
AUDIO,
Expand Down
2 changes: 1 addition & 1 deletion ...com/hellomeritz/chat/domain/ChatRoom.java → .../java/com/hello/chat/domain/ChatRoom.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.domain;
package com.hello.chat.domain;

import jakarta.persistence.*;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion ...tz/chat/global/BlockingNoticeMessage.java → ...lo/chat/global/BlockingNoticeMessage.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.global;
package com.hello.chat.global;

import lombok.Getter;

Expand Down
2 changes: 1 addition & 1 deletion ...llomeritz/chat/global/SourceLanguage.java → ...com/hello/chat/global/SourceLanguage.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.global;
package com.hello.chat.global;

import lombok.Getter;

Expand Down
2 changes: 1 addition & 1 deletion ...llomeritz/chat/global/TargetLanguage.java → ...com/hello/chat/global/TargetLanguage.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.global;
package com.hello.chat.global;

import lombok.Getter;

Expand Down
2 changes: 1 addition & 1 deletion ...com/hellomeritz/chat/global/VisaType.java → .../java/com/hello/chat/global/VisaType.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.global;
package com.hello.chat.global;

import java.util.Arrays;

Expand Down
2 changes: 1 addition & 1 deletion ...eritz/chat/global/config/MongoConfig.java → ...hello/chat/global/config/MongoConfig.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ritz/chat/global/config/SocketConfig.java → ...ello/chat/global/config/SocketConfig.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...chat/global/handler/ChatErrorHandler.java → ...chat/global/handler/ChatErrorHandler.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/hello/chat/global/stt/SttManager.java
View file
Original file line number Diff line number Diff line change
@@ -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);
}
9 changes: 3 additions & 6 deletions ...tz/chat/global/stt/SttManagerHandler.java → ...lo/chat/global/stt/SttManagerHandler.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lomeritz/chat/global/stt/SttProvider.java → ...om/hello/chat/global/stt/SttProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hellomeritz.chat.global.stt;
package com.hello.chat.global.stt;

public enum SttProvider {
GOOGLE,
Expand Down
4 changes: 2 additions & 2 deletions ...eritz/chat/global/stt/dto/SttRequest.java → ...hello/chat/global/stt/dto/SttRequest.java
View file
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
8 changes: 4 additions & 4 deletions ...ritz/chat/global/stt/dto/SttResponse.java → ...ello/chat/global/stt/dto/SttResponse.java
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit 30656a3

Please sign in to comment.