chore: 패키지 변경

todo-back/src/main/groovy/com/gdsc/todo/history/api/ApiWrapper.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/api/ApiWrapper.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.history.api;
+package com.gdsc.todo.domain.history.api;
 
 import lombok.Getter;
 import org.springframework.http.HttpStatus;

todo-back/src/main/groovy/com/gdsc/todo/history/api/HistoryController.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/api/HistoryController.java

@@ -1,9 +1,9 @@
-package com.gdsc.todo.history.api;
+package com.gdsc.todo.domain.history.api;
 
+import com.gdsc.todo.domain.history.dto.TodoHistoryFeedRequest;
+import com.gdsc.todo.domain.history.dto.TodoHistoryResponse;
 import com.gdsc.todo.global.details.CustomUser;
-import com.gdsc.todo.history.dto.TodoHistoryFeedRequest;
-import com.gdsc.todo.history.dto.TodoHistoryResponse;
-import com.gdsc.todo.history.service.TodoHistoryService;
+import com.gdsc.todo.domain.history.service.TodoHistoryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

todo-back/src/main/groovy/com/gdsc/todo/history/domain/Emotion.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/domain/Emotion.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.history.domain;
+package com.gdsc.todo.domain.history.domain;
 
 public enum Emotion {
     HAPPY("Happy"),

todo-back/src/main/groovy/com/gdsc/todo/history/domain/TodoHistory.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/domain/TodoHistory.java

@@ -1,9 +1,9 @@
-package com.gdsc.todo.history.domain;
+package com.gdsc.todo.domain.history.domain;
 
 import com.gdsc.todo.global.audit.BaseEntityTIme;
-import com.gdsc.todo.history.repository.TodoHistoryRepository;
-import com.gdsc.todo.task.domain.Todo;
-import com.gdsc.todo.user.domain.User;
+import com.gdsc.todo.domain.history.repository.TodoHistoryRepository;
+import com.gdsc.todo.domain.task.domain.Todo;
+import com.gdsc.todo.domain.user.domain.User;
 import jakarta.persistence.*;
 import lombok.*;
 

todo-back/src/main/groovy/com/gdsc/todo/history/dto/TodoHistoryFeedRequest.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/dto/TodoHistoryFeedRequest.java

@@ -1,7 +1,7 @@
-package com.gdsc.todo.history.dto;
+package com.gdsc.todo.domain.history.dto;
 
-import com.gdsc.todo.history.domain.Emotion;
-import com.gdsc.todo.history.domain.TodoHistory;
+import com.gdsc.todo.domain.history.domain.Emotion;
+import com.gdsc.todo.domain.history.domain.TodoHistory;
 import lombok.*;
 
 @Getter

todo-back/src/main/groovy/com/gdsc/todo/history/dto/TodoHistoryResponse.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/dto/TodoHistoryResponse.java

@@ -1,8 +1,8 @@
-package com.gdsc.todo.history.dto;
+package com.gdsc.todo.domain.history.dto;
 
-import com.gdsc.todo.history.domain.Emotion;
-import com.gdsc.todo.history.domain.TodoHistory;
-import com.gdsc.todo.task.dto.TodoResponse;
+import com.gdsc.todo.domain.history.domain.Emotion;
+import com.gdsc.todo.domain.history.domain.TodoHistory;
+import com.gdsc.todo.domain.task.dto.TodoResponse;
 import lombok.*;
 
 import java.time.LocalDate;
@@ -21,7 +21,7 @@ public class TodoHistoryResponse {
     private Emotion emotion;
     private List<TodoResponse> todos;
 
-    public static TodoHistoryResponse from(TodoHistory history,List<TodoResponse> todos){
+    public static TodoHistoryResponse from(TodoHistory history, List<TodoResponse> todos){
         return TodoHistoryResponse.builder()
                 .id(history.getId())
                 .day(history.getDay())

todo-back/src/main/groovy/com/gdsc/todo/history/repository/TodoHistoryRepository.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/repository/TodoHistoryRepository.java

@@ -1,7 +1,7 @@
-package com.gdsc.todo.history.repository;
+package com.gdsc.todo.domain.history.repository;
 
-import com.gdsc.todo.history.domain.TodoHistory;
-import com.gdsc.todo.user.domain.User;
+import com.gdsc.todo.domain.history.domain.TodoHistory;
+import com.gdsc.todo.domain.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.time.LocalDate;

todo-back/src/main/groovy/com/gdsc/todo/history/service/TodoHistoryService.java → todo-back/src/main/groovy/com/gdsc/todo/domain/history/service/TodoHistoryService.java

@@ -1,15 +1,15 @@
-package com.gdsc.todo.history.service;
-
+package com.gdsc.todo.domain.history.service;
+
+import com.gdsc.todo.domain.history.domain.TodoHistory;
+import com.gdsc.todo.domain.history.dto.TodoHistoryFeedRequest;
+import com.gdsc.todo.domain.history.dto.TodoHistoryResponse;
+import com.gdsc.todo.domain.history.repository.TodoHistoryRepository;
+import com.gdsc.todo.domain.task.domain.Todo;
+import com.gdsc.todo.domain.task.dto.TodoResponse;
+import com.gdsc.todo.domain.task.repository.TodoRepository;
+import com.gdsc.todo.domain.user.domain.User;
+import com.gdsc.todo.domain.user.repository.UserRepository;
 import com.gdsc.todo.global.details.CustomUser;
-import com.gdsc.todo.history.domain.TodoHistory;
-import com.gdsc.todo.history.dto.TodoHistoryFeedRequest;
-import com.gdsc.todo.history.dto.TodoHistoryResponse;
-import com.gdsc.todo.history.repository.TodoHistoryRepository;
-import com.gdsc.todo.task.domain.Todo;
-import com.gdsc.todo.task.dto.TodoResponse;
-import com.gdsc.todo.task.repository.TodoRepository;
-import com.gdsc.todo.user.domain.User;
-import com.gdsc.todo.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;

todo-back/src/main/groovy/com/gdsc/todo/quote/QuoteClient.java → todo-back/src/main/groovy/com/gdsc/todo/domain/quote/QuoteClient.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.quote;
+package com.gdsc.todo.domain.quote;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

todo-back/src/main/groovy/com/gdsc/todo/quote/api/QuoteController.java → todo-back/src/main/groovy/com/gdsc/todo/domain/quote/api/QuoteController.java

@@ -1,6 +1,6 @@
-package com.gdsc.todo.quote.api;
+package com.gdsc.todo.domain.quote.api;
 
-import com.gdsc.todo.quote.service.QuoteService;
+import com.gdsc.todo.domain.quote.service.QuoteService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

todo-back/src/main/groovy/com/gdsc/todo/quote/service/QuoteService.java → todo-back/src/main/groovy/com/gdsc/todo/domain/quote/service/QuoteService.java

@@ -1,6 +1,6 @@
-package com.gdsc.todo.quote.service;
+package com.gdsc.todo.domain.quote.service;
 
-import com.gdsc.todo.quote.QuoteClient;
+import com.gdsc.todo.domain.quote.QuoteClient;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

todo-back/src/main/groovy/com/gdsc/todo/task/api/TodoController.java → todo-back/src/main/groovy/com/gdsc/todo/domain/task/api/TodoController.java

@@ -1,17 +1,15 @@
-package com.gdsc.todo.task.api;
+package com.gdsc.todo.domain.task.api;
 
 import com.gdsc.todo.global.details.CustomUser;
-import com.gdsc.todo.task.dto.TodoRequest;
-import com.gdsc.todo.task.dto.TodoResponse;
-import com.gdsc.todo.task.service.TodoService;
+import com.gdsc.todo.domain.task.dto.TodoRequest;
+import com.gdsc.todo.domain.task.dto.TodoResponse;
+import com.gdsc.todo.domain.task.service.TodoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

todo-back/src/main/groovy/com/gdsc/todo/task/domain/Todo.java → todo-back/src/main/groovy/com/gdsc/todo/domain/task/domain/Todo.java

@@ -1,8 +1,8 @@
-package com.gdsc.todo.task.domain;
+package com.gdsc.todo.domain.task.domain;
 
+import com.gdsc.todo.domain.history.domain.TodoHistory;
 import com.gdsc.todo.global.audit.BaseEntityTIme;
-import com.gdsc.todo.history.domain.TodoHistory;
-import com.gdsc.todo.user.domain.User;
+import com.gdsc.todo.domain.user.domain.User;
 import jakarta.persistence.*;
 import lombok.*;
 

todo-back/src/main/groovy/com/gdsc/todo/task/dto/TodoRequest.java → todo-back/src/main/groovy/com/gdsc/todo/domain/task/dto/TodoRequest.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.task.dto;
+package com.gdsc.todo.domain.task.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

todo-back/src/main/groovy/com/gdsc/todo/task/dto/TodoResponse.java → todo-back/src/main/groovy/com/gdsc/todo/domain/task/dto/TodoResponse.java

@@ -1,6 +1,6 @@
-package com.gdsc.todo.task.dto;
+package com.gdsc.todo.domain.task.dto;
 
-import com.gdsc.todo.task.domain.Todo;
+import com.gdsc.todo.domain.task.domain.Todo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

todo-back/src/main/groovy/com/gdsc/todo/task/repository/TodoRepository.java → todo-back/src/main/groovy/com/gdsc/todo/domain/task/repository/TodoRepository.java

@@ -1,7 +1,7 @@
-package com.gdsc.todo.task.repository;
+package com.gdsc.todo.domain.task.repository;
 
-import com.gdsc.todo.task.domain.Todo;
-import com.gdsc.todo.user.domain.User;
+import com.gdsc.todo.domain.task.domain.Todo;
+import com.gdsc.todo.domain.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.time.LocalDate;

todo-back/src/main/groovy/com/gdsc/todo/task/service/TodoService.java → todo-back/src/main/groovy/com/gdsc/todo/domain/task/service/TodoService.java

@@ -1,13 +1,13 @@
-package com.gdsc.todo.task.service;
+package com.gdsc.todo.domain.task.service;
 
+import com.gdsc.todo.domain.task.domain.Todo;
+import com.gdsc.todo.domain.task.repository.TodoRepository;
+import com.gdsc.todo.domain.user.repository.UserRepository;
 import com.gdsc.todo.global.details.CustomUser;
-import com.gdsc.todo.history.service.TodoHistoryService;
-import com.gdsc.todo.task.domain.Todo;
-import com.gdsc.todo.task.dto.TodoRequest;
-import com.gdsc.todo.task.dto.TodoResponse;
-import com.gdsc.todo.task.repository.TodoRepository;
-import com.gdsc.todo.user.domain.User;
-import com.gdsc.todo.user.repository.UserRepository;
+import com.gdsc.todo.domain.history.service.TodoHistoryService;
+import com.gdsc.todo.domain.task.dto.TodoRequest;
+import com.gdsc.todo.domain.task.dto.TodoResponse;
+import com.gdsc.todo.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;

todo-back/src/main/groovy/com/gdsc/todo/user/api/UserController.java → todo-back/src/main/groovy/com/gdsc/todo/domain/user/api/UserController.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.user.api;
+package com.gdsc.todo.domain.user.api;
 
 import com.gdsc.todo.global.details.CustomUser;
 import io.swagger.v3.oas.annotations.Operation;

todo-back/src/main/groovy/com/gdsc/todo/user/domain/SocialType.java → todo-back/src/main/groovy/com/gdsc/todo/domain/user/domain/SocialType.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.user.domain;
+package com.gdsc.todo.domain.user.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

todo-back/src/main/groovy/com/gdsc/todo/user/domain/User.java → todo-back/src/main/groovy/com/gdsc/todo/domain/user/domain/User.java

@@ -1,9 +1,9 @@
-package com.gdsc.todo.user.domain;
+package com.gdsc.todo.domain.user.domain;
 
+import com.gdsc.todo.domain.history.domain.TodoHistory;
+import com.gdsc.todo.domain.task.domain.Todo;
 import com.gdsc.todo.global.audit.BaseEntityTIme;
 import com.gdsc.todo.global.details.Role;
-import com.gdsc.todo.history.domain.TodoHistory;
-import com.gdsc.todo.task.domain.Todo;
 import jakarta.persistence.*;
 import lombok.*;
 

todo-back/src/main/groovy/com/gdsc/todo/user/dto/OAuth2Response.java → todo-back/src/main/groovy/com/gdsc/todo/domain/user/dto/OAuth2Response.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.user.dto;
+package com.gdsc.todo.domain.user.dto;
 
 import com.gdsc.todo.global.details.Role;
 import jakarta.persistence.EnumType;

todo-back/src/main/groovy/com/gdsc/todo/user/dto/UserResponse.java → todo-back/src/main/groovy/com/gdsc/todo/domain/user/dto/UserResponse.java

@@ -1,4 +1,4 @@
-package com.gdsc.todo.user.dto;
+package com.gdsc.todo.domain.user.dto;
 
 import lombok.Builder;
 import lombok.Getter;

todo-back/src/main/groovy/com/gdsc/todo/user/repository/UserRepository.java → todo-back/src/main/groovy/com/gdsc/todo/domain/user/repository/UserRepository.java

@@ -1,7 +1,7 @@
-package com.gdsc.todo.user.repository;
+package com.gdsc.todo.domain.user.repository;
 
-import com.gdsc.todo.user.domain.SocialType;
-import com.gdsc.todo.user.domain.User;
+import com.gdsc.todo.domain.user.domain.SocialType;
+import com.gdsc.todo.domain.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;

todo-back/src/main/groovy/com/gdsc/todo/user/service/UserService.java → todo-back/src/main/groovy/com/gdsc/todo/domain/user/service/UserService.java

@@ -1,8 +1,8 @@
-package com.gdsc.todo.user.service;
+package com.gdsc.todo.domain.user.service;
 
+import com.gdsc.todo.domain.user.repository.UserRepository;
 import com.gdsc.todo.global.details.Role;
-import com.gdsc.todo.user.domain.User;
-import com.gdsc.todo.user.repository.UserRepository;
+import com.gdsc.todo.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

todo-back/src/main/groovy/com/gdsc/todo/global/details/CustomUserDetailsService.java

@@ -1,7 +1,7 @@
 package com.gdsc.todo.global.details;
 
-import com.gdsc.todo.user.domain.User;
-import com.gdsc.todo.user.repository.UserRepository;
+import com.gdsc.todo.domain.user.domain.User;
+import com.gdsc.todo.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.userdetails.UserDetails;

todo-back/src/main/groovy/com/gdsc/todo/global/oauth/CustomOAuth2Service.java

@@ -1,8 +1,8 @@
 package com.gdsc.todo.global.oauth;
 
-import com.gdsc.todo.user.domain.SocialType;
-import com.gdsc.todo.user.domain.User;
-import com.gdsc.todo.user.repository.UserRepository;
+import com.gdsc.todo.domain.user.domain.SocialType;
+import com.gdsc.todo.domain.user.domain.User;
+import com.gdsc.todo.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

todo-back/src/main/groovy/com/gdsc/todo/global/oauth/OAuthAttributes.java

@@ -4,8 +4,8 @@
 import com.gdsc.todo.global.oauth.userInfo.KakaoOAuth2UserInfo;
 import com.gdsc.todo.global.oauth.userInfo.NaverOAuth2UserInfo;
 import com.gdsc.todo.global.oauth.userInfo.OAuth2UserInfo;
-import com.gdsc.todo.user.domain.SocialType;
-import com.gdsc.todo.user.domain.User;
+import com.gdsc.todo.domain.user.domain.SocialType;
+import com.gdsc.todo.domain.user.domain.User;
 import lombok.Builder;
 import lombok.Getter;
 

todo-back/src/main/groovy/com/gdsc/todo/global/oauth/handler/Oauth2SuccessHandler.java

@@ -4,7 +4,6 @@
 import com.gdsc.todo.global.config.security.jwt.dto.TokenResponse;
 import com.gdsc.todo.global.config.security.jwt.service.TokenCacheService;
 import com.gdsc.todo.global.oauth.CustomOAuth2User;
-import com.gdsc.todo.user.repository.UserRepository;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

todo-back/src/test/groovy/com/gdsc/todo/service/TodoHistoryServiceTest.java

@@ -1,15 +1,15 @@
 package com.gdsc.todo.service;
 
 import com.gdsc.todo.global.details.Role;
-import com.gdsc.todo.history.domain.Emotion;
-import com.gdsc.todo.history.domain.TodoHistory;
-import com.gdsc.todo.history.repository.TodoHistoryRepository;
-import com.gdsc.todo.history.service.TodoHistoryService;
-import com.gdsc.todo.task.domain.Todo;
-import com.gdsc.todo.task.repository.TodoRepository;
-import com.gdsc.todo.user.domain.SocialType;
-import com.gdsc.todo.user.domain.User;
-import com.gdsc.todo.user.repository.UserRepository;
+import com.gdsc.todo.domain.history.domain.Emotion;
+import com.gdsc.todo.domain.history.domain.TodoHistory;
+import com.gdsc.todo.domain.history.repository.TodoHistoryRepository;
+import com.gdsc.todo.domain.history.service.TodoHistoryService;
+import com.gdsc.todo.domain.task.domain.Todo;
+import com.gdsc.todo.domain.task.repository.TodoRepository;
+import com.gdsc.todo.domain.user.domain.SocialType;
+import com.gdsc.todo.domain.user.domain.User;
+import com.gdsc.todo.domain.user.repository.UserRepository;
 import org.aspectj.lang.annotation.After;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

todo-back/src/test/groovy/com/gdsc/todo/service/TodoServiceTest.java

@@ -1,12 +1,12 @@
 package com.gdsc.todo.service;
 
 import com.gdsc.todo.global.details.Role;
-import com.gdsc.todo.task.domain.Todo;
-import com.gdsc.todo.task.repository.TodoRepository;
-import com.gdsc.todo.task.service.TodoService;
-import com.gdsc.todo.user.domain.SocialType;
-import com.gdsc.todo.user.domain.User;
-import com.gdsc.todo.user.repository.UserRepository;
+import com.gdsc.todo.domain.task.domain.Todo;
+import com.gdsc.todo.domain.task.repository.TodoRepository;
+import com.gdsc.todo.domain.task.service.TodoService;
+import com.gdsc.todo.domain.user.domain.SocialType;
+import com.gdsc.todo.domain.user.domain.User;
+import com.gdsc.todo.domain.user.repository.UserRepository;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;