Merge pull request #32 from chinmoy12c/enhancement/change_health_schema

Changed health endpoint response schema.
samagra-comms · Apr 18, 2023 · d61cdd2 · d61cdd2
2 parents e83d552 + 888f2af
commit d61cdd2
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 37 deletions.
diff --git a/src/main/java/com/uci/orchestrator/Health/HealthController.java b/src/main/java/com/uci/orchestrator/Health/HealthController.java
@@ -1,12 +1,14 @@
 package com.uci.orchestrator.Health;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.uci.dao.service.HealthService;
 import com.uci.utils.model.ApiResponse;
 import com.uci.utils.model.ApiResponseParams;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.health.Status;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,9 +27,17 @@ public Mono<ResponseEntity<ApiResponse>> statusCheck() {
 		return healthService.getAllHealthNode().map(health -> ApiResponse.builder()
 				.id("api.health")
 				.params(ApiResponseParams.builder().build())
-				.responseCode(HttpStatus.OK.name())
 				.result(health)
 				.build()
-		).map(ResponseEntity::ok);
+		).map(response -> {
+			if (((JsonNode)response.result).get("status").textValue().equals(Status.UP.getCode())) {
+				response.responseCode = HttpStatus.OK.name();
+				return new ResponseEntity<>(response, HttpStatus.OK);
+			}
+			else {
+				response.responseCode = HttpStatus.SERVICE_UNAVAILABLE.name();
+				return new ResponseEntity<>(response, HttpStatus.SERVICE_UNAVAILABLE);
+			}
+		});
     }
 }
diff --git a/src/main/java/com/uci/orchestrator/Health/ServiceStatusController.java b/src/main/java/com/uci/orchestrator/Health/ServiceStatusController.java
@@ -1,25 +1,17 @@
 package com.uci.orchestrator.Health;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.uci.dao.service.HealthService;
 import com.uci.utils.model.ApiResponse;
 import com.uci.utils.model.ApiResponseParams;
