refactor: entity 패키지를 도메인 기준으로 변경

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.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;
@@ -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;
     }
 

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.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;
@@ -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<InterestedCountry> interestedCountries = countryRepository.findByKoreanNames(interestedCountryNames).stream()
                 .map(country -> new InterestedCountry(savedSiteUser, country))
                 .toList();
-        interestedCountyRepository.saveAll(interestedCountries);
+        interestedCountryRepository.saveAll(interestedCountries);
     }
 
     protected abstract void validateSignUpToken(SignUpRequest signUpRequest);

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.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;
@@ -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;
     }
 

src/main/java/com/example/solidconnection/entity/Country.java → src/main/java/com/example/solidconnection/location/country/domain/Country.java

@@ -1,5 +1,6 @@
-package com.example.solidconnection.entity;
+package com.example.solidconnection.location.country.domain;
 
+import com.example.solidconnection.location.region.domain.Region;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;

src/main/java/com/example/solidconnection/entity/InterestedCountry.java → src/main/java/com/example/solidconnection/location/country/domain/InterestedCountry.java

@@ -1,4 +1,4 @@
-package com.example.solidconnection.entity;
+package com.example.solidconnection.location.country.domain;
 
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.persistence.Entity;

src/main/java/com/example/solidconnection/repositories/CountryRepository.java → src/main/java/com/example/solidconnection/location/country/repository/CountryRepository.java

@@ -1,6 +1,6 @@
-package com.example.solidconnection.repositories;
+package com.example.solidconnection.location.country.repository;
 
-import com.example.solidconnection.entity.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;

src/main/java/com/example/solidconnection/repositories/InterestedCountyRepository.java → src/main/java/com/example/solidconnection/location/country/repository/InterestedCountryRepository.java

@@ -1,13 +1,13 @@
-package com.example.solidconnection.repositories;
+package com.example.solidconnection.location.country.repository;
 
-import com.example.solidconnection.entity.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;
 
 import java.util.List;
 
 @Repository
-public interface InterestedCountyRepository extends JpaRepository<InterestedCountry, Long> {
+public interface InterestedCountryRepository extends JpaRepository<InterestedCountry, Long> {
     List<InterestedCountry> findAllBySiteUser(SiteUser siteUser);
 }

src/main/java/com/example/solidconnection/entity/InterestedRegion.java → src/main/java/com/example/solidconnection/location/region/domain/InterestedRegion.java

@@ -1,4 +1,4 @@
-package com.example.solidconnection.entity;
+package com.example.solidconnection.location.region.domain;
 
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.persistence.Entity;

src/main/java/com/example/solidconnection/entity/Region.java → src/main/java/com/example/solidconnection/location/region/domain/Region.java

@@ -1,4 +1,4 @@
-package com.example.solidconnection.entity;
+package com.example.solidconnection.location.region.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/com/example/solidconnection/repositories/InterestedRegionRepository.java → src/main/java/com/example/solidconnection/location/region/repository/InterestedRegionRepository.java

@@ -1,6 +1,6 @@
-package com.example.solidconnection.repositories;
+package com.example.solidconnection.location.region.repository;
 
-import com.example.solidconnection.entity.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;

src/main/java/com/example/solidconnection/repositories/RegionRepository.java → src/main/java/com/example/solidconnection/location/region/repository/RegionRepository.java

@@ -1,6 +1,6 @@
-package com.example.solidconnection.repositories;
+package com.example.solidconnection.location.region.repository;
 
-import com.example.solidconnection.entity.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;

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.location.country.domain.Country;
+import com.example.solidconnection.location.region.domain.Region;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

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.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;

src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java → 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.entity.Country;
-import com.example.solidconnection.region.fixture.RegionFixture;
+import com.example.solidconnection.location.country.domain.Country;
+import com.example.solidconnection.location.region.fixture.RegionFixture;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.test.context.TestComponent;
 

src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java → 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.entity.Country;
-import com.example.solidconnection.entity.Region;
-import com.example.solidconnection.country.repository.CountryRepositoryForTest;
+import com.example.solidconnection.location.country.domain.Country;
+import com.example.solidconnection.location.region.domain.Region;
+import com.example.solidconnection.location.country.repository.CountryRepositoryForTest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.test.context.TestComponent;
 

src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java → src/test/java/com/example/solidconnection/location/country/repository/CountryRepositoryForTest.java

@@ -1,6 +1,6 @@
-package com.example.solidconnection.country.repository;
+package com.example.solidconnection.location.country.repository;
 
-import com.example.solidconnection.entity.Country;
+import com.example.solidconnection.location.country.domain.Country;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;

src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java → src/test/java/com/example/solidconnection/location/region/fixture/RegionFixture.java

@@ -1,6 +1,6 @@
-package com.example.solidconnection.region.fixture;
+package com.example.solidconnection.location.region.fixture;
 
-import com.example.solidconnection.entity.Region;
+import com.example.solidconnection.location.region.domain.Region;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.test.context.TestComponent;
 

src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java → 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.entity.Region;
-import com.example.solidconnection.region.repository.RegionRepositoryForTest;
+import com.example.solidconnection.location.region.domain.Region;
+import com.example.solidconnection.location.region.repository.RegionRepositoryForTest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.test.context.TestComponent;
 

src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java → src/test/java/com/example/solidconnection/location/region/repository/RegionRepositoryForTest.java

@@ -1,6 +1,6 @@
-package com.example.solidconnection.region.repository;
+package com.example.solidconnection.location.region.repository;
 
-import com.example.solidconnection.entity.Region;
+import com.example.solidconnection.location.region.domain.Region;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;

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.location.country.domain.Country;
 import com.example.solidconnection.community.post.domain.PostImage;
-import com.example.solidconnection.entity.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.repositories.CountryRepository;
+import com.example.solidconnection.location.country.repository.CountryRepository;
 import com.example.solidconnection.community.post.repository.PostImageRepository;
-import com.example.solidconnection.repositories.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;

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;

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.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;

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.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;
@@ -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);