프로필 업데이트 처리

Author: gracefulife

profile/src/main/java/com/example/research/profile/v1/profile/ProfileHandler.java

@@ -2,6 +2,7 @@
 
 import com.example.research.profile.entity.cache.Profile;
 import com.example.research.profile.entity.cache.ProfileRepository;
+import com.example.research.profile.entity.event.ProfileChangedEvent;
 import com.example.research.profile.entity.event.ProfileSavedEvent;
 import com.example.research.profile.entity.storage.ProfileStorageRepository;
 
@@ -10,9 +11,11 @@
 import org.springframework.http.MediaType;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 
+import java.time.LocalDateTime;
 import java.util.function.Function;
 
 import lombok.extern.slf4j.Slf4j;
@@ -33,25 +36,19 @@ public class ProfileHandler {
   @NonNull
   public Mono<ServerResponse> fetchProfiles(ServerRequest request) {
     Flux<Profile> profiles = Flux.fromIterable(profileStorageRepository.findAll())
-        .flatMap(profile -> {
-          log.info("call switchIfEmpty");
-          return profileRepository.save(Profile.from(profile));
-        });
+        .flatMap(profile -> profileRepository.save(Profile.from(profile)));
     return ok().contentType(MediaType.APPLICATION_JSON).body(profiles, Profile.class);
   }
 
   @NonNull
   public Mono<ServerResponse> fetch(ServerRequest request) {
     String id = request.pathVariable("id");
     Mono<Profile> profile = profileRepository.findById(id)
-        .onErrorResume(throwable -> {
-          log.error("throwable : ", throwable);
-          return Mono.just(
-              profileStorageRepository.findById(id)
-                  .orElseThrow(() -> new IllegalStateException("profile not found"))
-          )
-              .flatMap(storedProfile -> profileRepository.save(Profile.from(storedProfile)));
-        });
+        .onErrorResume(throwable ->
+            Mono.just(profileStorageRepository.findById(id)
+                .orElseThrow(() -> new IllegalStateException("profile not found")))
+                .flatMap(storedProfile -> profileRepository.save(Profile.from(storedProfile)))
+        );
     return ok().contentType(MediaType.APPLICATION_JSON).body(profile, Profile.class);
   }
 
@@ -62,6 +59,7 @@ public Mono<ServerResponse> save(Mono<ProfileSaveRequest> request) {
 
     Function<com.example.research.profile.entity.storage.Profile, Mono<com.example.research.profile.entity.storage.Profile>>
         saveProfile = profile -> {
+      log.info("profile is {}", profile);
       com.example.research.profile.entity.storage.Profile storeProfile = profileStorageRepository.save(profile);
       applicationEventPublisher.publishEvent(ProfileSavedEvent.from(storeProfile));
       return Mono.just(storeProfile);
@@ -73,7 +71,29 @@ public Mono<ServerResponse> save(Mono<ProfileSaveRequest> request) {
     Mono<ProfileSaveResponse> save = request.flatMap(saveProfile.compose(mapToProfile))
         .map(mapToResponse); // FIXME throw 처리
 
-    return ServerResponse.ok()
-        .body(save, ProfileSaveResponse.class);
+    return ok().body(save, ProfileSaveResponse.class);
+  }
+
+  @NonNull
+  public Mono<ServerResponse> update(ServerRequest request) {
+    Mono<ProfileSaveRequest> profileSaveRequestMono = request.bodyToMono(ProfileSaveRequest.class);
+    com.example.research.profile.entity.storage.Profile existProfile = profileStorageRepository
+        .findById(request.pathVariable("id")).orElseThrow(IllegalStateException::new);
+
+    return profileSaveRequestMono.flatMap(requestProfile -> {
+      existProfile.setName(
+          StringUtils.isEmpty(requestProfile.getName()) ?
+              existProfile.getName() : requestProfile.getName()
+      );
+      existProfile.setAge(requestProfile.getAge() == null ? existProfile.getAge() : requestProfile.getAge());
+      existProfile.setSex(requestProfile.getSex() == null ? existProfile.getSex() : requestProfile.getSex());
+      existProfile.setUpdatedAt(LocalDateTime.now());
+      profileStorageRepository.save(existProfile);
+
+      applicationEventPublisher.publishEvent(ProfileChangedEvent.from(existProfile));
+
+      return ok().contentType(MediaType.APPLICATION_JSON).body(fromObject(existProfile))
+          .switchIfEmpty(ServerResponse.badRequest().build());
+    });
   }
 }

profile/src/main/java/com/example/research/profile/v1/profile/ProfileRouter.java

@@ -20,7 +20,7 @@ public class ProfileRouter {
             handler::fetchProfiles)
         .andRoute(POST("/api/v1/profiles").and(accept(MediaType.APPLICATION_JSON)),
             request -> handler.save(request.bodyToMono(ProfileSaveRequest.class)))
-        .andRoute(PUT("/api/v1/profiles").and(accept(MediaType.APPLICATION_JSON)),
+        .andRoute(PUT("/api/v1/profiles/{id}").and(accept(MediaType.APPLICATION_JSON)),
             handler::update)
         .andRoute(GET("/api/v1/profiles/{id}").and(accept(MediaType.APPLICATION_JSON)),
             handler::fetch);

profile/src/test/java/com/example/research/profile/entity/router/ProfileRouterTests.java

@@ -13,15 +13,19 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.BodyInserters;
 
+import java.util.UUID;
+
 import static org.hibernate.validator.internal.util.Contracts.assertNotNull;
 
 @RunWith(SpringRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SpringBootTest(classes = TestApplicationContext.class)
+@ActiveProfiles("test")
 public class ProfileRouterTests {
   @Autowired ApplicationContext applicationContext;
 
@@ -81,12 +85,14 @@ public void setup() {
         .accept(MediaType.APPLICATION_JSON)
         .body(BodyInserters.fromObject(profileSaveRequest))
         .exchange()
-        .expectStatus().isOk();
+        .expectStatus().isOk()
+        .expectBody()
+        .jsonPath("$.name").isEqualTo(profileSaveRequest.getName());
   }
 
   private ProfileSaveRequest generate() {
     return new ProfileSaveRequest(
-        RandomData.randomString(),
+        UUID.randomUUID().toString(),
         RandomData.name(), RandomData.randomInteger(1, 80),
         RandomData.randomBoolean() ? "man" : "woman"
     );