Use minimal health endpoint and introduce status endpoint

Author: d22

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ch.unisg.library.systemlibrarian</groupId>
   <artifactId>alma-job-runner</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>${packaging}</packaging>
 
   <parent>

src/main/java/ch/unisg/library/systemlibrarian/health/HealthController.java

@@ -30,6 +30,12 @@ public HealthController(
 
 	@Get(value = "/health", produces = MediaType.TEXT_PLAIN)
 	public HttpResponse<String> health() {
+		LOG.info("Health endpoint called, health OK");
+		return HttpResponse.ok("OK");
+	}
+
+	@Get(value = "/status", produces = MediaType.TEXT_PLAIN)
+	public HttpResponse<String> status() {
 		final List<String> issues = new ArrayList<>();
 		if (ResponseStatus.ERROR == almaApiHttpClient.apiHealthCheck().responseStatus()) {
 			issues.add("Alma API not available");

src/test/java/ch/unisg/library/systemlibrarian/health/HealthControllerTest.java

@@ -39,7 +39,14 @@ JobSchedulerService jobSchedulerService() {
 	}
 
 	@Test
-	void testHealthOk() {
+	void testHealth(){
+		HttpResponse<String> exchange = client.toBlocking().exchange(HttpRequest.GET("/health"), String.class);
+		Assertions.assertEquals(200, exchange.code());
+		Assertions.assertEquals("OK", exchange.body());
+	}
+
+	@Test
+	void testStatusOk() {
 		// mock Alma API, with response healthy
 		EmbeddedServer almaApiMockServer = ApplicationContext.run(
 				EmbeddedServer.class,
@@ -52,14 +59,14 @@ void testHealthOk() {
 		);
 		// mock non empty joblist
 		Mockito.when(jobSchedulerService.getScheduledJobs()).thenReturn(Set.of(Mockito.mock(JobConfig.class)));
-		HttpResponse<String> exchange = client.toBlocking().exchange(HttpRequest.GET("/health"), String.class);
+		HttpResponse<String> exchange = client.toBlocking().exchange(HttpRequest.GET("/status"), String.class);
 		Assertions.assertEquals(200, exchange.code());
 		Assertions.assertEquals("OK", exchange.body());
 		almaApiMockServer.close();
 	}
 
 	@Test
-	void testHealthAlmaApiNotAvailable() {
+	void testStatusAlmaApiNotAvailable() {
 		// mock Alma API, with unsuccessful response
 		EmbeddedServer almaApiMockServer = ApplicationContext.run(
 				EmbeddedServer.class,
@@ -73,7 +80,7 @@ void testHealthAlmaApiNotAvailable() {
 		// mock non empty joblist
 		Mockito.when(jobSchedulerService.getScheduledJobs()).thenReturn(Set.of(Mockito.mock(JobConfig.class)));
 		try {
-			client.toBlocking().exchange(HttpRequest.GET("/health"), String.class);
+			client.toBlocking().exchange(HttpRequest.GET("/status"), String.class);
 		} catch (HttpClientResponseException e) {
 			Assertions.assertEquals(500, e.getResponse().code());
 			Assertions.assertEquals("Alma API not available", e.getResponse().body());
@@ -82,7 +89,7 @@ void testHealthAlmaApiNotAvailable() {
 	}
 
 	@Test
-	void testHealthNoJobs() {
+	void testStatusNoJobs() {
 		// mock Alma API, with response healthy
 		EmbeddedServer almaApiMockServer = ApplicationContext.run(
 				EmbeddedServer.class,
@@ -96,7 +103,7 @@ void testHealthNoJobs() {
 		// mock empty joblist
 		Mockito.when(jobSchedulerService.getScheduledJobs()).thenReturn(Set.of());
 		try {
-			client.toBlocking().exchange(HttpRequest.GET("/health"), String.class);
+			client.toBlocking().exchange(HttpRequest.GET("/status"), String.class);
 		} catch (HttpClientResponseException e) {
 			Assertions.assertEquals(500, e.getResponse().code());
 			Assertions.assertEquals("No jobs registered", e.getResponse().body());