🚀 [Feature] - 유저 연관관계, 조회 및 디테일 설정 구현

src/main/java/com/tikitaka/naechinso/domain/member/MemberController.java

@@ -1,7 +1,9 @@
 package com.tikitaka.naechinso.domain.member;
 
 import com.tikitaka.naechinso.domain.member.dto.MemberCommonJoinRequestDto;
-import com.tikitaka.naechinso.domain.member.dto.MemberCommonJoinResponseDto;
+import com.tikitaka.naechinso.domain.member.dto.MemberCommonResponseDto;
+import com.tikitaka.naechinso.domain.member.dto.MemberDetailJoinRequestDto;
+import com.tikitaka.naechinso.domain.member.dto.MemberDetailResponseDto;
 import com.tikitaka.naechinso.domain.member.entity.Member;
 import com.tikitaka.naechinso.global.annotation.AuthMember;
 import com.tikitaka.naechinso.global.config.CommonApiResponse;
@@ -11,9 +13,11 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -24,22 +28,59 @@ public class MemberController {
     private final MemberService memberService;
 
     @GetMapping("/")
-    @ApiOperation(value = "유저 자신의 정보를 가져온다 (AccessToken 필요)")
-    public CommonApiResponse<MemberCommonJoinResponseDto> getMyInformation(HttpServletRequest request, @AuthMember Member member) {
+    @ApiOperation(value = "유저 자신의 모든 정보를 가져온다 (AccessToken 필요)")
+    public CommonApiResponse<MemberCommonResponseDto> getMyInformation(
+            HttpServletRequest request, @ApiIgnore @AuthMember Member member) {
+        //로그인 상태가 아닌 경우 401
         if (member == null) {
             throw new UnauthorizedException(ErrorCode.UNAUTHORIZED_USER);
         }
-        return CommonApiResponse.of(MemberCommonJoinResponseDto.of(member));
+        return CommonApiResponse.of(MemberCommonResponseDto.of(member));
     }
 
+    @PostMapping("/join")
+    @ApiOperation(value = "공통 유저를 기본 정보로 회원가입 시킨다")
+    public CommonApiResponse<MemberCommonResponseDto> joinCommonMember(
+            @Valid @RequestBody MemberCommonJoinRequestDto dto)
+    {
+        final MemberCommonResponseDto res = memberService.createCommonMember(dto);
+        return CommonApiResponse.of(res);
+    }
 
+    @GetMapping("/detail")
+    @ApiOperation(value = "회원가입 세부 정보를 가져온다 (AccessToken 필요)")
+    public CommonApiResponse<MemberDetailResponseDto> getMemberDetail(
+            @ApiIgnore @AuthMember Member member)
+    {
+        //로그인 상태가 아닌 경우 401
+        if (member == null) {
+            throw new UnauthorizedException(ErrorCode.UNAUTHORIZED_USER);
+        }
+        final MemberDetailResponseDto res = memberService.readDetail(member);
+        return CommonApiResponse.of(res);
+    }
 
-    @PostMapping("/join")
-    public CommonApiResponse<MemberCommonJoinResponseDto> joinCommonMember(@Valid @RequestBody MemberCommonJoinRequestDto dto) {
-        final MemberCommonJoinResponseDto res = memberService.joinCommonMember(dto);
+    @PostMapping("/detail")
+    @ApiOperation(value = "회원가입 세부 정보를 입력한다 (AccessToken 필요)")
+    public CommonApiResponse<MemberDetailResponseDto> setMemberDetail(
+            @Valid @RequestBody MemberDetailJoinRequestDto dto,
+            @ApiIgnore @AuthMember Member member)
+    {
+        //로그인 상태가 아닌 경우 401
+        if (member == null) {
+            throw new UnauthorizedException(ErrorCode.UNAUTHORIZED_USER);
+        }
+        final MemberDetailResponseDto res = memberService.createDetail(member, dto);
         return CommonApiResponse.of(res);
     }
 
+    //페이징 처리 추가할 예정
+    @GetMapping("/find")
+    @ApiOperation(value = "현재 가입한 모든 유저를 불러온다")
+    public CommonApiResponse<List<MemberCommonResponseDto>> getMyInformation() {
+        return CommonApiResponse.of(memberService.findAll());
+    }
+
 //    @PostMapping("/login")
 
 

src/main/java/com/tikitaka/naechinso/domain/member/MemberService.java

@@ -1,14 +1,18 @@
 package com.tikitaka.naechinso.domain.member;
 
 import com.tikitaka.naechinso.domain.member.dto.MemberCommonJoinRequestDto;
-import com.tikitaka.naechinso.domain.member.dto.MemberCommonJoinResponseDto;
+import com.tikitaka.naechinso.domain.member.dto.MemberCommonResponseDto;
+import com.tikitaka.naechinso.domain.member.dto.MemberDetailJoinRequestDto;
+import com.tikitaka.naechinso.domain.member.dto.MemberDetailResponseDto;
 import com.tikitaka.naechinso.domain.member.entity.Member;
+import com.tikitaka.naechinso.domain.member.entity.MemberDetail;
 import com.tikitaka.naechinso.global.common.response.TokenResponseDTO;
 import com.tikitaka.naechinso.global.config.security.MemberAdapter;
 import com.tikitaka.naechinso.global.config.security.dto.JwtDTO;
 import com.tikitaka.naechinso.global.config.security.jwt.JwtTokenProvider;
 import com.tikitaka.naechinso.global.error.ErrorCode;
 import com.tikitaka.naechinso.global.error.exception.BadRequestException;
+import com.tikitaka.naechinso.global.error.exception.NotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -17,8 +21,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -30,7 +36,14 @@ public class MemberService {
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
     private final JwtTokenProvider jwtTokenProvider;
 
-    public MemberCommonJoinResponseDto joinCommonMember(MemberCommonJoinRequestDto dto) {
+    public List<MemberCommonResponseDto> findAll() {
+        List<MemberCommonResponseDto> memberList = memberRepository.findAll().stream()
+                .map(member -> MemberCommonResponseDto.of(member)).collect(Collectors.toList());
+        return memberList;
+    }
+
+
+    public MemberCommonResponseDto createCommonMember(MemberCommonJoinRequestDto dto) {
 
         //이미 존재하는 유저일 경우 400
         Optional<Member> checkMember = memberRepository.findByPhone(dto.getPhone());
@@ -41,13 +54,12 @@ public MemberCommonJoinResponseDto joinCommonMember(MemberCommonJoinRequestDto d
         Member member = MemberCommonJoinRequestDto.toCommonMember(dto);
         memberRepository.save(member);
 
-        MemberCommonJoinResponseDto res = MemberCommonJoinResponseDto.of(member);
+        MemberCommonResponseDto res = MemberCommonResponseDto.of(member);
         return res;
     }
 
     public TokenResponseDTO login(String phone) {
 
-        System.out.println("phone = " + phone);
         Member checkMember = memberRepository.findByPhone(phone)
                 .orElseThrow(() -> new BadRequestException(ErrorCode.USER_NOT_FOUND));
 
@@ -63,6 +75,26 @@ public TokenResponseDTO login(String phone) {
         return tokenResponseDTO;
     }
 
+
+    public MemberDetailResponseDto readDetail(Member member) {
+//
+//        Member checkMember = memberRepository.findByPhone(phone)
+//                .orElseThrow(() -> new BadRequestException(ErrorCode.USER_NOT_FOUND));
+
+        MemberDetailResponseDto dto = MemberDetailResponseDto.of(member);
+
+        return dto;
+    }
+
+    public MemberDetailResponseDto createDetail(Member authMember, MemberDetailJoinRequestDto dto) {
+        //영속성 유지를 위한 fetch
+        Member member = memberRepository.findById(authMember.getId())
+                .orElseThrow(() -> new NotFoundException(ErrorCode.USER_NOT_FOUND));
+        MemberDetail detail = MemberDetail.of(member, dto);
+        memberDetailRepository.save(detail);
+        return MemberDetailResponseDto.of(detail);
+    }
+
 //
 //    public MemberCommonJoinResponseDto joinMemberWithDetail(MemberCommonJoinRequestDto dto) {
 //        //이미 존재하는 유저일 경우 400

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberCommonJoinRequestDto.java

@@ -3,8 +3,8 @@
 import com.tikitaka.naechinso.domain.member.constant.Gender;
 import com.tikitaka.naechinso.domain.member.entity.Member;
 import com.tikitaka.naechinso.global.annotation.Enum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.*;
 
@@ -18,16 +18,20 @@
 @Builder
 @ToString
 public class MemberCommonJoinRequestDto {
+    @ApiModelProperty(example = "01010001000")
     @NotBlank(message = "전화번호를 입력해주세요")
     @Pattern(regexp = "[0-9]{10,11}", message = "하이픈 없는 10~11자리 숫자를 입력해주세요")
     private String phone;
 
+    @ApiModelProperty(example = "닉")
     @NotBlank(message = "이름을 입력해주세요")
     private String name;
 
+    @ApiModelProperty(example = "M")
     @Enum(enumClass = Gender.class, message = "성별 입력이 올바르지 않습니다. M 또는 W가 필요합니다")
     private Gender gender;
 
+    @ApiModelProperty(example = "25")
     @Min(value = 25, message = "25-33세까지만 가입 가능합니다")
     @Max(value = 33, message = "25-33세까지만 가입 가능합니다")
     private int age;
@@ -50,12 +54,15 @@ public class MemberCommonJoinRequestDto {
     @NotNull(message = "마케팅 동의 여부가 필요합니다")
     private boolean acceptsMarketing;
 
+    @ApiModelProperty(example = "카카오")
     @NotBlank(message = "직장명을 입력해주세요")
     private String jobName;
 
+    @ApiModelProperty(example = "개발자")
     @NotBlank(message = "직장 부서를 입력해주세요")
     private String jobPart;
 
+    @ApiModelProperty(example = "판교")
     @NotBlank(message = "직장 위치를 입력해주세요")
     private String jobLocation;
 

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberCommonJoinResponseDto.java → src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberCommonResponseDto.java

@@ -4,11 +4,6 @@
 import com.tikitaka.naechinso.domain.member.entity.Member;
 import lombok.*;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 /**
  * 추천인 및 추천 받는 사람 공통 가입을 위한 Dto입니다
  * @author gengminy 220924
@@ -18,7 +13,7 @@
 @Getter
 @Builder
 @ToString
-public class MemberCommonJoinResponseDto {
+public class MemberCommonResponseDto {
     private String phone;
 
     private String name;
@@ -27,8 +22,8 @@ public class MemberCommonJoinResponseDto {
 
     private int age;
 
-    public static MemberCommonJoinResponseDto of(Member member) {
-        MemberCommonJoinResponseDto res = MemberCommonJoinResponseDto.builder()
+    public static MemberCommonResponseDto of(Member member) {
+        MemberCommonResponseDto res = MemberCommonResponseDto.builder()
                 .phone(member.getPhone())
                 .name(member.getName())
                 .gender(member.getGender())

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberDTO.java

@@ -0,0 +1,4 @@
+package com.tikitaka.naechinso.domain.member.dto;
+
+public class MemberDTO {
+}

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberDetailJoinRequestDto.java

@@ -2,8 +2,11 @@
 
 import com.tikitaka.naechinso.domain.member.constant.Gender;
 import com.tikitaka.naechinso.domain.member.entity.Member;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import org.hibernate.validator.constraints.Length;
 
+import javax.persistence.Column;
 import javax.validation.constraints.*;
 
 /**
@@ -16,61 +19,57 @@
 @Builder
 @ToString
 public class MemberDetailJoinRequestDto {
-    @NotBlank(message = "전화번호를 입력해주세요")
-    @Pattern(regexp = "[0-9]{10,11}", message = "하이픈 없는 10~11자리 숫자를 입력해주세요")
-    private String phone;
+    //추천인 정보
+    //
+    @ApiModelProperty(example = "180")
+    @Positive(message = "키는 양수여야 합니다")
+    private int height;
 
-    @NotBlank(message = "이름을 입력해주세요")
-    private String name;
+    @ApiModelProperty(example = "서울시 강남구")
+    @NotBlank(message = "주소 정보를 입력해야 합니다")
+    private String address;
 
-    @NotNull(message = "성별을 입력해주세요")
-    private Gender gender;
+    @NotBlank(message = "종교 정보를 입력해야 합니다")
+    private String religion;
 
-    @Min(value = 25, message = "25-33세까지만 가입 가능합니다")
-    @Max(value = 33, message = "25-33세까지만 가입 가능합니다")
-    private int age;
+    @NotBlank(message = "음주 정보를 입력해야 합니다")
+    private String drink;
 
-    @NotNull(message = "서비스 이용약관 동의가 필요합니다")
-    @AssertTrue(message = "서비스 이용약관 동의가 필요합니다")
-    private boolean acceptsService;
+    @NotBlank(message = "흡연 정보를 입력해야 합니다")
+    private String smoke;
 
-    @NotNull(message = "개인정보 이용 동의가 필요합니다")
-    @AssertTrue(message = "개인정보 이용 동의가 필요합니다")
-    private boolean acceptsInfo;
+    @ApiModelProperty(example = "ESTJ")
+    @Length(max = 4, message = "올바를 MBTI 정보를 입력하세요")
+    private String mbti = "";
 
-    @NotNull(message = "종교 정보 제공 동의가 필요합니다")
-    @AssertTrue(message = "종교 정보 제공 동의가 필요합니다")
-    private boolean acceptsReligion;
+    @NotBlank(message = "성격 정보를 입력해야 합니다")
+    private String personality;
 
-    @NotNull(message = "위치 정보 제공 동의 여부가 필요합니다")
-    private boolean acceptsLocation;
+    @NotBlank(message = "자기 소개를 입력해야 합니다")
+    private String introduce = "";
 
-    @NotNull(message = "마케팅 동의 여부가 필요합니다")
-    private boolean acceptsMarketing;
+    @NotBlank(message = "취미 정보를 입력해야 합니다")
+    private String hobby = "";
 
-    @NotBlank(message = "직장명을 입력해주세요")
-    private String jobName;
+    @NotBlank(message = "연애 스타일을 입력해야 합니다")
+    private String style = "";
 
-    @NotBlank(message = "직장 부서를 입력해주세요")
-    private String jobPart;
+    @NotBlank(message = "사진을 업로드해야 합니다")
+    private String picture;
+
+    @ApiModelProperty(example = "서울")
+    private String school;
+
+    @ApiModelProperty(example = "컴퓨터공학과")
+    private String major;
+
+    @ApiModelProperty(example = "대학교")
+    private String eduLevel;
 
-    @NotBlank(message = "직장 위치를 입력해주세요")
-    private String jobLocation;
 
     public static Member toCommonMember(MemberDetailJoinRequestDto dto) {
         Member member = Member.builder()
-                .phone(dto.phone)
-                .name(dto.name)
-                .gender(dto.gender)
-                .age(dto.age)
-                .acceptsService(dto.acceptsService)
-                .acceptsInfo(dto.acceptsInfo)
-                .acceptsReligion(dto.acceptsReligion)
-                .acceptsLocation(dto.acceptsLocation)
-                .acceptsMarketing(dto.acceptsMarketing)
-                .jobName(dto.jobName)
-                .jobPart(dto.jobPart)
-                .jobLocation(dto.jobLocation)
+
                 .build();
 
         return member;