Merge branch 'develop' into prod

AlreadyTakenSeat · Dec 29, 2024 · 1355f4f · 1355f4f
2 parents 4b0f9bb + c258a31
commit 1355f4f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/...src/main/java/com/example/artist/controller/dto/param/ArtistSearchPaginationApiParam.java b/...src/main/java/com/example/artist/controller/dto/param/ArtistSearchPaginationApiParam.java
@@ -17,7 +17,7 @@ public record ArtistSearchPaginationApiParam(
     String name,
 
     @Schema(description = "아티스트의 스포티파이 ID")
-    String artistSpotifyId,
+    String spotifyId,
 
     @Schema(description = "아티스트 구독 여부")
     boolean isSubscribed
@@ -28,7 +28,7 @@ public static ArtistSearchPaginationApiParam from(ArtistSearchPaginationServiceP
             .id(param.artistId())
             .name(param.name())
             .imageURL(param.artistImageUrl())
-            .artistSpotifyId(param.artistSpotifyId())
+            .spotifyId(param.artistSpotifyId())
             .isSubscribed(param.isSubscribed())
             .build();
     }

diff --git a/.../java/com/example/artist/controller/dto/param/ArtistUnsubscriptionPaginationApiParam.java b/.../java/com/example/artist/controller/dto/param/ArtistUnsubscriptionPaginationApiParam.java
@@ -7,6 +7,8 @@
 public record ArtistUnsubscriptionPaginationApiParam(
     @Schema(description = "아티스트 ID")
     UUID id,
+    @Schema(description = "아티스트의 스포티파이 ID")
+    String spotifyId,
     @Schema(description = "아티스트 이미지 URL")
     String imageURL,
     @Schema(description = "아티스트 이름")
@@ -18,6 +20,7 @@ public static ArtistUnsubscriptionPaginationApiParam from(
     ) {
         return new ArtistUnsubscriptionPaginationApiParam(
             param.id(),
+            param.spotifyId(),
             param.image(),
             param.name()
         );

diff --git a/...ow-api/src/main/java/com/example/artist/controller/dto/response/ArtistIdsApiResponse.java b/...ow-api/src/main/java/com/example/artist/controller/dto/response/ArtistIdsApiResponse.java
@@ -9,7 +9,7 @@ public record ArtistIdsApiResponse(
     UUID id,
 
     @Schema(description = "아티스트의 스포티파이 ID")
-    String artistSpotifyId
+    String spotifyId
 ) {
 
     public static ArtistIdsApiResponse from(ArtistIdsServiceResponse response) {

diff --git a/...java/com/example/artist/service/dto/param/ArtistUnsubscriptionPaginationServiceParam.java b/...java/com/example/artist/service/dto/param/ArtistUnsubscriptionPaginationServiceParam.java
@@ -5,13 +5,15 @@
 
 public record ArtistUnsubscriptionPaginationServiceParam(
     UUID id,
+    String spotifyId,
     String image,
     String name
 ) {
 
     public ArtistUnsubscriptionPaginationServiceParam(ArtistSimpleDomainResponse response) {
         this(
             response.id(),
+            response.spotifyId(),
             response.image(),
             response.name()
         );

diff --git a/...show-domain/src/main/java/org/example/dto/artist/response/ArtistSimpleDomainResponse.java b/...show-domain/src/main/java/org/example/dto/artist/response/ArtistSimpleDomainResponse.java
@@ -6,6 +6,7 @@
 @Builder
 public record ArtistSimpleDomainResponse(
     UUID id,
+    String spotifyId,
     String name,
     String image
 ) {

diff --git a/...show-domain/src/main/java/org/example/repository/artist/ArtistQuerydslRepositoryImpl.java b/...show-domain/src/main/java/org/example/repository/artist/ArtistQuerydslRepositoryImpl.java
@@ -84,6 +84,7 @@ public ArtistPaginationDomainResponse findAllWithCursorPagination(
                 Projections.constructor(
                     ArtistSimpleDomainResponse.class,
                     artist.id,
+                    artist.spotifyId,
                     artist.name,
                     artist.image
                 )

diff --git a/app/domain/show-domain/src/main/java/org/example/usecase/ArtistUseCase.java b/app/domain/show-domain/src/main/java/org/example/usecase/ArtistUseCase.java
@@ -175,7 +175,7 @@ private List<ArtistSearchPortParam> filterKoreanArtistSearch(
         ArtistSearchPortResponse response
     ) {
         return response.artists().stream()
-            .filter(artist -> artist.genres().stream()
+            .filter(artist -> !artist.genres().isEmpty() && artist.genres().stream()
                 .noneMatch(ArtistFilterType::isKoreanArtist))
             .toList();
     }