[fix] 전체 패키지 구조 변경

dockerfile

@@ -0,0 +1,6 @@
+FROM openjdk:11-jdk
+VOLUME /tmp
+ARG JAR_FILE=build/libs/Garam_e_spring-0.0.1-SNAPSHOT.jar
+COPY ${JAR_FILE} garam-server.jar
+
+ENTRYPOINT ["java","-jar","/garam-server.jar"]

src/main/java/com/garam/garam_e_spring/controller/ErrorController.java → src/main/java/com/garam/garam_e_spring/common/controller/ErrorController.java

@@ -1,6 +1,6 @@
-package com.garam.garam_e_spring.controller;
+package com.garam.garam_e_spring.common.controller;
 
-import com.garam.garam_e_spring.response.BaseResponseDto;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/garam/garam_e_spring/controller/TestController.java → src/main/java/com/garam/garam_e_spring/common/controller/TestController.java

@@ -1,8 +1,8 @@
-package com.garam.garam_e_spring.controller;
+package com.garam.garam_e_spring.common.controller;
 
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.service.EmailService;
-import com.garam.garam_e_spring.dto.UserResponseDto;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.domain.user.service.EmailService;
+import com.garam.garam_e_spring.domain.user.dto.res.UserResponseDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/garam/garam_e_spring/websocket/SocketMessage.java → src/main/java/com/garam/garam_e_spring/common/websocket/SocketMessage.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.websocket;
+package com.garam.garam_e_spring.common.websocket;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/garam/garam_e_spring/websocket/WebSocketConfig.java → src/main/java/com/garam/garam_e_spring/common/websocket/WebSocketConfig.java

@@ -1,9 +1,7 @@
-package com.garam.garam_e_spring.websocket;
+package com.garam.garam_e_spring.common.websocket;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.web.socket.config.annotation.*;
 
 @Configuration

src/main/java/com/garam/garam_e_spring/websocket/WebSocketHandler.java → src/main/java/com/garam/garam_e_spring/common/websocket/WebSocketHandler.java

@@ -1,7 +1,7 @@
-package com.garam.garam_e_spring.websocket;
+package com.garam.garam_e_spring.common.websocket;
 
-import com.garam.garam_e_spring.entity.exq.Exq;
-import com.garam.garam_e_spring.entity.exq.ExqRepository;
+import com.garam.garam_e_spring.domain.exq.entity.Exq;
+import com.garam.garam_e_spring.domain.exq.repository.ExqRepository;
 import com.google.gson.Gson;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j

src/main/java/com/garam/garam_e_spring/controller/ChatController.java → src/main/java/com/garam/garam_e_spring/domain/chat/controller/ChatController.java

@@ -1,12 +1,11 @@
-package com.garam.garam_e_spring.controller;
+package com.garam.garam_e_spring.domain.chat.controller;
 
 
-import com.garam.garam_e_spring.dto.ChatRequestDto;
-import com.garam.garam_e_spring.dto.ChatResponseDto;
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.response.ErrorMessage;
+import com.garam.garam_e_spring.domain.chat.dto.req.ChatRequestDto;
+import com.garam.garam_e_spring.domain.chat.dto.res.ChatResponseDto;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.global.response.ErrorMessage;
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

src/main/java/com/garam/garam_e_spring/dto/ChatRequestDto.java → src/main/java/com/garam/garam_e_spring/domain/chat/dto/req/ChatRequestDto.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.dto;
+package com.garam.garam_e_spring.domain.chat.dto.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/garam/garam_e_spring/dto/ChatResponseDto.java → src/main/java/com/garam/garam_e_spring/domain/chat/dto/res/ChatResponseDto.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.dto;
+package com.garam.garam_e_spring.domain.chat.dto.res;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/garam/garam_e_spring/dto/ExqRequestDto.java → src/main/java/com/garam/garam_e_spring/domain/exq/dto/req/ExqRequestDto.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.dto;
+package com.garam.garam_e_spring.domain.exq.dto.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/garam/garam_e_spring/dto/ExqResponseDto.java → src/main/java/com/garam/garam_e_spring/domain/exq/dto/res/ExqResponseDto.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.dto;
+package com.garam.garam_e_spring.domain.exq.dto.res;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/garam/garam_e_spring/entity/exq/Exq.java → src/main/java/com/garam/garam_e_spring/domain/exq/entity/Exq.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.entity.exq;
+package com.garam.garam_e_spring.domain.exq.entity;
 
 import lombok.*;
 

