[Fix] 검색 기능 수정

src/main/java/com/jeju/nanaland/domain/common/service/ImageFileService.java

@@ -8,6 +8,8 @@
 import com.jeju.nanaland.domain.common.repository.ImageFileRepository;
 import com.jeju.nanaland.domain.member.service.ProfileImageService;
 import com.jeju.nanaland.global.exception.ServerErrorException;
+import com.jeju.nanaland.global.file.data.FileCategory;
+import com.jeju.nanaland.global.file.service.FileUploadService;
 import com.jeju.nanaland.global.image_upload.S3ImageService;
 import com.jeju.nanaland.global.image_upload.dto.S3ImageDto;
 import java.io.File;
@@ -34,6 +36,7 @@ public class ImageFileService {
   private String MEMBER_PROFILE_DIRECTORY;
   private final S3ImageService s3ImageService;
   private final ImageFileRepository imageFileRepository;
+  private final FileUploadService fileUploadService;
 
 
   public ImageFile saveS3ImageFile(S3ImageDto s3ImageDto) {
@@ -87,4 +90,9 @@ public void uploadMemberProfileImage(Long memberId, File file) {
       CompletableFuture.failedFuture(new ServerErrorException(SERVER_ERROR.getMessage()));
     }
   }
+
+  public ImageFile getAndSaveImageFile(String fileKey) {
+    S3ImageDto s3ImageDto = fileUploadService.getCloudImageUrls(fileKey);
+    return saveS3ImageFile(s3ImageDto);
+  }
 }

src/main/java/com/jeju/nanaland/domain/common/service/VideoFileService.java

@@ -1,28 +1,20 @@
 package com.jeju.nanaland.domain.common.service;
 
-import static com.jeju.nanaland.global.exception.ErrorCode.*;
-
 import com.jeju.nanaland.domain.common.entity.VideoFile;
 import com.jeju.nanaland.domain.common.repository.VideoFileRepository;
