OP-1305 | Add confirm inventory method

src/main/java/org/isf/medicalinventory/manager/MedicalInventoryManager.java

@@ -23,6 +23,7 @@
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -37,11 +38,16 @@
 import org.isf.medicalstock.manager.MovStockInsertingManager;
 import org.isf.medicalstock.model.Lot;
 import org.isf.medicalstock.model.Movement;
+import org.isf.medstockmovtype.manager.MedicalDsrStockMovementTypeBrowserManager;
+import org.isf.medstockmovtype.model.MovementType;
+import org.isf.supplier.manager.SupplierBrowserManager;
+import org.isf.supplier.model.Supplier;
 import org.isf.utils.exception.OHDataValidationException;
 import org.isf.utils.exception.OHServiceException;
 import org.isf.utils.exception.model.OHExceptionMessage;
 import org.isf.utils.exception.model.OHSeverityLevel;
 import org.isf.utils.time.TimeTools;
+import org.isf.ward.manager.WardBrowserManager;
 import org.isf.ward.model.Ward;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
@@ -58,12 +64,20 @@ public class MedicalInventoryManager {
 
 	private MovBrowserManager movBrowserManager;
 
-	public MedicalInventoryManager(MedicalInventoryIoOperation medicalInventoryIoOperation, MedicalInventoryRowManager medicalInventoryRowManager,
-					MovStockInsertingManager movStockInsertingManager,
-					MovBrowserManager movBrowserManager) {
+	private MedicalDsrStockMovementTypeBrowserManager medicalDsrStockMovementTypeBrowserManager;
+
+	private SupplierBrowserManager supplierManager;
+
+	private WardBrowserManager wardManager;
+
+	public MedicalInventoryManager(MedicalInventoryIoOperation medicalInventoryIoOperation, MedicalInventoryRowManager medicalInventoryRowManager, MedicalDsrStockMovementTypeBrowserManager medicalDsrStockMovementTypeBrowserManager,
+					SupplierBrowserManager supplierManager, MovStockInsertingManager movStockInsertingManager, WardBrowserManager wardManager, MovBrowserManager movBrowserManager) {
 		this.ioOperations = medicalInventoryIoOperation;
 		this.medicalInventoryRowManager = medicalInventoryRowManager;
+		this.medicalDsrStockMovementTypeBrowserManager = medicalDsrStockMovementTypeBrowserManager;
+		this.supplierManager = supplierManager;
 		this.movStockInsertingManager = movStockInsertingManager;
+		this.wardManager = wardManager;
 		this.movBrowserManager = movBrowserManager;
 	}
 
@@ -372,4 +386,55 @@ public void deleteInventory(MedicalInventory medicalInventory) throws OHServiceE
 		}
 		ioOperations.deleteInventory(medicalInventory);
 	}
+
+	/**
+	 * Confirm the Inventory rows of inventory.
+	 *
+	 * @param inventory - The {@link MedicalInventory}
+	 * @param inventoryRowSearchList- The list of {@link MedicalInventory}
+	 * @throws OHDataValidationException
+	 */
+	@Transactional(rollbackFor = OHServiceException.class)
+	public List<Movement> confirmMedicalInventoryRow(MedicalInventory inventory, List<MedicalInventoryRow> inventoryRowSearchList) throws OHServiceException {
+		// validate the inventory
+		this.validateMedicalInventoryRow(inventory, inventoryRowSearchList);
+		// get general info
+		String referenceNumber = inventory.getInventoryReference();
+		// TODO: make possibility to allow charges and discharges with same referenceNumber
+		String chargeReferenceNumber = referenceNumber + "-charge";
+		String dischargeReferenceNumber = referenceNumber + "-discharge";
+		MovementType chargeType = medicalDsrStockMovementTypeBrowserManager.getMovementType(inventory.getChargeType());
+		MovementType dischargeType = medicalDsrStockMovementTypeBrowserManager.getMovementType(inventory.getDischargeType());
+		Supplier supplier = supplierManager.getByID(inventory.getSupplier());
+		Ward ward = wardManager.findWard(inventory.getDestination());
+		LocalDateTime now = TimeTools.getNow();
+		// prepare movements
+		List<Movement> chargeMovements = new ArrayList<>();
+		List<Movement> dischargeMovements = new ArrayList<>();
+		for (Iterator<MedicalInventoryRow> iterator = inventoryRowSearchList.iterator(); iterator.hasNext();) {
+			MedicalInventoryRow medicalInventoryRow = (MedicalInventoryRow) iterator.next();
+
+			double theoQty = medicalInventoryRow.getTheoreticQty();
+			double realQty = medicalInventoryRow.getRealQty();
+			Double ajustQty = realQty - theoQty;
+			Medical medical = medicalInventoryRow.getMedical();
+			Lot currentLot = medicalInventoryRow.getLot();
+			if (ajustQty > 0) { // charge movement when realQty > theoQty
+				Movement movement = new Movement(medical, chargeType, null, currentLot, now, ajustQty.intValue(), supplier, chargeReferenceNumber);
+				chargeMovements.add(movement);
+			} else if (ajustQty < 0) { // discharge movement when realQty < theoQty
+				Movement movement = new Movement(medical, dischargeType, ward, currentLot, now, -(ajustQty.intValue()), null, dischargeReferenceNumber);
+				dischargeMovements.add(movement);
+			} // else ajustQty = 0, continue
+		}
+		// create movements
+		List<Movement> insertedMovements = new ArrayList<>();
+		if (!chargeMovements.isEmpty()) {
+			insertedMovements.addAll(movStockInsertingManager.newMultipleChargingMovements(chargeMovements, chargeReferenceNumber));
+		}
+		if (!dischargeMovements.isEmpty()) {
+			insertedMovements.addAll(movStockInsertingManager.newMultipleDischargingMovements(dischargeMovements, dischargeReferenceNumber));
+		}
+		return insertedMovements;
+	}
 }