-import com.uci.utils.telemetry.LogTelemetryBuilder;
-import com.uci.utils.telemetry.TelemetryLogger;
 
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.IOException;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.health.Status;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,23 +27,28 @@ public class ServiceStatusController {
 	private HealthService healthService;
 
     /**
-     * In use by sunbird team - to check service liveliness & readliness
-     * @return
-     * @throws JsonProcessingException
-     */
+	 * In use by sunbird team - to check service liveliness & readliness
+	 *
+	 * @return
+	 * @throws JsonProcessingException
+	 */
     @RequestMapping(value = "/health", method = RequestMethod.GET, produces = { "application/json", "text/json" })
-    public ResponseEntity<ApiResponse> statusCheck() throws JsonProcessingException {
-        ObjectMapper mapper = new ObjectMapper();
-        JsonNode resultNode = mapper.readTree("{\"healthy\":true}");
-
-        ApiResponse response = ApiResponse.builder()
-                .id("api.service.health.cassandra")
-                .params(ApiResponseParams.builder().build())
-                .responseCode(HttpStatus.OK.name())
-                .result(resultNode)
-                .build();
-
-        return ResponseEntity.ok(response);
+    public Mono<ResponseEntity<ApiResponse>> statusCheck() throws JsonProcessingException {
+		return healthService.getAllHealthNode().map(health -> ApiResponse.builder()
+				.id("api.health")
+				.params(ApiResponseParams.builder().build())
+				.result(health)
+				.build()
+		).map(response -> {
+			if (((JsonNode)response.result).get("status").textValue().equals(Status.UP.getCode())) {
+				response.responseCode = HttpStatus.OK.name();
+				return new ResponseEntity<>(response, HttpStatus.OK);
+			}
+			else {
+				response.responseCode = HttpStatus.SERVICE_UNAVAILABLE.name();
+				return new ResponseEntity<>(response, HttpStatus.SERVICE_UNAVAILABLE);
+			}
+		});
     }
 
     @RequestMapping(value = "/health/cassandra", method = RequestMethod.GET, produces = { "application/json", "text/json" })
@@ -60,10 +57,18 @@ public Mono<ResponseEntity<ApiResponse>> cassandraStatusCheck() {
 				ApiResponse.builder()
 				.id("api.service.health.cassandra")
 				.params(ApiResponseParams.builder().build())
-				.responseCode(HttpStatus.OK.name())
 				.result(result)
 				.build())
-				.map(ResponseEntity::ok);
+				.map(response -> {
+					if (((JsonNode)response.result).get("status").textValue().equals(Status.UP.getCode())) {
+						response.responseCode = HttpStatus.OK.name();
+						return new ResponseEntity<>(response, HttpStatus.OK);
+					}
+					else {
+						response.responseCode = HttpStatus.SERVICE_UNAVAILABLE.name();
+						return new ResponseEntity<>(response, HttpStatus.SERVICE_UNAVAILABLE);
+					}
+				});
     }
 
     @RequestMapping(value = "/health/kafka", method = RequestMethod.GET, produces = { "application/json", "text/json" })
@@ -72,20 +77,36 @@ public Mono<ResponseEntity<ApiResponse>> kafkaStatusCheck() {
 				ApiResponse.builder()
 				.id("api.service.health.kafka")
 				.params(ApiResponseParams.builder().build())
-				.responseCode(HttpStatus.OK.name())
 				.result(result)
 				.build())
-				.map(ResponseEntity::ok);
+				.map(response -> {
+					if (((JsonNode)response.result).get("status").textValue().equals(Status.UP.getCode())) {
+						response.responseCode = HttpStatus.OK.name();
+						return new ResponseEntity<>(response, HttpStatus.OK);
+					}
+					else {
+						response.responseCode = HttpStatus.SERVICE_UNAVAILABLE.name();
+						return new ResponseEntity<>(response, HttpStatus.SERVICE_UNAVAILABLE);
+					}
+				});
     }
 
     @RequestMapping(value = "/health/campaign", method = RequestMethod.GET, produces = { "application/json", "text/json" })
     public Mono<ResponseEntity<ApiResponse>> campaignUrlStatusCheck() {
 		return healthService.getCampaignUrlHealthNode().map(result ->
 				ApiResponse.builder().id("api.service.health.campaign")
 				.params(ApiResponseParams.builder().build())
-				.responseCode(HttpStatus.OK.name())
 				.result(result)
 				.build())
-				.map(ResponseEntity::ok);
+				.map(response -> {
+					if (((JsonNode)response.result).get("status").textValue().equals(Status.UP.getCode())) {
+						response.responseCode = HttpStatus.OK.name();
+						return new ResponseEntity<>(response, HttpStatus.OK);
+					}
+					else {
+						response.responseCode = HttpStatus.SERVICE_UNAVAILABLE.name();
+						return new ResponseEntity<>(response, HttpStatus.SERVICE_UNAVAILABLE);
+					}
+				});
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -6,10 +6,7 @@ spring.kafka.consumer.auto-offset-reset=earliest
 spring.kafka.bootstrap-servers=${BOOTSTRAP_SERVERS}
 spring.kafka.properties.schema.registry.url=${REGISTRY_URL}
 campaign=${KAFKA_CAMPAIGN_TOPIC}
-inboundUnprocessed=${KAFKA_INBOUND_UNPROCESSED_TOPIC}
 inboundProcessed=${KAFKA_INBOUND_PROCESSED_TOPIC}
-gupshup-opted-out=${KAFKA_INBOUND_GS_OPTED_OUT_TOPIC}
-inbound-error=${KAFKA_INBOUND_ERROR_TOPIC}
 odk-transformer=${KAFKA_ODK_TRANSFORMER_TOPIC}
 kafka.logs.topic = logs
 broadcast-transformer=${KAFKA_BROADCAST_TRANSFORMER_TOPIC:#{"broadcast-transformer"}}
@@ -25,7 +22,7 @@ outbound=${KAFKA_OUTBOUND_TOPIC}
 cassandra.contactpoints=${CASSANDRA_URL}
 cassandra.port=${CASSANDRA_PORT}
 keyspace-name=${CASSANDRA_KEYSPACE}
-// Count of cassandra migrations run till now
+# Count of cassandra migrations run till now
 cassandra.migration.count=${CASSANDRA_MIGRATION_COUNT}
 
 spring.data.cassandra.local-datacenter=datacenter1