Implement /health and /version endpoints for Admin API

pom.xml

@@ -295,26 +295,25 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.4</version>
+				<version>4.9.10</version>
 				<executions>
 					<execution>
 						<id>get-the-git-infos</id>
 						<goals>
 							<goal>revision</goal>
 						</goals>
+						<phase>initialize</phase>
 					</execution>
 				</executions>
 				<configuration>
-					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-					<prefix>git</prefix>
-					<verbose>false</verbose>
 					<generateGitPropertiesFile>true</generateGitPropertiesFile>
-					<generateGitPropertiesFilename>
-						${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-					<format>json</format>
-					<gitDescribe>
-						<skip>true</skip>
-					</gitDescribe>
+					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+					<includeOnlyProperties>
+						<includeOnlyProperty>git.commit.id</includeOnlyProperty>
+						<includeOnlyProperty>git.build.time</includeOnlyProperty>
+					</includeOnlyProperties>
+					<commitIdGenerationMode>full</commitIdGenerationMode>
+					<format>properties</format>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -472,6 +471,12 @@
 							<goal>repackage</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>build-info</id>
+						<goals>
+							<goal>build-info</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
@@ -485,4 +490,4 @@
 			</plugin>
 		</plugins>
 	</reporting>
-</project>
+</project>

src/main/java/com/iemr/admin/config/SecurityFilterConfig.java

@@ -0,0 +1,33 @@
+package com.iemr.admin.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.iemr.admin.utils.JwtAuthenticationUtil;
+import com.iemr.admin.utils.JwtUserIdValidationFilter;
+
+@Configuration
+public class SecurityFilterConfig {
+
+    @Autowired
+    private JwtAuthenticationUtil jwtAuthenticationUtil;
+
+    @Value("${cors.allowed-origins}")
+    private String allowedOrigins;
+
+    @Bean
+    public FilterRegistrationBean<JwtUserIdValidationFilter> jwtFilterRegistration() {
+        FilterRegistrationBean<JwtUserIdValidationFilter> registration = new FilterRegistrationBean<>();
+        registration.setFilter(new JwtUserIdValidationFilter(jwtAuthenticationUtil, allowedOrigins));
+        registration.addUrlPatterns("/*");
+        registration.setOrder(1);
+
+        // Set name for easier debugging
+        registration.setName("JwtUserIdValidationFilter");
+
+        return registration;
+    }
+}

src/main/java/com/iemr/admin/controller/health/HealthController.java

@@ -0,0 +1,60 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.admin.controller.health;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iemr.admin.service.health.HealthService;
+
+import io.swagger.v3.oas.annotations.Operation;
+
+@RestController
+public class HealthController {
+
+    private static final Logger logger = LoggerFactory.getLogger(HealthController.class);
+
+    @Autowired
+    private HealthService healthService;
+
+    @Operation(summary = "Health check endpoint")
+    @GetMapping("/health")
+    public ResponseEntity<Map<String, Object>> health() {
+        logger.info("Health check endpoint called");
+
+        Map<String, Object> healthStatus = healthService.checkHealth();
+
+        // Return 503 if any service is down, 200 if all are up
+        String status = (String) healthStatus.get("status");
+        HttpStatus httpStatus = "UP".equals(status) ? HttpStatus.OK : HttpStatus.SERVICE_UNAVAILABLE;
+
+        logger.info("Health check completed with status: {}", status);
+        return ResponseEntity.status(httpStatus).body(healthStatus);
+    }
+}

src/main/java/com/iemr/admin/controller/version/VersionController.java

@@ -21,58 +21,33 @@
 */
 package com.iemr.admin.controller.version;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iemr.admin.utils.response.OutputResponse;
+import com.iemr.admin.service.version.VersionService;
 
 import io.swagger.v3.oas.annotations.Operation;
 
-
 @RestController
 public class VersionController {
 
-	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
-
-	@Operation(summary = "Version information")
-	@RequestMapping(value = "/version", method = { RequestMethod.GET })
-	public String versionInformation() {
-		OutputResponse output = new OutputResponse();
-		try {
-			logger.info("version Controller Start");
-			output.setResponse(readGitProperties());
-		} catch (Exception e) {
-			output.setError(e);
-		}
-
-		logger.info("version Controller End");
-		return output.toString();
-	}
-
-	private String readGitProperties() throws Exception {
-		ClassLoader classLoader = getClass().getClassLoader();
-		InputStream inputStream = classLoader.getResourceAsStream("git.properties");
+    private static final Logger logger = LoggerFactory.getLogger(VersionController.class);
 
-		return readFromInputStream(inputStream);
-	}
+    @Autowired
+    private VersionService versionService;
 
-	private String readFromInputStream(InputStream inputStream) throws IOException {
-		StringBuilder resultStringBuilder = new StringBuilder();
-		try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {
-			String line;
-			while ((line = br.readLine()) != null) {
-				resultStringBuilder.append(line).append("\n");
-			}
-		}
-		return resultStringBuilder.toString();
-	}
+    @Operation(summary = "Version information")
+    @GetMapping(value = "/version", produces = MediaType.APPLICATION_JSON_VALUE)
+    public Map<String, String> versionInformation() {
+        logger.info("version Controller Start");
+        Map<String, String> versionInfo = versionService.getVersionInfo();
+        logger.info("version Controller End");
+        return versionInfo;
+    }
 }

src/main/java/com/iemr/admin/service/health/HealthService.java

@@ -0,0 +1,119 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.admin.service.health;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class HealthService {
+
+    private static final Logger logger = LoggerFactory.getLogger(HealthService.class);
+    private static final String DB_HEALTH_CHECK_QUERY = "SELECT 1 as health_check";
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired(required = false)
+    private RedisTemplate<String, Object> redisTemplate;
+
+    public Map<String, Object> checkHealth() {
+        Map<String, Object> healthStatus = new HashMap<>();
+        boolean overallHealth = true;
+
+        // Check database connectivity (details logged internally, not exposed)
+        boolean dbHealthy = checkDatabaseHealthInternal();
+        if (!dbHealthy) {
+            overallHealth = false;
+        }
+
+        // Check Redis connectivity if configured (details logged internally)
+        if (redisTemplate != null) {
+            boolean redisHealthy = checkRedisHealthInternal();
+            if (!redisHealthy) {
+                overallHealth = false;
+            }
+        }
+
+        healthStatus.put("status", overallHealth ? "UP" : "DOWN");
+
+        logger.info("Health check completed - Overall status: {}", overallHealth ? "UP" : "DOWN");
+        return healthStatus;
+    }
+
+    private boolean checkDatabaseHealthInternal() {
+        long startTime = System.currentTimeMillis();
+
+        try (Connection connection = dataSource.getConnection()) {
+            boolean isConnectionValid = connection.isValid(2); // 2 second timeout per best practices
+
+            if (isConnectionValid) {
+                try (PreparedStatement stmt = connection.prepareStatement(DB_HEALTH_CHECK_QUERY)) {
+                    stmt.setQueryTimeout(3); // 3 second query timeout
+                    try (ResultSet rs = stmt.executeQuery()) {
+                        if (rs.next() && rs.getInt(1) == 1) {
+                            long responseTime = System.currentTimeMillis() - startTime;
+                            logger.debug("Database health check: UP ({}ms)", responseTime);
+                            return true;
+                        }
+                    }
+                }
+            }
+            logger.warn("Database health check: Connection not valid");
+            return false;
+        } catch (Exception e) {
+            logger.error("Database health check failed: {}", e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean checkRedisHealthInternal() {
+        long startTime = System.currentTimeMillis();
+
+        try {
+            String pong = redisTemplate.execute((RedisCallback<String>) connection -> connection.ping());
+
+            if ("PONG".equals(pong)) {
+                long responseTime = System.currentTimeMillis() - startTime;
+                logger.debug("Redis health check: UP ({}ms)", responseTime);
+                return true;
+            }
+            logger.warn("Redis health check: Ping returned unexpected response");
+            return false;
+        } catch (Exception e) {
+            logger.error("Redis health check failed: {}", e.getMessage());
+            return false;
+        }
+    }
+}