Merge pull request #93 from PSMRI/release-3.2.0

Release 3.2.0 -AMM-1718

Author: 5Amogh

.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"]

logs/admin-api.log.json

@@ -462,7 +462,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,7 +13,7 @@ videoConsultation-base-url=@env.SWYMED_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
@@ -24,3 +24,5 @@ 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@

pom.xml

@@ -0,0 +1,24 @@
+# local env 
+# DB Connections 
+spring.datasource.url=${DATABASE_URL}
+spring.datasource.username=${DATABASE_USERNAME}
+spring.datasource.password=${DATABASE_PASSWORD}
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+callcentre-server-ip=${CALLCENTRE_SERVER_IP}
+
+videoConsultation-apikey=${SWYMED_APIKEY}
+videoConsultation-base-url=${SWYMED_BASE_URL}
+
+### Redis IP
+spring.redis.host=${REDIS_HOST}
+spring.main.allow-bean-definition-overriding=true
+jwt.secret=${JWT_SECRET_KEY}
+#ELK logging file name
+logging.path=logs/
+logging.file.name=${ADMIN_API_LOGGING_FILE_NAME}
+
+common-url=${COMMON_API}
+
+springdoc.api-docs.enabled=${SWAGGER_DOC_ENABLED}
+springdoc.swagger-ui.enabled=${SWAGGER_DOC_ENABLED}

src/main/environment/admin_ci.properties

@@ -24,3 +24,5 @@ logging.path=logs/
 logging.file.name=logs/admin-api.log
 
 jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
+
+cors.allowed-origins=http://localhost:*

src/main/environment/admin_docker.properties

@@ -0,0 +1,28 @@
+package com.iemr.admin.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import java.util.Arrays;
+import org.springframework.beans.factory.annotation.Value;
+
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+
+    @Value("${cors.allowed-origins}")
+    private String allowedOrigins;
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOriginPatterns(
+                        Arrays.stream(allowedOrigins.split(","))
+                                .map(String::trim)
+                                .toArray(String[]::new))
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .allowedHeaders("*")
+                .exposedHeaders("Authorization", "Jwttoken")
+                .allowCredentials(true)
+                .maxAge(3600);
+    }
+}

src/main/environment/admin_example.properties

@@ -28,7 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
+
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -60,7 +60,6 @@ public void setServiceProvider_ServiceImpl(BlockingInter blockingInter) {
 		this.blockingInter = blockingInter;
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Block provider 1")
 	@RequestMapping(value = "/blockProvider1", headers = "Authorization", method = { RequestMethod.POST }, produces = {
 			"application/json" })
@@ -119,7 +118,6 @@ public String blockProvider1(@RequestBody String providerBlocking) {
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Block provider")
 	@RequestMapping(value = "/blockProvider", headers = "Authorization", method = { RequestMethod.POST }, produces = {
 			"application/json" })
@@ -178,7 +176,6 @@ public String blockProvider(@RequestBody String providerBlocking) {
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Block provider by service id")
 	@RequestMapping(value = { "/blockProviderByServiceId" }, method = { RequestMethod.POST }, produces = {
 			"application/json" }, headers = "Authorization")
@@ -239,7 +236,6 @@ public String blockProviderByServiceId(@RequestBody String blockProviderByServic
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get provider status")
 	@RequestMapping(value = "/getProviderStatus", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -266,7 +262,6 @@ public String getProviderStatus(@RequestBody String getProviderStatus) {
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get provider status 1")
 	@RequestMapping(value = "/getProviderStatus1", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -293,7 +288,6 @@ public String getProviderStatus1(@RequestBody String getProviderStatus) {
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get service liens using provider")
 	@RequestMapping(value = "/getServiceLinesUsingProvider", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -320,7 +314,6 @@ public String getServiceLiensUsingProvider(@RequestBody String getServiceLiensUs
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get provider status by provider and service id")
 	@RequestMapping(value = "/getProviderStatusByProviderAndServiceId", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -348,7 +341,6 @@ public String getProviderStatusByProviderAndServiceId(@RequestBody String getPro
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Block provider by service")
 	@RequestMapping(value = "/blockProviderByService", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -401,7 +393,6 @@ public String blockProviderByService(@RequestBody String providerServiceBlocking
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get provider status by service")
 	@RequestMapping(value = "/getProviderStatusByService", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -430,7 +421,6 @@ public String getProviderStatusByService(@RequestBody String providerServiceBloc
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Block provider by state")
 	@RequestMapping(value = "/blockProviderByState", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -491,7 +481,6 @@ public String blockProviderByState(@RequestBody String providerStateBlocking) {
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get provider status by state")
 	@RequestMapping(value = "/getProviderStatusByState", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -520,7 +509,6 @@ public String getProviderStatusByState(@RequestBody String providerStateBlocking
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Block user")
 	@RequestMapping(value = "/blockUser", headers = "Authorization", method = { RequestMethod.POST }, produces = {
 			"application/json" })
@@ -568,7 +556,6 @@ public String blockUser(@RequestBody String blockUser) {
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get status")
 	@RequestMapping(value = "/getStatus", headers = "Authorization", method = { RequestMethod.POST }, produces = {
 			"application/json" })
@@ -593,7 +580,6 @@ public String getStatus(@RequestBody String getStatus) {
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Provider state and service lines")
 	@RequestMapping(value = "/addProviderStateAndServiceLines", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -657,7 +643,6 @@ public String ProviderStateAndServiceLines(@RequestBody String ProviderStateAndS
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Delete provider state and service lines")
 	@RequestMapping(value = "/deleteProviderStateAndServiceLines", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -701,7 +686,6 @@ public String deleteProviderStateAndServiceLines(@RequestBody String deleteProvi
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Create cit mapping with service lines")
 	@RequestMapping(value = "/createCitMappingwithServiceLines", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -728,7 +712,6 @@ public String createCitMappingwithServiceLines(@RequestBody String createCitMapp
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get mapped service lines and state to provider")
 	@RequestMapping(value = "/getMappedServiceLinesAndStatetoProvider", headers = "Authorization", method = {
 			RequestMethod.POST }, consumes = { "application/json" }, produces = { "application/json" })
@@ -756,7 +739,6 @@ public String getMappedServiceLinesAndStatetoProvider(@RequestBody String getMap
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Map provider and service lines")
 	@RequestMapping(value = "/mapServiceLinesAndStatetoProvider", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -822,7 +804,6 @@ public String mapProviderAndServiceLines(@RequestBody String mapProviderAndServi
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Edit mapped service lines and state to provider")
 	@RequestMapping(value = "/editMappedServiceLinesAndStatetoProvider", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
@@ -856,7 +837,6 @@ public String editMappedServiceLinesAndStatetoProvider(
 
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Delete mapped service lines and state to provider")
 	@RequestMapping(value = "/deleteMappedServiceLinesAndStatetoProvider", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })