Skip to content

Commit

Permalink
feat: swagger 예시 데이터 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
dgjinsu committed Dec 1, 2023
1 parent d0c7023 commit e173df7
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ResponseEntity<Response> joinMember(@RequestBody JoinRequest request) {
@Operation(summary = "회원 가입: 아이디 중복 체크")
@PostMapping("/validation-phone")
public ResponseEntity<Response> validationPhone(@RequestBody ValidationUsernameRequest request) {
memberService.validationPhone(request);
memberService.validationPhone(request.getPhone());
return ResponseEntity.ok(new Response("사용 가능한 아이디 입니다."));
}

Expand Down
24 changes: 21 additions & 3 deletions src/main/java/jikgong/domain/member/dtos/JoinRequest.java
Original file line number Diff line number Diff line change
@@ -1,36 +1,54 @@
package jikgong.domain.member.dtos;

import io.swagger.v3.oas.annotations.media.Schema;
import jikgong.domain.member.entity.Gender;
import jikgong.domain.member.entity.Nationality;
import jikgong.domain.member.entity.Role;
import lombok.Getter;
import lombok.NoArgsConstructor;

@NoArgsConstructor
@Getter
public class JoinRequest {
@Schema(description = "휴대폰 번호", example = "01012345678")
private String phone;
@Schema(description = "인증 코드 6자리", example = "")
private String authCode; // 인증 코드
@Schema(description = "회원 타입 [ROLE_WORKER or ROLE_REGISTER]", example = "ROLE_WORKER")
private Role role; // 회원 타입
private String account; // 게좌번호
@Schema(description = "계좌 번호", example = "12341234123412")
private String account; // 게좌 번호
@Schema(description = "은행 종류", example = "국민은행")
private String bank; // 은행

// 위치 정보
@Schema(description = "도로명 주소", example = "부산광역시 사하구 낙동대로 550번길 37")
private String address; // 도로명 주소
@Schema(description = "위도", example = "35.116777388697734")
private Float latitude; // 위도
@Schema(description = "경도", example = "128.9685393114043")
private Float longitude; // 경도

// 회사 정보
@Schema(description = "사업자 번호", example = "00000000")
private String businessNumber; // 사업자 번호
@Schema(description = "지역", example = "서울")
private String region; // 지역
@Schema(description = "회사 명", example = "삼성")
private String companyName; // 회사 명
@Schema(description = "이메일", example = "[email protected]")
private String email; // 이메일
@Schema(description = "담당자 이름", example = "이재용")
private String manager; // 담당자 이름
@Schema(description = "문의 내용", example = "직공 서비스에 가입하고 싶습니다.")
private String requestContent; // 문의 내용

// 노동자 정보
@Schema(description = "노동자 이름", example = "홍길동")
private String workerName; // 노동자 이름
@Schema(description = "생년월일", example = "19750101")
private String rrnPrefix; // 생년월일
@Schema(description = "성별 [MALE or FEMAILE]", example = "MALE")
private Gender gender; // 성별
private Nationality nationality; // 국적
@Schema(description = "국적", example = "대한민국")
private String nationality; // 국적
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package jikgong.domain.member.dtos;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.NoArgsConstructor;

@NoArgsConstructor
@Getter
public class ValidationUsernameRequest {
private String username; // 아이디
@Schema(description = "휴대폰 번호", example = "01012345678")
private String phone; // 휴대폰 번호
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package jikgong.domain.member.dtos;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.NoArgsConstructor;

@NoArgsConstructor
@Getter
public class VerificationAccountRequest {
@Schema(description = "계좌 번호", example = "12341234123412")
private String account; // 계좌 번호
@Schema(description = "은행 종류", example = "국민은행")
private String bank; // 은행
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package jikgong.domain.member.dtos;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Getter;

@AllArgsConstructor
@Getter
public class VerificationAccountResponse {
@Schema(description = "인증 번호", example = "")
private String authCode; // 2자리 인증 코드
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package jikgong.domain.member.dtos;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.NoArgsConstructor;

@NoArgsConstructor
@Getter
public class VerificationSmsRequest {
@Schema(description = "휴대폰 번호", example = "01012345678")
private String phone; // 핸드폰 번호
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package jikgong.domain.member.dtos;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Getter;

@AllArgsConstructor
@Getter
public class VerificationSmsResponse {
@Schema(description = "6자리 인증 코드", example = "")
private String authCode; // 6자리 인증 코드
}
14 changes: 0 additions & 14 deletions src/main/java/jikgong/domain/member/entity/Nationality.java

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/jikgong/domain/member/entity/Worker.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ public class Worker {
@Enumerated(value = EnumType.STRING)
private Gender gender; // 성별
@Enumerated(value = EnumType.STRING)
private Nationality nationality; // 국적
private String nationality; // 국적

@Builder
public Worker(String workerName, String rrnPrefix, Gender gender, Nationality nationality) {
public Worker(String workerName, String rrnPrefix, Gender gender, String nationality) {
this.workerName = workerName;
this.rrnPrefix = rrnPrefix;
this.gender = gender;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class MemberService {
private final PasswordEncoder encoder;

public Long joinMember(JoinRequest request) {
validationPhone(request.getPhone());

Worker worker = null;
Company company = null;

Expand Down Expand Up @@ -77,8 +79,8 @@ public Long joinMember(JoinRequest request) {
return savedMember.getId();
}

public void validationPhone(ValidationUsernameRequest request) {
Optional<Member> member = memberRepository.findByPhone(request.getUsername());
public void validationPhone(String phone) {
Optional<Member> member = memberRepository.findByPhone(phone);
if (member.isPresent()) {
throw new CustomException(ErrorCode.MEMBER_PHONE_EXIST);
}
Expand Down

0 comments on commit e173df7

Please sign in to comment.