refactor: Duplicate Selection Apply #95

Author: oOccasio

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

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

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

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) {

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)
+                );
+    }
 }

src/main/java/sopt/comfit/company/service/CompanyService.java

@@ -34,8 +34,8 @@ public class CompanyService {
 
     @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){