fix : 헤더 값 요청 수정

.github/workflows/showpot-dev-ci.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - develop
+      - temp-develop
 
 jobs:
   build:

app/api/common-api/src/main/java/org/example/repository/TokenRepository.java

@@ -15,5 +15,5 @@ public interface TokenRepository {
 
     boolean existAccessTokenInBlacklist(UUID userId, String accessToken);
 
-    void deleteRefreshToken(UUID userId);
+    boolean deleteRefreshToken(UUID userId);
 }

app/api/common-api/src/main/java/org/example/security/token/TokenProcessor.java

@@ -40,7 +40,10 @@ public void makeAccessTokenBlacklistAndDeleteRefreshToken(
         UUID userId
     ) {
         tokenRepository.saveBlacklistAccessToken(userId, accessToken);
-        tokenRepository.deleteRefreshToken(userId);
+
+        if (!tokenRepository.deleteRefreshToken(userId)) {
+            throw new BusinessException(TokenError.INVALID_TOKEN);
+        }
     }
 
     private String getExistRefreshToken(UserParam userParam) {

app/api/common-api/src/main/java/org/example/util/ParseToken.java

@@ -0,0 +1,8 @@
+package org.example.util;
+
+public final class ParseToken {
+
+    public static String getAccessToken(String accessToken) {
+        return accessToken.replace("Bearer ", "");
+    }
+}

app/api/show-api/src/main/java/com/example/artist/controller/ArtistController.java

@@ -12,13 +12,16 @@
 import com.example.artist.controller.dto.response.ArtistFilterTotalCountApiResponse;
 import com.example.artist.controller.dto.response.ArtistSubscriptionApiResponse;
 import com.example.artist.controller.dto.response.ArtistUnsubscriptionApiResponse;
+import com.example.artist.controller.dto.response.NumberOfSubscribedArtistApiResponse;
 import com.example.artist.service.ArtistService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.example.dto.response.PaginationApiResponse;
 import org.example.security.dto.AuthenticatedUser;
+import org.example.util.ValidatorUser;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -42,15 +45,8 @@ public ResponseEntity<PaginationApiResponse<ArtistUnsubscriptionPaginationApiPar
         @AuthenticationPrincipal AuthenticatedUser user,
         @ParameterObject ArtistUnsubscriptionPaginationApiRequest request
     ) {
-        var response =
-            (user == null)
-                ? artistService.findArtistUnsubscriptionsForNonUser(
-                    request.toNonUserServiceRequest()
-                )
-                : artistService.findArtistUnsubscriptions(
-                    request.toServiceRequest(user.userId())
-                );
-
+        UUID userId = ValidatorUser.getUserId(user);
+        var response = artistService.findArtistUnsubscriptions(request.toServiceRequest(userId));
         var data = response.data().stream()
             .map(ArtistUnsubscriptionPaginationApiParam::from)
             .toList();
@@ -83,6 +79,18 @@ public ResponseEntity<PaginationApiResponse<ArtistSubscriptionPaginationApiParam
         );
     }
 
