diff --git a/src/main/java/com/odiga/fiesta/festival/controller/FestivalController.java b/src/main/java/com/odiga/fiesta/festival/controller/FestivalController.java index e55e412c..2f76b59d 100644 --- a/src/main/java/com/odiga/fiesta/festival/controller/FestivalController.java +++ b/src/main/java/com/odiga/fiesta/festival/controller/FestivalController.java @@ -12,10 +12,10 @@ import com.odiga.fiesta.festival.dto.response.CompanionResponse; import com.odiga.fiesta.festival.dto.response.MoodResponse; import com.odiga.fiesta.festival.dto.response.PriorityResponse; -import com.odiga.fiesta.festival.service.CategoryService; -import com.odiga.fiesta.festival.service.CompanionService; -import com.odiga.fiesta.festival.service.MoodService; -import com.odiga.fiesta.festival.service.PriorityService; +import com.odiga.fiesta.global.service.CategoryService; +import com.odiga.fiesta.global.service.CompanionService; +import com.odiga.fiesta.global.service.MoodService; +import com.odiga.fiesta.global.service.PriorityService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/odiga/fiesta/festival/dto/response/CategoryResponse.java b/src/main/java/com/odiga/fiesta/festival/dto/response/CategoryResponse.java index 41adc0a9..07224489 100644 --- a/src/main/java/com/odiga/fiesta/festival/dto/response/CategoryResponse.java +++ b/src/main/java/com/odiga/fiesta/festival/dto/response/CategoryResponse.java @@ -2,7 +2,7 @@ import static lombok.AccessLevel.*; -import com.odiga.fiesta.festival.domain.Category; +import com.odiga.fiesta.global.domain.Category; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/odiga/fiesta/festival/dto/response/CompanionResponse.java b/src/main/java/com/odiga/fiesta/festival/dto/response/CompanionResponse.java index fc30c3a2..641a2ea1 100644 --- a/src/main/java/com/odiga/fiesta/festival/dto/response/CompanionResponse.java +++ b/src/main/java/com/odiga/fiesta/festival/dto/response/CompanionResponse.java @@ -2,7 +2,7 @@ import static lombok.AccessLevel.*; -import com.odiga.fiesta.festival.domain.Companion; +import com.odiga.fiesta.global.domain.Companion; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/odiga/fiesta/festival/dto/response/MoodResponse.java b/src/main/java/com/odiga/fiesta/festival/dto/response/MoodResponse.java index ad14abc9..23bb67f9 100644 --- a/src/main/java/com/odiga/fiesta/festival/dto/response/MoodResponse.java +++ b/src/main/java/com/odiga/fiesta/festival/dto/response/MoodResponse.java @@ -2,7 +2,7 @@ import static lombok.AccessLevel.*; -import com.odiga.fiesta.festival.domain.Mood; +import com.odiga.fiesta.global.domain.Mood; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/odiga/fiesta/festival/dto/response/PriorityResponse.java b/src/main/java/com/odiga/fiesta/festival/dto/response/PriorityResponse.java index bc55e067..c3343e01 100644 --- a/src/main/java/com/odiga/fiesta/festival/dto/response/PriorityResponse.java +++ b/src/main/java/com/odiga/fiesta/festival/dto/response/PriorityResponse.java @@ -2,7 +2,7 @@ import static lombok.AccessLevel.*; -import com.odiga.fiesta.festival.domain.Priority; +import com.odiga.fiesta.global.domain.Priority; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/odiga/fiesta/festival/domain/Category.java b/src/main/java/com/odiga/fiesta/global/domain/Category.java similarity index 93% rename from src/main/java/com/odiga/fiesta/festival/domain/Category.java rename to src/main/java/com/odiga/fiesta/global/domain/Category.java index 1600e9a6..7176e8b8 100644 --- a/src/main/java/com/odiga/fiesta/festival/domain/Category.java +++ b/src/main/java/com/odiga/fiesta/global/domain/Category.java @@ -1,4 +1,4 @@ -package com.odiga.fiesta.festival.domain; +package com.odiga.fiesta.global.domain; import static jakarta.persistence.GenerationType.*; import static lombok.AccessLevel.*; diff --git a/src/main/java/com/odiga/fiesta/festival/domain/Companion.java b/src/main/java/com/odiga/fiesta/global/domain/Companion.java similarity index 94% rename from src/main/java/com/odiga/fiesta/festival/domain/Companion.java rename to src/main/java/com/odiga/fiesta/global/domain/Companion.java index 9406b9a1..c6652905 100644 --- a/src/main/java/com/odiga/fiesta/festival/domain/Companion.java +++ b/src/main/java/com/odiga/fiesta/global/domain/Companion.java @@ -1,4 +1,4 @@ -package com.odiga.fiesta.festival.domain; +package com.odiga.fiesta.global.domain; import static jakarta.persistence.GenerationType.*; import static lombok.AccessLevel.*; diff --git a/src/main/java/com/odiga/fiesta/festival/domain/Mood.java b/src/main/java/com/odiga/fiesta/global/domain/Mood.java similarity index 93% rename from src/main/java/com/odiga/fiesta/festival/domain/Mood.java rename to src/main/java/com/odiga/fiesta/global/domain/Mood.java index 69f9031b..971130df 100644 --- a/src/main/java/com/odiga/fiesta/festival/domain/Mood.java +++ b/src/main/java/com/odiga/fiesta/global/domain/Mood.java @@ -1,4 +1,4 @@ -package com.odiga.fiesta.festival.domain; +package com.odiga.fiesta.global.domain; import static jakarta.persistence.GenerationType.*; import static lombok.AccessLevel.*; diff --git a/src/main/java/com/odiga/fiesta/festival/domain/Priority.java b/src/main/java/com/odiga/fiesta/global/domain/Priority.java similarity index 93% rename from src/main/java/com/odiga/fiesta/festival/domain/Priority.java rename to src/main/java/com/odiga/fiesta/global/domain/Priority.java index 26bb969a..8a951558 100644 --- a/src/main/java/com/odiga/fiesta/festival/domain/Priority.java +++ b/src/main/java/com/odiga/fiesta/global/domain/Priority.java @@ -1,4 +1,4 @@ -package com.odiga.fiesta.festival.domain; +package com.odiga.fiesta.global.domain; import static jakarta.persistence.GenerationType.*; import static lombok.AccessLevel.*; diff --git a/src/main/java/com/odiga/fiesta/festival/repository/CategoryRepository.java b/src/main/java/com/odiga/fiesta/global/repository/CategoryRepository.java similarity index 59% rename from src/main/java/com/odiga/fiesta/festival/repository/CategoryRepository.java rename to src/main/java/com/odiga/fiesta/global/repository/CategoryRepository.java index fdda6936..682c70bf 100644 --- a/src/main/java/com/odiga/fiesta/festival/repository/CategoryRepository.java +++ b/src/main/java/com/odiga/fiesta/global/repository/CategoryRepository.java @@ -1,8 +1,8 @@ -package com.odiga.fiesta.festival.repository; +package com.odiga.fiesta.global.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.odiga.fiesta.festival.domain.Category; +import com.odiga.fiesta.global.domain.Category; public interface CategoryRepository extends JpaRepository { } diff --git a/src/main/java/com/odiga/fiesta/festival/repository/CompanionRepository.java b/src/main/java/com/odiga/fiesta/global/repository/CompanionRepository.java similarity index 59% rename from src/main/java/com/odiga/fiesta/festival/repository/CompanionRepository.java rename to src/main/java/com/odiga/fiesta/global/repository/CompanionRepository.java index e68ce26b..a7f2cb20 100644 --- a/src/main/java/com/odiga/fiesta/festival/repository/CompanionRepository.java +++ b/src/main/java/com/odiga/fiesta/global/repository/CompanionRepository.java @@ -1,8 +1,8 @@ -package com.odiga.fiesta.festival.repository; +package com.odiga.fiesta.global.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.odiga.fiesta.festival.domain.Companion; +import com.odiga.fiesta.global.domain.Companion; public interface CompanionRepository extends JpaRepository { } diff --git a/src/main/java/com/odiga/fiesta/festival/repository/MoodRepository.java b/src/main/java/com/odiga/fiesta/global/repository/MoodRepository.java similarity index 59% rename from src/main/java/com/odiga/fiesta/festival/repository/MoodRepository.java rename to src/main/java/com/odiga/fiesta/global/repository/MoodRepository.java index 5064a410..b9accb3f 100644 --- a/src/main/java/com/odiga/fiesta/festival/repository/MoodRepository.java +++ b/src/main/java/com/odiga/fiesta/global/repository/MoodRepository.java @@ -1,8 +1,8 @@ -package com.odiga.fiesta.festival.repository; +package com.odiga.fiesta.global.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.odiga.fiesta.festival.domain.Mood; +import com.odiga.fiesta.global.domain.Mood; public interface MoodRepository extends JpaRepository { } diff --git a/src/main/java/com/odiga/fiesta/festival/repository/PriorityRepository.java b/src/main/java/com/odiga/fiesta/global/repository/PriorityRepository.java similarity index 59% rename from src/main/java/com/odiga/fiesta/festival/repository/PriorityRepository.java rename to src/main/java/com/odiga/fiesta/global/repository/PriorityRepository.java index 25520fa5..9d0b8bc7 100644 --- a/src/main/java/com/odiga/fiesta/festival/repository/PriorityRepository.java +++ b/src/main/java/com/odiga/fiesta/global/repository/PriorityRepository.java @@ -1,8 +1,8 @@ -package com.odiga.fiesta.festival.repository; +package com.odiga.fiesta.global.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.odiga.fiesta.festival.domain.Priority; +import com.odiga.fiesta.global.domain.Priority; public interface PriorityRepository extends JpaRepository { } diff --git a/src/main/java/com/odiga/fiesta/festival/service/CategoryService.java b/src/main/java/com/odiga/fiesta/global/service/CategoryService.java similarity index 79% rename from src/main/java/com/odiga/fiesta/festival/service/CategoryService.java rename to src/main/java/com/odiga/fiesta/global/service/CategoryService.java index a8895200..60108800 100644 --- a/src/main/java/com/odiga/fiesta/festival/service/CategoryService.java +++ b/src/main/java/com/odiga/fiesta/global/service/CategoryService.java @@ -1,13 +1,13 @@ -package com.odiga.fiesta.festival.service; +package com.odiga.fiesta.global.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.odiga.fiesta.festival.domain.Category; +import com.odiga.fiesta.global.domain.Category; import com.odiga.fiesta.festival.dto.response.CategoryResponse; -import com.odiga.fiesta.festival.repository.CategoryRepository; +import com.odiga.fiesta.global.repository.CategoryRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/odiga/fiesta/festival/service/CompanionService.java b/src/main/java/com/odiga/fiesta/global/service/CompanionService.java similarity index 79% rename from src/main/java/com/odiga/fiesta/festival/service/CompanionService.java rename to src/main/java/com/odiga/fiesta/global/service/CompanionService.java index 78eac4ba..c2facb3a 100644 --- a/src/main/java/com/odiga/fiesta/festival/service/CompanionService.java +++ b/src/main/java/com/odiga/fiesta/global/service/CompanionService.java @@ -1,13 +1,13 @@ -package com.odiga.fiesta.festival.service; +package com.odiga.fiesta.global.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.odiga.fiesta.festival.domain.Companion; +import com.odiga.fiesta.global.domain.Companion; import com.odiga.fiesta.festival.dto.response.CompanionResponse; -import com.odiga.fiesta.festival.repository.CompanionRepository; +import com.odiga.fiesta.global.repository.CompanionRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/odiga/fiesta/festival/service/MoodService.java b/src/main/java/com/odiga/fiesta/global/service/MoodService.java similarity index 78% rename from src/main/java/com/odiga/fiesta/festival/service/MoodService.java rename to src/main/java/com/odiga/fiesta/global/service/MoodService.java index 09ad590c..263a3163 100644 --- a/src/main/java/com/odiga/fiesta/festival/service/MoodService.java +++ b/src/main/java/com/odiga/fiesta/global/service/MoodService.java @@ -1,13 +1,13 @@ -package com.odiga.fiesta.festival.service; +package com.odiga.fiesta.global.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.odiga.fiesta.festival.domain.Mood; +import com.odiga.fiesta.global.domain.Mood; import com.odiga.fiesta.festival.dto.response.MoodResponse; -import com.odiga.fiesta.festival.repository.MoodRepository; +import com.odiga.fiesta.global.repository.MoodRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/odiga/fiesta/festival/service/PriorityService.java b/src/main/java/com/odiga/fiesta/global/service/PriorityService.java similarity index 79% rename from src/main/java/com/odiga/fiesta/festival/service/PriorityService.java rename to src/main/java/com/odiga/fiesta/global/service/PriorityService.java index 49ceca79..e0a54b2d 100644 --- a/src/main/java/com/odiga/fiesta/festival/service/PriorityService.java +++ b/src/main/java/com/odiga/fiesta/global/service/PriorityService.java @@ -1,13 +1,13 @@ -package com.odiga.fiesta.festival.service; +package com.odiga.fiesta.global.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.odiga.fiesta.festival.domain.Priority; +import com.odiga.fiesta.global.domain.Priority; import com.odiga.fiesta.festival.dto.response.PriorityResponse; -import com.odiga.fiesta.festival.repository.PriorityRepository; +import com.odiga.fiesta.global.repository.PriorityRepository; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/odiga/fiesta/ControllerTestSupport.java b/src/test/java/com/odiga/fiesta/ControllerTestSupport.java index 73b53b69..3f2a75fc 100644 --- a/src/test/java/com/odiga/fiesta/ControllerTestSupport.java +++ b/src/test/java/com/odiga/fiesta/ControllerTestSupport.java @@ -9,10 +9,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.odiga.fiesta.festival.controller.FestivalController; -import com.odiga.fiesta.festival.service.CategoryService; -import com.odiga.fiesta.festival.service.CompanionService; -import com.odiga.fiesta.festival.service.MoodService; -import com.odiga.fiesta.festival.service.PriorityService; +import com.odiga.fiesta.global.service.CategoryService; +import com.odiga.fiesta.global.service.CompanionService; +import com.odiga.fiesta.global.service.MoodService; +import com.odiga.fiesta.global.service.PriorityService; @ActiveProfiles("test") @WithMockUser diff --git a/src/test/java/com/odiga/fiesta/festival/controller/FestivalControllerTest.java b/src/test/java/com/odiga/fiesta/festival/controller/FestivalControllerTest.java index 3b65d13d..a8c5af27 100644 --- a/src/test/java/com/odiga/fiesta/festival/controller/FestivalControllerTest.java +++ b/src/test/java/com/odiga/fiesta/festival/controller/FestivalControllerTest.java @@ -16,10 +16,10 @@ import com.odiga.fiesta.festival.dto.response.CompanionResponse; import com.odiga.fiesta.festival.dto.response.MoodResponse; import com.odiga.fiesta.festival.dto.response.PriorityResponse; -import com.odiga.fiesta.festival.service.CategoryService; -import com.odiga.fiesta.festival.service.CompanionService; -import com.odiga.fiesta.festival.service.MoodService; -import com.odiga.fiesta.festival.service.PriorityService; +import com.odiga.fiesta.global.service.CategoryService; +import com.odiga.fiesta.global.service.CompanionService; +import com.odiga.fiesta.global.service.MoodService; +import com.odiga.fiesta.global.service.PriorityService; class FestivalControllerTest extends ControllerTestSupport { diff --git a/src/test/java/com/odiga/fiesta/festival/service/CategoryServiceTest.java b/src/test/java/com/odiga/fiesta/festival/service/CategoryServiceTest.java index d217b1be..9d2b0d9c 100644 --- a/src/test/java/com/odiga/fiesta/festival/service/CategoryServiceTest.java +++ b/src/test/java/com/odiga/fiesta/festival/service/CategoryServiceTest.java @@ -11,9 +11,10 @@ import org.mockito.Mock; import com.odiga.fiesta.MockTestSupport; -import com.odiga.fiesta.festival.domain.Category; +import com.odiga.fiesta.global.domain.Category; import com.odiga.fiesta.festival.dto.response.CategoryResponse; -import com.odiga.fiesta.festival.repository.CategoryRepository; +import com.odiga.fiesta.global.repository.CategoryRepository; +import com.odiga.fiesta.global.service.CategoryService; class CategoryServiceTest extends MockTestSupport { diff --git a/src/test/java/com/odiga/fiesta/festival/service/CompanionServiceTest.java b/src/test/java/com/odiga/fiesta/festival/service/CompanionServiceTest.java index 54658ba3..6c6acc46 100644 --- a/src/test/java/com/odiga/fiesta/festival/service/CompanionServiceTest.java +++ b/src/test/java/com/odiga/fiesta/festival/service/CompanionServiceTest.java @@ -11,9 +11,10 @@ import org.mockito.Mock; import com.odiga.fiesta.MockTestSupport; -import com.odiga.fiesta.festival.domain.Companion; +import com.odiga.fiesta.global.domain.Companion; import com.odiga.fiesta.festival.dto.response.CompanionResponse; -import com.odiga.fiesta.festival.repository.CompanionRepository; +import com.odiga.fiesta.global.repository.CompanionRepository; +import com.odiga.fiesta.global.service.CompanionService; class CompanionServiceTest extends MockTestSupport { diff --git a/src/test/java/com/odiga/fiesta/festival/service/MoodServiceTest.java b/src/test/java/com/odiga/fiesta/festival/service/MoodServiceTest.java index 582756ea..3f22de0b 100644 --- a/src/test/java/com/odiga/fiesta/festival/service/MoodServiceTest.java +++ b/src/test/java/com/odiga/fiesta/festival/service/MoodServiceTest.java @@ -11,9 +11,10 @@ import org.mockito.Mock; import com.odiga.fiesta.MockTestSupport; -import com.odiga.fiesta.festival.domain.Mood; +import com.odiga.fiesta.global.domain.Mood; import com.odiga.fiesta.festival.dto.response.MoodResponse; -import com.odiga.fiesta.festival.repository.MoodRepository; +import com.odiga.fiesta.global.repository.MoodRepository; +import com.odiga.fiesta.global.service.MoodService; class MoodServiceTest extends MockTestSupport { diff --git a/src/test/java/com/odiga/fiesta/festival/service/PriorityServiceTest.java b/src/test/java/com/odiga/fiesta/festival/service/PriorityServiceTest.java index 310d360a..9e8465a6 100644 --- a/src/test/java/com/odiga/fiesta/festival/service/PriorityServiceTest.java +++ b/src/test/java/com/odiga/fiesta/festival/service/PriorityServiceTest.java @@ -11,9 +11,10 @@ import org.mockito.Mock; import com.odiga.fiesta.MockTestSupport; -import com.odiga.fiesta.festival.domain.Priority; +import com.odiga.fiesta.global.domain.Priority; import com.odiga.fiesta.festival.dto.response.PriorityResponse; -import com.odiga.fiesta.festival.repository.PriorityRepository; +import com.odiga.fiesta.global.repository.PriorityRepository; +import com.odiga.fiesta.global.service.PriorityService; class PriorityServiceTest extends MockTestSupport {