Profile fetch 시 항상 db 조회를 하던 문제를 수정함

gracefulife · gracefulife · commit 14413a119810 · 2018-05-29T19:52:30.000+09:00
switchIfEmpty 는 값을 평가한 후 동작하므로, 항상 함수가 실행됨 + Mono 는 empty 시 error 를 발생시키지 않으므로 , onnext,onerror 도 타지않는 짜증나는 문제가 있었음. 이를 single() 메소드를 통해 NoSuchElementException을 발생시키도록 함
diff --git a/profile/src/main/java/com/example/research/profile/config/RedisConfig.java b/profile/src/main/java/com/example/research/profile/config/RedisConfig.java
@@ -4,7 +4,6 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.ReactiveRedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
@@ -32,14 +31,8 @@ public LettuceConnectionFactory connectionFactoryForDev() {
   }
 
   @Bean
-  public ReactiveRedisTemplate<String, String> reactiveRedisTemplate(ReactiveRedisConnectionFactory connectionFactory) {
-    log.info("call reactiveRedisTemplate");
-    return new ReactiveRedisTemplate<>(connectionFactory, RedisSerializationContext.string());
-  }
-
-  @Bean
-  public ReactiveRedisTemplate<String, Profile> reactiveJsonPersonRedisTemplate(
-      ReactiveRedisConnectionFactory connectionFactory) {
+  public ReactiveRedisTemplate<String, Profile> reactiveJsonProfileRedisTemplate(
+      LettuceConnectionFactory connectionFactory) {
     log.info("call reactiveJsonPersonRedisTemplate");
     RedisSerializationContext<String, Profile> serializationContext = RedisSerializationContext
         .<String, Profile>newSerializationContext(new StringRedisSerializer())
diff --git a/profile/src/main/java/com/example/research/profile/entity/cache/Profile.java b/profile/src/main/java/com/example/research/profile/entity/cache/Profile.java
@@ -9,9 +9,13 @@
 import java.util.Set;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
+@ToString
+@EqualsAndHashCode
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/profile/src/main/java/com/example/research/profile/entity/cache/ProfileRepository.java b/profile/src/main/java/com/example/research/profile/entity/cache/ProfileRepository.java
@@ -22,12 +22,11 @@ public Flux<Profile> findAll() {
   }
 
   public Mono<Profile> findById(String id) {
-    return template.<String, Profile>opsForHash().get("profiles", id);
+    return template.<String, Profile>opsForHash().get("profiles", id).single();
   }
 
   public Mono<Profile> save(Profile profile) {
     return template.<String, Profile>opsForHash().put("profiles", profile.getId(), profile)
-        .log()
         .map(p -> profile);
 
   }
diff --git a/profile/src/main/java/com/example/research/profile/entity/event/Event.java b/profile/src/main/java/com/example/research/profile/entity/event/Event.java
@@ -3,5 +3,5 @@
 import java.io.Serializable;
 
 public interface Event extends Serializable {
-  String getId();
+  String getTag();
 }
diff --git a/profile/src/main/java/com/example/research/profile/entity/event/ProfileChangedEvent.java b/profile/src/main/java/com/example/research/profile/entity/event/ProfileChangedEvent.java
@@ -1,5 +1,7 @@
 package com.example.research.profile.entity.event;
 
+import com.example.research.profile.entity.storage.Profile;
+
 import java.time.LocalDateTime;
 
 import lombok.Getter;
@@ -10,12 +12,21 @@
 public class ProfileChangedEvent implements ProfileEvent {
   @Getter public static final String ID = ProfileChangedEvent.class.getSimpleName();
 
+  @NonNull String id;
   @NonNull String name;
   @NonNull Integer age;
   @NonNull String sex; // man, woman
   @NonNull LocalDateTime createdAt;
 
-  @Override public String getId() {
+  public static ProfileChangedEvent from(Profile storeProfile) {
+    return new ProfileChangedEvent(
+        storeProfile.getId(),
+        storeProfile.getName(), storeProfile.getAge(),
+        storeProfile.getSex(), storeProfile.getCreatedAt()
+    );
+  }
+
+  @Override public String getTag() {
     return ID;
   }
 }
diff --git a/profile/src/main/java/com/example/research/profile/entity/event/ProfileSavedEvent.java b/profile/src/main/java/com/example/research/profile/entity/event/ProfileSavedEvent.java
@@ -13,21 +13,23 @@
 @Getter
 @RequiredArgsConstructor
 public class ProfileSavedEvent implements ProfileEvent {
-  public static final String ID = ProfileSavedEvent.class.getSimpleName();
+  public static final String TAG = ProfileSavedEvent.class.getSimpleName();
 
+  @NonNull String id;
   @NonNull String name;
   @NonNull Integer age;
   @NonNull String sex; // man, woman
   @NonNull LocalDateTime createdAt;
 
   public static ProfileSavedEvent from(Profile storeProfile) {
     return new ProfileSavedEvent(
+        storeProfile.getId(),
         storeProfile.getName(), storeProfile.getAge(),
         storeProfile.getSex(), storeProfile.getCreatedAt()
     );
   }
 
-  @Override public String getId() {
-    return ID;
+  @Override public String getTag() {
+    return TAG;
   }
 }
diff --git a/profile/src/main/java/com/example/research/profile/v1/profile/ProfileEventListener.java b/profile/src/main/java/com/example/research/profile/v1/profile/ProfileEventListener.java
@@ -13,5 +13,6 @@ public class ProfileEventListener {
 
   @EventListener public void onProfileSavedEventReceived(ProfileSavedEvent event) {
     log.info("event received : {}" + event);
+
   }
 }
diff --git a/profile/src/main/java/com/example/research/profile/v1/profile/ProfileHandler.java b/profile/src/main/java/com/example/research/profile/v1/profile/ProfileHandler.java
@@ -19,7 +19,8 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.server.ServerResponse.ok;
 
 @Slf4j
 @Component
@@ -31,28 +32,27 @@ public class ProfileHandler {
 
   @NonNull
   public Mono<ServerResponse> fetchProfiles(ServerRequest request) {
-    // send Event
-    Flux<Profile> profiles = profileRepository.findAll()
-        .switchIfEmpty(
-            Flux.fromIterable(profileStorageRepository.findAll())
-                .map(Profile::from) // TODO send Event
-        );
-
-    return ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).body(profiles, Profile.class);
+    Flux<Profile> profiles = Flux.fromIterable(profileStorageRepository.findAll())
+        .flatMap(profile -> {
+          log.info("call switchIfEmpty");
+          return 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)
-        .switchIfEmpty(
-            Mono.just(
-                profileStorageRepository.findById(id)
-                    .orElseThrow(() -> new IllegalStateException("profile not found"))
-            )
-                .map(Profile::from) // TODO send Event
-        );
-    return ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).body(profile, Profile.class);
+        .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)));
+        });
+    return ok().contentType(MediaType.APPLICATION_JSON).body(profile, Profile.class);
   }
 
   @NonNull
