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: LoginController, LoginService를 Member관련 클래스에서 분리
- Loading branch information
Showing
6 changed files
with
84 additions
and
27 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
src/main/java/com/woowacourse/zzazanstagram/model/member/LoginController.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,30 @@ | ||
package com.woowacourse.zzazanstagram.model.member; | ||
|
||
import org.springframework.stereotype.Controller; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PostMapping; | ||
|
||
import javax.servlet.http.HttpSession; | ||
|
||
import static com.woowacourse.zzazanstagram.util.SessionKeys.MEMBER; | ||
|
||
@Controller | ||
public class LoginController { | ||
private final LoginService loginService; | ||
|
||
public LoginController(LoginService loginService) { | ||
this.loginService = loginService; | ||
} | ||
|
||
@GetMapping("/login") | ||
public String loginForm() { | ||
return "login"; | ||
} | ||
|
||
@PostMapping("/login") | ||
public String login(MemberLoginRequest memberLoginRequest, HttpSession httpSession) { | ||
MemberResponse memberResponse = loginService.find(memberLoginRequest); | ||
httpSession.setAttribute(MEMBER, new MemberSession(memberResponse.getEmail())); | ||
return "redirect:/"; | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
src/main/java/com/woowacourse/zzazanstagram/model/member/LoginControllerAdvice.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 = LoginController.class) | ||
public class LoginControllerAdvice { | ||
private static final Logger log = LoggerFactory.getLogger(LoginControllerAdvice.class); | ||
private static final String TAG = "[LoginControllerAdvice]"; | ||
|
||
@ExceptionHandler(MemberException.class) | ||
public String handleIllegalUserParamsException(MemberException e) { | ||
log.error("{} MemberException >> {}", TAG, e.getMessage()); | ||
|
||
return "redirect:/login"; | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
src/main/java/com/woowacourse/zzazanstagram/model/member/LoginService.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,32 @@ | ||
package com.woowacourse.zzazanstagram.model.member; | ||
|
||
import com.woowacourse.zzazanstagram.model.member.exception.MemberException; | ||
import com.woowacourse.zzazanstagram.model.member.vo.Email; | ||
import org.springframework.stereotype.Service; | ||
|
||
import java.util.Optional; | ||
|
||
@Service | ||
public class LoginService { | ||
private static final String ERROR_ILLEGAL_LOGIN_MESSAGE = "로그인 정보가 올바르지 않습니다."; | ||
private final MemberRepository memberRepository; | ||
|
||
public LoginService(MemberRepository memberRepository) { | ||
this.memberRepository = memberRepository; | ||
} | ||
|
||
public MemberResponse find(MemberLoginRequest request) { | ||
Member member = checkEnrolledMember(request); | ||
return MemberAssembler.assemble(member); | ||
} | ||
|
||
private Member checkEnrolledMember(MemberLoginRequest request) { | ||
return findByEmail(request.getEmail()) | ||
.filter(m -> m.isMatchPassword(request.getPassword())) | ||
.orElseThrow(() -> new MemberException(ERROR_ILLEGAL_LOGIN_MESSAGE)); | ||
} | ||
|
||
private Optional<Member> findByEmail(String email) { | ||
return memberRepository.findByEmail(Email.of(email)); | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,7 +77,7 @@ class MemberControllerTest extends RequestTemplate { | |
.body(WebTestHelper.loginForm("[email protected]", | ||
"Password!1")) | ||
.exchange() | ||
.expectHeader().valueMatches("location", URL_REGEX + "/signup" + JSESSIONID_URL) | ||
.expectHeader().valueMatches("location", URL_REGEX + "/login" + JSESSIONID_URL) | ||
.expectStatus().is3xxRedirection(); | ||
} | ||
|
||
|
@@ -87,7 +87,7 @@ class MemberControllerTest extends RequestTemplate { | |
.body(WebTestHelper.loginForm("[email protected]", | ||
"Password@2")) | ||
.exchange() | ||
.expectHeader().valueMatches("location", URL_REGEX + "/signup" + JSESSIONID_URL) | ||
.expectHeader().valueMatches("location", URL_REGEX + "/login" + JSESSIONID_URL) | ||
.expectStatus().is3xxRedirection(); | ||
} | ||
} |