Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Gyuhyeok99 wants to merge 8 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4d5a77
refactor: Country 전용 패키지 생성 및 이동
Gyuhyeok99 May 12, 2025
b29b2a2
refactor: Region 전용 패키지 생성 및 이동
Gyuhyeok99 May 12, 2025
cc6efd1
chore: InterestedCountryRepository 오타 수정
Gyuhyeok99 May 12, 2025
951b407
refactor: 변경된 패키지 반영
Gyuhyeok99 May 12, 2025
439cd9b
fix: QClass 설정 꼬인 것 해결
Gyuhyeok99 May 12, 2025
bbb9c19
refactor: Country와 Region을 Location 패키지로 이동
Gyuhyeok99 May 12, 2025
15b11a6
refactor: Test용 Country와 Region을 Location 패키지로 이동
Gyuhyeok99 May 12, 2025
2da4c99
fix: QClass 설정 꼬인 것 해결
Gyuhyeok99 May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/example/solidconnection/auth/service/SignUpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
3 changes: 2 additions & 1 deletion ...ample/solidconnection/entity/Country.java → ...lidconnection/country/domain/Country.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...dconnection/entity/InterestedCountry.java → ...ion/country/domain/InterestedCountry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ction/repositories/CountryRepository.java → ...country/repository/CountryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ositories/InterestedCountyRepository.java → ...pository/InterestedCountryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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;

import java.util.List;

@Repository
public interface InterestedCountyRepository extends JpaRepository<InterestedCountry, Long> {
public interface InterestedCountryRepository extends JpaRepository<InterestedCountry, Long> {
List<InterestedCountry> findAllBySiteUser(SiteUser siteUser);
}
2 changes: 1 addition & 1 deletion ...idconnection/entity/InterestedRegion.java → ...ction/region/domain/InterestedRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...xample/solidconnection/entity/Region.java → ...solidconnection/region/domain/Region.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.solidconnection.entity;
package com.example.solidconnection.region.domain;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down
4 changes: 2 additions & 2 deletions ...ositories/InterestedRegionRepository.java → ...epository/InterestedRegionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ection/repositories/RegionRepository.java → ...n/region/repository/RegionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/example/solidconnection/university/domain/University.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.country.repository;

import com.example.solidconnection.entity.Country;
import com.example.solidconnection.country.domain.Country;
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

1. 도메인 패키지 임포트 일관화
- Country 클래스 임포트 경로를 com.example.solidconnection.country.domain으로 수정해 도메인 기준 구조와 일치시켰습니다.

2. 잔여 레거시 인포트 확인 요청
- 프로젝트 전반에 com.example.solidconnection.entity 패키지 참조가 남아있는지 검색해주세요.

🏁 Script executed:

#!/bin/bash
# 레거시 엔티티 패키지 참조 검색
rg "import com\.example\.solidconnection\.entity"

Length of output: 1038

🚨 잔여 레거시 엔티티 패키지 임포트 수정 요청

  1. 도메인 패키지 임포트 일관화가 com.example.solidconnection.country.domain으로 정상 적용된 것을 확인했습니다.
  2. 아직 아래 파일들에서 com.example.solidconnection.entity 패키지를 참조하고 있습니다. 도메인 기준 구조에 맞춰 임포트를 수정해 주세요:
    • src/main/java/com/example/solidconnection/news/domain/News.java
    • src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java
    • src/main/java/com/example/solidconnection/score/domain/GpaScore.java
    • src/main/java/com/example/solidconnection/community/comment/domain/Comment.java
    • src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java
    • src/main/java/com/example/solidconnection/community/post/domain/Post.java

예시)

-import com.example.solidconnection.entity.common.BaseEntity;
+import com.example.solidconnection.common.BaseEntity;

Committable suggestion skipped: line range outside the PR's diff.

import org.springframework.data.jpa.repository.JpaRepository;

import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 7 additions & 7 deletions ...t/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -34,7 +34,7 @@ class UniversityRecommendServiceTest extends BaseIntegrationTest {
private InterestedRegionRepository interestedRegionRepository;

@Autowired
private InterestedCountyRepository interestedCountyRepository;
private InterestedCountryRepository interestedCountryRepository;

@Autowired
private GeneralUniversityRecommendService generalUniversityRecommendService;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Loading