From f4d5a77f6fe422660b3c0f11b7544d3a409b27d6 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 14:20:25 +0900 Subject: [PATCH 1/8] =?UTF-8?q?refactor:=20Country=20=EC=A0=84=EC=9A=A9=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=83=9D=EC=84=B1=20=EB=B0=8F=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../solidconnection/{entity => country/domain}/Country.java | 3 ++- .../{entity => country/domain}/InterestedCountry.java | 2 +- .../repository}/CountryRepository.java | 4 ++-- .../repository}/InterestedCountyRepository.java | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) rename src/main/java/com/example/solidconnection/{entity => country/domain}/Country.java (87%) rename src/main/java/com/example/solidconnection/{entity => country/domain}/InterestedCountry.java (93%) rename src/main/java/com/example/solidconnection/{repositories => country/repository}/CountryRepository.java (80%) rename src/main/java/com/example/solidconnection/{repositories => country/repository}/InterestedCountyRepository.java (74%) diff --git a/src/main/java/com/example/solidconnection/entity/Country.java b/src/main/java/com/example/solidconnection/country/domain/Country.java similarity index 87% rename from src/main/java/com/example/solidconnection/entity/Country.java rename to src/main/java/com/example/solidconnection/country/domain/Country.java index 0a5d974d7..0bcb01812 100644 --- a/src/main/java/com/example/solidconnection/entity/Country.java +++ b/src/main/java/com/example/solidconnection/country/domain/Country.java @@ -1,5 +1,6 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.country.domain; +import com.example.solidconnection.region.domain.Region; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/src/main/java/com/example/solidconnection/entity/InterestedCountry.java b/src/main/java/com/example/solidconnection/country/domain/InterestedCountry.java similarity index 93% rename from src/main/java/com/example/solidconnection/entity/InterestedCountry.java rename to src/main/java/com/example/solidconnection/country/domain/InterestedCountry.java index 8b8b4e735..772062973 100644 --- a/src/main/java/com/example/solidconnection/entity/InterestedCountry.java +++ b/src/main/java/com/example/solidconnection/country/domain/InterestedCountry.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.country.domain; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/repositories/CountryRepository.java b/src/main/java/com/example/solidconnection/country/repository/CountryRepository.java similarity index 80% rename from src/main/java/com/example/solidconnection/repositories/CountryRepository.java rename to src/main/java/com/example/solidconnection/country/repository/CountryRepository.java index d9ba75555..3c3f1e18c 100644 --- a/src/main/java/com/example/solidconnection/repositories/CountryRepository.java +++ b/src/main/java/com/example/solidconnection/country/repository/CountryRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.country.repository; -import com.example.solidconnection.entity.Country; +import com.example.solidconnection.country.domain.Country; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/example/solidconnection/repositories/InterestedCountyRepository.java b/src/main/java/com/example/solidconnection/country/repository/InterestedCountyRepository.java similarity index 74% rename from src/main/java/com/example/solidconnection/repositories/InterestedCountyRepository.java rename to src/main/java/com/example/solidconnection/country/repository/InterestedCountyRepository.java index 68e10b320..aa2e97c87 100644 --- a/src/main/java/com/example/solidconnection/repositories/InterestedCountyRepository.java +++ b/src/main/java/com/example/solidconnection/country/repository/InterestedCountyRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.country.repository; -import com.example.solidconnection.entity.InterestedCountry; +import com.example.solidconnection.country.domain.InterestedCountry; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; From b29b2a241043227bb39874e106928fac8c649cfc Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 14:20:47 +0900 Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20Region=20=EC=A0=84=EC=9A=A9=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=83=9D=EC=84=B1=20=EB=B0=8F=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{entity => region/domain}/InterestedRegion.java | 2 +- .../solidconnection/{entity => region/domain}/Region.java | 2 +- .../repository}/InterestedRegionRepository.java | 4 ++-- .../{repositories => region/repository}/RegionRepository.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/com/example/solidconnection/{entity => region/domain}/InterestedRegion.java (93%) rename src/main/java/com/example/solidconnection/{entity => region/domain}/Region.java (92%) rename src/main/java/com/example/solidconnection/{repositories => region/repository}/InterestedRegionRepository.java (75%) rename src/main/java/com/example/solidconnection/{repositories => region/repository}/RegionRepository.java (81%) diff --git a/src/main/java/com/example/solidconnection/entity/InterestedRegion.java b/src/main/java/com/example/solidconnection/region/domain/InterestedRegion.java similarity index 93% rename from src/main/java/com/example/solidconnection/entity/InterestedRegion.java rename to src/main/java/com/example/solidconnection/region/domain/InterestedRegion.java index 7ec8fa50c..8076f3fe8 100644 --- a/src/main/java/com/example/solidconnection/entity/InterestedRegion.java +++ b/src/main/java/com/example/solidconnection/region/domain/InterestedRegion.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.region.domain; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/entity/Region.java b/src/main/java/com/example/solidconnection/region/domain/Region.java similarity index 92% rename from src/main/java/com/example/solidconnection/entity/Region.java rename to src/main/java/com/example/solidconnection/region/domain/Region.java index 6bd64c5cc..763ed7fa0 100644 --- a/src/main/java/com/example/solidconnection/entity/Region.java +++ b/src/main/java/com/example/solidconnection/region/domain/Region.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.region.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/repositories/InterestedRegionRepository.java b/src/main/java/com/example/solidconnection/region/repository/InterestedRegionRepository.java similarity index 75% rename from src/main/java/com/example/solidconnection/repositories/InterestedRegionRepository.java rename to src/main/java/com/example/solidconnection/region/repository/InterestedRegionRepository.java index df5acd696..c095ec1bf 100644 --- a/src/main/java/com/example/solidconnection/repositories/InterestedRegionRepository.java +++ b/src/main/java/com/example/solidconnection/region/repository/InterestedRegionRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.region.repository; -import com.example.solidconnection.entity.InterestedRegion; +import com.example.solidconnection.region.domain.InterestedRegion; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/repositories/RegionRepository.java b/src/main/java/com/example/solidconnection/region/repository/RegionRepository.java similarity index 81% rename from src/main/java/com/example/solidconnection/repositories/RegionRepository.java rename to src/main/java/com/example/solidconnection/region/repository/RegionRepository.java index 0dc99fb08..7f70f8894 100644 --- a/src/main/java/com/example/solidconnection/repositories/RegionRepository.java +++ b/src/main/java/com/example/solidconnection/region/repository/RegionRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.region.repository; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.region.domain.Region; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; From cc6efd106e081d6516efb471d9acd5f907c3932d Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 14:22:22 +0900 Subject: [PATCH 3/8] =?UTF-8?q?chore:=20InterestedCountryRepository=20?= =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...edCountyRepository.java => InterestedCountryRepository.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/com/example/solidconnection/country/repository/{InterestedCountyRepository.java => InterestedCountryRepository.java} (81%) diff --git a/src/main/java/com/example/solidconnection/country/repository/InterestedCountyRepository.java b/src/main/java/com/example/solidconnection/country/repository/InterestedCountryRepository.java similarity index 81% rename from src/main/java/com/example/solidconnection/country/repository/InterestedCountyRepository.java rename to src/main/java/com/example/solidconnection/country/repository/InterestedCountryRepository.java index aa2e97c87..6dcff51ec 100644 --- a/src/main/java/com/example/solidconnection/country/repository/InterestedCountyRepository.java +++ b/src/main/java/com/example/solidconnection/country/repository/InterestedCountryRepository.java @@ -8,6 +8,6 @@ import java.util.List; @Repository -public interface InterestedCountyRepository extends JpaRepository { +public interface InterestedCountryRepository extends JpaRepository { List findAllBySiteUser(SiteUser siteUser); } From 951b407c9d5cf96a8c7f21d81b70c09ad5497a28 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 14:22:57 +0900 Subject: [PATCH 4/8] =?UTF-8?q?refactor:=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/EmailSignUpService.java | 12 +++++------ .../auth/service/SignUpService.java | 20 +++++++++---------- .../service/oauth/OAuthSignUpService.java | 12 +++++------ .../university/domain/University.java | 4 ++-- .../country/fixture/CountryFixture.java | 2 +- .../fixture/CountryFixtureBuilder.java | 4 ++-- .../repository/CountryRepositoryForTest.java | 2 +- .../region/fixture/RegionFixture.java | 2 +- .../region/fixture/RegionFixtureBuilder.java | 2 +- .../repository/RegionRepositoryForTest.java | 2 +- .../integration/BaseIntegrationTest.java | 8 ++++---- .../fixture/UniversityFixtureBuilder.java | 4 ++-- .../UniversityRecommendServiceTest.java | 14 ++++++------- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java index 37f6681ea..a5dfd8875 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java @@ -2,10 +2,10 @@ import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.country.repository.CountryRepository; +import com.example.solidconnection.country.repository.InterestedCountryRepository; +import com.example.solidconnection.region.repository.InterestedRegionRepository; +import com.example.solidconnection.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; @@ -20,9 +20,9 @@ public class EmailSignUpService extends SignUpService { public EmailSignUpService(SignInService signInService, SiteUserRepository siteUserRepository, RegionRepository regionRepository, InterestedRegionRepository interestedRegionRepository, - CountryRepository countryRepository, InterestedCountyRepository interestedCountyRepository, + CountryRepository countryRepository, InterestedCountryRepository interestedCountryRepository, EmailSignUpTokenProvider emailSignUpTokenProvider) { - super(signInService, siteUserRepository, regionRepository, interestedRegionRepository, countryRepository, interestedCountyRepository); + super(signInService, siteUserRepository, regionRepository, interestedRegionRepository, countryRepository, interestedCountryRepository); this.emailSignUpTokenProvider = emailSignUpTokenProvider; } diff --git a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java index 319083658..312a46471 100644 --- a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java @@ -3,12 +3,12 @@ import com.example.solidconnection.auth.dto.SignInResponse; import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.entity.InterestedCountry; -import com.example.solidconnection.entity.InterestedRegion; -import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.country.domain.InterestedCountry; +import com.example.solidconnection.region.domain.InterestedRegion; +import com.example.solidconnection.country.repository.CountryRepository; +import com.example.solidconnection.country.repository.InterestedCountryRepository; +import com.example.solidconnection.region.repository.InterestedRegionRepository; +import com.example.solidconnection.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import org.springframework.transaction.annotation.Transactional; @@ -31,17 +31,17 @@ public abstract class SignUpService { protected final RegionRepository regionRepository; protected final InterestedRegionRepository interestedRegionRepository; protected final CountryRepository countryRepository; - protected final InterestedCountyRepository interestedCountyRepository; + protected final InterestedCountryRepository interestedCountryRepository; protected SignUpService(SignInService signInService, SiteUserRepository siteUserRepository, RegionRepository regionRepository, InterestedRegionRepository interestedRegionRepository, - CountryRepository countryRepository, InterestedCountyRepository interestedCountyRepository) { + CountryRepository countryRepository, InterestedCountryRepository interestedCountryRepository) { this.signInService = signInService; this.siteUserRepository = siteUserRepository; this.regionRepository = regionRepository; this.interestedRegionRepository = interestedRegionRepository; this.countryRepository = countryRepository; - this.interestedCountyRepository = interestedCountyRepository; + this.interestedCountryRepository = interestedCountryRepository; } @Transactional @@ -81,7 +81,7 @@ private void saveInterestedCountry(SignUpRequest signUpRequest, SiteUser savedSi List interestedCountries = countryRepository.findByKoreanNames(interestedCountryNames).stream() .map(country -> new InterestedCountry(savedSiteUser, country)) .toList(); - interestedCountyRepository.saveAll(interestedCountries); + interestedCountryRepository.saveAll(interestedCountries); } protected abstract void validateSignUpToken(SignUpRequest signUpRequest); diff --git a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java index a46728bb2..dd4d2289c 100644 --- a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java @@ -4,10 +4,10 @@ import com.example.solidconnection.auth.service.SignInService; import com.example.solidconnection.auth.service.SignUpService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.country.repository.CountryRepository; +import com.example.solidconnection.country.repository.InterestedCountryRepository; +import com.example.solidconnection.region.repository.InterestedRegionRepository; +import com.example.solidconnection.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; @@ -22,9 +22,9 @@ public class OAuthSignUpService extends SignUpService { OAuthSignUpService(SignInService signInService, SiteUserRepository siteUserRepository, RegionRepository regionRepository, InterestedRegionRepository interestedRegionRepository, - CountryRepository countryRepository, InterestedCountyRepository interestedCountyRepository, + CountryRepository countryRepository, InterestedCountryRepository interestedCountryRepository, OAuthSignUpTokenProvider oAuthSignUpTokenProvider) { - super(signInService, siteUserRepository, regionRepository, interestedRegionRepository, countryRepository, interestedCountyRepository); + super(signInService, siteUserRepository, regionRepository, interestedRegionRepository, countryRepository, interestedCountryRepository); this.oAuthSignUpTokenProvider = oAuthSignUpTokenProvider; } diff --git a/src/main/java/com/example/solidconnection/university/domain/University.java b/src/main/java/com/example/solidconnection/university/domain/University.java index c3021385e..55feb5013 100644 --- a/src/main/java/com/example/solidconnection/university/domain/University.java +++ b/src/main/java/com/example/solidconnection/university/domain/University.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.domain; -import com.example.solidconnection.entity.Country; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.country.domain.Country; +import com.example.solidconnection.region.domain.Region; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java b/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java index 53f394eae..3009f4912 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java +++ b/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java @@ -1,6 +1,6 @@ package com.example.solidconnection.country.fixture; -import com.example.solidconnection.entity.Country; +import com.example.solidconnection.country.domain.Country; import com.example.solidconnection.region.fixture.RegionFixture; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java b/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java index e3ea004c5..41328dcbe 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java @@ -1,7 +1,7 @@ package com.example.solidconnection.country.fixture; -import com.example.solidconnection.entity.Country; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.country.domain.Country; +import com.example.solidconnection.region.domain.Region; import com.example.solidconnection.country.repository.CountryRepositoryForTest; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java b/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java index fc5dab0f9..14209e19c 100644 --- a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.country.repository; -import com.example.solidconnection.entity.Country; +import com.example.solidconnection.country.domain.Country; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java b/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java index a1cd97e56..3a8715a2e 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java +++ b/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java @@ -1,6 +1,6 @@ package com.example.solidconnection.region.fixture; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.region.domain.Region; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java b/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java index a385a53f8..57f16e473 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java @@ -1,6 +1,6 @@ package com.example.solidconnection.region.fixture; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.region.domain.Region; import com.example.solidconnection.region.repository.RegionRepositoryForTest; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java b/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java index 00c35c02d..9a429939c 100644 --- a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.region.repository; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.region.domain.Region; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index 05b101985..23282ee80 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -6,14 +6,14 @@ import com.example.solidconnection.application.repository.ApplicationRepository; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.board.repository.BoardRepository; -import com.example.solidconnection.entity.Country; +import com.example.solidconnection.country.domain.Country; import com.example.solidconnection.community.post.domain.PostImage; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.region.domain.Region; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.repositories.CountryRepository; +import com.example.solidconnection.country.repository.CountryRepository; import com.example.solidconnection.community.post.repository.PostImageRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.region.repository.RegionRepository; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.GpaScoreRepository; diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java index f51ea9677..ac596e2ec 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.fixture; -import com.example.solidconnection.entity.Country; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.country.domain.Country; +import com.example.solidconnection.region.domain.Region; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.repository.UniversityRepository; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java index 11591d11f..504ea307d 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java @@ -1,9 +1,9 @@ package com.example.solidconnection.university.service; -import com.example.solidconnection.entity.InterestedCountry; -import com.example.solidconnection.entity.InterestedRegion; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; +import com.example.solidconnection.country.domain.InterestedCountry; +import com.example.solidconnection.region.domain.InterestedRegion; +import com.example.solidconnection.country.repository.InterestedCountryRepository; +import com.example.solidconnection.region.repository.InterestedRegionRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; @@ -34,7 +34,7 @@ class UniversityRecommendServiceTest extends BaseIntegrationTest { private InterestedRegionRepository interestedRegionRepository; @Autowired - private InterestedCountyRepository interestedCountyRepository; + private InterestedCountryRepository interestedCountryRepository; @Autowired private GeneralUniversityRecommendService generalUniversityRecommendService; @@ -68,7 +68,7 @@ void setUp() { void 관심_국가_설정한_사용자의_맞춤_추천_대학을_조회한다() { // given SiteUser testUser = createSiteUser(); - interestedCountyRepository.save(new InterestedCountry(testUser, 덴마크)); + interestedCountryRepository.save(new InterestedCountry(testUser, 덴마크)); // when UniversityRecommendsResponse response = universityRecommendService.getPersonalRecommends(testUser); @@ -87,7 +87,7 @@ void setUp() { // given SiteUser testUser = createSiteUser(); interestedRegionRepository.save(new InterestedRegion(testUser, 영미권)); - interestedCountyRepository.save(new InterestedCountry(testUser, 덴마크)); + interestedCountryRepository.save(new InterestedCountry(testUser, 덴마크)); // when UniversityRecommendsResponse response = universityRecommendService.getPersonalRecommends(testUser); From 439cd9b2d77c0298be2bd59ae86379523aad0655 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 19:31:35 +0900 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20QClass=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EA=BC=AC=EC=9D=B8=20=EA=B2=83=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/custom/UniversityFilterRepositoryImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java index dd84cfbf5..ccc9f7cd3 100644 --- a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java +++ b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.repository.custom; -import com.example.solidconnection.entity.QCountry; -import com.example.solidconnection.entity.QRegion; +import com.example.solidconnection.country.domain.QCountry; +import com.example.solidconnection.region.domain.QRegion; import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.university.domain.QUniversity; import com.example.solidconnection.university.domain.QUniversityInfoForApply; From bbb9c199ba989de6059b2bc6f440ce2dee34c07c Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 19:36:29 +0900 Subject: [PATCH 6/8] =?UTF-8?q?refactor:=20Country=EC=99=80=20Region?= =?UTF-8?q?=EC=9D=84=20Location=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/EmailSignUpService.java | 8 ++++---- .../solidconnection/auth/service/SignUpService.java | 12 ++++++------ .../auth/service/oauth/OAuthSignUpService.java | 8 ++++---- .../{ => location}/country/domain/Country.java | 4 ++-- .../country/domain/InterestedCountry.java | 2 +- .../country/repository/CountryRepository.java | 4 ++-- .../repository/InterestedCountryRepository.java | 4 ++-- .../region/domain/InterestedRegion.java | 2 +- .../{ => location}/region/domain/Region.java | 2 +- .../repository/InterestedRegionRepository.java | 4 ++-- .../region/repository/RegionRepository.java | 4 ++-- .../university/domain/University.java | 4 ++-- .../country/fixture/CountryFixture.java | 2 +- .../country/fixture/CountryFixtureBuilder.java | 4 ++-- .../country/repository/CountryRepositoryForTest.java | 2 +- .../region/fixture/RegionFixture.java | 2 +- .../region/fixture/RegionFixtureBuilder.java | 2 +- .../region/repository/RegionRepositoryForTest.java | 2 +- .../support/integration/BaseIntegrationTest.java | 8 ++++---- .../university/fixture/UniversityFixtureBuilder.java | 4 ++-- .../service/UniversityRecommendServiceTest.java | 8 ++++---- 21 files changed, 46 insertions(+), 46 deletions(-) rename src/main/java/com/example/solidconnection/{ => location}/country/domain/Country.java (85%) rename src/main/java/com/example/solidconnection/{ => location}/country/domain/InterestedCountry.java (92%) rename src/main/java/com/example/solidconnection/{ => location}/country/repository/CountryRepository.java (78%) rename src/main/java/com/example/solidconnection/{ => location}/country/repository/InterestedCountryRepository.java (72%) rename src/main/java/com/example/solidconnection/{ => location}/region/domain/InterestedRegion.java (92%) rename src/main/java/com/example/solidconnection/{ => location}/region/domain/Region.java (91%) rename src/main/java/com/example/solidconnection/{ => location}/region/repository/InterestedRegionRepository.java (72%) rename src/main/java/com/example/solidconnection/{ => location}/region/repository/RegionRepository.java (78%) diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java index a5dfd8875..4d2f74812 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java @@ -2,10 +2,10 @@ import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.country.repository.CountryRepository; -import com.example.solidconnection.country.repository.InterestedCountryRepository; -import com.example.solidconnection.region.repository.InterestedRegionRepository; -import com.example.solidconnection.region.repository.RegionRepository; +import com.example.solidconnection.location.country.repository.CountryRepository; +import com.example.solidconnection.location.country.repository.InterestedCountryRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; diff --git a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java index 312a46471..54aaa07ce 100644 --- a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java @@ -3,12 +3,12 @@ import com.example.solidconnection.auth.dto.SignInResponse; import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.country.domain.InterestedCountry; -import com.example.solidconnection.region.domain.InterestedRegion; -import com.example.solidconnection.country.repository.CountryRepository; -import com.example.solidconnection.country.repository.InterestedCountryRepository; -import com.example.solidconnection.region.repository.InterestedRegionRepository; -import com.example.solidconnection.region.repository.RegionRepository; +import com.example.solidconnection.location.country.domain.InterestedCountry; +import com.example.solidconnection.location.region.domain.InterestedRegion; +import com.example.solidconnection.location.country.repository.CountryRepository; +import com.example.solidconnection.location.country.repository.InterestedCountryRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java index dd4d2289c..e44036987 100644 --- a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java @@ -4,10 +4,10 @@ import com.example.solidconnection.auth.service.SignInService; import com.example.solidconnection.auth.service.SignUpService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.country.repository.CountryRepository; -import com.example.solidconnection.country.repository.InterestedCountryRepository; -import com.example.solidconnection.region.repository.InterestedRegionRepository; -import com.example.solidconnection.region.repository.RegionRepository; +import com.example.solidconnection.location.country.repository.CountryRepository; +import com.example.solidconnection.location.country.repository.InterestedCountryRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; diff --git a/src/main/java/com/example/solidconnection/country/domain/Country.java b/src/main/java/com/example/solidconnection/location/country/domain/Country.java similarity index 85% rename from src/main/java/com/example/solidconnection/country/domain/Country.java rename to src/main/java/com/example/solidconnection/location/country/domain/Country.java index 0bcb01812..5a14fef86 100644 --- a/src/main/java/com/example/solidconnection/country/domain/Country.java +++ b/src/main/java/com/example/solidconnection/location/country/domain/Country.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.country.domain; +package com.example.solidconnection.location.country.domain; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.region.domain.Region; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/src/main/java/com/example/solidconnection/country/domain/InterestedCountry.java b/src/main/java/com/example/solidconnection/location/country/domain/InterestedCountry.java similarity index 92% rename from src/main/java/com/example/solidconnection/country/domain/InterestedCountry.java rename to src/main/java/com/example/solidconnection/location/country/domain/InterestedCountry.java index 772062973..9d75c51ed 100644 --- a/src/main/java/com/example/solidconnection/country/domain/InterestedCountry.java +++ b/src/main/java/com/example/solidconnection/location/country/domain/InterestedCountry.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.country.domain; +package com.example.solidconnection.location.country.domain; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/country/repository/CountryRepository.java b/src/main/java/com/example/solidconnection/location/country/repository/CountryRepository.java similarity index 78% rename from src/main/java/com/example/solidconnection/country/repository/CountryRepository.java rename to src/main/java/com/example/solidconnection/location/country/repository/CountryRepository.java index 3c3f1e18c..4860e6015 100644 --- a/src/main/java/com/example/solidconnection/country/repository/CountryRepository.java +++ b/src/main/java/com/example/solidconnection/location/country/repository/CountryRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.country.repository; +package com.example.solidconnection.location.country.repository; -import com.example.solidconnection.country.domain.Country; +import com.example.solidconnection.location.country.domain.Country; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/example/solidconnection/country/repository/InterestedCountryRepository.java b/src/main/java/com/example/solidconnection/location/country/repository/InterestedCountryRepository.java similarity index 72% rename from src/main/java/com/example/solidconnection/country/repository/InterestedCountryRepository.java rename to src/main/java/com/example/solidconnection/location/country/repository/InterestedCountryRepository.java index 6dcff51ec..2eacc2ca9 100644 --- a/src/main/java/com/example/solidconnection/country/repository/InterestedCountryRepository.java +++ b/src/main/java/com/example/solidconnection/location/country/repository/InterestedCountryRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.country.repository; +package com.example.solidconnection.location.country.repository; -import com.example.solidconnection.country.domain.InterestedCountry; +import com.example.solidconnection.location.country.domain.InterestedCountry; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/region/domain/InterestedRegion.java b/src/main/java/com/example/solidconnection/location/region/domain/InterestedRegion.java similarity index 92% rename from src/main/java/com/example/solidconnection/region/domain/InterestedRegion.java rename to src/main/java/com/example/solidconnection/location/region/domain/InterestedRegion.java index 8076f3fe8..457ee4eb6 100644 --- a/src/main/java/com/example/solidconnection/region/domain/InterestedRegion.java +++ b/src/main/java/com/example/solidconnection/location/region/domain/InterestedRegion.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.region.domain; +package com.example.solidconnection.location.region.domain; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/region/domain/Region.java b/src/main/java/com/example/solidconnection/location/region/domain/Region.java similarity index 91% rename from src/main/java/com/example/solidconnection/region/domain/Region.java rename to src/main/java/com/example/solidconnection/location/region/domain/Region.java index 763ed7fa0..cb0d5ab7a 100644 --- a/src/main/java/com/example/solidconnection/region/domain/Region.java +++ b/src/main/java/com/example/solidconnection/location/region/domain/Region.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.region.domain; +package com.example.solidconnection.location.region.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/region/repository/InterestedRegionRepository.java b/src/main/java/com/example/solidconnection/location/region/repository/InterestedRegionRepository.java similarity index 72% rename from src/main/java/com/example/solidconnection/region/repository/InterestedRegionRepository.java rename to src/main/java/com/example/solidconnection/location/region/repository/InterestedRegionRepository.java index c095ec1bf..90d860b3c 100644 --- a/src/main/java/com/example/solidconnection/region/repository/InterestedRegionRepository.java +++ b/src/main/java/com/example/solidconnection/location/region/repository/InterestedRegionRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.region.repository; +package com.example.solidconnection.location.region.repository; -import com.example.solidconnection.region.domain.InterestedRegion; +import com.example.solidconnection.location.region.domain.InterestedRegion; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/region/repository/RegionRepository.java b/src/main/java/com/example/solidconnection/location/region/repository/RegionRepository.java similarity index 78% rename from src/main/java/com/example/solidconnection/region/repository/RegionRepository.java rename to src/main/java/com/example/solidconnection/location/region/repository/RegionRepository.java index 7f70f8894..094f19f5f 100644 --- a/src/main/java/com/example/solidconnection/region/repository/RegionRepository.java +++ b/src/main/java/com/example/solidconnection/location/region/repository/RegionRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.region.repository; +package com.example.solidconnection.location.region.repository; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.region.domain.Region; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/example/solidconnection/university/domain/University.java b/src/main/java/com/example/solidconnection/university/domain/University.java index 55feb5013..d010861d4 100644 --- a/src/main/java/com/example/solidconnection/university/domain/University.java +++ b/src/main/java/com/example/solidconnection/university/domain/University.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.domain; -import com.example.solidconnection.country.domain.Country; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.region.domain.Region; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java b/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java index 3009f4912..3538e11a9 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java +++ b/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java @@ -1,6 +1,6 @@ package com.example.solidconnection.country.fixture; -import com.example.solidconnection.country.domain.Country; +import com.example.solidconnection.location.country.domain.Country; import com.example.solidconnection.region.fixture.RegionFixture; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java b/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java index 41328dcbe..eab4574ec 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java @@ -1,7 +1,7 @@ package com.example.solidconnection.country.fixture; -import com.example.solidconnection.country.domain.Country; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.country.repository.CountryRepositoryForTest; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java b/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java index 14209e19c..3503f93e4 100644 --- a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.country.repository; -import com.example.solidconnection.country.domain.Country; +import com.example.solidconnection.location.country.domain.Country; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java b/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java index 3a8715a2e..19b54be41 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java +++ b/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java @@ -1,6 +1,6 @@ package com.example.solidconnection.region.fixture; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.region.domain.Region; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java b/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java index 57f16e473..0bdaa07c1 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java @@ -1,6 +1,6 @@ package com.example.solidconnection.region.fixture; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.region.repository.RegionRepositoryForTest; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java b/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java index 9a429939c..5f12d6bd8 100644 --- a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.region.repository; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.region.domain.Region; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index 23282ee80..3a38b34cf 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -6,14 +6,14 @@ import com.example.solidconnection.application.repository.ApplicationRepository; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.board.repository.BoardRepository; -import com.example.solidconnection.country.domain.Country; +import com.example.solidconnection.location.country.domain.Country; import com.example.solidconnection.community.post.domain.PostImage; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.country.repository.CountryRepository; +import com.example.solidconnection.location.country.repository.CountryRepository; import com.example.solidconnection.community.post.repository.PostImageRepository; -import com.example.solidconnection.region.repository.RegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.GpaScoreRepository; diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java index ac596e2ec..4da6cdfd7 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.fixture; -import com.example.solidconnection.country.domain.Country; -import com.example.solidconnection.region.domain.Region; +import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.repository.UniversityRepository; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java index 504ea307d..f17beba25 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java @@ -1,9 +1,9 @@ package com.example.solidconnection.university.service; -import com.example.solidconnection.country.domain.InterestedCountry; -import com.example.solidconnection.region.domain.InterestedRegion; -import com.example.solidconnection.country.repository.InterestedCountryRepository; -import com.example.solidconnection.region.repository.InterestedRegionRepository; +import com.example.solidconnection.location.country.domain.InterestedCountry; +import com.example.solidconnection.location.region.domain.InterestedRegion; +import com.example.solidconnection.location.country.repository.InterestedCountryRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; From 15b11a6a7892d793b699f71627491a8c2935a028 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 19:37:20 +0900 Subject: [PATCH 7/8] =?UTF-8?q?refactor:=20Test=EC=9A=A9=20Country?= =?UTF-8?q?=EC=99=80=20Region=EC=9D=84=20Location=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => location}/country/fixture/CountryFixture.java | 4 ++-- .../{ => location}/country/fixture/CountryFixtureBuilder.java | 4 ++-- .../country/repository/CountryRepositoryForTest.java | 2 +- .../{ => location}/region/fixture/RegionFixture.java | 2 +- .../{ => location}/region/fixture/RegionFixtureBuilder.java | 4 ++-- .../region/repository/RegionRepositoryForTest.java | 2 +- .../solidconnection/university/fixture/UniversityFixture.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename src/test/java/com/example/solidconnection/{ => location}/country/fixture/CountryFixture.java (91%) rename src/test/java/com/example/solidconnection/{ => location}/country/fixture/CountryFixtureBuilder.java (88%) rename src/test/java/com/example/solidconnection/{ => location}/country/repository/CountryRepositoryForTest.java (81%) rename src/test/java/com/example/solidconnection/{ => location}/region/fixture/RegionFixture.java (93%) rename src/test/java/com/example/solidconnection/{ => location}/region/fixture/RegionFixtureBuilder.java (86%) rename src/test/java/com/example/solidconnection/{ => location}/region/repository/RegionRepositoryForTest.java (81%) diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixture.java similarity index 91% rename from src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java rename to src/test/java/com/example/solidconnection/location/country/fixture/CountryFixture.java index 3538e11a9..cf3e2d6b1 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java +++ b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixture.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.country.fixture; +package com.example.solidconnection.location.country.fixture; import com.example.solidconnection.location.country.domain.Country; -import com.example.solidconnection.region.fixture.RegionFixture; +import com.example.solidconnection.location.region.fixture.RegionFixture; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java similarity index 88% rename from src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java rename to src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java index eab4574ec..bd2b4138f 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java @@ -1,8 +1,8 @@ -package com.example.solidconnection.country.fixture; +package com.example.solidconnection.location.country.fixture; import com.example.solidconnection.location.country.domain.Country; import com.example.solidconnection.location.region.domain.Region; -import com.example.solidconnection.country.repository.CountryRepositoryForTest; +import com.example.solidconnection.location.country.repository.CountryRepositoryForTest; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java b/src/test/java/com/example/solidconnection/location/country/repository/CountryRepositoryForTest.java similarity index 81% rename from src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java rename to src/test/java/com/example/solidconnection/location/country/repository/CountryRepositoryForTest.java index 3503f93e4..c9c7400a9 100644 --- a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/location/country/repository/CountryRepositoryForTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.country.repository; +package com.example.solidconnection.location.country.repository; import com.example.solidconnection.location.country.domain.Country; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixture.java similarity index 93% rename from src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java rename to src/test/java/com/example/solidconnection/location/region/fixture/RegionFixture.java index 19b54be41..2cf13437e 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java +++ b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixture.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.region.fixture; +package com.example.solidconnection.location.region.fixture; import com.example.solidconnection.location.region.domain.Region; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixtureBuilder.java similarity index 86% rename from src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java rename to src/test/java/com/example/solidconnection/location/region/fixture/RegionFixtureBuilder.java index 0bdaa07c1..968665e22 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixtureBuilder.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.region.fixture; +package com.example.solidconnection.location.region.fixture; import com.example.solidconnection.location.region.domain.Region; -import com.example.solidconnection.region.repository.RegionRepositoryForTest; +import com.example.solidconnection.location.region.repository.RegionRepositoryForTest; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java b/src/test/java/com/example/solidconnection/location/region/repository/RegionRepositoryForTest.java similarity index 81% rename from src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java rename to src/test/java/com/example/solidconnection/location/region/repository/RegionRepositoryForTest.java index 5f12d6bd8..a27c16b9b 100644 --- a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/location/region/repository/RegionRepositoryForTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.region.repository; +package com.example.solidconnection.location.region.repository; import com.example.solidconnection.location.region.domain.Region; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java index f3a41515f..d1c9d2dd4 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java +++ b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.fixture; -import com.example.solidconnection.country.fixture.CountryFixture; -import com.example.solidconnection.region.fixture.RegionFixture; +import com.example.solidconnection.location.country.fixture.CountryFixture; +import com.example.solidconnection.location.region.fixture.RegionFixture; import com.example.solidconnection.university.domain.University; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; From 2da4c99d021e4518012430b371e7974ceb89d7dc Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Mon, 12 May 2025 20:08:53 +0900 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20QClass=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EA=BC=AC=EC=9D=B8=20=EA=B2=83=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/custom/UniversityFilterRepositoryImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java index ccc9f7cd3..47c674318 100644 --- a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java +++ b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.repository.custom; -import com.example.solidconnection.country.domain.QCountry; -import com.example.solidconnection.region.domain.QRegion; +import com.example.solidconnection.location.country.domain.QCountry; +import com.example.solidconnection.location.region.domain.QRegion; import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.university.domain.QUniversity; import com.example.solidconnection.university.domain.QUniversityInfoForApply;