src/main/java/com/garam/garam_e_spring/entity/exq/ExqRepository.java → src/main/java/com/garam/garam_e_spring/domain/exq/repository/ExqRepository.java

@@ -1,6 +1,7 @@
-package com.garam.garam_e_spring.entity.exq;
+package com.garam.garam_e_spring.domain.exq.repository;
 
 
+import com.garam.garam_e_spring.domain.exq.entity.Exq;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/garam/garam_e_spring/controller/AdminController.java → src/main/java/com/garam/garam_e_spring/domain/user/controller/AdminController.java

@@ -1,8 +1,8 @@
-package com.garam.garam_e_spring.controller;
+package com.garam.garam_e_spring.domain.user.controller;
 
-import com.garam.garam_e_spring.dto.ExqResponseDto;
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.service.AdminService;
+import com.garam.garam_e_spring.domain.exq.dto.res.ExqResponseDto;
+import com.garam.garam_e_spring.domain.user.service.AdminService;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/garam/garam_e_spring/controller/AuthController.java → src/main/java/com/garam/garam_e_spring/domain/user/controller/AuthController.java

@@ -1,10 +1,10 @@
-package com.garam.garam_e_spring.controller;
+package com.garam.garam_e_spring.domain.user.controller;
 
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.service.AuthService;
-import com.garam.garam_e_spring.service.EmailService;
-import com.garam.garam_e_spring.dto.UserRequestDto;
-import com.garam.garam_e_spring.dto.UserResponseDto;
+import com.garam.garam_e_spring.domain.user.service.AuthService;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.domain.user.service.EmailService;
+import com.garam.garam_e_spring.domain.user.dto.req.UserRequestDto;
+import com.garam.garam_e_spring.domain.user.dto.res.UserResponseDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/garam/garam_e_spring/controller/UserController.java → src/main/java/com/garam/garam_e_spring/domain/user/controller/UserController.java

@@ -1,12 +1,12 @@
-package com.garam.garam_e_spring.controller;
+package com.garam.garam_e_spring.domain.user.controller;
 
-import com.garam.garam_e_spring.dto.UserRequestDto;
-import com.garam.garam_e_spring.dto.UserResponseDto;
-import com.garam.garam_e_spring.jwt.JwtTokenProvider;
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.response.ErrorMessage;
-import com.garam.garam_e_spring.service.EmailService;
-import com.garam.garam_e_spring.service.UserService;
+import com.garam.garam_e_spring.domain.user.dto.req.UserRequestDto;
+import com.garam.garam_e_spring.domain.user.dto.res.UserResponseDto;
+import com.garam.garam_e_spring.global.jwt.JwtTokenProvider;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.global.response.ErrorMessage;
+import com.garam.garam_e_spring.domain.user.service.EmailService;
+import com.garam.garam_e_spring.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/garam/garam_e_spring/dto/UserRequestDto.java → src/main/java/com/garam/garam_e_spring/domain/user/dto/req/UserRequestDto.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.dto;
+package com.garam.garam_e_spring.domain.user.dto.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/garam/garam_e_spring/dto/UserResponseDto.java → src/main/java/com/garam/garam_e_spring/domain/user/dto/res/UserResponseDto.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.dto;
+package com.garam.garam_e_spring.domain.user.dto.res;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/garam/garam_e_spring/entity/user/User.java → src/main/java/com/garam/garam_e_spring/domain/user/entity/User.java

@@ -1,6 +1,6 @@
-package com.garam.garam_e_spring.entity.user;
+package com.garam.garam_e_spring.domain.user.entity;
 
-import com.garam.garam_e_spring.entity.BaseEntity;
+import com.garam.garam_e_spring.global.BaseEntity;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.springframework.security.core.GrantedAuthority;

src/main/java/com/garam/garam_e_spring/entity/user/UserRepository.java → src/main/java/com/garam/garam_e_spring/domain/user/repository/UserRepository.java

@@ -1,5 +1,6 @@
-package com.garam.garam_e_spring.entity.user;
+package com.garam.garam_e_spring.domain.user.repository;
 
