forked from woowacourse/miniprojects-2019
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[#44] refactor: 예외 관련 테스트 케이스 추가 및 관련 프로덕션 로직 추가
- Loading branch information
Showing
20 changed files
with
220 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 24 additions & 6 deletions
30
src/main/java/com/woowacourse/zzazanstagram/model/article/domain/vo/Image.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/main/java/com/woowacourse/zzazanstagram/model/article/dto/ArticleRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
src/main/java/com/woowacourse/zzazanstagram/model/article/exception/ArticleException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.woowacourse.zzazanstagram.model.article.exception; | ||
|
||
public class ArticleException extends IllegalArgumentException { | ||
public ArticleException() { | ||
} | ||
|
||
public ArticleException(String s) { | ||
super(s); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
src/main/java/com/woowacourse/zzazanstagram/model/member/MemberControllerAdvice.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package com.woowacourse.zzazanstagram.model.member; | ||
|
||
import com.woowacourse.zzazanstagram.model.member.exception.MemberException; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
import org.springframework.web.bind.annotation.ControllerAdvice; | ||
import org.springframework.web.bind.annotation.ExceptionHandler; | ||
|
||
@ControllerAdvice(assignableTypes = MemberController.class) | ||
public class MemberControllerAdvice { | ||
private static final Logger log = LoggerFactory.getLogger(MemberControllerAdvice.class); | ||
private static final String TAG = "[MemberControllerAdvice]"; | ||
|
||
@ExceptionHandler(MemberException.class) | ||
public String handleIllegalUserParamsException(MemberException e) { | ||
log.error("{} MemberException >> {}", TAG, e.getMessage()); | ||
|
||
return "redirect:/signup"; | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
3
src/main/java/com/woowacourse/zzazanstagram/model/member/MemberRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,13 @@ | ||
package com.woowacourse.zzazanstagram.model.member; | ||
|
||
import com.woowacourse.zzazanstagram.model.member.vo.Email; | ||
import com.woowacourse.zzazanstagram.model.member.vo.NickName; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
import java.util.Optional; | ||
|
||
public interface MemberRepository extends JpaRepository<Member, Long> { | ||
Optional<Member> findByEmail(Email email); | ||
|
||
Optional<Member> findByNickName(NickName nickName); | ||
} |
35 changes: 31 additions & 4 deletions
35
src/main/java/com/woowacourse/zzazanstagram/model/member/MemberService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,56 @@ | ||
package com.woowacourse.zzazanstagram.model.member; | ||
|
||
import com.woowacourse.zzazanstagram.model.member.exception.MemberException; | ||
import com.woowacourse.zzazanstagram.model.member.vo.Email; | ||
import com.woowacourse.zzazanstagram.model.member.vo.NickName; | ||
import org.springframework.stereotype.Service; | ||
|
||
import java.util.Optional; | ||
|
||
@Service | ||
public class MemberService { | ||
private static final String ERROR_ILLEGAL_LOGIN_MESSAGE = "로그인 정보가 올바르지 않습니다."; | ||
private MemberRepository memberRepository; | ||
|
||
public MemberService(MemberRepository memberRepository) { | ||
this.memberRepository = memberRepository; | ||
} | ||
|
||
public MemberResponse find(MemberLoginRequest request) { | ||
Member member = validateEnrolledMember(request); | ||
Member member = checkEnrolledMember(request); | ||
return MemberAssembler.assemble(member); | ||
} | ||
|
||
private Member validateEnrolledMember(MemberLoginRequest request) { | ||
return memberRepository.findByEmail(Email.of(request.getEmail())) | ||
private Member checkEnrolledMember(MemberLoginRequest request) { | ||
return findByEmail(request.getEmail()) | ||
.filter(m -> m.isMatchPassword(request.getPassword())) | ||
.orElseThrow(() -> new IllegalArgumentException("로그인 정보가 올바르지 않습니다.")); | ||
.orElseThrow(() -> new MemberException(ERROR_ILLEGAL_LOGIN_MESSAGE)); | ||
} | ||
|
||
private Optional<Member> findByEmail(String email) { | ||
return memberRepository.findByEmail(Email.of(email)); | ||
} | ||
|
||
public void save(MemberSignUpRequest memberSignupRequest) { | ||
checkEnrolledEmail(memberSignupRequest.getEmail()); | ||
checkEnrolledNickName(memberSignupRequest.getNickName()); | ||
Member member = MemberAssembler.toEntity(memberSignupRequest); | ||
memberRepository.save(member); | ||
} | ||
|
||
private void checkEnrolledEmail(String email) { | ||
if (findByEmail(email).isPresent()) { | ||
throw new MemberException("이미 존재하는 이메일 입니다."); | ||
} | ||
} | ||
|
||
private void checkEnrolledNickName(String nickName) { | ||
if (findByNickName(nickName).isPresent()) { | ||
throw new MemberException("이미 존재하는 닉네임 입니다."); | ||
} | ||
} | ||
|
||
private Optional<Member> findByNickName(String nickName) { | ||
return memberRepository.findByNickName(NickName.of(nickName)); | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
src/main/java/com/woowacourse/zzazanstagram/model/member/exception/MemberException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.woowacourse.zzazanstagram.model.member.exception; | ||
|
||
public class MemberException extends IllegalArgumentException { | ||
public MemberException() { | ||
} | ||
|
||
public MemberException(String s) { | ||
super(s); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.