Merge pull request #251 from Link-MIND/refactor/#250

[Refactor/#250] 패키지 구조 변경

linkmind/src/main/java/com/app/toaster/controller/AuthController.java → linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller;
+package com.app.toaster.auth.controller;
 
 import java.io.IOException;
 
@@ -13,13 +13,13 @@
 
 import com.app.toaster.common.dto.ApiResponse;
 // import com.app.toaster.config.UserId;
-import com.app.toaster.config.UserId;
-import com.app.toaster.controller.request.auth.SignInRequestDto;
-import com.app.toaster.controller.response.auth.SignInResponseDto;
-import com.app.toaster.controller.response.auth.TokenHealthDto;
-import com.app.toaster.controller.response.auth.TokenResponseDto;
+import com.app.toaster.common.config.UserId;
+import com.app.toaster.auth.controller.request.SignInRequestDto;
+import com.app.toaster.auth.controller.response.SignInResponseDto;
+import com.app.toaster.auth.controller.response.TokenHealthDto;
+import com.app.toaster.auth.controller.response.TokenResponseDto;
 import com.app.toaster.exception.Success;
-import com.app.toaster.service.auth.AuthService;
+import com.app.toaster.auth.service.AuthService;
 
 import lombok.RequiredArgsConstructor;
 

linkmind/src/main/java/com/app/toaster/controller/request/auth/SignInRequestDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/request/SignInRequestDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.request.auth;
+package com.app.toaster.auth.controller.request;
 
 public record SignInRequestDto(String socialType, String fcmToken) {
 }

linkmind/src/main/java/com/app/toaster/controller/response/auth/SignInResponseDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/response/SignInResponseDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.auth;
+package com.app.toaster.auth.controller.response;
 
 public record SignInResponseDto(Long userId, String accessToken, String refreshToken, String fcmToken, Boolean isRegistered,Boolean fcmIsAllowed, String profile) {
 	public static SignInResponseDto of(Long userId, String accessToken, String refreshToken, String fcmToken,

linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenHealthDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenHealthDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.auth;
+package com.app.toaster.auth.controller.response;
 
 public record TokenHealthDto(boolean tokenHealth) {
 	public static TokenHealthDto of(boolean tokenHealth){return new TokenHealthDto(tokenHealth);}

linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenResponseDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenResponseDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.auth;
+package com.app.toaster.auth.controller.response;
 
 public record TokenResponseDto(String accessToken, String refreshToken) {
 	public static TokenResponseDto of(String accessToken, String refreshToken){

linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java → linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java

@@ -1,40 +1,35 @@
-package com.app.toaster.service.auth;
+package com.app.toaster.auth.service;
 
 import java.io.IOException;
-import java.time.LocalDateTime;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.context.request.WebRequest;
 
 
-import com.app.toaster.config.jwt.JwtService;
-import com.app.toaster.controller.request.auth.SignInRequestDto;
-import com.app.toaster.controller.response.auth.SignInResponseDto;
-import com.app.toaster.controller.response.auth.TokenHealthDto;
-import com.app.toaster.controller.response.auth.TokenResponseDto;
-import com.app.toaster.domain.SocialType;
-import com.app.toaster.domain.User;
+import com.app.toaster.common.config.jwt.JwtService;
+import com.app.toaster.auth.controller.request.SignInRequestDto;
+import com.app.toaster.auth.controller.response.SignInResponseDto;
+import com.app.toaster.auth.controller.response.TokenHealthDto;
+import com.app.toaster.auth.controller.response.TokenResponseDto;
+import com.app.toaster.user.domain.SocialType;
+import com.app.toaster.user.domain.User;
 import com.app.toaster.exception.Error;
-import com.app.toaster.exception.Success;
 import com.app.toaster.exception.model.CustomException;
 import com.app.toaster.exception.model.NotFoundException;
 import com.app.toaster.exception.model.UnprocessableEntityException;
-import com.app.toaster.external.client.discord.DiscordMessage;
 import com.app.toaster.external.client.discord.DiscordMessageProvider;
 import com.app.toaster.external.client.discord.NotificationDto;
 import com.app.toaster.external.client.discord.NotificationType;
 import com.app.toaster.external.client.slack.SlackApi;
-import com.app.toaster.infrastructure.CategoryRepository;
-import com.app.toaster.infrastructure.TimerRepository;
+import com.app.toaster.category.infrastructure.CategoryRepository;
+import com.app.toaster.timer.infrastructure.TimerRepository;
 import com.app.toaster.toast.infrastructure.ToastRepository;
-import com.app.toaster.infrastructure.UserRepository;
+import com.app.toaster.user.infrastructure.UserRepository;
 import com.app.toaster.popup.infrastructure.PopupManagerRepository;
-import com.app.toaster.service.auth.apple.AppleSignInService;
-import com.app.toaster.service.auth.kakao.KakaoSignInService;
-import com.app.toaster.service.auth.kakao.LoginResult;
+import com.app.toaster.auth.service.apple.AppleSignInService;
+import com.app.toaster.auth.service.kakao.KakaoSignInService;
+import com.app.toaster.auth.service.kakao.LoginResult;
 import com.app.toaster.toast.service.ToastService;
 
 import lombok.RequiredArgsConstructor;

linkmind/src/main/java/com/app/toaster/service/auth/apple/AppleSignInService.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/AppleSignInService.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple;
+package com.app.toaster.auth.service.apple;
 
 import java.security.PublicKey;
 import java.util.Map;
@@ -7,11 +7,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClient;
 
-import com.app.toaster.service.auth.apple.response.ApplePublicKeys;
-import com.app.toaster.service.auth.apple.verify.AppleJwtParser;
-import com.app.toaster.service.auth.apple.verify.PublicKeyGenerator;
-import com.app.toaster.service.auth.kakao.LoginResult;
-import com.mysql.cj.log.Log;
+import com.app.toaster.auth.service.apple.response.ApplePublicKeys;
+import com.app.toaster.auth.service.apple.verify.AppleJwtParser;
+import com.app.toaster.auth.service.apple.verify.PublicKeyGenerator;
+import com.app.toaster.auth.service.kakao.LoginResult;
 
 import io.jsonwebtoken.Claims;
 import lombok.RequiredArgsConstructor;

linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKey.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKey.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.response;
+package com.app.toaster.auth.service.apple.response;
 
 public record ApplePublicKey(
 	String kty,

linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKeys.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKeys.java

@@ -1,12 +1,10 @@
-package com.app.toaster.service.auth.apple.response;
+package com.app.toaster.auth.service.apple.response;
 
 import java.util.List;
 
 import com.app.toaster.exception.Error;
 import com.app.toaster.exception.model.CustomException;
 
-import lombok.extern.slf4j.Slf4j;
-
 public record ApplePublicKeys(List<ApplePublicKey> keys) {
 
 	public ApplePublicKey getMatchesKey(String alg, String kid) {

linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/AppleJwtParser.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/AppleJwtParser.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.verify;
+package com.app.toaster.auth.service.apple.verify;
 
 import java.security.PublicKey;
 import java.util.Base64;

linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/EncryptUtils.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/EncryptUtils.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.verify;
+package com.app.toaster.auth.service.apple.verify;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;

linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/PublicKeyGenerator.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/PublicKeyGenerator.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.verify;
+package com.app.toaster.auth.service.apple.verify;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;
@@ -13,10 +13,8 @@
 
 import com.app.toaster.exception.Error;
 import com.app.toaster.exception.model.CustomException;
-import com.app.toaster.service.auth.apple.response.ApplePublicKey;
-import com.app.toaster.service.auth.apple.response.ApplePublicKeys;
-
-import lombok.extern.slf4j.Slf4j;
+import com.app.toaster.auth.service.apple.response.ApplePublicKey;
+import com.app.toaster.auth.service.apple.response.ApplePublicKeys;
 
 @Component
 public class PublicKeyGenerator {

linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoAccount.java → linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoAccount.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.kakao;
+package com.app.toaster.auth.service.kakao;
 
 public record KakaoAccount(KakaoUserProfile profile) {
 }

linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoSignInService.java → linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoSignInService.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.kakao;
+package com.app.toaster.auth.service.kakao;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -13,7 +13,6 @@
 import org.springframework.web.client.RestTemplate;
 
 import com.app.toaster.exception.Error;
-import com.app.toaster.exception.model.ForbiddenException;
 import com.app.toaster.exception.model.UnprocessableEntityException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.JsonArray;

linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserProfile.java → linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserProfile.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.kakao;
+package com.app.toaster.auth.service.kakao;
 
 public record KakaoUserProfile(String nickname, String profileImageUrl) {
 }

linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserResponse.java → linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserResponse.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.kakao;
+package com.app.toaster.auth.service.kakao;
 
 public record KakaoUserResponse(KakaoAccount kakaoAccount) {
 	public static KakaoUserResponse of(KakaoAccount kakaoAccount){

linkmind/src/main/java/com/app/toaster/service/auth/kakao/LoginResult.java → linkmind/src/main/java/com/app/toaster/auth/service/kakao/LoginResult.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.kakao;
+package com.app.toaster.auth.service.kakao;
 
 public record LoginResult(String id, String profile, String nickname) {
 	public static LoginResult of(String id, String profile,String nickname){

linkmind/src/main/java/com/app/toaster/service/auth/kakao/Strategy.java → linkmind/src/main/java/com/app/toaster/auth/service/kakao/Strategy.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.kakao;
+package com.app.toaster.auth.service.kakao;
 
 public enum Strategy {
 	WITHDRAWAL,

linkmind/src/main/java/com/app/toaster/controller/CategoryController.java → linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java

@@ -1,16 +1,18 @@
-package com.app.toaster.controller;
+package com.app.toaster.category.controller;
 
+import com.app.toaster.category.controller.request.ChangeCateoryPriorityDto;
+import com.app.toaster.category.controller.request.ChangeCateoryTitleDto;
+import com.app.toaster.category.controller.request.CreateCategoryDto;
 import com.app.toaster.common.dto.ApiResponse;
-import com.app.toaster.config.UserId;
-import com.app.toaster.controller.request.category.*;
-import com.app.toaster.controller.response.category.CategoriesResponse;
+import com.app.toaster.common.config.UserId;
+import com.app.toaster.category.controller.response.CategoriesResponse;
 import com.app.toaster.toast.controller.response.ToastFilter;
-import com.app.toaster.controller.response.category.GetCategoryResponseDto;
-import com.app.toaster.controller.valid.Severity;
-import com.app.toaster.controller.valid.TitleValid;
+import com.app.toaster.category.controller.response.GetCategoryResponseDto;
+import com.app.toaster.utils.valid.Severity;
+import com.app.toaster.utils.valid.TitleValid;
 import com.app.toaster.exception.Success;
-import com.app.toaster.service.category.CategoryService;
-import com.app.toaster.service.search.SearchService;
+import com.app.toaster.category.service.CategoryService;
+import com.app.toaster.search.service.SearchService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;

linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryPriorityDto.java → linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryPriorityDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.request.category;
+package com.app.toaster.category.controller.request;
 
 import jakarta.validation.constraints.NotNull;
 

linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryTitleDto.java → linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java

@@ -1,7 +1,7 @@
-package com.app.toaster.controller.request.category;
+package com.app.toaster.category.controller.request;
 
-import com.app.toaster.controller.valid.Severity;
-import com.app.toaster.controller.valid.TitleValid;
+import com.app.toaster.utils.valid.Severity;
+import com.app.toaster.utils.valid.TitleValid;
 import jakarta.validation.constraints.NotNull;
 
 public record ChangeCateoryTitleDto(

linkmind/src/main/java/com/app/toaster/controller/request/category/CreateCategoryDto.java → linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java

@@ -1,7 +1,7 @@
-package com.app.toaster.controller.request.category;
+package com.app.toaster.category.controller.request;
 
-import com.app.toaster.controller.valid.Severity;
-import com.app.toaster.controller.valid.TitleValid;
+import com.app.toaster.utils.valid.Severity;
+import com.app.toaster.utils.valid.TitleValid;
 import jakarta.validation.constraints.NotNull;
 
 public record CreateCategoryDto(@TitleValid(payload = Severity.Error.class) @NotNull String categoryTitle) {

linkmind/src/main/java/com/app/toaster/controller/request/category/DeleteCategoryDto.java → linkmind/src/main/java/com/app/toaster/category/controller/request/DeleteCategoryDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.request.category;
+package com.app.toaster.category.controller.request;
 
 import jakarta.validation.constraints.NotNull;
 

linkmind/src/main/java/com/app/toaster/controller/response/category/CategoriesResponse.java → linkmind/src/main/java/com/app/toaster/category/controller/response/CategoriesResponse.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.category;
+package com.app.toaster.category.controller.response;
 
 import java.util.List;
 

linkmind/src/main/java/com/app/toaster/controller/response/category/CategoryResponse.java → linkmind/src/main/java/com/app/toaster/category/controller/response/CategoryResponse.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.category;
+package com.app.toaster.category.controller.response;
 
 import lombok.Builder;
 

linkmind/src/main/java/com/app/toaster/controller/response/category/DuplicatedResponse.java → linkmind/src/main/java/com/app/toaster/category/controller/response/DuplicatedResponse.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.category;
+package com.app.toaster.category.controller.response;
 
 public record DuplicatedResponse(Boolean isDupicated) {
 	public static DuplicatedResponse of(Boolean isDupicated){

linkmind/src/main/java/com/app/toaster/controller/response/category/GetCategoryResponseDto.java → linkmind/src/main/java/com/app/toaster/category/controller/response/GetCategoryResponseDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.category;
+package com.app.toaster.category.controller.response;
 
 import com.app.toaster.toast.controller.response.ToastDto;
 import lombok.Builder;

linkmind/src/main/java/com/app/toaster/domain/Category.java → linkmind/src/main/java/com/app/toaster/category/domain/Category.java

@@ -1,12 +1,11 @@
-package com.app.toaster.domain;
+package com.app.toaster.category.domain;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
 
+import com.app.toaster.timer.domain.Reminder;
+import com.app.toaster.user.domain.User;
 import jakarta.persistence.*;
-import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java → linkmind/src/main/java/com/app/toaster/category/infrastructure/CategoryRepository.java

@@ -1,20 +1,17 @@
-package com.app.toaster.infrastructure;
+package com.app.toaster.category.infrastructure;
 
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 
-import com.app.toaster.controller.request.category.ChangeCateoryTitleDto;
-import com.app.toaster.domain.User;
+import com.app.toaster.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.app.toaster.domain.Category;
+import com.app.toaster.category.domain.Category;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
 
 public interface CategoryRepository extends JpaRepository<Category, Long> {
 

linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java → linkmind/src/main/java/com/app/toaster/category/service/CategoryService.java

@@ -1,24 +1,26 @@
-package com.app.toaster.service.category;
+package com.app.toaster.category.service;
 
-import com.app.toaster.controller.request.category.*;
-import com.app.toaster.controller.response.category.CategoriesResponse;
-import com.app.toaster.controller.response.category.DuplicatedResponse;
+import com.app.toaster.category.controller.request.ChangeCateoryPriorityDto;
+import com.app.toaster.category.controller.request.ChangeCateoryTitleDto;
+import com.app.toaster.category.controller.request.CreateCategoryDto;
+import com.app.toaster.category.controller.response.CategoriesResponse;
+import com.app.toaster.category.controller.response.DuplicatedResponse;
 import com.app.toaster.toast.controller.response.ToastDto;
 import com.app.toaster.toast.controller.response.ToastFilter;
-import com.app.toaster.controller.response.category.CategoryResponse;
-import com.app.toaster.controller.response.category.GetCategoryResponseDto;
-import com.app.toaster.domain.Category;
-import com.app.toaster.domain.Reminder;
+import com.app.toaster.category.controller.response.CategoryResponse;
+import com.app.toaster.category.controller.response.GetCategoryResponseDto;
+import com.app.toaster.category.domain.Category;
+import com.app.toaster.timer.domain.Reminder;
 import com.app.toaster.toast.domain.Toast;
-import com.app.toaster.domain.User;
+import com.app.toaster.user.domain.User;
 import com.app.toaster.exception.Error;
 import com.app.toaster.exception.model.BadRequestException;
 import com.app.toaster.exception.model.CustomException;
 import com.app.toaster.exception.model.NotFoundException;
-import com.app.toaster.infrastructure.CategoryRepository;
-import com.app.toaster.infrastructure.TimerRepository;
+import com.app.toaster.category.infrastructure.CategoryRepository;
+import com.app.toaster.timer.infrastructure.TimerRepository;
 import com.app.toaster.toast.infrastructure.ToastRepository;
-import com.app.toaster.infrastructure.UserRepository;
+import com.app.toaster.user.infrastructure.UserRepository;
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;

linkmind/src/main/java/com/app/toaster/config/UserId.java → linkmind/src/main/java/com/app/toaster/common/config/UserId.java

@@ -1,4 +1,4 @@
-package com.app.toaster.config;
+package com.app.toaster.common.config;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;