merge: 멤버 이름 추가

Feature/#65 멤버 이름 추가
Unithon11th-Team5 · Apr 6, 2024 · 6976563 · 6976563
2 parents 437e56f + b3593f2
commit 6976563
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/src/main/java/unithon/team5/login/controller/LoginController.java b/src/main/java/unithon/team5/login/controller/LoginController.java
@@ -21,7 +21,7 @@ public class LoginController implements LoginControllerDocs {
     public ResponseEntity<JwtTokenResponse> registerToken(
             @Valid @RequestBody final LoginRequest loginRequest
     ) {
-        final var token = loginService.createToken(loginRequest.token(), loginRequest.email());
+        final var token = loginService.createToken(loginRequest);
         return ResponseEntity.ok(new JwtTokenResponse(token));
     }
 

diff --git a/src/main/java/unithon/team5/login/controller/LoginControllerDocs.java b/src/main/java/unithon/team5/login/controller/LoginControllerDocs.java
@@ -33,6 +33,7 @@ public interface LoginControllerDocs {
                                             {
                                             \t"token": "apple id toekn...",
                                             \t"email": "[email protected]"
+                                            \t"name": "다연"
                                             }""")
                             })))
     ResponseEntity<JwtTokenResponse> registerToken(@Valid @RequestBody final LoginRequest request);
@@ -44,6 +45,5 @@ public interface LoginControllerDocs {
     })
     @Operation(summary = "로그인한 사용자 정보 조회")
     ResponseEntity<LoginResponse> getLoginInfo(
-            @Parameter(hidden = true)
-            final Member member);
+            @Parameter(hidden = true) final Member member);
 }
diff --git a/src/main/java/unithon/team5/login/dto/LoginRequest.java b/src/main/java/unithon/team5/login/dto/LoginRequest.java
@@ -3,11 +3,17 @@
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotEmpty;
 
+import java.util.Optional;
+
 public record LoginRequest(
+        String name,
         @NotEmpty
         String token,
         @Email
         String email
 ) {
 
+    public Optional<String> getName() {
+        return Optional.ofNullable(name);
+    }
 }
diff --git a/src/main/java/unithon/team5/login/service/LoginService.java b/src/main/java/unithon/team5/login/service/LoginService.java
@@ -3,9 +3,11 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import unithon.team5.login.dto.LoginRequest;
 import unithon.team5.member.Member;
 import unithon.team5.member.repository.MemberRepository;
 
+import java.util.Optional;
 import java.util.UUID;
 
 @Service
@@ -16,22 +18,25 @@ public class LoginService {
     private final MemberRepository memberRepository;
 
     @Transactional
-    public String createToken(final String idToken, final String email) {
-        final String memberIdentifier = jwtProvider.decodeSub(idToken, email);
+    public String createToken(final LoginRequest loginRequest) {
+        final String memberIdentifier = jwtProvider.decodeSub(loginRequest.token(), loginRequest.email());
         final Member registeredMember = memberRepository.findByIdentifier(memberIdentifier)
-                .orElseGet(() -> registerMember(memberIdentifier, email));
+                .orElseGet(() -> registerMember(memberIdentifier, loginRequest.email(), loginRequest.getName()));
         final UUID id = registeredMember.getId();
         return jwtProvider.createAccessTokenWith(id);
     }
 
-    private Member registerMember(final String memberAppleIdentifier, final String email) {
+    private Member registerMember(final String memberAppleIdentifier, final String email, final Optional<String> name) {
         final String nickname = parseEmail(email);
         final String validateNickname = generateValidateNickname(nickname);
+        final String memberName = name.orElse(validateNickname);
 
         final Member member = Member.builder()
                 .nickname(validateNickname)
                 .identifier(memberAppleIdentifier)
+                .name(memberName)
                 .build();
+
         return memberRepository.save(member);
     }
 

diff --git a/src/main/java/unithon/team5/member/Member.java b/src/main/java/unithon/team5/member/Member.java
@@ -18,15 +18,17 @@ protected Member() {
         super(null);
     }
 
-    private Member(final UUID id, final String nickname, final String identifier) {
+    private Member(final UUID id, final String name, final String nickname, final String identifier) {
         super(id);
+        this.name = name;
         this.nickname = nickname;
         this.identifier = identifier;
     }
 
     @Builder
-    public Member(final String nickname, final String identifier) {
+    public Member(final String name, final String nickname, final String identifier) {
         super(null);
+        this.name = name;
         this.nickname = nickname;
         this.identifier = identifier;
     }
@@ -36,7 +38,9 @@ public Member(final String nickname, final String identifier) {
 
     private String identifier;
 
-    public static Member create(final String nickname, final String identifier) {
-        return new Member(null, nickname, identifier);
+    private String name;
+
+    public static Member create(final String name, final String nickname, final String identifier) {
+        return new Member(null, name, nickname, identifier);
     }
 }