Merge branch 'PSMRI:develop' into develop

.github/workflows/checkstyle.yml

@@ -0,0 +1,13 @@
+name: Call Checkstyle
+
+on:
+  pull_request:
+    branches: ["master", "develop"]
+    paths:
+      - '**/*.java'
+
+jobs:
+  style-check:
+    uses: PSMRI/.github/.github/workflows/checkstyle.yml@main
+    with:
+      java-version: '17'

.gitignore

@@ -6,6 +6,7 @@
 /out-tsc
 /target
 /logs
+command_output.log
 
 # dependencies
 /node_modules

README.md

@@ -22,3 +22,12 @@ Detailed information on API endpoints can be found in the [API Guide](https://pi
 
 ## Usage
 All features have been exposed as REST endpoints. Refer to the SWAGGER API specification for details.
+
+## Filing Issues
+
+If you encounter any issues, bugs, or have feature requests, please file them in the [main AMRIT repository](https://github.com/PSMRI/AMRIT/issues). Centralizing all feedback helps us streamline improvements and address concerns efficiently.  
+
+## Join Our Community
+
+We’d love to have you join our community discussions and get real-time support!  
+Join our [Discord server](https://discord.gg/FVQWsf5ENS) to connect with contributors, ask questions, and stay updated.  

checkstyle.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+    <property name="severity" value="warning" />
+    <property name="fileExtensions" value="java" />
+
+    <!-- Checks for Size Violations -->
+    <module name="FileLength">
+        <property name="max" value="500" />
+    </module>
+    <module name="LineLength">
+        <property name="max" value="120" />
+    </module>
+
+    <module name="TreeWalker">
+        <!-- Checks for Naming Conventions -->
+        <module name="MethodName" />
+        <module name="PackageName" />
+        <module name="TypeName" />
+        <module name="ParameterName" />
+        <module name="LocalVariableName" />
+        <module name="MemberName" />
+
+        <!-- Checks for imports -->
+        <module name="AvoidStarImport" />
+        <module name="IllegalImport" />
+        <module name="RedundantImport" />
+        <module name="UnusedImports" />
+
+        <!-- Checks for Size Violations -->
+        <module name="MethodLength">
+            <property name="max" value="50" />
+        </module>
+
+        <!-- Checks for whitespace -->
+        <module name="EmptyLineSeparator" />
+        <module name="GenericWhitespace" />
+        <module name="MethodParamPad" />
+        <module name="NoWhitespaceAfter" />
+        <module name="NoWhitespaceBefore" />
+        <module name="ParenPad" />
+        <module name="TypecastParenPad" />
+        <module name="WhitespaceAfter" />
+        <module name="WhitespaceAround" />
+
+        <!-- Modifier Checks -->
+        <module name="ModifierOrder" />
+        <module name="RedundantModifier" />
+
+        <!-- Checks for blocks -->
+        <module name="EmptyBlock" />
+        <module name="LeftCurly" />
+        <module name="RightCurly" />
+        <module name="NeedBraces" />
+
+        <!-- Checks for common coding problems -->
+        <module name="EmptyStatement" />
+        <module name="EqualsHashCode" />
+        <module name="IllegalInstantiation" />
+        <module name="MissingSwitchDefault" />
+        <module name="SimplifyBooleanExpression" />
+        <module name="SimplifyBooleanReturn" />
+    </module>
+</module>

pom.xml

@@ -390,9 +390,35 @@
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
 			</plugin>
-
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>3.3.1</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.puppycrawl.tools</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>10.12.7</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<configLocation>checkstyle.xml</configLocation>
+					<encoding>UTF-8</encoding>
+					<consoleOutput>true</consoleOutput>
+					<failsOnError>true</failsOnError>
+					<linkXRef>false</linkXRef>
+				</configuration>
+				<executions>
+					<execution>
+						<id>validate</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
-
 	</build>
 	<dependencyManagement>
 		<dependencies>

src/main/environment/common_example.properties

@@ -1,6 +1,7 @@
-benSearchByBenIDURL=http://localhost:8080/commonapi-v1.0/beneficiary/searchUserByID
-userAuthURL=http://localhost:8080/commonapi-v1.0/user/userAuthenticate
+server.port=8093
 
+benSearchByBenIDURL=http://localhost:8083/beneficiary/searchUserByID
+userAuthURL=http://localhost:8083/user/userAuthenticate
 # E-aushadhi
 eaushadhiStoreStockDetailsUrl=https://uatbiharsso.dcservices.in/eAushadhi_BIHAR/rest/storeStockDetailsService/
 eaushadhiStoreStockAckUrl=https://uatbiharsso.dcservices.in/eAushadhi_BIHAR/rest/AcknowledgeStoreStockService/
@@ -9,18 +10,18 @@ fhirUserName=<Enter FHIR username here>
 fhirPassword=<Enter FHIR password here>
 
 # DB Connections (MySQL)
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
+spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
+spring.datasource.username=root
+spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 # DB Connection (Mongo DB)
-spring.data.mongodb.host=<Enter Mongo DB host ip address>
+spring.data.mongodb.host=localhost
 spring.data.mongodb.port=27017
-spring.data.mongodb.authentication-database=<Enter MongoDB authentication database name>
-spring.data.mongodb.database=<Enter MongoDB database name>
-spring.data.mongodb.username=<Enter MongoDB username>
-spring.data.mongodb.password=<Enter MongoDB password>
+spring.data.mongodb.authentication-database=admin
+spring.data.mongodb.database=amrit
+spring.data.mongodb.username=root
+spring.data.mongodb.password=1234
 
 atomsFeedStartPage=1
 parentUrl=https://demo.mybahmni.org