-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
227 additions
and
8 deletions.
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
src/main/java/com/cmc/suppin/member/controller/MemberApi.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,44 @@ | ||
package com.cmc.suppin.member.controller; | ||
|
||
import com.cmc.suppin.global.presentation.ApiResponse; | ||
import com.cmc.suppin.member.controller.dto.MemberRequestDTO; | ||
import com.cmc.suppin.member.controller.dto.MemberResponseDTO; | ||
import com.cmc.suppin.member.converter.MemberConverter; | ||
import com.cmc.suppin.member.domain.Member; | ||
import com.cmc.suppin.member.service.command.MemberCommandService; | ||
import io.swagger.v3.oas.annotations.Operation; | ||
import io.swagger.v3.oas.annotations.tags.Tag; | ||
import jakarta.validation.Valid; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.validation.annotation.Validated; | ||
import org.springframework.web.bind.annotation.*; | ||
|
||
@RestController | ||
@Slf4j | ||
@RequiredArgsConstructor | ||
@Validated | ||
@Tag(name = "Member", description = "Member 관련 API") | ||
@RequestMapping("/api/members") | ||
public class MemberApi { | ||
|
||
private final MemberCommandService memberCommandService; | ||
|
||
|
||
@PostMapping("/join") | ||
@Operation(summary = "회원가입 API", description = "request 파라미터 : id, password, name, phone, email") | ||
public ApiResponse<MemberResponseDTO.JoinResultDTO> join(@RequestBody @Valid MemberRequestDTO.JoinDTO request) { | ||
Member member = memberCommandService.join(request); | ||
|
||
return ApiResponse.onSuccess(MemberConverter.toJoinResultDTO(member)); | ||
|
||
} | ||
|
||
@GetMapping("/checkUserId") | ||
@Operation(summary = "아이디 중복 체크 API", description = "request : userId, response: 중복이면 false, 중복 아니면 true") | ||
public ApiResponse<MemberResponseDTO.IdConfirmResultDTO> checkUserId(@RequestBody MemberRequestDTO.IdConfirmDTO request) { | ||
boolean checkUserId = memberCommandService.confirmUserId(request); | ||
|
||
return ApiResponse.onSuccess(MemberConverter.toIdConfirmResultDTO(checkUserId)); | ||
} | ||
} |
42 changes: 42 additions & 0 deletions
42
src/main/java/com/cmc/suppin/member/controller/dto/MemberRequestDTO.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,42 @@ | ||
package com.cmc.suppin.member.controller.dto; | ||
|
||
import jakarta.persistence.Id; | ||
import jakarta.validation.constraints.Email; | ||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.Pattern; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
public class MemberRequestDTO { | ||
|
||
@Getter | ||
@NoArgsConstructor | ||
@AllArgsConstructor | ||
public static class JoinDTO { | ||
@NotBlank(message = "아이디를 입력해주세요") | ||
@Id | ||
private String userId; | ||
|
||
@NotBlank(message = "이름을 입력해주세요") | ||
private String name; | ||
|
||
@NotBlank(message = "비밀번호를 입력해주세요") | ||
@Pattern(regexp = "(?=.*[0-9])(?=.*[a-zA-Z])(?=.*\\W)(?=\\S+$).{8,16}", message = "비밀번호는 8~16자 영문, 숫자, 특수문자를 사용하세요.") | ||
private String password; | ||
|
||
@NotBlank(message = "이메일을 입력해주세요") | ||
@Email(message = "이메일 형식이 올바르지 않습니다.") | ||
private String email; | ||
|
||
@NotBlank(message = "휴대폰 번호를 입력해주세요") | ||
private String phone; | ||
} | ||
|
||
@Getter | ||
@NoArgsConstructor | ||
@AllArgsConstructor | ||
public static class IdConfirmDTO { | ||
private String userId; | ||
} | ||
} |
31 changes: 31 additions & 0 deletions
31
src/main/java/com/cmc/suppin/member/controller/dto/MemberResponseDTO.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,31 @@ | ||
package com.cmc.suppin.member.controller.dto; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
public class MemberResponseDTO { | ||
|
||
@Builder | ||
@Getter | ||
@NoArgsConstructor | ||
@AllArgsConstructor | ||
public static class JoinResultDTO { | ||
Long memberId; | ||
String userId; | ||
String name; | ||
String email; | ||
LocalDateTime createdAt; | ||
} | ||
|
||
@Builder | ||
@Getter | ||
@NoArgsConstructor | ||
@AllArgsConstructor | ||
public static class IdConfirmResultDTO { | ||
Boolean checkUserId; | ||
} | ||
} |
Empty file.
36 changes: 36 additions & 0 deletions
36
src/main/java/com/cmc/suppin/member/converter/MemberConverter.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,36 @@ | ||
package com.cmc.suppin.member.converter; | ||
|
||
import com.cmc.suppin.member.controller.dto.MemberRequestDTO; | ||
import com.cmc.suppin.member.controller.dto.MemberResponseDTO; | ||
import com.cmc.suppin.member.domain.Member; | ||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; | ||
|
||
public class MemberConverter { | ||
|
||
public Member toEntity(MemberRequestDTO.JoinDTO request, BCryptPasswordEncoder encoder) { | ||
return Member.builder() | ||
.userId(request.getUserId()) | ||
.name(request.getName()) | ||
.password(encoder.encode(request.getPassword())) | ||
.email(request.getEmail()) | ||
.phoneNumber(request.getPhone()) | ||
.build(); | ||
} | ||
|
||
public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member) { | ||
return MemberResponseDTO.JoinResultDTO.builder() | ||
.memberId(member.getId()) | ||
.userId(member.getUserId()) | ||
.name(member.getName()) | ||
.email(member.getEmail()) | ||
.createdAt(member.getCreatedAt()) | ||
.build(); | ||
} | ||
|
||
public static MemberResponseDTO.IdConfirmResultDTO toIdConfirmResultDTO(boolean checkUserId) { | ||
return MemberResponseDTO.IdConfirmResultDTO.builder() | ||
.checkUserId(checkUserId) | ||
.build(); | ||
} | ||
|
||
} |
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
Empty file.
11 changes: 11 additions & 0 deletions
11
src/main/java/com/cmc/suppin/member/service/command/MemberCommandService.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,11 @@ | ||
package com.cmc.suppin.member.service.command; | ||
|
||
import com.cmc.suppin.member.controller.dto.MemberRequestDTO; | ||
import com.cmc.suppin.member.domain.Member; | ||
|
||
public interface MemberCommandService { | ||
|
||
Member join(MemberRequestDTO.JoinDTO request); | ||
|
||
Boolean confirmUserId(MemberRequestDTO.IdConfirmDTO request); | ||
} |
50 changes: 50 additions & 0 deletions
50
src/main/java/com/cmc/suppin/member/service/command/MemberCommandServiceImpl.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,50 @@ | ||
package com.cmc.suppin.member.service.command; | ||
|
||
import com.cmc.suppin.member.controller.dto.MemberRequestDTO; | ||
import com.cmc.suppin.member.converter.MemberConverter; | ||
import com.cmc.suppin.member.domain.Member; | ||
import com.cmc.suppin.member.domain.repository.MemberRepository; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
@Service | ||
@Slf4j | ||
@RequiredArgsConstructor | ||
@Transactional | ||
public class MemberCommandServiceImpl implements MemberCommandService { | ||
|
||
private final MemberRepository memberRepository; | ||
private final BCryptPasswordEncoder bCryptPasswordEncoder; | ||
private final MemberConverter memberConverter; | ||
|
||
/** | ||
* 회원가입 | ||
*/ | ||
@Override | ||
public Member join(MemberRequestDTO.JoinDTO request) { | ||
// 중복된 아이디 체크 | ||
if (memberRepository.existsByUserId(request.getUserId())) { | ||
throw new IllegalArgumentException("이미 존재하는 유저입니다."); | ||
} | ||
|
||
// DTO를 Entity로 변환 | ||
Member member = memberConverter.toEntity(request, bCryptPasswordEncoder); | ||
|
||
// 회원 정보 저장 | ||
memberRepository.save(member); | ||
|
||
return member; | ||
} | ||
|
||
/** | ||
* ID 중복 확인 | ||
*/ | ||
@Override | ||
public Boolean confirmUserId(MemberRequestDTO.IdConfirmDTO request) { | ||
// 아이디 중복 체크 | ||
return !memberRepository.existsByUserId(request.getUserId()); | ||
} | ||
} |
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,4 +1,6 @@ | ||
spring: | ||
server: | ||
port: 8080 | ||
datasource: | ||
url: ${DB_URL} | ||
username: ${DB_USER} | ||
|