Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/tiki/server/member/Constants.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.tiki.server.member;

public class Constants {

public static final String PASSWORD_PATTERN = "^(?=.*[a-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-={}\\[\\]:;\"'<>?,./]).{8,}$";
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public enum ErrorCode {

/* 400 BAD REQUEST : 잘못된 요청 */
UNMATCHED_PASSWORD(BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
INVALID_PASSWORD(BAD_REQUEST, "잘못된 비밀번호 형식입니다."),
INVALID_EMAIL(BAD_REQUEST, "잘못된 이메일 형식입니다."),

/* 404 NOT_FOUND : 자원을 찾을 수 없음 */
Expand Down
23 changes: 17 additions & 6 deletions src/main/java/com/tiki/server/member/service/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

import lombok.RequiredArgsConstructor;

import java.util.regex.Pattern;

import static com.tiki.server.member.Constants.PASSWORD_PATTERN;
import static com.tiki.server.member.message.ErrorCode.*;

@Service
Expand All @@ -28,21 +31,23 @@ public class MemberService {
private final MemberTeamManagerFinder memberTeamManagerFinder;

@Transactional
public void signUp(MemberProfileCreateRequest request) {
public void signUp(final MemberProfileCreateRequest request) {
memberFinder.checkPresent(Email.from(request.email()));
checkPasswordFormat(request.password());
checkPassword(request.password(), request.passwordChecker());
Member member = createMember(request);
saveMember(member);
}

@Transactional
public void changePassword(PasswordChangeRequest request) {
public void changePassword(final PasswordChangeRequest request) {
Member member = memberFinder.checkEmpty(Email.from(request.email()));
checkPasswordFormat(request.password());
checkPassword(request.password(), request.passwordChecker());
member.resetPassword(passwordEncoder.encode(request.password()));
}

private Member createMember(MemberProfileCreateRequest request) {
private Member createMember(final MemberProfileCreateRequest request) {
return Member.of(
request.email(),
passwordEncoder.encode(request.password()),
Expand All @@ -51,17 +56,23 @@ private Member createMember(MemberProfileCreateRequest request) {
request.univ());
}

private void checkPassword(String password, String passwordChecker) {
private void checkPasswordFormat(final String password) {
if (!(password != null && !password.contains(" ") && Pattern.matches(PASSWORD_PATTERN, password))) {
throw new MemberException(INVALID_PASSWORD);
}
}

private void checkPassword(final String password, final String passwordChecker) {
if (!password.equals(passwordChecker)) {
throw new MemberException(UNMATCHED_PASSWORD);
}
}

private void saveMember(Member member) {
private void saveMember(final Member member) {
memberSaver.save(member);
}

public BelongTeamsGetResponse findBelongTeams(long memberId) {
public BelongTeamsGetResponse findBelongTeams(final long memberId) {
return BelongTeamsGetResponse.from(memberTeamManagerFinder.findBelongTeamByMemberId(memberId));
}
}
Loading