Merge branch 'main' into feat/#255

Author: kms152000

.github/workflows/ci.yml

@@ -15,6 +15,12 @@ jobs:
   backend-test:
     runs-on: ubuntu-latest
 
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+
     env:
       SPRING_PROFILES_ACTIVE: test
       SPRING_DATASOURCE_URL: jdbc:h2:mem:testdb;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false

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

@@ -2,13 +2,10 @@
 
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.*;
 import com.back.web7_9_codecrete_be.domain.artists.entity.Artist;
-import com.back.web7_9_codecrete_be.domain.artists.entity.ArtistLike;
 import com.back.web7_9_codecrete_be.domain.artists.entity.ArtistSort;
-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.service.ArtistService;
-import com.back.web7_9_codecrete_be.domain.artists.service.ArtistEnrichService;
+import com.back.web7_9_codecrete_be.domain.artists.service.artistEnrichService.ArtistEnrichService;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import com.back.web7_9_codecrete_be.global.rq.Rq;
 import com.back.web7_9_codecrete_be.global.rsData.RsData;
@@ -121,6 +118,13 @@ public RsData<List<ConcertListByArtistResponse>> concertList() {
         return RsData.success("찜한 아티스트 공연 리스트 조회 성공", artistService.getConcertList(user.getId()));
     }
 
