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

     @RequestMapping(value = "/store/resetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> resetPassword(@RequestBody UserModel userModel) throws Exception {
         if ((userModel.getMobile() == null || userModel.getMobile().isEmpty()) && (userModel.getPassword() == null || userModel.getPassword().isEmpty())) {
             throw new ProfitMandiBusinessException("error", "", "all field are required");
+        }
-            try{
+        try {
-                customerService.resetPassword(userModel.getMobile(), userModel.getPassword());
+            customerService.resetPassword(userModel.getMobile(), userModel.getPassword());
-            }
-            catch (ProfitMandiBusinessException p){
+        } catch (ProfitMandiBusinessException p) {
-                throw new ProfitMandiBusinessException("error", "", "An error occurred while resetting password");
+            throw new ProfitMandiBusinessException("error", "", "An error occurred while resetting password");
-            }
+        }
         return responseSender.ok(true);
+    }
     @RequestMapping(value = "/store/changePassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> changePassword(@RequestBody UserModel userModel) throws Exception {
-        logger.info("UserModel - "+userModel);
+        logger.info("UserModel - " + userModel);
-        if ((userModel.getOldPassword() == null || userModel.getOldPassword().isEmpty()) && (userModel.getMobile() == null || userModel.getMobile().isEmpty()) &&( userModel.getPassword() == null || userModel.getPassword().isEmpty())) {
+        if ((userModel.getOldPassword() == null || userModel.getOldPassword().isEmpty()) && (userModel.getMobile() == null || userModel.getMobile().isEmpty()) && (userModel.getPassword() == null || userModel.getPassword().isEmpty())) {
             throw new ProfitMandiBusinessException("error", "", "all fields are required");
+        }
-        try{
+        try {
-            customerService.changePassword(userModel.getMobile(),  userModel.getOldPassword(),userModel.getPassword());
+            customerService.changePassword(userModel.getMobile(), userModel.getOldPassword(), userModel.getPassword());
-        }
-        catch (ProfitMandiBusinessException p){
+        } catch (ProfitMandiBusinessException p) {
             throw new ProfitMandiBusinessException("error", "", "An error occurred while changing password");
+        }
         return responseSender.ok(true);
+    }
     @RequestMapping(value = "/store/address/defaultAddress/{addressId}/{customerId}", method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")
     })
     @ApiOperation(value = "Set default address for a store")
-    public ResponseEntity<?> setDefaultAddress(HttpServletRequest request,@PathVariable int addressId, @PathVariable int customerId) throws Exception {
+    public ResponseEntity<?> setDefaultAddress(HttpServletRequest request, @PathVariable int addressId, @PathVariable int customerId) throws Exception {
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         CustomerAddress defaultAddress;
         try {
             defaultAddress = customerAddressRepository.selectById(addressId);
         } catch (ProfitMandiBusinessException e) {
+        }
         logger.info("CustomerID: {}", customerId);
         List<CustomerAddress> customerAddresses = customerAddressRepository.selectByActiveCustomerId(customerId);
         logger.info("customerAddresses: {}", customerAddresses);
         for (CustomerAddress addr : customerAddresses) {
-            if (addr.getDefault()) {
+            if (addr.getDefault() ) {
                 addr.setDefault(false);
+            }
+        }
         defaultAddress.setDefault(true);
         return responseSender.ok("Default address updated successfully.");
             cashback = cashback == null ? 0 : cashback;
             float itemSellingPrice = tagListing.getMop() - cashback;
             CartItemResponseModel cartItemResponseModel = new CartItemResponseModel();
             cartItemResponseModel.setSellingPrice(cartItem.getSellingPrice());
             cartItemResponseModel.setPendingOrderItemPolicyPlan(cartItem.getPendingOrderItemPolicyPlan());
-            logger.info("itemSellingPrice: {}",itemSellingPrice);
+            logger.info("itemSellingPrice: {}", itemSellingPrice);
-            logger.info("cartItem: {}",cartItem.getSellingPrice());
+            logger.info("cartItem: {}", cartItem.getSellingPrice());
-            logger.info("cashback: {}",cashback);
+            logger.info("cashback: {}", cashback);
             if (itemSellingPrice != cartItem.getSellingPrice()) {
                 itemMsg.setType("price");
-                itemMsg.setMessageText("Price has changed to "+itemSellingPrice);
+                itemMsg.setMessageText("Price has changed to " + itemSellingPrice);
                 cartItemResponseModel.setSellingPrice(itemSellingPrice);
                 cartMessageChanged++;
+            }
             int estimate = -2;
             LocalDateTime promiseDeliveryTime = LocalDateTime.now();
             int qtyRequired = (int) cartItem.getQuantity();
             AvailabilityModel availabilityModel = inventoryItemAvailabilityMap.get(cartItem.getItemId());
             cartItemResponseModel.setMaxQuantity(availabilityModel.getMaxAvailability());
             if (availabilityModel.getStoreAvailability() >= qtyRequired) {
                 itemMsg.setType("estimate0");
-                itemMsg.setMessageText("Store availability is "+ availabilityModel.getStoreAvailability());
+                itemMsg.setMessageText("Store availability is " + availabilityModel.getStoreAvailability());
                 estimate = 0;
             } else if (availabilityModel.getWarehouseAvailability() >= qtyRequired) {
                 itemMsg.setType("estimate2");
-                itemMsg.setMessageText("Store availability is "+ availabilityModel.getWarehouseAvailability());
+                itemMsg.setMessageText("Store availability is " + availabilityModel.getWarehouseAvailability());
                 estimate = 2;
             } else if (availabilityModel.getStoreAvailability() > 0) {
                 estimate = 0;
                 qtyRequired = availabilityModel.getStoreAvailability();
                 cartMessageChanged++;
                 itemMsg.setType("quantity0");
-                itemMsg.setMessageText("quantity is updated "+qtyRequired);
+                itemMsg.setMessageText("quantity is updated " + qtyRequired);
             } else if (availabilityModel.getWarehouseAvailability() > 0) {
                 qtyRequired = availabilityModel.getWarehouseAvailability();
                 estimate = 2;
                 cartMessageChanged++;
                 itemMsg.setType("quantity2");
-                itemMsg.setMessageText("quantity is updated "+qtyRequired);
+                itemMsg.setMessageText("quantity is updated " + qtyRequired);
             } else {
                 qtyRequired = 0;
                 cartMessageChanged++;
                 itemMsg.setType("item");
                 itemMsg.setMessageText(item.getItemDescriptionNoColor() + " is out of stock");
+    }
     @RequestMapping(value = "/store/partnerStock", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> partnerStock(HttpServletRequest request, @RequestParam(required = false, defaultValue = "3") String categoryId, @RequestParam int offset,
-      @RequestParam int limit, @RequestParam(required = false) String sort, @RequestParam(required = false) String brand,
+                                          @RequestParam int limit, @RequestParam(required = false) String sort, @RequestParam(required = false) String brand,
-      @RequestParam(value = "subCategoryId", required = false) int subCategoryId, @RequestParam(required = false) String queryTerm,
+                                          @RequestParam(value = "subCategoryId", required = false) int subCategoryId, @RequestParam(required = false) String queryTerm,
-      @RequestParam(required = false) String listing, @RequestParam(required = false, defaultValue = "true") boolean partnerStockOnly) throws Throwable {
+                                          @RequestParam(required = false) String listing, @RequestParam(required = false, defaultValue = "true") boolean partnerStockOnly) throws Throwable {
         List<FofoCatalogResponse> dealResponse = new ArrayList<>();
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         FofoStore fs = fofoStoreRepository.selectByRetailerId(userInfo.getRetailerId());
         sort = "w" + fs.getWarehouseId() + "_i desc";
         dealResponse = this.getCatalogResponse(
         return responseSender.ok(customerAddressRepository.selectByActiveCustomerId(customerId));
+    }
     @RequestMapping(value = "/store/address", method = RequestMethod.POST)
     public ResponseEntity<?> addAddress(HttpServletRequest request, @RequestBody CustomerAddress customerAddress) throws Throwable {
+        List<CustomerAddress> customerAddresses = customerAddressRepository.selectByActiveCustomerId(customerAddress.getCustomerId());
+        if (customerAddresses.isEmpty()) {
+            customerAddress.setDefault(true);
+        } else {
+            customerAddress.setDefault(false);
+        }
         customerAddressRepository.persist(customerAddress);
         return responseSender.ok(customerAddress);
+    }
     @RequestMapping(value = "/store/deactivateCustomerAddress", method = RequestMethod.POST)
     public ResponseEntity<?> deactivateAddresss(HttpServletRequest request, @RequestParam int id) throws Throwable {
         CustomerAddress cust = customerAddressRepository.selectById(id);
+        List<CustomerAddress> customerAddresses = customerAddressRepository.selectByCustomerId(cust.getCustomerId());
         cust.setActive(false);
+        if(cust.getDefault()){
+            List<CustomerAddress> activeAddresses = customerAddresses.stream()
+                    .filter(a -> a.getActive() && a.getId() != id)
+                    .sorted(Comparator.comparing(CustomerAddress::getUpdateTimestamp).reversed())
+                    .collect(Collectors.toList());
+            if (!activeAddresses.isEmpty()) {
+                CustomerAddress newDefault = activeAddresses.get(0);
+                newDefault.setDefault(true);
+            }
+        }
         return responseSender.ok(cust);
+    }
     @RequestMapping(value = "/store/updateCustomer", method = RequestMethod.POST)
     public ResponseEntity<?> updateCustomerProfile(HttpServletRequest request, @RequestBody Customer customer) throws Throwable {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java – Rev 34248 → 34259