Skip to content

Commit e58dd37

Browse files
committed
✨ feat: 얼굴 타입 반환
1 parent e067126 commit e58dd37

4 files changed

Lines changed: 33 additions & 37 deletions

File tree

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.api.advanced_mobile.domain.member.service;
22

3+
import com.api.advanced_mobile.domain.member.web.dto.FaceRes;
34
import com.api.advanced_mobile.domain.member.web.dto.LoginReq;
45
import com.api.advanced_mobile.domain.member.web.dto.SignupReq;
5-
import com.api.advanced_mobile.domain.member.web.dto.SignupRes;
66
import jakarta.validation.Valid;
77

88
public interface MemberService {
9-
SignupRes signUp(@Valid SignupReq req);
9+
void signUp(@Valid SignupReq req);
1010

1111
void login(@Valid LoginReq req);
12+
13+
FaceRes getFace(Long id);
1214
}

src/main/java/com/api/advanced_mobile/domain/member/service/MemberServiceImpl.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
import com.api.advanced_mobile.domain.member.exception.InvalidPasswordException;
66
import com.api.advanced_mobile.domain.member.exception.NotFoundMemberException;
77
import com.api.advanced_mobile.domain.member.repository.MemberRepository;
8+
import com.api.advanced_mobile.domain.member.web.dto.FaceRes;
89
import com.api.advanced_mobile.domain.member.web.dto.LoginReq;
910
import com.api.advanced_mobile.domain.member.web.dto.SignupReq;
10-
import com.api.advanced_mobile.domain.member.web.dto.SignupRes;
1111
import lombok.RequiredArgsConstructor;
1212
import org.springframework.security.crypto.password.PasswordEncoder;
1313
import org.springframework.stereotype.Service;
1414

15-
import java.util.List;
16-
1715
import static com.api.advanced_mobile.domain.member.entity.Member.createMember;
1816

1917
@Service
@@ -25,7 +23,7 @@ public class MemberServiceImpl implements MemberService{
2523

2624
//회원가입
2725
@Override
28-
public SignupRes signUp(SignupReq req) {
26+
public void signUp(SignupReq req) {
2927
//아이디 중복 확인
3028
if(memberRepository.existsByMemberId(req.getMemberId())){
3129
throw new ExistMemberException();
@@ -35,14 +33,6 @@ public SignupRes signUp(SignupReq req) {
3533
Member member = createMember(hash, req);
3634
memberRepository.save(member);
3735

38-
List<String> troubles = req.getTrouble();
39-
40-
return new SignupRes(
41-
member.getId(),
42-
member.getSkinType(),
43-
member.getFaceType(),
44-
troubles
45-
);
4636
}
4737

4838
//로그인
@@ -56,4 +46,14 @@ public void login(LoginReq req) {
5646
}
5747
}
5848

49+
//얼굴 타입 반환
50+
@Override
51+
public FaceRes getFace(Long id) {
52+
Member member = memberRepository.findById(id)
53+
.orElseThrow(NotFoundMemberException::new);
54+
55+
return new FaceRes(member.getFaceType());
56+
}
57+
58+
5959
}
Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
package com.api.advanced_mobile.domain.member.web.controller;
22

33
import com.api.advanced_mobile.domain.member.service.MemberService;
4+
import com.api.advanced_mobile.domain.member.web.dto.FaceRes;
45
import com.api.advanced_mobile.domain.member.web.dto.LoginReq;
56
import com.api.advanced_mobile.domain.member.web.dto.SignupReq;
6-
import com.api.advanced_mobile.domain.member.web.dto.SignupRes;
77
import com.api.advanced_mobile.global.response.SuccessResponse;
88
import jakarta.validation.Valid;
99
import lombok.RequiredArgsConstructor;
1010
import org.springframework.http.HttpStatus;
1111
import org.springframework.http.ResponseEntity;
12-
import org.springframework.web.bind.annotation.PostMapping;
13-
import org.springframework.web.bind.annotation.RequestBody;
14-
import org.springframework.web.bind.annotation.RestController;
12+
import org.springframework.web.bind.annotation.*;
1513

1614
@RestController
1715
@RequiredArgsConstructor
@@ -24,9 +22,9 @@ public class MemberController {
2422
public ResponseEntity<SuccessResponse<?>> signup(
2523
@Valid @RequestBody SignupReq req ){
2624

27-
SignupRes res = memberService.signUp(req);
25+
memberService.signUp(req);
2826
return ResponseEntity.status(
29-
HttpStatus.CREATED).body(SuccessResponse.created(res));
27+
HttpStatus.CREATED).body(SuccessResponse.created("가입 완료"));
3028
}
3129

3230
//사용자 로그인
@@ -36,7 +34,19 @@ public ResponseEntity<SuccessResponse<?>> login(
3634

3735
memberService.login(req);
3836
return ResponseEntity.status(
39-
HttpStatus.OK).body(SuccessResponse.created(null));
37+
HttpStatus.OK).body(SuccessResponse.created("로그인 완료"));
38+
}
39+
40+
//얼굴 조회
41+
@GetMapping("/face/{id}")
42+
public ResponseEntity<SuccessResponse<?>> getFace(
43+
@PathVariable Long id){
44+
45+
FaceRes res = memberService.getFace(id);
46+
47+
return ResponseEntity.status(
48+
HttpStatus.OK).body(SuccessResponse.ok(res));
49+
4050
}
4151

4252
}

src/main/java/com/api/advanced_mobile/domain/survay/web/controller/SurvayContoller.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)