+import com.garam.garam_e_spring.domain.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/garam/garam_e_spring/service/AdminService.java → src/main/java/com/garam/garam_e_spring/domain/user/service/AdminService.java

@@ -1,9 +1,9 @@
-package com.garam.garam_e_spring.service;
+package com.garam.garam_e_spring.domain.user.service;
 
-import com.garam.garam_e_spring.entity.exq.Exq;
-import com.garam.garam_e_spring.entity.exq.ExqRepository;
-import com.garam.garam_e_spring.dto.ExqResponseDto;
-import com.garam.garam_e_spring.response.BaseResponseDto;
+import com.garam.garam_e_spring.domain.exq.entity.Exq;
+import com.garam.garam_e_spring.domain.exq.repository.ExqRepository;
+import com.garam.garam_e_spring.domain.exq.dto.res.ExqResponseDto;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/garam/garam_e_spring/service/AuthService.java → src/main/java/com/garam/garam_e_spring/domain/user/service/AuthService.java

@@ -1,12 +1,12 @@
-package com.garam.garam_e_spring.service;
-
-import com.garam.garam_e_spring.jwt.JwtTokenProvider;
-import com.garam.garam_e_spring.jwt.TokenInfo;
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.response.ErrorMessage;
-import com.garam.garam_e_spring.entity.user.UserRepository;
-import com.garam.garam_e_spring.dto.UserRequestDto;
-import com.garam.garam_e_spring.dto.UserResponseDto;
+package com.garam.garam_e_spring.domain.user.service;
+
+import com.garam.garam_e_spring.global.jwt.JwtTokenProvider;
+import com.garam.garam_e_spring.global.jwt.TokenInfo;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.global.response.ErrorMessage;
+import com.garam.garam_e_spring.domain.user.repository.UserRepository;
+import com.garam.garam_e_spring.domain.user.dto.req.UserRequestDto;
+import com.garam.garam_e_spring.domain.user.dto.res.UserResponseDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/garam/garam_e_spring/service/EmailService.java → src/main/java/com/garam/garam_e_spring/domain/user/service/EmailService.java

