GetBenHealthIdDetails API changes

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

@@ -17,7 +17,6 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 17
-          distribution: 'zulu'
-
+          distribution: 'adopt'
       - name: Build with Maven  
         run: mvn clean install

.github/workflows/package.yml

@@ -26,7 +26,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         java-version: 17
-        distribution: 'zulu'
+        distribution: 'adopt'
 
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
@@ -35,7 +35,7 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3 
       with:
         name: FHIR-API
         path: target/fhirapi-v1.0.war

.github/workflows/sast.yml

@@ -41,10 +41,10 @@ jobs:
       uses: actions/setup-java@v2
       with:
           java-version: 17
-          distribution: 'zulu'
+          distribution: 'adopt'
 
     - name: Build with Maven
-      run: mvn clean install
+      run: mvn clean install -DENV_VAR=test
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

pom.xml

@@ -58,10 +58,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>co.elastic.logging</groupId>
-			<artifactId>logback-ecs-encoder</artifactId>
-			<version>1.3.2</version>
+		<dependency> 
+			<groupId>co.elastic.logging</groupId> 
+			<artifactId>logback-ecs-encoder</artifactId> 
+			<version>1.3.2</version> 
 		</dependency>
 
 		<dependency>
@@ -189,15 +189,17 @@
 			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-structures-r4 -->
+		<!--
+		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-structures-r4 -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-r4</artifactId>
 			<version>7.0.2</version>
 		</dependency>
 
 
-		<!-- https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/org.hl7.fhir.utilities -->
+		<!--
+		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/org.hl7.fhir.utilities -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>org.hl7.fhir.utilities</artifactId>
@@ -233,27 +235,6 @@
 			<artifactId>json-path</artifactId>
 			<version>2.9.0</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt-api</artifactId>
-			<version>0.12.6</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-impl -->
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt-impl</artifactId>
-			<version>0.12.6</version>
-			<scope>runtime</scope>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-jackson -->
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt-jackson</artifactId>
-			<version>0.12.6</version>
-			<scope>runtime</scope>
-		</dependency>
-
 
 	</dependencies>
 
@@ -269,7 +250,7 @@
 					<format>HTML</format>
 					<nvdApiServerId>nvd</nvdApiServerId>
 				</configuration>
-
+				
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -348,7 +329,8 @@
 									${target-properties} and
 									${source-properties}
 								</echo>
-								<concat destfile="${target-properties}" append="yes"
+								<concat destfile="${target-properties}"
+									append="yes"
 									force="yes">
 									<fileset file="${source-properties}">
 									</fileset>

src/main/environment/common_ci.properties

@@ -110,5 +110,4 @@ logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
 
 #ELK logging file name
-[email protected]_API_LOGGING_FILE_NAME@
-[email protected]_SECRET_KEY@
+[email protected]_API_LOGGING_FILE_NAME@

src/main/environment/common_dev.properties

@@ -107,4 +107,3 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
-jwt.secret=

src/main/environment/common_example.properties

@@ -109,4 +109,3 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
-jwt.secret=

src/main/environment/common_test.properties

@@ -108,4 +108,3 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
-jwt.secret=

src/main/java/com/wipro/fhir/FhirApiApplication.java

@@ -26,32 +26,11 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
-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 com.wipro.fhir.data.users.User;
 
 @SpringBootApplication
 public class FhirApiApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(FhirApiApplication.class, args);
 	}
-
-	@Bean
-	public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
-		RedisTemplate<String, Object> template = new RedisTemplate<>();
-		template.setConnectionFactory(factory);
-
-		// Use StringRedisSerializer for keys (userId)
-		template.setKeySerializer(new StringRedisSerializer());
-
-		// Use Jackson2JsonRedisSerializer for values (Users objects)
-		Jackson2JsonRedisSerializer<User> serializer = new Jackson2JsonRedisSerializer<>(User.class);
-		template.setValueSerializer(serializer);
-
-		return template;
-	}
 }

src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java

@@ -30,10 +30,12 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
+import lombok.Data;
 
 import com.google.gson.annotations.Expose;
 @Entity
 @Table(name = "m_benhealthidmapping")
