From 0d1ed8c65f422e5c0cd291c35dba67b1f2205997 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sat, 4 Sep 2021 17:35:53 +0200
Subject: [PATCH] query:1.0.2 - Fixed responses for availability edge-cases

* No invalid redirect, if the host-info ist not available
* 503 Service Temporarily Unavailable, while streams is not ready
---
 pom.xml                                                |  2 +-
 .../juplo/kafka/wordcount/query/QueryController.java   | 10 +++++++++-
 .../kafka/wordcount/query/QueryStreamProcessor.java    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2dd080b..56a2b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>de.juplo.kafka.wordcount</groupId>
 	<artifactId>query</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<name>Wordcount-Query</name>
 	<description>Query stream-processor of the multi-user wordcount-example</description>
 	<properties>
diff --git a/src/main/java/de/juplo/kafka/wordcount/query/QueryController.java b/src/main/java/de/juplo/kafka/wordcount/query/QueryController.java
index 0c7dc31..a9b5b80 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryController.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryController.java
@@ -1,6 +1,7 @@
 package de.juplo.kafka.wordcount.query;
 
 import lombok.RequiredArgsConstructor;
+import org.apache.kafka.streams.errors.InvalidStateStoreException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +31,13 @@ public class QueryController
               .build();
     }
 
-    return ResponseEntity.of(processor.getUserRanking(username));
+    try
+    {
+      return ResponseEntity.of(processor.getUserRanking(username));
+    }
+    catch (InvalidStateStoreException e)
+    {
+      return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).build();
+    }
   }
 }
diff --git a/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
index f7dc750..696e088 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
@@ -99,7 +99,7 @@ public class QueryStreamProcessor
 		HostInfo activeHost = metadata.activeHost();
 		log.debug("Local store for {}: {}, {}:{}", username, metadata.partition(), activeHost.host(), activeHost.port());
 
-		if (activeHost.equals(this.hostInfo))
+		if (activeHost.equals(this.hostInfo) || activeHost.equals(HostInfo.unavailable()))
 		{
 			return Optional.empty();
 		}
-- 
2.20.1