Release 3.6.2

.github/workflows/swagger-json.yml

@@ -0,0 +1,108 @@
+name: Sync Swagger to AMRIT-Docs
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  swagger-sync:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Checkout API repo
+        uses: actions/checkout@v4
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: maven
+
+      - name: Build API (skip tests)
+        run: mvn -B clean package -DskipTests
+
+      - name: Install jq
+        run: sudo apt-get update && sudo apt-get install -y jq
+
+      - name: Run API in swagger profile
+        run: |
+          nohup java -jar target/identity-api-*.war \
+            --spring.profiles.active=swagger \
+            --server.port=9090 \
+            > app.log 2>&1 &
+          echo $! > api_pid.txt
+
+      - name: Wait for API & fetch Swagger
+        run: |
+          for i in {1..40}; do
+            CODE=$(curl --connect-timeout 2 --max-time 5 -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true)
+
+            if [ "$CODE" = "200" ]; then
+              jq . swagger_raw.json > identity-api.json || {
+                echo "Swagger JSON invalid"
+                cat swagger_raw.json
+                exit 1
+              }
+
+              if [ "$(jq '.paths | length' identity-api.json)" -eq 0 ]; then
+                echo "Swagger paths empty – failing"
+                exit 1
+              fi
+
+              echo "Swagger generated successfully"
+              exit 0
+            fi
+
+            echo "Waiting for API... ($i)"
+            sleep 4
+          done
+
+          echo "Swagger not generated"
+          cat app.log || true
+          exit 1
+
+      - name: Stop API
+        if: always()
+        run: |
+            # Attempt graceful shutdown by PID
+            if [ -f api_pid.txt ]; then
+              PID=$(cat api_pid.txt)
+              kill -TERM "$PID" 2>/dev/null || true
+              sleep 2
+              kill -9 "$PID" 2>/dev/null || true
+            fi
+            # Fallback: kill whatever is listening on port 9090
+            fuser -k 9090/tcp 2>/dev/null || true
+            sleep 2
+            # Force-kill if still lingering
+            fuser -k -KILL 9090/tcp 2>/dev/null || true
+
+      - name: Checkout AMRIT-Docs
+        uses: actions/checkout@v4
+        with:
+          repository: PSMRI/AMRIT-Docs
+          token: ${{ secrets.DOCS_REPO_TOKEN }}
+          path: amrit-docs
+          fetch-depth: 0
+
+      - name: Copy Swagger JSON
+        run: |
+          mkdir -p amrit-docs/docs/swagger
+          cp identity-api.json amrit-docs/docs/swagger/identity-api.json
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v8
+        with:
+          token: ${{ secrets.DOCS_REPO_TOKEN }}
+          path: amrit-docs
+          branch: auto/swagger-update-identity-api
+          base: main
+          commit-message: "chore(docs): auto-update identity-api swagger"
+          title: "chore(docs): auto-update identity-api swagger"
+          delete-branch: true
+          body: |
+            This PR automatically updates identity-api Swagger JSON
+            from the latest main branch build.

README.md

