diff --git a/backend/src/main/java/mouda/backend/aop/logging/RequestLoggingAspect.java b/backend/src/main/java/mouda/backend/aop/logging/RequestLoggingAspect.java index 934e8fd48..88513de1f 100644 --- a/backend/src/main/java/mouda/backend/aop/logging/RequestLoggingAspect.java +++ b/backend/src/main/java/mouda/backend/aop/logging/RequestLoggingAspect.java @@ -17,8 +17,8 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.domain.Member; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.member.Member; @Aspect @Component diff --git a/backend/src/main/java/mouda/backend/auth/Infrastructure/KakaoOauthClient.java b/backend/src/main/java/mouda/backend/api/auth/Infrastructure/KakaoOauthClient.java similarity index 90% rename from backend/src/main/java/mouda/backend/auth/Infrastructure/KakaoOauthClient.java rename to backend/src/main/java/mouda/backend/api/auth/Infrastructure/KakaoOauthClient.java index 4bcc1ce58..9c10b7fdd 100644 --- a/backend/src/main/java/mouda/backend/auth/Infrastructure/KakaoOauthClient.java +++ b/backend/src/main/java/mouda/backend/api/auth/Infrastructure/KakaoOauthClient.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.Infrastructure; +package mouda.backend.api.auth.Infrastructure; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; @@ -11,9 +11,9 @@ import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestClient; -import mouda.backend.auth.presentation.response.OauthResponse; -import mouda.backend.auth.exception.AuthErrorMessage; -import mouda.backend.auth.exception.AuthException; +import mouda.backend.api.auth.exception.AuthErrorMessage; +import mouda.backend.api.auth.exception.AuthException; +import mouda.backend.core.dto.auth.response.OauthResponse; @Component public class KakaoOauthClient { diff --git a/backend/src/main/java/mouda/backend/auth/business/AuthService.java b/backend/src/main/java/mouda/backend/api/auth/business/AuthService.java similarity index 72% rename from backend/src/main/java/mouda/backend/auth/business/AuthService.java rename to backend/src/main/java/mouda/backend/api/auth/business/AuthService.java index 566c057a4..ea3592e08 100644 --- a/backend/src/main/java/mouda/backend/auth/business/AuthService.java +++ b/backend/src/main/java/mouda/backend/api/auth/business/AuthService.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.business; +package mouda.backend.api.auth.business; import java.util.Map; @@ -6,18 +6,18 @@ import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; -import mouda.backend.auth.Infrastructure.KakaoOauthClient; -import mouda.backend.auth.exception.AuthErrorMessage; -import mouda.backend.auth.exception.AuthException; -import mouda.backend.auth.presentation.request.OauthRequest; -import mouda.backend.auth.presentation.response.LoginResponse; -import mouda.backend.auth.util.JwtProvider; -import mouda.backend.auth.util.TokenDecoder; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; -import mouda.backend.member.infrastructure.MemberRepository; +import mouda.backend.api.auth.Infrastructure.KakaoOauthClient; +import mouda.backend.api.auth.exception.AuthErrorMessage; +import mouda.backend.api.auth.exception.AuthException; +import mouda.backend.core.dto.auth.request.OauthRequest; +import mouda.backend.core.dto.auth.response.LoginResponse; +import mouda.backend.api.auth.util.JwtProvider; +import mouda.backend.api.auth.util.TokenDecoder; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.member.Member; +import mouda.backend.api.member.infrastructure.MemberRepository; @Service @RequiredArgsConstructor diff --git a/backend/src/main/java/mouda/backend/auth/exception/AuthErrorMessage.java b/backend/src/main/java/mouda/backend/api/auth/exception/AuthErrorMessage.java similarity index 95% rename from backend/src/main/java/mouda/backend/auth/exception/AuthErrorMessage.java rename to backend/src/main/java/mouda/backend/api/auth/exception/AuthErrorMessage.java index edce66c63..40054b673 100644 --- a/backend/src/main/java/mouda/backend/auth/exception/AuthErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/auth/exception/AuthErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.exception; +package mouda.backend.api.auth.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/api/auth/exception/AuthException.java b/backend/src/main/java/mouda/backend/api/auth/exception/AuthException.java new file mode 100644 index 000000000..f61e8d469 --- /dev/null +++ b/backend/src/main/java/mouda/backend/api/auth/exception/AuthException.java @@ -0,0 +1,12 @@ +package mouda.backend.api.auth.exception; + +import org.springframework.http.HttpStatus; + +import mouda.backend.api.common.exception.MoudaException; + +public class AuthException extends MoudaException { + + public AuthException(HttpStatus httpStatus, AuthErrorMessage authErrorMessage) { + super(httpStatus, authErrorMessage.getMessage()); + } +} diff --git a/backend/src/main/java/mouda/backend/auth/presentation/controller/AuthController.java b/backend/src/main/java/mouda/backend/api/auth/presentation/controller/AuthController.java similarity index 68% rename from backend/src/main/java/mouda/backend/auth/presentation/controller/AuthController.java rename to backend/src/main/java/mouda/backend/api/auth/presentation/controller/AuthController.java index b17155442..ef40c89ff 100644 --- a/backend/src/main/java/mouda/backend/auth/presentation/controller/AuthController.java +++ b/backend/src/main/java/mouda/backend/api/auth/presentation/controller/AuthController.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.presentation.controller; +package mouda.backend.api.auth.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -7,11 +7,11 @@ import org.springframework.web.bind.annotation.RestController; import lombok.RequiredArgsConstructor; -import mouda.backend.auth.business.AuthService; -import mouda.backend.auth.presentation.controller.swagger.AuthSwagger; -import mouda.backend.auth.presentation.request.OauthRequest; -import mouda.backend.auth.presentation.response.LoginResponse; -import mouda.backend.common.response.RestResponse; +import mouda.backend.api.auth.business.AuthService; +import mouda.backend.api.auth.presentation.controller.swagger.AuthSwagger; +import mouda.backend.core.dto.auth.request.OauthRequest; +import mouda.backend.core.dto.auth.response.LoginResponse; +import mouda.backend.api.common.response.RestResponse; @RestController @RequestMapping("/v1/auth") diff --git a/backend/src/main/java/mouda/backend/auth/presentation/controller/swagger/AuthSwagger.java b/backend/src/main/java/mouda/backend/api/auth/presentation/controller/swagger/AuthSwagger.java similarity index 73% rename from backend/src/main/java/mouda/backend/auth/presentation/controller/swagger/AuthSwagger.java rename to backend/src/main/java/mouda/backend/api/auth/presentation/controller/swagger/AuthSwagger.java index 447bacaa8..5582130cd 100644 --- a/backend/src/main/java/mouda/backend/auth/presentation/controller/swagger/AuthSwagger.java +++ b/backend/src/main/java/mouda/backend/api/auth/presentation/controller/swagger/AuthSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.presentation.controller.swagger; +package mouda.backend.api.auth.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; @@ -6,9 +6,9 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import mouda.backend.auth.presentation.request.OauthRequest; -import mouda.backend.auth.presentation.response.LoginResponse; -import mouda.backend.common.response.RestResponse; +import mouda.backend.core.dto.auth.request.OauthRequest; +import mouda.backend.core.dto.auth.response.LoginResponse; +import mouda.backend.api.common.response.RestResponse; public interface AuthSwagger { diff --git a/backend/src/main/java/mouda/backend/auth/util/JwtProvider.java b/backend/src/main/java/mouda/backend/api/auth/util/JwtProvider.java similarity index 90% rename from backend/src/main/java/mouda/backend/auth/util/JwtProvider.java rename to backend/src/main/java/mouda/backend/api/auth/util/JwtProvider.java index de2c8bde6..380bcdea1 100644 --- a/backend/src/main/java/mouda/backend/auth/util/JwtProvider.java +++ b/backend/src/main/java/mouda/backend/api/auth/util/JwtProvider.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.util; +package mouda.backend.api.auth.util; import java.util.Date; @@ -10,9 +10,9 @@ import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import mouda.backend.auth.exception.AuthErrorMessage; -import mouda.backend.auth.exception.AuthException; -import mouda.backend.member.domain.Member; +import mouda.backend.api.auth.exception.AuthErrorMessage; +import mouda.backend.api.auth.exception.AuthException; +import mouda.backend.core.domain.member.Member; @Component public class JwtProvider { diff --git a/backend/src/main/java/mouda/backend/auth/util/TokenDecoder.java b/backend/src/main/java/mouda/backend/api/auth/util/TokenDecoder.java similarity index 84% rename from backend/src/main/java/mouda/backend/auth/util/TokenDecoder.java rename to backend/src/main/java/mouda/backend/api/auth/util/TokenDecoder.java index 0668d736b..8b13b51eb 100644 --- a/backend/src/main/java/mouda/backend/auth/util/TokenDecoder.java +++ b/backend/src/main/java/mouda/backend/api/auth/util/TokenDecoder.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.util; +package mouda.backend.api.auth.util; import java.util.Base64; import java.util.Map; @@ -7,11 +7,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import mouda.backend.auth.exception.AuthErrorMessage; -import mouda.backend.auth.exception.AuthException; +import mouda.backend.api.auth.exception.AuthErrorMessage; +import mouda.backend.api.auth.exception.AuthException; public class TokenDecoder { - + public static Map parseKakaoToken(String kakaoIdToken) { try { String[] parts = kakaoIdToken.split("\\."); diff --git a/backend/src/main/java/mouda/backend/common/config/CorsConfig.java b/backend/src/main/java/mouda/backend/api/common/config/CorsConfig.java similarity index 93% rename from backend/src/main/java/mouda/backend/common/config/CorsConfig.java rename to backend/src/main/java/mouda/backend/api/common/config/CorsConfig.java index 2b1fc2ede..5bd601575 100644 --- a/backend/src/main/java/mouda/backend/common/config/CorsConfig.java +++ b/backend/src/main/java/mouda/backend/api/common/config/CorsConfig.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config; +package mouda.backend.api.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; diff --git a/backend/src/main/java/mouda/backend/common/config/FirebaseConfig.java b/backend/src/main/java/mouda/backend/api/common/config/FirebaseConfig.java similarity index 94% rename from backend/src/main/java/mouda/backend/common/config/FirebaseConfig.java rename to backend/src/main/java/mouda/backend/api/common/config/FirebaseConfig.java index 5c945ba0d..0c20b98ec 100644 --- a/backend/src/main/java/mouda/backend/common/config/FirebaseConfig.java +++ b/backend/src/main/java/mouda/backend/api/common/config/FirebaseConfig.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config; +package mouda.backend.api.common.config; import java.io.InputStream; diff --git a/backend/src/main/java/mouda/backend/common/config/JacksonConfig.java b/backend/src/main/java/mouda/backend/api/common/config/JacksonConfig.java similarity index 96% rename from backend/src/main/java/mouda/backend/common/config/JacksonConfig.java rename to backend/src/main/java/mouda/backend/api/common/config/JacksonConfig.java index 2991fec42..a552ab723 100644 --- a/backend/src/main/java/mouda/backend/common/config/JacksonConfig.java +++ b/backend/src/main/java/mouda/backend/api/common/config/JacksonConfig.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config; +package mouda.backend.api.common.config; import java.time.LocalDate; import java.time.LocalTime; diff --git a/backend/src/main/java/mouda/backend/common/config/RequestBodyWrappingFilter.java b/backend/src/main/java/mouda/backend/api/common/config/RequestBodyWrappingFilter.java similarity index 95% rename from backend/src/main/java/mouda/backend/common/config/RequestBodyWrappingFilter.java rename to backend/src/main/java/mouda/backend/api/common/config/RequestBodyWrappingFilter.java index eb538ee01..bb11bdb3e 100644 --- a/backend/src/main/java/mouda/backend/common/config/RequestBodyWrappingFilter.java +++ b/backend/src/main/java/mouda/backend/api/common/config/RequestBodyWrappingFilter.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config; +package mouda.backend.api.common.config; import java.io.IOException; diff --git a/backend/src/main/java/mouda/backend/common/config/RestClientConfig.java b/backend/src/main/java/mouda/backend/api/common/config/RestClientConfig.java similarity index 95% rename from backend/src/main/java/mouda/backend/common/config/RestClientConfig.java rename to backend/src/main/java/mouda/backend/api/common/config/RestClientConfig.java index e4007954f..740dbc8de 100644 --- a/backend/src/main/java/mouda/backend/common/config/RestClientConfig.java +++ b/backend/src/main/java/mouda/backend/api/common/config/RestClientConfig.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config; +package mouda.backend.api.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/mouda/backend/common/config/SwaggerConfig.java b/backend/src/main/java/mouda/backend/api/common/config/SwaggerConfig.java similarity index 84% rename from backend/src/main/java/mouda/backend/common/config/SwaggerConfig.java rename to backend/src/main/java/mouda/backend/api/common/config/SwaggerConfig.java index 46cd22f29..7786a8673 100644 --- a/backend/src/main/java/mouda/backend/common/config/SwaggerConfig.java +++ b/backend/src/main/java/mouda/backend/api/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config; +package mouda.backend.api.common.config; import org.springdoc.core.utils.SpringDocUtils; import org.springframework.context.annotation.Bean; @@ -8,8 +8,8 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.config.argumentresolver.LoginMember; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.config.argumentresolver.LoginMember; @Configuration public class SwaggerConfig { diff --git a/backend/src/main/java/mouda/backend/common/config/WebMvcConfig.java b/backend/src/main/java/mouda/backend/api/common/config/WebMvcConfig.java similarity index 78% rename from backend/src/main/java/mouda/backend/common/config/WebMvcConfig.java rename to backend/src/main/java/mouda/backend/api/common/config/WebMvcConfig.java index 02eadb290..f8f502f39 100644 --- a/backend/src/main/java/mouda/backend/common/config/WebMvcConfig.java +++ b/backend/src/main/java/mouda/backend/api/common/config/WebMvcConfig.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config; +package mouda.backend.api.common.config; import java.util.List; @@ -9,10 +9,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMemberArgumentResolver; -import mouda.backend.common.config.argumentresolver.LoginMemberArgumentResolver; -import mouda.backend.common.config.converter.FilterTypeConverter; -import mouda.backend.common.config.interceptor.AuthenticationCheckInterceptor; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMemberArgumentResolver; +import mouda.backend.api.common.config.argumentresolver.LoginMemberArgumentResolver; +import mouda.backend.api.common.config.converter.FilterTypeConverter; +import mouda.backend.api.common.config.interceptor.AuthenticationCheckInterceptor; @Configuration @RequiredArgsConstructor diff --git a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginDarakbangMember.java b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginDarakbangMember.java similarity index 82% rename from backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginDarakbangMember.java rename to backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginDarakbangMember.java index 5247df392..6f3925889 100644 --- a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginDarakbangMember.java +++ b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginDarakbangMember.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config.argumentresolver; +package mouda.backend.api.common.config.argumentresolver; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginDarakbangMemberArgumentResolver.java b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginDarakbangMemberArgumentResolver.java similarity index 91% rename from backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginDarakbangMemberArgumentResolver.java rename to backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginDarakbangMemberArgumentResolver.java index 2cc6ef6fa..607801be1 100644 --- a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginDarakbangMemberArgumentResolver.java +++ b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginDarakbangMemberArgumentResolver.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config.argumentresolver; +package mouda.backend.api.common.config.argumentresolver; import java.util.Map; @@ -12,8 +12,8 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; -import mouda.backend.auth.business.AuthService; -import mouda.backend.member.domain.Member; +import mouda.backend.api.auth.business.AuthService; +import mouda.backend.core.domain.member.Member; @Component @RequiredArgsConstructor diff --git a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginMember.java b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginMember.java similarity index 82% rename from backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginMember.java rename to backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginMember.java index 79d10a353..762eb0c2d 100644 --- a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginMember.java +++ b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginMember.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config.argumentresolver; +package mouda.backend.api.common.config.argumentresolver; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginMemberArgumentResolver.java b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginMemberArgumentResolver.java new file mode 100644 index 000000000..9d1eea60e --- /dev/null +++ b/backend/src/main/java/mouda/backend/api/common/config/argumentresolver/LoginMemberArgumentResolver.java @@ -0,0 +1,38 @@ +package mouda.backend.api.common.config.argumentresolver; + +import org.springframework.core.MethodParameter; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +import lombok.RequiredArgsConstructor; +import mouda.backend.api.auth.business.AuthService; + +@Component +@RequiredArgsConstructor +public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver { + + private final AuthService authService; + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.hasParameterAnnotation(LoginMember.class); + } + + @Override + public Object resolveArgument( + MethodParameter parameter, ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, WebDataBinderFactory binderFactory + ) throws Exception { + String authorizationHeader = webRequest.getHeader("Authorization"); + + String token = extractToken(authorizationHeader); + return authService.findMember(token); + } + + private String extractToken(String authorizationHeader) { + return authorizationHeader.substring(7); + } +} diff --git a/backend/src/main/java/mouda/backend/common/config/converter/FilterTypeConverter.java b/backend/src/main/java/mouda/backend/api/common/config/converter/FilterTypeConverter.java similarity index 81% rename from backend/src/main/java/mouda/backend/common/config/converter/FilterTypeConverter.java rename to backend/src/main/java/mouda/backend/api/common/config/converter/FilterTypeConverter.java index 3f71d2d57..d70f96710 100644 --- a/backend/src/main/java/mouda/backend/common/config/converter/FilterTypeConverter.java +++ b/backend/src/main/java/mouda/backend/api/common/config/converter/FilterTypeConverter.java @@ -1,9 +1,9 @@ -package mouda.backend.common.config.converter; +package mouda.backend.api.common.config.converter; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; -import mouda.backend.moim.domain.FilterType; +import mouda.backend.core.domain.moim.FilterType; @Component public class FilterTypeConverter implements Converter { diff --git a/backend/src/main/java/mouda/backend/common/config/interceptor/AuthenticationCheckInterceptor.java b/backend/src/main/java/mouda/backend/api/common/config/interceptor/AuthenticationCheckInterceptor.java similarity index 84% rename from backend/src/main/java/mouda/backend/common/config/interceptor/AuthenticationCheckInterceptor.java rename to backend/src/main/java/mouda/backend/api/common/config/interceptor/AuthenticationCheckInterceptor.java index d9099665e..95c0327d2 100644 --- a/backend/src/main/java/mouda/backend/common/config/interceptor/AuthenticationCheckInterceptor.java +++ b/backend/src/main/java/mouda/backend/api/common/config/interceptor/AuthenticationCheckInterceptor.java @@ -1,4 +1,4 @@ -package mouda.backend.common.config.interceptor; +package mouda.backend.api.common.config.interceptor; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; @@ -8,9 +8,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import mouda.backend.auth.exception.AuthErrorMessage; -import mouda.backend.auth.exception.AuthException; -import mouda.backend.auth.business.AuthService; +import mouda.backend.api.auth.business.AuthService; +import mouda.backend.api.auth.exception.AuthErrorMessage; +import mouda.backend.api.auth.exception.AuthException; @Component @RequiredArgsConstructor diff --git a/backend/src/main/java/mouda/backend/common/exception/ErrorResponse.java b/backend/src/main/java/mouda/backend/api/common/exception/ErrorResponse.java similarity index 54% rename from backend/src/main/java/mouda/backend/common/exception/ErrorResponse.java rename to backend/src/main/java/mouda/backend/api/common/exception/ErrorResponse.java index 950fa1cd5..0fbc7dcdd 100644 --- a/backend/src/main/java/mouda/backend/common/exception/ErrorResponse.java +++ b/backend/src/main/java/mouda/backend/api/common/exception/ErrorResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.common.exception; +package mouda.backend.api.common.exception; public record ErrorResponse( String message diff --git a/backend/src/main/java/mouda/backend/common/exception/GlobalExceptionHandler.java b/backend/src/main/java/mouda/backend/api/common/exception/GlobalExceptionHandler.java similarity index 98% rename from backend/src/main/java/mouda/backend/common/exception/GlobalExceptionHandler.java rename to backend/src/main/java/mouda/backend/api/common/exception/GlobalExceptionHandler.java index 91f252097..c65601bb2 100644 --- a/backend/src/main/java/mouda/backend/common/exception/GlobalExceptionHandler.java +++ b/backend/src/main/java/mouda/backend/api/common/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package mouda.backend.common.exception; +package mouda.backend.api.common.exception; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatusCode; diff --git a/backend/src/main/java/mouda/backend/common/exception/MoudaException.java b/backend/src/main/java/mouda/backend/api/common/exception/MoudaException.java similarity index 84% rename from backend/src/main/java/mouda/backend/common/exception/MoudaException.java rename to backend/src/main/java/mouda/backend/api/common/exception/MoudaException.java index 5e8285117..d01ac6f4c 100644 --- a/backend/src/main/java/mouda/backend/common/exception/MoudaException.java +++ b/backend/src/main/java/mouda/backend/api/common/exception/MoudaException.java @@ -1,4 +1,4 @@ -package mouda.backend.common.exception; +package mouda.backend.api.common.exception; import org.springframework.http.HttpStatus; diff --git a/backend/src/main/java/mouda/backend/common/response/RestResponse.java b/backend/src/main/java/mouda/backend/api/common/response/RestResponse.java similarity index 76% rename from backend/src/main/java/mouda/backend/common/response/RestResponse.java rename to backend/src/main/java/mouda/backend/api/common/response/RestResponse.java index b6bd91715..879d22b1f 100644 --- a/backend/src/main/java/mouda/backend/common/response/RestResponse.java +++ b/backend/src/main/java/mouda/backend/api/common/response/RestResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.common.response; +package mouda.backend.api.common.response; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/darakbang/business/DarakbangService.java b/backend/src/main/java/mouda/backend/api/darakbang/business/DarakbangService.java similarity index 75% rename from backend/src/main/java/mouda/backend/darakbang/business/DarakbangService.java rename to backend/src/main/java/mouda/backend/api/darakbang/business/DarakbangService.java index f686cc131..c7b21cd07 100644 --- a/backend/src/main/java/mouda/backend/darakbang/business/DarakbangService.java +++ b/backend/src/main/java/mouda/backend/api/darakbang/business/DarakbangService.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbang.business; +package mouda.backend.api.darakbang.business; import java.util.List; @@ -7,24 +7,24 @@ import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.exception.DarakbangErrorMessage; -import mouda.backend.darakbang.exception.DarakbangException; -import mouda.backend.darakbang.implement.InvitationCodeGenerator; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbang.presentation.request.DarakbangCreateRequest; -import mouda.backend.darakbang.presentation.request.DarakbangEnterRequest; -import mouda.backend.darakbang.presentation.response.CodeValidationResponse; -import mouda.backend.darakbang.presentation.response.DarakbangNameResponse; -import mouda.backend.darakbang.presentation.response.DarakbangResponse; -import mouda.backend.darakbang.presentation.response.DarakbangResponses; -import mouda.backend.darakbang.presentation.response.InvitationCodeResponse; -import mouda.backend.darakbangmember.domain.DarakBangMemberRole; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.exception.DarakbangMemberErrorMessage; -import mouda.backend.darakbangmember.exception.DarakbangMemberException; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.exception.DarakbangErrorMessage; +import mouda.backend.api.darakbang.exception.DarakbangException; +import mouda.backend.api.darakbang.implement.InvitationCodeGenerator; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.dto.darakbang.request.DarakbangCreateRequest; +import mouda.backend.core.dto.darakbang.request.DarakbangEnterRequest; +import mouda.backend.core.dto.darakbang.response.CodeValidationResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangNameResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangResponses; +import mouda.backend.core.dto.darakbang.response.InvitationCodeResponse; +import mouda.backend.core.domain.darakbang.DarakBangMemberRole; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberErrorMessage; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberException; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.member.Member; @Service @Transactional diff --git a/backend/src/main/java/mouda/backend/darakbang/exception/DarakbangErrorMessage.java b/backend/src/main/java/mouda/backend/api/darakbang/exception/DarakbangErrorMessage.java similarity index 91% rename from backend/src/main/java/mouda/backend/darakbang/exception/DarakbangErrorMessage.java rename to backend/src/main/java/mouda/backend/api/darakbang/exception/DarakbangErrorMessage.java index ea607900d..d2fc6c847 100644 --- a/backend/src/main/java/mouda/backend/darakbang/exception/DarakbangErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/darakbang/exception/DarakbangErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbang.exception; +package mouda.backend.api.darakbang.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/mouda/backend/darakbang/exception/DarakbangException.java b/backend/src/main/java/mouda/backend/api/darakbang/exception/DarakbangException.java similarity index 69% rename from backend/src/main/java/mouda/backend/darakbang/exception/DarakbangException.java rename to backend/src/main/java/mouda/backend/api/darakbang/exception/DarakbangException.java index 24d21baca..672a75e74 100644 --- a/backend/src/main/java/mouda/backend/darakbang/exception/DarakbangException.java +++ b/backend/src/main/java/mouda/backend/api/darakbang/exception/DarakbangException.java @@ -1,8 +1,8 @@ -package mouda.backend.darakbang.exception; +package mouda.backend.api.darakbang.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class DarakbangException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/darakbang/implement/InvitationCodeGenerator.java b/backend/src/main/java/mouda/backend/api/darakbang/implement/InvitationCodeGenerator.java similarity index 94% rename from backend/src/main/java/mouda/backend/darakbang/implement/InvitationCodeGenerator.java rename to backend/src/main/java/mouda/backend/api/darakbang/implement/InvitationCodeGenerator.java index 66974e8b1..20247293a 100644 --- a/backend/src/main/java/mouda/backend/darakbang/implement/InvitationCodeGenerator.java +++ b/backend/src/main/java/mouda/backend/api/darakbang/implement/InvitationCodeGenerator.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbang.implement; +package mouda.backend.api.darakbang.implement; import java.security.SecureRandom; diff --git a/backend/src/main/java/mouda/backend/darakbang/infrastructure/DarakbangRepository.java b/backend/src/main/java/mouda/backend/api/darakbang/infrastructure/DarakbangRepository.java similarity index 77% rename from backend/src/main/java/mouda/backend/darakbang/infrastructure/DarakbangRepository.java rename to backend/src/main/java/mouda/backend/api/darakbang/infrastructure/DarakbangRepository.java index 56356e1db..e4c716483 100644 --- a/backend/src/main/java/mouda/backend/darakbang/infrastructure/DarakbangRepository.java +++ b/backend/src/main/java/mouda/backend/api/darakbang/infrastructure/DarakbangRepository.java @@ -1,11 +1,11 @@ -package mouda.backend.darakbang.infrastructure; +package mouda.backend.api.darakbang.infrastructure; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import mouda.backend.darakbang.domain.Darakbang; +import mouda.backend.core.domain.darakbang.Darakbang; @Repository public interface DarakbangRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/controller/DarakbangController.java b/backend/src/main/java/mouda/backend/api/darakbang/presentation/controller/DarakbangController.java similarity index 73% rename from backend/src/main/java/mouda/backend/darakbang/presentation/controller/DarakbangController.java rename to backend/src/main/java/mouda/backend/api/darakbang/presentation/controller/DarakbangController.java index cf1d6515e..b4471ce9c 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/controller/DarakbangController.java +++ b/backend/src/main/java/mouda/backend/api/darakbang/presentation/controller/DarakbangController.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbang.presentation.controller; +package mouda.backend.api.darakbang.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -11,20 +11,20 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.config.argumentresolver.LoginMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbang.business.DarakbangService; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.presentation.controller.swagger.DarakbangSwagger; -import mouda.backend.darakbang.presentation.request.DarakbangCreateRequest; -import mouda.backend.darakbang.presentation.request.DarakbangEnterRequest; -import mouda.backend.darakbang.presentation.response.CodeValidationResponse; -import mouda.backend.darakbang.presentation.response.DarakbangNameResponse; -import mouda.backend.darakbang.presentation.response.DarakbangResponses; -import mouda.backend.darakbang.presentation.response.InvitationCodeResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.domain.Member; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.config.argumentresolver.LoginMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.api.darakbang.business.DarakbangService; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.presentation.controller.swagger.DarakbangSwagger; +import mouda.backend.core.dto.darakbang.request.DarakbangCreateRequest; +import mouda.backend.core.dto.darakbang.request.DarakbangEnterRequest; +import mouda.backend.core.dto.darakbang.response.CodeValidationResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangNameResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangResponses; +import mouda.backend.core.dto.darakbang.response.InvitationCodeResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.member.Member; @RestController @RequestMapping("/v1/darakbang") diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/controller/swagger/DarakbangSwagger.java b/backend/src/main/java/mouda/backend/api/darakbang/presentation/controller/swagger/DarakbangSwagger.java similarity index 80% rename from backend/src/main/java/mouda/backend/darakbang/presentation/controller/swagger/DarakbangSwagger.java rename to backend/src/main/java/mouda/backend/api/darakbang/presentation/controller/swagger/DarakbangSwagger.java index 35e90aea4..76f1996eb 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/controller/swagger/DarakbangSwagger.java +++ b/backend/src/main/java/mouda/backend/api/darakbang/presentation/controller/swagger/DarakbangSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbang.presentation.controller.swagger; +package mouda.backend.api.darakbang.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -8,17 +8,17 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.config.argumentresolver.LoginMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbang.presentation.request.DarakbangCreateRequest; -import mouda.backend.darakbang.presentation.request.DarakbangEnterRequest; -import mouda.backend.darakbang.presentation.response.CodeValidationResponse; -import mouda.backend.darakbang.presentation.response.DarakbangNameResponse; -import mouda.backend.darakbang.presentation.response.DarakbangResponses; -import mouda.backend.darakbang.presentation.response.InvitationCodeResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.domain.Member; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.config.argumentresolver.LoginMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.dto.darakbang.request.DarakbangCreateRequest; +import mouda.backend.core.dto.darakbang.request.DarakbangEnterRequest; +import mouda.backend.core.dto.darakbang.response.CodeValidationResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangNameResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangResponses; +import mouda.backend.core.dto.darakbang.response.InvitationCodeResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.member.Member; public interface DarakbangSwagger { diff --git a/backend/src/main/java/mouda/backend/darakbangmember/business/DarakbangMemberService.java b/backend/src/main/java/mouda/backend/api/darakbangmember/business/DarakbangMemberService.java similarity index 70% rename from backend/src/main/java/mouda/backend/darakbangmember/business/DarakbangMemberService.java rename to backend/src/main/java/mouda/backend/api/darakbangmember/business/DarakbangMemberService.java index b4c12e1d5..cdc496f20 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/business/DarakbangMemberService.java +++ b/backend/src/main/java/mouda/backend/api/darakbangmember/business/DarakbangMemberService.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.business; +package mouda.backend.api.darakbangmember.business; import java.util.List; import java.util.Optional; @@ -8,14 +8,14 @@ import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberResponse; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberResponses; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberRoleResponse; -import mouda.backend.darakbangmember.exception.DarakbangMemberErrorMessage; -import mouda.backend.darakbangmember.exception.DarakbangMemberException; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberErrorMessage; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberException; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberResponse; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberResponses; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberRoleResponse; +import mouda.backend.core.domain.member.Member; @Service @Transactional diff --git a/backend/src/main/java/mouda/backend/darakbangmember/exception/DarakbangMemberErrorMessage.java b/backend/src/main/java/mouda/backend/api/darakbangmember/exception/DarakbangMemberErrorMessage.java similarity index 90% rename from backend/src/main/java/mouda/backend/darakbangmember/exception/DarakbangMemberErrorMessage.java rename to backend/src/main/java/mouda/backend/api/darakbangmember/exception/DarakbangMemberErrorMessage.java index 804675af3..a2552ab63 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/exception/DarakbangMemberErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/darakbangmember/exception/DarakbangMemberErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.exception; +package mouda.backend.api.darakbangmember.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/mouda/backend/darakbangmember/exception/DarakbangMemberException.java b/backend/src/main/java/mouda/backend/api/darakbangmember/exception/DarakbangMemberException.java similarity index 69% rename from backend/src/main/java/mouda/backend/darakbangmember/exception/DarakbangMemberException.java rename to backend/src/main/java/mouda/backend/api/darakbangmember/exception/DarakbangMemberException.java index 28b71fc3b..c739e505e 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/exception/DarakbangMemberException.java +++ b/backend/src/main/java/mouda/backend/api/darakbangmember/exception/DarakbangMemberException.java @@ -1,8 +1,8 @@ -package mouda.backend.darakbangmember.exception; +package mouda.backend.api.darakbangmember.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class DarakbangMemberException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/darakbangmember/infrastructure/DarakbangMemberRepository.java b/backend/src/main/java/mouda/backend/api/darakbangmember/infrastructure/DarakbangMemberRepository.java similarity index 83% rename from backend/src/main/java/mouda/backend/darakbangmember/infrastructure/DarakbangMemberRepository.java rename to backend/src/main/java/mouda/backend/api/darakbangmember/infrastructure/DarakbangMemberRepository.java index a009a0ea5..bb6929d69 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/infrastructure/DarakbangMemberRepository.java +++ b/backend/src/main/java/mouda/backend/api/darakbangmember/infrastructure/DarakbangMemberRepository.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.infrastructure; +package mouda.backend.api.darakbangmember.infrastructure; import java.util.List; import java.util.Optional; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import mouda.backend.darakbangmember.domain.DarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; @Repository public interface DarakbangMemberRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/darakbangmember/presentation/controller/DarakbangMemberController.java b/backend/src/main/java/mouda/backend/api/darakbangmember/presentation/controller/DarakbangMemberController.java similarity index 65% rename from backend/src/main/java/mouda/backend/darakbangmember/presentation/controller/DarakbangMemberController.java rename to backend/src/main/java/mouda/backend/api/darakbangmember/presentation/controller/DarakbangMemberController.java index ebdf5668c..5de99622b 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/presentation/controller/DarakbangMemberController.java +++ b/backend/src/main/java/mouda/backend/api/darakbangmember/presentation/controller/DarakbangMemberController.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.presentation.controller; +package mouda.backend.api.darakbangmember.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.RestController; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.config.argumentresolver.LoginMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.business.DarakbangMemberService; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.presentation.controller.swagger.DarakbangMemberSwagger; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberResponses; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberRoleResponse; -import mouda.backend.member.domain.Member; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.config.argumentresolver.LoginMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.api.darakbangmember.business.DarakbangMemberService; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.presentation.controller.swagger.DarakbangMemberSwagger; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberResponses; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberRoleResponse; +import mouda.backend.core.domain.member.Member; @RestController @RequestMapping("/v1/darakbang") diff --git a/backend/src/main/java/mouda/backend/darakbangmember/presentation/controller/swagger/DarakbangMemberSwagger.java b/backend/src/main/java/mouda/backend/api/darakbangmember/presentation/controller/swagger/DarakbangMemberSwagger.java similarity index 70% rename from backend/src/main/java/mouda/backend/darakbangmember/presentation/controller/swagger/DarakbangMemberSwagger.java rename to backend/src/main/java/mouda/backend/api/darakbangmember/presentation/controller/swagger/DarakbangMemberSwagger.java index ee5304aee..3fef89983 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/presentation/controller/swagger/DarakbangMemberSwagger.java +++ b/backend/src/main/java/mouda/backend/api/darakbangmember/presentation/controller/swagger/DarakbangMemberSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.presentation.controller.swagger; +package mouda.backend.api.darakbangmember.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -6,13 +6,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.config.argumentresolver.LoginMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberResponses; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberRoleResponse; -import mouda.backend.member.domain.Member; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.config.argumentresolver.LoginMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberResponses; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberRoleResponse; +import mouda.backend.core.domain.member.Member; public interface DarakbangMemberSwagger { diff --git a/backend/src/main/java/mouda/backend/member/business/MemberService.java b/backend/src/main/java/mouda/backend/api/member/business/MemberService.java similarity index 72% rename from backend/src/main/java/mouda/backend/member/business/MemberService.java rename to backend/src/main/java/mouda/backend/api/member/business/MemberService.java index 9826aea10..6ad906b43 100644 --- a/backend/src/main/java/mouda/backend/member/business/MemberService.java +++ b/backend/src/main/java/mouda/backend/api/member/business/MemberService.java @@ -1,11 +1,11 @@ -package mouda.backend.member.business; +package mouda.backend.api.member.business; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.presentation.response.MemberFindResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.member.response.MemberFindResponse; @Service @Transactional diff --git a/backend/src/main/java/mouda/backend/member/infrastructure/MemberRepository.java b/backend/src/main/java/mouda/backend/api/member/infrastructure/MemberRepository.java similarity index 68% rename from backend/src/main/java/mouda/backend/member/infrastructure/MemberRepository.java rename to backend/src/main/java/mouda/backend/api/member/infrastructure/MemberRepository.java index 7b97cfeee..f8817db70 100644 --- a/backend/src/main/java/mouda/backend/member/infrastructure/MemberRepository.java +++ b/backend/src/main/java/mouda/backend/api/member/infrastructure/MemberRepository.java @@ -1,10 +1,10 @@ -package mouda.backend.member.infrastructure; +package mouda.backend.api.member.infrastructure; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import mouda.backend.member.domain.Member; +import mouda.backend.core.domain.member.Member; public interface MemberRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/member/presentation/controller/MemberController.java b/backend/src/main/java/mouda/backend/api/member/presentation/controller/MemberController.java similarity index 66% rename from backend/src/main/java/mouda/backend/member/presentation/controller/MemberController.java rename to backend/src/main/java/mouda/backend/api/member/presentation/controller/MemberController.java index 084771e08..a6c1629ce 100644 --- a/backend/src/main/java/mouda/backend/member/presentation/controller/MemberController.java +++ b/backend/src/main/java/mouda/backend/api/member/presentation/controller/MemberController.java @@ -1,4 +1,4 @@ -package mouda.backend.member.presentation.controller; +package mouda.backend.api.member.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -7,12 +7,12 @@ import org.springframework.web.bind.annotation.RestController; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.business.MemberService; -import mouda.backend.member.presentation.controller.swagger.MemberSwagger; -import mouda.backend.member.presentation.response.MemberFindResponse; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.member.business.MemberService; +import mouda.backend.api.member.presentation.controller.swagger.MemberSwagger; +import mouda.backend.core.dto.member.response.MemberFindResponse; @RestController @RequestMapping("/v1/darakbang/{darakbangId}/member") diff --git a/backend/src/main/java/mouda/backend/member/presentation/controller/swagger/MemberSwagger.java b/backend/src/main/java/mouda/backend/api/member/presentation/controller/swagger/MemberSwagger.java similarity index 67% rename from backend/src/main/java/mouda/backend/member/presentation/controller/swagger/MemberSwagger.java rename to backend/src/main/java/mouda/backend/api/member/presentation/controller/swagger/MemberSwagger.java index 34239379e..dd117c7a9 100644 --- a/backend/src/main/java/mouda/backend/member/presentation/controller/swagger/MemberSwagger.java +++ b/backend/src/main/java/mouda/backend/api/member/presentation/controller/swagger/MemberSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.member.presentation.controller.swagger; +package mouda.backend.api.member.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -6,10 +6,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.presentation.response.MemberFindResponse; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.member.response.MemberFindResponse; public interface MemberSwagger { diff --git a/backend/src/main/java/mouda/backend/moim/business/ChamyoService.java b/backend/src/main/java/mouda/backend/api/moim/business/ChamyoService.java similarity index 76% rename from backend/src/main/java/mouda/backend/moim/business/ChamyoService.java rename to backend/src/main/java/mouda/backend/api/moim/business/ChamyoService.java index 621f759fe..ae889ee3b 100644 --- a/backend/src/main/java/mouda/backend/moim/business/ChamyoService.java +++ b/backend/src/main/java/mouda/backend/api/moim/business/ChamyoService.java @@ -1,25 +1,26 @@ -package mouda.backend.moim.business; +package mouda.backend.api.moim.business; import java.util.List; -import java.util.Optional; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Chamyo; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimRole; -import mouda.backend.moim.domain.MoimStatus; -import mouda.backend.moim.exception.ChamyoErrorMessage; -import mouda.backend.moim.exception.ChamyoException; -import mouda.backend.moim.infrastructure.ChamyoRepository; -import mouda.backend.moim.infrastructure.MoimRepository; -import mouda.backend.moim.presentation.response.chamyo.ChamyoFindAllResponse; -import mouda.backend.moim.presentation.response.chamyo.ChamyoFindAllResponses; -import mouda.backend.moim.presentation.response.chamyo.MoimRoleFindResponse; +import mouda.backend.api.moim.exception.ChamyoErrorMessage; +import mouda.backend.api.moim.exception.ChamyoException; +import mouda.backend.api.moim.implement.ChamyoFinder; +import mouda.backend.api.moim.implement.MoimFinder; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.moim.infrastructure.MoimRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chamyo; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; +import mouda.backend.core.domain.moim.MoimStatus; +import mouda.backend.core.dto.moim.response.chamyo.ChamyoFindAllResponse; +import mouda.backend.core.dto.moim.response.chamyo.ChamyoFindAllResponses; +import mouda.backend.core.dto.moim.response.chamyo.MoimRoleFindResponse; import mouda.backend.notification.business.NotificationService; import mouda.backend.notification.domain.NotificationType; @@ -31,18 +32,19 @@ public class ChamyoService { private final ChamyoRepository chamyoRepository; private final MoimRepository moimRepository; private final NotificationService notificationService; + private final ChamyoFinder chamyoFinder; + private final MoimFinder moimFinder; @Transactional(readOnly = true) public MoimRoleFindResponse findMoimRole(Long darakbangId, Long moimId, DarakbangMember darakbangMember) { - Optional chamyoOptional = chamyoRepository.findByMoimIdAndDarakbangMemberId(moimId, - darakbangMember.getId()); - chamyoOptional.ifPresent(chamyo -> { - if (chamyo.getMoim().isNotInDarakbang(darakbangId)) { - throw new ChamyoException(HttpStatus.BAD_REQUEST, ChamyoErrorMessage.MOIM_NOT_FOUND); - } - }); - - MoimRole moimRole = chamyoOptional.map(Chamyo::getMoimRole).orElse(MoimRole.NON_MOIMEE); + /* + 모임이 다락방에 있는지 확인한다. + 모임에서 자기역할을 찾는다. + 멤버가 모임에 참여하고 있는지 검증한다. -> 침여가 필요하다. + 참여에서 역할을 반환한다. + */ + Moim moim = moimFinder.find(moimId, darakbangId); + MoimRole moimRole = chamyoFinder.readMoimRole(moim, darakbangMember); return new MoimRoleFindResponse(moimRole.name()); } diff --git a/backend/src/main/java/mouda/backend/moim/business/ChatService.java b/backend/src/main/java/mouda/backend/api/moim/business/ChatService.java similarity index 83% rename from backend/src/main/java/mouda/backend/moim/business/ChatService.java rename to backend/src/main/java/mouda/backend/api/moim/business/ChatService.java index ca62c3667..3a90ca6e4 100644 --- a/backend/src/main/java/mouda/backend/moim/business/ChatService.java +++ b/backend/src/main/java/mouda/backend/api/moim/business/ChatService.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.business; +package mouda.backend.api.moim.business; import java.time.LocalDateTime; import java.util.Comparator; @@ -10,27 +10,26 @@ import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Chamyo; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimRole; -import mouda.backend.moim.exception.ChatErrorMessage; -import mouda.backend.moim.exception.ChatException; -import mouda.backend.moim.infrastructure.ChamyoRepository; -import mouda.backend.moim.infrastructure.ChatRepository; -import mouda.backend.moim.infrastructure.MoimRepository; -import mouda.backend.moim.presentation.request.chat.ChatCreateRequest; -import mouda.backend.moim.presentation.request.chat.DateTimeConfirmRequest; -import mouda.backend.moim.presentation.request.chat.LastReadChatRequest; -import mouda.backend.moim.presentation.request.chat.PlaceConfirmRequest; -import mouda.backend.moim.presentation.response.chat.ChatFindDetailResponse; -import mouda.backend.moim.presentation.response.chat.ChatFindUnloadedResponse; -import mouda.backend.moim.presentation.response.chat.ChatPreviewResponse; -import mouda.backend.moim.presentation.response.chat.ChatPreviewResponses; -import mouda.backend.notification.domain.MoudaNotification; -import mouda.backend.notification.domain.NotificationType; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chamyo; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; +import mouda.backend.api.moim.exception.ChatErrorMessage; +import mouda.backend.api.moim.exception.ChatException; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.moim.infrastructure.ChatRepository; +import mouda.backend.api.moim.infrastructure.MoimRepository; +import mouda.backend.core.dto.moim.request.chat.ChatCreateRequest; +import mouda.backend.core.dto.moim.request.chat.DateTimeConfirmRequest; +import mouda.backend.core.dto.moim.request.chat.LastReadChatRequest; +import mouda.backend.core.dto.moim.request.chat.PlaceConfirmRequest; +import mouda.backend.core.dto.moim.response.chat.ChatFindDetailResponse; +import mouda.backend.core.dto.moim.response.chat.ChatFindUnloadedResponse; +import mouda.backend.core.dto.moim.response.chat.ChatPreviewResponse; +import mouda.backend.core.dto.moim.response.chat.ChatPreviewResponses; import mouda.backend.notification.business.NotificationService; +import mouda.backend.notification.domain.NotificationType; @Transactional @Service diff --git a/backend/src/main/java/mouda/backend/moim/business/MoimService.java b/backend/src/main/java/mouda/backend/api/moim/business/MoimService.java similarity index 89% rename from backend/src/main/java/mouda/backend/moim/business/MoimService.java rename to backend/src/main/java/mouda/backend/api/moim/business/MoimService.java index 85b137af0..428744b31 100644 --- a/backend/src/main/java/mouda/backend/moim/business/MoimService.java +++ b/backend/src/main/java/mouda/backend/api/moim/business/MoimService.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.business; +package mouda.backend.api.moim.business; import static java.util.stream.Collectors.*; @@ -12,29 +12,29 @@ import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Chamyo; -import mouda.backend.moim.domain.Comment; -import mouda.backend.moim.domain.FilterType; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimRole; -import mouda.backend.moim.domain.MoimStatus; -import mouda.backend.moim.domain.Zzim; -import mouda.backend.moim.exception.CommentErrorMessage; -import mouda.backend.moim.exception.CommentException; -import mouda.backend.moim.exception.MoimErrorMessage; -import mouda.backend.moim.exception.MoimException; -import mouda.backend.moim.infrastructure.ChamyoRepository; -import mouda.backend.moim.infrastructure.CommentRepository; -import mouda.backend.moim.infrastructure.MoimRepository; -import mouda.backend.moim.infrastructure.ZzimRepository; -import mouda.backend.moim.presentation.request.comment.CommentCreateRequest; -import mouda.backend.moim.presentation.request.moim.MoimCreateRequest; -import mouda.backend.moim.presentation.request.moim.MoimEditRequest; -import mouda.backend.moim.presentation.response.comment.CommentResponse; -import mouda.backend.moim.presentation.response.moim.MoimDetailsFindResponse; -import mouda.backend.moim.presentation.response.moim.MoimFindAllResponse; -import mouda.backend.moim.presentation.response.moim.MoimFindAllResponses; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chamyo; +import mouda.backend.core.domain.moim.Comment; +import mouda.backend.core.domain.moim.FilterType; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; +import mouda.backend.core.domain.moim.MoimStatus; +import mouda.backend.core.domain.moim.Zzim; +import mouda.backend.api.moim.exception.CommentErrorMessage; +import mouda.backend.api.moim.exception.CommentException; +import mouda.backend.api.moim.exception.MoimErrorMessage; +import mouda.backend.api.moim.exception.MoimException; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.moim.infrastructure.CommentRepository; +import mouda.backend.api.moim.infrastructure.MoimRepository; +import mouda.backend.api.moim.infrastructure.ZzimRepository; +import mouda.backend.core.dto.moim.request.comment.CommentCreateRequest; +import mouda.backend.core.dto.moim.request.moim.MoimCreateRequest; +import mouda.backend.core.dto.moim.request.moim.MoimEditRequest; +import mouda.backend.core.dto.moim.response.comment.CommentResponse; +import mouda.backend.core.dto.moim.response.moim.MoimDetailsFindResponse; +import mouda.backend.core.dto.moim.response.moim.MoimFindAllResponse; +import mouda.backend.core.dto.moim.response.moim.MoimFindAllResponses; import mouda.backend.notification.business.NotificationService; import mouda.backend.notification.domain.NotificationType; diff --git a/backend/src/main/java/mouda/backend/moim/business/ZzimService.java b/backend/src/main/java/mouda/backend/api/moim/business/ZzimService.java similarity index 75% rename from backend/src/main/java/mouda/backend/moim/business/ZzimService.java rename to backend/src/main/java/mouda/backend/api/moim/business/ZzimService.java index 02f720a91..b756f550b 100644 --- a/backend/src/main/java/mouda/backend/moim/business/ZzimService.java +++ b/backend/src/main/java/mouda/backend/api/moim/business/ZzimService.java @@ -1,18 +1,18 @@ -package mouda.backend.moim.business; +package mouda.backend.api.moim.business; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.Zzim; -import mouda.backend.moim.exception.ZzimErrorMessage; -import mouda.backend.moim.exception.ZzimException; -import mouda.backend.moim.infrastructure.MoimRepository; -import mouda.backend.moim.infrastructure.ZzimRepository; -import mouda.backend.moim.presentation.response.zzim.ZzimCheckResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.Zzim; +import mouda.backend.api.moim.exception.ZzimErrorMessage; +import mouda.backend.api.moim.exception.ZzimException; +import mouda.backend.api.moim.infrastructure.MoimRepository; +import mouda.backend.api.moim.infrastructure.ZzimRepository; +import mouda.backend.core.dto.moim.response.zzim.ZzimCheckResponse; @Service @Transactional diff --git a/backend/src/main/java/mouda/backend/moim/exception/ChamyoErrorMessage.java b/backend/src/main/java/mouda/backend/api/moim/exception/ChamyoErrorMessage.java similarity index 92% rename from backend/src/main/java/mouda/backend/moim/exception/ChamyoErrorMessage.java rename to backend/src/main/java/mouda/backend/api/moim/exception/ChamyoErrorMessage.java index a223718f9..99685c08f 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/ChamyoErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/ChamyoErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/mouda/backend/moim/exception/ChamyoException.java b/backend/src/main/java/mouda/backend/api/moim/exception/ChamyoException.java similarity index 71% rename from backend/src/main/java/mouda/backend/moim/exception/ChamyoException.java rename to backend/src/main/java/mouda/backend/api/moim/exception/ChamyoException.java index 5836a2261..508d1596a 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/ChamyoException.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/ChamyoException.java @@ -1,8 +1,8 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class ChamyoException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/moim/exception/ChatErrorMessage.java b/backend/src/main/java/mouda/backend/api/moim/exception/ChatErrorMessage.java similarity index 94% rename from backend/src/main/java/mouda/backend/moim/exception/ChatErrorMessage.java rename to backend/src/main/java/mouda/backend/api/moim/exception/ChatErrorMessage.java index d93b44286..36c9c12e9 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/ChatErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/ChatErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/moim/exception/ChatException.java b/backend/src/main/java/mouda/backend/api/moim/exception/ChatException.java similarity index 70% rename from backend/src/main/java/mouda/backend/moim/exception/ChatException.java rename to backend/src/main/java/mouda/backend/api/moim/exception/ChatException.java index 9391cff8d..2b680b31f 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/ChatException.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/ChatException.java @@ -1,8 +1,8 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class ChatException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/moim/exception/CommentErrorMessage.java b/backend/src/main/java/mouda/backend/api/moim/exception/CommentErrorMessage.java similarity index 90% rename from backend/src/main/java/mouda/backend/moim/exception/CommentErrorMessage.java rename to backend/src/main/java/mouda/backend/api/moim/exception/CommentErrorMessage.java index 2e6af08da..776354adb 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/CommentErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/CommentErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/moim/exception/CommentException.java b/backend/src/main/java/mouda/backend/api/moim/exception/CommentException.java similarity index 71% rename from backend/src/main/java/mouda/backend/moim/exception/CommentException.java rename to backend/src/main/java/mouda/backend/api/moim/exception/CommentException.java index 47b3dd4a8..df2a97a22 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/CommentException.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/CommentException.java @@ -1,8 +1,8 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class CommentException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/moim/exception/MoimErrorMessage.java b/backend/src/main/java/mouda/backend/api/moim/exception/MoimErrorMessage.java similarity index 97% rename from backend/src/main/java/mouda/backend/moim/exception/MoimErrorMessage.java rename to backend/src/main/java/mouda/backend/api/moim/exception/MoimErrorMessage.java index 24cce1745..a3f0dcfe0 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/MoimErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/MoimErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/moim/exception/MoimException.java b/backend/src/main/java/mouda/backend/api/moim/exception/MoimException.java similarity index 70% rename from backend/src/main/java/mouda/backend/moim/exception/MoimException.java rename to backend/src/main/java/mouda/backend/api/moim/exception/MoimException.java index 9768edf1e..04b3caa73 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/MoimException.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/MoimException.java @@ -1,8 +1,8 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class MoimException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/moim/exception/ZzimErrorMessage.java b/backend/src/main/java/mouda/backend/api/moim/exception/ZzimErrorMessage.java similarity index 83% rename from backend/src/main/java/mouda/backend/moim/exception/ZzimErrorMessage.java rename to backend/src/main/java/mouda/backend/api/moim/exception/ZzimErrorMessage.java index c8cc00ca0..1fbe3a249 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/ZzimErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/ZzimErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/mouda/backend/moim/exception/ZzimException.java b/backend/src/main/java/mouda/backend/api/moim/exception/ZzimException.java similarity index 70% rename from backend/src/main/java/mouda/backend/moim/exception/ZzimException.java rename to backend/src/main/java/mouda/backend/api/moim/exception/ZzimException.java index b4cf86b00..73188578b 100644 --- a/backend/src/main/java/mouda/backend/moim/exception/ZzimException.java +++ b/backend/src/main/java/mouda/backend/api/moim/exception/ZzimException.java @@ -1,8 +1,8 @@ -package mouda.backend.moim.exception; +package mouda.backend.api.moim.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class ZzimException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/api/moim/implement/ChamyoFinder.java b/backend/src/main/java/mouda/backend/api/moim/implement/ChamyoFinder.java new file mode 100644 index 000000000..b8b3671fa --- /dev/null +++ b/backend/src/main/java/mouda/backend/api/moim/implement/ChamyoFinder.java @@ -0,0 +1,39 @@ +package mouda.backend.api.moim.implement; + +import java.util.Optional; + +import org.springframework.stereotype.Component; + +import lombok.RequiredArgsConstructor; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chamyo; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; + +@Component +@RequiredArgsConstructor +public class ChamyoFinder { + + private final ChamyoValidator chamyoValidator; + private final ChamyoRepository chamyoRepository; + + public Chamyo read(Moim moim, DarakbangMember darakbangMember) { + Chamyo chamyo = find(moim.getId(), darakbangMember).orElseThrow(); + chamyoValidator.validateInDarakbang(chamyo.getMoim(), darakbangMember.getDarakbang().getId()); + return chamyo; + } + + private Optional find(long moimId, DarakbangMember darakbangMember) { + return chamyoRepository.findByMoimIdAndDarakbangMemberId(moimId, + darakbangMember.getId()); + } + + public MoimRole readMoimRole(Moim moim, DarakbangMember darakbangMember) { + Optional chamyo = find(moim.getId(), darakbangMember); + if (chamyo.isPresent()) { + return chamyo.get().getMoimRole(); + } + return MoimRole.NON_MOIMEE; + } +} diff --git a/backend/src/main/java/mouda/backend/api/moim/implement/ChamyoValidator.java b/backend/src/main/java/mouda/backend/api/moim/implement/ChamyoValidator.java new file mode 100644 index 000000000..e981466bc --- /dev/null +++ b/backend/src/main/java/mouda/backend/api/moim/implement/ChamyoValidator.java @@ -0,0 +1,20 @@ +package mouda.backend.api.moim.implement; + +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; + +import lombok.RequiredArgsConstructor; +import mouda.backend.api.moim.exception.ChamyoErrorMessage; +import mouda.backend.api.moim.exception.ChamyoException; +import mouda.backend.core.domain.moim.Moim; + +@Component +@RequiredArgsConstructor +public class ChamyoValidator { + + public void validateInDarakbang(Moim moim, long darakbangId) { + if (moim.isNotInDarakbang(darakbangId)) { + throw new ChamyoException(HttpStatus.BAD_REQUEST, ChamyoErrorMessage.MOIM_NOT_FOUND); + } + } +} diff --git a/backend/src/main/java/mouda/backend/api/moim/implement/MoimFinder.java b/backend/src/main/java/mouda/backend/api/moim/implement/MoimFinder.java new file mode 100644 index 000000000..7c8893521 --- /dev/null +++ b/backend/src/main/java/mouda/backend/api/moim/implement/MoimFinder.java @@ -0,0 +1,22 @@ +package mouda.backend.api.moim.implement; + +import org.springframework.stereotype.Component; + +import lombok.RequiredArgsConstructor; +import mouda.backend.api.moim.infrastructure.MoimRepository; +import mouda.backend.core.domain.moim.Moim; + +@Component +@RequiredArgsConstructor +public class MoimFinder { + + private final MoimRepository moimRepository; + + public Moim find(long moimId, long darakbangId) { + return moimRepository.findByMoimIdAndDarakbangId(moimId, darakbangId) + .orElseThrow(); + // Moim moim = moimRepository.findById(moimId).orElseThrow(); + // moim.isNotInDarakbang(darakbangId); + // return moim; + } +} diff --git a/backend/src/main/java/mouda/backend/moim/infrastructure/ChamyoRepository.java b/backend/src/main/java/mouda/backend/api/moim/infrastructure/ChamyoRepository.java similarity index 88% rename from backend/src/main/java/mouda/backend/moim/infrastructure/ChamyoRepository.java rename to backend/src/main/java/mouda/backend/api/moim/infrastructure/ChamyoRepository.java index 9868ef952..02dc56d86 100644 --- a/backend/src/main/java/mouda/backend/moim/infrastructure/ChamyoRepository.java +++ b/backend/src/main/java/mouda/backend/api/moim/infrastructure/ChamyoRepository.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.infrastructure; +package mouda.backend.api.moim.infrastructure; import java.util.List; import java.util.Optional; @@ -7,8 +7,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import mouda.backend.moim.domain.Chamyo; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.moim.Chamyo; +import mouda.backend.core.domain.moim.Moim; public interface ChamyoRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/moim/infrastructure/ChatRepository.java b/backend/src/main/java/mouda/backend/api/moim/infrastructure/ChatRepository.java similarity index 85% rename from backend/src/main/java/mouda/backend/moim/infrastructure/ChatRepository.java rename to backend/src/main/java/mouda/backend/api/moim/infrastructure/ChatRepository.java index 013cd0d4e..1a3230836 100644 --- a/backend/src/main/java/mouda/backend/moim/infrastructure/ChatRepository.java +++ b/backend/src/main/java/mouda/backend/api/moim/infrastructure/ChatRepository.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.infrastructure; +package mouda.backend.api.moim.infrastructure; import java.util.List; import java.util.Optional; @@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import mouda.backend.moim.domain.Chat; +import mouda.backend.core.domain.moim.Chat; public interface ChatRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/moim/infrastructure/CommentRepository.java b/backend/src/main/java/mouda/backend/api/moim/infrastructure/CommentRepository.java similarity index 83% rename from backend/src/main/java/mouda/backend/moim/infrastructure/CommentRepository.java rename to backend/src/main/java/mouda/backend/api/moim/infrastructure/CommentRepository.java index 36960c448..5f8a887ae 100644 --- a/backend/src/main/java/mouda/backend/moim/infrastructure/CommentRepository.java +++ b/backend/src/main/java/mouda/backend/api/moim/infrastructure/CommentRepository.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.infrastructure; +package mouda.backend.api.moim.infrastructure; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import mouda.backend.moim.domain.Comment; +import mouda.backend.core.domain.moim.Comment; public interface CommentRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/moim/infrastructure/MoimRepository.java b/backend/src/main/java/mouda/backend/api/moim/infrastructure/MoimRepository.java similarity index 82% rename from backend/src/main/java/mouda/backend/moim/infrastructure/MoimRepository.java rename to backend/src/main/java/mouda/backend/api/moim/infrastructure/MoimRepository.java index f82a8e2ee..1b5f1faf1 100644 --- a/backend/src/main/java/mouda/backend/moim/infrastructure/MoimRepository.java +++ b/backend/src/main/java/mouda/backend/api/moim/infrastructure/MoimRepository.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.infrastructure; +package mouda.backend.api.moim.infrastructure; import java.util.List; import java.util.Optional; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import jakarta.persistence.LockModeType; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimStatus; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimStatus; public interface MoimRepository extends JpaRepository { @@ -33,4 +33,6 @@ public interface MoimRepository extends JpaRepository { @Lock(LockModeType.PESSIMISTIC_WRITE) @Query("select m from Moim m where m.id = :moimId") Optional findByIdForUpdate(@Param("moimId") Long moimId); + + Optional findByMoimIdAndDarakbangId(long moimId, long darakbangId); } diff --git a/backend/src/main/java/mouda/backend/moim/infrastructure/ZzimRepository.java b/backend/src/main/java/mouda/backend/api/moim/infrastructure/ZzimRepository.java similarity index 83% rename from backend/src/main/java/mouda/backend/moim/infrastructure/ZzimRepository.java rename to backend/src/main/java/mouda/backend/api/moim/infrastructure/ZzimRepository.java index 014144a28..e7f72451e 100644 --- a/backend/src/main/java/mouda/backend/moim/infrastructure/ZzimRepository.java +++ b/backend/src/main/java/mouda/backend/api/moim/infrastructure/ZzimRepository.java @@ -1,11 +1,11 @@ -package mouda.backend.moim.infrastructure; +package mouda.backend.api.moim.infrastructure; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import mouda.backend.moim.domain.Zzim; +import mouda.backend.core.domain.moim.Zzim; public interface ZzimRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/ChamyoController.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/ChamyoController.java similarity index 77% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/ChamyoController.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/ChamyoController.java index 3d4cdc86d..ee6d9ef45 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/ChamyoController.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/ChamyoController.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller; +package mouda.backend.api.moim.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -12,15 +12,15 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.business.ChamyoService; -import mouda.backend.moim.presentation.controller.swagger.ChamyoSwagger; -import mouda.backend.moim.presentation.request.chamyo.ChamyoCancelRequest; -import mouda.backend.moim.presentation.request.chamyo.MoimChamyoRequest; -import mouda.backend.moim.presentation.response.chamyo.ChamyoFindAllResponses; -import mouda.backend.moim.presentation.response.chamyo.MoimRoleFindResponse; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.moim.business.ChamyoService; +import mouda.backend.api.moim.presentation.controller.swagger.ChamyoSwagger; +import mouda.backend.core.dto.moim.request.chamyo.ChamyoCancelRequest; +import mouda.backend.core.dto.moim.request.chamyo.MoimChamyoRequest; +import mouda.backend.core.dto.moim.response.chamyo.ChamyoFindAllResponses; +import mouda.backend.core.dto.moim.response.chamyo.MoimRoleFindResponse; @RestController @RequestMapping("/v1/darakbang/{darakbangId}/chamyo") diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/ChatController.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/ChatController.java similarity index 81% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/ChatController.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/ChatController.java index 6c0fda1e3..e16e5cd3b 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/ChatController.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/ChatController.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller; +package mouda.backend.api.moim.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -13,17 +13,17 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import mouda.backend.aop.logging.ExceptRequestLogging; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.business.ChatService; -import mouda.backend.moim.presentation.controller.swagger.ChatSwagger; -import mouda.backend.moim.presentation.request.chat.ChatCreateRequest; -import mouda.backend.moim.presentation.request.chat.DateTimeConfirmRequest; -import mouda.backend.moim.presentation.request.chat.LastReadChatRequest; -import mouda.backend.moim.presentation.request.chat.PlaceConfirmRequest; -import mouda.backend.moim.presentation.response.chat.ChatFindUnloadedResponse; -import mouda.backend.moim.presentation.response.chat.ChatPreviewResponses; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.moim.business.ChatService; +import mouda.backend.api.moim.presentation.controller.swagger.ChatSwagger; +import mouda.backend.core.dto.moim.request.chat.ChatCreateRequest; +import mouda.backend.core.dto.moim.request.chat.DateTimeConfirmRequest; +import mouda.backend.core.dto.moim.request.chat.LastReadChatRequest; +import mouda.backend.core.dto.moim.request.chat.PlaceConfirmRequest; +import mouda.backend.core.dto.moim.response.chat.ChatFindUnloadedResponse; +import mouda.backend.core.dto.moim.response.chat.ChatPreviewResponses; @RestController @RequestMapping("/v1/darakbang/{darakbangId}/chat") diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/MoimController.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/MoimController.java similarity index 85% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/MoimController.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/MoimController.java index f6b478445..6765614f2 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/MoimController.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/MoimController.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller; +package mouda.backend.api.moim.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -13,18 +13,18 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.business.MoimService; -import mouda.backend.moim.domain.FilterType; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.presentation.controller.swagger.MoimSwagger; -import mouda.backend.moim.presentation.request.comment.CommentCreateRequest; -import mouda.backend.moim.presentation.request.moim.MoimCreateRequest; -import mouda.backend.moim.presentation.request.moim.MoimEditRequest; -import mouda.backend.moim.presentation.response.moim.MoimDetailsFindResponse; -import mouda.backend.moim.presentation.response.moim.MoimFindAllResponses; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.moim.business.MoimService; +import mouda.backend.core.domain.moim.FilterType; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.presentation.controller.swagger.MoimSwagger; +import mouda.backend.core.dto.moim.request.comment.CommentCreateRequest; +import mouda.backend.core.dto.moim.request.moim.MoimCreateRequest; +import mouda.backend.core.dto.moim.request.moim.MoimEditRequest; +import mouda.backend.core.dto.moim.response.moim.MoimDetailsFindResponse; +import mouda.backend.core.dto.moim.response.moim.MoimFindAllResponses; @RestController @RequestMapping("/v1/darakbang/{darakbangId}/moim") diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/ZzimController.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/ZzimController.java similarity index 74% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/ZzimController.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/ZzimController.java index df7f3d067..78dac71b9 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/ZzimController.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/ZzimController.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller; +package mouda.backend.api.moim.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -11,13 +11,13 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.business.ZzimService; -import mouda.backend.moim.presentation.controller.swagger.ZzimSwagger; -import mouda.backend.moim.presentation.request.zzim.ZzimUpdateRequest; -import mouda.backend.moim.presentation.response.zzim.ZzimCheckResponse; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.moim.business.ZzimService; +import mouda.backend.api.moim.presentation.controller.swagger.ZzimSwagger; +import mouda.backend.core.dto.moim.request.zzim.ZzimUpdateRequest; +import mouda.backend.core.dto.moim.response.zzim.ZzimCheckResponse; @RestController @RequestMapping("/v1/darakbang/{darakbangId}/zzim") diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ChamyoSwagger.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ChamyoSwagger.java similarity index 78% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ChamyoSwagger.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ChamyoSwagger.java index 8ef8c2199..9fd3459ac 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ChamyoSwagger.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ChamyoSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller.swagger; +package mouda.backend.api.moim.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -9,13 +9,13 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.presentation.request.chamyo.ChamyoCancelRequest; -import mouda.backend.moim.presentation.request.chamyo.MoimChamyoRequest; -import mouda.backend.moim.presentation.response.chamyo.ChamyoFindAllResponses; -import mouda.backend.moim.presentation.response.chamyo.MoimRoleFindResponse; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.moim.request.chamyo.ChamyoCancelRequest; +import mouda.backend.core.dto.moim.request.chamyo.MoimChamyoRequest; +import mouda.backend.core.dto.moim.response.chamyo.ChamyoFindAllResponses; +import mouda.backend.core.dto.moim.response.chamyo.MoimRoleFindResponse; public interface ChamyoSwagger { diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ChatSwagger.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ChatSwagger.java similarity index 82% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ChatSwagger.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ChatSwagger.java index 1a3c58377..30fd0639b 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ChatSwagger.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ChatSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller.swagger; +package mouda.backend.api.moim.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -8,15 +8,15 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.presentation.request.chat.ChatCreateRequest; -import mouda.backend.moim.presentation.request.chat.DateTimeConfirmRequest; -import mouda.backend.moim.presentation.request.chat.LastReadChatRequest; -import mouda.backend.moim.presentation.request.chat.PlaceConfirmRequest; -import mouda.backend.moim.presentation.response.chat.ChatFindUnloadedResponse; -import mouda.backend.moim.presentation.response.chat.ChatPreviewResponses; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.moim.request.chat.ChatCreateRequest; +import mouda.backend.core.dto.moim.request.chat.DateTimeConfirmRequest; +import mouda.backend.core.dto.moim.request.chat.LastReadChatRequest; +import mouda.backend.core.dto.moim.request.chat.PlaceConfirmRequest; +import mouda.backend.core.dto.moim.response.chat.ChatFindUnloadedResponse; +import mouda.backend.core.dto.moim.response.chat.ChatPreviewResponses; public interface ChatSwagger { diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/MoimSwagger.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/MoimSwagger.java similarity index 87% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/MoimSwagger.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/MoimSwagger.java index cc3a36666..683737119 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/MoimSwagger.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/MoimSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller.swagger; +package mouda.backend.api.moim.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -9,15 +9,15 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.FilterType; -import mouda.backend.moim.presentation.request.comment.CommentCreateRequest; -import mouda.backend.moim.presentation.request.moim.MoimCreateRequest; -import mouda.backend.moim.presentation.request.moim.MoimEditRequest; -import mouda.backend.moim.presentation.response.moim.MoimDetailsFindResponse; -import mouda.backend.moim.presentation.response.moim.MoimFindAllResponses; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.FilterType; +import mouda.backend.core.dto.moim.request.comment.CommentCreateRequest; +import mouda.backend.core.dto.moim.request.moim.MoimCreateRequest; +import mouda.backend.core.dto.moim.request.moim.MoimEditRequest; +import mouda.backend.core.dto.moim.response.moim.MoimDetailsFindResponse; +import mouda.backend.core.dto.moim.response.moim.MoimFindAllResponses; public interface MoimSwagger { diff --git a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ZzimSwagger.java b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ZzimSwagger.java similarity index 75% rename from backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ZzimSwagger.java rename to backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ZzimSwagger.java index cccd60d36..fb098b339 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/controller/swagger/ZzimSwagger.java +++ b/backend/src/main/java/mouda/backend/api/moim/presentation/controller/swagger/ZzimSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.controller.swagger; +package mouda.backend.api.moim.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -9,11 +9,11 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.presentation.request.zzim.ZzimUpdateRequest; -import mouda.backend.moim.presentation.response.zzim.ZzimCheckResponse; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.moim.request.zzim.ZzimUpdateRequest; +import mouda.backend.core.dto.moim.response.zzim.ZzimCheckResponse; public interface ZzimSwagger { diff --git a/backend/src/main/java/mouda/backend/please/business/InterestService.java b/backend/src/main/java/mouda/backend/api/please/business/InterestService.java similarity index 76% rename from backend/src/main/java/mouda/backend/please/business/InterestService.java rename to backend/src/main/java/mouda/backend/api/please/business/InterestService.java index 75c96a74b..d1f252a4f 100644 --- a/backend/src/main/java/mouda/backend/please/business/InterestService.java +++ b/backend/src/main/java/mouda/backend/api/please/business/InterestService.java @@ -1,18 +1,18 @@ -package mouda.backend.please.business; +package mouda.backend.api.please.business; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.please.domain.Interest; -import mouda.backend.please.domain.Please; -import mouda.backend.please.presentation.request.InterestUpdateRequest; -import mouda.backend.please.exception.PleaseErrorMessage; -import mouda.backend.please.exception.PleaseException; -import mouda.backend.please.infrastructure.InterestRepository; -import mouda.backend.please.infrastructure.PleaseRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.please.Interest; +import mouda.backend.core.domain.please.Please; +import mouda.backend.api.please.exception.PleaseErrorMessage; +import mouda.backend.api.please.exception.PleaseException; +import mouda.backend.api.please.infrastructure.InterestRepository; +import mouda.backend.api.please.infrastructure.PleaseRepository; +import mouda.backend.core.dto.please.request.InterestUpdateRequest; @Service @Transactional diff --git a/backend/src/main/java/mouda/backend/please/business/PleaseService.java b/backend/src/main/java/mouda/backend/api/please/business/PleaseService.java similarity index 73% rename from backend/src/main/java/mouda/backend/please/business/PleaseService.java rename to backend/src/main/java/mouda/backend/api/please/business/PleaseService.java index 2c1523407..18213350e 100644 --- a/backend/src/main/java/mouda/backend/please/business/PleaseService.java +++ b/backend/src/main/java/mouda/backend/api/please/business/PleaseService.java @@ -1,4 +1,4 @@ -package mouda.backend.please.business; +package mouda.backend.api.please.business; import java.util.Comparator; import java.util.List; @@ -8,15 +8,15 @@ import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.please.domain.Please; -import mouda.backend.please.presentation.request.PleaseCreateRequest; -import mouda.backend.please.presentation.response.PleaseFindAllResponse; -import mouda.backend.please.presentation.response.PleaseFindAllResponses; -import mouda.backend.please.exception.PleaseErrorMessage; -import mouda.backend.please.exception.PleaseException; -import mouda.backend.please.infrastructure.InterestRepository; -import mouda.backend.please.infrastructure.PleaseRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.please.Please; +import mouda.backend.api.please.exception.PleaseErrorMessage; +import mouda.backend.api.please.exception.PleaseException; +import mouda.backend.api.please.infrastructure.InterestRepository; +import mouda.backend.api.please.infrastructure.PleaseRepository; +import mouda.backend.core.dto.please.request.PleaseCreateRequest; +import mouda.backend.core.dto.please.response.PleaseFindAllResponse; +import mouda.backend.core.dto.please.response.PleaseFindAllResponses; @Service @Transactional @@ -57,7 +57,9 @@ public PleaseFindAllResponses findAllPlease(Long darakbangId, DarakbangMember da long interestCount = interestRepository.countByPleaseId(please.getId()); return PleaseFindAllResponse.toResponse(please, isInterested, interestCount); }) - .sorted(Comparator.comparing(PleaseFindAllResponse::interestCount).reversed().thenComparing(PleaseFindAllResponse::pleaseId)) + .sorted(Comparator.comparing(PleaseFindAllResponse::interestCount) + .reversed() + .thenComparing(PleaseFindAllResponse::pleaseId)) .toList()); } } diff --git a/backend/src/main/java/mouda/backend/please/exception/PleaseErrorMessage.java b/backend/src/main/java/mouda/backend/api/please/exception/PleaseErrorMessage.java similarity index 92% rename from backend/src/main/java/mouda/backend/please/exception/PleaseErrorMessage.java rename to backend/src/main/java/mouda/backend/api/please/exception/PleaseErrorMessage.java index 9de5a68b5..814623abe 100644 --- a/backend/src/main/java/mouda/backend/please/exception/PleaseErrorMessage.java +++ b/backend/src/main/java/mouda/backend/api/please/exception/PleaseErrorMessage.java @@ -1,4 +1,4 @@ -package mouda.backend.please.exception; +package mouda.backend.api.please.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/please/exception/PleaseException.java b/backend/src/main/java/mouda/backend/api/please/exception/PleaseException.java similarity index 68% rename from backend/src/main/java/mouda/backend/please/exception/PleaseException.java rename to backend/src/main/java/mouda/backend/api/please/exception/PleaseException.java index 4767a1afb..48f4a49a0 100644 --- a/backend/src/main/java/mouda/backend/please/exception/PleaseException.java +++ b/backend/src/main/java/mouda/backend/api/please/exception/PleaseException.java @@ -1,8 +1,8 @@ -package mouda.backend.please.exception; +package mouda.backend.api.please.exception; import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class PleaseException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/please/infrastructure/InterestRepository.java b/backend/src/main/java/mouda/backend/api/please/infrastructure/InterestRepository.java similarity index 80% rename from backend/src/main/java/mouda/backend/please/infrastructure/InterestRepository.java rename to backend/src/main/java/mouda/backend/api/please/infrastructure/InterestRepository.java index 7b1ae4d82..9d5b033b8 100644 --- a/backend/src/main/java/mouda/backend/please/infrastructure/InterestRepository.java +++ b/backend/src/main/java/mouda/backend/api/please/infrastructure/InterestRepository.java @@ -1,10 +1,10 @@ -package mouda.backend.please.infrastructure; +package mouda.backend.api.please.infrastructure; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import mouda.backend.please.domain.Interest; +import mouda.backend.core.domain.please.Interest; public interface InterestRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/please/infrastructure/PleaseRepository.java b/backend/src/main/java/mouda/backend/api/please/infrastructure/PleaseRepository.java similarity index 70% rename from backend/src/main/java/mouda/backend/please/infrastructure/PleaseRepository.java rename to backend/src/main/java/mouda/backend/api/please/infrastructure/PleaseRepository.java index 91353c063..08418a159 100644 --- a/backend/src/main/java/mouda/backend/please/infrastructure/PleaseRepository.java +++ b/backend/src/main/java/mouda/backend/api/please/infrastructure/PleaseRepository.java @@ -1,10 +1,10 @@ -package mouda.backend.please.infrastructure; +package mouda.backend.api.please.infrastructure; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import mouda.backend.please.domain.Please; +import mouda.backend.core.domain.please.Please; public interface PleaseRepository extends JpaRepository { diff --git a/backend/src/main/java/mouda/backend/please/presentation/controller/InterestController.java b/backend/src/main/java/mouda/backend/api/please/presentation/controller/InterestController.java similarity index 69% rename from backend/src/main/java/mouda/backend/please/presentation/controller/InterestController.java rename to backend/src/main/java/mouda/backend/api/please/presentation/controller/InterestController.java index 2f4df8270..535762c31 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/controller/InterestController.java +++ b/backend/src/main/java/mouda/backend/api/please/presentation/controller/InterestController.java @@ -1,4 +1,4 @@ -package mouda.backend.please.presentation.controller; +package mouda.backend.api.please.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RestController; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.please.business.InterestService; -import mouda.backend.please.presentation.controller.swagger.InterestSwagger; -import mouda.backend.please.presentation.request.InterestUpdateRequest; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.please.business.InterestService; +import mouda.backend.api.please.presentation.controller.swagger.InterestSwagger; +import mouda.backend.core.dto.please.request.InterestUpdateRequest; @RestController @RequestMapping("/v1/darakbang/{darakbangId}/interest") diff --git a/backend/src/main/java/mouda/backend/please/presentation/controller/PleaseController.java b/backend/src/main/java/mouda/backend/api/please/presentation/controller/PleaseController.java similarity index 75% rename from backend/src/main/java/mouda/backend/please/presentation/controller/PleaseController.java rename to backend/src/main/java/mouda/backend/api/please/presentation/controller/PleaseController.java index d0f0cb0b6..425528299 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/controller/PleaseController.java +++ b/backend/src/main/java/mouda/backend/api/please/presentation/controller/PleaseController.java @@ -1,4 +1,4 @@ -package mouda.backend.please.presentation.controller; +package mouda.backend.api.please.presentation.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -11,14 +11,14 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.please.business.PleaseService; -import mouda.backend.please.domain.Please; -import mouda.backend.please.presentation.controller.swagger.PleaseSwagger; -import mouda.backend.please.presentation.request.PleaseCreateRequest; -import mouda.backend.please.presentation.response.PleaseFindAllResponses; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.please.business.PleaseService; +import mouda.backend.core.domain.please.Please; +import mouda.backend.api.please.presentation.controller.swagger.PleaseSwagger; +import mouda.backend.core.dto.please.request.PleaseCreateRequest; +import mouda.backend.core.dto.please.response.PleaseFindAllResponses; @RestController @RequiredArgsConstructor diff --git a/backend/src/main/java/mouda/backend/please/presentation/controller/swagger/InterestSwagger.java b/backend/src/main/java/mouda/backend/api/please/presentation/controller/swagger/InterestSwagger.java similarity index 73% rename from backend/src/main/java/mouda/backend/please/presentation/controller/swagger/InterestSwagger.java rename to backend/src/main/java/mouda/backend/api/please/presentation/controller/swagger/InterestSwagger.java index ae4ecd9a3..fed5ec30d 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/controller/swagger/InterestSwagger.java +++ b/backend/src/main/java/mouda/backend/api/please/presentation/controller/swagger/InterestSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.please.presentation.controller.swagger; +package mouda.backend.api.please.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -7,9 +7,9 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.please.presentation.request.InterestUpdateRequest; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.please.request.InterestUpdateRequest; public interface InterestSwagger { diff --git a/backend/src/main/java/mouda/backend/please/presentation/controller/swagger/PleaseSwagger.java b/backend/src/main/java/mouda/backend/api/please/presentation/controller/swagger/PleaseSwagger.java similarity index 79% rename from backend/src/main/java/mouda/backend/please/presentation/controller/swagger/PleaseSwagger.java rename to backend/src/main/java/mouda/backend/api/please/presentation/controller/swagger/PleaseSwagger.java index a687562bd..9aba89595 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/controller/swagger/PleaseSwagger.java +++ b/backend/src/main/java/mouda/backend/api/please/presentation/controller/swagger/PleaseSwagger.java @@ -1,4 +1,4 @@ -package mouda.backend.please.presentation.controller.swagger; +package mouda.backend.api.please.presentation.controller.swagger; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -8,11 +8,11 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; -import mouda.backend.common.config.argumentresolver.LoginDarakbangMember; -import mouda.backend.common.response.RestResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.please.presentation.request.PleaseCreateRequest; -import mouda.backend.please.presentation.response.PleaseFindAllResponses; +import mouda.backend.api.common.config.argumentresolver.LoginDarakbangMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.dto.please.request.PleaseCreateRequest; +import mouda.backend.core.dto.please.response.PleaseFindAllResponses; public interface PleaseSwagger { diff --git a/backend/src/main/java/mouda/backend/auth/exception/AuthException.java b/backend/src/main/java/mouda/backend/auth/exception/AuthException.java deleted file mode 100644 index f11e389e9..000000000 --- a/backend/src/main/java/mouda/backend/auth/exception/AuthException.java +++ /dev/null @@ -1,11 +0,0 @@ -package mouda.backend.auth.exception; - -import mouda.backend.common.exception.MoudaException; -import org.springframework.http.HttpStatus; - -public class AuthException extends MoudaException { - - public AuthException(HttpStatus httpStatus, AuthErrorMessage authErrorMessage) { - super(httpStatus, authErrorMessage.getMessage()); - } -} diff --git a/backend/src/main/java/mouda/backend/auth/presentation/request/OauthRequest.java b/backend/src/main/java/mouda/backend/auth/presentation/request/OauthRequest.java deleted file mode 100644 index 42b8a8491..000000000 --- a/backend/src/main/java/mouda/backend/auth/presentation/request/OauthRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package mouda.backend.auth.presentation.request; - -public record OauthRequest( - String code -) { -} diff --git a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginMemberArgumentResolver.java b/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginMemberArgumentResolver.java deleted file mode 100644 index 74b1382bf..000000000 --- a/backend/src/main/java/mouda/backend/common/config/argumentresolver/LoginMemberArgumentResolver.java +++ /dev/null @@ -1,37 +0,0 @@ -package mouda.backend.common.config.argumentresolver; - -import lombok.RequiredArgsConstructor; -import mouda.backend.auth.business.AuthService; -import org.springframework.core.MethodParameter; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.support.WebDataBinderFactory; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.method.support.ModelAndViewContainer; - -@Component -@RequiredArgsConstructor -public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver { - - private final AuthService authService; - - @Override - public boolean supportsParameter(MethodParameter parameter) { - return parameter.hasParameterAnnotation(LoginMember.class); - } - - @Override - public Object resolveArgument( - MethodParameter parameter, ModelAndViewContainer mavContainer, - NativeWebRequest webRequest, WebDataBinderFactory binderFactory - ) throws Exception { - String authorizationHeader = webRequest.getHeader("Authorization"); - - String token = extractToken(authorizationHeader); - return authService.findMember(token); - } - - private String extractToken(String authorizationHeader) { - return authorizationHeader.substring(7); - } -} diff --git a/backend/src/main/java/mouda/backend/darakbangmember/domain/DarakBangMemberRole.java b/backend/src/main/java/mouda/backend/core/domain/darakbang/DarakBangMemberRole.java similarity index 65% rename from backend/src/main/java/mouda/backend/darakbangmember/domain/DarakBangMemberRole.java rename to backend/src/main/java/mouda/backend/core/domain/darakbang/DarakBangMemberRole.java index a26760f09..7fa1951b0 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/domain/DarakBangMemberRole.java +++ b/backend/src/main/java/mouda/backend/core/domain/darakbang/DarakBangMemberRole.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.domain; +package mouda.backend.core.domain.darakbang; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/darakbang/domain/Darakbang.java b/backend/src/main/java/mouda/backend/core/domain/darakbang/Darakbang.java similarity index 83% rename from backend/src/main/java/mouda/backend/darakbang/domain/Darakbang.java rename to backend/src/main/java/mouda/backend/core/domain/darakbang/Darakbang.java index c3ad3af42..891db7ddb 100644 --- a/backend/src/main/java/mouda/backend/darakbang/domain/Darakbang.java +++ b/backend/src/main/java/mouda/backend/core/domain/darakbang/Darakbang.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbang.domain; +package mouda.backend.core.domain.darakbang; import org.springframework.http.HttpStatus; @@ -10,8 +10,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.darakbang.exception.DarakbangErrorMessage; -import mouda.backend.darakbang.exception.DarakbangException; +import mouda.backend.api.darakbang.exception.DarakbangErrorMessage; +import mouda.backend.api.darakbang.exception.DarakbangException; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/darakbangmember/domain/DarakbangMember.java b/backend/src/main/java/mouda/backend/core/domain/darakbang/DarakbangMember.java similarity index 86% rename from backend/src/main/java/mouda/backend/darakbangmember/domain/DarakbangMember.java rename to backend/src/main/java/mouda/backend/core/domain/darakbang/DarakbangMember.java index 42b0118f7..5022d1631 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/domain/DarakbangMember.java +++ b/backend/src/main/java/mouda/backend/core/domain/darakbang/DarakbangMember.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.domain; +package mouda.backend.core.domain.darakbang; import org.springframework.http.HttpStatus; @@ -15,9 +15,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbangmember.exception.DarakbangMemberErrorMessage; -import mouda.backend.darakbangmember.exception.DarakbangMemberException; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberErrorMessage; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberException; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/member/domain/Member.java b/backend/src/main/java/mouda/backend/core/domain/member/Member.java similarity index 89% rename from backend/src/main/java/mouda/backend/member/domain/Member.java rename to backend/src/main/java/mouda/backend/core/domain/member/Member.java index df4ba11b5..2c23485c7 100644 --- a/backend/src/main/java/mouda/backend/member/domain/Member.java +++ b/backend/src/main/java/mouda/backend/core/domain/member/Member.java @@ -1,4 +1,4 @@ -package mouda.backend.member.domain; +package mouda.backend.core.domain.member; import java.util.Objects; @@ -11,8 +11,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.moim.exception.MoimErrorMessage; -import mouda.backend.moim.exception.MoimException; +import mouda.backend.api.moim.exception.MoimErrorMessage; +import mouda.backend.api.moim.exception.MoimException; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/moim/domain/Chamyo.java b/backend/src/main/java/mouda/backend/core/domain/moim/Chamyo.java similarity index 91% rename from backend/src/main/java/mouda/backend/moim/domain/Chamyo.java rename to backend/src/main/java/mouda/backend/core/domain/moim/Chamyo.java index 9386cd9bb..f58fa8c2e 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/Chamyo.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/Chamyo.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -12,7 +12,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/moim/domain/Chat.java b/backend/src/main/java/mouda/backend/core/domain/moim/Chat.java similarity index 92% rename from backend/src/main/java/mouda/backend/moim/domain/Chat.java rename to backend/src/main/java/mouda/backend/core/domain/moim/Chat.java index f286af428..8065c6a0b 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/Chat.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/Chat.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; import java.time.LocalDate; import java.time.LocalTime; @@ -13,7 +13,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/moim/domain/ChatType.java b/backend/src/main/java/mouda/backend/core/domain/moim/ChatType.java similarity index 56% rename from backend/src/main/java/mouda/backend/moim/domain/ChatType.java rename to backend/src/main/java/mouda/backend/core/domain/moim/ChatType.java index 777f0f6fa..deb2dd5fd 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/ChatType.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/ChatType.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; public enum ChatType { diff --git a/backend/src/main/java/mouda/backend/moim/domain/Comment.java b/backend/src/main/java/mouda/backend/core/domain/moim/Comment.java similarity index 89% rename from backend/src/main/java/mouda/backend/moim/domain/Comment.java rename to backend/src/main/java/mouda/backend/core/domain/moim/Comment.java index 0f0ab5b42..bebd0fe8b 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/Comment.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/Comment.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; import java.time.LocalDateTime; @@ -14,9 +14,9 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.exception.CommentErrorMessage; -import mouda.backend.moim.exception.CommentException; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.moim.exception.CommentErrorMessage; +import mouda.backend.api.moim.exception.CommentException; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/moim/domain/FilterType.java b/backend/src/main/java/mouda/backend/core/domain/moim/FilterType.java similarity index 56% rename from backend/src/main/java/mouda/backend/moim/domain/FilterType.java rename to backend/src/main/java/mouda/backend/core/domain/moim/FilterType.java index c846c53bf..0c74d21c2 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/FilterType.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/FilterType.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; public enum FilterType { ALL, diff --git a/backend/src/main/java/mouda/backend/moim/domain/Moim.java b/backend/src/main/java/mouda/backend/core/domain/moim/Moim.java similarity index 97% rename from backend/src/main/java/mouda/backend/moim/domain/Moim.java rename to backend/src/main/java/mouda/backend/core/domain/moim/Moim.java index d109276cf..57256bdf5 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/Moim.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/Moim.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; import java.time.LocalDate; import java.time.LocalDateTime; @@ -17,8 +17,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.moim.exception.MoimErrorMessage; -import mouda.backend.moim.exception.MoimException; +import mouda.backend.api.moim.exception.MoimErrorMessage; +import mouda.backend.api.moim.exception.MoimException; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/moim/domain/MoimRole.java b/backend/src/main/java/mouda/backend/core/domain/moim/MoimRole.java similarity index 68% rename from backend/src/main/java/mouda/backend/moim/domain/MoimRole.java rename to backend/src/main/java/mouda/backend/core/domain/moim/MoimRole.java index 262f1f494..01bc6e8a0 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/MoimRole.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/MoimRole.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/moim/domain/MoimStatus.java b/backend/src/main/java/mouda/backend/core/domain/moim/MoimStatus.java similarity index 68% rename from backend/src/main/java/mouda/backend/moim/domain/MoimStatus.java rename to backend/src/main/java/mouda/backend/core/domain/moim/MoimStatus.java index 421456331..b1ee82fa8 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/MoimStatus.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/MoimStatus.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; import lombok.Getter; diff --git a/backend/src/main/java/mouda/backend/moim/domain/Zzim.java b/backend/src/main/java/mouda/backend/core/domain/moim/Zzim.java similarity index 87% rename from backend/src/main/java/mouda/backend/moim/domain/Zzim.java rename to backend/src/main/java/mouda/backend/core/domain/moim/Zzim.java index f720ae1f0..da072b28d 100644 --- a/backend/src/main/java/mouda/backend/moim/domain/Zzim.java +++ b/backend/src/main/java/mouda/backend/core/domain/moim/Zzim.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.domain; +package mouda.backend.core.domain.moim; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -9,7 +9,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/please/domain/Interest.java b/backend/src/main/java/mouda/backend/core/domain/please/Interest.java similarity index 84% rename from backend/src/main/java/mouda/backend/please/domain/Interest.java rename to backend/src/main/java/mouda/backend/core/domain/please/Interest.java index 721ac3a10..2574b0a29 100644 --- a/backend/src/main/java/mouda/backend/please/domain/Interest.java +++ b/backend/src/main/java/mouda/backend/core/domain/please/Interest.java @@ -1,4 +1,4 @@ -package mouda.backend.please.domain; +package mouda.backend.core.domain.please; import org.springframework.http.HttpStatus; @@ -11,9 +11,9 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.please.exception.PleaseErrorMessage; -import mouda.backend.please.exception.PleaseException; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.please.exception.PleaseErrorMessage; +import mouda.backend.api.please.exception.PleaseException; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/please/domain/Please.java b/backend/src/main/java/mouda/backend/core/domain/please/Please.java similarity index 90% rename from backend/src/main/java/mouda/backend/please/domain/Please.java rename to backend/src/main/java/mouda/backend/core/domain/please/Please.java index 3f53884fc..ff0d71578 100644 --- a/backend/src/main/java/mouda/backend/please/domain/Please.java +++ b/backend/src/main/java/mouda/backend/core/domain/please/Please.java @@ -1,4 +1,4 @@ -package mouda.backend.please.domain; +package mouda.backend.core.domain.please; import org.springframework.http.HttpStatus; @@ -10,8 +10,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import mouda.backend.please.exception.PleaseErrorMessage; -import mouda.backend.please.exception.PleaseException; +import mouda.backend.api.please.exception.PleaseErrorMessage; +import mouda.backend.api.please.exception.PleaseException; @Entity @Getter diff --git a/backend/src/main/java/mouda/backend/auth/presentation/request/LoginRequest.java b/backend/src/main/java/mouda/backend/core/dto/auth/request/LoginRequest.java similarity index 50% rename from backend/src/main/java/mouda/backend/auth/presentation/request/LoginRequest.java rename to backend/src/main/java/mouda/backend/core/dto/auth/request/LoginRequest.java index bf0c8cddc..ffddcdfbc 100644 --- a/backend/src/main/java/mouda/backend/auth/presentation/request/LoginRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/auth/request/LoginRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.presentation.request; +package mouda.backend.core.dto.auth.request; public record LoginRequest(String nickname) { diff --git a/backend/src/main/java/mouda/backend/core/dto/auth/request/OauthRequest.java b/backend/src/main/java/mouda/backend/core/dto/auth/request/OauthRequest.java new file mode 100644 index 000000000..386365f14 --- /dev/null +++ b/backend/src/main/java/mouda/backend/core/dto/auth/request/OauthRequest.java @@ -0,0 +1,6 @@ +package mouda.backend.core.dto.auth.request; + +public record OauthRequest( + String code +) { +} diff --git a/backend/src/main/java/mouda/backend/auth/presentation/response/LoginResponse.java b/backend/src/main/java/mouda/backend/core/dto/auth/response/LoginResponse.java similarity index 51% rename from backend/src/main/java/mouda/backend/auth/presentation/response/LoginResponse.java rename to backend/src/main/java/mouda/backend/core/dto/auth/response/LoginResponse.java index 067496939..29b91b6b8 100644 --- a/backend/src/main/java/mouda/backend/auth/presentation/response/LoginResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/auth/response/LoginResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.presentation.response; +package mouda.backend.core.dto.auth.response; public record LoginResponse(String accessToken) { diff --git a/backend/src/main/java/mouda/backend/auth/presentation/response/OauthResponse.java b/backend/src/main/java/mouda/backend/core/dto/auth/response/OauthResponse.java similarity index 51% rename from backend/src/main/java/mouda/backend/auth/presentation/response/OauthResponse.java rename to backend/src/main/java/mouda/backend/core/dto/auth/response/OauthResponse.java index d268a8a1e..335ce0d86 100644 --- a/backend/src/main/java/mouda/backend/auth/presentation/response/OauthResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/auth/response/OauthResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.auth.presentation.response; +package mouda.backend.core.dto.auth.response; public record OauthResponse( String id_token diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/request/DarakbangCreateRequest.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/request/DarakbangCreateRequest.java similarity index 71% rename from backend/src/main/java/mouda/backend/darakbang/presentation/request/DarakbangCreateRequest.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/request/DarakbangCreateRequest.java index 347ce29e2..cfa223530 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/request/DarakbangCreateRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/request/DarakbangCreateRequest.java @@ -1,7 +1,7 @@ -package mouda.backend.darakbang.presentation.request; +package mouda.backend.core.dto.darakbang.request; import jakarta.validation.constraints.NotNull; -import mouda.backend.darakbang.domain.Darakbang; +import mouda.backend.core.domain.darakbang.Darakbang; public record DarakbangCreateRequest( @NotNull diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/request/DarakbangEnterRequest.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/request/DarakbangEnterRequest.java similarity index 56% rename from backend/src/main/java/mouda/backend/darakbang/presentation/request/DarakbangEnterRequest.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/request/DarakbangEnterRequest.java index 228b21037..5f94125ed 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/request/DarakbangEnterRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/request/DarakbangEnterRequest.java @@ -1,10 +1,10 @@ -package mouda.backend.darakbang.presentation.request; +package mouda.backend.core.dto.darakbang.request; import jakarta.validation.constraints.NotNull; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbangmember.domain.DarakBangMemberRole; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.domain.Member; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.core.domain.darakbang.DarakBangMemberRole; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.member.Member; public record DarakbangEnterRequest( @NotNull diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/response/CodeValidationResponse.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/CodeValidationResponse.java similarity index 74% rename from backend/src/main/java/mouda/backend/darakbang/presentation/response/CodeValidationResponse.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/CodeValidationResponse.java index 7e2dc3238..5a898e654 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/response/CodeValidationResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/CodeValidationResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.darakbang.presentation.response; +package mouda.backend.core.dto.darakbang.response; import lombok.Builder; -import mouda.backend.darakbang.domain.Darakbang; +import mouda.backend.core.domain.darakbang.Darakbang; @Builder public record CodeValidationResponse( diff --git a/backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberResponse.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberResponse.java similarity index 75% rename from backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberResponse.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberResponse.java index 908b33de3..a52ebaea4 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.darakbangmember.presentation.response; +package mouda.backend.core.dto.darakbang.response; import lombok.Builder; -import mouda.backend.darakbangmember.domain.DarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; @Builder public record DarakbangMemberResponse( diff --git a/backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberResponses.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberResponses.java similarity index 86% rename from backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberResponses.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberResponses.java index a9c2f3257..1be527fee 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberResponses.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberResponses.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbangmember.presentation.response; +package mouda.backend.core.dto.darakbang.response; import java.util.List; diff --git a/backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberRoleResponse.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberRoleResponse.java similarity index 78% rename from backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberRoleResponse.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberRoleResponse.java index 5f147c4b1..ca15e8eb9 100644 --- a/backend/src/main/java/mouda/backend/darakbangmember/presentation/response/DarakbangMemberRoleResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangMemberRoleResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.darakbangmember.presentation.response; +package mouda.backend.core.dto.darakbang.response; import lombok.Builder; -import mouda.backend.darakbangmember.domain.DarakBangMemberRole; +import mouda.backend.core.domain.darakbang.DarakBangMemberRole; @Builder public record DarakbangMemberRoleResponse( diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangNameResponse.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangNameResponse.java similarity index 70% rename from backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangNameResponse.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangNameResponse.java index 43652408f..30db4ad1d 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangNameResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangNameResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.darakbang.presentation.response; +package mouda.backend.core.dto.darakbang.response; import lombok.Builder; -import mouda.backend.darakbang.domain.Darakbang; +import mouda.backend.core.domain.darakbang.Darakbang; @Builder public record DarakbangNameResponse( diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangResponse.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangResponse.java similarity index 74% rename from backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangResponse.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangResponse.java index 90294bc39..87aaebcbe 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.darakbang.presentation.response; +package mouda.backend.core.dto.darakbang.response; import lombok.Builder; -import mouda.backend.darakbangmember.domain.DarakbangMember; +import mouda.backend.core.domain.darakbang.DarakbangMember; @Builder public record DarakbangResponse( diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangResponses.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangResponses.java similarity index 84% rename from backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangResponses.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangResponses.java index d176c97e0..89ae4a66b 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/response/DarakbangResponses.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/DarakbangResponses.java @@ -1,4 +1,4 @@ -package mouda.backend.darakbang.presentation.response; +package mouda.backend.core.dto.darakbang.response; import java.util.List; @@ -8,7 +8,7 @@ public record DarakbangResponses( List darakbangResponses ) { - + public static DarakbangResponses toResponse(List responses) { return DarakbangResponses.builder() .darakbangResponses(responses) diff --git a/backend/src/main/java/mouda/backend/darakbang/presentation/response/InvitationCodeResponse.java b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/InvitationCodeResponse.java similarity index 70% rename from backend/src/main/java/mouda/backend/darakbang/presentation/response/InvitationCodeResponse.java rename to backend/src/main/java/mouda/backend/core/dto/darakbang/response/InvitationCodeResponse.java index ec8508f7d..7fa4befc1 100644 --- a/backend/src/main/java/mouda/backend/darakbang/presentation/response/InvitationCodeResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/darakbang/response/InvitationCodeResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.darakbang.presentation.response; +package mouda.backend.core.dto.darakbang.response; import lombok.Builder; -import mouda.backend.darakbang.domain.Darakbang; +import mouda.backend.core.domain.darakbang.Darakbang; @Builder public record InvitationCodeResponse( diff --git a/backend/src/main/java/mouda/backend/member/presentation/response/MemberFindResponse.java b/backend/src/main/java/mouda/backend/core/dto/member/response/MemberFindResponse.java similarity index 59% rename from backend/src/main/java/mouda/backend/member/presentation/response/MemberFindResponse.java rename to backend/src/main/java/mouda/backend/core/dto/member/response/MemberFindResponse.java index daf89b5dd..302be50ee 100644 --- a/backend/src/main/java/mouda/backend/member/presentation/response/MemberFindResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/member/response/MemberFindResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.member.presentation.response; +package mouda.backend.core.dto.member.response; public record MemberFindResponse( String nickname, diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/chamyo/ChamyoCancelRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/chamyo/ChamyoCancelRequest.java similarity index 75% rename from backend/src/main/java/mouda/backend/moim/presentation/request/chamyo/ChamyoCancelRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/chamyo/ChamyoCancelRequest.java index ce517cdf6..3d593be3e 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/chamyo/ChamyoCancelRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/chamyo/ChamyoCancelRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.request.chamyo; +package mouda.backend.core.dto.moim.request.chamyo; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/chamyo/MoimChamyoRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/chamyo/MoimChamyoRequest.java similarity index 75% rename from backend/src/main/java/mouda/backend/moim/presentation/request/chamyo/MoimChamyoRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/chamyo/MoimChamyoRequest.java index 8de16a6d2..56c9c8e5f 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/chamyo/MoimChamyoRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/chamyo/MoimChamyoRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.request.chamyo; +package mouda.backend.core.dto.moim.request.chamyo; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/ChatCreateRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/ChatCreateRequest.java similarity index 67% rename from backend/src/main/java/mouda/backend/moim/presentation/request/chat/ChatCreateRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/chat/ChatCreateRequest.java index ab3aabe56..719784cce 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/ChatCreateRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/ChatCreateRequest.java @@ -1,14 +1,14 @@ -package mouda.backend.moim.presentation.request.chat; +package mouda.backend.core.dto.moim.request.chat; import java.time.LocalDate; import java.time.LocalTime; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.ChatType; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.ChatType; +import mouda.backend.core.domain.moim.Moim; public record ChatCreateRequest( @NotNull diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/DateTimeConfirmRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/DateTimeConfirmRequest.java similarity index 68% rename from backend/src/main/java/mouda/backend/moim/presentation/request/chat/DateTimeConfirmRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/chat/DateTimeConfirmRequest.java index 3a7e47ea7..343c4d7ef 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/DateTimeConfirmRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/DateTimeConfirmRequest.java @@ -1,13 +1,13 @@ -package mouda.backend.moim.presentation.request.chat; +package mouda.backend.core.dto.moim.request.chat; import java.time.LocalDate; import java.time.LocalTime; import jakarta.validation.constraints.NotNull; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.ChatType; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.ChatType; +import mouda.backend.core.domain.moim.Moim; public record DateTimeConfirmRequest( @NotNull diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/LastReadChatRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/LastReadChatRequest.java similarity index 73% rename from backend/src/main/java/mouda/backend/moim/presentation/request/chat/LastReadChatRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/chat/LastReadChatRequest.java index 5852420de..62284ab18 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/LastReadChatRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/LastReadChatRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.request.chat; +package mouda.backend.core.dto.moim.request.chat; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/PlaceConfirmRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/PlaceConfirmRequest.java similarity index 67% rename from backend/src/main/java/mouda/backend/moim/presentation/request/chat/PlaceConfirmRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/chat/PlaceConfirmRequest.java index 6bf9ce997..0f1cc4964 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/chat/PlaceConfirmRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/chat/PlaceConfirmRequest.java @@ -1,14 +1,14 @@ -package mouda.backend.moim.presentation.request.chat; +package mouda.backend.core.dto.moim.request.chat; import java.time.LocalDate; import java.time.LocalTime; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.ChatType; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.ChatType; +import mouda.backend.core.domain.moim.Moim; public record PlaceConfirmRequest( @NotNull diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/comment/CommentCreateRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/comment/CommentCreateRequest.java similarity index 66% rename from backend/src/main/java/mouda/backend/moim/presentation/request/comment/CommentCreateRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/comment/CommentCreateRequest.java index 45c64d498..67522eac6 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/comment/CommentCreateRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/comment/CommentCreateRequest.java @@ -1,11 +1,11 @@ -package mouda.backend.moim.presentation.request.comment; +package mouda.backend.core.dto.moim.request.comment; import java.time.LocalDateTime; import jakarta.validation.constraints.NotNull; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Comment; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Comment; +import mouda.backend.core.domain.moim.Moim; public record CommentCreateRequest( Long parentId, diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimCreateRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimCreateRequest.java similarity index 85% rename from backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimCreateRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimCreateRequest.java index dcdcfbc3c..1b901587b 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimCreateRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimCreateRequest.java @@ -1,11 +1,11 @@ -package mouda.backend.moim.presentation.request.moim; +package mouda.backend.core.dto.moim.request.moim; import java.time.LocalDate; import java.time.LocalTime; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.moim.Moim; public record MoimCreateRequest( @NotBlank diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimEditRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimEditRequest.java similarity index 88% rename from backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimEditRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimEditRequest.java index 86beb3e94..71faf1653 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimEditRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimEditRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.request.moim; +package mouda.backend.core.dto.moim.request.moim; import java.time.LocalDate; import java.time.LocalTime; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimJoinRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimJoinRequest.java similarity index 82% rename from backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimJoinRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimJoinRequest.java index 5107ce18c..d9b362e73 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/moim/MoimJoinRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/moim/MoimJoinRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.request.moim; +package mouda.backend.core.dto.moim.request.moim; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/request/zzim/ZzimUpdateRequest.java b/backend/src/main/java/mouda/backend/core/dto/moim/request/zzim/ZzimUpdateRequest.java similarity index 75% rename from backend/src/main/java/mouda/backend/moim/presentation/request/zzim/ZzimUpdateRequest.java rename to backend/src/main/java/mouda/backend/core/dto/moim/request/zzim/ZzimUpdateRequest.java index 3881187b6..7194c91fa 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/request/zzim/ZzimUpdateRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/request/zzim/ZzimUpdateRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.request.zzim; +package mouda.backend.core.dto.moim.request.zzim; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/ChamyoFindAllResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/ChamyoFindAllResponse.java similarity index 78% rename from backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/ChamyoFindAllResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/ChamyoFindAllResponse.java index 2705f70eb..47e8119ea 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/ChamyoFindAllResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/ChamyoFindAllResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.moim.presentation.response.chamyo; +package mouda.backend.core.dto.moim.response.chamyo; import lombok.Builder; -import mouda.backend.moim.domain.Chamyo; +import mouda.backend.core.domain.moim.Chamyo; @Builder public record ChamyoFindAllResponse( diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/ChamyoFindAllResponses.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/ChamyoFindAllResponses.java similarity index 65% rename from backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/ChamyoFindAllResponses.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/ChamyoFindAllResponses.java index 76f7f0807..b20580bb9 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/ChamyoFindAllResponses.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/ChamyoFindAllResponses.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.response.chamyo; +package mouda.backend.core.dto.moim.response.chamyo; import java.util.List; diff --git a/backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/MoimRoleFindResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/MoimRoleFindResponse.java new file mode 100644 index 000000000..c545b3e0a --- /dev/null +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/chamyo/MoimRoleFindResponse.java @@ -0,0 +1,6 @@ +package mouda.backend.core.dto.moim.response.chamyo; + +public record MoimRoleFindResponse( + String role +) { +} diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatFindDetailResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatFindDetailResponse.java similarity index 81% rename from backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatFindDetailResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatFindDetailResponse.java index 7addbaa6d..9307d3097 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatFindDetailResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatFindDetailResponse.java @@ -1,11 +1,11 @@ -package mouda.backend.moim.presentation.response.chat; +package mouda.backend.core.dto.moim.response.chat; import java.time.LocalDate; import java.time.LocalTime; import lombok.Builder; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.ChatType; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.ChatType; @Builder public record ChatFindDetailResponse( diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatFindUnloadedResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatFindUnloadedResponse.java similarity index 66% rename from backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatFindUnloadedResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatFindUnloadedResponse.java index 4b7c5efb6..7544a6ab6 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatFindUnloadedResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatFindUnloadedResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.response.chat; +package mouda.backend.core.dto.moim.response.chat; import java.util.List; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatPreviewResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatPreviewResponse.java similarity index 85% rename from backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatPreviewResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatPreviewResponse.java index e27204b6b..30ad46438 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatPreviewResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatPreviewResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.moim.presentation.response.chat; +package mouda.backend.core.dto.moim.response.chat; import lombok.Builder; -import mouda.backend.moim.domain.Chamyo; +import mouda.backend.core.domain.moim.Chamyo; @Builder public record ChatPreviewResponse( diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatPreviewResponses.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatPreviewResponses.java similarity index 67% rename from backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatPreviewResponses.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatPreviewResponses.java index 753d680c6..47f1fb5d6 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/chat/ChatPreviewResponses.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/chat/ChatPreviewResponses.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.response.chat; +package mouda.backend.core.dto.moim.response.chat; import java.util.List; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/comment/ChildCommentResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/comment/ChildCommentResponse.java similarity index 84% rename from backend/src/main/java/mouda/backend/moim/presentation/response/comment/ChildCommentResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/comment/ChildCommentResponse.java index c48ef6809..22e2e9630 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/comment/ChildCommentResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/comment/ChildCommentResponse.java @@ -1,11 +1,11 @@ -package mouda.backend.moim.presentation.response.comment; +package mouda.backend.core.dto.moim.response.comment; import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Builder; -import mouda.backend.moim.domain.Comment; +import mouda.backend.core.domain.moim.Comment; @Builder public record ChildCommentResponse( diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/comment/CommentResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/comment/CommentResponse.java similarity index 88% rename from backend/src/main/java/mouda/backend/moim/presentation/response/comment/CommentResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/comment/CommentResponse.java index 23fd8602a..61ab63790 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/comment/CommentResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/comment/CommentResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.response.comment; +package mouda.backend.core.dto.moim.response.comment; import java.time.LocalDateTime; import java.util.List; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Builder; -import mouda.backend.moim.domain.Comment; +import mouda.backend.core.domain.moim.Comment; @Builder public record CommentResponse( diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimDetailsFindResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimDetailsFindResponse.java similarity index 85% rename from backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimDetailsFindResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimDetailsFindResponse.java index 9f5be23c9..aa5b36002 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimDetailsFindResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimDetailsFindResponse.java @@ -1,12 +1,12 @@ -package mouda.backend.moim.presentation.response.moim; +package mouda.backend.core.dto.moim.response.moim; import static java.time.format.DateTimeFormatter.*; import java.util.List; import lombok.Builder; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.presentation.response.comment.CommentResponse; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.dto.moim.response.comment.CommentResponse; @Builder public record MoimDetailsFindResponse( diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimFindAllResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimFindAllResponse.java similarity index 90% rename from backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimFindAllResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimFindAllResponse.java index 325033edd..cbed2ca72 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimFindAllResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimFindAllResponse.java @@ -1,9 +1,9 @@ -package mouda.backend.moim.presentation.response.moim; +package mouda.backend.core.dto.moim.response.moim; import static java.time.format.DateTimeFormatter.*; import lombok.Builder; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.moim.Moim; @Builder public record MoimFindAllResponse( diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimFindAllResponses.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimFindAllResponses.java similarity index 64% rename from backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimFindAllResponses.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimFindAllResponses.java index ec71c23c1..a57690f57 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/moim/MoimFindAllResponses.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/moim/MoimFindAllResponses.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.response.moim; +package mouda.backend.core.dto.moim.response.moim; import java.util.List; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/zzim/ZzimCheckResponse.java b/backend/src/main/java/mouda/backend/core/dto/moim/response/zzim/ZzimCheckResponse.java similarity index 51% rename from backend/src/main/java/mouda/backend/moim/presentation/response/zzim/ZzimCheckResponse.java rename to backend/src/main/java/mouda/backend/core/dto/moim/response/zzim/ZzimCheckResponse.java index 11da43863..801f86c11 100644 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/zzim/ZzimCheckResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/moim/response/zzim/ZzimCheckResponse.java @@ -1,4 +1,4 @@ -package mouda.backend.moim.presentation.response.zzim; +package mouda.backend.core.dto.moim.response.zzim; public record ZzimCheckResponse( boolean isZzimed diff --git a/backend/src/main/java/mouda/backend/please/presentation/request/InterestUpdateRequest.java b/backend/src/main/java/mouda/backend/core/dto/please/request/InterestUpdateRequest.java similarity index 61% rename from backend/src/main/java/mouda/backend/please/presentation/request/InterestUpdateRequest.java rename to backend/src/main/java/mouda/backend/core/dto/please/request/InterestUpdateRequest.java index 702109fe7..c03274d5d 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/request/InterestUpdateRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/please/request/InterestUpdateRequest.java @@ -1,4 +1,4 @@ -package mouda.backend.please.presentation.request; +package mouda.backend.core.dto.please.request; public record InterestUpdateRequest( long pleaseId, diff --git a/backend/src/main/java/mouda/backend/please/presentation/request/PleaseCreateRequest.java b/backend/src/main/java/mouda/backend/core/dto/please/request/PleaseCreateRequest.java similarity index 78% rename from backend/src/main/java/mouda/backend/please/presentation/request/PleaseCreateRequest.java rename to backend/src/main/java/mouda/backend/core/dto/please/request/PleaseCreateRequest.java index a70b89840..a09841fac 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/request/PleaseCreateRequest.java +++ b/backend/src/main/java/mouda/backend/core/dto/please/request/PleaseCreateRequest.java @@ -1,7 +1,7 @@ -package mouda.backend.please.presentation.request; +package mouda.backend.core.dto.please.request; import jakarta.validation.constraints.NotNull; -import mouda.backend.please.domain.Please; +import mouda.backend.core.domain.please.Please; public record PleaseCreateRequest( diff --git a/backend/src/main/java/mouda/backend/please/presentation/response/PleaseFindAllResponse.java b/backend/src/main/java/mouda/backend/core/dto/please/response/PleaseFindAllResponse.java similarity index 83% rename from backend/src/main/java/mouda/backend/please/presentation/response/PleaseFindAllResponse.java rename to backend/src/main/java/mouda/backend/core/dto/please/response/PleaseFindAllResponse.java index 2df5f0fb8..9d02d8b43 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/response/PleaseFindAllResponse.java +++ b/backend/src/main/java/mouda/backend/core/dto/please/response/PleaseFindAllResponse.java @@ -1,7 +1,7 @@ -package mouda.backend.please.presentation.response; +package mouda.backend.core.dto.please.response; import lombok.Builder; -import mouda.backend.please.domain.Please; +import mouda.backend.core.domain.please.Please; @Builder public record PleaseFindAllResponse( diff --git a/backend/src/main/java/mouda/backend/please/presentation/response/PleaseFindAllResponses.java b/backend/src/main/java/mouda/backend/core/dto/please/response/PleaseFindAllResponses.java similarity index 67% rename from backend/src/main/java/mouda/backend/please/presentation/response/PleaseFindAllResponses.java rename to backend/src/main/java/mouda/backend/core/dto/please/response/PleaseFindAllResponses.java index ecc6bb29d..ecced39e8 100644 --- a/backend/src/main/java/mouda/backend/please/presentation/response/PleaseFindAllResponses.java +++ b/backend/src/main/java/mouda/backend/core/dto/please/response/PleaseFindAllResponses.java @@ -1,4 +1,4 @@ -package mouda.backend.please.presentation.response; +package mouda.backend.core.dto.please.response; import java.util.List; diff --git a/backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/MoimRoleFindResponse.java b/backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/MoimRoleFindResponse.java deleted file mode 100644 index 8bcc2d457..000000000 --- a/backend/src/main/java/mouda/backend/moim/presentation/response/chamyo/MoimRoleFindResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package mouda.backend.moim.presentation.response.chamyo; - -public record MoimRoleFindResponse( - String role -) { -} diff --git a/backend/src/main/java/mouda/backend/notification/business/NotificationService.java b/backend/src/main/java/mouda/backend/notification/business/NotificationService.java index 62a6ab74c..1b12fcff9 100644 --- a/backend/src/main/java/mouda/backend/notification/business/NotificationService.java +++ b/backend/src/main/java/mouda/backend/notification/business/NotificationService.java @@ -10,9 +10,9 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.domain.Member; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.member.Member; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MemberNotification; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCancelledNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCancelledNotificationBuilder.java index 896b1440b..12cfd03f5 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCancelledNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCancelledNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCreatedNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCreatedNotificationBuilder.java index 31c7f99bb..12b2fbcd7 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCreatedNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimCreatedNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimModifiedNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimModifiedNotificationBuilder.java index c22416674..559f0c70f 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimModifiedNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimModifiedNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimPlaceConfirmedNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimPlaceConfirmedNotificationBuilder.java index 27d0ded30..ee946512a 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimPlaceConfirmedNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimPlaceConfirmedNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimTimeConfirmedNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimTimeConfirmedNotificationBuilder.java index cc4c4d8ba..8a8dd480d 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimTimeConfirmedNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimTimeConfirmedNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimeeLeftNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimeeLeftNotificationBuilder.java index 639589e68..9c29c86af 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimeeLeftNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimeeLeftNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingCompletedNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingCompletedNotificationBuilder.java index bac4a2bf6..5de28f566 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingCompletedNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingCompletedNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingReopenedNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingReopenedNotificationBuilder.java index a50815325..5f743737c 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingReopenedNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/MoimingReopenedNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/NewChatNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/NewChatNotificationBuilder.java index 45d1e2553..22f32a358 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/NewChatNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/NewChatNotificationBuilder.java @@ -4,8 +4,8 @@ import org.springframework.stereotype.Component; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/NewCommentNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/NewCommentNotificationBuilder.java index 8a02e9497..d9153d5d7 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/NewCommentNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/NewCommentNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/NewMoimeeJoinedNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/NewMoimeeJoinedNotificationBuilder.java index 1dc168c0a..4c40eca86 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/NewMoimeeJoinedNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/NewMoimeeJoinedNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/NewReplyNotificationBuilder.java b/backend/src/main/java/mouda/backend/notification/domain/notification/NewReplyNotificationBuilder.java index 9ee65604f..ca80e0a80 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/NewReplyNotificationBuilder.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/NewReplyNotificationBuilder.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/notification/NotificationBuilderStrategy.java b/backend/src/main/java/mouda/backend/notification/domain/notification/NotificationBuilderStrategy.java index 5edfa75db..4fbda0de2 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/notification/NotificationBuilderStrategy.java +++ b/backend/src/main/java/mouda/backend/notification/domain/notification/NotificationBuilderStrategy.java @@ -1,7 +1,7 @@ package mouda.backend.notification.domain.notification; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; public interface NotificationBuilderStrategy { diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCanclledNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCanclledNotificationRecipientResolver.java index 7d204db5c..126ffa649 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCanclledNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCanclledNotificationRecipientResolver.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; import mouda.backend.notification.infrastructure.MemberNotificationRepository; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCompletedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCompletedNotificationRecipientResolver.java index 4cd4d30be..0adaeb7f0 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCompletedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCompletedNotificationRecipientResolver.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; import mouda.backend.notification.infrastructure.MemberNotificationRepository; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCreatedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCreatedNotificationRecipientResolver.java index 19b3b622c..2eb0ed1cb 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCreatedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimCreatedNotificationRecipientResolver.java @@ -5,10 +5,10 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimModifiedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimModifiedNotificationRecipientResolver.java index 6420e5e86..67c6cd51e 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimModifiedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimModifiedNotificationRecipientResolver.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; import mouda.backend.notification.infrastructure.MemberNotificationRepository; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimPlaceConfirmedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimPlaceConfirmedNotificationRecipientResolver.java index b80c9494a..661fe01bf 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimPlaceConfirmedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimPlaceConfirmedNotificationRecipientResolver.java @@ -4,11 +4,11 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimRole; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimStatusChangedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimStatusChangedNotificationRecipientResolver.java index c2bda5f23..904f8b7ec 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimStatusChangedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimStatusChangedNotificationRecipientResolver.java @@ -2,11 +2,11 @@ import java.util.List; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimRole; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.infrastructure.MemberNotificationRepository; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimTimeConfirmedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimTimeConfirmedNotificationRecipientResolver.java index a4e7fa4d3..493161230 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimTimeConfirmedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimTimeConfirmedNotificationRecipientResolver.java @@ -4,11 +4,11 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimRole; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimeeLeftNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimeeLeftNotificationRecipientResolver.java index a32e691d1..d271ac221 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimeeLeftNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimeeLeftNotificationRecipientResolver.java @@ -4,10 +4,10 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimingReopenedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimingReopenedNotificationRecipientResolver.java index efb7d7c73..208290aea 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimingReopenedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/MoimingReopenedNotificationRecipientResolver.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; import mouda.backend.notification.infrastructure.MemberNotificationRepository; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/NewChatNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/NewChatNotificationRecipientResolver.java index d2779ad26..1bce2ff89 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/NewChatNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/NewChatNotificationRecipientResolver.java @@ -5,9 +5,9 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/NewCommentNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/NewCommentNotificationRecipientResolver.java index 843af1308..cb13c28e5 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/NewCommentNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/NewCommentNotificationRecipientResolver.java @@ -4,10 +4,10 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/NewMoimeeJoinedNotificationRecipientResolver.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/NewMoimeeJoinedNotificationRecipientResolver.java index c08f8681d..70f3a5c0f 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/NewMoimeeJoinedNotificationRecipientResolver.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/NewMoimeeJoinedNotificationRecipientResolver.java @@ -4,10 +4,10 @@ import org.springframework.stereotype.Component; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; import mouda.backend.notification.domain.NotificationTypeProvider; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/NoneChatRecipientResolverStrategy.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/NoneChatRecipientResolverStrategy.java index b4c5d9f8b..d011ecc73 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/NoneChatRecipientResolverStrategy.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/NoneChatRecipientResolverStrategy.java @@ -3,8 +3,8 @@ import java.util.List; import lombok.RequiredArgsConstructor; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; import mouda.backend.notification.domain.MemberNotification; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.infrastructure.MemberNotificationRepository; diff --git a/backend/src/main/java/mouda/backend/notification/domain/recipient/RecipientResolverStrategy.java b/backend/src/main/java/mouda/backend/notification/domain/recipient/RecipientResolverStrategy.java index 23932fb90..f63b46203 100644 --- a/backend/src/main/java/mouda/backend/notification/domain/recipient/RecipientResolverStrategy.java +++ b/backend/src/main/java/mouda/backend/notification/domain/recipient/RecipientResolverStrategy.java @@ -2,8 +2,8 @@ import java.util.List; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Moim; import mouda.backend.notification.domain.MoudaNotification; public interface RecipientResolverStrategy { diff --git a/backend/src/main/java/mouda/backend/notification/exception/NotificationErrorMessage.java b/backend/src/main/java/mouda/backend/notification/exception/NotificationErrorMessage.java index 8cc9eef7c..87eb1e34c 100644 --- a/backend/src/main/java/mouda/backend/notification/exception/NotificationErrorMessage.java +++ b/backend/src/main/java/mouda/backend/notification/exception/NotificationErrorMessage.java @@ -9,8 +9,7 @@ public enum NotificationErrorMessage { // Firebase FCM_TOKEN_NOT_FOUND_BY_MEMBER("회원의 FCM 토큰이 존재하지 않아요."), - FCM_TOKEN_NOT_FOUND_BY_TOKEN("요청한 FCM 토큰이 존재하지 않아요.") - ; + FCM_TOKEN_NOT_FOUND_BY_TOKEN("요청한 FCM 토큰이 존재하지 않아요."); // Notification diff --git a/backend/src/main/java/mouda/backend/notification/exception/NotificationException.java b/backend/src/main/java/mouda/backend/notification/exception/NotificationException.java index d9d937fe9..fd12347d2 100644 --- a/backend/src/main/java/mouda/backend/notification/exception/NotificationException.java +++ b/backend/src/main/java/mouda/backend/notification/exception/NotificationException.java @@ -2,7 +2,7 @@ import org.springframework.http.HttpStatus; -import mouda.backend.common.exception.MoudaException; +import mouda.backend.api.common.exception.MoudaException; public class NotificationException extends MoudaException { diff --git a/backend/src/main/java/mouda/backend/notification/presentation/controller/NotificationController.java b/backend/src/main/java/mouda/backend/notification/presentation/controller/NotificationController.java index 0b0ba210b..d9c2208c9 100644 --- a/backend/src/main/java/mouda/backend/notification/presentation/controller/NotificationController.java +++ b/backend/src/main/java/mouda/backend/notification/presentation/controller/NotificationController.java @@ -10,13 +10,13 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import mouda.backend.common.response.RestResponse; -import mouda.backend.common.config.argumentresolver.LoginMember; -import mouda.backend.member.domain.Member; +import mouda.backend.api.common.config.argumentresolver.LoginMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.member.Member; +import mouda.backend.notification.business.NotificationService; +import mouda.backend.notification.presentation.controller.swagger.NotificationSwagger; import mouda.backend.notification.presentation.request.FcmTokenSaveRequest; import mouda.backend.notification.presentation.response.NotificationFindAllResponses; -import mouda.backend.notification.presentation.controller.swagger.NotificationSwagger; -import mouda.backend.notification.business.NotificationService; @RestController @RequestMapping diff --git a/backend/src/main/java/mouda/backend/notification/presentation/controller/swagger/NotificationSwagger.java b/backend/src/main/java/mouda/backend/notification/presentation/controller/swagger/NotificationSwagger.java index 5f8fb05a3..66dd199dd 100644 --- a/backend/src/main/java/mouda/backend/notification/presentation/controller/swagger/NotificationSwagger.java +++ b/backend/src/main/java/mouda/backend/notification/presentation/controller/swagger/NotificationSwagger.java @@ -8,9 +8,9 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; -import mouda.backend.common.response.RestResponse; -import mouda.backend.common.config.argumentresolver.LoginMember; -import mouda.backend.member.domain.Member; +import mouda.backend.api.common.config.argumentresolver.LoginMember; +import mouda.backend.api.common.response.RestResponse; +import mouda.backend.core.domain.member.Member; import mouda.backend.notification.presentation.request.FcmTokenSaveRequest; import mouda.backend.notification.presentation.response.NotificationFindAllResponses; diff --git a/backend/src/test/java/mouda/backend/common/fixture/ChatFixture.java b/backend/src/test/java/mouda/backend/common/fixture/ChatFixture.java index 3b7c5e82e..dcdb2c74f 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/ChatFixture.java +++ b/backend/src/test/java/mouda/backend/common/fixture/ChatFixture.java @@ -3,10 +3,10 @@ import java.time.LocalDate; import java.time.LocalTime; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.ChatType; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.ChatType; +import mouda.backend.core.domain.moim.Moim; public class ChatFixture { diff --git a/backend/src/test/java/mouda/backend/common/fixture/CommentFixture.java b/backend/src/test/java/mouda/backend/common/fixture/CommentFixture.java index 6526a9b25..d2fcc7ea3 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/CommentFixture.java +++ b/backend/src/test/java/mouda/backend/common/fixture/CommentFixture.java @@ -2,9 +2,9 @@ import java.time.LocalDateTime; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.moim.domain.Comment; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.moim.Comment; +import mouda.backend.core.domain.moim.Moim; public class CommentFixture { diff --git a/backend/src/test/java/mouda/backend/common/fixture/DarakbangFixture.java b/backend/src/test/java/mouda/backend/common/fixture/DarakbangFixture.java index c89dd979e..a73ae709a 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/DarakbangFixture.java +++ b/backend/src/test/java/mouda/backend/common/fixture/DarakbangFixture.java @@ -1,6 +1,6 @@ package mouda.backend.common.fixture; -import mouda.backend.darakbang.domain.Darakbang; +import mouda.backend.core.domain.darakbang.Darakbang; public class DarakbangFixture { diff --git a/backend/src/test/java/mouda/backend/common/fixture/DarakbangMemberFixture.java b/backend/src/test/java/mouda/backend/common/fixture/DarakbangMemberFixture.java index 9b2138d4e..3ad55c33b 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/DarakbangMemberFixture.java +++ b/backend/src/test/java/mouda/backend/common/fixture/DarakbangMemberFixture.java @@ -1,9 +1,9 @@ package mouda.backend.common.fixture; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbangmember.domain.DarakBangMemberRole; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.member.domain.Member; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.core.domain.darakbang.DarakBangMemberRole; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.core.domain.member.Member; public class DarakbangMemberFixture { diff --git a/backend/src/test/java/mouda/backend/common/fixture/DarakbangSetUp.java b/backend/src/test/java/mouda/backend/common/fixture/DarakbangSetUp.java index 1f6a00e45..52eb7a846 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/DarakbangSetUp.java +++ b/backend/src/test/java/mouda/backend/common/fixture/DarakbangSetUp.java @@ -4,12 +4,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; -import mouda.backend.member.infrastructure.MemberRepository; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.member.Member; +import mouda.backend.api.member.infrastructure.MemberRepository; @SpringBootTest public class DarakbangSetUp { diff --git a/backend/src/test/java/mouda/backend/common/fixture/MemberFixture.java b/backend/src/test/java/mouda/backend/common/fixture/MemberFixture.java index 89f187fa2..4aed19998 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/MemberFixture.java +++ b/backend/src/test/java/mouda/backend/common/fixture/MemberFixture.java @@ -1,6 +1,6 @@ package mouda.backend.common.fixture; -import mouda.backend.member.domain.Member; +import mouda.backend.core.domain.member.Member; public class MemberFixture { diff --git a/backend/src/test/java/mouda/backend/common/fixture/MoimFixture.java b/backend/src/test/java/mouda/backend/common/fixture/MoimFixture.java index b9d94f526..e3e9249ca 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/MoimFixture.java +++ b/backend/src/test/java/mouda/backend/common/fixture/MoimFixture.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.time.LocalTime; -import mouda.backend.moim.domain.Moim; +import mouda.backend.core.domain.moim.Moim; public class MoimFixture { diff --git a/backend/src/test/java/mouda/backend/common/fixture/PleaseFixture.java b/backend/src/test/java/mouda/backend/common/fixture/PleaseFixture.java index 7fb61d7f7..a7f498492 100644 --- a/backend/src/test/java/mouda/backend/common/fixture/PleaseFixture.java +++ b/backend/src/test/java/mouda/backend/common/fixture/PleaseFixture.java @@ -1,6 +1,6 @@ package mouda.backend.common.fixture; -import mouda.backend.please.domain.Please; +import mouda.backend.core.domain.please.Please; public class PleaseFixture { diff --git a/backend/src/test/java/mouda/backend/darakbang/business/DarakbangServiceTest.java b/backend/src/test/java/mouda/backend/darakbang/business/DarakbangServiceTest.java index 79cdfacd1..a1ef020b1 100644 --- a/backend/src/test/java/mouda/backend/darakbang/business/DarakbangServiceTest.java +++ b/backend/src/test/java/mouda/backend/darakbang/business/DarakbangServiceTest.java @@ -13,21 +13,22 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import mouda.backend.api.darakbang.business.DarakbangService; import mouda.backend.common.fixture.DarakbangFixture; import mouda.backend.common.fixture.DarakbangMemberFixture; import mouda.backend.common.fixture.MemberFixture; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.exception.DarakbangException; -import mouda.backend.darakbang.implement.InvitationCodeGenerator; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbang.presentation.request.DarakbangCreateRequest; -import mouda.backend.darakbang.presentation.request.DarakbangEnterRequest; -import mouda.backend.darakbang.presentation.response.CodeValidationResponse; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.exception.DarakbangMemberException; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; -import mouda.backend.member.infrastructure.MemberRepository; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.exception.DarakbangException; +import mouda.backend.api.darakbang.implement.InvitationCodeGenerator; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.dto.darakbang.request.DarakbangCreateRequest; +import mouda.backend.core.dto.darakbang.request.DarakbangEnterRequest; +import mouda.backend.core.dto.darakbang.response.CodeValidationResponse; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberException; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.member.Member; +import mouda.backend.api.member.infrastructure.MemberRepository; @SpringBootTest class DarakbangServiceTest { diff --git a/backend/src/test/java/mouda/backend/darakbang/implement/InvitationCodeGeneratorTest.java b/backend/src/test/java/mouda/backend/darakbang/implement/InvitationCodeGeneratorTest.java index 2f80af7a3..32f7216e4 100644 --- a/backend/src/test/java/mouda/backend/darakbang/implement/InvitationCodeGeneratorTest.java +++ b/backend/src/test/java/mouda/backend/darakbang/implement/InvitationCodeGeneratorTest.java @@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import mouda.backend.api.darakbang.implement.InvitationCodeGenerator; + @SpringBootTest class InvitationCodeGeneratorTest { diff --git a/backend/src/test/java/mouda/backend/darakbangmember/business/DarakbangMemberServiceTest.java b/backend/src/test/java/mouda/backend/darakbangmember/business/DarakbangMemberServiceTest.java index f0985cbb0..b697bb40b 100644 --- a/backend/src/test/java/mouda/backend/darakbangmember/business/DarakbangMemberServiceTest.java +++ b/backend/src/test/java/mouda/backend/darakbangmember/business/DarakbangMemberServiceTest.java @@ -8,17 +8,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import mouda.backend.api.darakbangmember.business.DarakbangMemberService; import mouda.backend.common.fixture.DarakbangFixture; import mouda.backend.common.fixture.DarakbangMemberFixture; import mouda.backend.common.fixture.MemberFixture; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.exception.DarakbangMemberException; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.darakbangmember.presentation.response.DarakbangMemberRoleResponse; -import mouda.backend.member.domain.Member; -import mouda.backend.member.infrastructure.MemberRepository; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.exception.DarakbangMemberException; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.dto.darakbang.response.DarakbangMemberRoleResponse; +import mouda.backend.core.domain.member.Member; +import mouda.backend.api.member.infrastructure.MemberRepository; @SpringBootTest class DarakbangMemberServiceTest { diff --git a/backend/src/test/java/mouda/backend/moim/chamyo/business/ChamyoServiceTest.java b/backend/src/test/java/mouda/backend/moim/chamyo/business/ChamyoServiceTest.java index 29fd4cdf2..db087819c 100644 --- a/backend/src/test/java/mouda/backend/moim/chamyo/business/ChamyoServiceTest.java +++ b/backend/src/test/java/mouda/backend/moim/chamyo/business/ChamyoServiceTest.java @@ -16,16 +16,16 @@ import mouda.backend.common.fixture.DarakbangMemberFixture; import mouda.backend.common.fixture.MemberFixture; import mouda.backend.common.fixture.MoimFixture; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; -import mouda.backend.member.infrastructure.MemberRepository; -import mouda.backend.moim.business.ChamyoService; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.exception.ChamyoException; -import mouda.backend.moim.infrastructure.MoimRepository; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.member.Member; +import mouda.backend.api.member.infrastructure.MemberRepository; +import mouda.backend.api.moim.business.ChamyoService; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.exception.ChamyoException; +import mouda.backend.api.moim.infrastructure.MoimRepository; @SpringBootTest class ChamyoServiceTest { diff --git a/backend/src/test/java/mouda/backend/moim/chat/business/ChatServiceTest.java b/backend/src/test/java/mouda/backend/moim/chat/business/ChatServiceTest.java index 67d0e1f04..d3cfa883a 100644 --- a/backend/src/test/java/mouda/backend/moim/chat/business/ChatServiceTest.java +++ b/backend/src/test/java/mouda/backend/moim/chat/business/ChatServiceTest.java @@ -16,21 +16,21 @@ import mouda.backend.common.fixture.ChatFixture; import mouda.backend.common.fixture.DarakbangSetUp; import mouda.backend.common.fixture.MoimFixture; -import mouda.backend.moim.business.ChatService; -import mouda.backend.moim.domain.Chamyo; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.domain.MoimRole; -import mouda.backend.moim.exception.ChatException; -import mouda.backend.moim.infrastructure.ChamyoRepository; -import mouda.backend.moim.infrastructure.ChatRepository; -import mouda.backend.moim.infrastructure.MoimRepository; -import mouda.backend.moim.presentation.request.chat.ChatCreateRequest; -import mouda.backend.moim.presentation.request.chat.DateTimeConfirmRequest; -import mouda.backend.moim.presentation.request.chat.PlaceConfirmRequest; -import mouda.backend.moim.presentation.response.chat.ChatFindUnloadedResponse; -import mouda.backend.moim.presentation.response.chat.ChatPreviewResponse; -import mouda.backend.moim.presentation.response.chat.ChatPreviewResponses; +import mouda.backend.api.moim.business.ChatService; +import mouda.backend.core.domain.moim.Chamyo; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.core.domain.moim.MoimRole; +import mouda.backend.api.moim.exception.ChatException; +import mouda.backend.api.moim.infrastructure.ChamyoRepository; +import mouda.backend.api.moim.infrastructure.ChatRepository; +import mouda.backend.api.moim.infrastructure.MoimRepository; +import mouda.backend.core.dto.moim.request.chat.ChatCreateRequest; +import mouda.backend.core.dto.moim.request.chat.DateTimeConfirmRequest; +import mouda.backend.core.dto.moim.request.chat.PlaceConfirmRequest; +import mouda.backend.core.dto.moim.response.chat.ChatFindUnloadedResponse; +import mouda.backend.core.dto.moim.response.chat.ChatPreviewResponse; +import mouda.backend.core.dto.moim.response.chat.ChatPreviewResponses; @SpringBootTest class ChatServiceTest extends DarakbangSetUp { diff --git a/backend/src/test/java/mouda/backend/moim/chat/infrastructure/ChatRepositoryTest.java b/backend/src/test/java/mouda/backend/moim/chat/infrastructure/ChatRepositoryTest.java index 13d0bab9c..6c399dde0 100644 --- a/backend/src/test/java/mouda/backend/moim/chat/infrastructure/ChatRepositoryTest.java +++ b/backend/src/test/java/mouda/backend/moim/chat/infrastructure/ChatRepositoryTest.java @@ -12,10 +12,10 @@ import mouda.backend.common.fixture.ChatFixture; import mouda.backend.common.fixture.DarakbangSetUp; import mouda.backend.common.fixture.MoimFixture; -import mouda.backend.moim.domain.Chat; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.infrastructure.ChatRepository; -import mouda.backend.moim.infrastructure.MoimRepository; +import mouda.backend.core.domain.moim.Chat; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.infrastructure.ChatRepository; +import mouda.backend.api.moim.infrastructure.MoimRepository; @SpringBootTest class ChatRepositoryTest extends DarakbangSetUp { diff --git a/backend/src/test/java/mouda/backend/moim/comment/domain/CommentTest.java b/backend/src/test/java/mouda/backend/moim/comment/domain/CommentTest.java index e05e6b4a3..f76cd44b9 100644 --- a/backend/src/test/java/mouda/backend/moim/comment/domain/CommentTest.java +++ b/backend/src/test/java/mouda/backend/moim/comment/domain/CommentTest.java @@ -11,8 +11,8 @@ import mouda.backend.common.fixture.CommentFixture; import mouda.backend.common.fixture.DarakbangSetUp; import mouda.backend.common.fixture.MoimFixture; -import mouda.backend.moim.domain.Comment; -import mouda.backend.moim.exception.CommentException; +import mouda.backend.core.domain.moim.Comment; +import mouda.backend.api.moim.exception.CommentException; class CommentTest extends DarakbangSetUp { diff --git a/backend/src/test/java/mouda/backend/moim/moim/business/MoimServiceTest.java b/backend/src/test/java/mouda/backend/moim/moim/business/MoimServiceTest.java index ef8e2d3a4..46d437ffe 100644 --- a/backend/src/test/java/mouda/backend/moim/moim/business/MoimServiceTest.java +++ b/backend/src/test/java/mouda/backend/moim/moim/business/MoimServiceTest.java @@ -18,22 +18,22 @@ import mouda.backend.common.fixture.DarakbangMemberFixture; import mouda.backend.common.fixture.MemberFixture; import mouda.backend.common.fixture.MoimFixture; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; -import mouda.backend.member.infrastructure.MemberRepository; -import mouda.backend.moim.business.MoimService; -import mouda.backend.moim.domain.Comment; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.exception.CommentException; -import mouda.backend.moim.infrastructure.CommentRepository; -import mouda.backend.moim.infrastructure.MoimRepository; -import mouda.backend.moim.presentation.request.comment.CommentCreateRequest; -import mouda.backend.moim.presentation.request.moim.MoimCreateRequest; -import mouda.backend.moim.presentation.response.moim.MoimDetailsFindResponse; -import mouda.backend.moim.presentation.response.moim.MoimFindAllResponses; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.member.Member; +import mouda.backend.api.member.infrastructure.MemberRepository; +import mouda.backend.api.moim.business.MoimService; +import mouda.backend.core.domain.moim.Comment; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.exception.CommentException; +import mouda.backend.api.moim.infrastructure.CommentRepository; +import mouda.backend.api.moim.infrastructure.MoimRepository; +import mouda.backend.core.dto.moim.request.comment.CommentCreateRequest; +import mouda.backend.core.dto.moim.request.moim.MoimCreateRequest; +import mouda.backend.core.dto.moim.response.moim.MoimDetailsFindResponse; +import mouda.backend.core.dto.moim.response.moim.MoimFindAllResponses; @SpringBootTest class MoimServiceTest extends IgnoreNotificationTest { diff --git a/backend/src/test/java/mouda/backend/moim/moim/domain/MoimTest.java b/backend/src/test/java/mouda/backend/moim/moim/domain/MoimTest.java index b00f30ba8..c407ed90b 100644 --- a/backend/src/test/java/mouda/backend/moim/moim/domain/MoimTest.java +++ b/backend/src/test/java/mouda/backend/moim/moim/domain/MoimTest.java @@ -12,8 +12,8 @@ import mouda.backend.common.fixture.DarakbangSetUp; import mouda.backend.common.fixture.MoimFixture; -import mouda.backend.moim.domain.Moim; -import mouda.backend.moim.exception.MoimException; +import mouda.backend.core.domain.moim.Moim; +import mouda.backend.api.moim.exception.MoimException; class MoimTest extends DarakbangSetUp { diff --git a/backend/src/test/java/mouda/backend/notification/business/NotificationServiceTest.java b/backend/src/test/java/mouda/backend/notification/business/NotificationServiceTest.java index 0266a2a1a..b69409689 100644 --- a/backend/src/test/java/mouda/backend/notification/business/NotificationServiceTest.java +++ b/backend/src/test/java/mouda/backend/notification/business/NotificationServiceTest.java @@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import mouda.backend.darakbang.domain.Darakbang; -import mouda.backend.darakbang.infrastructure.DarakbangRepository; -import mouda.backend.darakbangmember.domain.DarakBangMemberRole; -import mouda.backend.darakbangmember.domain.DarakbangMember; -import mouda.backend.darakbangmember.infrastructure.DarakbangMemberRepository; -import mouda.backend.member.domain.Member; -import mouda.backend.member.infrastructure.MemberRepository; +import mouda.backend.core.domain.darakbang.Darakbang; +import mouda.backend.api.darakbang.infrastructure.DarakbangRepository; +import mouda.backend.core.domain.darakbang.DarakBangMemberRole; +import mouda.backend.core.domain.darakbang.DarakbangMember; +import mouda.backend.api.darakbangmember.infrastructure.DarakbangMemberRepository; +import mouda.backend.core.domain.member.Member; +import mouda.backend.api.member.infrastructure.MemberRepository; import mouda.backend.notification.domain.MemberNotification; import mouda.backend.notification.domain.MoudaNotification; import mouda.backend.notification.domain.NotificationType; diff --git a/backend/src/test/java/mouda/backend/please/business/PleaseServiceTest.java b/backend/src/test/java/mouda/backend/please/business/PleaseServiceTest.java index 388d6c621..f0b5e1a1f 100644 --- a/backend/src/test/java/mouda/backend/please/business/PleaseServiceTest.java +++ b/backend/src/test/java/mouda/backend/please/business/PleaseServiceTest.java @@ -12,14 +12,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import mouda.backend.api.please.business.InterestService; +import mouda.backend.api.please.business.PleaseService; import mouda.backend.common.fixture.DarakbangSetUp; import mouda.backend.common.fixture.PleaseFixture; -import mouda.backend.please.domain.Please; -import mouda.backend.please.exception.PleaseException; -import mouda.backend.please.infrastructure.PleaseRepository; -import mouda.backend.please.presentation.request.InterestUpdateRequest; -import mouda.backend.please.presentation.request.PleaseCreateRequest; -import mouda.backend.please.presentation.response.PleaseFindAllResponses; +import mouda.backend.core.domain.please.Please; +import mouda.backend.api.please.exception.PleaseException; +import mouda.backend.api.please.infrastructure.PleaseRepository; +import mouda.backend.core.dto.please.request.InterestUpdateRequest; +import mouda.backend.core.dto.please.request.PleaseCreateRequest; +import mouda.backend.core.dto.please.response.PleaseFindAllResponses; @SpringBootTest class PleaseServiceTest extends DarakbangSetUp {