chore(profile): ProfileQueryRepository 리팩토링

sickgyun · Apr 25, 2024 · 3de41e4 · 3de41e4
1 parent 3746e00
commit 3de41e4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/...in/repository/ProfileQueryRepository.java → ...in/repository/QueryProfileRepository.java b/...in/repository/ProfileQueryRepository.java → ...in/repository/QueryProfileRepository.java
@@ -5,6 +5,6 @@
 import com.sickgyun.server.profile.domain.Profile;
 import com.sickgyun.server.profile.domain.value.Filter;
 
-public interface ProfileQueryRepository {
+public interface QueryProfileRepository {
 	List<Profile> findAllFiltered(Filter filter);
 }
diff --git a/main-server/src/main/java/com/sickgyun/server/profile/domain/value/Filter.java b/main-server/src/main/java/com/sickgyun/server/profile/domain/value/Filter.java
@@ -5,6 +5,6 @@
 public record Filter(
 	Boolean isRecruited,
 	List<Major> majors,
-	String cardinals
+	Long cardinal
 ) {
 }
diff --git a/.../database/ProfileQueryRepositoryImpl.java → .../database/QueryProfileRepositoryImpl.java b/.../database/ProfileQueryRepositoryImpl.java → .../database/QueryProfileRepositoryImpl.java
@@ -3,7 +3,6 @@
 import static com.sickgyun.server.profile.domain.QProfile.*;
 import static com.sickgyun.server.user.domain.QUser.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.stereotype.Repository;
@@ -12,7 +11,7 @@
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.sickgyun.server.profile.domain.Profile;
-import com.sickgyun.server.profile.domain.repository.ProfileQueryRepository;
+import com.sickgyun.server.profile.domain.repository.QueryProfileRepository;
 import com.sickgyun.server.profile.domain.value.Filter;
 import com.sickgyun.server.profile.domain.value.Major;
 
@@ -21,7 +20,7 @@
 @Repository
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
-public class ProfileQueryRepositoryImpl implements ProfileQueryRepository {
+public class QueryProfileRepositoryImpl implements QueryProfileRepository {
 
 	private final JPAQueryFactory queryFactory;
 
@@ -34,7 +33,7 @@ public List<Profile> findAllFiltered(Filter filter) {
 			.where(
 				majorFilter(filter.majors()),
 				recruitedFilter(filter.isRecruited()),
-				admissionYearFilter(filter.cardinals())
+				cardinalFilter(filter.cardinal())
 			).fetch();
 	}
 
@@ -47,22 +46,18 @@ private BooleanExpression majorFilter(List<Major> majors) {
 	}
 
 	private BooleanExpression recruitedFilter(Boolean isRecruited) {
-		if (isRecruited == null) {
+		if (isRecruited == null || !isRecruited) {
 			return null;
 		}
 
 		return profile.company.isNotEmpty();
 	}
 
-	private BooleanExpression admissionYearFilter(String admissionYear) {
-		if (admissionYear == null) {
+	private BooleanExpression cardinalFilter(Long cardinal) {
+		if (cardinal == null) {
 			return null;
 		}
 
-		List<Integer> list = Arrays.stream(admissionYear.split("-"))
-			.map(Integer::parseInt)
-			.toList();
-
-		return user.cardinal.between(list.get(0), list.get(1));
+		return user.cardinal.eq(cardinal);
 	}
 }
diff --git a/main-server/src/main/java/com/sickgyun/server/profile/presentation/dto/FilterRequest.java b/main-server/src/main/java/com/sickgyun/server/profile/presentation/dto/FilterRequest.java
@@ -13,13 +13,13 @@ public record FilterRequest(
 	@RequestParam(required = false)
 	List<Major> majors,
 	@RequestParam(required = false)
-	String cardinals
+	Long cardinal
 ) {
 	public Filter toDomain() {
 		return new Filter(
 			isReqruited,
 			majors,
-			cardinals
+			cardinal
 		);
 	}
 }
diff --git a/...erver/src/main/java/com/sickgyun/server/profile/service/implementation/ProfileReader.java b/...erver/src/main/java/com/sickgyun/server/profile/service/implementation/ProfileReader.java
@@ -5,8 +5,8 @@
 import org.springframework.stereotype.Service;
 
 import com.sickgyun.server.profile.domain.Profile;
-import com.sickgyun.server.profile.domain.repository.ProfileQueryRepository;
 import com.sickgyun.server.profile.domain.repository.ProfileRepository;
+import com.sickgyun.server.profile.domain.repository.QueryProfileRepository;
 import com.sickgyun.server.profile.domain.value.Filter;
 import com.sickgyun.server.user.domain.User;
 
@@ -16,7 +16,7 @@
 @RequiredArgsConstructor
 public class ProfileReader {
 	private final ProfileRepository profileRepository;
-	private final ProfileQueryRepository queryRepository;
+	private final QueryProfileRepository queryRepository;
 
 	public Profile findProfileByWriter(User writer) {
 		return profileRepository.getByWriter(writer);