Merge pull request #86 from srishtigrp78/develop

Shifting commonAPI URL properties to common_ci from application.properties

Author: srishtigrp78

src/main/environment/common_ci.properties

@@ -2,7 +2,10 @@ spring.datasource.url=@env.DATABASE_URL@
 spring.datasource.username=@env.DATABASE_USERNAME@
 spring.datasource.password=@env.DATABASE_PASSWORD@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-common-api-url=@env.COMMON_API@
+
+common-api-url-searchuserbyid=@env.COMMON_API@beneficiary/searchUserByID
+common-api-url-searchBeneficiary=@env.COMMON_API@beneficiary/searchBeneficiary
+
 callcentre-server-ip=@env.CALLCENTRE_SERVER_IP@
 ### Redis IP
 spring.data.redis.host=localhost

src/main/environment/common_example.properties

@@ -8,6 +8,10 @@ spring.profiles.active=test
 callcentre-server-ip=10.208.122.99
 common-api-url=http://localhost:8083/
 
+
+common-api-url-searchuserbyid=http://localhost:8083/beneficiary/searchUserByID
+common-api-url-searchBeneficiary=http://localhost:8083/beneficiary/searchBeneficiary
+
 ### Redis IP
 spring.data.redis.host=localhost
 jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret

src/main/java/com/iemr/inventory/service/visit/VisitServiceImpl.java

@@ -65,8 +65,7 @@ public class VisitServiceImpl implements VisitService {
 	Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 	private static HttpUtils httpUtils = new HttpUtils();
 	private InputMapper inputMapper = new InputMapper();
-	private String identityBaseURL = ConfigProperties.getPropertyByName("common-api-url");
-	private static final String COMMON_BASE_URL = "COMMON_BASE_URL";
+
 
 	@Override
 	public BeneficiaryModel getVisitDetail(String benrID, Integer providerservicemapID, String auth) throws Exception {
@@ -109,8 +108,7 @@ public List<BeneficiaryModel> getBeneficiaryListByIDs(String benrID, String auth
 		String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
 		header.put("Cookie", "Jwttoken=" + jwtTokenFromCookie);
 
-		result = httpUtils.post(ConfigProperties.getPropertyByName("common-api-url-searchuserbyid")
-				.replace(COMMON_BASE_URL, identityBaseURL), benrID, header);
+		result = httpUtils.post(ConfigProperties.getPropertyByName("common-api-url-searchuserbyid"), benrID, header);
 		OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class);
 		if (identityResponse.getStatusCode() != 200) {
 			throw new InventoryException("Invalid BeneficiaryID");
@@ -145,8 +143,7 @@ public List<BeneficiaryModel> getBeneficiaryListBySearch(String benrID, String a
 		String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
 		header.put("Cookie", "Jwttoken=" + jwtTokenFromCookie);
 
-		result = httpUtils.post(ConfigProperties.getPropertyByName("common-api-url-searchBeneficiary")
-				.replace(COMMON_BASE_URL, identityBaseURL), benrID, header);
+		result = httpUtils.post(ConfigProperties.getPropertyByName("common-api-url-searchBeneficiary"), benrID, header);
 		OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class);
 		if (identityResponse.getStatusCode() == OutputResponse.USERID_FAILURE) {
 			throw new IEMRException(identityResponse.getErrorMessage());

src/main/resources/application.properties

@@ -23,8 +23,7 @@ logging.level.com.iemr=DEBUG
 
 spring.jpa.show-sql=true
 enableCTIUserCreation=true
-common-api-url-searchuserbyid=COMMON_BASE_URLbeneficiary/searchUserByID
-common-api-url-searchBeneficiary=COMMON_BASE_URLbeneficiary/searchBeneficiary
+
 
 spring.main.allow-bean-definition-overriding=true