From e67a6aad6cf3148e8e2238d7a1a8cf50ecdeb9e6 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Mon, 19 Jan 2026 21:20:02 +0530 Subject: [PATCH 1/3] docs(readme): add documentation badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba44e2c..3b1a235 100644 --- a/README.md +++ b/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. From 86b1c39e8f65e976fb9e9c76afb42fcb6c8906ca Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Wed, 4 Feb 2026 18:54:17 +0530 Subject: [PATCH 2/3] chore(swagger): automate swagger sync to amrit-docs --- .github/workflows/swagger-json.yml | 89 +++++++++++++++++++ pom.xml | 5 ++ .../common/identity/utils/FilterConfig.java | 2 + .../resources/application-swagger.properties | 15 ++++ 4 files changed, 111 insertions(+) create mode 100644 .github/workflows/swagger-json.yml create mode 100644 src/main/resources/application-swagger.properties diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml new file mode 100644 index 0000000..818e90c --- /dev/null +++ b/.github/workflows/swagger-json.yml @@ -0,0 +1,89 @@ +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 clean package -DskipTests + + - name: Install jq + run: sudo apt-get update && sudo apt-get install -y jq + + - name: Run API in swagger profile + run: | + mvn spring-boot:run \ + -Dspring-boot.run.profiles=swagger \ + -Dspring-boot.run.arguments=--server.port=9090 \ + > app.log 2>&1 & + echo $! > api_pid.txt + + - name: Wait for API & fetch Swagger + run: | + for i in {1..30}; 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 + if jq . swagger_raw.json > identity-api.json; then + echo "Swagger generated successfully" + exit 0 + else + echo "Failed to parse swagger_raw.json with jq" + exit 1 + fi + fi + echo "Waiting for API... ($i)" + sleep 5 + done + + echo "Swagger not generated" + cat app.log || true + exit 1 + + - name: Stop API + if: always() + run: | + if [ -f api_pid.txt ]; then + kill $(cat api_pid.txt) || true + fi + + - name: Checkout AMRIT-Docs + uses: actions/checkout@v4 + with: + repository: PSMRI/AMRIT-Docs + token: ${{ secrets.DOCS_REPO_TOKEN }} + path: amrit-docs + + - 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@v6 + with: + token: ${{ secrets.DOCS_REPO_TOKEN }} + path: amrit-docs + branch: auto/swagger-update-${{ github.run_id }} + base: main + commit-message: Auto-update Identity-API swagger + title: Auto-update Identity-API swagger + body: | + This PR automatically updates the Identity-API JSON + from the latest main branch build. diff --git a/pom.xml b/pom.xml index 84eb159..5170d70 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,11 @@ 0.12.6 runtime + + com.h2database + h2 + runtime + diff --git a/src/main/java/com/iemr/common/identity/utils/FilterConfig.java b/src/main/java/com/iemr/common/identity/utils/FilterConfig.java index e13b8b4..bb05427 100644 --- a/src/main/java/com/iemr/common/identity/utils/FilterConfig.java +++ b/src/main/java/com/iemr/common/identity/utils/FilterConfig.java @@ -5,8 +5,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; +import org.springframework.context.annotation.Profile; @Configuration +@Profile("!swagger") public class FilterConfig { @Value("${cors.allowed-origins}") private String allowedOrigins; diff --git a/src/main/resources/application-swagger.properties b/src/main/resources/application-swagger.properties new file mode 100644 index 0000000..0b6945e --- /dev/null +++ b/src/main/resources/application-swagger.properties @@ -0,0 +1,15 @@ +spring.datasource.url=jdbc:h2:mem:swaggerdb +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=create-drop + +# Disable Redis if not needed for docs (optional) +spring.redis.host=localhost +spring.redis.port=6379 + +# CORS for Swagger UI +cors.allowed-origins=${CORS_ALLOWED_ORIGINS:http://localhost:9090,http://localhost:8080} + +jwt.secret=${JWT_SECRET_KEY:default-swagger-secret-change-me} +# Logging +logging.level.root=INFO From af077461dd046d649ceafcccefb62d845af2ef8b Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Wed, 4 Feb 2026 19:00:24 +0530 Subject: [PATCH 3/3] chore(swagger): automate swagger sync to amrit-docs --- .github/workflows/swagger-json.yml | 41 +++++++++++++++++++----------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml index 818e90c..03cef49 100644 --- a/.github/workflows/swagger-json.yml +++ b/.github/workflows/swagger-json.yml @@ -11,8 +11,10 @@ jobs: timeout-minutes: 20 steps: - - name: Checkout API repo + - name: Checkout API repo (full history) uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up Java 17 uses: actions/setup-java@v4 @@ -22,14 +24,14 @@ jobs: cache: maven - name: Build API (skip tests) - run: mvn clean package -DskipTests + 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: | - mvn spring-boot:run \ + nohup mvn spring-boot:run \ -Dspring-boot.run.profiles=swagger \ -Dspring-boot.run.arguments=--server.port=9090 \ > app.log 2>&1 & @@ -37,19 +39,27 @@ jobs: - name: Wait for API & fetch Swagger run: | - for i in {1..30}; do + 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 - if jq . swagger_raw.json > identity-api.json; then - echo "Swagger generated successfully" - exit 0 - else - echo "Failed to parse swagger_raw.json with jq" + 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 5 + sleep 4 done echo "Swagger not generated" @@ -60,7 +70,7 @@ jobs: if: always() run: | if [ -f api_pid.txt ]; then - kill $(cat api_pid.txt) || true + kill -9 $(cat api_pid.txt) || true fi - name: Checkout AMRIT-Docs @@ -69,6 +79,7 @@ jobs: repository: PSMRI/AMRIT-Docs token: ${{ secrets.DOCS_REPO_TOKEN }} path: amrit-docs + fetch-depth: 0 - name: Copy Swagger JSON run: | @@ -80,10 +91,10 @@ jobs: with: token: ${{ secrets.DOCS_REPO_TOKEN }} path: amrit-docs - branch: auto/swagger-update-${{ github.run_id }} + branch: auto/swagger-update-${{ github.run_id }}-${{ github.run_attempt }} base: main - commit-message: Auto-update Identity-API swagger - title: Auto-update Identity-API swagger + commit-message: "chore(docs): auto-update Identity-API swagger" + title: "chore(docs): auto-update Identity-API swagger" body: | - This PR automatically updates the Identity-API JSON + This PR automatically updates Identity-API Swagger JSON from the latest main branch build.