Merge remote-tracking branch 'upstream/develop' into enhancement

# Conflicts:
#	src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java

Author: SauravBizbRolly

.github/workflows/build-on-pull-request.yml

@@ -2,7 +2,7 @@ name: Build On Pull Request
 on:
   pull_request:
     branches: [ "master","develop" ]
-    
+
 jobs:
   Build:
     runs-on: ubuntu-latest
@@ -14,9 +14,9 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: 17
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Build with Maven  
         run: mvn clean install

.github/workflows/package.yml

@@ -5,35 +5,35 @@ on:
     branches: [ "develop"]
     paths-ignore:
      - target/**
-     
+
   pull_request:
      branches: [ "develop" ]
      paths-ignore:
      - target/**
-     
+
 env:
   ENV_VAR: test
 
 jobs:
   Package-test:
     runs-on: ubuntu-latest
     steps:
-    
+
     - name: Checkout code 
-      uses: actions/checkout@v2
-      
+      uses: actions/checkout@v3
+
     - name: Setup JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: 17
-        distribution: 'adopt'
-        
+        distribution: 'temurin'
+
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
-      
+
     - name: Build WAR file
       run: mvn -B package --file pom.xml
-      
+
     - name: Upload WAR file as artifact
       uses: actions/upload-artifact@v4
       with:

.github/workflows/sast.yml

@@ -5,7 +5,7 @@ on:
     branches: [ "develop" ]
     paths-ignore:
      - target/**
-     
+
   pull_request:
     branches: [ "develop" ]
     paths-ignore:
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'java' ]
-       
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v3
@@ -42,7 +42,7 @@ jobs:
       with:
           java-version: 17
           distribution: 'adopt'
-       
+
     - name: Build with Maven
       run: mvn clean install
 

.gitignore

@@ -15,6 +15,9 @@ target/
 *.iml
 *.ipr
 
+### environment ###
+.env
+
 ### NetBeans ###
 nbproject/private/
 build/

Dockerfile

@@ -0,0 +1,22 @@
+# --- Stage 1: Build the application using Maven ---
+FROM maven:3.9.6-eclipse-temurin-17 AS build
+
+WORKDIR /app
+
+COPY . .
+
+# Build the application while caching Maven dependencies to speed up future builds
+RUN --mount=type=cache,target=/root/.m2 \
+    mvn clean package -DENV_VAR=docker -DskipTests -Dgit.skip=true
+
+# --- Stage 2: Run the application with a minimal JRE image ---
+FROM eclipse-temurin:17-jre
+
+WORKDIR /app
+
+# Copy the built WAR file from the build stage
+COPY --from=build /app/target/*.war app.war
+
+EXPOSE 8080
+
+ENTRYPOINT ["java", "-jar", "app.war"]

README.md

@@ -10,9 +10,9 @@ Admin module provides a user-friendly interface for managing your application. I
 
 ## Building From Source
 This microservice is built on Java, Spring boot framework and MySQL DB.
-
+For steps to clone and set up this Repository, refer to the [Developer Guide](https://piramal-swasthya.gitbook.io/amrit/developer-guide/development-environment-setup)
 Prerequisites 
-* JDK 1.8
+* JDK 17
 * Maven 
 * Springboot V2
 * MySQL
@@ -24,7 +24,7 @@ Prerequisites
 3. Run the spring server with local configuration `mvn spring-boot:run -DENV_VAR=local`
 
 ## Installation
-This service has been tested on Wildfly as the application server. To install the admin module, follow these steps:
+This service has been tested on Wildfly as the application server. To install the admin module, kindly refer to Installation Guide for [API Repository](https://piramal-swasthya.gitbook.io/amrit/developer-guide/development-environment-setup/installation-instructions/for-api-repositories) for guidance.
 
 ## Usage
 All the features have been exposed as REST endpoints.

logs/admin-api.log.json

@@ -4,8 +4,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.admin</groupId>
-	<artifactId>Admin-API</artifactId>
-	<version>1.2.0</version>
+	<artifactId>admin-api</artifactId>
+	<version>3.1.0</version>
 	<packaging>war</packaging>
 	<name>Admin-API</name>
 	<description>Admin Page</description>
@@ -280,7 +280,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>adminapi-v3.0.0</finalName>
+		<finalName>${artifactId}-${version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.owasp</groupId>
@@ -467,7 +467,18 @@
 					</execution>
 				</executions>
 			</plugin>
-
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>3.2.2</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<reporting>

logs/admin-api.log.json.2025-06-13.gz

@@ -13,10 +13,16 @@ [email protected]_BASE_URL@
 
 
 ### Redis IP
-spring.redis.host=localhost
+spring.redis.host=@env.REDIS_HOST@
 spring.main.allow-bean-definition-overriding=true
 jwt.secret=@env.JWT_SECRET_KEY@
 #ELK logging file name
+logging.path=logs/
 logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@
 
-common-url=@env.COMMON_URL@
+common-url=@env.COMMON_API@
+
+springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
+springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
+
+cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@