Release 3.5.0

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.inventory</groupId>
 	<artifactId>inventory-api</artifactId>
-	<version>3.4.0</version>
+	<version>3.5.0</version>
 	<packaging>war</packaging>
 	<name>Inventory-API</name>
 	<description>Inventory Page</description>
@@ -111,11 +111,11 @@
 			<artifactId>jersey-media-multipart</artifactId>
 			<version>2.0-m11</version>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>2.0.7</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -215,14 +215,26 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
+			<!-- <exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-logging</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> -->
 			<!-- <version>2.5.5</version> Use the latest stable version -->
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j.version}</version>
+			</dependency>
+
+
 		<dependency>
 			<groupId>org.springframework.plugin</groupId>
 			<artifactId>spring-plugin-core</artifactId>

src/main/java/com/iemr/inventory/controller/report/CRMReportController.java

@@ -211,7 +211,7 @@
 			ItemStockEntryReport report = InputMapper.gson().fromJson(request, ItemStockEntryReport.class);
 			String res = crmReportService.getShortExpiryReport(report);
 			response.setResponse(res);
-			logger.info("getShortExpiryReport response " + response.toString());
+			logger.info("Short Expiry Report response:" + response.toString());
 		} catch (Exception e) {
 			logger.error(e.getMessage());
 			response.setError(e);

src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java

@@ -53,6 +53,7 @@ public interface InventoryReportMapper {
 	@Mappings({ @Mapping(target = "facilityName", expression = "java(entryReport.getFacilityName())"),
 		@Mapping(target = "itemName", expression = "java(entryReport.getItemName())"),
 		@Mapping(target = "itemCategory", expression = "java(entryReport.getItemCategoryName())"),
+		@Mapping(target = "strength", expression = "java(entryReport.getStrength())"),
 		@Mapping(target = "batchNo", expression = "java(entryReport.getBatchNo())"),
 		@Mapping(target = "unitCostPrice", expression = "java(entryReport.getUnitCostPrice())"),
 		@Mapping(target = "expiryDate", expression = "java(entryReport.getExpiryDate())"),

src/main/java/com/iemr/inventory/model/report/ExpiryReport.java

@@ -40,6 +40,8 @@
 
 	private String itemCategory;
 
+	private String strength;
+
 	private String batchNo;
 
 	private Double unitCostPrice;
@@ -52,12 +54,13 @@
 
 	}
 
-	public ExpiryReport(String facilityName, String itemName, String itemCategory, String batchNo, Double unitCostPrice,
+	public ExpiryReport(String facilityName, String itemName, String itemCategory, String Strength, String batchNo, Double unitCostPrice,
 			Date expiryDate, Integer quantityInHand) {
 
 		this.facilityName = facilityName;
 		this.itemName = itemName;
 		this.itemCategory = itemCategory;
+		this.strength = Strength;
 		this.batchNo = batchNo;
 		this.unitCostPrice = unitCostPrice;
 		this.expiryDate = expiryDate;

src/main/java/com/iemr/inventory/repo/report/ItemStockReportRepo.java

@@ -99,11 +99,11 @@ List<Object[]> getDailyStockDetailReportByFacilityID(@Param("startDate") Date st
 	List<Object[]> getDailyStockSummaryReportByFacilityID(@Param("startDate") Date startDate,
 			@Param("endDate") Date endDate, @Param("facilityID") Integer facilityID);
 
-	@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
+	@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, Strength, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
 			+ "where ExpiryDate >= :startDate and ExpiryDate <= adddate(:startDate,AlertBeforeDays) and Deleted=false order by ExpiryDate asc",nativeQuery=true)
 	List<Object[]> getShortExpiryReport(@Param("startDate") Date startDate);
 
-	@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
+	@Query(value="Select distinct FacilityName, ItemName, ItemCategoryName, Strength, BatchNo, UnitCostPrice, ExpiryDate, QuantityInHand from db_reporting.fact_itemstockentry "
 			+ "where ExpiryDate >= :startDate and ExpiryDate <= adddate(:startDate,AlertBeforeDays) and FacilityID = :facilityID and Deleted=false order by ExpiryDate asc",nativeQuery=true)
 	List<Object[]> getShortExpiryReportByFacilityID(@Param("startDate") Date startDate,
 			@Param("facilityID") Integer facilityID);

src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java

@@ -27,6 +27,8 @@
 import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,6 +59,8 @@
 	@Autowired(required=false)
 	InventoryReportMapper mapper;
 
+	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
 	@Override
 	public String getInwardStockReport(ItemStockEntryReport entryReport) {
 
@@ -98,9 +102,10 @@
 						object[1] != null ? object[1].toString() : null,
 						object[2] != null ? object[2].toString() : null,
 						object[3] != null ? object[3].toString() : null,
-						object[4] != null ? Double.valueOf(object[4].toString()) : null,
-						(Date) (object[5] != null ? object[5] : null),
-						(Integer) (object[6] != null ? object[6] : null));
+						object[4] != null ? object[4].toString() : null,
+						object[5] != null ? Double.valueOf(object[5].toString()) : null,
+						(Date) (object[6] != null ? object[6] : null),
+						(Integer) (object[7] != null ? object[7] : null));
 
 				report.setSlNo(slNo++);
 				reportList.add(report);
@@ -618,6 +623,10 @@
 			list = itemStockReportRepo.getShortExpiryReport(startExpiry);
 		}
 
+		logger.info("Short Expiry Report Start Date: " + startExpiry + " End Date: " + endExpiry);
+
+		logger.info("Short Expiry Report List Size: " + list.size());
+
 		Long slNo = 1L;
 
 		for (Object[] object : list) {
@@ -627,9 +636,10 @@
 						object[1] != null ? object[1].toString() : null,
 						object[2] != null ? object[2].toString() : null,
 						object[3] != null ? object[3].toString() : null,
-						object[4] != null ? ((BigDecimal) object[4]).doubleValue() : null,
-						(Date) (object[5] != null ? object[5] : null),
-						(Integer) (object[6] != null ? object[6] : null));
+						object[4] != null ? object[4].toString() : null,
+						object[5] != null ? ((BigDecimal) object[5]).doubleValue() : null,
+						(Date) (object[6] != null ? object[6] : null),
+						(Integer) (object[7] != null ? object[7] : null));
 
 				report.setSlNo(slNo++);
 				reportList.add(report);

src/main/java/com/iemr/inventory/service/stockEntry/StockEntryServiceImpl.java

@@ -148,22 +148,13 @@
 			throws InventoryException {
 
 		List<AllocateItemMap> allocateItemMapList = new ArrayList<AllocateItemMap>();
-
+		logger.info("ItemStockExitList Size:" + itemStockExitList.size());
 		for (ItemStockExit itemStockExit : itemStockExitList) {
 			AllocateItemMap allocateItemMap = new AllocateItemMap();
 			List<ItemStockEntry> itemStockList = new ArrayList<ItemStockEntry>();
 
 			ItemMaster item = itemService.getItemMasterCatByID(itemStockExit.getItemID());
 
-
-System.out.println("Test Item: " + item.toString());
-System.out.println("Test item category: "+ item.getItemCategory());
-System.out.println("Test item issuetype: "+ item.getItemCategory().getIssueType());
-System.out.println("Test facilityID: "+ item.getFacilityID());
-System.out.println("Test itemStockExit: "+ itemStockExit.toString());
-System.out.println("Test itemStockExit.getDuration(): "+ itemStockExit.getDuration());
-
-
 			allocateItemMap.setFacilityID(item.getFacilityID());
 			allocateItemMap.setItemID(item.getItemID());
 			allocateItemMap.setItemName(item.getItemName());