diff --git a/pom.xml b/pom.xml
index a0b8dcf6..707e18a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.iemr.common.flw
flw-api
- 3.1.0
+ 3.8.0
war
FLW-API
@@ -252,6 +252,13 @@
0.12.6
runtime
+
+
+ io.jsonwebtoken
+ jjwt-jackson
+ 0.12.6
+ runtime
+
@@ -330,6 +337,32 @@
+
+ io.github.git-commit-id
+ git-commit-id-maven-plugin
+ 9.0.2
+
+
+ get-the-git-infos
+
+ revision
+
+ initialize
+
+
+
+ true
+ ${project.build.outputDirectory}/git.properties
+
+ ^git.branch$
+ ^git.commit.id.abbrev$
+ ^git.build.version$
+ ^git.build.time$
+
+ false
+ false
+
+
org.apache.maven.plugins
maven-antrun-plugin
@@ -413,4 +446,4 @@
-
\ No newline at end of file
+
diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
index e069bede..b5aa3f02 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -16,8 +16,7 @@ secondary.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
secondary.datasource.url=@env.DATABASE_IDENTITY_URL@
secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
-springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
+
#ELK logging file name
logging.path=logs/
@@ -29,3 +28,12 @@ jwt.secret=@env.JWT_SECRET_KEY@
spring.redis.host=@env.REDIS_HOST@
cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
+
+#### SMS Configuration
+send-sms=@env.SEND_SMS@
+source-address=@env.SMS_CONSENT_SOURCE_ADDRESS@
+sms-username=@env.SMS_USERNAME@
+sms-password=@env.SMS_PASSWORD@
+send-message-url=@env.SMS_MESSAGE_URL@
+
+#crash.logs.base.path=@env.CRASH_LOGS_PATH@
diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties
index 0b04b964..befe0069 100644
--- a/src/main/environment/common_docker.properties
+++ b/src/main/environment/common_docker.properties
@@ -1,5 +1,5 @@
-fhir-url = ${FHIR_URL}
-tm-url = ${TM_URL}
+fhir-url = ${FHIR_API}
+tm-url = ${TM_API}
##--------------------------------------------## Primary db-------------------------------------------------------------------
@@ -15,8 +15,8 @@ secondary.datasource.password=${DATABASE_IDENTITY_PASSWORD}
secondary.datasource.url=${DATABASE_IDENTITY_URL}
secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-springdoc.api-docs.enabled=false
-springdoc.swagger-ui.enabled=false
+
+
#ELK logging file name
logging.path=logs/
@@ -25,4 +25,17 @@ logging.file.name=${FLW_API_LOGGING_FILE_NAME}
jwt.secret=${JWT_SECRET_KEY}
# Redis Config
-spring.redis.host=${REDIS_HOST}
\ No newline at end of file
+spring.redis.host=${REDIS_HOST}
+
+#### SMS Configuration
+send-sms=${SEND_SMS}
+source-address=${SMS_CONSENT_SOURCE_ADDRESS}
+sms-username=${SMS_USERNAME}
+sms-password=${SMS_PASSWORD}
+
+send-message-url=${SMS_MESSAGE_URL}
+
+#crash.logs.base.path=${CRASH_LOGS_PATH}
+
+
+
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index da750988..51873ab6 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -30,3 +30,15 @@ jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
spring.redis.host=localhost
cors.allowed-origins=http://localhost:*
+
+source-address=
+sms-username=
+sms-password=
+send-message-url=
+
+crash.logs.base.path=
+
+
+
+
+
diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties
index 0d05ae5f..6e5bdd00 100644
--- a/src/main/environment/common_local.properties
+++ b/src/main/environment/common_local.properties
@@ -1,29 +1,45 @@
-server.port=8081
-# FHIR Config
-fhir-url=http://localhost:8093/
-
- # TM Config
-tm-url=http://localhost:8089/
-##--------------------------------------------## Primary db-------------------------------------------------------------------
-
-spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
-spring.datasource.username=root
-spring.datasource.password=1234
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-##--------------------------------------------## Secondary db-------------------------------------------------------------------
-
-secondary.datasource.url=jdbc:mysql://localhost:3306/db_identity
-secondary.datasource.username=root
-secondary.datasource.password=1234
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-springdoc.api-docs.enabled=true
-springdoc.swagger-ui.enabled=true
-
-logging.path=logs/
-logging.file.name=logs/flw-api.log
-
-jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
-
-cors.allowed-origins=http://localhost:4208
\ No newline at end of file
+spring.main.banner-mode=off
+spring.data.jpa.repositories.enabled=true
+#spring.jpa.hibernate.ddl-auto=none
+
+# Naming strategies
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
+spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+
+# The SQL dialect makes Hibernate generate better SQL for the chosen database
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQLDialect
+
+#Below lines are added for security reasons
+
+spring.session.store-type=redis
+spring.redis.password=
+spring.redis.port=6379
+
+## Below values are needed for extending the expiry time and extend expiry time.
+iemr.extend.expiry.time=true
+iemr.session.expiry.time=7200
+enableIPValidation=false
+
+#logging.pattern.level=DEBUG
+logging.level.root=INFO
+logging.level.org.springframework.web=INFO
+logging.level.org.hibernate=INFO
+logging.level.com.iemr=DEBUG
+logging.level.org.springframework=INFO
+
+spring.datasource.tomcat.initial-size=5
+spring.datasource.tomcat.max-idle=15
+spring.datasource.tomcat.max-active=30
+spring.datasource.tomcat.min-idle=5
+spring.datasource.tomcat.min-evictable-idle-time-millis=15000
+spring.datasource.tomcat.remove-abandoned=true
+spring.datasource.tomcat.logAbandoned=true
+spring.datasource.continue-on-error=true
+spring.datasource.tomcat.remove-abandoned-timeout=600
+door-to-door-page-size=10
+
+#Get-HRP-Status
+get-HRP-Status=ANC/getHRPStatus
+
+#Get Beneficiary ABHA
+getHealthID=healthID/getBenhealthID
diff --git a/src/main/java/com/iemr/flw/FlwApplication.java b/src/main/java/com/iemr/flw/FlwApplication.java
index fac27988..23fc5352 100644
--- a/src/main/java/com/iemr/flw/FlwApplication.java
+++ b/src/main/java/com/iemr/flw/FlwApplication.java
@@ -1,21 +1,27 @@
package com.iemr.flw;
+import com.iemr.flw.masterEnum.GroupName;
import com.iemr.flw.utils.FLWApplBeans;
+import jakarta.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@ComponentScan("com.iemr.flw.*")
@EntityScan(basePackages = {"com.iemr.flw.domain.identity", "com.iemr.flw.domain.iemr"})
+@EnableScheduling
public class FlwApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
+
+
SpringApplication.run(applicationClass, args);
}
@@ -31,4 +37,5 @@ public FLWApplBeans instantiateBeans(){
return new FLWApplBeans();
}
+
}
diff --git a/src/main/java/com/iemr/flw/controller/AdolescentHealthController.java b/src/main/java/com/iemr/flw/controller/AdolescentHealthController.java
new file mode 100644
index 00000000..11cc5e57
--- /dev/null
+++ b/src/main/java/com/iemr/flw/controller/AdolescentHealthController.java
@@ -0,0 +1,76 @@
+package com.iemr.flw.controller;
+
+import com.iemr.flw.domain.iemr.AdolescentHealth;
+import com.iemr.flw.dto.identity.GetBenRequestHandler;
+import com.iemr.flw.dto.iemr.AdolescentHealthDTO;
+import com.iemr.flw.service.AdolescentHealthService;
+import com.iemr.flw.utils.response.OutputResponse;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping(value = "/adolescentHealth", headers = "Authorization")
+public class AdolescentHealthController {
+ private final org.slf4j.Logger logger = LoggerFactory.getLogger(AdolescentHealthController.class);
+
+ @Autowired
+ private AdolescentHealthService adolescentHealthService;
+
+ @RequestMapping(value = "/saveAll", method = RequestMethod.POST, headers = "Authorization")
+ public ResponseEntity