[BE] Refactor/#406 토픽 권한을 가진 회원 목록 조회 시 공개 여부를 함께 반환하도록 변경

backend/docs/README.md

@@ -39,19 +39,19 @@
 
 - 핀 상세 조회
 
-#### 유저 핀
+#### 회원 핀
 
-- 유저 핀 생성
+- 회원 핀 생성
 
-- 유저 핀 정보 수정
+- 회원 핀 정보 수정
     - name, description 만 수정 가능하다.
     - description 은 1000자 까지만 가능하다.
 
-- 유저 핀 삭제
+- 회원 핀 삭제
     - Delete 는 Soft Delete
 
 ---
 
-- 유저 핀 목록 조회
+- 회원 핀 목록 조회
     - 페이지 네이션 (무한 스크롤, 일단 15개)
 

backend/src/docs/asciidoc/bookmark.adoc

@@ -1,10 +1,10 @@
 == 즐겨찾기
 
-=== 토픽을 유저의 즐겨찾기에 추가
+=== 토픽을 회원의 즐겨찾기에 추가
 
 operation::bookmark-controller-test/add-topic-in-bookmark[snippets='http-request,http-response']
 
 
-=== 유저의 토픽 즐겨찾기 삭제
+=== 회원의 토픽 즐겨찾기 삭제
 
 operation::bookmark-controller-test/delete-topic-in-bookmark[snippets='http-request,http-response']

backend/src/docs/asciidoc/member.adoc

@@ -1,25 +1,25 @@
-== 유저
+== 회원
 
-=== 유저 목록 조회
+=== 회원 목록 조회
 
 operation::member-controller-test/find-all-member[snippets='http-request,http-response']
 
-=== 유저 단일 조회
+=== 회원 단일 조회
 
 operation::member-controller-test/find-member-by-id[snippets='http-request,http-response']
 
-=== 유저의 나의 지도 목록 조회
+=== 회원의 나의 지도 목록 조회
 
 operation::member-controller-test/find-my-all-topics[snippets='http-request,http-response']
 
-=== 유저의 나의 핀 목록 조회
+=== 회원의 나의 핀 목록 조회
 
 operation::member-controller-test/find-my-all-pins[snippets='http-request,http-response']
 
-=== 유저의 모아보기 조회
+=== 회원의 모아보기 조회
 
 operation::member-controller-test/find-all-topics-in-atlas[snippets='http-request,http-response']
 
-=== 유저의 즐겨찾기 조회
+=== 회원의 즐겨찾기 조회
 
 operation::member-controller-test/find-all-topics-in-bookmark[snippets='http-request,http-response']

backend/src/docs/asciidoc/permission.adoc

