Merge pull request #100 from prgrms-web-devcourse-final-project/feat/#92

[Artist] 아티스트 검색

Author: Creamcheesepie

src/main/java/com/back/web7_9_codecrete_be/domain/artists/controller/ArtistsController.java

@@ -1,14 +1,17 @@
 package com.back.web7_9_codecrete_be.domain.artists.controller;
 
 import com.back.web7_9_codecrete_be.domain.artists.dto.request.CreateRequest;
+import com.back.web7_9_codecrete_be.domain.artists.dto.request.SearchRequest;
 import com.back.web7_9_codecrete_be.domain.artists.dto.request.UpdateRequest;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistListResponse;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistDetailResponse;
+import com.back.web7_9_codecrete_be.domain.artists.dto.response.SearchResponse;
 import com.back.web7_9_codecrete_be.domain.artists.service.ArtistService;
 import com.back.web7_9_codecrete_be.domain.artists.service.ArtistEnrichService;
 import com.back.web7_9_codecrete_be.global.rsData.RsData;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -80,12 +83,13 @@ public RsData<Void> delete(
         return RsData.success("아티스트 정보를 삭제했습니다.", null);
     }
 
-    @Operation(summary = "아티스트 검색", description = "아티스트 이름을 입력받아 검색합니다.")
-    @PostMapping("/{id}")
-    public RsData<Void> search(
-            @PathVariable Long id
+    @Operation(summary = "아티스트 검색",
+            description = "아티스트 이름 또는 키워드를 입력하면, 해당 키워드가 포함된 아티스트 목록 또는 이름에 해당하는 아티스트를 조회합니다.")
+    @PostMapping("/search")
+    public RsData<List<SearchResponse>> search(
+            @Valid @RequestBody SearchRequest reqBody
     ) {
-        return RsData.success("아티스트 검색에 성공했습니다.", null);
+        return RsData.success("아티스트 검색에 성공했습니다.", artistService.search(reqBody.artistName()));
     }
 
     @Operation(summary = "아티스트 찜하기", description = "id 에 해당하는 특정 아티스트를 찜합니다.")

src/main/java/com/back/web7_9_codecrete_be/domain/artists/dto/request/SearchRequest.java

@@ -0,0 +1,9 @@
+package com.back.web7_9_codecrete_be.domain.artists.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record SearchRequest(
+        @NotBlank(message = "검색어를 입력해주세요")
+        String artistName
+) {
+}

src/main/java/com/back/web7_9_codecrete_be/domain/artists/dto/response/SearchResponse.java

@@ -0,0 +1,17 @@
+package com.back.web7_9_codecrete_be.domain.artists.dto.response;
+
+import com.back.web7_9_codecrete_be.domain.artists.entity.Artist;
+
+public record SearchResponse(
+        String artistName,
+        String artistGroup,
+        int likeCount
+) {
+    public static SearchResponse from(Artist artist) {
+        return new SearchResponse(
+                artist.getArtistName(),
+                artist.getArtistGroup(),
+                artist.getLikeCount()
+        );
+    }
+}

src/main/java/com/back/web7_9_codecrete_be/domain/artists/entity/Artist.java

@@ -37,6 +37,9 @@ public class Artist {
     @Column(name = "name_ko", length = 200)
     private String nameKo;
 
+    @Column(name = "like_count", nullable = false)
+    private int likeCount = 0;
+
     public Artist(String spotifyArtistId, String artistName, String artistGroup, ArtistType artistType, Genre genre) {
         this.spotifyArtistId = spotifyArtistId;
         this.artistName = artistName;

src/main/java/com/back/web7_9_codecrete_be/domain/artists/repository/ArtistRepository.java

@@ -7,7 +7,6 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 @Repository
 public interface ArtistRepository extends JpaRepository<Artist, Long> {
@@ -21,4 +20,6 @@ public interface ArtistRepository extends JpaRepository<Artist, Long> {
 
     List<Artist> findTop5ByArtistGroupAndIdNot(String artistGroup, long excludeId);
     List<Artist> findTop5ByGenreIdAndIdNot(Long genreId, long excludeId);
+
+    List<Artist> findAllByArtistNameContainingIgnoreCaseOrNameKoContainingIgnoreCase(String artistName1, String artistName2);
 }

src/main/java/com/back/web7_9_codecrete_be/domain/artists/service/ArtistService.java

@@ -3,6 +3,7 @@
 import com.back.web7_9_codecrete_be.domain.artists.dto.request.UpdateRequest;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistListResponse;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistDetailResponse;
+import com.back.web7_9_codecrete_be.domain.artists.dto.response.SearchResponse;
 import com.back.web7_9_codecrete_be.domain.artists.entity.Artist;
 import com.back.web7_9_codecrete_be.domain.artists.entity.ArtistType;
 import com.back.web7_9_codecrete_be.domain.artists.entity.Genre;
@@ -98,7 +99,7 @@ public void updateArtist(Long id, UpdateRequest req) {
         }
 
         if (!changed) {
-            throw new BusinessException(ArtistErrorCode.INVALID_UPDATE_REQUEST); // "수정할 값이 없습니다"
+            throw new BusinessException(ArtistErrorCode.INVALID_UPDATE_REQUEST);
         }
     }
 
@@ -109,4 +110,19 @@ public void delete(Long id) {
         artistRepository.delete(artist);
     }
 
+    @Transactional
+    public List<SearchResponse> search(String artistName) {
+
+        List<Artist> artists =
+                artistRepository.findAllByArtistNameContainingIgnoreCaseOrNameKoContainingIgnoreCase(artistName, artistName);
+
+        if (artists.isEmpty()) {
+            throw new BusinessException(ArtistErrorCode.ARTIST_NOT_FOUND);
+        }
+
+        return artists.stream()
+                .map(SearchResponse::from)
+                .toList();
+    }
+
 }

src/main/java/com/back/web7_9_codecrete_be/global/error/code/ArtistErrorCode.java

@@ -14,7 +14,8 @@ public enum ArtistErrorCode implements ErrorCode {
     ARTIST_NOT_FOUND(HttpStatus.NOT_FOUND, "AT-102", "아티스트를 찾을 수 없습니다."),
     ARTIST_ALREADY_EXISTS(HttpStatus.CONFLICT, "AT-103", "이미 존재하는 아티스트입니다."),
     SPOTIFY_NOT_FOUND(HttpStatus.NOT_FOUND, "AT-104", "존재하지 않는 Spotify Artist Key 입니다."),
-    INVALID_UPDATE_REQUEST(HttpStatus.BAD_REQUEST, "AT-105", "수정할 내용이 없습니다.");
+    INVALID_UPDATE_REQUEST(HttpStatus.BAD_REQUEST, "AT-105", "수정할 내용이 없습니다."),
+    INVALID_SEARCH_KEYWORD(HttpStatus.BAD_REQUEST, "AT-106", "입력 값이 없습니다.");
 
     private final HttpStatus status;
     private final String code;