+    @GetMapping("/subscriptions/count")
+    @Operation(summary = "구독한 아티스트 수")
+    public ResponseEntity<NumberOfSubscribedArtistApiResponse> getNumberOfSubscribedArtist(
+        @AuthenticationPrincipal AuthenticatedUser user
+    ) {
+        return ResponseEntity.ok(
+            NumberOfSubscribedArtistApiResponse.from(
+                artistService.countSubscribedArtists(user.userId())
+            )
+        );
+    }
+
     @PostMapping("/subscribe")
     @Operation(summary = "구독하기")
     public ResponseEntity<ArtistSubscriptionApiResponse> subscribe(
@@ -115,7 +123,8 @@ public ResponseEntity<PaginationApiResponse<ArtistSearchPaginationApiParam>> sea
         @AuthenticationPrincipal AuthenticatedUser user,
         @ParameterObject ArtistSearchPaginationApiRequest request
     ) {
-        var response = artistService.searchArtist(request.toServiceRequest(user));
+        UUID userId = ValidatorUser.getUserId(user);
+        var response = artistService.searchArtist(request.toServiceRequest(userId));
         var data = response.data().stream()
             .map(ArtistSearchPaginationApiParam::from)
             .toList();

app/api/show-api/src/main/java/com/example/artist/controller/dto/request/ArtistSearchPaginationApiRequest.java

@@ -5,7 +5,6 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.UUID;
-import org.example.security.dto.AuthenticatedUser;
 
 public record ArtistSearchPaginationApiRequest(
 
@@ -31,12 +30,7 @@ public record ArtistSearchPaginationApiRequest(
         }
     }
 
-    public ArtistSearchPaginationServiceRequest toServiceRequest(AuthenticatedUser user) {
-        UUID userId = null;
-        if (user != null) {
-            userId = user.userId();
-        }
-
+    public ArtistSearchPaginationServiceRequest toServiceRequest(UUID userId) {
         return ArtistSearchPaginationServiceRequest.builder()
             .userId(userId)
             .sortStandard(sortStandard)

app/api/show-api/src/main/java/com/example/artist/controller/dto/request/ArtistUnsubscriptionPaginationApiRequest.java

@@ -65,17 +65,4 @@ public ArtistUnsubscriptionPaginationServiceRequest toServiceRequest(UUID userId
             .size(size)
             .build();
     }
-
-    public ArtistUnsubscriptionPaginationServiceRequest toNonUserServiceRequest() {
-        return ArtistUnsubscriptionPaginationServiceRequest.builder()
-            .subscriptionStatusApiType(SubscriptionStatusApiType.UNSUBSCRIBED)
-            .sortStandard(sortStandard)
-            .artistGenderApiTypes(artistGenderApiTypes)
-            .artistApiTypes(artistApiTypes)
-            .genreIds(genreIds)
-            .userId(null)
-            .cursor(cursor)
-            .size(size)
-            .build();
-    }
 }

app/api/show-api/src/main/java/com/example/artist/controller/dto/response/NumberOfSubscribedArtistApiResponse.java

@@ -0,0 +1,15 @@
+package com.example.artist.controller.dto.response;
+
+
+import com.example.artist.service.dto.response.NumberOfSubscribedArtistServiceResponse;
+
+public record NumberOfSubscribedArtistApiResponse(
+    long count
+) {
+
+    public static NumberOfSubscribedArtistApiResponse from(
+        NumberOfSubscribedArtistServiceResponse response
+    ) {
+        return new NumberOfSubscribedArtistApiResponse(response.count());
+    }
+}

app/api/show-api/src/main/java/com/example/artist/service/ArtistService.java

@@ -12,6 +12,7 @@
 import com.example.artist.service.dto.response.ArtistFilterTotalCountServiceResponse;
 import com.example.artist.service.dto.response.ArtistSubscriptionServiceResponse;
 import com.example.artist.service.dto.response.ArtistUnsubscriptionServiceResponse;
+import com.example.artist.service.dto.response.NumberOfSubscribedArtistServiceResponse;
 import com.example.publish.MessagePublisher;
 import com.example.publish.message.ArtistServiceMessage;
 import com.example.publish.message.ArtistSubscriptionServiceMessage;
@@ -22,10 +23,9 @@
 import org.example.dto.response.PaginationServiceResponse;
 import org.example.entity.ArtistSubscription;
 import org.example.entity.artist.Artist;
-import org.example.usecase.ArtistSubscriptionUseCase;
-import org.example.usecase.UserShowUseCase;
-import org.example.usecase.UserUseCase;
 import org.example.usecase.artist.ArtistUseCase;
+import org.example.usecase.subscription.ArtistSubscriptionUseCase;
+import org.example.usecase.user.UserUseCase;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -35,7 +35,6 @@ public class ArtistService {
 
     private final ArtistUseCase artistUseCase;
     private final ArtistSubscriptionUseCase artistSubscriptionUseCase;
-    private final UserShowUseCase userShowUseCase;
     private final UserUseCase userUseCase;
     private final MessagePublisher messagePublisher;
 
@@ -46,7 +45,7 @@ public PaginationServiceResponse<ArtistSearchPaginationServiceParam> searchArtis
 
         List<UUID> subscribedArtistIds = request.userId() == null
             ? List.of()
-            : userShowUseCase.findArtistSubscriptionByUserId(request.userId()).stream()
+            : artistSubscriptionUseCase.findArtistSubscriptionByUserId(request.userId()).stream()
                 .map(ArtistSubscription::getArtistId)
                 .toList();
 
@@ -123,7 +122,6 @@ public ArtistUnsubscriptionServiceResponse unsubscribe(
             .map(ArtistServiceMessage::toUnsubscribe)
             .toList();
 
-
         var userFcmToken = userUseCase.findUserFcmTokensByUserId(request.userId());
 
         messagePublisher.publishArtistSubscription(
@@ -168,7 +166,9 @@ public PaginationServiceResponse<ArtistSubscriptionPaginationServiceParam> findA
     public PaginationServiceResponse<ArtistUnsubscriptionPaginationServiceParam> findArtistUnsubscriptions(
         ArtistUnsubscriptionPaginationServiceRequest request
     ) {
-        List<UUID> subscriptionArtistIds = getSubscriptionArtistIds(request.userId());
+        List<UUID> subscriptionArtistIds = request.userId() == null
+            ? List.of()
+            : getSubscriptionArtistIds(request.userId());
 
         var response = artistUseCase.findAllArtistInCursorPagination(
             request.toDomainRequest(subscriptionArtistIds));
@@ -179,21 +179,14 @@ public PaginationServiceResponse<ArtistUnsubscriptionPaginationServiceParam> fin
         return PaginationServiceResponse.of(data, response.hasNext());
     }
 
-    public PaginationServiceResponse<ArtistUnsubscriptionPaginationServiceParam> findArtistUnsubscriptionsForNonUser(
-        ArtistUnsubscriptionPaginationServiceRequest request
-    ) {
-        var response = artistUseCase.findAllArtistInCursorPagination(
-            request.toNonUserDomainRequest());
-        List<ArtistUnsubscriptionPaginationServiceParam> data = response.data().stream()
-            .map(ArtistUnsubscriptionPaginationServiceParam::new)
-            .toList();
-
-        return PaginationServiceResponse.of(data, response.hasNext());
+    public NumberOfSubscribedArtistServiceResponse countSubscribedArtists(UUID userId) {
+        return NumberOfSubscribedArtistServiceResponse.from(
+            artistSubscriptionUseCase.countSubscribedArtists(userId)
+        );
     }
 
     private List<UUID> getSubscriptionArtistIds(UUID userId) {
-        List<ArtistSubscription> subscriptions = artistSubscriptionUseCase.findSubscriptionList(
-            userId);
+        List<ArtistSubscription> subscriptions = artistSubscriptionUseCase.findSubscriptionList(userId);
 
         return subscriptions.stream()
             .map(ArtistSubscription::getArtistId)

app/api/show-api/src/main/java/com/example/artist/service/dto/request/ArtistUnsubscriptionPaginationServiceRequest.java

@@ -23,14 +23,6 @@ public record ArtistUnsubscriptionPaginationServiceRequest(
 ) {
 
     public ArtistPaginationDomainRequest toDomainRequest(List<UUID> artistIds) {
-        return buildDomainRequest(artistIds);
-    }
-
-    public ArtistPaginationDomainRequest toNonUserDomainRequest() {
-        return buildDomainRequest(List.of());
-    }
-
-    private ArtistPaginationDomainRequest buildDomainRequest(List<UUID> artistIds) {
         var artistGenders = artistGenderApiTypes.stream()
             .map(ArtistGenderApiType::toDomainType)
             .toList();

app/api/user-api/src/main/java/org/example/service/dto/response/NumberOfSubscribedArtistServiceResponse.java → app/api/show-api/src/main/java/com/example/artist/service/dto/response/NumberOfSubscribedArtistServiceResponse.java

@@ -1,4 +1,4 @@
-package org.example.service.dto.response;
+package com.example.artist.service.dto.response;
 
 public record NumberOfSubscribedArtistServiceResponse(
     long count

app/api/show-api/src/main/java/com/example/component/ViewCountComponent.java

@@ -4,5 +4,5 @@
 
 public interface ViewCountComponent {
 
-    boolean validateViewCount(UUID showId, String viewIdentifier);
+    boolean validateViewCount(UUID showId, String deviceToken);
 }