@@ -8,10 +8,10 @@ operation::permission-controller-test/add-permission[snippets='http-request,http
 
 operation::permission-controller-test/delete-permission[snippets='http-request,http-response']
 
-=== 토픽에 권한을 가진 유저 목록 조회
+=== 토픽에 권한을 가진 회원 목록 조회
 
-operation::permission-controller-test/find-all-topic-permissions[snippets='http-request,http-response']
+operation::permission-controller-test/find-topic-access-detail-by-topic-id[snippets='http-request,http-response']
 
-=== 토픽에 권한을 가진 유저 단일 조회
+=== 토픽에 권한을 가진 회원 단일 조회
 
 operation::permission-controller-test/find-permission-by-id[snippets='http-request,http-response']

backend/src/docs/asciidoc/pin.adoc

@@ -8,7 +8,7 @@ operation::pin-controller-test/find-all[snippets='http-request,http-response']
 
 operation::pin-controller-test/find-by-id[snippets='http-request,http-response']
 
-=== 멤버별 핀 목록 조회
+=== 회원별 핀 목록 조회
 
 operation::pin-controller-test/find-all-pins-by-member-id[snippets='http-request,http-response']
 

backend/src/docs/asciidoc/topic.adoc

@@ -12,7 +12,7 @@ operation::topic-controller-test/find-all-by-order-by-updated-at-desc[snippets='
 
 operation::topic-controller-test/find-all-best-topics[snippets='http-request,http-response']
 
-=== 멤버별 토픽 목록 조회
+=== 회원별 토픽 목록 조회
 
 operation::topic-controller-test/find-all-topics-by-member-id[snippets='http-request,http-response']
 

backend/src/main/java/com/mapbefine/mapbefine/member/application/MemberCommandService.java

@@ -0,0 +1,43 @@
+package com.mapbefine.mapbefine.member.application;
+
+import com.mapbefine.mapbefine.auth.domain.AuthMember;
+import com.mapbefine.mapbefine.member.domain.Member;
+import com.mapbefine.mapbefine.member.domain.MemberRepository;
+import com.mapbefine.mapbefine.member.dto.request.MemberUpdateRequest;
+import com.mapbefine.mapbefine.member.exception.MemberErrorCode;
+import com.mapbefine.mapbefine.member.exception.MemberException.MemberConflictException;
+import java.util.NoSuchElementException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class MemberCommandService {
+
+    private final MemberRepository memberRepository;
+
+    public MemberCommandService(MemberRepository memberRepository) {
+        this.memberRepository = memberRepository;
+    }
+
+    public void updateInfoById(AuthMember authMember, MemberUpdateRequest request) {
+        Member member = findMemberById(authMember.getMemberId());
+        String nickName = request.nickName();
+
+        validateNicknameDuplicated(nickName);
+
+        member.update(nickName);
+    }
+
+    private Member findMemberById(Long memberId) {
+        return memberRepository.findById(memberId)
+                .orElseThrow(() -> new NoSuchElementException("findMemberById; memberId=" + memberId));
+    }
+
+    private void validateNicknameDuplicated(String nickName) {
+        if (memberRepository.existsByMemberInfoNickName(nickName)) {
+            throw new MemberConflictException(MemberErrorCode.ILLEGAL_NICKNAME_ALREADY_EXISTS, nickName);
+        }
+    }
+
+}

backend/src/main/java/com/mapbefine/mapbefine/member/domain/Member.java

@@ -98,21 +98,14 @@ private static String createNickname(String nickname) {
     private static String createNicknameSuffix() {
         return randomUUID()
                 .toString()
-                .replaceAll("-", "")
+                .replace("-", "")
                 .substring(0, DEFAULT_NICKNAME_SUFFIX_LENGTH);
     }
 
     public void update(
-            String nickName,
-            String email,
-            String imageUrl
+            String nickName
     ) {
-        memberInfo = MemberInfo.of(
-                nickName,
-                email,
-                imageUrl,
-                memberInfo.getRole()
-        );
+        memberInfo = memberInfo.createUpdatedMemberInfo(nickName);
     }
 
     public void addTopic(Topic topic) {

backend/src/main/java/com/mapbefine/mapbefine/member/domain/MemberInfo.java

@@ -28,7 +28,7 @@ public class MemberInfo {
     @Column(nullable = false, length = 20, unique = true)
     private String nickName;
 
-    @Column(nullable = false, unique = true)
+    @Column(nullable = false)
     private String email;
 
     @Column(nullable = false)
@@ -93,6 +93,11 @@ private static void validateRole(Role role) {
         }
     }
 
+    public MemberInfo createUpdatedMemberInfo(String nickName) {
+
+        return MemberInfo.of(nickName, this.email, this.imageUrl.getImageUrl(), this.role);
+    }
+
     public String getImageUrl() {
         return imageUrl.getImageUrl();
     }

backend/src/main/java/com/mapbefine/mapbefine/member/domain/MemberRepository.java

@@ -5,12 +5,10 @@
 
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
-    Optional<Member> findByMemberInfoEmail(String email);
-
-    boolean existsByMemberInfoEmail(String email);
-
-    Optional<Member> findByOauthIdOauthServerId(Long oauthServerId);
+    Optional<Member> findById(Long id);
 
     Optional<Member> findByOauthId(OauthId oauthId);
 
+    boolean existsByMemberInfoNickName(String nickName);
+
 }

backend/src/main/java/com/mapbefine/mapbefine/member/domain/Role.java

@@ -9,7 +9,7 @@
 public enum Role {
 
     ADMIN("ROLE_ADMIN", "운영자"),
-    USER("ROLE_USER", "로그인 유저"),
+    USER("ROLE_USER", "로그인 회원"),
     GUEST("ROLE_GUEST", "손님");
 
     private final String key;

backend/src/main/java/com/mapbefine/mapbefine/member/dto/request/MemberUpdateRequest.java

@@ -0,0 +1,6 @@
+package com.mapbefine.mapbefine.member.dto.request;
+
+public record MemberUpdateRequest(
+        String nickName
+) {
+}

backend/src/main/java/com/mapbefine/mapbefine/member/exception/MemberErrorCode.java

@@ -10,6 +10,7 @@ public enum MemberErrorCode {
     ILLEGAL_EMAIL_NULL("05002", "이메일은 필수로 입력해야합니다."),
     ILLEGAL_EMAIL_PATTERN("05003", "올바르지 않은 이메일 형식입니다."),
     MEMBER_NOT_FOUND("05400", "존재하지 않는 회원입니다."),
+    ILLEGAL_NICKNAME_ALREADY_EXISTS("05900", "이미 존재하는 닉네임입니다."),
     ;
 
     private final String code;

backend/src/main/java/com/mapbefine/mapbefine/member/exception/MemberException.java

@@ -1,6 +1,7 @@
 package com.mapbefine.mapbefine.member.exception;
 
 import com.mapbefine.mapbefine.common.exception.BadRequestException;
+import com.mapbefine.mapbefine.common.exception.ConflictException;
 import com.mapbefine.mapbefine.common.exception.ErrorCode;
 import com.mapbefine.mapbefine.common.exception.NotFoundException;
 
@@ -18,5 +19,11 @@ public MemberNotFoundException(MemberErrorCode errorCode, Long id) {
         }
     }
 
+    public static class MemberConflictException extends ConflictException {
+        public MemberConflictException(MemberErrorCode errorCode, String value) {
+            super(new ErrorCode<>(errorCode.getCode(), errorCode.getMessage(), value));
+        }
+    }
+
 }
 

backend/src/main/java/com/mapbefine/mapbefine/member/presentation/MemberController.java

@@ -2,25 +2,31 @@
 
 import com.mapbefine.mapbefine.auth.domain.AuthMember;
 import com.mapbefine.mapbefine.common.interceptor.LoginRequired;
+import com.mapbefine.mapbefine.member.application.MemberCommandService;
 import com.mapbefine.mapbefine.member.application.MemberQueryService;
+import com.mapbefine.mapbefine.member.dto.request.MemberUpdateRequest;
 import com.mapbefine.mapbefine.member.dto.response.MemberDetailResponse;
 import com.mapbefine.mapbefine.member.dto.response.MemberResponse;
 import com.mapbefine.mapbefine.pin.dto.response.PinResponse;
 import com.mapbefine.mapbefine.topic.dto.response.TopicResponse;
 import java.util.List;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/members")
 public class MemberController {
 
+    private final MemberCommandService memberCommandService;
     private final MemberQueryService memberQueryService;
 
-    public MemberController(MemberQueryService memberQueryService) {
+    public MemberController(MemberCommandService memberCommandService, MemberQueryService memberQueryService) {
+        this.memberCommandService = memberCommandService;
         this.memberQueryService = memberQueryService;
     }
 
@@ -72,4 +78,12 @@ public ResponseEntity<List<TopicResponse>> findAllTopicsInBookmark(AuthMember au
         return ResponseEntity.ok(responses);
     }
 
+    @LoginRequired
+    @PatchMapping("/my/profiles")
+    public ResponseEntity<Void> updateMyInfo(AuthMember authMember, @RequestBody MemberUpdateRequest request) {
+        memberCommandService.updateInfoById(authMember, request);
+
+        return ResponseEntity.ok().build();
+    }
+
 }

backend/src/main/java/com/mapbefine/mapbefine/permission/application/PermissionQueryService.java

@@ -4,9 +4,16 @@
 
 import com.mapbefine.mapbefine.permission.domain.Permission;
 import com.mapbefine.mapbefine.permission.domain.PermissionRepository;
-import com.mapbefine.mapbefine.permission.dto.response.PermissionDetailResponse;
-import com.mapbefine.mapbefine.permission.dto.response.PermissionResponse;
+import com.mapbefine.mapbefine.permission.dto.response.PermissionMemberDetailResponse;
+import com.mapbefine.mapbefine.permission.dto.response.PermissionedMemberResponse;
+import com.mapbefine.mapbefine.permission.dto.response.TopicAccessDetailResponse;
 import com.mapbefine.mapbefine.permission.exception.PermissionException.PermissionNotFoundException;
+import com.mapbefine.mapbefine.topic.domain.Publicity;
+import com.mapbefine.mapbefine.topic.domain.Topic;
+import com.mapbefine.mapbefine.topic.domain.TopicRepository;
+import com.mapbefine.mapbefine.topic.domain.TopicStatus;
+import com.mapbefine.mapbefine.topic.exception.TopicErrorCode;
+import com.mapbefine.mapbefine.topic.exception.TopicException.TopicNotFoundException;
 import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,22 +23,35 @@
 public class PermissionQueryService {
 
     private final PermissionRepository permissionRepository;
+    private final TopicRepository topicRepository;
 
-    public PermissionQueryService(PermissionRepository permissionRepository) {
+    public PermissionQueryService(PermissionRepository permissionRepository, TopicRepository topicRepository) {
         this.permissionRepository = permissionRepository;
+        this.topicRepository = topicRepository;
     }
 
-    public List<PermissionResponse> findAllTopicPermissions(Long topicId) {
-        return permissionRepository.findAllByTopicId(topicId)
+    public TopicAccessDetailResponse findTopicAccessDetailById(Long topicId) {
+        Publicity publicity = findTopicPublicityById(topicId);
+        /// TODO: 2023/09/15 이럴거면 topic.getPermissions 로 하는 게 나을 수도 있나? TopicController 에서 하는 게 더 자연스러운 것 같기도..
+        List<PermissionedMemberResponse> permissionedMembers = permissionRepository.findAllByTopicId(topicId)
                 .stream()
-                .map(PermissionResponse::from)
+                .map(PermissionedMemberResponse::from)
                 .toList();
+
+        return new TopicAccessDetailResponse(publicity, permissionedMembers);
+    }
+
+    private Publicity findTopicPublicityById(Long topicId) {
+        return topicRepository.findById(topicId)
+                .map(Topic::getTopicStatus)
+                .map(TopicStatus::getPublicity)
+                .orElseThrow(() -> new TopicNotFoundException(TopicErrorCode.TOPIC_NOT_FOUND, topicId));
     }
 
-    public PermissionDetailResponse findPermissionById(Long permissionId) {
+    public PermissionMemberDetailResponse findPermissionById(Long permissionId) {
         Permission permission = permissionRepository.findById(permissionId)
                 .orElseThrow(() -> new PermissionNotFoundException(PERMISSION_NOT_FOUND, permissionId));
 
-        return PermissionDetailResponse.from(permission);
+        return PermissionMemberDetailResponse.from(permission);
     }
 }

backend/src/main/java/com/mapbefine/mapbefine/permission/domain/Permission.java

@@ -19,6 +19,7 @@
 @Getter
 public class Permission extends BaseTimeEntity {
 
+    // TODO 매핑 테이블인데 Id를 가져야 할까?
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

backend/src/main/java/com/mapbefine/mapbefine/permission/dto/response/PermissionDetailResponse.java → backend/src/main/java/com/mapbefine/mapbefine/permission/dto/response/PermissionMemberDetailResponse.java

@@ -4,14 +4,14 @@
 import com.mapbefine.mapbefine.permission.domain.Permission;
 import java.time.LocalDateTime;
 
-public record PermissionDetailResponse(
+public record PermissionMemberDetailResponse(
         Long id,
         LocalDateTime updatedAt,
         MemberDetailResponse memberDetailResponse
 ) {
 
-    public static PermissionDetailResponse from(Permission permission) {
-        return new PermissionDetailResponse(
+    public static PermissionMemberDetailResponse from(Permission permission) {
+        return new PermissionMemberDetailResponse(
                 permission.getId(),
                 permission.getUpdatedAt(),
                 MemberDetailResponse.from(permission.getMember())