diff --git a/src/main/java/umc/th/juinjang/config/SecurityConfig.java b/src/main/java/umc/th/juinjang/config/SecurityConfig.java index 240904a7..766cb4c7 100644 --- a/src/main/java/umc/th/juinjang/config/SecurityConfig.java +++ b/src/main/java/umc/th/juinjang/config/SecurityConfig.java @@ -18,7 +18,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import umc.th.juinjang.jwt.JwtAuthenticationFilter; import umc.th.juinjang.jwt.JwtExceptionFilter; -import umc.th.juinjang.service.JwtService; +import umc.th.juinjang.service.auth.JwtService; import java.util.Arrays; diff --git a/src/main/java/umc/th/juinjang/controller/ChecklistController.java b/src/main/java/umc/th/juinjang/controller/ChecklistController.java index a1580bca..06b2d54a 100644 --- a/src/main/java/umc/th/juinjang/controller/ChecklistController.java +++ b/src/main/java/umc/th/juinjang/controller/ChecklistController.java @@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.*; import umc.th.juinjang.apiPayload.ApiResponse; import umc.th.juinjang.model.dto.checklist.*; -import umc.th.juinjang.service.ChecklistService.ChecklistCommandService; -import umc.th.juinjang.service.ChecklistService.ChecklistQueryService; +import umc.th.juinjang.service.checklist.ChecklistCommandService; +import umc.th.juinjang.service.checklist.ChecklistQueryService; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/controller/ImageController.java b/src/main/java/umc/th/juinjang/controller/ImageController.java index eb9796e1..39f04a0e 100644 --- a/src/main/java/umc/th/juinjang/controller/ImageController.java +++ b/src/main/java/umc/th/juinjang/controller/ImageController.java @@ -20,9 +20,9 @@ import umc.th.juinjang.apiPayload.code.status.SuccessStatus; import umc.th.juinjang.model.dto.image.ImageDeleteRequestDTO; import umc.th.juinjang.model.dto.image.ImageListResponseDTO; -import umc.th.juinjang.service.ImageService.ImageCommandService; -import umc.th.juinjang.service.ImageService.ImageQueryService; -import umc.th.juinjang.service.LimjangService.LimjangCommandService; +import umc.th.juinjang.service.image.ImageCommandService; +import umc.th.juinjang.service.image.ImageQueryService; +import umc.th.juinjang.service.limjang.LimjangCommandService; @RestController @RequestMapping("/api/limjang/image") diff --git a/src/main/java/umc/th/juinjang/controller/LimjangController.java b/src/main/java/umc/th/juinjang/controller/LimjangController.java index 03e5c911..4cd407df 100644 --- a/src/main/java/umc/th/juinjang/controller/LimjangController.java +++ b/src/main/java/umc/th/juinjang/controller/LimjangController.java @@ -29,8 +29,8 @@ import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetResponse; import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetVersion2Response; import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.LimjangService.LimjangCommandService; -import umc.th.juinjang.service.LimjangService.LimjangQueryService; +import umc.th.juinjang.service.limjang.LimjangCommandService; +import umc.th.juinjang.service.limjang.LimjangQueryService; @RestController @RequestMapping("/api/limjang") diff --git a/src/main/java/umc/th/juinjang/controller/MemberController.java b/src/main/java/umc/th/juinjang/controller/MemberController.java index 23f29662..c103563d 100644 --- a/src/main/java/umc/th/juinjang/controller/MemberController.java +++ b/src/main/java/umc/th/juinjang/controller/MemberController.java @@ -4,19 +4,17 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import umc.th.juinjang.apiPayload.ApiResponse; import umc.th.juinjang.apiPayload.ExceptionHandler; import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; import umc.th.juinjang.model.dto.member.MemberAgreeVersionPostRequest; import umc.th.juinjang.model.dto.member.MemberRequestDto; import umc.th.juinjang.model.dto.member.MemberResponseDto; import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.MemberService.MemberService; +import umc.th.juinjang.service.member.MemberService; import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.NICKNAME_EMPTY; diff --git a/src/main/java/umc/th/juinjang/controller/OAuthController.java b/src/main/java/umc/th/juinjang/controller/OAuthController.java index 108ed1aa..8085b852 100644 --- a/src/main/java/umc/th/juinjang/controller/OAuthController.java +++ b/src/main/java/umc/th/juinjang/controller/OAuthController.java @@ -1,20 +1,16 @@ package umc.th.juinjang.controller; -import com.fasterxml.jackson.core.JsonProcessingException; import io.micrometer.common.lang.Nullable; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.util.StringUtils; -import org.springframework.validation.BindingResult; -import org.springframework.validation.ObjectError; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import umc.th.juinjang.apiPayload.ApiResponse; import umc.th.juinjang.apiPayload.ExceptionHandler; import umc.th.juinjang.apiPayload.code.status.SuccessStatus; -import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; import umc.th.juinjang.model.dto.auth.LoginResponseDto; import umc.th.juinjang.model.dto.auth.LoginResponseVersion2Dto; import umc.th.juinjang.model.dto.auth.WithdrawReasonRequestDto; @@ -25,15 +21,9 @@ import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestDto; import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestVersion2Dto; import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.Withdraw; -import umc.th.juinjang.repository.withdraw.WithdrawRepository; -import umc.th.juinjang.service.JwtService; -import umc.th.juinjang.service.WithdrawService.WithdrawService; +import umc.th.juinjang.service.withdraw.WithdrawService; import umc.th.juinjang.service.auth.OAuthService; -import java.io.IOException; -import java.util.List; - import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.*; @Slf4j diff --git a/src/main/java/umc/th/juinjang/controller/RecordController.java b/src/main/java/umc/th/juinjang/controller/RecordController.java index 017929cc..0ddfb8fa 100644 --- a/src/main/java/umc/th/juinjang/controller/RecordController.java +++ b/src/main/java/umc/th/juinjang/controller/RecordController.java @@ -13,7 +13,7 @@ import umc.th.juinjang.model.dto.record.RecordRequestDTO; import umc.th.juinjang.model.dto.record.RecordResponseDTO; import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.recordService.RecordService; +import umc.th.juinjang.service.record.RecordService; import java.io.IOException; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/controller/ScrapController.java b/src/main/java/umc/th/juinjang/controller/ScrapController.java index f4c3d832..a4586ecf 100644 --- a/src/main/java/umc/th/juinjang/controller/ScrapController.java +++ b/src/main/java/umc/th/juinjang/controller/ScrapController.java @@ -11,7 +11,7 @@ import umc.th.juinjang.apiPayload.ApiResponse; import umc.th.juinjang.apiPayload.code.status.SuccessStatus; import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.ScrapService.ScrapService; +import umc.th.juinjang.service.scrap.ScrapService; @RestController @RequestMapping("/api/limjangs/scraps") diff --git a/src/main/java/umc/th/juinjang/controller/TestController.java b/src/main/java/umc/th/juinjang/controller/TestController.java deleted file mode 100644 index 1c7970cc..00000000 --- a/src/main/java/umc/th/juinjang/controller/TestController.java +++ /dev/null @@ -1,19 +0,0 @@ -package umc.th.juinjang.controller; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import umc.th.juinjang.model.entity.Member; - - -@Slf4j -@RestController -public class TestController { - - @GetMapping("/test") - public String test() { - return "Hello, World!"; - } -} diff --git a/src/main/java/umc/th/juinjang/converter/ScrapConverter.java b/src/main/java/umc/th/juinjang/converter/ScrapConverter.java deleted file mode 100644 index b13ce789..00000000 --- a/src/main/java/umc/th/juinjang/converter/ScrapConverter.java +++ /dev/null @@ -1,6 +0,0 @@ -package umc.th.juinjang.converter; - -public class ScrapConverter { - - -} diff --git a/src/main/java/umc/th/juinjang/converter/TempConverter.java b/src/main/java/umc/th/juinjang/converter/TempConverter.java deleted file mode 100644 index 5a0b4218..00000000 --- a/src/main/java/umc/th/juinjang/converter/TempConverter.java +++ /dev/null @@ -1,19 +0,0 @@ -package umc.th.juinjang.converter; - - -import umc.th.juinjang.model.dto.TempResponse; - -public class TempConverter { - - public static TempResponse.TempTestDTO toTempTestDTO(){ - return TempResponse.TempTestDTO.builder() - .testString("This is Test!") - .build(); - } - - public static TempResponse.TempExceptionDTO toTempExceptionDTO(Integer flag){ - return TempResponse.TempExceptionDTO.builder() - .flag(flag) - .build(); - } -} \ No newline at end of file diff --git a/src/main/java/umc/th/juinjang/converter/limjang/LimjangDetailConverter.java b/src/main/java/umc/th/juinjang/converter/limjang/LimjangDetailConverter.java index 60f8ccc6..08efd522 100644 --- a/src/main/java/umc/th/juinjang/converter/limjang/LimjangDetailConverter.java +++ b/src/main/java/umc/th/juinjang/converter/limjang/LimjangDetailConverter.java @@ -1,6 +1,6 @@ package umc.th.juinjang.converter.limjang; -import static umc.th.juinjang.service.LimjangService.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/converter/limjang/LimjangsMainGetResponseConverter.java b/src/main/java/umc/th/juinjang/converter/limjang/LimjangsMainGetResponseConverter.java index d0a5aea3..6e76a7b3 100644 --- a/src/main/java/umc/th/juinjang/converter/limjang/LimjangsMainGetResponseConverter.java +++ b/src/main/java/umc/th/juinjang/converter/limjang/LimjangsMainGetResponseConverter.java @@ -1,6 +1,6 @@ package umc.th.juinjang.converter.limjang; -import static umc.th.juinjang.service.LimjangService.LimjangPriceBridge.getPriceToString; +import static umc.th.juinjang.service.limjang.LimjangPriceBridge.getPriceToString; import java.util.Optional; import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetResponse.LimjangMainResponse; diff --git a/src/main/java/umc/th/juinjang/jwt/JwtAuthenticationFilter.java b/src/main/java/umc/th/juinjang/jwt/JwtAuthenticationFilter.java index 86c3bf77..eec3e720 100644 --- a/src/main/java/umc/th/juinjang/jwt/JwtAuthenticationFilter.java +++ b/src/main/java/umc/th/juinjang/jwt/JwtAuthenticationFilter.java @@ -1,28 +1,19 @@ package umc.th.juinjang.jwt; import io.jsonwebtoken.ExpiredJwtException; -import io.jsonwebtoken.JwtException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import jakarta.xml.bind.ValidationException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; -import org.springframework.web.filter.GenericFilterBean; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.service.JwtService; +import umc.th.juinjang.service.auth.JwtService; import java.io.IOException; -import java.rmi.server.ExportException; // Jwt 토큰으로 인증하는 필터입니다. diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailGetResponse.java b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailGetResponse.java index ef11ce2c..8a59bdb3 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailGetResponse.java +++ b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailGetResponse.java @@ -1,6 +1,6 @@ package umc.th.juinjang.model.dto.limjang.response; -import static umc.th.juinjang.service.LimjangService.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetByKeywordResponse.java b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetByKeywordResponse.java index 8c36bb81..95700608 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetByKeywordResponse.java +++ b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetByKeywordResponse.java @@ -1,6 +1,6 @@ package umc.th.juinjang.model.dto.limjang.response; -import static umc.th.juinjang.service.LimjangService.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; import java.util.List; import java.util.Map; diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetResponse.java b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetResponse.java index 7e178f75..2e0afcad 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetResponse.java +++ b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetResponse.java @@ -1,8 +1,7 @@ package umc.th.juinjang.model.dto.limjang.response; -import static umc.th.juinjang.service.LimjangService.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; -import java.util.Comparator; import java.util.List; import java.util.Map; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetVersion2Response.java b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetVersion2Response.java index 2cdfcd66..024bbd6b 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetVersion2Response.java +++ b/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetVersion2Response.java @@ -1,6 +1,6 @@ package umc.th.juinjang.model.dto.limjang.response; -import static umc.th.juinjang.service.LimjangService.LimjangPriceBridge.getPriceToString; +import static umc.th.juinjang.service.limjang.LimjangPriceBridge.getPriceToString; import java.util.List; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/service/TempService/TempCommandService.java b/src/main/java/umc/th/juinjang/service/TempService/TempCommandService.java deleted file mode 100644 index afb228f6..00000000 --- a/src/main/java/umc/th/juinjang/service/TempService/TempCommandService.java +++ /dev/null @@ -1,4 +0,0 @@ -package umc.th.juinjang.service.TempService; - -public interface TempCommandService { -} diff --git a/src/main/java/umc/th/juinjang/service/TempService/TempCommandServiceImpl.java b/src/main/java/umc/th/juinjang/service/TempService/TempCommandServiceImpl.java deleted file mode 100644 index 7f8cea31..00000000 --- a/src/main/java/umc/th/juinjang/service/TempService/TempCommandServiceImpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package umc.th.juinjang.service.TempService; - -public class TempCommandServiceImpl { -} diff --git a/src/main/java/umc/th/juinjang/service/TempService/TempQueryService.java b/src/main/java/umc/th/juinjang/service/TempService/TempQueryService.java deleted file mode 100644 index 03751f32..00000000 --- a/src/main/java/umc/th/juinjang/service/TempService/TempQueryService.java +++ /dev/null @@ -1,6 +0,0 @@ -package umc.th.juinjang.service.TempService; - -public interface TempQueryService { - - void CheckFlag(Integer flag); -} \ No newline at end of file diff --git a/src/main/java/umc/th/juinjang/service/TempService/TempQueryServiceImpl.java b/src/main/java/umc/th/juinjang/service/TempService/TempQueryServiceImpl.java deleted file mode 100644 index fed02351..00000000 --- a/src/main/java/umc/th/juinjang/service/TempService/TempQueryServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package umc.th.juinjang.service.TempService; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.TempHandler; - -@Service -@RequiredArgsConstructor -public class TempQueryServiceImpl implements TempQueryService{ - - @Override - public void CheckFlag(Integer flag) { - if (flag == 1) - throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); - } -} \ No newline at end of file diff --git a/src/main/java/umc/th/juinjang/service/JwtService.java b/src/main/java/umc/th/juinjang/service/auth/JwtService.java similarity index 91% rename from src/main/java/umc/th/juinjang/service/JwtService.java rename to src/main/java/umc/th/juinjang/service/auth/JwtService.java index 79dd90dc..32c4b6d8 100644 --- a/src/main/java/umc/th/juinjang/service/JwtService.java +++ b/src/main/java/umc/th/juinjang/service/auth/JwtService.java @@ -1,11 +1,9 @@ -package umc.th.juinjang.service; +package umc.th.juinjang.service.auth; -import ch.qos.logback.core.spi.ErrorCodes; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.jsonwebtoken.*; import jakarta.servlet.http.HttpServletRequest; -import jakarta.validation.constraints.Null; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +13,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import umc.th.juinjang.apiPayload.ExceptionHandler; import umc.th.juinjang.apiPayload.code.status.ErrorStatus; @@ -24,14 +21,10 @@ import umc.th.juinjang.model.dto.auth.apple.AppleClient; import umc.th.juinjang.model.dto.auth.apple.AppleInfo; import umc.th.juinjang.repository.limjang.MemberRepository; -import umc.th.juinjang.service.auth.UserDetailServiceImpl; import umc.th.juinjang.utils.ApplePublicKeyGenerator; -import javax.naming.AuthenticationException; import java.nio.charset.StandardCharsets; -import java.security.NoSuchAlgorithmException; import java.security.PublicKey; -import java.security.spec.InvalidKeySpecException; import java.util.Base64; import java.util.Date; import java.util.Map; @@ -42,12 +35,12 @@ public class JwtService { @Value("${jwt.secret}") private String JWT_SECRET; - + @Value ("${jwt.access-token-expiration}") + private Long ACCESS_TOKEN_EXPIRE_TIME; + @Value ("${jwt.refresh-token-expiration}") + private Long REFRESH_TOKEN_EXPIRE_TIME; private final UserDetailServiceImpl userDetailService; - private Long tokenValidTime = 1000L * 60 * 60; // 1h - private Long refreshTokenValidTime = 1000L * 60 * 60 * 24 * 7; // 7d - @Autowired private final AppleClient appleAuthClient; @@ -66,7 +59,7 @@ public String encodeJwtToken(TokenDto tokenDto) { .setIssuer("juinjang") .setIssuedAt(now) .setSubject(tokenDto.getMemberId().toString()) - .setExpiration(new Date(now.getTime() + tokenValidTime)) + .setExpiration(new Date(now.getTime() + ACCESS_TOKEN_EXPIRE_TIME)) .claim("memberId", tokenDto.getMemberId()) .signWith(SignatureAlgorithm.HS256, Base64.getEncoder().encodeToString(("" + JWT_SECRET).getBytes( @@ -80,7 +73,7 @@ public String encodeJwtRefreshToken(Long memberId) { return Jwts.builder() .setIssuedAt(now) .setSubject(memberId.toString()) - .setExpiration(new Date(now.getTime() + refreshTokenValidTime)) + .setExpiration(new Date(now.getTime() + REFRESH_TOKEN_EXPIRE_TIME)) .claim("memberId", memberId) .claim("roles", "USER") .signWith(SignatureAlgorithm.HS256, diff --git a/src/main/java/umc/th/juinjang/service/auth/OAuthService.java b/src/main/java/umc/th/juinjang/service/auth/OAuthService.java index 739e0cba..6641f694 100644 --- a/src/main/java/umc/th/juinjang/service/auth/OAuthService.java +++ b/src/main/java/umc/th/juinjang/service/auth/OAuthService.java @@ -31,8 +31,7 @@ import umc.th.juinjang.repository.limjang.MemberRepository; import umc.th.juinjang.repository.limjang.ScrapRepository; import umc.th.juinjang.repository.record.RecordRepository; -import umc.th.juinjang.service.JwtService; -import umc.th.juinjang.service.S3Service; +import umc.th.juinjang.service.external.S3Service; import java.time.LocalDateTime; import java.util.Collections; diff --git a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistCommandService.java b/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandService.java similarity index 75% rename from src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistCommandService.java rename to src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandService.java index a47f9fe8..8aeb1767 100644 --- a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistCommandService.java +++ b/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandService.java @@ -1,8 +1,7 @@ -package umc.th.juinjang.service.ChecklistService; +package umc.th.juinjang.service.checklist; import umc.th.juinjang.model.dto.checklist.ChecklistAnswerAndReportResponseDTO; import umc.th.juinjang.model.dto.checklist.ChecklistAnswerRequestDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistCommandServiceImpl.java b/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandServiceImpl.java similarity index 99% rename from src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistCommandServiceImpl.java rename to src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandServiceImpl.java index 8e863bf8..3b760313 100644 --- a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistCommandServiceImpl.java +++ b/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandServiceImpl.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ChecklistService; +package umc.th.juinjang.service.checklist; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistQueryService.java b/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryService.java similarity index 83% rename from src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistQueryService.java rename to src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryService.java index eb85c521..e48a225d 100644 --- a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistQueryService.java +++ b/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryService.java @@ -1,7 +1,6 @@ -package umc.th.juinjang.service.ChecklistService; +package umc.th.juinjang.service.checklist; import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistQuestionDTO; import umc.th.juinjang.model.dto.checklist.ReportResponseDTO; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistQueryServiceImpl.java b/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryServiceImpl.java similarity index 89% rename from src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistQueryServiceImpl.java rename to src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryServiceImpl.java index 8b17fb64..984c405f 100644 --- a/src/main/java/umc/th/juinjang/service/ChecklistService/ChecklistQueryServiceImpl.java +++ b/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryServiceImpl.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ChecklistService; +package umc.th.juinjang.service.checklist; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -7,27 +7,17 @@ import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler; import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; import umc.th.juinjang.converter.checklist.ChecklistAnswerAndReportConverter; -import umc.th.juinjang.converter.checklist.ChecklistAnswerConverter; -import umc.th.juinjang.converter.checklist.ChecklistQuestionConverter; import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistQuestionDTO; import umc.th.juinjang.model.dto.checklist.ReportResponseDTO; import umc.th.juinjang.model.entity.ChecklistAnswer; import umc.th.juinjang.model.entity.Limjang; import umc.th.juinjang.model.entity.Report; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionCategory; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionVersion; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; import umc.th.juinjang.repository.checklist.ChecklistAnswerRepository; import umc.th.juinjang.repository.checklist.ChecklistQuestionRepository; import umc.th.juinjang.repository.checklist.ReportRepository; import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.service.LimjangService.LimjangQueryService; -import java.util.ArrayList; import java.util.List; -import java.util.NoSuchElementException; -import java.util.Objects; import java.util.stream.Collectors; @Slf4j diff --git a/src/main/java/umc/th/juinjang/service/S3Service.java b/src/main/java/umc/th/juinjang/service/external/S3Service.java similarity index 98% rename from src/main/java/umc/th/juinjang/service/S3Service.java rename to src/main/java/umc/th/juinjang/service/external/S3Service.java index aa31781b..7a3113f5 100644 --- a/src/main/java/umc/th/juinjang/service/S3Service.java +++ b/src/main/java/umc/th/juinjang/service/external/S3Service.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service; +package umc.th.juinjang.service.external; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.DeleteObjectRequest; diff --git a/src/main/java/umc/th/juinjang/service/ImageService/ImageCommandService.java b/src/main/java/umc/th/juinjang/service/image/ImageCommandService.java similarity index 87% rename from src/main/java/umc/th/juinjang/service/ImageService/ImageCommandService.java rename to src/main/java/umc/th/juinjang/service/image/ImageCommandService.java index b966bfeb..f0e6f894 100644 --- a/src/main/java/umc/th/juinjang/service/ImageService/ImageCommandService.java +++ b/src/main/java/umc/th/juinjang/service/image/ImageCommandService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ImageService; +package umc.th.juinjang.service.image; import java.util.List; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/umc/th/juinjang/service/ImageService/ImageCommandServiceImpl.java b/src/main/java/umc/th/juinjang/service/image/ImageCommandServiceImpl.java similarity index 96% rename from src/main/java/umc/th/juinjang/service/ImageService/ImageCommandServiceImpl.java rename to src/main/java/umc/th/juinjang/service/image/ImageCommandServiceImpl.java index 0c220274..f7b6c97f 100644 --- a/src/main/java/umc/th/juinjang/service/ImageService/ImageCommandServiceImpl.java +++ b/src/main/java/umc/th/juinjang/service/image/ImageCommandServiceImpl.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ImageService; +package umc.th.juinjang.service.image; import java.io.IOException; import java.util.List; @@ -17,7 +17,7 @@ import umc.th.juinjang.model.entity.Limjang; import umc.th.juinjang.repository.image.ImageRepository; import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.service.S3Service; +import umc.th.juinjang.service.external.S3Service; @Slf4j @Service diff --git a/src/main/java/umc/th/juinjang/service/ImageService/ImageQueryService.java b/src/main/java/umc/th/juinjang/service/image/ImageQueryService.java similarity index 78% rename from src/main/java/umc/th/juinjang/service/ImageService/ImageQueryService.java rename to src/main/java/umc/th/juinjang/service/image/ImageQueryService.java index 2164c52d..b2cfd10f 100644 --- a/src/main/java/umc/th/juinjang/service/ImageService/ImageQueryService.java +++ b/src/main/java/umc/th/juinjang/service/image/ImageQueryService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ImageService; +package umc.th.juinjang.service.image; import umc.th.juinjang.model.dto.image.ImageListResponseDTO; diff --git a/src/main/java/umc/th/juinjang/service/ImageService/ImageQueryServiceImpl.java b/src/main/java/umc/th/juinjang/service/image/ImageQueryServiceImpl.java similarity index 96% rename from src/main/java/umc/th/juinjang/service/ImageService/ImageQueryServiceImpl.java rename to src/main/java/umc/th/juinjang/service/image/ImageQueryServiceImpl.java index c9df3427..73b2a4ca 100644 --- a/src/main/java/umc/th/juinjang/service/ImageService/ImageQueryServiceImpl.java +++ b/src/main/java/umc/th/juinjang/service/image/ImageQueryServiceImpl.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ImageService; +package umc.th.juinjang.service.image; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangCommandService.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandService.java similarity index 82% rename from src/main/java/umc/th/juinjang/service/LimjangService/LimjangCommandService.java rename to src/main/java/umc/th/juinjang/service/limjang/LimjangCommandService.java index d68f2363..4515ac16 100644 --- a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangCommandService.java +++ b/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandService.java @@ -1,8 +1,7 @@ -package umc.th.juinjang.service.LimjangService; +package umc.th.juinjang.service.limjang; import umc.th.juinjang.model.dto.limjang.request.LimjangPatchRequest; import umc.th.juinjang.model.dto.limjang.request.LimjangPostRequest; -import umc.th.juinjang.model.dto.limjang.request.LimjangUpdateRequestDTO; import umc.th.juinjang.model.dto.limjang.request.LimjangsDeleteRequest; import umc.th.juinjang.model.entity.Limjang; import umc.th.juinjang.model.entity.Member; diff --git a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangCommandServiceImpl.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandServiceImpl.java similarity index 95% rename from src/main/java/umc/th/juinjang/service/LimjangService/LimjangCommandServiceImpl.java rename to src/main/java/umc/th/juinjang/service/limjang/LimjangCommandServiceImpl.java index 87a76e35..6778b4a2 100644 --- a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangCommandServiceImpl.java +++ b/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandServiceImpl.java @@ -1,6 +1,6 @@ -package umc.th.juinjang.service.LimjangService; +package umc.th.juinjang.service.limjang; -import static umc.th.juinjang.service.LimjangService.LimjangPriceBridge.determineLimjangPrice; +import static umc.th.juinjang.service.limjang.LimjangPriceBridge.determineLimjangPrice; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangPriceBridge.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangPriceBridge.java similarity index 97% rename from src/main/java/umc/th/juinjang/service/LimjangService/LimjangPriceBridge.java rename to src/main/java/umc/th/juinjang/service/limjang/LimjangPriceBridge.java index cf925c60..69f2c86b 100644 --- a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangPriceBridge.java +++ b/src/main/java/umc/th/juinjang/service/limjang/LimjangPriceBridge.java @@ -1,6 +1,5 @@ -package umc.th.juinjang.service.LimjangService; +package umc.th.juinjang.service.limjang; -import jakarta.persistence.criteria.CriteriaBuilder.In; import java.util.ArrayList; import java.util.List; import umc.th.juinjang.apiPayload.code.status.ErrorStatus; diff --git a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangQueryService.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryService.java similarity index 94% rename from src/main/java/umc/th/juinjang/service/LimjangService/LimjangQueryService.java rename to src/main/java/umc/th/juinjang/service/limjang/LimjangQueryService.java index 36928347..112a1577 100644 --- a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangQueryService.java +++ b/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.LimjangService; +package umc.th.juinjang.service.limjang; import umc.th.juinjang.model.dto.limjang.response.LimjangDetailGetResponse; diff --git a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangQueryServiceImpl.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryServiceImpl.java similarity index 98% rename from src/main/java/umc/th/juinjang/service/LimjangService/LimjangQueryServiceImpl.java rename to src/main/java/umc/th/juinjang/service/limjang/LimjangQueryServiceImpl.java index 3582174d..de4151b0 100644 --- a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangQueryServiceImpl.java +++ b/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryServiceImpl.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.LimjangService; +package umc.th.juinjang.service.limjang; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangSchedulerService.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangSchedulerService.java similarity index 92% rename from src/main/java/umc/th/juinjang/service/LimjangService/LimjangSchedulerService.java rename to src/main/java/umc/th/juinjang/service/limjang/LimjangSchedulerService.java index d635d280..9961cd53 100644 --- a/src/main/java/umc/th/juinjang/service/LimjangService/LimjangSchedulerService.java +++ b/src/main/java/umc/th/juinjang/service/limjang/LimjangSchedulerService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.LimjangService; +package umc.th.juinjang.service.limjang; import java.time.LocalDateTime; @@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import umc.th.juinjang.repository.limjang.LimjangRepository; diff --git a/src/main/java/umc/th/juinjang/service/MemberService/MemberService.java b/src/main/java/umc/th/juinjang/service/member/MemberService.java similarity index 91% rename from src/main/java/umc/th/juinjang/service/MemberService/MemberService.java rename to src/main/java/umc/th/juinjang/service/member/MemberService.java index 9f553362..dfd0abb9 100644 --- a/src/main/java/umc/th/juinjang/service/MemberService/MemberService.java +++ b/src/main/java/umc/th/juinjang/service/member/MemberService.java @@ -1,4 +1,6 @@ -package umc.th.juinjang.service.MemberService; +package umc.th.juinjang.service.member; + +import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.MEMBER_NOT_FOUND; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.AmazonS3Client; @@ -7,29 +9,21 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import umc.th.juinjang.apiPayload.ExceptionHandler; import umc.th.juinjang.apiPayload.code.status.ErrorStatus; import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; -import umc.th.juinjang.converter.record.RecordConverter; import umc.th.juinjang.model.dto.member.MemberAgreeVersionPostRequest; import umc.th.juinjang.model.dto.member.MemberRequestDto; import umc.th.juinjang.model.dto.member.MemberResponseDto; import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.Record; import umc.th.juinjang.repository.limjang.MemberRepository; import java.io.IOException; -import java.util.Arrays; -import java.util.Optional; import java.util.UUID; -import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.ALREADY_NICKNAME; -import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.MEMBER_NOT_FOUND; - @Slf4j @Service @Transactional diff --git a/src/main/java/umc/th/juinjang/service/recordService/RecordService.java b/src/main/java/umc/th/juinjang/service/record/RecordService.java similarity index 99% rename from src/main/java/umc/th/juinjang/service/recordService/RecordService.java rename to src/main/java/umc/th/juinjang/service/record/RecordService.java index 2d3cb42a..c8980469 100644 --- a/src/main/java/umc/th/juinjang/service/recordService/RecordService.java +++ b/src/main/java/umc/th/juinjang/service/record/RecordService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.recordService; +package umc.th.juinjang.service.record; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.ObjectMetadata; diff --git a/src/main/java/umc/th/juinjang/service/ScrapService/ScrapService.java b/src/main/java/umc/th/juinjang/service/scrap/ScrapService.java similarity index 80% rename from src/main/java/umc/th/juinjang/service/ScrapService/ScrapService.java rename to src/main/java/umc/th/juinjang/service/scrap/ScrapService.java index 02f3059d..6601a059 100644 --- a/src/main/java/umc/th/juinjang/service/ScrapService/ScrapService.java +++ b/src/main/java/umc/th/juinjang/service/scrap/ScrapService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ScrapService; +package umc.th.juinjang.service.scrap; import umc.th.juinjang.model.entity.Member; diff --git a/src/main/java/umc/th/juinjang/service/ScrapService/ScrapServiceImpl.java b/src/main/java/umc/th/juinjang/service/scrap/ScrapServiceImpl.java similarity index 97% rename from src/main/java/umc/th/juinjang/service/ScrapService/ScrapServiceImpl.java rename to src/main/java/umc/th/juinjang/service/scrap/ScrapServiceImpl.java index 0d4589ef..e3a682f8 100644 --- a/src/main/java/umc/th/juinjang/service/ScrapService/ScrapServiceImpl.java +++ b/src/main/java/umc/th/juinjang/service/scrap/ScrapServiceImpl.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.ScrapService; +package umc.th.juinjang.service.scrap; import java.util.Optional; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/umc/th/juinjang/service/WithdrawService/WithdrawService.java b/src/main/java/umc/th/juinjang/service/withdraw/WithdrawService.java similarity index 95% rename from src/main/java/umc/th/juinjang/service/WithdrawService/WithdrawService.java rename to src/main/java/umc/th/juinjang/service/withdraw/WithdrawService.java index c2d3a15e..d39a1514 100644 --- a/src/main/java/umc/th/juinjang/service/WithdrawService/WithdrawService.java +++ b/src/main/java/umc/th/juinjang/service/withdraw/WithdrawService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.WithdrawService; +package umc.th.juinjang.service.withdraw; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;