@@ -1,7 +1,7 @@
-package com.garam.garam_e_spring.service;
+package com.garam.garam_e_spring.domain.user.service;
 
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.dto.UserResponseDto;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.domain.user.dto.res.UserResponseDto;
 
 public interface EmailService {
     BaseResponseDto<UserResponseDto.Inquiry> sendInquiryMessage(String title, String content, String username) throws Exception;

src/main/java/com/garam/garam_e_spring/service/EmailServiceImpl.java → src/main/java/com/garam/garam_e_spring/domain/user/service/EmailServiceImpl.java

@@ -1,7 +1,7 @@
-package com.garam.garam_e_spring.service;
+package com.garam.garam_e_spring.domain.user.service;
 
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.dto.UserResponseDto;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.domain.user.dto.res.UserResponseDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/garam/garam_e_spring/service/UserService.java → src/main/java/com/garam/garam_e_spring/domain/user/service/UserService.java

@@ -1,15 +1,15 @@
-package com.garam.garam_e_spring.service;
-
-
-import com.garam.garam_e_spring.entity.user.User;
-import com.garam.garam_e_spring.entity.user.UserRepository;
-import com.garam.garam_e_spring.dto.UserRequestDto;
-import com.garam.garam_e_spring.dto.UserResponseDto;
-import com.garam.garam_e_spring.enums.Authority;
-import com.garam.garam_e_spring.enums.Language;
-import com.garam.garam_e_spring.jwt.JwtTokenProvider;
-import com.garam.garam_e_spring.response.BaseResponseDto;
-import com.garam.garam_e_spring.response.ErrorMessage;
+package com.garam.garam_e_spring.domain.user.service;
+
+
+import com.garam.garam_e_spring.domain.user.entity.User;
+import com.garam.garam_e_spring.domain.user.repository.UserRepository;
+import com.garam.garam_e_spring.domain.user.dto.req.UserRequestDto;
+import com.garam.garam_e_spring.domain.user.dto.res.UserResponseDto;
+import com.garam.garam_e_spring.global.enums.Authority;
+import com.garam.garam_e_spring.global.enums.Language;
+import com.garam.garam_e_spring.global.jwt.JwtTokenProvider;
+import com.garam.garam_e_spring.global.response.BaseResponseDto;
+import com.garam.garam_e_spring.global.response.ErrorMessage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/garam/garam_e_spring/entity/BaseEntity.java → src/main/java/com/garam/garam_e_spring/global/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.entity;
+package com.garam.garam_e_spring.global;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/java/com/garam/garam_e_spring/config/EmailConfig.java → src/main/java/com/garam/garam_e_spring/global/config/EmailConfig.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.config;
+package com.garam.garam_e_spring.global.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

src/main/java/com/garam/garam_e_spring/config/RedisRepositoryConfig.java → src/main/java/com/garam/garam_e_spring/global/config/RedisRepositoryConfig.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.config;
+package com.garam.garam_e_spring.global.config;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;

src/main/java/com/garam/garam_e_spring/config/SwaggerConfig.java → src/main/java/com/garam/garam_e_spring/global/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.config;
+package com.garam.garam_e_spring.global.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/garam/garam_e_spring/config/WebConfig.java → src/main/java/com/garam/garam_e_spring/global/config/WebConfig.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.config;
+package com.garam.garam_e_spring.global.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

src/main/java/com/garam/garam_e_spring/config/WebSecurityConfig.java → src/main/java/com/garam/garam_e_spring/global/config/WebSecurityConfig.java

@@ -1,7 +1,7 @@
-package com.garam.garam_e_spring.config;
+package com.garam.garam_e_spring.global.config;
 
-import com.garam.garam_e_spring.jwt.JwtAuthenticationFilter;
-import com.garam.garam_e_spring.jwt.JwtTokenProvider;
+import com.garam.garam_e_spring.global.jwt.JwtAuthenticationFilter;
+import com.garam.garam_e_spring.global.jwt.JwtTokenProvider;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/garam/garam_e_spring/enums/Authority.java → src/main/java/com/garam/garam_e_spring/global/enums/Authority.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.enums;
+package com.garam.garam_e_spring.global.enums;
 
 public enum Authority {
     ROLE_USER, ROLE_ADMIN

src/main/java/com/garam/garam_e_spring/global/enums/Language.java

@@ -0,0 +1,5 @@
+package com.garam.garam_e_spring.global.enums;
+
+public enum Language {
+    KOR, ENG, CHN
+}

src/main/java/com/garam/garam_e_spring/jwt/CustomUserDetailsService.java → src/main/java/com/garam/garam_e_spring/global/jwt/CustomUserDetailsService.java

@@ -1,7 +1,7 @@
-package com.garam.garam_e_spring.jwt;
+package com.garam.garam_e_spring.global.jwt;
 
-import com.garam.garam_e_spring.entity.user.User;
-import com.garam.garam_e_spring.entity.user.UserRepository;
+import com.garam.garam_e_spring.domain.user.entity.User;
+import com.garam.garam_e_spring.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/com/garam/garam_e_spring/jwt/JwtAuthenticationFilter.java → src/main/java/com/garam/garam_e_spring/global/jwt/JwtAuthenticationFilter.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.jwt;
+package com.garam.garam_e_spring.global.jwt;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/garam/garam_e_spring/jwt/JwtTokenProvider.java → src/main/java/com/garam/garam_e_spring/global/jwt/JwtTokenProvider.java

@@ -1,6 +1,5 @@
-package com.garam.garam_e_spring.jwt;
+package com.garam.garam_e_spring.global.jwt;
 
-import com.sun.security.auth.UserPrincipal;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;

src/main/java/com/garam/garam_e_spring/jwt/TokenInfo.java → src/main/java/com/garam/garam_e_spring/global/jwt/TokenInfo.java

@@ -1,4 +1,4 @@
-package com.garam.garam_e_spring.jwt;
+package com.garam.garam_e_spring.global.jwt;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/garam/garam_e_spring/response/BaseResponseDto.java → src/main/java/com/garam/garam_e_spring/global/response/BaseResponseDto.java

@@ -1,12 +1,12 @@
-package com.garam.garam_e_spring.response;
+package com.garam.garam_e_spring.global.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
 
-import static com.garam.garam_e_spring.response.SuccessMessage.SUCCESS;
+import static com.garam.garam_e_spring.global.response.SuccessMessage.SUCCESS;
 
 
 @Getter