-import com.jeju.nanaland.global.exception.ServerErrorException;
-import com.jeju.nanaland.global.image_upload.S3VideoService;
+import com.jeju.nanaland.global.file.service.FileUploadService;
 import com.jeju.nanaland.global.image_upload.dto.S3VideoDto;
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class VideoFileService {
 
-  private final S3VideoService s3VideoService;
   private final VideoFileRepository videoFileRepository;
-  private final FileService fileService;
+  private final FileUploadService fileUploadService;
 
   public VideoFile saveS3VideoFile(S3VideoDto s3VideoDto) {
     VideoFile videoFile = VideoFile.builder()
@@ -32,15 +24,8 @@ public VideoFile saveS3VideoFile(S3VideoDto s3VideoDto) {
   }
 
   // S3에 저장될 경로 지정
-  public VideoFile uploadAndSaveVideoFile(File file, String directory) {
-    try {
-      MultipartFile multipartFile = fileService.convertFileToMultipartFile(file);
-      CompletableFuture<S3VideoDto> futureVideoDto = s3VideoService.uploadVideoToS3(multipartFile, directory);
-      S3VideoDto s3VideoDto = futureVideoDto.join();
-      return saveS3VideoFile(s3VideoDto);
-    } catch (IOException e) {
-      log.error("파일 업로드 오류: {}", e.getMessage());
-      throw new ServerErrorException(FILE_FAIL_ERROR.getMessage());
-    }
+  public VideoFile getAndSaveVideoFile(String fileKey) {
+    S3VideoDto s3VideoDto = fileUploadService.getCloudVideoUrls(fileKey);
+    return saveS3VideoFile(s3VideoDto);
   }
 }

src/main/java/com/jeju/nanaland/domain/experience/repository/ExperienceRepositoryCustom.java

@@ -42,9 +42,9 @@ PopularPostPreviewDto findRandomPopularPostPreviewDtoByLanguage(Language languag
 
   PopularPostPreviewDto findPostPreviewDtoByLanguageAndId(Language language, Long postId);
 
-  Page<ExperienceSearchDto> findSearchDtoByKeywordsUnion(List<String> keywords, Language language,
-      Pageable pageable);
+  Page<ExperienceSearchDto> findSearchDtoByKeywordsUnion(ExperienceType experienceType,
+      List<String> keywords, Language language, Pageable pageable);
 
-  Page<ExperienceSearchDto> findSearchDtoByKeywordsIntersect(List<String> keywords,
-      Language language, Pageable pageable);
+  Page<ExperienceSearchDto> findSearchDtoByKeywordsIntersect(ExperienceType experienceType,
+      List<String> keywords, Language language, Pageable pageable);
 }

src/main/java/com/jeju/nanaland/domain/experience/repository/ExperienceRepositoryImpl.java

@@ -112,8 +112,8 @@ public ExperienceCompositeDto findCompositeDtoByIdWithPessimisticLock(Long id,
   }
 
   @Override
-  public Page<ExperienceSearchDto> findSearchDtoByKeywordsUnion(List<String> keywords,
-      Language language, Pageable pageable) {
+  public Page<ExperienceSearchDto> findSearchDtoByKeywordsUnion(ExperienceType experienceType,
+      List<String> keywords, Language language, Pageable pageable) {
 
     // experience_id를 가진 게시물의 해시태그가 검색어 키워드 중 몇개를 포함하는지 계산
     List<Tuple> keywordMatchQuery = queryFactory
@@ -123,7 +123,9 @@ public Page<ExperienceSearchDto> findSearchDtoByKeywordsUnion(List<String> keywo
         .on(hashtag.post.id.eq(experience.id)
             .and(hashtag.language.eq(language)))
         .innerJoin(hashtag.keyword, QKeyword.keyword)
-        .where(QKeyword.keyword.content.toLowerCase().trim().in(keywords))
+        .where(
+            experience.experienceType.eq(experienceType),
+            QKeyword.keyword.content.toLowerCase().trim().in(keywords))
         .groupBy(experience.id)
         .fetch();
 
@@ -146,6 +148,7 @@ public Page<ExperienceSearchDto> findSearchDtoByKeywordsUnion(List<String> keywo
         .leftJoin(experience.firstImageFile, imageFile)
         .leftJoin(experience.experienceTrans, experienceTrans)
         .on(experienceTrans.language.eq(language))
+        .where(experience.experienceType.eq(experienceType))
         .fetch();
 
     // 해시태그 값을 matchedCount에 더해줌
@@ -176,8 +179,9 @@ public Page<ExperienceSearchDto> findSearchDtoByKeywordsUnion(List<String> keywo
   }
 
   @Override
-  public Page<ExperienceSearchDto> findSearchDtoByKeywordsIntersect(List<String> keywords,
-      Language language, Pageable pageable) {
+  public Page<ExperienceSearchDto> findSearchDtoByKeywordsIntersect(
+      ExperienceType experienceType, List<String> keywords, Language language,
+      Pageable pageable) {
 
     // experience_id를 가진 게시물의 해시태그가 검색어 키워드 중 몇개를 포함하는지 계산
     List<Tuple> keywordMatchQuery = queryFactory
@@ -187,7 +191,9 @@ public Page<ExperienceSearchDto> findSearchDtoByKeywordsIntersect(List<String> k
         .on(hashtag.post.id.eq(experience.id)
             .and(hashtag.language.eq(language)))
         .innerJoin(hashtag.keyword, QKeyword.keyword)
-        .where(QKeyword.keyword.content.toLowerCase().trim().in(keywords))
+        .where(
+            experience.experienceType.eq(experienceType),
+            QKeyword.keyword.content.toLowerCase().trim().in(keywords))
         .groupBy(experience.id)
         .fetch();
 
@@ -210,6 +216,7 @@ public Page<ExperienceSearchDto> findSearchDtoByKeywordsIntersect(List<String> k
         .leftJoin(experience.firstImageFile, imageFile)
         .leftJoin(experience.experienceTrans, experienceTrans)
         .on(experienceTrans.language.eq(language))
+        .where(experience.experienceType.eq(experienceType))
         .fetch();
 
     // 해시태그 값을 matchedCount에 더해줌
@@ -413,34 +420,6 @@ public PopularPostPreviewDto findPostPreviewDtoByLanguageAndId(Language language
         .fetchOne();
   }
 
-  private List<Long> getIdListContainAllHashtags(String keywords, Language language) {
-    return queryFactory
-        .select(experience.id)
-        .from(experience)
-        .leftJoin(hashtag)
-        .on(hashtag.post.id.eq(experience.id)
-            .and(hashtag.category.eq(Category.EXPERIENCE))
-            .and(hashtag.language.eq(language)))
-        .where(hashtag.keyword.content.toLowerCase().trim().in(keywords))
-        .groupBy(experience.id)
-        .having(experience.id.count().eq(splitKeyword(keywords).stream().count()))
-        .fetch();
-  }
-
-  private List<Long> getIdListContainAllHashtags(List<String> keywords, Language language) {
-    return queryFactory
-        .select(experience.id)
-        .from(experience)
-        .leftJoin(hashtag)
-        .on(hashtag.post.id.eq(experience.id)
-            .and(hashtag.category.eq(Category.EXPERIENCE))
-            .and(hashtag.language.eq(language)))
-        .where(hashtag.keyword.content.toLowerCase().trim().in(keywords))
-        .groupBy(experience.id)
-        .having(experience.id.count().eq(keywords.stream().count()))
-        .fetch();
-  }
-
   private List<String> splitKeyword(String keyword) {
     String[] tokens = keyword.split("\\s+");
     List<String> tokenList = new ArrayList<>();
@@ -469,15 +448,42 @@ private BooleanExpression keywordCondition(List<ExperienceTypeKeyword> keywordFi
     }
   }
 
+  /**
+   * 공백 제거, 소문자화, '-'와 '_' 제거
+   *
+   * @param stringExpression 조건절 컬럼
+   * @return 정규화된 컬럼
+   */
+  private StringExpression normalizeStringExpression(StringExpression stringExpression) {
+    return Expressions.stringTemplate(
+        "replace(replace({0}, '-', ''), '_', '')",
+        stringExpression.toLowerCase().trim());
+  }
+
+  /**
+   * 제목, 주소태그, 내용과 일치하는 키워드 개수 카운팅
+   *
+   * @param keywords 키워드
+   * @return 키워드를 포함하는 조건 개수
+   */
   private Expression<Long> countMatchingWithKeyword(List<String> keywords) {
     return Expressions.asNumber(0L)
-        .add(countMatchingConditionWithKeyword(experienceTrans.title.toLowerCase().trim(), keywords,
-            0))
-        .add(countMatchingConditionWithKeyword(experienceTrans.addressTag.toLowerCase().trim(),
+        .add(countMatchingConditionWithKeyword(normalizeStringExpression(experienceTrans.title),
             keywords, 0))
+        .add(
+            countMatchingConditionWithKeyword(normalizeStringExpression(experienceTrans.addressTag),
+                keywords, 0))
         .add(countMatchingConditionWithKeyword(experienceTrans.content, keywords, 0));
   }
 
+  /**
+   * 조건이 키워드를 포함하는지 검사
+   *
+   * @param condition 테이블 컬럼
+   * @param keywords  유저 키워드 리스트
+   * @param idx       키워드 인덱스
+   * @return
+   */
   private Expression<Integer> countMatchingConditionWithKeyword(StringExpression condition,
       List<String> keywords, int idx) {
     if (idx == keywords.size()) {
@@ -490,13 +496,4 @@ private Expression<Integer> countMatchingConditionWithKeyword(StringExpression c
         .otherwise(0)
         .add(countMatchingConditionWithKeyword(condition, keywords, idx + 1));
   }
-
-  private BooleanExpression containsAllKeywords(StringExpression condition, List<String> keywords) {
-    BooleanExpression expression = null;
-    for (String keyword : keywords) {
-      BooleanExpression containsKeyword = condition.contains(keyword);
-      expression = (expression == null) ? containsKeyword : expression.and(containsKeyword);
-    }
-    return expression;
-  }
 }

src/main/java/com/jeju/nanaland/domain/festival/repository/FestivalRepositoryImpl.java

@@ -534,6 +534,18 @@ private BooleanExpression addressTagCondition(Language language, List<AddressTag
     }
   }
 
+  /**
+   * 공백 제거, 소문자화, '-'와 '_' 제거
+   *
+   * @param stringExpression 조건절 컬럼
+   * @return 정규화된 컬럼
+   */
+  private StringExpression normalizeStringExpression(StringExpression stringExpression) {
+    return Expressions.stringTemplate(
+        "replace(replace({0}, '-', ''), '_', '')",
+        stringExpression.toLowerCase().trim());
+  }
+
   /**
    * 제목, 주소태그, 내용과 일치하는 키워드 개수 카운팅
    *
@@ -542,9 +554,9 @@ private BooleanExpression addressTagCondition(Language language, List<AddressTag
    */
   private Expression<Long> countMatchingWithKeyword(List<String> keywords) {
     return Expressions.asNumber(0L)
-        .add(countMatchingConditionWithKeyword(festivalTrans.title.toLowerCase().trim(), keywords,
-            0))
-        .add(countMatchingConditionWithKeyword(festivalTrans.addressTag.toLowerCase().trim(),
+        .add(countMatchingConditionWithKeyword(normalizeStringExpression(festivalTrans.title),
+            keywords, 0))
+        .add(countMatchingConditionWithKeyword(normalizeStringExpression(festivalTrans.addressTag),
             keywords, 0))
         .add(countMatchingConditionWithKeyword(festivalTrans.content, keywords, 0));
   }

src/main/java/com/jeju/nanaland/domain/market/repository/MarketRepositoryImpl.java

@@ -387,6 +387,18 @@ private BooleanExpression addressTagCondition(Language language, List<AddressTag
     }
   }
 
+  /**
+   * 공백 제거, 소문자화, '-'와 '_' 제거
+   *
+   * @param stringExpression 조건절 컬럼
+   * @return 정규화된 컬럼
+   */
+  private StringExpression normalizeStringExpression(StringExpression stringExpression) {
+    return Expressions.stringTemplate(
+        "replace(replace({0}, '-', ''), '_', '')",
+        stringExpression.toLowerCase().trim());
+  }
+
   /**
    * 제목, 주소태그, 내용과 일치하는 키워드 개수 카운팅
    *
@@ -395,9 +407,9 @@ private BooleanExpression addressTagCondition(Language language, List<AddressTag
    */
   private Expression<Long> countMatchingWithKeyword(List<String> keywords) {
     return Expressions.asNumber(0L)
-        .add(countMatchingConditionWithKeyword(marketTrans.title.toLowerCase().trim(), keywords,
-            0))
-        .add(countMatchingConditionWithKeyword(marketTrans.addressTag.toLowerCase().trim(),
+        .add(countMatchingConditionWithKeyword(normalizeStringExpression(marketTrans.title),
+            keywords, 0))
+        .add(countMatchingConditionWithKeyword(normalizeStringExpression(marketTrans.addressTag),
             keywords, 0))
         .add(countMatchingConditionWithKeyword(marketTrans.content, keywords, 0));
   }

src/main/java/com/jeju/nanaland/domain/member/controller/MemberController.java

@@ -42,17 +42,14 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 @Slf4j
 @RestController
@@ -75,12 +72,11 @@ public class MemberController {
       @ApiResponse(responseCode = "409", description = "이미 가입된 계정이 있는 경우, 닉네임이 중복되는 경우", content = @Content),
       @ApiResponse(responseCode = "500", description = "서버측 에러", content = @Content)
   })
-  @PostMapping(value = "/join",
-      consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+  @PostMapping(value = "/join")
   public BaseResponse<JwtDto> join(
-      @RequestPart(value = "reqDto") @Valid MemberRequest.JoinDto joinDto,
-      @RequestPart(required = false) MultipartFile multipartFile) {
-    JwtDto jwtDto = memberLoginService.join(joinDto, multipartFile);
+      @RequestBody @Valid MemberRequest.JoinDto joinDto,
+      @RequestParam(required = false) String fileKey) {
+    JwtDto jwtDto = memberLoginService.join(joinDto, fileKey);
     return BaseResponse.success(JOIN_SUCCESS, jwtDto);
   }
 
@@ -220,6 +216,7 @@ public BaseResponse<Null> withdrawal(
       description = "유저 닉네임, 설명, 프로필 사진 수정")
   @ApiResponses(value = {
       @ApiResponse(responseCode = "200", description = "성공"),
+      @ApiResponse(responseCode = "400", description = "파일키 형식이 맞지 않는 등 입력값이 올바르지 않은 경우", content = @Content),
       @ApiResponse(responseCode = "401", description = "accessToken이 유효하지 않은 경우", content = @Content),
       @ApiResponse(responseCode = "500", description = "이미지 업로드에 실패한 경우", content = @Content)
   })