Merge pull request #43 from BokDoong/member_feature

Member feature
BokDoong · Oct 9, 2023 · 5eb358a · 5eb358a
2 parents ac8d622 + 964b930
commit 5eb358a
Show file tree

Hide file tree

Showing 29 changed files with 408 additions and 108 deletions.
diff --git a/src/main/java/hanium/englishfairytale/common/files/FileManageService.java b/src/main/java/hanium/englishfairytale/common/files/FileManageService.java
@@ -3,7 +3,6 @@
 import hanium.englishfairytale.common.util.ImageFileUtility;
 import hanium.englishfairytale.exception.RuntimeIOException;
 import hanium.englishfairytale.exception.code.ErrorCode;
-import hanium.englishfairytale.tale.application.dto.TaleImageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,13 +17,13 @@ public class FileManageService {
     private final FileStore fileStore;
 
     @Transactional
-    public TaleImageInfo uploadTaleImage(MultipartFile image) {
+    public ImageInfo uploadImage(MultipartFile image) {
         try {
             String originalName = image.getOriginalFilename();
             String storedName = ImageFileUtility.createObjectNameByUUID(originalName);
             String imageUrl = fileStore.upload(storedName, image.getInputStream(), ImageFileUtility.createObjectMetadata(image));
 
-            return new TaleImageInfo(originalName, storedName, imageUrl);
+            return new ImageInfo(originalName, storedName, imageUrl);
         } catch (IOException e) {
             throw new RuntimeIOException(e, ErrorCode.IMAGE_PROCESSING_IO);
         }

diff --git a/...e/tale/application/dto/TaleImageInfo.java → ...lishfairytale/common/files/ImageInfo.java b/...e/tale/application/dto/TaleImageInfo.java → ...lishfairytale/common/files/ImageInfo.java
@@ -1,13 +1,11 @@
-package hanium.englishfairytale.tale.application.dto;
+package hanium.englishfairytale.common.files;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor
 @AllArgsConstructor
-public class TaleImageInfo {
+public class ImageInfo {
     String originalFileName;
     String storedName;
     String imageUrl;

diff --git a/src/main/java/hanium/englishfairytale/exception/code/ErrorCode.java b/src/main/java/hanium/englishfairytale/exception/code/ErrorCode.java
@@ -28,12 +28,13 @@ public enum ErrorCode {
     EXCEED_KEYWORD_LIMIT(TaleCode.KEYWORD_COUNT_LIMIT.getCode(), BAD_REQUEST, "입력 키워드 개수 초과"),
     DUPLICATED_KEYWORD(TaleCode.KEYWORD_DUPLICATED.getCode(), BAD_REQUEST, "중복된 키워드가 있는 경우"),
     IMAGE_PROCESSING_IO(TaleCode.IMAGE_IO.getCode(), BAD_REQUEST, "이미지 처리 중 문제가 발생한 경우"),
-    IMAGE_NON_EXITED(TaleCode.NON_EXISTED_IMAGE.getCode(), NOT_ACCEPTABLE, "삭제할 이미지가 존재하지 않는 경우"),
+    TALE_IMAGE_NON_EXISTED(TaleCode.NON_EXISTED_IMAGE.getCode(), NOT_ACCEPTABLE, "삭제할 이미지가 존재하지 않는 경우"),
 
     // Member
     MEMBER_NOT_FOUND(MemberCode.NOT_FOUND.getCode(), NOT_FOUND, "존재하지 않는 회원"),
     EXISTED_MEMBER(MemberCode.MEMBER_EXISTED.getCode(), CONFLICT, "이미 회원가입 되어있을 경우"),
     DUPLICATED_NICKNAME(MemberCode.NICKNAME_DUPLICATED.getCode(), CONFLICT, "동일한 닉네임이 존재하는 경우"),
+    MEMBER_IMAGE_NON_EXISTED(MemberCode.NON_EXISTED_IMAGE.getCode(), CONFLICT, "삭제할 이미지가 존재하지 않는 경우")
     ;
 
     private final String code;

diff --git a/src/main/java/hanium/englishfairytale/exception/code/MemberCode.java b/src/main/java/hanium/englishfairytale/exception/code/MemberCode.java
@@ -9,6 +9,7 @@ public enum MemberCode {
     NOT_FOUND("M-001"),
     MEMBER_EXISTED("M-002"),
     NICKNAME_DUPLICATED("M-003"),
+    NON_EXISTED_IMAGE("M-004"),
     ;
 
     private final String code;

diff --git a/src/main/java/hanium/englishfairytale/member/application/MemberCommandService.java b/src/main/java/hanium/englishfairytale/member/application/MemberCommandService.java
@@ -1,40 +1,101 @@
 package hanium.englishfairytale.member.application;
 
+import hanium.englishfairytale.common.files.FileManageService;
 import hanium.englishfairytale.exception.BusinessException;
+import hanium.englishfairytale.exception.NotFoundException;
 import hanium.englishfairytale.exception.code.ErrorCode;
 import hanium.englishfairytale.member.application.dto.MemberCreateCommand;
-import hanium.englishfairytale.member.application.dto.CreateMemberResponse;
+import hanium.englishfairytale.member.application.dto.MemberImageUpdateCommand;
+import hanium.englishfairytale.member.application.dto.MemberUpdatePasswordCommand;
+import hanium.englishfairytale.member.domain.ImageRepository;
 import hanium.englishfairytale.member.domain.Member;
+import hanium.englishfairytale.member.domain.MemberImage;
 import hanium.englishfairytale.member.domain.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 @Service
 @RequiredArgsConstructor
 public class MemberCommandService {
 
     private final MemberRepository memberRepository;
+    private final ImageRepository imageRepository;
+    private final FileManageService fileManageService;
 
     @Transactional
-    public CreateMemberResponse register(MemberCreateCommand memberCreateCommand) {
-        return new CreateMemberResponse(createAndSaveMember(memberCreateCommand));
+    public Long register(MemberCreateCommand memberCreateCommand) {
+        verifyExistedMember(memberCreateCommand);
+        return createAndSaveMember(memberCreateCommand);
     }
 
-    private Long createAndSaveMember(MemberCreateCommand memberCreateCommand) {
-        verifyExistedMember(memberCreateCommand);
-        verifyDuplicatedNickname(memberCreateCommand);
-        return memberRepository.save(createMember(memberCreateCommand));
+    @Transactional
+    public void updateNickname(Long memberId, String nickname) {
+        Member member = findMember(memberId);
+        member.updateNickname(nickname);
+    }
+
+    @Transactional
+    public void updatePassword(MemberUpdatePasswordCommand updatePasswordCommand) {
+        Member member = findMember(updatePasswordCommand.getMemberId());
+        member.updatePassword(updatePasswordCommand.getPassword());
+    }
+
+    @Transactional
+    public void updateMemberImage(MemberImageUpdateCommand imageUpdateCommand) {
+        Member member = findMember(imageUpdateCommand.getMemberId());
+        member.updateMemberImage(createAndSaveMemberImage(imageUpdateCommand.getImage()));
+    }
+
+    @Transactional
+    public void deleteMemberImage(Long memberId) {
+        Member member = findMember(memberId);
+        Long imageId = findImageId(member);
+        deleteImage(member, imageId);
+    }
+
+    private void deleteImage(Member member, Long imageId) {
+        member.makeImageNull();
+        imageRepository.delete(imageId);
+    }
+
+    private Long findImageId(Member member) {
+        verifyImageIsEmpty(member);
+        return member.getImageId();
+    }
+
+    private void verifyImageIsEmpty(Member member) {
+        member.checkImageEmpty();
+    }
+
+    private Member findMember(Long id) {
+        return memberRepository.findMemberById(id)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.MEMBER_NOT_FOUND));
     }
 
-    private void verifyDuplicatedNickname(MemberCreateCommand memberCreateCommand) {
-        if (memberRepository.findByNickname(memberCreateCommand.getNickname()).isPresent()) {
-            throw new BusinessException(ErrorCode.DUPLICATED_NICKNAME);
+    private Long createAndSaveMember(MemberCreateCommand memberCreateCommand) {
+        Member member = createMember(memberCreateCommand);
+        if (!checkImageEmpty(memberCreateCommand)) {
+            member.putImage(createAndSaveMemberImage(memberCreateCommand.getImage()));
         }
+        return saveMember(member);
+    }
+
+    private boolean checkImageEmpty(MemberCreateCommand memberCreateCommand) {
+        return memberCreateCommand.getImage().isEmpty();
+    }
+
+    private Long saveMember(Member member) {
+        return memberRepository.save(member);
+    }
+
+    private MemberImage createAndSaveMemberImage(MultipartFile file) {
+        return new MemberImage(fileManageService.uploadImage(file));
     }
 
     private void verifyExistedMember(MemberCreateCommand memberCreateCommand) {
-        if (memberRepository.findByPhoneNumber(memberCreateCommand.getPhoneNumber()).isPresent()) {
+        if (memberRepository.findMemberByPhoneNumber(memberCreateCommand.getPhoneNumber()).isPresent()) {
             throw new BusinessException(ErrorCode.EXISTED_MEMBER);
         }
     }

diff --git a/src/main/java/hanium/englishfairytale/member/application/MemberQueryService.java b/src/main/java/hanium/englishfairytale/member/application/MemberQueryService.java
@@ -1,35 +1,53 @@
 package hanium.englishfairytale.member.application;
 
-import hanium.englishfairytale.tale.application.dto.TalesInfo;
-import hanium.englishfairytale.tale.domain.Keyword;
-import hanium.englishfairytale.tale.domain.TaleKeyword;
-import hanium.englishfairytale.tale.domain.TaleRepository;
+import hanium.englishfairytale.exception.BusinessException;
+import hanium.englishfairytale.exception.NotFoundException;
+import hanium.englishfairytale.exception.code.ErrorCode;
+import hanium.englishfairytale.member.application.dto.MemberDetailInfo;
+import hanium.englishfairytale.member.application.dto.MemberInfo;
+import hanium.englishfairytale.member.domain.Member;
+import hanium.englishfairytale.member.domain.MemberRepository;
+import hanium.englishfairytale.member.infra.MemberQueryDao;
+import hanium.englishfairytale.tale.infra.TaleQueryDao;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Service
 @RequiredArgsConstructor
 public class MemberQueryService {
 
-    private final TaleRepository taleRepository;
+    private final MemberRepository memberRepository;
+    private final MemberQueryDao memberQueryDao;
+    private final TaleQueryDao taleQueryDao;
+
+    @Transactional
+    public void verifyNickname(String nickname) {
+        verifyNicknameDuplicated(nickname);
+    }
 
-    @Transactional(readOnly = true)
-    public List<TalesInfo> findMainTalesInfo(Long memberId) {
+    @Transactional
+    public MemberInfo findMemberInfo(Long memberId) {
+        return new MemberInfo(findMember(memberId), countTales(memberId));
+    }
 
-        // memberId -> Tale 조회 -> 최신순, Tale+Member+Image+TaleKeywords 나옴.
-        // 각 TaleKeyword 의 id값 -> Keywords 조회 -> 위에서 찾은 TaleKeyword 의 id 값을 넣는다. ->
+    @Transactional
+    public MemberDetailInfo findMemberDetailInfo(Long memberId) {
+        return new MemberDetailInfo(findMember(memberId));
+    }
 
+    private Member findMember(Long memberId) {
+        return memberQueryDao.findMemberAndImage(memberId)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.MEMBER_NOT_FOUND));
+    }
 
-        return null;
+    private Long countTales(Long memberId) {
+        return taleQueryDao.countTales(memberId);
     }
 
-    private List<Keyword> getKeywordsFromTaleKeyword(List<TaleKeyword> taleKeywords) {
-        return taleKeywords.stream()
-                .map(TaleKeyword::getKeyword)
-                .collect(Collectors.toList());
+    private void verifyNicknameDuplicated(String nickName) {
+        if (memberRepository.findByMemberNickname(nickName).isPresent()) {
+            throw new BusinessException(ErrorCode.DUPLICATED_NICKNAME);
+        }
     }
 }
diff --git a/src/main/java/hanium/englishfairytale/member/application/dto/MemberCreateCommand.java b/src/main/java/hanium/englishfairytale/member/application/dto/MemberCreateCommand.java
@@ -2,6 +2,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import org.springframework.web.multipart.MultipartFile;
 
 @Builder
 @Getter
@@ -11,4 +12,6 @@ public class MemberCreateCommand {
     private String nickname;
     private String email;
     private String password;
+    private MultipartFile image;
+
 }
diff --git a/src/main/java/hanium/englishfairytale/member/application/dto/MemberDetailInfo.java b/src/main/java/hanium/englishfairytale/member/application/dto/MemberDetailInfo.java
@@ -0,0 +1,19 @@
+package hanium.englishfairytale.member.application.dto;
+
+import hanium.englishfairytale.member.domain.Member;
+import lombok.Getter;
+
+@Getter
+public class MemberDetailInfo {
+    String nickname;
+    String email;
+    String phoneNumber;
+    String imageUrl;
+
+    public MemberDetailInfo(Member member) {
+        this.nickname = member.getNickname();
+        this.email = member.getEmail();
+        this.phoneNumber = member.getPhoneNumber();
+        this.imageUrl = member.getImage() == null ? null : member.getImage().getUrl();
+    }
+}
diff --git a/src/main/java/hanium/englishfairytale/member/application/dto/MemberImageUpdateCommand.java b/src/main/java/hanium/englishfairytale/member/application/dto/MemberImageUpdateCommand.java
@@ -0,0 +1,12 @@
+package hanium.englishfairytale.member.application.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+import org.springframework.web.multipart.MultipartFile;
+
+@Builder
+@Getter
+public class MemberImageUpdateCommand {
+    private Long memberId;
+    private MultipartFile image;
+}
diff --git a/src/main/java/hanium/englishfairytale/member/application/dto/MemberInfo.java b/src/main/java/hanium/englishfairytale/member/application/dto/MemberInfo.java
@@ -0,0 +1,17 @@
+package hanium.englishfairytale.member.application.dto;
+
+import hanium.englishfairytale.member.domain.Member;
+import lombok.Getter;
+
+@Getter
+public class MemberInfo {
+    String nickname;
+    String imageUrl;
+    Long taleCounts;
+
+    public MemberInfo(Member member, Long taleCounts) {
+        this.nickname = member.getNickname();
+        this.imageUrl = member.getImage() == null ? null : member.getImage().getUrl();
+        this.taleCounts = taleCounts;
+    }
+}
diff --git a/...application/dto/CreateMemberResponse.java → ...tion/dto/MemberUpdatePasswordCommand.java b/...application/dto/CreateMemberResponse.java → ...tion/dto/MemberUpdatePasswordCommand.java
@@ -1,12 +1,15 @@
 package hanium.englishfairytale.member.application.dto;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
-@AllArgsConstructor
 @NoArgsConstructor
-public class CreateMemberResponse {
-    private Long memberId;
+@AllArgsConstructor
+@Builder
+public class MemberUpdatePasswordCommand {
+    Long memberId;
+    String password;
 }
diff --git a/src/main/java/hanium/englishfairytale/member/domain/ImageRepository.java b/src/main/java/hanium/englishfairytale/member/domain/ImageRepository.java
@@ -0,0 +1,6 @@
+package hanium.englishfairytale.member.domain;
+
+public interface ImageRepository {
+
+    void delete(Long memberImageId);
+}
diff --git a/src/main/java/hanium/englishfairytale/member/domain/Member.java b/src/main/java/hanium/englishfairytale/member/domain/Member.java
@@ -1,5 +1,7 @@
 package hanium.englishfairytale.member.domain;
 
+import hanium.englishfairytale.exception.BusinessException;
+import hanium.englishfairytale.exception.code.ErrorCode;
 import hanium.englishfairytale.tale.domain.Tale;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -34,7 +36,7 @@ public class Member {
     @Column(name = "created_date")
     private LocalDateTime createdTime;
 
-    @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
     private List<Tale> tales = new ArrayList<>();
 
     @Builder
@@ -45,6 +47,7 @@ public Member(String name, String phoneNumber, String nickname, String email, St
         this.email = email;
         this.password = password;
         this.createdTime = LocalDateTime.now();
+        this.image = new Image();
         this.tales = new ArrayList<>();
     }
 
@@ -54,4 +57,34 @@ public void addTale(Tale newTale) {
     public void putImage(MemberImage memberImage) {
         image.putMemberImage(memberImage);
     }
+
+    public void updateNickname(String nickname) {
+        this.nickname = nickname;
+    }
+    public void updatePassword(String password) {
+        this.password = password;
+    }
+
+    public void updateMemberImage(MemberImage memberImage) {
+        if (image == null) {
+            this.image = new Image();
+            this.image.putMemberImage(memberImage);
+        } else {
+            image.putMemberImage(memberImage);
+        }
+    }
+
+    public void checkImageEmpty() {
+        if (image == null) {
+            throw new BusinessException(ErrorCode.MEMBER_IMAGE_NON_EXISTED);
+        }
+    }
+
+    public Long getImageId() {
+        return this.image.getMemberImage().getId();
+    }
+
+    public void makeImageNull() {
+        this.image = null;
+    }
 }