#149|Disable Zero Current quantity and support fractional value for receivedQuantity and dispatchedQuantity

Author: ramakanthk711

goonj/src/main/java/org/avni_integration_service/goonj/dto/DispatchReceivedStatusLineItem.java

@@ -30,9 +30,9 @@ public class DispatchReceivedStatusLineItem {
     @JsonProperty("ReceivingStatus")
     private String receivingStatus;
     @JsonProperty("DispatchedQuantity")
-    private int dispatchedQuantity;
+    private double dispatchedQuantity;
     @JsonProperty("ReceivedQuantity")
-    private int receivedQuantity;
+    private double receivedQuantity;
 
     /**
      * No args constructor for use in serialization
@@ -51,7 +51,7 @@ public DispatchReceivedStatusLineItem() {
      * @param dispatchedQuantity
      * @param receivedQuantity
      */
-    public DispatchReceivedStatusLineItem(String sourceId, String typeOfMaterial, String itemName, String dispatchStatusLineItem, String unit, String receivingStatus, int dispatchedQuantity, int receivedQuantity) {
+    public DispatchReceivedStatusLineItem(String sourceId, String typeOfMaterial, String itemName, String dispatchStatusLineItem, String unit, String receivingStatus, double dispatchedQuantity, double receivedQuantity) {
         super();
         this.sourceId = sourceId;
         this.typeOfMaterial = typeOfMaterial;
@@ -124,7 +124,7 @@ public void setReceivingStatus(String receivingStatus) {
     }
 
     @JsonProperty("DispatchedQuantity")
-    public int getDispatchedQuantity() {
+    public double getDispatchedQuantity() {
         return dispatchedQuantity;
     }
 
@@ -134,7 +134,7 @@ public void setDispatchedQuantity(int dispatchedQuantity) {
     }
 
     @JsonProperty("ReceivedQuantity")
-    public int getReceivedQuantity() {
+    public double getReceivedQuantity() {
         return receivedQuantity;
     }
 

goonj/src/main/java/org/avni_integration_service/goonj/repository/DispatchReceiptRepository.java

@@ -103,19 +103,19 @@ private List<DispatchReceivedStatusLineItem> fetchDrsLineItemsFromEncounter(Gene
     }
 
     public DispatchReceivedStatusLineItem createDispatchReceivedStatusLineItem(HashMap<String, Object> entry) {
-        int receivedQuantity;
+        double receivedQuantity;
         String dispatchStatusLineItemId = (String) entry.get(DISPATCH_STATUS_LINE_ITEM_ID);
         String typeOfMaterial = (String) entry.get(TYPE_OF_MATERIAL);
         String itemName = typeOfMaterial.equals(CONTRIBUTED_ITEM) ?
                 (String) entry.get(CONTRIBUTED_ITEM_NAME) :
                 (typeOfMaterial.equals(KIT) ? (String) entry.get(KIT_NAME) : (String) entry.get(MATERIAL_NAME));
-        int dispatchedQuantity = entry.get(QUANTITY_DISPATCHED) != null ?
-                (int) entry.get(QUANTITY_DISPATCHED) : 0;
+        double dispatchedQuantity = entry.get(QUANTITY_DISPATCHED) != null ?
+                (double) entry.get(QUANTITY_DISPATCHED) : 0d;
         boolean quantityMatching = entry.get(QUANTITY_MATCHING).equals("Yes");
         if (quantityMatching) {
             receivedQuantity = dispatchedQuantity;
         } else {
-            receivedQuantity = entry.get(QUANTITY) != null ? (int) entry.get(QUANTITY) : 0;
+            receivedQuantity = entry.get(QUANTITY) != null ? (double) entry.get(QUANTITY) : 0d;
         }
         return new DispatchReceivedStatusLineItem(dispatchStatusLineItemId, mapTypeOfMaterial(entry), itemName,
                 dispatchStatusLineItemId, EMPTY_STRING, EMPTY_STRING, dispatchedQuantity, receivedQuantity);

goonj/src/main/java/org/avni_integration_service/goonj/worker/goonj/InventoryEventWorker.java

@@ -56,6 +56,13 @@ private void processImplementationInventory(Map<String, Object> inventoryRespons
         Inventory inventoryItems = Inventory.from(inventoryResponse);
         Subject subject = inventoryItems.subjectWithoutObservations();
         inventoryService.populateObservations(subject, inventoryItems);
+        if (subject.getVoided() == Boolean.FALSE){
+            Object currentQuantity = subject.getObservation("Current Quantity");
+            if (currentQuantity != null && (Double) currentQuantity == 0d){
+                subject.setVoided(Boolean.TRUE);
+                logger.info(String.format("0 currentQuantity, Voiding implementation inventory: name %s || uuid %s", inventoryResponse.get("ImplementationInventoryName"), inventoryResponse.get("ImplementationInventoryId")));
+            }
+        }
         avniSubjectRepository.create(subject);
     }