Merge pull request #4 from PSMRI/develop

latest code

Author: srishtigrp78

.github/workflows/build-on-pull-request.yml

@@ -14,9 +14,9 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: 17
-          distribution: 'adopt'
+          distribution: 'temurin'
       - name: Build with Maven  
         run: mvn clean install

.github/workflows/package.yml

@@ -20,13 +20,13 @@ jobs:
     steps:
 
     - name: Checkout code 
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: 17
-        distribution: 'adopt'
+        distribution: 'temurin'
 
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}

.github/workflows/sast.yml

@@ -35,18 +35,18 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
 
     - name: Setup JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
           java-version: 17
-          distribution: 'adopt'
+          distribution: 'temurin'
 
     - name: Build with Maven
       run: mvn clean install
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

README.md

@@ -7,29 +7,33 @@ The AMRIT Telemedicine (TM) Service enhances the capabilities of Health and Well
 
 ## Features of Telemedicine (TM)
 
-Telemedicine plays a crucial role in the services provided by Health and Wellness Centers (HWCs). Here's how HWCs and telemedicine are connected:
+### **Telemedicine in Health and Wellness Centers (HWCs)**
 
-1. **Teleconsultation**: HWCs utilize telemedicine technology to offer virtual consultations between patients and healthcare professionals. Through video calls, patients can connect with doctors and specialists to discuss their medical concerns, receive diagnoses, and obtain medical advice remotely, eliminating the need for in-person visits.
+Telemedicine is integral to HWCs, enhancing accessibility and efficiency in healthcare services.
 
-2. **Improved Accessibility**: Telemedicine in HWCs improves accessibility to healthcare services. Patients who face difficulties in traveling to the center, such as those residing in remote areas or with limited mobility, can conveniently access medical consultations and services from their own location.
+1. **Teleconsultation** – HWCs use telemedicine for virtual consultations, allowing patients to connect with doctors via video calls for diagnoses, medical advice, and follow-ups, reducing the need for in-person visits.
 
-3. **Outpatient Services**: HWCs primarily focus on outpatient services, catering to patients who do not require hospitalization. Telemedicine facilitates the delivery of these outpatient services by enabling virtual visits, follow-ups, and monitoring, eliminating the need for physical appointments.
+2. **Improved Accessibility** – Patients in remote areas or with mobility issues can access healthcare conveniently without traveling to HWCs.
 
-4. **Medication Management**: Telemedicine can be integrated into the medication management process at HWCs. Doctors can remotely prescribe medications and provide necessary instructions to patients. Patients can then obtain their prescribed medications from the center's drug dispensing facility, ensuring a streamlined medication management process.
+3. **Outpatient Services** – Telemedicine supports outpatient care by enabling virtual visits, follow-ups, and remote monitoring, ensuring timely medical attention without physical appointments.
 
-5. **Collaborative Care**: Telemedicine allows for collaboration between healthcare professionals within the HWC and specialists located in different locations. If a patient requires specialized expertise, telemedicine facilitates video consultations and discussions between the HWC's healthcare team and remote specialists, ensuring comprehensive care for the patient.
+4. **Medication Management** – Doctors can remotely prescribe medications, and patients can collect them from the HWC’s drug dispensing facility, ensuring a smooth medication process.
+
+5. **Collaborative Care** – HWCs can consult specialists via telemedicine for expert opinions, ensuring comprehensive patient care through seamless collaboration.
+
+6. **Integration with Laboratory Services** – IoT-enabled labs can transmit test data directly to the HWC’s application, facilitating real-time consultations and efficient interpretation of results.
+
+Telemedicine strengthens HWCs by bridging geographical gaps, optimizing resources, and ensuring timely medical intervention.
 
-6. **Integration with Laboratory Services**: HWCs often have laboratory facilities for conducting diagnostic tests. Telemedicine can streamline this process by enabling remote monitoring and consultation regarding test results. For example, IoT devices in the laboratory can transmit test data directly to the HWC's application, facilitating seamless communication and interpretation of results during teleconsultations.
 
 ## Building From Source
 
 This microservice is built using Java and the Spring Boot framework, with MySQL as the underlying database. Before building the TM module, ensure you have the following prerequisites:
+For step-by-step guide, follow this [guide] (https://piramal-swasthya.gitbook.io/amrit/developer-guide/development-environment-setup) .
 
-- JDK 1.8
+## Prerequisites
+- JDK 17 (LTS)
 - Maven
-- Redis
-- Spring Boot V2
-- MySQL
 
 To build the TM module from source, follow these steps:
 

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>
@@ -300,7 +300,7 @@
 
 
 	<build>
-		<finalName>tmapi-v3.0.0</finalName>
+		<finalName>${artifactId}-${version}</finalName>
 
 		<plugins>
 			<plugin>

src/main/environment/common_ci.properties

@@ -6,41 +6,41 @@ [email protected]_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,5 +71,9 @@ [email protected]_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@
+springdoc.swagger-ui.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
+