src/main/java/org/isf/medicalstock/service/MedicalStockIoOperations.java

@@ -91,7 +91,7 @@ public enum MovementOrder {
 	 * 
 	 * @return {@code true} if automatic lot mode, {@code false} otherwise.
 	 */
-	private boolean isAutomaticLotMode() {
+	private boolean isAutomaticLotInMode() {
 		return GeneralData.AUTOMATICLOT_IN;
 	}
 
@@ -180,26 +180,23 @@ public List<Movement> newAutomaticDischargingMovement(Movement movement) throws
 	 * Stores the specified {@link Movement}.
 	 * 
 	 * @param movement - the movement to store.
+	 * @return the stored {@link Movement}.
 	 * @throws OHServiceException if an error occurs during the store operation.
 	 */
 	public Movement newMovement(Movement movement) throws OHServiceException {
 		String lotCode = null;
+		Lot lot = movement.getLot();
 
-		if (movement.getLot() != null) {
-			lotCode = movement.getLot().getCode();
+		if (lot != null) {
+			lotCode = lot.getCode();
 		}
 
-		// we have to manage the Lot
-		if (movement.getType().getType().contains("+")) {
-			// if is in automatic lot mode then we have to generate a new lot code
-			if (isAutomaticLotMode() || "".equals(lotCode)) {
-				lotCode = generateLotCode();
-			}
-
-			boolean lotExists = lotExists(lotCode);
-			if (!lotExists) {
-				storeLot(lotCode, movement.getLot(), movement.getMedical());
-			}
+		// if charging we have to manage the Lot, if discharging the lot should be given
+		boolean chargeMovement = movement.getType().getType().contains("+");
+		boolean lotExists = lotExists(lotCode);
+		if (chargeMovement && !lotExists) {
+			lot = storeLot(lotCode, movement.getLot(), movement.getMedical());
+			lotCode = lot.getCode();
 		}
 
 		Movement movementStored = storeMovement(movement, lotCode);
@@ -312,7 +309,7 @@ public Lot updateLot(Lot lot) throws OHServiceException {
 	/**
 	 * Stores the specified {@link Lot}.
 	 * 
-	 * @param lotCode the {@link Lot} code.
+	 * @param lotCode the {@link Lot} code. If {@code null} or {@code empty} it will be generated.
 	 * @param lot the lot to store.
 	 * @param medical
 	 * @return the stored {@link Lot} object.
@@ -322,6 +319,9 @@ public Lot updateLot(Lot lot) throws OHServiceException {
 	public Lot storeLot(String lotCode, Lot lot, Medical medical) throws OHServiceException {
 		if (lotCode == null || lotCode.equals("")) {
 			lotCode = this.generateLotCode();
+			if (!isAutomaticLotInMode()) {
+				LOGGER.warn("AUTOMATICLOT_IN mode set to 'false' but lot code not provided. Generating... {}.", lotCode);
+			}
 		}
 		lot.setCode(lotCode);
 		lot.setMedical(medical);
@@ -590,7 +590,8 @@ public List<Movement> getMovementForPrint(
 	}
 
 	/**
-	 * Retrieves lot referred to the specified {@link Medical}, expiring first on top Lots with zero quantities will be stripped out if removeEmpty is set to true.
+	 * Retrieves lot referred to the specified {@link Medical}, expiring first on top Lots with zero quantities will be stripped out if removeEmpty is set to
+	 * true.
 	 * 
 	 * @param medical the medical.
 	 * @param removeEmpty

src/main/java/org/isf/supplier/model/Supplier.java

@@ -101,6 +101,7 @@ public Supplier() {
 	 * @param supEmail
 	 * @param supNote
 	 */
+	// TODO: to verify if it is really needed to have supID in the constructor
 	public Supplier(Integer supID, String supName, String supAddress, String supTaxcode, String supPhone, String supFax, String supEmail, String supNote) {
 		this.supId = supID;
 		this.supName = supName;
@@ -123,6 +124,7 @@ public Supplier(Integer supID, String supName, String supAddress, String supTaxc
 	 * @param supNote
 	 * @param supDeleted
 	 */
+	// TODO: to remove, used only in tests
 	public Supplier(Integer supID, String supName, String supAddress, String supTaxcode, String supPhone, String supFax, String supEmail, String supNote,
 					Character supDeleted) {
 		this.supId = supID;

src/test/java/org/isf/medicalsinventory/TestMedicalInventory.java

@@ -27,20 +27,23 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
+import org.isf.medicalinventory.model.InventoryStatus;
+import org.isf.medicalinventory.model.InventoryType;
 import org.isf.medicalinventory.model.MedicalInventory;
 import org.isf.utils.exception.OHException;
+import org.isf.utils.time.TimeTools;
 import org.isf.ward.model.Ward;
 
 public class TestMedicalInventory {
 
 	private int id = 1;
-	private String status = "STATUS";
-	private LocalDateTime inventoryDate = LocalDateTime.now();
-	private String user = "USER";
+	private String status = InventoryStatus.draft.toString();
+	private LocalDateTime inventoryDate = TimeTools.getNow();
+	private String user = "admin";
 	private String inventoryReference = "REFERENCE";
-	private String inventoryType = "TYPE";
+	private String inventoryType = InventoryType.main.toString();
 	private String ward = "Z";
-	private int supplier = 3;
+	private int supplier = 1;
 	private String destination = "INV";
 	private String charge = "inventory+";
 	private String discharge = "inventory-";