@@ -1,5 +1,5 @@
 # AMRIT - Identity Service 
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)  ![branch parameter](https://github.com/PSMRI/Identity-API/actions/workflows/sast-and-package.yml/badge.svg)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)  [![DeepWiki](https://img.shields.io/badge/DeepWiki-PSMRI%2FIdentity--API-blue)](https://deepwiki.com/PSMRI/Identity-API)
 
 Identity API is a microservice which is used for the creation and management of beneficaries.
 

pom.xml

@@ -250,6 +250,17 @@
 			<version>0.12.6</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- Elasticsearch client for health check -->
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-client</artifactId>
+			<version>8.10.0</version>
+		</dependency>
 		<!--END NEW DEPENDENCIES ADDED-->
 	</dependencies>
 	<profiles>
@@ -291,31 +302,29 @@
 				<version>3.3.0</version>
 			</plugin>
 			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>4.9.10</version>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
+				<version>9.0.2</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>false</skip>
-						<always>false</always>
-						<dirty>-dirty</dirty>
-					</gitDescribe>
+					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+					<includeOnlyProperties>
+						<property>^git.branch$</property>
+						<property>^git.commit.id.abbrev$</property>
+						<property>^git.build.version$</property>
+						<property>^git.build.time$</property>
+					</includeOnlyProperties>
+					<failOnNoGitDirectory>false</failOnNoGitDirectory>
+					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 				</configuration>
 			</plugin>
 

src/main/java/com/iemr/common/identity/config/SwaggerConfig.java

@@ -23,6 +23,7 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -32,14 +33,23 @@
 
 
 @Configuration
-public class SwaggerConfig
-{
-	@Bean
-    public OpenAPI customOpenAPI() {
-        return new OpenAPI().info(new 
-             Info().title("Identity API").version("version").description("A microservice for the creation and management of beneficiaries."))
-                .addSecurityItem(new SecurityRequirement().addList("my security"))
-                .components(new Components().addSecuritySchemes("my security",
-                        new SecurityScheme().name("my security").type(SecurityScheme.Type.HTTP).scheme("bearer")));
+public class SwaggerConfig {
+    private static final String DEFAULT_SERVER_URL = "http://localhost:9090";
+
+    @Bean
+    public OpenAPI customOpenAPI(Environment env) {
+        String devUrl = env.getProperty("api.dev.url", DEFAULT_SERVER_URL);
+        String uatUrl = env.getProperty("api.uat.url", DEFAULT_SERVER_URL);
+        String demoUrl = env.getProperty("api.demo.url", DEFAULT_SERVER_URL);
+        return new OpenAPI()
+            .info(new Info().title("Identity API").version("version").description("A microservice for the creation and management of beneficiaries."))
+            .addSecurityItem(new SecurityRequirement().addList("my security"))
+            .components(new Components().addSecuritySchemes("my security",
+                new SecurityScheme().name("my security").type(SecurityScheme.Type.HTTP).scheme("bearer")))
+            .servers(java.util.Arrays.asList(
+                new io.swagger.v3.oas.models.servers.Server().url(devUrl).description("Dev"),
+                new io.swagger.v3.oas.models.servers.Server().url(uatUrl).description("UAT"),
+                new io.swagger.v3.oas.models.servers.Server().url(demoUrl).description("Demo")
+            ));
     }
 }

src/main/java/com/iemr/common/identity/controller/health/HealthController.java

@@ -0,0 +1,90 @@
+/*
+* 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.common.identity.controller.health;
+
+import java.time.Instant;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import com.iemr.common.identity.service.health.HealthService;
+import com.iemr.common.identity.utils.JwtAuthenticationUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+
+@RestController
+@RequestMapping("/health")
+@Tag(name = "Health Check", description = "APIs for checking infrastructure health status")
+public class HealthController {
+
+    private static final Logger logger = LoggerFactory.getLogger(HealthController.class);
+
+    private final HealthService healthService;
+    private final JwtAuthenticationUtil jwtAuthenticationUtil;
+
+    public HealthController(HealthService healthService, JwtAuthenticationUtil jwtAuthenticationUtil) {
+        this.healthService = healthService;
+        this.jwtAuthenticationUtil = jwtAuthenticationUtil;
+    }
+    @GetMapping
+    @Operation(summary = "Check infrastructure health", 
+               description = "Returns the health status of MySQL, Redis, Elasticsearch, and other configured services")
+    @ApiResponses({
+        @ApiResponse(responseCode = "200", description = "Services are UP or DEGRADED (operational with warnings)"),
+        @ApiResponse(responseCode = "503", description = "One or more critical services are DOWN")
+    })
+    public ResponseEntity<Map<String, Object>> checkHealth() {
+        logger.info("Health check endpoint called");
+
+        try {
+            Map<String, Object> healthStatus = healthService.checkHealth();
+            String overallStatus = (String) healthStatus.get("status");
+
+            // Return 503 only if DOWN; 200 for both UP and DEGRADED (DEGRADED = operational with warnings)
+            HttpStatus httpStatus = "DOWN".equals(overallStatus) ? HttpStatus.SERVICE_UNAVAILABLE : HttpStatus.OK;
+
+            logger.debug("Health check completed with status: {}", overallStatus);
+            return new ResponseEntity<>(healthStatus, httpStatus);
+
+        } catch (Exception e) {
+            logger.error("Unexpected error during health check", e);
+
+            // Return sanitized error response
+            Map<String, Object> errorResponse = Map.of(
+                "status", "DOWN",
+                "timestamp", Instant.now().toString()
+            );
+
+            return new ResponseEntity<>(errorResponse, HttpStatus.SERVICE_UNAVAILABLE);
+        }
+    }
+}