feat: member 상태관리를 위한 member.status 추가에 따른 수정

module-api/src/main/java/inspiration/auth/AuthService.java

@@ -5,6 +5,7 @@
 import inspiration.auth.request.LoginRequest;
 import inspiration.domain.member.Member;
 import inspiration.domain.member.MemberRepository;
+import inspiration.domain.member.MemberStatus;
 import inspiration.domain.member.response.MemberInfoResponse;
 import inspiration.enumeration.ExceptionType;
 import inspiration.enumeration.ExpireTimeConstants;
@@ -44,7 +45,7 @@ public ResultResponse<TokenResponse> login(LoginRequest request) {
     }
 
     private Member checkEmail(String email) {
-        return memberRepository.findByEmail(email)
+        return memberRepository.findByEmailAndMemberStatus(email, MemberStatus.REGISTERED)
                                .orElseThrow(() -> new PostNotFoundException(ExceptionType.EMAIl_NOT_FOUND.getMessage()));
     }
 

module-api/src/main/java/inspiration/domain/emailauth/EmailAuthService.java

@@ -1,6 +1,7 @@
 package inspiration.domain.emailauth;
 
 import inspiration.ResultResponse;
+import inspiration.domain.member.MemberStatus;
 import inspiration.enumeration.ExceptionType;
 import inspiration.exception.PostNotFoundException;
 import inspiration.domain.member.MemberRepository;