+@Data
 public class BenHealthIDMapping {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -57,13 +59,6 @@ public class BenHealthIDMapping {
 	@Expose
 	@Column(name = "AuthenticationMode")
     String authenticationMode;
-
-	public String getAuthenticationMode() {
-		return authenticationMode;
-	}
-	public void setAuthenticationMode(String authenticationMode) {
-		this.authenticationMode = authenticationMode;
-	}
 	@Column(name = "Deleted", insertable = false, updatable = true)
 	private Boolean deleted = false;
 	@Expose
@@ -79,77 +74,8 @@ public void setAuthenticationMode(String authenticationMode) {
 	private String modifiedBy;
 	@Column(name = "LastModDate", insertable = false, updatable = false)
 	private Timestamp lastModDate;
-	public Integer getBenHealthID() {
-		return benHealthID;
-	}
-	public void setBenHealthID(Integer benHealthID) {
-		this.benHealthID = benHealthID;
-	}
-	public String getHealthIdNumber() {
-		return healthIdNumber;
-	}
-	public void setHealthIdNumber(String healthIdNumber) {
-		this.healthIdNumber = healthIdNumber;
-	}
-	public Integer getProviderServiceMapID() {
-		return providerServiceMapId;
-	}
-	public void setProviderServiceMapID(Integer providerServiceMapID) {
-		this.providerServiceMapId = providerServiceMapID;
-	}
-	public Long getBeneficiaryRegId() {
-		return beneficiaryRegID;
-	}
-	public void setBeneficiaryRegId(Long beneficiaryRegId) {
-		this.beneficiaryRegID = beneficiaryRegId;
-	}
-	public String getHealthId() {
-		return healthId;
-	}
-	public void setHealthId(String healthId) {
-		this.healthId = healthId;
-	}
-	public Boolean getDeleted() {
-		return deleted;
-	}
-	public void setDeleted(Boolean deleted) {
-		this.deleted = deleted;
-	}
-	public String getProcessed() {
-		return processed;
-	}
-	public void setProcessed(String processed) {
-		this.processed = processed;
-	}
-	public String getCreatedBy() {
-		return createdBy;
-	}
-	public void setCreatedBy(String createdBy) {
-		this.createdBy = createdBy;
-	}
-	public Timestamp getCreatedDate() {
-		return createdDate;
-	}
-	public void setCreatedDate(Timestamp createdDate) {
-		this.createdDate = createdDate;
-	}
-	public String getModifiedBy() {
-		return modifiedBy;
-	}
-	public void setModifiedBy(String modifiedBy) {
-		this.modifiedBy = modifiedBy;
-	}
-	public Timestamp getLastModDate() {
-		return lastModDate;
-	}
-	public void setLastModDate(Timestamp lastModDate) {
-		this.lastModDate = lastModDate;
-	}
-	public Long getBeneficiaryID() {
-		return beneficiaryID;
-	}
-	public void setBeneficiaryID(Long beneficiaryID) {
-		this.beneficiaryID = beneficiaryID;
-	}
 
+	@Transient
+	private boolean isNewAbha;
+
 }

src/main/java/com/wipro/fhir/data/v3/abhaCard/LoginMethod.java

@@ -7,6 +7,7 @@ public class LoginMethod {
 
 	private String loginId;
 	private String loginMethod;
+	private String loginHint;
 	private String pId;
 	private String txnId;
 	private String mobileNumber;

src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java

@@ -75,5 +75,8 @@ public interface BenHealthIDMappingRepo extends CrudRepository<BenHealthIDMappin
 	@Modifying
 	@Query(value = "UPDATE db_iemr.t_benvisitdetail SET AbdmFacilityID = :abdmFacilityId WHERE VisitCode= :visitCode", nativeQuery = true)
 	Integer updateFacilityIdForVisit(@Param("visitCode") BigInteger visitCode, @Param("abdmFacilityId") String abdmFacilityId);
+
+	@Query(value = "select isNewAbha from t_healthid where HealthIdNumber=:healthIdNumber order by 1 desc limit 1", nativeQuery = true)
+	boolean getIsNewAbha(@Param("healthIdNumber") String healthIdNumber);
 
 }