Merge branch 'suraj/contributor' of https://github.com/Suraj-kumar00/TM-API into suraj/contributor

Author: Suraj-kumar00

pom.xml

@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.iemr.tm</groupId>
-	<artifactId>tmapi-v1.0</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<artifactId>tm-api</artifactId>
+	<version>3.1.0</version>
 	<packaging>war</packaging>
 
-	<name>tm-api</name>
+	<name>TM-API</name>
 	<description>Piramal TM</description>
 
 	<parent>
@@ -299,7 +299,7 @@
 
 
 	<build>
-		<finalName>tmapi-v3.0.0</finalName>
+		<finalName>${artifactId}-${version}</finalName>
 
 		<plugins>
 			<plugin>

src/main/environment/common_ci.properties

@@ -6,41 +6,41 @@ spring.datasource.password=@env.DATABASE_PASSWORD@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 ## Carestream URLs
-carestreamOrderCreateURL=@env.COMMON_API@/carestream/createOrder
+carestreamOrderCreateURL=@env.COMMON_API@carestream/createOrder
 
 ## Identity - Common URLs
 #  Registration
-registrationUrl =@env.COMMON_API@/beneficiary/create
+registrationUrl =@env.COMMON_API@beneficiary/create
 
-registrarQuickSearchByIdUrl =@env.COMMON_API@/beneficiary/searchUserByID
+registrarQuickSearchByIdUrl =@env.COMMON_API@beneficiary/searchUserByID
 
-registrarQuickSearchByPhoneNoUrl =@env.COMMON_API@/beneficiary/searchUserByPhone
+registrarQuickSearchByPhoneNoUrl =@env.COMMON_API@beneficiary/searchUserByPhone
 
-getBenImageFromIdentity =@env.IDENTITY_API@/id/benImageByBenRegID
+getBenImageFromIdentity =@env.IDENTITY_API@id/benImageByBenRegID
 
 ##beneficiary edit
-beneficiaryEditUrl =@env.COMMON_API@/beneficiary/update
+beneficiaryEditUrl =@env.COMMON_API@beneficiary/update
 
 ## Advance Search
-registrarAdvanceSearchUrl =@env.COMMON_API@/beneficiary/searchBeneficiary
+registrarAdvanceSearchUrl =@env.COMMON_API@beneficiary/searchBeneficiary
 
 ## Data Sync API
-dataSyncUploadUrl=@env.MMU_API@/dataSync/van-to-server
+dataSyncUploadUrl=@env.MMU_API@dataSync/van-to-server
 
 ## Data download API
-dataSyncDownloadUrl=@env.MMU_API@/dataSync/server-to-van
+dataSyncDownloadUrl=@env.MMU_API@dataSync/server-to-van
 
 ## TC specialist slot booking
-tcSpecialistSlotBook=@env.SCHEDULER_API@/schedule/bookSlot
+tcSpecialistSlotBook=@env.SCHEDULER_API@schedule/bookSlot
 
 ## TC specialist slot cancelling
-tcSpecialistSlotCancel=@env.SCHEDULER_API@/schedule/cancelBookedSlot
+tcSpecialistSlotCancel=@env.SCHEDULER_API@schedule/cancelBookedSlot
 
 ## TM sms to beneficiary(schedule, cancel, reschedule)
-sendSMSUrl=@env.COMMON_API@/sms/sendSMS
+sendSMSUrl=@env.COMMON_API@sms/sendSMS
 
 ### get openkm doc download url
-openkmDocUrl=@env.COMMON_API@/kmfilemanager/getKMFileDownloadURL
+openkmDocUrl=@env.COMMON_API@kmfilemanager/getKMFileDownloadURL
 
 ##Fetosense Url
 fetosense-api-url-ANCTestDetails=https://asia-south1-amrit-fetosense.cloudfunctions.net/insertMother
@@ -71,6 +71,7 @@ jwt.secret=@env.JWT_SECRET_KEY@
 
 
 #ELK logging file name
+logging.path=logs/
 logging.file.name=@env.TM_API_LOGGING_FILE_NAME@
 
 springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@

src/main/environment/common_dev.properties

@@ -69,3 +69,7 @@ prescription=TMPrescription SMS
 ### Redis IP
 spring.redis.host=localhost
 
+jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
+logging.path=logs/
+logging.file.name=logs/tm-api.log
+

src/main/environment/common_example.properties

@@ -34,7 +34,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.google.gson.Gson;

src/main/environment/common_test.properties

@@ -44,6 +44,7 @@
 
 import com.google.gson.Gson;
 import com.iemr.tm.utils.CookieUtil;
+import com.iemr.tm.utils.RestTemplateUtil;
 
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -63,19 +64,11 @@ public int createMamographyRequest(ArrayList<Object[]> benDataForCareStream, lon
 			String Authorization) {
 		int responseData = 0;
 		RestTemplate restTemplate = new RestTemplate();
-		HttpServletRequest requestHeader = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-				.getRequest();
-		String jwtTokenFromCookie = cookieUtil.getJwtTokenFromCookie(requestHeader);
 		try {
-			// HttpHeaders headers = new HttpHeaders();
-			MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
-			headers.add("Content-Type", "application/json");
-			headers.add("AUTHORIZATION", Authorization);
-			headers.add("Cookie", "Jwttoken=" + jwtTokenFromCookie);
+			
 			String requestOBJ = getOrderCreationRequestOBJ(benDataForCareStream, benRegID, benVisitID);
 
-			HttpEntity<Object> request = new HttpEntity<Object>(requestOBJ, headers);
-			// System.out.println("hello");
+			HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(requestOBJ, Authorization);
 			ResponseEntity<String> response = restTemplate.exchange(carestreamOrderCreateURL, HttpMethod.POST, request,
 					String.class);
 			if (response != null) {

src/main/environment/common_uat.properties

@@ -120,7 +120,9 @@ public String getMasterDataForNurse(Integer visitCategoryID, Integer providerSer
 				break;
 			case 7: {
 				// 7 : General OPD (QC)
-				nurseMasterData = "No Master Data found for QuickConsultation";
+				// nurseMasterData = "No Master Data found for QuickConsultation";
+				nurseMasterData = ancMasterDataServiceImpl
+						.getCommonNurseMasterDataForGenopdAncNcdcarePnc(visitCategoryID, providerServiceMapID, gender);
 			}
 				break;
 			case (8): {

src/main/java/com/iemr/tm/controller/registrar/main/RegistrarController.java

@@ -62,6 +62,7 @@
 import com.iemr.tm.repo.nurse.anc.ANCCareRepo;
 import com.iemr.tm.repo.registrar.BeneficiaryImageRepo;
 import com.iemr.tm.repo.registrar.ReistrarRepoBenSearch;
+import com.iemr.tm.utils.RestTemplateUtil;
 
 @Service
 @PropertySource("classpath:application.properties")
@@ -217,11 +218,7 @@ public String getBenDetailsForLeftSideByRegIDNew(Long beneficiaryRegID, Long ben
 	public String getBenImageFromIdentityAPI(String Authorization, String comingRequest) throws Exception {
 		String returnOBJ = null;
 		RestTemplate restTemplate = new RestTemplate();
-		MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
-		headers.add("Content-Type", "application/json");
-		headers.add("AUTHORIZATION", Authorization);
-
-		HttpEntity<Object> request = new HttpEntity<Object>(comingRequest, headers);
+		HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(comingRequest, Authorization);
 		ResponseEntity<String> response = restTemplate.exchange(getBenImageFromIdentity, HttpMethod.POST, request,
 				String.class);
 		returnOBJ = response.getBody();