diff --git a/profile/src/main/java/com/example/research/profile/v1/profile/ProfileRouter.java b/profile/src/main/java/com/example/research/profile/v1/profile/ProfileRouter.java
@@ -9,6 +9,7 @@
 
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
+import static org.springframework.web.reactive.function.server.RequestPredicates.PUT;
 import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
 
 @Configuration
@@ -19,6 +20,8 @@ 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)),
+            handler::update)
         .andRoute(GET("/api/v1/profiles/{id}").and(accept(MediaType.APPLICATION_JSON)),
             handler::fetch);
   }
diff --git a/profile/src/test/java/com/example/research/profile/entity/cache/test/ProfileRepositoryTests.java b/profile/src/test/java/com/example/research/profile/entity/cache/test/ProfileRepositoryTests.java
@@ -21,16 +21,19 @@
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 import javax.persistence.EntityManager;
 
 import reactor.test.StepVerifier;
 
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = TestApplicationContext.class)
@@ -52,6 +55,27 @@ public void setup() {
     connectionFactory.getConnection().flushDb();
   }
 
+  @Test public void 프로필_조회_레디스() {
+    final Profile generateProfile = generateProfile();
+
+    // GIVEN
+    StepVerifier.create(profileRepository.save(generateProfile))
+        .expectNextCount(1)
+        .verifyComplete();
+
+    StepVerifier.create(profileRepository.findById(generateProfile.getId()))
+        .expectNext(generateProfile)
+        .verifyComplete();
+
+    Iterable<Profile> profiles = profileRepository.findAll().toIterable();
+    Profile profile = StreamSupport.stream(profiles.spliterator(), false)
+        .filter(generateProfile::equals)
+        .findAny()
+        .orElseThrow(() -> new IllegalStateException("profile must not be null"));
+
+    assertThat(profile, is(generateProfile));
+  }
+
   @Test public void 프로필_조회() {
     final List<Tag> generatedTags = generateRandomTagData();
 
@@ -69,7 +93,7 @@ public void setup() {
     });
 
     // to redis
