From 219ae88296e8f879bc2c1b0b6f6ebc34f16d6566 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 14:42:30 +0530 Subject: [PATCH 01/11] add db identity table --- pom.xml | 4 + src/main/environment/common_ci.properties | 7 ++ src/main/environment/common_docker.properties | 7 ++ .../identity/config/PrimaryDBConfig.java | 89 +++++++++++++++++++ .../identity/config/SecondaryDBConfig.java | 87 ++++++++++++++++++ 5 files changed, 194 insertions(+) create mode 100644 src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java create mode 100644 src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java diff --git a/pom.xml b/pom.xml index 84eb159..b185aa0 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,10 @@ spring-boot-devtools runtime + + org.apache.tomcat + tomcat-jdbc + com.mysql diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 75ad875..b10474c 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -4,6 +4,13 @@ spring.datasource.username=@env.DATABASE_IDENTITY_USERNAME@ spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver + +secondary.datasource.url=@env.DATABASE_URL@ +secondary.datasource.username=@env.DATABASE_USERNAME@ +secondary.datasource.password=@env.DATABASE_PASSWORD@ +secondary.datasource.driver-class-name=com.mysql.jdbc.Driver + + #ELK logging file name logging.path=logs/ logging.file.name=@env.IDENTITY_API_LOGGING_FILE_NAME@ diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties index 90942c2..c064861 100644 --- a/src/main/environment/common_docker.properties +++ b/src/main/environment/common_docker.properties @@ -4,6 +4,13 @@ spring.datasource.username=${DATABASE_IDENTITY_USERNAME} spring.datasource.password=${DATABASE_IDENTITY_PASSWORD} spring.datasource.driver-class-name=com.mysql.jdbc.Driver + +secondary.datasource.url=${DATABASE_URL} +secondary.datasource.username=${DATABASE_USERNAME} +secondary.datasource.password={DATABASE_PASSWORD} +secondary.datasource.driver-class-name=com.mysql.jdbc.Driver + + #ELK logging file name logging.path=logs/ logging.file.name=${IDENTITY_API_LOGGING_FILE_NAME} diff --git a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java new file mode 100644 index 0000000..2586176 --- /dev/null +++ b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java @@ -0,0 +1,89 @@ +/* + * 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.config; + +import com.iemr.common.identity.utils.config.ConfigProperties; +import jakarta.persistence.EntityManagerFactory; +import org.apache.tomcat.jdbc.pool.DataSource; +import org.apache.tomcat.jdbc.pool.PoolConfiguration; +import org.apache.tomcat.jdbc.pool.PoolProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@Configuration +@EnableTransactionManagement +@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.flw.domain.iemr", + "com.iemr.flw.repo.iemr", "com.iemr.flw.dto.iemr"}) +public class PrimaryDBConfig { + + Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Primary + @Bean(name = "dataSource") + @ConfigurationProperties(prefix = "spring.datasource") + public DataSource dataSource() { + PoolConfiguration p = new PoolProperties(); + p.setMaxActive(30); + p.setMaxIdle(15); + p.setMinIdle(5); + p.setInitialSize(5); + p.setMaxWait(10000); + p.setMinEvictableIdleTimeMillis(15000); + p.setRemoveAbandoned(true); + p.setLogAbandoned(true); + p.setRemoveAbandonedTimeout(600); + p.setTestOnBorrow(true); + p.setValidationQuery("SELECT 1"); + org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource(); + datasource.setPoolProperties(p); + + datasource.setUsername(ConfigProperties.getPropertyByName("spring.datasource.username")); + datasource.setPassword(ConfigProperties.getPropertyByName("spring.datasource.password")); + + return datasource; + } + + @Primary + @Bean(name = "entityManagerFactory") + public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, + @Qualifier("dataSource") DataSource dataSource) { + return builder.dataSource(dataSource).packages("com.iemr.flw.domain.iemr").persistenceUnit("db_iemr").build(); + } + + @Primary + @Bean(name = "transactionManager") + public PlatformTransactionManager transactionManager( + @Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) { + return new JpaTransactionManager(entityManagerFactory); + } +} diff --git a/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java new file mode 100644 index 0000000..68a69ab --- /dev/null +++ b/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java @@ -0,0 +1,87 @@ +/* + * 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.config; + +import com.iemr.common.identity.utils.config.ConfigProperties; +import jakarta.persistence.EntityManagerFactory; +import org.apache.tomcat.jdbc.pool.DataSource; +import org.apache.tomcat.jdbc.pool.PoolConfiguration; +import org.apache.tomcat.jdbc.pool.PoolProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@Configuration +@EnableTransactionManagement +@EnableJpaRepositories(entityManagerFactoryRef = "secondaryEntityManagerFactory", + transactionManagerRef = "secondaryTransactionManager", basePackages = {"com.iemr.flw.domain.identity", + "com.iemr.flw.repo.identity"}) +public class SecondaryDBConfig { + + Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Bean(name = "secondaryDataSource") + @ConfigurationProperties(prefix = "secondary.datasource") + public DataSource dataSource() { + PoolConfiguration p = new PoolProperties(); + p.setMaxActive(30); + p.setMaxIdle(15); + p.setMinIdle(5); + p.setInitialSize(5); + p.setMaxWait(10000); + p.setMinEvictableIdleTimeMillis(15000); + p.setRemoveAbandoned(true); + p.setLogAbandoned(true); + p.setRemoveAbandonedTimeout(600); + p.setTestOnBorrow(true); + p.setValidationQuery("SELECT 1"); + org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource(); + datasource.setPoolProperties(p); + + datasource.setUsername(ConfigProperties.getPropertyByName("secondary.datasource.username")); + datasource.setPassword(ConfigProperties.getPropertyByName("secondary.datasource.password")); + + + return datasource; + } + + @Bean(name = "secondaryEntityManagerFactory") + public LocalContainerEntityManagerFactoryBean barEntityManagerFactory(EntityManagerFactoryBuilder builder, + @Qualifier("secondaryDataSource") DataSource dataSource) { + return builder.dataSource(dataSource).packages("com.iemr.flw.domain.identity").persistenceUnit("db_identity").build(); + } + + @Bean(name = "secondaryTransactionManager") + public PlatformTransactionManager barTransactionManager( + @Qualifier("secondaryEntityManagerFactory") EntityManagerFactory secondaryEntityManagerFactory) { + return new JpaTransactionManager(secondaryEntityManagerFactory); + } +} From 4aef14671490e7b0b3ad4e35b21b4013362c52de Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 14:55:23 +0530 Subject: [PATCH 02/11] add db identity table --- .../identity/config/PrimaryDBConfig.java | 6 ++-- .../identity/config/SecondaryDBConfig.java | 6 ++-- .../identity/domain/{ => iemr}/User.java | 2 +- .../common/identity/repo/iemr/userRepo.java | 31 +++++++++++++++++++ .../identity/utils/JwtAuthenticationUtil.java | 2 +- .../identity/utils/redis/RedisConfig.java | 3 +- 6 files changed, 40 insertions(+), 10 deletions(-) rename src/main/java/com/iemr/common/identity/domain/{ => iemr}/User.java (98%) create mode 100644 src/main/java/com/iemr/common/identity/repo/iemr/userRepo.java diff --git a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java index 2586176..084232a 100644 --- a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java @@ -42,8 +42,8 @@ @Configuration @EnableTransactionManagement -@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.flw.domain.iemr", - "com.iemr.flw.repo.iemr", "com.iemr.flw.dto.iemr"}) +@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.domain", + "com.iemr.common.identity.repo"}) public class PrimaryDBConfig { Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @@ -77,7 +77,7 @@ public DataSource dataSource() { @Bean(name = "entityManagerFactory") public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, @Qualifier("dataSource") DataSource dataSource) { - return builder.dataSource(dataSource).packages("com.iemr.flw.domain.iemr").persistenceUnit("db_iemr").build(); + return builder.dataSource(dataSource).packages("com.iemr.common.identity.domain").persistenceUnit("db_identity").build(); } @Primary diff --git a/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java index 68a69ab..13869ec 100644 --- a/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java @@ -42,8 +42,8 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories(entityManagerFactoryRef = "secondaryEntityManagerFactory", - transactionManagerRef = "secondaryTransactionManager", basePackages = {"com.iemr.flw.domain.identity", - "com.iemr.flw.repo.identity"}) + transactionManagerRef = "secondaryTransactionManager", basePackages = {"com.iemr.common.identity.domain.iemr", + "com.iemr.common.identity.repo.iemr"}) public class SecondaryDBConfig { Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @@ -76,7 +76,7 @@ public DataSource dataSource() { @Bean(name = "secondaryEntityManagerFactory") public LocalContainerEntityManagerFactoryBean barEntityManagerFactory(EntityManagerFactoryBuilder builder, @Qualifier("secondaryDataSource") DataSource dataSource) { - return builder.dataSource(dataSource).packages("com.iemr.flw.domain.identity").persistenceUnit("db_identity").build(); + return builder.dataSource(dataSource).packages("com.iemr.common.identity.domain.iemr").persistenceUnit("db_iemr").build(); } @Bean(name = "secondaryTransactionManager") diff --git a/src/main/java/com/iemr/common/identity/domain/User.java b/src/main/java/com/iemr/common/identity/domain/iemr/User.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/User.java rename to src/main/java/com/iemr/common/identity/domain/iemr/User.java index 2a88b2e..1754093 100644 --- a/src/main/java/com/iemr/common/identity/domain/User.java +++ b/src/main/java/com/iemr/common/identity/domain/iemr/User.java @@ -1,4 +1,4 @@ -package com.iemr.common.identity.domain; +package com.iemr.common.identity.domain.iemr; import java.sql.Timestamp; import java.time.LocalDate; diff --git a/src/main/java/com/iemr/common/identity/repo/iemr/userRepo.java b/src/main/java/com/iemr/common/identity/repo/iemr/userRepo.java new file mode 100644 index 0000000..e1e177a --- /dev/null +++ b/src/main/java/com/iemr/common/identity/repo/iemr/userRepo.java @@ -0,0 +1,31 @@ +/* +* 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.repo.iemr; + +import com.iemr.common.identity.domain.iemr.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface userRepo extends JpaRepository{ + +} \ No newline at end of file diff --git a/src/main/java/com/iemr/common/identity/utils/JwtAuthenticationUtil.java b/src/main/java/com/iemr/common/identity/utils/JwtAuthenticationUtil.java index 49e4826..6c30c0e 100644 --- a/src/main/java/com/iemr/common/identity/utils/JwtAuthenticationUtil.java +++ b/src/main/java/com/iemr/common/identity/utils/JwtAuthenticationUtil.java @@ -14,7 +14,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import com.iemr.common.identity.domain.User; +import com.iemr.common.identity.domain.iemr.User; import com.iemr.common.identity.exception.IEMRException; import io.jsonwebtoken.Claims; diff --git a/src/main/java/com/iemr/common/identity/utils/redis/RedisConfig.java b/src/main/java/com/iemr/common/identity/utils/redis/RedisConfig.java index 49969b8..822b487 100644 --- a/src/main/java/com/iemr/common/identity/utils/redis/RedisConfig.java +++ b/src/main/java/com/iemr/common/identity/utils/redis/RedisConfig.java @@ -5,13 +5,12 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.session.data.redis.config.ConfigureRedisAction; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.iemr.common.identity.domain.User; +import com.iemr.common.identity.domain.iemr.User; @Configuration public class RedisConfig { From f7bdc5c4311106d97e9f6f18ae0d0c32140f8d31 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 15:13:25 +0530 Subject: [PATCH 03/11] add db identity table --- .../identity/config/PrimaryDBConfig.java | 4 +-- .../ElasticsearchSyncController.java | 2 +- .../domain/{ => identity}/Address.java | 2 +- .../domain/{ => identity}/Contact.java | 2 +- .../domain/{ => identity}/Identity.java | 2 +- .../{ => identity}/MBeneficiaryAccount.java | 2 +- .../{ => identity}/MBeneficiaryImage.java | 2 +- .../{ => identity}/MBeneficiaryaddress.java | 2 +- .../{ => identity}/MBeneficiaryconsent.java | 2 +- .../{ => identity}/MBeneficiarycontact.java | 2 +- .../{ => identity}/MBeneficiarydetail.java | 6 +---- .../MBeneficiaryfamilymapping.java | 2 +- .../{ => identity}/MBeneficiaryidentity.java | 2 +- .../{ => identity}/MBeneficiarymapping.java | 2 +- .../MBeneficiaryregidmapping.java | 2 +- .../MBeneficiaryservicemapping.java | 2 +- .../{ => identity}/MBensecurestack.java | 2 +- .../identity/domain/{ => identity}/Phone.java | 2 +- .../domain/{ => identity}/TBendataaccess.java | 2 +- .../{ => identity}/VBenAdvanceSearch.java | 2 +- .../common/identity/dto/BeneficiariesDTO.java | 9 ++----- .../iemr/common/identity/dto/IdentityDTO.java | 10 +++---- .../common/identity/dto/IdentityEditDTO.java | 6 ++--- .../identity/dto/IdentityFilterDTO.java | 2 +- .../identity/dto/IdentitySearchDTO.java | 2 +- .../identity/mapper/BenIdImportMapper.java | 2 +- .../identity/mapper/IdentityEditMapper.java | 22 +++++++-------- .../identity/mapper/IdentityMapper.java | 26 +++++++----------- .../mapper/IdentityPartialMapper.java | 2 +- .../identity/mapper/IdentitySearchMapper.java | 6 ++--- .../common/identity/repo/BenAddressRepo.java | 2 +- .../common/identity/repo/BenConsentRepo.java | 2 +- .../common/identity/repo/BenContactRepo.java | 2 +- .../identity/repo/BenDataAccessRepo.java | 2 +- .../common/identity/repo/BenDetailRepo.java | 2 +- .../identity/repo/BenDetailRepoCustom.java | 2 +- .../identity/repo/BenDetailRepoImpl.java | 2 +- .../identity/repo/BenFamilyMappingRepo.java | 2 +- .../common/identity/repo/BenIdentityRepo.java | 2 +- .../common/identity/repo/BenMappingRepo.java | 6 +---- .../identity/repo/BenMappingRepoCustom.java | 4 +-- .../identity/repo/BenMappingRepoImpl.java | 12 ++++----- .../identity/repo/BenRegIdMappingRepo.java | 2 +- .../identity/repo/BenSecureStackRepo.java | 2 +- .../identity/repo/BenServiceMappingRepo.java | 2 +- .../repo/MBeneficiaryAccountRepo.java | 2 +- .../identity/repo/MBeneficiaryImageRepo.java | 2 +- .../identity/repo/V_BenAdvanceSearchRepo.java | 2 +- .../identity/service/IdentityService.java | 27 +++++++++---------- .../familyTagging/FamilyTagServiceImpl.java | 4 +-- 50 files changed, 96 insertions(+), 120 deletions(-) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/Address.java (97%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/Contact.java (96%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/Identity.java (96%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryAccount.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryImage.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryaddress.java (99%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryconsent.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiarycontact.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiarydetail.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryfamilymapping.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryidentity.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiarymapping.java (99%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryregidmapping.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBeneficiaryservicemapping.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/MBensecurestack.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/Phone.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/TBendataaccess.java (98%) rename src/main/java/com/iemr/common/identity/domain/{ => identity}/VBenAdvanceSearch.java (99%) diff --git a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java index 084232a..9503596 100644 --- a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java @@ -42,7 +42,7 @@ @Configuration @EnableTransactionManagement -@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.domain", +@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.domain.identity", "com.iemr.common.identity.repo"}) public class PrimaryDBConfig { @@ -77,7 +77,7 @@ public DataSource dataSource() { @Bean(name = "entityManagerFactory") public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, @Qualifier("dataSource") DataSource dataSource) { - return builder.dataSource(dataSource).packages("com.iemr.common.identity.domain").persistenceUnit("db_identity").build(); + return builder.dataSource(dataSource).packages("com.iemr.common.identity.domain.identity").persistenceUnit("db_identity").build(); } @Primary diff --git a/src/main/java/com/iemr/common/identity/controller/elasticsearch/ElasticsearchSyncController.java b/src/main/java/com/iemr/common/identity/controller/elasticsearch/ElasticsearchSyncController.java index 7d8f187..ae8d30b 100644 --- a/src/main/java/com/iemr/common/identity/controller/elasticsearch/ElasticsearchSyncController.java +++ b/src/main/java/com/iemr/common/identity/controller/elasticsearch/ElasticsearchSyncController.java @@ -42,7 +42,7 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient; -import com.iemr.common.identity.domain.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; import com.iemr.common.identity.service.elasticsearch.ElasticsearchIndexingService; /** diff --git a/src/main/java/com/iemr/common/identity/domain/Address.java b/src/main/java/com/iemr/common/identity/domain/identity/Address.java similarity index 97% rename from src/main/java/com/iemr/common/identity/domain/Address.java rename to src/main/java/com/iemr/common/identity/domain/identity/Address.java index c37b450..9219903 100644 --- a/src/main/java/com/iemr/common/identity/domain/Address.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/Address.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import lombok.Data; diff --git a/src/main/java/com/iemr/common/identity/domain/Contact.java b/src/main/java/com/iemr/common/identity/domain/identity/Contact.java similarity index 96% rename from src/main/java/com/iemr/common/identity/domain/Contact.java rename to src/main/java/com/iemr/common/identity/domain/identity/Contact.java index 79010bc..04b96cd 100644 --- a/src/main/java/com/iemr/common/identity/domain/Contact.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/Contact.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import lombok.Data; diff --git a/src/main/java/com/iemr/common/identity/domain/Identity.java b/src/main/java/com/iemr/common/identity/domain/identity/Identity.java similarity index 96% rename from src/main/java/com/iemr/common/identity/domain/Identity.java rename to src/main/java/com/iemr/common/identity/domain/identity/Identity.java index 31c6e66..564bc61 100644 --- a/src/main/java/com/iemr/common/identity/domain/Identity.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/Identity.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.math.BigInteger; import java.sql.Timestamp; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryAccount.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryAccount.java index 312a57e..17dfa40 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryAccount.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryAccount.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.math.BigInteger; import java.sql.Timestamp; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryImage.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryImage.java index 9e26691..6d28425 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryImage.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryImage.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.math.BigInteger; import java.sql.Timestamp; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryaddress.java similarity index 99% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryaddress.java index 0e2ab41..48b3ca6 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryaddress.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryaddress.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryconsent.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryconsent.java index f13cfa0..c46c5b1 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryconsent.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryconsent.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarycontact.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarycontact.java index cea4538..d813871 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarycontact.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarycontact.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarydetail.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarydetail.java index 36559ef..ee36eaf 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarydetail.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarydetail.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; @@ -27,8 +27,6 @@ import java.util.Calendar; import java.util.Date; -import org.json.JSONObject; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -39,8 +37,6 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryfamilymapping.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryfamilymapping.java index 39955b5..0782063 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryfamilymapping.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryfamilymapping.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryidentity.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryidentity.java index 157345d..9a92fae 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryidentity.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryidentity.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarymapping.java similarity index 99% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarymapping.java index 4397f21..a13d2a9 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiarymapping.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiarymapping.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryregidmapping.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryregidmapping.java index ec4cd56..cf2be6c 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryregidmapping.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryregidmapping.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryservicemapping.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryservicemapping.java index 697af89..daabb3c 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBeneficiaryservicemapping.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBeneficiaryservicemapping.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/MBensecurestack.java b/src/main/java/com/iemr/common/identity/domain/identity/MBensecurestack.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/MBensecurestack.java rename to src/main/java/com/iemr/common/identity/domain/identity/MBensecurestack.java index 6578cbd..d383063 100644 --- a/src/main/java/com/iemr/common/identity/domain/MBensecurestack.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/MBensecurestack.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.sql.Timestamp; diff --git a/src/main/java/com/iemr/common/identity/domain/Phone.java b/src/main/java/com/iemr/common/identity/domain/identity/Phone.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/Phone.java rename to src/main/java/com/iemr/common/identity/domain/identity/Phone.java index 4e6f835..0d8a7c5 100644 --- a/src/main/java/com/iemr/common/identity/domain/Phone.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/Phone.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java b/src/main/java/com/iemr/common/identity/domain/identity/TBendataaccess.java similarity index 98% rename from src/main/java/com/iemr/common/identity/domain/TBendataaccess.java rename to src/main/java/com/iemr/common/identity/domain/identity/TBendataaccess.java index 707960c..654d486 100644 --- a/src/main/java/com/iemr/common/identity/domain/TBendataaccess.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/TBendataaccess.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/identity/VBenAdvanceSearch.java similarity index 99% rename from src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java rename to src/main/java/com/iemr/common/identity/domain/identity/VBenAdvanceSearch.java index 99ec57b..75e43e0 100644 --- a/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java +++ b/src/main/java/com/iemr/common/identity/domain/identity/VBenAdvanceSearch.java @@ -19,7 +19,7 @@ * 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.domain; +package com.iemr.common.identity.domain.identity; import java.math.BigInteger; import java.sql.Timestamp; diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java index d48cd9b..51fa640 100644 --- a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java +++ b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java @@ -25,16 +25,11 @@ import java.math.BigInteger; import java.sql.Timestamp; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.iemr.common.identity.domain.Address; -import com.iemr.common.identity.domain.Phone; +import com.iemr.common.identity.domain.identity.Address; +import com.iemr.common.identity.domain.identity.Phone; import lombok.Data; diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java index 322e57f..7a18361 100644 --- a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java +++ b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java @@ -24,14 +24,10 @@ import java.sql.Timestamp; import java.util.List; -import org.json.JSONObject; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; -import com.iemr.common.identity.domain.Address; -import com.iemr.common.identity.domain.Contact; -import com.iemr.common.identity.domain.Identity; +import com.iemr.common.identity.domain.identity.Address; +import com.iemr.common.identity.domain.identity.Contact; +import com.iemr.common.identity.domain.identity.Identity; import lombok.Data; diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java index 6d223a7..bcea9df 100644 --- a/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java +++ b/src/main/java/com/iemr/common/identity/dto/IdentityEditDTO.java @@ -25,9 +25,9 @@ import java.sql.Timestamp; import java.util.List; -import com.iemr.common.identity.domain.Address; -import com.iemr.common.identity.domain.Contact; -import com.iemr.common.identity.domain.Identity; +import com.iemr.common.identity.domain.identity.Address; +import com.iemr.common.identity.domain.identity.Contact; +import com.iemr.common.identity.domain.identity.Identity; import lombok.Data; diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java index f34183a..5bb640f 100644 --- a/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java +++ b/src/main/java/com/iemr/common/identity/dto/IdentityFilterDTO.java @@ -24,7 +24,7 @@ import java.math.BigInteger; import java.util.Optional; -import com.iemr.common.identity.domain.Address; +import com.iemr.common.identity.domain.identity.Address; public class IdentityFilterDTO { private Optional beneficiaryId; diff --git a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java index db4bf01..753128a 100644 --- a/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java +++ b/src/main/java/com/iemr/common/identity/dto/IdentitySearchDTO.java @@ -25,7 +25,7 @@ import java.sql.Timestamp; import com.fasterxml.jackson.annotation.JsonFormat; -import com.iemr.common.identity.domain.Address; +import com.iemr.common.identity.domain.identity.Address; import lombok.Data; diff --git a/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java b/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java index 7471570..4d576de 100644 --- a/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java +++ b/src/main/java/com/iemr/common/identity/mapper/BenIdImportMapper.java @@ -28,7 +28,7 @@ import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; -import com.iemr.common.identity.domain.MBeneficiaryregidmapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryregidmapping; import com.iemr.common.identity.dto.BenIdImportDTO; @Mapper(componentModel = "spring") diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java index 64dd299..decbf35 100644 --- a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java +++ b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java @@ -30,17 +30,17 @@ import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; -import com.iemr.common.identity.domain.Identity; -import com.iemr.common.identity.domain.MBeneficiaryAccount; -import com.iemr.common.identity.domain.MBeneficiaryImage; -import com.iemr.common.identity.domain.MBeneficiaryaddress; -import com.iemr.common.identity.domain.MBeneficiaryconsent; -import com.iemr.common.identity.domain.MBeneficiarycontact; -import com.iemr.common.identity.domain.MBeneficiarydetail; -import com.iemr.common.identity.domain.MBeneficiaryfamilymapping; -import com.iemr.common.identity.domain.MBeneficiaryidentity; -import com.iemr.common.identity.domain.MBeneficiarymapping; -import com.iemr.common.identity.domain.MBeneficiaryservicemapping; +import com.iemr.common.identity.domain.identity.Identity; +import com.iemr.common.identity.domain.identity.MBeneficiaryAccount; +import com.iemr.common.identity.domain.identity.MBeneficiaryImage; +import com.iemr.common.identity.domain.identity.MBeneficiaryaddress; +import com.iemr.common.identity.domain.identity.MBeneficiaryconsent; +import com.iemr.common.identity.domain.identity.MBeneficiarycontact; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiaryfamilymapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryidentity; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryservicemapping; import com.iemr.common.identity.dto.BenDetailDTO; import com.iemr.common.identity.dto.BenFamilyDTO; import com.iemr.common.identity.dto.BenIdentityDTO; diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java index bc3ad68..1656496 100644 --- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java +++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java @@ -22,31 +22,25 @@ package com.iemr.common.identity.mapper; import java.sql.Timestamp; -import java.util.Arrays; import java.util.Collection; import java.util.List; -import java.util.stream.Collectors; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.IterableMapping; import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import org.mapstruct.Mappings; -import org.mapstruct.Named; import org.mapstruct.factory.Mappers; -import com.iemr.common.identity.domain.Identity; -import com.iemr.common.identity.domain.MBeneficiaryAccount; -import com.iemr.common.identity.domain.MBeneficiaryImage; -import com.iemr.common.identity.domain.MBeneficiaryaddress; -import com.iemr.common.identity.domain.MBeneficiaryconsent; -import com.iemr.common.identity.domain.MBeneficiarycontact; -import com.iemr.common.identity.domain.MBeneficiarydetail; -import com.iemr.common.identity.domain.MBeneficiaryfamilymapping; -import com.iemr.common.identity.domain.MBeneficiaryidentity; -import com.iemr.common.identity.domain.MBeneficiarymapping; -import com.iemr.common.identity.domain.MBeneficiaryservicemapping; -import com.iemr.common.identity.domain.Phone; +import com.iemr.common.identity.domain.identity.Identity; +import com.iemr.common.identity.domain.identity.MBeneficiaryAccount; +import com.iemr.common.identity.domain.identity.MBeneficiaryImage; +import com.iemr.common.identity.domain.identity.MBeneficiaryconsent; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiaryfamilymapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryidentity; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryservicemapping; +import com.iemr.common.identity.domain.identity.Phone; import com.iemr.common.identity.dto.BenDetailDTO; import com.iemr.common.identity.dto.BenFamilyDTO; import com.iemr.common.identity.dto.BenIdentityDTO; diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java index 5a1a2d6..f671097 100644 --- a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java +++ b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java @@ -25,7 +25,7 @@ import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; -import com.iemr.common.identity.domain.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; import com.iemr.common.identity.dto.BeneficiariesPartialDTO; import com.iemr.common.identity.dto.BeneficiaryCreateResp; diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java index 2d31e77..1955971 100644 --- a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java +++ b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java @@ -25,9 +25,9 @@ import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; -import com.iemr.common.identity.domain.MBeneficiaryaddress; -import com.iemr.common.identity.domain.MBeneficiarycontact; -import com.iemr.common.identity.domain.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiaryaddress; +import com.iemr.common.identity.domain.identity.MBeneficiarycontact; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; import com.iemr.common.identity.dto.IdentitySearchDTO; @Mapper(componentModel = "spring") diff --git a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java index 5d79f8a..bdb7759 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiaryaddress; +import com.iemr.common.identity.domain.identity.MBeneficiaryaddress; @Repository public interface BenAddressRepo extends CrudRepository { diff --git a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java index 9abb4cb..77b5b85 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiaryconsent; +import com.iemr.common.identity.domain.identity.MBeneficiaryconsent; @Repository public interface BenConsentRepo extends CrudRepository { diff --git a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java index fdbda21..5427ca1 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiarycontact; +import com.iemr.common.identity.domain.identity.MBeneficiarycontact; @Repository public interface BenContactRepo extends CrudRepository { diff --git a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java index 24d2082..8289419 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenDataAccessRepo.java @@ -28,7 +28,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import com.iemr.common.identity.domain.TBendataaccess; +import com.iemr.common.identity.domain.identity.TBendataaccess; @Repository public interface BenDataAccessRepo extends CrudRepository diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java index 4e8bcc0..c044523 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java @@ -32,7 +32,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.iemr.common.identity.domain.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; import jakarta.transaction.Transactional; diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java index 9395ba1..c7734e6 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java +++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoCustom.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Repository; -import com.iemr.common.identity.domain.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; import com.iemr.common.identity.dto.IdentitySearchDTO; @Repository diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java index 1510d70..c4dc473 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java +++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepoImpl.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; -import com.iemr.common.identity.domain.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; import com.iemr.common.identity.dto.IdentitySearchDTO; public class BenDetailRepoImpl implements BenDetailRepoCustom { diff --git a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java index 3310ada..67b64ca 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiaryfamilymapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryfamilymapping; @Repository public interface BenFamilyMappingRepo extends CrudRepository { diff --git a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java index f194f02..223db0b 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiaryidentity; +import com.iemr.common.identity.domain.identity.MBeneficiaryidentity; @Repository public interface BenIdentityRepo extends CrudRepository { diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java index 9c20f49..fc9a590 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java @@ -32,11 +32,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiarymapping; -import com.iemr.common.identity.domain.MBeneficiaryservicemapping; -import com.iemr.common.identity.domain.VBenAdvanceSearch; -import com.iemr.common.identity.dto.IdentityDTO; -import com.iemr.common.identity.dto.IdentitySearchDTO; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; @Repository public interface BenMappingRepo extends CrudRepository, BenMappingRepoCustom { diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java index 43f9205..357d726 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java +++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java @@ -23,8 +23,8 @@ import java.util.List; -import com.iemr.common.identity.domain.MBeneficiarymapping; -import com.iemr.common.identity.domain.VBenAdvanceSearch; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.VBenAdvanceSearch; import com.iemr.common.identity.dto.IdentityDTO; import com.iemr.common.identity.dto.IdentitySearchDTO; diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java index 45e2b5a..9b8f66a 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java +++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java @@ -39,12 +39,12 @@ import org.springframework.beans.factory.annotation.Autowired; -import com.iemr.common.identity.domain.Address; -import com.iemr.common.identity.domain.MBeneficiaryaddress; -import com.iemr.common.identity.domain.MBeneficiarycontact; -import com.iemr.common.identity.domain.MBeneficiarydetail; -import com.iemr.common.identity.domain.MBeneficiarymapping; -import com.iemr.common.identity.domain.VBenAdvanceSearch; +import com.iemr.common.identity.domain.identity.Address; +import com.iemr.common.identity.domain.identity.MBeneficiaryaddress; +import com.iemr.common.identity.domain.identity.MBeneficiarycontact; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.VBenAdvanceSearch; import com.iemr.common.identity.dto.IdentityDTO; import com.iemr.common.identity.dto.IdentitySearchDTO; import com.iemr.common.identity.mapper.IdentitySearchMapper; diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java index 3875211..67b0111 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java @@ -31,7 +31,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.iemr.common.identity.domain.MBeneficiaryregidmapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryregidmapping; import jakarta.transaction.Transactional; diff --git a/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java b/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java index 22c581b..8451616 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenSecureStackRepo.java @@ -23,7 +23,7 @@ import org.springframework.stereotype.Repository; -import com.iemr.common.identity.domain.MBensecurestack; +import com.iemr.common.identity.domain.identity.MBensecurestack; @Repository public interface BenSecureStackRepo { diff --git a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java index 49ed72d..9a1a8d1 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiaryservicemapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryservicemapping; @Repository public interface BenServiceMappingRepo extends CrudRepository { diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java index 2bf561b..e31e954 100644 --- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java @@ -29,7 +29,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiaryAccount; +import com.iemr.common.identity.domain.identity.MBeneficiaryAccount; public interface MBeneficiaryAccountRepo extends CrudRepository { @Transactional diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java index 8cd40c2..571b920 100644 --- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java @@ -29,7 +29,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import com.iemr.common.identity.domain.MBeneficiaryImage; +import com.iemr.common.identity.domain.identity.MBeneficiaryImage; public interface MBeneficiaryImageRepo extends CrudRepository { @Query("select t from MBeneficiaryImage t where t.vanSerialNo = :benImageID AND t.vanID = :vanID ") diff --git a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java index a7fd5f2..727ec8f 100644 --- a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java @@ -29,7 +29,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.iemr.common.identity.domain.VBenAdvanceSearch; +import com.iemr.common.identity.domain.identity.VBenAdvanceSearch; @Repository public interface V_BenAdvanceSearchRepo extends CrudRepository { diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index 08b9fbb..207954e 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -50,19 +50,19 @@ import com.google.gson.JsonParser; import com.google.gson.LongSerializationPolicy; import com.iemr.common.identity.data.rmnch.RMNCHBeneficiaryDetailsRmnch; -import com.iemr.common.identity.domain.Address; -import com.iemr.common.identity.domain.MBeneficiaryAccount; -import com.iemr.common.identity.domain.MBeneficiaryImage; -import com.iemr.common.identity.domain.MBeneficiaryaddress; -import com.iemr.common.identity.domain.MBeneficiaryconsent; -import com.iemr.common.identity.domain.MBeneficiarycontact; -import com.iemr.common.identity.domain.MBeneficiarydetail; -import com.iemr.common.identity.domain.MBeneficiaryfamilymapping; -import com.iemr.common.identity.domain.MBeneficiaryidentity; -import com.iemr.common.identity.domain.MBeneficiarymapping; -import com.iemr.common.identity.domain.MBeneficiaryregidmapping; -import com.iemr.common.identity.domain.MBeneficiaryservicemapping; -import com.iemr.common.identity.domain.VBenAdvanceSearch; +import com.iemr.common.identity.domain.identity.Address; +import com.iemr.common.identity.domain.identity.MBeneficiaryAccount; +import com.iemr.common.identity.domain.identity.MBeneficiaryImage; +import com.iemr.common.identity.domain.identity.MBeneficiaryaddress; +import com.iemr.common.identity.domain.identity.MBeneficiaryconsent; +import com.iemr.common.identity.domain.identity.MBeneficiarycontact; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiaryfamilymapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryidentity; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryregidmapping; +import com.iemr.common.identity.domain.identity.MBeneficiaryservicemapping; +import com.iemr.common.identity.domain.identity.VBenAdvanceSearch; import com.iemr.common.identity.dto.AbhaAddressDTO; import com.iemr.common.identity.dto.BenIdImportDTO; import com.iemr.common.identity.dto.BeneficiariesDTO; @@ -95,7 +95,6 @@ import com.iemr.common.identity.service.elasticsearch.ElasticsearchService; import com.iemr.common.identity.utils.mapper.OutputMapper; import com.iemr.common.identity.utils.response.OutputResponse; -import org.springframework.scheduling.annotation.Async; import org.springframework.beans.factory.annotation.Value; import com.iemr.common.identity.service.elasticsearch.BeneficiaryElasticsearchIndexUpdater; diff --git a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java index 2a60571..d47d993 100644 --- a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java +++ b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java @@ -37,8 +37,8 @@ import com.google.gson.JsonParser; import com.iemr.common.identity.data.familyTagging.BenFamilyMapping; import com.iemr.common.identity.data.familyTagging.FamilyMembers; -import com.iemr.common.identity.domain.MBeneficiarydetail; -import com.iemr.common.identity.domain.MBeneficiarymapping; +import com.iemr.common.identity.domain.identity.MBeneficiarydetail; +import com.iemr.common.identity.domain.identity.MBeneficiarymapping; import com.iemr.common.identity.exception.IEMRException; import com.iemr.common.identity.repo.BenDetailRepo; import com.iemr.common.identity.repo.BenMappingRepo; From 382e785cc05b89c31fcfed7d686ca7290f5b9eae Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 21:14:08 +0530 Subject: [PATCH 04/11] add db identity table --- src/main/environment/common_example.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 45018aa..48b9491 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -5,6 +5,11 @@ spring.datasource.username=root spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.jdbc.Driver +secondary.datasource.username=your_db_username +secondary.datasource.password=your_db_password +secondary.datasource.url=jdbc:mysql://host:port/dbname +secondary.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret logging.path=logs/ logging.file.name=logs/identity-api.log From 06b98fadbd1309e7b46cd7274adf0469f86f375b Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 21:17:59 +0530 Subject: [PATCH 05/11] add db identity table --- .../java/com/iemr/common/identity/config/PrimaryDBConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java index 9503596..da356aa 100644 --- a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java @@ -43,7 +43,7 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.domain.identity", - "com.iemr.common.identity.repo"}) + "com.iemr.common.identity.repo","com.iemr.common.identity.repo.rmnch"}) public class PrimaryDBConfig { Logger logger = LoggerFactory.getLogger(this.getClass().getName()); From 85a6faf0514e75f1b73d329bca413d3f24c3ae8c Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 21:52:55 +0530 Subject: [PATCH 06/11] add db identity table --- .../java/com/iemr/common/identity/config/PrimaryDBConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java index da356aa..3724903 100644 --- a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java @@ -43,7 +43,7 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.domain.identity", - "com.iemr.common.identity.repo","com.iemr.common.identity.repo.rmnch"}) + "com.iemr.common.identity.repo","com.iemr.common.identity.repo.rmnch","com.iemr.common.identity.data",}) public class PrimaryDBConfig { Logger logger = LoggerFactory.getLogger(this.getClass().getName()); From ef13eb4912a3ed0e3dbeed722e2ce5fe7a389eb0 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 21:57:02 +0530 Subject: [PATCH 07/11] add db identity table --- .../java/com/iemr/common/identity/config/PrimaryDBConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java index 3724903..f4b39c8 100644 --- a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java @@ -43,7 +43,7 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.domain.identity", - "com.iemr.common.identity.repo","com.iemr.common.identity.repo.rmnch","com.iemr.common.identity.data",}) + "com.iemr.common.identity.repo","com.iemr.common.identity.repo.rmnch","com.iemr.common.identity.data.rmnch",}) public class PrimaryDBConfig { Logger logger = LoggerFactory.getLogger(this.getClass().getName()); From 20f51ff55e812e6f93119a12edf4056bfa00f5e8 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 22:04:52 +0530 Subject: [PATCH 08/11] add db identity table --- .../java/com/iemr/common/identity/config/PrimaryDBConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java index f4b39c8..47b9e71 100644 --- a/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/PrimaryDBConfig.java @@ -43,7 +43,7 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = {"com.iemr.common.identity.domain.identity", - "com.iemr.common.identity.repo","com.iemr.common.identity.repo.rmnch","com.iemr.common.identity.data.rmnch",}) + "com.iemr.common.identity.repo","com.iemr.common.identity.data.rmnch",}) public class PrimaryDBConfig { Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @@ -77,7 +77,7 @@ public DataSource dataSource() { @Bean(name = "entityManagerFactory") public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, @Qualifier("dataSource") DataSource dataSource) { - return builder.dataSource(dataSource).packages("com.iemr.common.identity.domain.identity").persistenceUnit("db_identity").build(); + return builder.dataSource(dataSource).packages("com.iemr.common.identity.domain.identity","com.iemr.common.identity.data.rmnch").persistenceUnit("db_identity").build(); } @Primary From 5b903bc32b73d03f2a1235e8acbfcd8e18974471 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 22:13:16 +0530 Subject: [PATCH 09/11] add db identity table --- src/main/environment/common_example.properties | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 48b9491..d8df43c 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -5,9 +5,10 @@ spring.datasource.username=root spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.jdbc.Driver -secondary.datasource.username=your_db_username -secondary.datasource.password=your_db_password -secondary.datasource.url=jdbc:mysql://host:port/dbname + +secondary.datasource.url=jdbc:mysql://localhost:3306/db_iemr +secondary.datasource.username=root +secondary.datasource.password=root123 secondary.datasource.driver-class-name=com.mysql.cj.jdbc.Driver jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret From f05498ac25b9206c6ed6d90dba16bb5b66ecb012 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Feb 2026 22:17:24 +0530 Subject: [PATCH 10/11] add db identity table --- src/main/environment/common_docker.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties index 247f219..258fadf 100644 --- a/src/main/environment/common_docker.properties +++ b/src/main/environment/common_docker.properties @@ -7,7 +7,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver secondary.datasource.url=${DATABASE_URL} secondary.datasource.username=${DATABASE_USERNAME} -secondary.datasource.password={DATABASE_PASSWORD} +secondary.datasource.password=${DATABASE_PASSWORD} secondary.datasource.driver-class-name=com.mysql.jdbc.Driver From 4719d0f4a158a55dfd8446c513c2df4286e40b11 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Tue, 24 Feb 2026 15:16:14 +0530 Subject: [PATCH 11/11] add db identity table --- .../com/iemr/common/identity/config/SecondaryDBConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java b/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java index 13869ec..2e5e09a 100644 --- a/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java +++ b/src/main/java/com/iemr/common/identity/config/SecondaryDBConfig.java @@ -42,8 +42,7 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories(entityManagerFactoryRef = "secondaryEntityManagerFactory", - transactionManagerRef = "secondaryTransactionManager", basePackages = {"com.iemr.common.identity.domain.iemr", - "com.iemr.common.identity.repo.iemr"}) + transactionManagerRef = "secondaryTransactionManager", basePackages = {"com.iemr.common.identity.domain.iemr"}) public class SecondaryDBConfig { Logger logger = LoggerFactory.getLogger(this.getClass().getName());