@@ -46,7 +47,7 @@ public void authenticateEmailOfSignUp(String email) {
     @Transactional
     public void resetPasswordForAuthEmailSend(String email) {
 
-        if (!memberRepository.existsByEmail(email)) {
+        if (!memberRepository.existsByEmailAndMemberStatus(email, MemberStatus.REGISTERED)) {
             throw new PostNotFoundException(ExceptionType.MEMBER_NOT_FOUND.getMessage());
         }
 

module-api/src/main/java/inspiration/domain/member/MemberService.java

@@ -41,7 +41,7 @@ public void changePassword(Long memberId, String confirmPassword, String passwor
     @Transactional
     public void resetPasswordEmailSend(String email) {
 
-        Member member = memberRepository.findByEmail(email)
+        Member member = memberRepository.findByEmailAndMemberStatus(email, MemberStatus.REGISTERED)
                 .orElseThrow(() -> new PostNotFoundException(ExceptionType.USER_NOT_EXISTS.getMessage()));
 
         String resetPassword = GetResetPasswordUtil.getResetPassword();
@@ -72,9 +72,7 @@ public void removeUser(Long memberId) {
                 .orElseThrow(() -> new PostNotFoundException(ExceptionType.USER_NOT_EXISTS.getMessage()));
 
         emailAuthRepository.deleteByEmail(member.getEmail());
-
-        memberRepository.deleteById(memberId);
-
+        member.removeMember();
     }
 
     private void confirmPasswordCheck(String confirmPasswordCheck, String password) {
@@ -89,11 +87,4 @@ public Member findById(Long id) {
                 .orElseThrow(UnauthorizedAccessRequestException::new);
     }
 
-    public List<MemberResponse> findAll() {
-        return memberRepository.findAll()
-                                .stream()
-                                .map(MemberResponse::of)
-                                .collect(Collectors.toList());
-    }
-
 }

module-api/src/main/java/inspiration/signup/SignupService.java

@@ -4,6 +4,7 @@
 import inspiration.auth.jwt.JwtProvider;
 import inspiration.auth.TokenResponse;
 import inspiration.domain.emailauth.EmailAuthRepository;
+import inspiration.domain.member.MemberStatus;
 import inspiration.enumeration.ExceptionType;
 import inspiration.exception.ConflictRequestException;
 import inspiration.exception.PostNotFoundException;
@@ -51,15 +52,15 @@ public ResultResponse checkNickName(String nickname) {
     @Transactional
     public void updateExtraInfo(String email, ExtraInfoRequest request) {
 
-        Member member = memberRepository.findByEmail(email)
+        Member member = memberRepository.findByEmailAndMemberStatus(email, MemberStatus.REGISTERED)
                 .orElseThrow(() -> new PostNotFoundException(ExceptionType.USER_NOT_EXISTS.getMessage()));
 
         member.updateExtraInfo(request.getGender(), request.getAge(), request.getJob());
     }
 
     public ResultResponse validSignUpEmailStatus(String email) {
 
-        if (memberRepository.existsByEmail(email)) {
+        if (memberRepository.existsByEmailAndMemberStatus(email, MemberStatus.REGISTERED)) {
 
             return ResultResponse.of(ExceptionType.EMAIL_ALREADY_AUTHENTICATED.getMessage(), true);
         }
@@ -83,14 +84,14 @@ private void verifyEmail(String email) {
 
     private void isValidNickName(String nickName) {
 
-        if (memberRepository.existsByNickname(nickName)) {
+        if (memberRepository.existsByNicknameAndMemberStatus(nickName, MemberStatus.REGISTERED)) {
             throw new ConflictRequestException(ExceptionType.EXISTS_NICKNAME.getMessage());
         }
     }
 
     private void isValidEmail(String email) {
 
-        if (memberRepository.existsByEmail(email)) {
+        if (memberRepository.existsByEmailAndMemberStatus(email, MemberStatus.REGISTERED)) {
             throw new ConflictRequestException(ExceptionType.EXISTS_EMAIL.getMessage());
         }
     }

module-domain/src/main/java/inspiration/domain/inspiration/InspirationRepository.java

@@ -1,7 +1,6 @@
 package inspiration.domain.inspiration;
 
 import inspiration.domain.member.Member;
-import inspiration.domain.tag.Tag;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -21,14 +20,9 @@ public interface InspirationRepository extends JpaRepository<Inspiration, Long>,
 
     Optional<Inspiration> findAllByMemberAndId(Member member, Long id);
 
-    @Query(value = "select it.inspiration from InspirationTag it where it.tag in :tags group by it.inspiration having count(it.inspiration) >= :count")
-    Optional<List<Inspiration>> findDistinctInspirationByTags(@Param("tags") List<Tag> tags, @Param("count") Long count);
-
-    Page<Inspiration> findAllByIdIn(List<Long> inspirationIds, Pageable pageable);
-
     List<Inspiration> findAllByMember(Member member);
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(value = "delete from Inspiration i where i.member = :member")
-    void deleteAllByMember(Member member);
+    void deleteAllByMember(@Param("member") Member member);
 }

module-domain/src/main/java/inspiration/domain/inspiration_tag/InspirationTagRepository.java

@@ -5,6 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -18,7 +19,7 @@ public interface InspirationTagRepository extends JpaRepository<InspirationTag,
 
     @Modifying
     @Query(value = "delete from InspirationTag where inspiration in :inspirations")
-    void deleteAllByInspirationIn(List<Inspiration> inspirations);
+    void deleteAllByInspirationIn(@Param("inspirations") List<Inspiration> inspirations);
 
     void deleteAllByTag(Tag tag);
 

module-domain/src/main/java/inspiration/domain/member/Member.java

@@ -9,7 +9,6 @@
 @Getter
 @Entity
 @Builder
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @ToString(callSuper = true)
 public class Member extends BaseTimeEntity {
@@ -37,11 +36,25 @@ public class Member extends BaseTimeEntity {
      */
     @Column
     @Enumerated(EnumType.STRING)
-    private AgeGroupType ageGroup;
+    private AgeGroupType ageGroupType;
 
     @Column
     private String job;
 
+    @Enumerated(value = EnumType.STRING)
+    private MemberStatus memberStatus;
+
+    private Member(Long id, String nickname, String email, String password, GenderType gender, AgeGroupType ageGroupType, String job, MemberStatus memberStatus) {
+        this.id = id;
+        this.nickname = nickname;
+        this.email = email;
+        this.password = password;
+        this.gender = gender;
+        this.ageGroupType = ageGroupType;
+        this.job = job;
+        this.memberStatus = MemberStatus.REGISTERED;
+    }
+
     public void updatePassword(String password) {
 
         this.password = password;
@@ -52,14 +65,18 @@ public void updateNickname(String nickname) {
         this.nickname = nickname;
     }
 
-    public void updateExtraInfo(GenderType gender, AgeGroupType ageGroup, String job) {
+    public void updateExtraInfo(GenderType gender, AgeGroupType ageGroupType, String job) {
 
         this.gender = gender;
-        this.ageGroup = ageGroup;
+        this.ageGroupType = ageGroupType;
         this.job = job;
     }
 
     public boolean isSameMember(Long id) {
         return this.id.equals(id);
     }
+
+    public void removeMember(){
+        this.memberStatus = MemberStatus.UNREGISTERED;
+    }
 }

module-domain/src/main/java/inspiration/domain/member/MemberRepository.java

@@ -5,11 +5,10 @@
 
 public interface MemberRepository extends JpaRepository<Member, Long>, MemberRepositoryCustom {
 
-    Optional<Member> findById(Long id);
+    Optional<Member> findByEmailAndMemberStatus(String email, MemberStatus memberStatus);
 
-    Optional<Member> findByEmail(String email);
+    boolean existsByNicknameAndMemberStatus(String nickName, MemberStatus memberStatus);
 
-    boolean existsByNickname(String nickName);
+    boolean existsByEmailAndMemberStatus(String email, MemberStatus memberStatus);
 
-    boolean existsByEmail(String email);
 }

module-domain/src/main/java/inspiration/domain/member/MemberStatus.java

@@ -0,0 +1,5 @@
+package inspiration.domain.member;
+
+public enum MemberStatus {
+    REGISTERED, UNREGISTERED
+}

module-domain/src/main/java/inspiration/domain/tag/TagRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -26,6 +27,6 @@ public interface TagRepository extends JpaRepository<Tag, Long>{
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(value = "delete from Tag t where t.member = :member")
-    void deleteAllByMember(Member member);
+    void deleteAllByMember(@Param("member") Member member);
 
 }

module-domain/src/main/resources/db/migration/V15__alter_member_column.sql

@@ -0,0 +1,2 @@
+alter table member
+    add column member_status varchar(255)

module-web/src/main/resources/db/migration/V15__alter_member_column.sql

@@ -0,0 +1,2 @@
+alter table member
+    add column member_status varchar(255)

module-web/src/test/java/inspiration/v1/signup/SignUpControllerTest.java

@@ -5,6 +5,7 @@
 import inspiration.domain.emailauth.request.SendEmailRequest;
 import inspiration.domain.member.Member;
 import inspiration.domain.member.MemberRepository;
+import inspiration.domain.member.MemberStatus;
 import inspiration.domain.member.request.SignUpRequest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -70,7 +71,7 @@ void signUp() throws Exception {
                // then 1
                .andExpect(status().isCreated());
         // then 2
-        Optional<Member> member = memberRepository.findByEmail(email);
+        Optional<Member> member = memberRepository.findByEmailAndMemberStatus(email, MemberStatus.REGISTERED);
         assertThat(member).isPresent();
         assertThat(member.get().getEmail()).isEqualTo(email);
         assertThat(member.get().getNickname()).isEqualTo("nickname");