JUnit Test cases and SonarQube issues fix v5

PSMRI · Mar 11, 2024 · 25c8354 · 25c8354
1 parent cc4f50c
commit 25c8354
Show file tree

Hide file tree

Showing 72 changed files with 548 additions and 1,189 deletions.
diff --git a/src/main/java/com/iemr/inventory/config/RedisConfig.java b/src/main/java/com/iemr/inventory/config/RedisConfig.java
@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 
 

diff --git a/src/main/java/com/iemr/inventory/data/dispenseagainst_rx/PrescribedDrugDetails.java b/src/main/java/com/iemr/inventory/data/dispenseagainst_rx/PrescribedDrugDetails.java
@@ -24,6 +24,8 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 
+import com.google.gson.annotations.Expose;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -32,8 +34,6 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 
-import com.google.gson.annotations.Expose;
-
 @Entity
 @Table(name = "v_getprescribeddrugswithdetails")
 public class PrescribedDrugDetails {

diff --git a/src/main/java/com/iemr/inventory/data/drugtype/M_Drugtype.java b/src/main/java/com/iemr/inventory/data/drugtype/M_Drugtype.java
@@ -23,6 +23,9 @@
 
 import java.sql.Date;
 
+import com.google.gson.annotations.Expose;
+import com.iemr.inventory.utils.mapper.OutputMapper;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -31,9 +34,6 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 
-import com.google.gson.annotations.Expose;
-import com.iemr.inventory.utils.mapper.OutputMapper;
-
 @Entity
 @Table(name="m_drugtype")
 public class M_Drugtype {

diff --git a/src/main/java/com/iemr/inventory/data/facilitytype/M_facilitytype.java b/src/main/java/com/iemr/inventory/data/facilitytype/M_facilitytype.java
@@ -23,6 +23,9 @@
 
 import java.sql.Date;
 
+import com.google.gson.annotations.Expose;
+import com.iemr.inventory.utils.mapper.OutputMapper;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -31,9 +34,6 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 
-import com.google.gson.annotations.Expose;
-import com.iemr.inventory.utils.mapper.OutputMapper;
-
 @Entity
 @Table(name="m_facilitytype")
 public class M_facilitytype {
@@ -87,14 +87,9 @@ public class M_facilitytype {
 
 
 	public M_facilitytype() {
-		// TODO Auto-generated constructor stub
 	}
 
-
-
-
-
-
+
 
 	public Integer getFacilityTypeID() {
 		return facilityTypeID;

diff --git a/src/main/java/com/iemr/inventory/data/indent/Indent.java b/src/main/java/com/iemr/inventory/data/indent/Indent.java
@@ -25,6 +25,10 @@
 import java.sql.Timestamp;
 import java.util.List;
 
+import com.google.gson.annotations.Expose;
+import com.iemr.inventory.data.store.M_Facility;
+import com.iemr.inventory.utils.mapper.OutputMapper;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -36,114 +40,108 @@
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
-
-import com.google.gson.annotations.Expose;
-import com.iemr.inventory.data.store.M_Facility;
-import com.iemr.inventory.utils.mapper.OutputMapper;
-
 import lombok.Data;
 
 @Entity
 @Data
-@Table(name="t_indent")
+@Table(name = "t_indent")
 public class Indent implements Serializable {
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Expose
-	@Column(name="IndentID")
+	@Column(name = "IndentID")
 	private Long indentID;
-	
+
 	@Expose
-	@Column(name="FromFacilityID")
+	@Column(name = "FromFacilityID")
 	private Integer fromFacilityID;
-	
+
 	@Expose
-	@Column(name="SyncFacilityID")
+	@Column(name = "SyncFacilityID")
 	private Integer syncFacilityID;
-	
+
 	@Expose
-	@Column(name="FromFacilityName")
+	@Column(name = "FromFacilityName")
 	private String fromFacilityName;
-	
+
 	@Expose
-	@Column(name="ToFacilityID")
+	@Column(name = "ToFacilityID")
 	private Integer toFacilityID;
-	
+
 	@Expose
-	@Column(name="RefNo")
+	@Column(name = "RefNo")
 	private String refNo;
-	
+
 	@Expose
-	@Column(name="OrderDate")
+	@Column(name = "OrderDate")
 	private Timestamp orderDate;
-	
+
 	@Expose
-	@Column(name="Reason")
+	@Column(name = "Reason")
 	private String reason;
-	
+
 	@Expose
-	@Column(name="UserID")
+	@Column(name = "UserID")
 	private Integer userID;
-	
+
 	@Expose
-	@Column(name="ProviderServiceMapID")
+	@Column(name = "ProviderServiceMapID")
 	private Integer providerServiceMapID;
-	
+
 	@Expose
-	@Column(name="Status")
+	@Column(name = "Status")
 	private String status;
-
-
+
 	@Expose
-	@Column(name="StatusReason")
+	@Column(name = "StatusReason")
 	private String statusReason;
-	
+
 	@Expose
-	@Column(name="Deleted", updatable = true, insertable = false)
+	@Column(name = "Deleted", updatable = true, insertable = false)
 	private Boolean deleted;
-	
+
 	@Expose
-	@Column(name="Processed")
+	@Column(name = "Processed")
 	private String processed;
-	
+
 	@Expose
-	@Column(name="CreatedBy")
+	@Column(name = "CreatedBy")
 	private String createdBy;
-	
+
 	@Expose
-	@Column(name="CreatedDate")
+	@Column(name = "CreatedDate")
 	private Timestamp createdDate;
-	
+
 	@Expose
-	@Column(name="ModifiedBy")
+	@Column(name = "ModifiedBy")
 	private String modifiedBy;
-	
+
 	@Expose
-	@Column(name="LastModDate", updatable = false, insertable = false)
+	@Column(name = "LastModDate", updatable = false, insertable = false)
 	private Timestamp lastModDate;
-	
+
 	@Expose
-	@Column(name="VanID")
+	@Column(name = "VanID")
 	private Long vanID;
-	
+
 	@Expose
-	@Column(name="ParkingPlaceID")
+	@Column(name = "ParkingPlaceID")
 	private Long parkingPlaceID;
-	
+
 	@Expose
-	@Column(name="VanSerialNo", updatable = true, insertable = false)
+	@Column(name = "VanSerialNo", updatable = true, insertable = false)
 	private Long vanSerialNo;
-	
+
 	@Expose
 	@Transient
 	@OneToMany(fetch = FetchType.LAZY, mappedBy = "indent")
 	private List<IndentOrder> indentOrder;
-	
+
 	@OneToOne(fetch = FetchType.LAZY)
 	@JoinColumn(updatable = false, insertable = false, name = "fromFacilityID", referencedColumnName = "facilityID")
 	private M_Facility m_Facility;
-	
+
 	@Transient
 	private OutputMapper outputMapper = new OutputMapper();
 
@@ -152,6 +150,4 @@ public String toString() {
 		return outputMapper.gson().toJson(this);
 	}
 
-
-
 }
diff --git a/src/main/java/com/iemr/inventory/data/indent/IndentIssue.java b/src/main/java/com/iemr/inventory/data/indent/IndentIssue.java
@@ -24,17 +24,16 @@
 import java.sql.Timestamp;
 import java.util.Date;
 
+import com.google.gson.annotations.Expose;
+import com.iemr.inventory.utils.mapper.OutputMapper;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
-
-import com.google.gson.annotations.Expose;
-import com.iemr.inventory.utils.mapper.OutputMapper;
-
 import lombok.Data;
 
 @Entity
@@ -165,19 +164,4 @@ public class IndentIssue {
 	public String toString() {
 		return outputMapper.gson().toJson(this);
 	}
-
-	public Long getIndentID() {
-
-		return null;
-	}
-
-	public String getRejectedReason() {
-
-		return null;
-	}
-
-	public String getAction() {
-
-		return null;
-	}
 }
diff --git a/src/main/java/com/iemr/inventory/data/indent/IndentOrder.java b/src/main/java/com/iemr/inventory/data/indent/IndentOrder.java
@@ -22,7 +22,10 @@
 package com.iemr.inventory.data.indent;
 
 import java.sql.Timestamp;
-import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.iemr.inventory.data.items.ItemMaster;
+import com.iemr.inventory.utils.mapper.OutputMapper;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -35,11 +38,6 @@
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
-
-import com.google.gson.annotations.Expose;
-import com.iemr.inventory.data.items.ItemMaster;
-import com.iemr.inventory.utils.mapper.OutputMapper;
-
 import lombok.Data;
 
 @Data