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

 package com.spice.profitmandi.web.controller;
+import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.dao.entity.inventory.State;
 import com.spice.profitmandi.dao.entity.inventory.Warehouse;
 import com.spice.profitmandi.dao.entity.transaction.Seller;
-import com.spice.profitmandi.dao.entity.transaction.SellerWarehouse;
-import com.spice.profitmandi.dao.entity.transaction.WarehouseAddressMapping;
 import com.spice.profitmandi.dao.entity.transaction.WarehouseAddressMaster;
+import com.spice.profitmandi.dao.model.warehouse.NewPhysicalWarehouseRequest;
-import com.spice.profitmandi.dao.enumuration.inventory.InventoryType;
+import com.spice.profitmandi.dao.model.warehouse.NewSellerRequest;
-import com.spice.profitmandi.dao.enumuration.inventory.WarehouseType;
+import com.spice.profitmandi.dao.model.warehouse.NewWarehouseAddressRequest;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
-import com.spice.profitmandi.dao.repository.inventory.WarehouseRepository;
 import com.spice.profitmandi.dao.repository.transaction.SellerRepository;
 import com.spice.profitmandi.dao.repository.transaction.SellerWarehouseRepository;
-import com.spice.profitmandi.dao.repository.transaction.WarehouseAddressMappingRepository;
-import com.spice.profitmandi.dao.repository.transaction.WarehouseAddressMasterRepository;
 import com.spice.profitmandi.service.SellerService;
