회원가입 로직 개선

Daemawiki · Feb 18, 2024 · 3ef3473 · 3ef3473
1 parent 23a278b
commit 3ef3473
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/main/java/com/example/daemawiki/domain/auth/service/Signup.java b/src/main/java/com/example/daemawiki/domain/auth/service/Signup.java
@@ -51,7 +51,8 @@ public Mono<Void> execute(SignupRequest request) {
 
                                 return Mono.fromCallable(() -> passwordEncoder.encode(request.password()))
                                         .subscribeOn(scheduler)
-                                        .map(password -> User.builder()
+                                        .flatMap(password -> {
+                                            User user = User.builder()
                                                     .name(request.name())
                                                     .email(request.email())
                                                     .password(password)
@@ -60,13 +61,15 @@ public Mono<Void> execute(SignupRequest request) {
                                                             .gen(request.gen())
                                                             .major(getMajorType.execute(request.major()))
                                                             .build())
-                                                    .build())
-                                        .flatMap(userRepository::save)
-                                        .flatMap(user -> createDocumentByUser.execute(user)
-                                                .flatMap(document -> {
-                                                    user.setDocumentId(document.getId());
-                                                    return userRepository.save(user);
-                                                }));
+                                                    .build();
+
+                                            return userRepository.save(user)
+                                                    .flatMap(savedUser -> createDocumentByUser.execute(savedUser)
+                                                            .flatMap(document -> {
+                                                                savedUser.setDocumentId(document.getId());
+                                                                return userRepository.save(savedUser);
+                                                            }));
+                                        });
                             }))).then();
     }