-    StepVerifier.create(profileRepository.save(generateProfile(generatedTags)))
+    StepVerifier.create(profileRepository.save(generateProfile()))
         .expectNextCount(1)
         .verifyComplete();
 
@@ -78,10 +102,11 @@ public void setup() {
         .verifyComplete();
   }
 
-  private static Profile generateProfile(List<Tag> tags) {
+  private static Profile generateProfile() {
     return new Profile(
-        RandomData.alphabetic(20),
-        tags.stream().map(Tag::getNo).collect(Collectors.toSet())
+        RandomData.alphabetic(20), RandomData.name(),
+        RandomData.randomInteger(10, 45), RandomData.randomBoolean() ? "man" : "woman",
+        RandomData.randomBoolean(), Collections.emptySet()
     );
   }
 
diff --git a/profile/src/test/java/com/example/research/profile/entity/router/ProfileRouterTests.java b/profile/src/test/java/com/example/research/profile/entity/router/ProfileRouterTests.java
@@ -22,7 +22,7 @@
 @RunWith(SpringRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SpringBootTest(classes = TestApplicationContext.class)
-public class UserApplicationTests {
+public class ProfileRouterTests {
   @Autowired ApplicationContext applicationContext;
 
   private WebTestClient webClient;
@@ -37,11 +37,7 @@ public void setup() {
 
   @Test
   public void a_프로필_생성() {
-    ProfileSaveRequest profileSaveRequest = new ProfileSaveRequest(
-        RandomData.randomString(),
-        RandomData.name(), RandomData.randomInteger(1, 80),
-        RandomData.randomBoolean() ? "man" : "woman"
-    );
+    ProfileSaveRequest profileSaveRequest = generate();
     assertNotNull(profileSaveRequest, "profile request must not be null !");
 
     webClient
@@ -63,4 +59,36 @@ public void setup() {
         .exchange()
         .expectStatus().isOk();
   }
+
+  @Test
+  public void c_프로필_업데이트() {
+    ProfileSaveRequest profileSaveRequest = generate();
+    webClient
+        .post()
+        .uri("/api/v1/profiles")
+        .contentType(MediaType.APPLICATION_JSON)
+        .accept(MediaType.APPLICATION_JSON)
+        .body(BodyInserters.fromObject(profileSaveRequest))
+        .exchange()
+        .expectStatus().isOk();
+
+    profileSaveRequest.setName(profileSaveRequest.getName().toUpperCase());
+
+    webClient
+        .put()
+        .uri("/api/v1/profiles/" + profileSaveRequest.getId())
+        .contentType(MediaType.APPLICATION_JSON)
+        .accept(MediaType.APPLICATION_JSON)
+        .body(BodyInserters.fromObject(profileSaveRequest))
+        .exchange()
+        .expectStatus().isOk();
+  }
+
+  private ProfileSaveRequest generate() {
+    return new ProfileSaveRequest(
+        RandomData.randomString(),
+        RandomData.name(), RandomData.randomInteger(1, 80),
+        RandomData.randomBoolean() ? "man" : "woman"
+    );
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,11 @@ public Flux<Profile> findAll() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public Mono<Profile> findById(String id) {`
`25`		`- return template.<String, Profile>opsForHash().get("profiles", id);`
	`25`	`+ return template.<String, Profile>opsForHash().get("profiles", id).single();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public Mono<Profile> save(Profile profile) {`
`29`	`29`	`return template.<String, Profile>opsForHash().put("profiles", profile.getId(), profile)`
`30`		`- .log()`
`31`	`30`	`.map(p -> profile);`
`32`	`31`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`import java.io.Serializable;`
`4`	`4`
`5`	`5`	`public interface Event extends Serializable {`
`6`		`- String getId();`
	`6`	`+ String getTag();`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ public class ProfileEventListener {`
`13`	`13`
`14`	`14`	`@EventListener public void onProfileSavedEventReceived(ProfileSavedEvent event) {`
`15`	`15`	`log.info("event received : {}" + event);`
	`16`	`+`
`16`	`17`	`}`
`17`	`18`	`}`