♻️ Refactor - 회사 검색 시 조건을 중복 선택으로 변경하고 DB 조회성능을 튜닝한다

oOccasio · web-flow · commit 8523757778c0 · 2026-03-11T07:50:33.000+09:00
diff --git a/build.gradle b/build.gradle
@@ -105,6 +105,9 @@ dependencies {
 
     //logging
     implementation "net.logstash.logback:logstash-logback-encoder:7.4"
+
+    //역직렬화
+    implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names'
 }
 
 tasks.named('test') {
diff --git a/src/main/java/sopt/comfit/company/controller/CompanyController.java b/src/main/java/sopt/comfit/company/controller/CompanyController.java
@@ -26,19 +26,25 @@ public class CompanyController implements CompanySwagger {
 
     @Override
     public PageDto<GetCompanyListResponseDto> getCompanyList(@RequestParam(required = false) String keyword,
-                                                             @RequestParam(required = false) String industry,
-                                                             @RequestParam(required = false) String scale,
+                                                             @RequestParam(required = false) List<String> industry,
+                                                             @RequestParam(required = false) List<String> scale,
                                                              @RequestParam(required = false) String sort,
                                                              @RequestParam(defaultValue = "1") int page,
                                                              @RequestParam(required = false) Boolean isRecruited) {
 
         Pageable pageable = PageRequest.of(Math.max(page - 1, 0), 8);
-        EIndustry industryEnum = industry != null ? EIndustry.from(industry) : null;
-        EScale scaleEnum = scale != null ? EScale.valueOf(scale) : null;
+        List<EIndustry> industryEnums = industry != null
+                ? industry.stream().map(EIndustry::from).toList()
+                : null;
+
+        List<EScale> scaleEnums = scale != null
+                ? scale.stream().map(EScale::from).toList()
+                : null;
+
         ESort sortEnum = sort != null ? ESort.valueOf(sort) : null;
 
 
-        return companyService.getCompanyList(keyword, industryEnum, scaleEnum, sortEnum, isRecruited, pageable);
+        return companyService.getCompanyList(keyword, industryEnums, scaleEnums, sortEnum, isRecruited, pageable);
     }
 
     @Override
diff --git a/src/main/java/sopt/comfit/company/controller/CompanySwagger.java b/src/main/java/sopt/comfit/company/controller/CompanySwagger.java
@@ -44,8 +44,8 @@ public interface CompanySwagger {
     @GetMapping
     @SecurityRequirement(name = "JWT")
     PageDto<GetCompanyListResponseDto> getCompanyList(@RequestParam(required = false) String keyword,
-                                                                  @RequestParam(required = false) String industry,
-                                                                  @RequestParam(required = false) String scale,
+                                                                  @RequestParam(required = false) List<String> industry,
+                                                                  @RequestParam(required = false) List<String> scale,
                                                                   @RequestParam(required = false) String sort,
                                                                   @RequestParam(defaultValue = "1") int page,
                                                                   @RequestParam(required = false) Boolean isRecruited);
diff --git a/src/main/java/sopt/comfit/company/domain/Company.java b/src/main/java/sopt/comfit/company/domain/Company.java
@@ -10,7 +10,9 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Table(name = "companies")
+@Table(name = "companies", indexes = {
+        @Index(name = "idx_company_industry_scale_created", columnList = "industry, scale, created_at DESC")
+})
 public class Company extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/sopt/comfit/company/domain/CompanyRepositoryCustom.java b/src/main/java/sopt/comfit/company/domain/CompanyRepositoryCustom.java
@@ -6,12 +6,14 @@
 import sopt.comfit.global.enums.EIndustry;
 import sopt.comfit.global.enums.ESort;
 
+import java.util.List;
+
 public interface CompanyRepositoryCustom {
 
     Page<GetCompanyListResponseDto> getCompanyList(
             String keyword,
-            EIndustry industry,
-            EScale scale,
+            List<EIndustry> industry,
+            List<EScale> scale,
             Boolean isRecruited,
             ESort sort,
             Pageable pageable
diff --git a/src/main/java/sopt/comfit/company/domain/CompanyRepositoryImpl.java b/src/main/java/sopt/comfit/company/domain/CompanyRepositoryImpl.java
@@ -29,8 +29,8 @@ public class CompanyRepositoryImpl implements CompanyRepositoryCustom {
     @Override
     public Page<GetCompanyListResponseDto> getCompanyList(
             String keyword,
-            EIndustry industry,
-            EScale scale,
+            List<EIndustry> industry,
+            List<EScale> scale,
             Boolean isRecruited,
             ESort sort,
             Pageable pageable
@@ -87,8 +87,8 @@ public Page<GetCompanyListResponseDto> getCompanyList(
 
     private List<Company> sortByLikeCount(
             String keyword,
-            EIndustry industry,
-            EScale scale,
+            List<EIndustry> industry,
+            List<EScale> scale,
             Boolean isRecruited,
             Pageable pageable
     ) {
@@ -143,12 +143,16 @@ private BooleanExpression keywordContains(String keyword) {
                 : null;
     }
 
-    private BooleanExpression industryEq(EIndustry industry) {
-        return industry != null ? company.industry.eq(industry) : null;
+    private BooleanExpression industryEq(List<EIndustry> industry) {
+        return industry != null && !industry.isEmpty()
+                ? company.industry.in(industry)
+                : null;
     }
 
-    private BooleanExpression scaleEq(EScale scale) {
-        return scale != null ? company.scale.eq(scale) : null;
+    private BooleanExpression scaleEq(List<EScale> scale) {
+        return scale != null && !scale.isEmpty()
+                ? company.scale.in(scale)
+                : null;
     }
 
     private BooleanExpression recruitingEq(Boolean isRecruited) {
diff --git a/src/main/java/sopt/comfit/company/domain/EScale.java b/src/main/java/sopt/comfit/company/domain/EScale.java
@@ -2,19 +2,38 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import sopt.comfit.company.exception.CompanyErrorCode;
+import sopt.comfit.global.enums.EIndustry;
+import sopt.comfit.global.exception.BaseException;
+import sopt.comfit.global.exception.CommonErrorCode;
+
+import java.util.Arrays;
 
 @Getter
 @RequiredArgsConstructor
 public enum EScale {
 
-    LARGE("대기업"),
-    STARTUP("스타트업"),
-    PUBLIC_CORP("공기업"),
-    MID_LARGE("중견기업"),
-    SME("small and medium enterprise/중소기업"),
-    FOREIGN("외국기업"),
-    PUBLIC_ORG("공공기관"),
-    ETC("기타");
+    LARGE("LARGE", "대기업"),
+    STARTUP("STARTUP","스타트업"),
+    PUBLIC_CORP("PUBLIC_CORP", "공기업"),
+    MID_LARGE("MID_LARGE", "중견기업"),
+    SME("SME", "small and medium enterprise/중소기업"),
+    FOREIGN("FOREIGN","외국기업"),
+    PUBLIC_ORG("PUBLIC_ORG", "공공기관"),
+    ETC("ETC", "기타");
 
+    private final String code;
     private final String description;
+
+    public static EScale from(String value) {
+
+        if(value == null){
+            return null;
+        }
+        return Arrays.stream(values())
+                .filter(eScale -> eScale.getCode().equals(value))
+                .findFirst().orElseThrow(
+                        () -> BaseException.type(CompanyErrorCode.INVALID_KEYWORD)
+                );
+    }
 }
diff --git a/src/main/java/sopt/comfit/company/service/CompanyService.java b/src/main/java/sopt/comfit/company/service/CompanyService.java
@@ -1,6 +1,7 @@
 package sopt.comfit.company.service;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,11 +32,14 @@ public class CompanyService {
     private final CompanyIssueRepository companyIssueRepository;
     private final UserRepository userRepository;
 
-
+    @Cacheable(
+            value = "companyList",
+            key = "#keyword + '_' + #industry + '_' + #scale + '_' + #sort + '_' + #isRecruited + '_' + #pageable.pageNumber"
+    )
     @Transactional(readOnly = true)
     public PageDto<GetCompanyListResponseDto> getCompanyList( String keyword,
-                                                              EIndustry industry,
-                                                              EScale scale,
+                                                              List<EIndustry> industry,
+                                                              List<EScale> scale,
                                                               ESort sort,
                                                               Boolean isRecruited,
                                                               Pageable pageable){
diff --git a/src/main/java/sopt/comfit/global/config/RedisConfig.java b/src/main/java/sopt/comfit/global/config/RedisConfig.java
@@ -1,11 +1,19 @@
 package sopt.comfit.global.config;
 
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import java.time.Duration;
+
+@EnableCaching
 @Configuration
 public class RedisConfig {
 
@@ -23,4 +31,18 @@ public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory factor
 
         return redisTemplate;
     }
+
+    @Bean
+    public RedisCacheManager cacheManager(RedisConnectionFactory factory) {
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofMinutes(10))
+                .serializeKeysWith(RedisSerializationContext.SerializationPair
+                        .fromSerializer(new StringRedisSerializer()))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair
+                        .fromSerializer(new GenericJackson2JsonRedisSerializer()));
+
+        return RedisCacheManager.builder(factory)
+                .cacheDefaults(config)
+                .build();
+    }
 }
diff --git a/src/main/java/sopt/comfit/report/domain/AIReportRepository.java b/src/main/java/sopt/comfit/report/domain/AIReportRepository.java
@@ -23,6 +23,11 @@ Page<AIReport> findByExperienceUserIdAndKeyword(
             Pageable pageable
     );
 
-    Optional<AIReport> findByExperienceUserIdAndId(Long userId, Long id);
+    @Query("SELECT a FROM AIReport a " +
+            "JOIN FETCH a.company " +
+            "JOIN FETCH a.experience " +
+            "WHERE a.experience.user.id = :userId AND a.id = :id")
+    Optional<AIReport> findByExperienceUserIdAndId(@Param("userId") Long userId, @Param("id") Long id);
+
     boolean existsByCompanyIdAndExperienceUserId(Long companyId, Long userId);
 }

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ dependencies {`
`105`	`105`
`106`	`106`	`//logging`
`107`	`107`	`implementation "net.logstash.logback:logstash-logback-encoder:7.4"`
	`108`	`+`
	`109`	`+ //역직렬화`
	`110`	`+ implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names'`
`108`	`111`	`}`
`109`	`112`
`110`	`113`	`tasks.named('test') {`