+    @Operation(summary = "찜한 아티스트 리스트 생성", description = "로그인한 유저가 찜한 아티스트 목록을 반환합니다.")
+    @GetMapping("/likes")
+    public RsData<List<LikeArtistsResponse>> likeArtists() {
+        User user = rq.getUser();
+        return RsData.success("찜한 아티스트 목록 조회 성공", artistService.findLikeArtistsByUserid(user));
+    }
+
     @Operation(summary = "아티스트 찜 여부 반환", description = "아티스트 Id 를 통해 로그인한 유저가 해당 아티스트를 찜했는지 여부를 반환합니다.")
     @GetMapping("/likes/{artistId}")
     public RsData<LikeArtistResponse> isLiked(

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

@@ -0,0 +1,28 @@
+package com.back.web7_9_codecrete_be.domain.artists.dto.response;
+
+import com.back.web7_9_codecrete_be.domain.artists.entity.Artist;
+import com.back.web7_9_codecrete_be.domain.concerts.entity.Concert;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record LikeArtistsResponse(
+        @Schema(description = "아티스트 아이디입니다.")
+        Long id,
+
+        @Schema(description = "아티스트 이름입니다.")
+        String artistName,
+
+        @Schema(description = "한국어 기준 아티스트 이름 입니다.")
+        String nameKo,
+
+        @Schema(description = "아티스트 프로필 사진 URL 입니다.")
+        String imageUrl
+) {
+        public static LikeArtistsResponse from(Artist artist) {
+                return new LikeArtistsResponse(
+                        artist.getId(),
+                        artist.getArtistName(),
+                        artist.getNameKo(),
+                        artist.getImageUrl()
+                );
+        }
+}

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

@@ -4,6 +4,9 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 public record SearchResponse(
+        @Schema(description = "아티스트 id 입니다.")
+        Long id,
+
         @Schema(description = "아티스트 이름입니다.")
         String artistName,
 
@@ -14,14 +17,21 @@ public record SearchResponse(
         String artistGroup,
 
         @Schema(description = "받은 총 좋아요 수(찜한 수) 입니다.")
-        int likeCount
+        int likeCount,
+
+        @Schema(description = "아티스트 이미지 URL 입니다.")
+        String imageUrl
+
+
 ) {
     public static SearchResponse from(Artist artist) {
         return new SearchResponse(
+                artist.getId(),
                 artist.getArtistName(),
                 artist.getNameKo(),
                 artist.getArtistGroup(),
-                artist.getLikeCount()
+                artist.getLikeCount(),
+                artist.getImageUrl()
         );
     }
 }

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

@@ -27,14 +27,14 @@ public class Artist {
     @Column(name = "artist_group")
     private String artistGroup;
 
-    @Enumerated(EnumType.STRING)
+    @Convert(converter = ArtistTypeConverter.class)
     @Column(name = "artist_type")
     private ArtistType artistType;
 
     @Column(name = "spotify_artist_id", unique = true)
     private String spotifyArtistId;
 
-    @Column(name = "musicbrainz_id")
+    @Column(name = "musicbrainz_id", unique = true)
     private String musicBrainzId;
 
     @Column(name = "name_ko", length = 200)
@@ -43,6 +43,9 @@ public class Artist {
     @Column(name = "real_name", length = 200)
     private String realName;
 
+    @Column(name = "description", columnDefinition = "TEXT")
+    private String description;
+
     @Column(name = "like_count", nullable = false)
     private int likeCount = 0;
 

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

@@ -0,0 +1,40 @@
+package com.back.web7_9_codecrete_be.domain.artists.entity;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Converter(autoApply = true)
+public class ArtistTypeConverter implements AttributeConverter<ArtistType, String> {
+
+    @Override
+    public String convertToDatabaseColumn(ArtistType attribute) {
+        if (attribute == null) {
+            return null;
+        }
+        return attribute.name();
+    }
+
+    @Override
+    public ArtistType convertToEntityAttribute(String dbData) {
+        if (dbData == null || dbData.isBlank()) {
+            return null;
+        }
+        
+        // 숫자로 저장된 잘못된 값 처리 (예: "0", "1", "2")
+        if (dbData.matches("\\d+")) {
+            log.warn("잘못된 artist_type 값 발견 (숫자): {}, null로 처리", dbData);
+            return null;
+        }
+        
+        try {
+            return ArtistType.valueOf(dbData);
+        } catch (IllegalArgumentException e) {
+            log.warn("잘못된 artist_type 값 발견: {}, null로 처리", dbData);
+            return null;
+        }
+    }
+}
+
+

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

@@ -1,5 +1,6 @@
 package com.back.web7_9_codecrete_be.domain.artists.repository;
 
+import com.back.web7_9_codecrete_be.domain.artists.dto.response.LikeArtistsResponse;
 import com.back.web7_9_codecrete_be.domain.artists.entity.Artist;
 import com.back.web7_9_codecrete_be.domain.artists.entity.ArtistLike;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
@@ -23,4 +24,10 @@ public interface ArtistLikeRepository extends JpaRepository<ArtistLike, Long> {
     """)
     List<Long> findArtistIdsByUserId(@Param("userId") Long userId);
 
+    @Query("""
+        select al.artist
+        from ArtistLike al
+        where al.user.id = :userId
+    """)
+    List<Artist> findLikeArtistsByUserId(@Param("userId") Long userId);
 }

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

@@ -23,13 +23,15 @@ public interface ArtistRepository extends JpaRepository<Artist, Long> {
     boolean existsByArtistName(String artistName);
     boolean existsByNameKo(String nameKo);
 
-    List<Artist> findTop5ByArtistGroupAndIdNot(String artistGroup, long excludeId);
+    @Query("SELECT a FROM Artist a WHERE a.artistGroup = :artistGroup AND a.id != :excludeId ORDER BY a.likeCount DESC, a.id ASC")
+    List<Artist> findTop5ByArtistGroupAndIdNot(@org.springframework.data.repository.query.Param("artistGroup") String artistGroup,
+                                               @org.springframework.data.repository.query.Param("excludeId") long excludeId);
 
     @Query("""
         SELECT DISTINCT a FROM Artist a
         JOIN a.artistGenres ag
         WHERE ag.genre.id = :genreId AND a.id != :excludeId
-        ORDER BY a.likeCount DESC
+        ORDER BY a.likeCount DESC, a.id ASC
     """)
     List<Artist> findTop5ByGenreIdAndIdNot(@org.springframework.data.repository.query.Param("genreId") Long genreId, 
                                              @org.springframework.data.repository.query.Param("excludeId") long excludeId,
@@ -57,4 +59,14 @@ List<Artist> findTop5ByGenreIdAndIdNot(@org.springframework.data.repository.quer
     // 배치 조회: spotifyId 리스트로 존재하는 아티스트의 spotifyId만 반환
     @Query("SELECT a.spotifyArtistId FROM Artist a WHERE a.spotifyArtistId IN :spotifyIds")
     List<String> findSpotifyIdsBySpotifyIdsIn(@org.springframework.data.repository.query.Param("spotifyIds") List<String> spotifyIds);
+    
+    // 배치 조회: spotifyId 리스트로 존재하는 아티스트 전체 엔티티 반환 (Bulk 저장용)
+    @Query("SELECT a FROM Artist a WHERE a.spotifyArtistId IN :spotifyIds")
+    List<Artist> findBySpotifyArtistIdIn(@org.springframework.data.repository.query.Param("spotifyIds") List<String> spotifyIds);
+    
+    // 같은 artistType인 아티스트들 조회 (관련 아티스트 추천용)
+    @Query("SELECT a FROM Artist a WHERE a.artistType = :artistType AND a.id != :excludeId ORDER BY a.likeCount DESC, a.id ASC")
+    List<Artist> findByArtistTypeAndIdNot(@org.springframework.data.repository.query.Param("artistType") com.back.web7_9_codecrete_be.domain.artists.entity.ArtistType artistType,
+                                          @org.springframework.data.repository.query.Param("excludeId") long excludeId,
+                                          Pageable pageable);
 }

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

@@ -4,6 +4,9 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ConcertArtistRepository extends JpaRepository<ConcertArtist, Long> {
+    List<ConcertArtist> getConcertArtistsByConcert_ConcertId(Long concertConcertId);
 }

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

@@ -7,6 +7,7 @@
 import com.back.web7_9_codecrete_be.domain.artists.repository.ArtistRepository;
 import com.back.web7_9_codecrete_be.domain.artists.repository.ArtistLikeRepository;
 import com.back.web7_9_codecrete_be.domain.artists.repository.ConcertArtistRepository;
+import com.back.web7_9_codecrete_be.domain.artists.service.spotifyService.SpotifyService;
 import com.back.web7_9_codecrete_be.domain.concerts.entity.Concert;
 import com.back.web7_9_codecrete_be.domain.concerts.repository.ConcertRepository;
 import com.back.web7_9_codecrete_be.domain.concerts.service.ConcertService;
@@ -223,4 +224,12 @@ public LikeArtistResponse findArtistLikeByUserId(Artist artist, User user) {
          return new LikeArtistResponse(artistLikeRepository.existsByArtistAndUser(artist, user));
     }
 
+    @Transactional(readOnly = true)
+    public List<LikeArtistsResponse> findLikeArtistsByUserid(User user) {
+        List<Artist> likeArtists = artistLikeRepository.findLikeArtistsByUserId(user.getId());
+        return likeArtists.stream()
+                .map(LikeArtistsResponse::from)
+                .toList();
+    }
+
 }