WebSVN – SmartDukaan – Diff – //trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java

 package com.spice.profitmandi.web.controller;
+import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.dao.entity.inventory.State;
 import com.spice.profitmandi.dao.entity.inventory.Vendor;
 import com.spice.profitmandi.dao.entity.inventory.Warehouse;
 import com.spice.profitmandi.dao.entity.transaction.Seller;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 @Controller
 @Transactional(rollbackFor = Throwable.class)
 public class SupplierController {
     private static final Logger LOGGER = LogManager.getLogger(SupplierController.class);
     @Autowired
     WarehouseRepository warehouseRepository;
+    // Physical warehouses are the ones with an active seller registration (transaction.sellerwarehouse);
+    // inventory.warehouse only supplies the name.
+    private Map<Integer, String> activePhysicalWarehouses() {
+        Map<Integer, String> activeWarehouses = new TreeMap<>();
+        for (SellerWarehouse sellerWarehouse : sellerWarehouseRepository.selectAll()) {
+            if (!sellerWarehouse.isActive() || activeWarehouses.containsKey(sellerWarehouse.getWarehouseId())) {
+                continue;
+            }
+            Warehouse warehouse = warehouseRepository.selectById(sellerWarehouse.getWarehouseId());
+            activeWarehouses.put(sellerWarehouse.getWarehouseId(), sellerWarehouse.getPrefix() + " - "
+                    + (warehouse == null ? String.valueOf(sellerWarehouse.getWarehouseId()) : warehouse.getDisplayName()));
+        }
+        return activeWarehouses;
+    }
+    // 0 means not internal. A supplier marked internal stands for that physical warehouse in stock movements, so it
+    // must be an active one.
+    private void applyInternalWarehouse(Supplier supplier, Integer internalWarehouseId) throws ProfitMandiBusinessException {
+        int warehouseId = internalWarehouseId == null ? 0 : internalWarehouseId;
+        if (warehouseId > 0 && !this.activePhysicalWarehouses().containsKey(warehouseId)) {
+            throw new ProfitMandiBusinessException("internalWarehouseId", warehouseId,
+                    "Warehouse " + warehouseId + " is not an active physical warehouse");
+        }
+        supplier.setInternal(warehouseId > 0);
+        supplier.setInternalWarehouseId(warehouseId);
+    }
     @RequestMapping(value = "/getAllInActiveSupplier", method = RequestMethod.GET)
     public String getShowInActiveSupplier(HttpServletRequest request, Model model) throws Exception {
         List<Supplier> supplierInactives = supplierRepository.selectByStatus(false);
+    }
     @RequestMapping(value = "/getCreateNewSupplier", method = RequestMethod.GET)
     public String getCreateNewSupplier(HttpServletRequest request, Model model) throws Exception {
-        List<SellerWarehouse> sellerWarehouses = sellerWarehouseRepository.selectAll();
+        List<SellerWarehouse> sellerWarehouses = sellerWarehouseRepository.selectAll().stream()
-        Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
-        sellerWarehouses = sellerWarehouses.stream().filter(x -> warehouseMap.containsKey(x.getWarehouseId())).collect(Collectors.toList());
+                .filter(SellerWarehouse::isActive).collect(Collectors.toList());
         Map<Integer, WarehouseIdPrefixModel> warehouseIdAndState = new HashMap<>();
         for (SellerWarehouse sw : sellerWarehouses) {
             WarehouseAddressMapping warehouseAddressMapping = warehouseAddressMappingRepository.selectByWarehouseId(sw.getWarehouseId());
         model.addAttribute("warehouseIdAndState", warehouseIdAndState);
         List<State> state = stateRepository.selectAll();
         model.addAttribute("state", state);
-        model.addAttribute("warehouseMap", ProfitMandiConstants.WAREHOUSE_MAP);
+        model.addAttribute("warehouseMap", this.activePhysicalWarehouses());
         return "new-supplier";
+    }
     @RequestMapping(value = "/setStatusInActive", method = RequestMethod.POST)
         supplier.setPan(createNewSupplier.getPan());
         supplier.setPhone(createNewSupplier.getPhone());
         supplier.setPoValidityLimit(createNewSupplier.getpOValidityLimit());
         supplier.setRegisteredAddress(createNewSupplier.getRegisteredAddress());
         supplierStateResolver.applyGstinAndState(supplier, createNewSupplier.getGst(), createNewSupplier.getState());
-        supplier.setInternalWarehouseId(createNewSupplier.getInternalWarehouseId());
+        this.applyInternalWarehouse(supplier, createNewSupplier.getInternalWarehouseId());
         supplierRepository.persist(supplier);
         Vendor vendor = new Vendor();
         vendor.setName(supplier.getName());
         vendor.setId(supplier.getId());
+    }
     @RequestMapping(value = "/supplier/edit/{supplierId}", method = RequestMethod.GET)
     public String getEditSupplier(HttpServletRequest request, Model model, @PathVariable int supplierId) throws Exception {
         Supplier supplier  = supplierRepository.selectById(supplierId);
-        List<SellerWarehouse> sellerWarehouses = sellerWarehouseRepository.selectAll();
+        List<SellerWarehouse> sellerWarehouses = sellerWarehouseRepository.selectAll().stream()
+                .filter(SellerWarehouse::isActive).collect(Collectors.toList());
         Map<Integer, WarehouseIdPrefixModel> warehouseIdAndState = new HashMap<>();
         List<Warehouse> supplierWarehouses = warehouseRepository.selectVendorWarehouses(supplierId, WarehouseType.OURS, InventoryType.GOOD);
         List<Integer> supplierPhysicalWarehouseIds = supplierWarehouses.stream().map(x -> x.getShippingWarehouseId()).collect(Collectors.toList());
         LOGGER.info("supplierPhysicalWarehouseIds" + supplierPhysicalWarehouseIds);
         model.addAttribute("warehouseIdAndState", warehouseIdAndState);
         List<State> state = stateRepository.selectAll();
         model.addAttribute("state", state);
-        model.addAttribute("warehouseMap", ProfitMandiConstants.WAREHOUSE_MAP);
+        model.addAttribute("warehouseMap", this.activePhysicalWarehouses());
         model.addAttribute("supplier", supplier);
         model.addAttribute("supplierPhysicalWarehouseIds", supplierPhysicalWarehouseIds);
         return "edit-supplier";
+    }
         supplier.setContactEmail(supplierFormData.getInputContactEmail());
         supplier.setFax((supplierFormData.getInputFax()));
         supplier.setRegisteredAddress(supplierFormData.getInputRegisteredAddress());
         supplier.setCommunicationAddress(supplierFormData.getInputCommunicationAddress());
         supplier.setTnc(supplierFormData.getInputTermConditions());
-        supplier.setInternalWarehouseId(supplierFormData.getInternalWarehouseId());
+        this.applyInternalWarehouse(supplier, supplierFormData.getInternalWarehouseId());
-        if (supplierFormData.getInternalWarehouseId() != null && supplierFormData.getInternalWarehouseId() > 0) {
-            supplier.setInternal(true);
-        } else {
-            supplier.setInternal(false);
-            supplier.setInternalWarehouseId(null);
-        }
         supplierStateResolver.applyGstinAndState(supplier, supplierFormData.getInputGst(), supplierFormData.getStateId());
         supplier.setPoValidityLimit(supplierFormData.getInputPOValidityLimit());
         List<Integer> newWarehouseIds = supplierFormData.getInputWarehouseLocation();

Subversion Repositories SmartDukaan

(root)//trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java – Rev 37770 → 37823