+import com.spice.profitmandi.service.warehouse.WarehouseSetupService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+/**
+ * Seller / physical warehouse setup screen. Rules live in WarehouseSetupService; this only maps requests to it.
+ */
 @Controller
 @Transactional(rollbackFor = Throwable.class)
 public class SellerController {
     @Autowired
     private SellerRepository sellerRepository;
     @Autowired
     private StateRepository stateRepository;
-    @Autowired
-    WarehouseRepository warehouseRepository;
-    @Autowired
-    WarehouseAddressMasterRepository warehouseAddressMasterRepository;
     @Autowired
     private SellerWarehouseRepository sellerWarehouseRepository;
     @Autowired
-    private WarehouseAddressMappingRepository warehouseAddressMappingRepository;
+    private SellerService sellerService;
     @Autowired
-    private SellerService sellerService;
+    private WarehouseSetupService warehouseSetupService;
     private static final Logger LOGGER = LogManager.getLogger(SellerController.class);
     /**
      * Realign the INTERNAL stores of a warehouse with the address currently mapped to it.
+     *
-     * The mapping has no edit screen - it gets repointed straight in the database - so nothing
+     * The mapping had no edit screen - it got repointed straight in the database - so nothing
      * carried a warehouse's move through to the internal store's user.address, and orders kept
-     * billing to an address the branch had left years earlier. This is that missing hop; run it
+     * billing to an address the branch had left years earlier. Remapping from the setup screen now
-     * after changing a warehouse's address mapping.
+     * syncs on its own; this stays for mappings changed outside it.
      */
     @RequestMapping(value = "/syncWarehouseInternalAddress", method = RequestMethod.POST)
     @ResponseBody
     public ResponseEntity<?> syncWarehouseInternalAddress(@RequestParam(name = "warehouseId") int warehouseId)
             throws Exception {
         response.put("warehouseId", warehouseId);
         response.put("storesSynced", synced);
         return ResponseEntity.ok(response);
+    }
-    @RequestMapping(value = "/createNewWarehouse", method = RequestMethod.POST)
+    @RequestMapping(value = "/getAllSeller", method = RequestMethod.GET)
-    public String getViewOurSales(HttpServletRequest request, @RequestParam(name = "address", required = true, defaultValue = "0") int address, @RequestParam(name = "prefix", required = true, defaultValue = "0") String prefix, @RequestParam(name = "sellerId", required = true, defaultValue = "0") int sellerId, @RequestParam(name = "warehouseName", required = true, defaultValue = "0") String warehouseName, @RequestParam(name = "pin", required = true, defaultValue = "0") String pinCode, Model model)
+    public String getAllSeller(Model model) throws Exception {
-            throws Exception {
-        Seller seller = sellerRepository.selectById(sellerId);
-        WarehouseAddressMaster wam = warehouseAddressMasterRepository.selectById(address);
+        Map<Integer, Long> warehouseCounts = sellerWarehouseRepository.selectAll().stream()
-        Warehouse warehouse = new Warehouse();
-        warehouse.setDisplayName(warehouseName);
-        warehouse.setLocation(wam.getAddress());
-        warehouse.setGstin(seller.getGstin());
-        warehouse.setStateId(seller.getStateId());
-        warehouse.setStatus(3);
-        warehouse.setAddedOn(LocalDateTime.now());
-        warehouse.setLastCheckedOn(LocalDateTime.now());
-        warehouse.setTinNumber(null);
-        warehouse.setPincode(pinCode);
-        warehouse.setLogisticsLocation(0);
-        warehouse.setVendor(1);
-        warehouse.setBillingType(0);
-        warehouse.setInventoryType(InventoryType.GOOD);
-        warehouse.setWarehouseType(WarehouseType.OURS);
-        warehouse.setIsAvailabilityMonitored(1);
-        warehouse.setSource(0);
-        warehouseRepository.persist(warehouse);
-        warehouse.setBillingWarehouseId(warehouse.getId());
-        warehouse.setShippingWarehouseId(warehouse.getId());
+                .collect(Collectors.groupingBy(x -> x.getSellerId(), Collectors.counting()));
-        LOGGER.info("warehouseId" + warehouse.getId());
-        SellerWarehouse sellerWarehouse = new SellerWarehouse();
+        model.addAttribute("sellers", warehouseSetupService.getSellers());
-        sellerWarehouse.setActive(true);
-        sellerWarehouse.setWarehouseId(warehouse.getId());
+        model.addAttribute("warehouseCounts", warehouseCounts);
-        sellerWarehouse.setChallanSequence(0);
-        sellerWarehouse.setCreateTimestamp(LocalDateTime.now());
+        model.addAttribute("stateNames", this.stateNames());
-        sellerWarehouse.setInvoiceSequence(0);
-        sellerWarehouse.setPrefix(prefix);
-        sellerWarehouse.setOrderType(0);
-        sellerWarehouse.setSellerId(sellerId);
-        sellerWarehouseRepository.persist(sellerWarehouse);
-        WarehouseAddressMapping warehouseAddressMapping = new WarehouseAddressMapping();
-        warehouseAddressMapping.setAddressId(address);
-        warehouseAddressMapping.setCreated(LocalDateTime.now());
+        model.addAttribute("states", stateRepository.selectAll());
-        warehouseAddressMapping.setUpdated(null);
-        warehouseAddressMapping.setWarehouseId(warehouse.getId());
+        model.addAttribute("addresses", warehouseSetupService.getAddresses());
-        warehouseAddressMapping.setAddressId(address);
-        warehouseAddressMappingRepository.persist(warehouseAddressMapping);
-        // Setting the mapping is what gives a warehouse its address, so the internal stores that bill
-        // from it are realigned in the same transaction. A brand new warehouse has none yet and this
-        // is a no-op, but anchoring the rule at the write means no later path can set a mapping and
-        // leave an internal store on the previous address - which is how the Delhi stores drifted.
-        sellerService.syncInternalStoreAddresses(warehouse.getId());
         return "seller";
+    }
-    @RequestMapping(value = "/createNewSeller", method = RequestMethod.POST)
+    @RequestMapping(value = "/getSellerWareHouse", method = RequestMethod.GET)
-    public String getNewSeller(HttpServletRequest request, @RequestParam(name = "label", required = true, defaultValue = "0") String label, @RequestParam(name = "address", required = true, defaultValue = "0") String address, @RequestParam(name = "gst", required = true, defaultValue = "0") String gst, @RequestParam(name = "state", required = true, defaultValue = "0") int state, Model model) throws Exception {
+    public String getSellerWareHouse(@RequestParam(name = "sellerId") int sellerId, Model model) throws Exception {
-        Seller seller = new Seller();
+        Seller seller = sellerRepository.selectById(sellerId);
-        seller.setAddress(address);
+        model.addAttribute("seller", seller);
-        seller.setLabel(label);
-        seller.setGstin(gst);
-        seller.setStateId(state);
+        model.addAttribute("stateNames", this.stateNames());
-        seller.setOrganisationId(7);
+        model.addAttribute("warehouses", warehouseSetupService.getPhysicalWarehouses(sellerId));
-        sellerRepository.persist(seller);
+        model.addAttribute("assignableAddresses", warehouseSetupService.getAssignableAddresses(seller.getStateId()));
-        return "seller";
+        return "seller-warehouse-container";
+    }
     @RequestMapping(value = "/createNewAddress", method = RequestMethod.POST)
-    public String getNewSeller(HttpServletRequest request, @RequestParam(name = "newAddress", required = true, defaultValue = "0") String address, @RequestParam(name = "pin", required = true, defaultValue = "0") String pin, @RequestParam(name = "stateId", required = true, defaultValue = "0") int stateId, Model model) throws Exception {
+    @ResponseBody
-        WarehouseAddressMaster wham = new WarehouseAddressMaster();
+    public ResponseEntity<?> createNewAddress(@RequestBody NewWarehouseAddressRequest request) throws Exception {
-        wham.setAddress(address);
-        wham.setPin(pin);
-        wham.setStateId(stateId);
-        wham.setContacNumber("18002700273");
-        wham.setContactPerson("Customer Care");
-        wham.setCreated(LocalDateTime.now());
+        WarehouseAddressMaster address = warehouseSetupService.createAddress(request);
-        warehouseAddressMasterRepository.persist(wham);
+        return ResponseEntity.ok(this.idResponse("addressId", address.getId()));
-        return "seller";
+    }
-    @RequestMapping(value = "/getAllSeller", method = RequestMethod.GET)
+    @RequestMapping(value = "/warehouseAddress/{addressId}/active", method = RequestMethod.POST)
-    public String getAllSeller(HttpServletRequest request, Model model) throws Exception {
-        List<Seller> sellers = sellerRepository.selectAll().stream().filter(x -> x.getOrganisationId() == 7).collect(Collectors.toList());
-        List<WarehouseAddressMaster> warehouseAddressMaster = sellerRepository.selectAllWarehouseAddressMaster();
-        List<State> state = stateRepository.selectAll();
-        LOGGER.info("statemaster" + state);
+    @ResponseBody
-        model.addAttribute("state", state);
+    public ResponseEntity<?> setAddressActive(@PathVariable int addressId, @RequestParam boolean active)
-        LOGGER.info("sellerLabel" + sellers);
+            throws Exception {
-        LOGGER.info("warehouseAddressMaster" + warehouseAddressMaster);
+        warehouseSetupService.setAddressActive(addressId, active);
-        model.addAttribute("sellerLabel", sellers);
-        model.addAttribute("warehouseAddressMaster", warehouseAddressMaster);
+        return ResponseEntity.ok(this.idResponse("addressId", addressId));
-        return "seller";
+    }
-    @RequestMapping(value = "/getSellerWareHouse", method = RequestMethod.GET)
+    @RequestMapping(value = "/createNewSeller", method = RequestMethod.POST)
+    @ResponseBody
-    public String getSellerWareHouse(HttpServletRequest request, @RequestParam(name = "sellerId", required = true, defaultValue = "0") int sellerId, Model model) throws Exception {
+    public ResponseEntity<?> createNewSeller(@RequestBody NewSellerRequest request) throws Exception {
-        List<SellerWarehouse> sellerWarehouse = sellerWarehouseRepository.selectBySellerId(sellerId);
+        Seller seller = warehouseSetupService.createSeller(request);
-        List<WarehouseAddressMaster> allWarehouseAddressMaster = sellerRepository.selectAllWarehouseAddressMaster();
-        Seller seller = sellerRepository.selectById(sellerId);
+        return ResponseEntity.ok(this.idResponse("sellerId", seller.getId()));
+    }
-        List<Integer> sellerwarehouseIds = sellerWarehouse.stream().map(x -> x.getWarehouseId()).collect(Collectors.toList());
-        Map<Integer, WarehouseAddressMaster> wam = null;
+    @RequestMapping(value = "/createNewWarehouse", method = RequestMethod.POST)
-        if (sellerwarehouseIds.size() > 0) {
+    @ResponseBody
-            List<WarehouseAddressMapping> warehouseAddressMapping = warehouseAddressMappingRepository.selectAllByIds(sellerwarehouseIds);
+    public ResponseEntity<?> createNewWarehouse(@RequestBody NewPhysicalWarehouseRequest request) throws Exception {
-            wam = mapWarhouseIdAndAddress(warehouseAddressMapping);
+        Warehouse warehouse = warehouseSetupService.createPhysicalWarehouse(request);
-        } else {
-            wam = new HashMap<>();
+        return ResponseEntity.ok(this.idResponse("warehouseId", warehouse.getId()));
-        }
+    }
+    @RequestMapping(value = "/physicalWarehouse/{warehouseId}/active", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseEntity<?> setWarehouseActive(@PathVariable int warehouseId, @RequestParam boolean active)
+            throws Exception {
-        model.addAttribute("allWhm", allWarehouseAddressMaster);
+        warehouseSetupService.setWarehouseActive(warehouseId, active);
+        return ResponseEntity.ok(this.idResponse("warehouseId", warehouseId));
+    }
+    @RequestMapping(value = "/physicalWarehouse/{warehouseId}/address", method = RequestMethod.POST)
-        model.addAttribute("wam", wam);
+    @ResponseBody
-        model.addAttribute("seller", seller);
+    public ResponseEntity<?> remapAddress(@PathVariable int warehouseId, @RequestParam int addressId)
-        model.addAttribute("sellerId", sellerId);
+            throws Exception {
-        model.addAttribute("sellerWarehouse", sellerWarehouse);
+        warehouseSetupService.remapAddress(warehouseId, addressId);
-        return "seller-warehouse-container";
+        return ResponseEntity.ok(this.idResponse("warehouseId", warehouseId));
+    }
-    private Map<Integer, WarehouseAddressMaster> mapWarhouseIdAndAddress(
+    // Raised after the transaction has rolled back; the screen shows the rule that was broken.
-                                                                         List<WarehouseAddressMapping> warehouseAddressMapping) {
-        Map<Integer, WarehouseAddressMaster> wam = new HashMap<>();
+    @ExceptionHandler(ProfitMandiBusinessException.class)
+    @ResponseBody
-        for (WarehouseAddressMapping wa : warehouseAddressMapping) {
+    public ResponseEntity<String> handleBusinessException(ProfitMandiBusinessException e) {
-            WarehouseAddressMaster wm = warehouseAddressMasterRepository.selectById(wa.getAddressId());
+        LOGGER.info("Seller setup refused: {} = {} - {}", e.getRejectedType(), e.getRejectedValue(), e.getCode());
-            wam.put(wa.getWarehouseId(), wm);
+        return ResponseEntity.badRequest().body(e.getCode());
-        }
+    }
+    private Map<Integer, String> stateNames() {
-        return wam;
+        return stateRepository.selectAll().stream()
+                .collect(Collectors.toMap(State::getId, State::getName, (a, b) -> a));
+    }
-}
     private Map<String, Object> idResponse(String key, int id) {
+        Map<String, Object> response = new HashMap<>();
+        response.put(key, id);
+        return response;
+    }
+}

Subversion Repositories SmartDukaan

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