Merge pull request #78 from YAPP-Github/feature/MAFOO-181

[MAFOO-181] feat: 공유 앨범 대상 사용자 검색 API를 구현했어요

photo-service/src/main/java/kr/mafoo/photo/api/SharedMemberApi.java

@@ -19,6 +19,23 @@
 @RequestMapping("/v1/shared-members")
 public interface SharedMemberApi {
 
+    @Operation(summary = "공유 사용자 조회", description = "앨범 ID 및 사용자 ID에 해당하는 공유 사용자를 조회합니다.")
+    @GetMapping
+    Mono<SharedMemberResponse> getSharedMemberByAlbumAndMember(
+        @RequestMemberId
+        String requestMemberId,
+
+        @ULID
+        @Parameter(description = "앨범 ID", example = "test_album_id")
+        @RequestParam
+        String albumId,
+
+        @ULID
+        @Parameter(description = "사용자 ID", example = "test_album_id")
+        @RequestParam
+        String memberId
+    );
+
     @Operation(summary = "공유 사용자 생성", description = "공유 사용자를 생성합니다.")
     @PostMapping
     Mono<SharedMemberResponse> createSharedMember(

photo-service/src/main/java/kr/mafoo/photo/controller/SharedMemberController.java

@@ -16,6 +16,16 @@ public class SharedMemberController implements SharedMemberApi {
 
     private final SharedMemberService sharedMemberService;
 
+    @Override
+    public Mono<SharedMemberResponse> getSharedMemberByAlbumAndMember(
+        String requestMemberId,
+        String albumId,
+        String memberId
+    ) {
+        return sharedMemberService.findSharedMemberByAlbumIdAndMemberId(albumId, memberId)
+            .map(SharedMemberResponse::fromEntity);
+    }
+
     @Override
     public Mono<SharedMemberResponse> createSharedMember(
         String memberId,

photo-service/src/main/java/kr/mafoo/photo/service/SharedMemberService.java

@@ -20,6 +20,11 @@ public class SharedMemberService {
 
     private final AlbumPermissionVerifier albumPermissionVerifier;
 
+    @Transactional(readOnly = true)
+    public Mono<SharedMemberEntity> findSharedMemberByAlbumIdAndMemberId(String albumId, String requestMemberId) {
+        return sharedMemberQuery.findByAlbumIdAndMemberId(albumId, requestMemberId);
+    }
+
     @Transactional
     public Mono<SharedMemberEntity> addSharedMember(String albumId, String permissionLevel, String sharingMemberId, String requestMemberId) {
         return albumPermissionVerifier.verifyOwnershipOrAccessPermission(albumId, requestMemberId, FULL_ACCESS)

user-service/src/main/java/kr/mafoo/user/api/MemberApi.java

@@ -4,7 +4,9 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import kr.mafoo.user.annotation.RequestMemberId;
+import kr.mafoo.user.controller.dto.response.MemberDetailResponse;
 import kr.mafoo.user.controller.dto.response.MemberResponse;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -17,16 +19,23 @@
 @Validated
 @RequestMapping("/v1/members")
 public interface MemberApi {
-    @Operation(summary = "사용자 검색", description = "키워드로 사용자를 검색합니다. (이름으로 검색)")
+    @Operation(summary = "공유 앨범 대상 사용자 검색", description = "키워드로 사용자를 검색합니다. (이름으로 검색)")
     @GetMapping
-    Flux<MemberResponse> getMemberListByName(
+    Flux<MemberDetailResponse> getMemberListByNameForSharedAlbum(
         @RequestMemberId
         @Parameter(hidden = true)
         String requesterId,
 
         @Parameter(description = "검색어", example = "사람")
         @RequestParam
-        String keyword
+        String keyword,
+
+        @Parameter(description = "앨범 ID", example = "test_album_id")
+        @RequestParam
+        String albumId,
+
+        // Authorization Header를 받아올 목적
+        ServerHttpRequest serverHttpRequest
     );
 
     @Operation(summary = "사용자 단건 조회", description = "사용자 단건 정보를 조회합니다.")

user-service/src/main/java/kr/mafoo/user/controller/MemberController.java

@@ -1,9 +1,11 @@
 package kr.mafoo.user.controller;
 
 import kr.mafoo.user.api.MemberApi;
+import kr.mafoo.user.controller.dto.response.MemberDetailResponse;
 import kr.mafoo.user.controller.dto.response.MemberResponse;
 import kr.mafoo.user.service.MemberService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -14,12 +16,16 @@ public class MemberController implements MemberApi {
     private final MemberService memberService;
 
     @Override
-    public Flux<MemberResponse> getMemberListByName(
+    public Flux<MemberDetailResponse> getMemberListByNameForSharedAlbum(
         String requesterId,
-        String keyword
+        String keyword,
+        String albumId,
+        ServerHttpRequest serverHttpRequest
     ) {
-        return memberService.getMemberByKeyword(keyword)
-            .map(MemberResponse::fromEntity);
+        String authorizationToken = serverHttpRequest.getHeaders().getFirst("Authorization");
+
+        return memberService.getMemberByKeywordForSharedAlbum(keyword, albumId, authorizationToken)
+            .map(MemberDetailResponse::fromDto);
     }
 
     @Override

user-service/src/main/java/kr/mafoo/user/controller/dto/response/MemberDetailResponse.java

@@ -0,0 +1,42 @@
+package kr.mafoo.user.controller.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import kr.mafoo.user.service.dto.MemberDetailDto;
+
+@Schema(description = "사용자의 정보 응답")
+public record MemberDetailResponse(
+        @Schema(description = "사용자 ID", example = "test")
+        String memberId,
+
+        @Schema(description = "사용자 이름", example = "송영민")
+        String name,
+
+        @Schema(description = "프로필 이미지 URL", example = "https://mafoo.kr/profile.jpg")
+        String profileImageUrl,
+
+        @Schema(description = "식별 번호", example = "0000")
+        String serialNumber,
+
+        @Schema(description = "공유 사용자 ID", example = "test_shared_member_id")
+        String sharedMemberId,
+
+        @Schema(description = "공유 상태", example = "PENDING")
+        String shareStatus,
+
+        @Schema(description = "권한 단계", example = "FULL_ACCESS")
+        String permissionLevel
+) {
+        public static MemberDetailResponse fromDto(
+            MemberDetailDto dto
+        ) {
+                return new MemberDetailResponse(
+                    dto.memberId(),
+                    dto.name(),
+                    dto.profileImageUrl(),
+                    dto.serialNumber(),
+                    dto.sharedMemberId(),
+                    dto.shareStatus(),
+                    dto.permissionLevel()
+                );
+        }
+}

user-service/src/main/java/kr/mafoo/user/exception/ErrorCode.java

@@ -13,6 +13,8 @@ public enum ErrorCode {
     TOKEN_TYPE_MISMATCH("AU0001", "토큰 타입이 일치하지 않습니다. (아마 AccessToken?)"),
     TOKEN_EXPIRED("AU0002", "토큰이 만료되었습니다"),
     TOKEN_INVALID("AU0003", "토큰이 유효하지 않습니다"),
+
+    MAFOO_PHOTO_API_FAILED("MPE0001", "마푸의 photo-service API 호출이 실패했습니다")
     ;
     private final String code;
     private final String message;

user-service/src/main/java/kr/mafoo/user/exception/MafooPhotoApiFailedException.java

@@ -0,0 +1,7 @@
+package kr.mafoo.user.exception;
+
+public class MafooPhotoApiFailedException extends DomainException {
+    public MafooPhotoApiFailedException() {
+        super(ErrorCode.MAFOO_PHOTO_API_FAILED);
+    }
+}

user-service/src/main/java/kr/mafoo/user/service/MemberService.java

@@ -4,6 +4,7 @@
 import kr.mafoo.user.exception.MemberNotFoundException;
 import kr.mafoo.user.repository.MemberRepository;
 import kr.mafoo.user.repository.SocialMemberRepository;
+import kr.mafoo.user.service.dto.MemberDetailDto;
 import kr.mafoo.user.util.IdGenerator;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +20,7 @@ public class MemberService {
     private final MemberRepository memberRepository;
     private final SocialMemberRepository socialMemberRepository;
     private final SlackService slackService;
+    private final SharedMemberService sharedMemberService;
 
     @Transactional
     public Mono<Void> quitMemberByMemberId(String memberId) {
@@ -27,10 +29,13 @@ public Mono<Void> quitMemberByMemberId(String memberId) {
                 .then(memberRepository.deleteMemberById(memberId));
     }
 
-    public Flux<MemberEntity> getMemberByKeyword(String keyword) {
+    public Flux<MemberDetailDto> getMemberByKeywordForSharedAlbum(String keyword, String albumId, String token) {
         return memberRepository
             .findAllByNameContaining(keyword)
-            .switchIfEmpty(Mono.error(new MemberNotFoundException()));
+            .switchIfEmpty(Mono.error(new MemberNotFoundException()))
+            .concatMap(member -> sharedMemberService.getSharedMemberInfoByAlbumId(albumId, member.getId(), token)
+                .flatMap(sharedMemberDto -> Mono.just(MemberDetailDto.fromSharedMember(member, sharedMemberDto)))
+            );
     }
 
     public Mono<MemberEntity> getMemberByMemberId(String memberId) {

user-service/src/main/java/kr/mafoo/user/service/SharedMemberService.java

@@ -0,0 +1,32 @@
+package kr.mafoo.user.service;
+import kr.mafoo.user.exception.MafooPhotoApiFailedException;
+import kr.mafoo.user.service.dto.SharedMemberDto;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+@RequiredArgsConstructor
+@Service
+public class SharedMemberService {
+
+    @Value("${app.gateway.endpoint}")
+    private String endpoint;
+
+    private final WebClient client;
+
+    public Mono<SharedMemberDto> getSharedMemberInfoByAlbumId(String albumId, String memberId, String authorizationToken) {
+        return client
+            .get()
+            .uri(endpoint + "/photo/v1/shared-members?albumId=" + albumId + "&memberId=" + memberId)
+            .header("Authorization", "Bearer " + authorizationToken)
+            .retrieve()
+            .onStatus(status -> status.isSameCodeAs(HttpStatus.BAD_REQUEST), (res) -> Mono.empty())
+            .onStatus(status -> !status.is2xxSuccessful(), (res) -> Mono.error(new MafooPhotoApiFailedException()))
+            .bodyToMono(SharedMemberDto.class);
+    }
+
+}
+

user-service/src/main/java/kr/mafoo/user/service/dto/MemberDetailDto.java

@@ -0,0 +1,28 @@
+package kr.mafoo.user.service.dto;
+
+import kr.mafoo.user.domain.MemberEntity;
+
+public record MemberDetailDto(
+    String memberId,
+    String name,
+    String profileImageUrl,
+    String serialNumber,
+    String sharedMemberId,
+    String shareStatus,
+    String permissionLevel
+) {
+    public static MemberDetailDto fromSharedMember(
+        MemberEntity memberEntity,
+        SharedMemberDto sharedMemberDto
+    ) {
+        return new MemberDetailDto(
+            memberEntity.getId(),
+            memberEntity.getName(),
+            memberEntity.getProfileImageUrl(),
+            String.format("%04d", memberEntity.getSerialNumber()),
+            sharedMemberDto.sharedMemberId(),
+            sharedMemberDto.shareStatus(),
+            sharedMemberDto.permissionLevel()
+        );
+    }
+}

user-service/src/main/java/kr/mafoo/user/service/dto/SharedMemberDto.java

@@ -0,0 +1,10 @@
+package kr.mafoo.user.service.dto;
+
+public record SharedMemberDto(
+    String sharedMemberId,
+    String shareStatus,
+    String permissionLevel,
+    String albumId,
+    String memberId
+) {
+}