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

 import com.spice.profitmandi.dao.repository.fofo.*;
 import com.spice.profitmandi.dao.repository.inventory.ItemAvailabilityCacheRepository;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.dao.repository.user.UserRepository;
-import com.spice.profitmandi.dao.repository.webRepository.NavBarRepository;
 import com.spice.profitmandi.service.CustomerService;
 import com.spice.profitmandi.service.EmailService;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.integrations.zest.InsuranceService;
 import com.spice.profitmandi.web.res.ValidateCartResponse;
 import com.spice.profitmandi.web.services.PartnerIndexService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.conn.HttpHostConnectException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
+        }
+    }
     @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{
-        customerService.resetPassword(userModel.getMobile(), userModel.getPassword());
+                customerService.resetPassword(userModel.getMobile(), userModel.getPassword());
+            }
+            catch (ProfitMandiBusinessException p){
+                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 (customerService.changePassword(userModel.getMobile(), userModel.getOldPassword(), userModel.getPassword())) {
+        if ((userModel.getOldPassword() == null || userModel.getOldPassword().isEmpty()) && (userModel.getMobile() == null || userModel.getMobile().isEmpty()) &&( userModel.getPassword() == null || userModel.getPassword().isEmpty())) {
-            return responseSender.ok(true);
-        } else {
-            throw new ProfitMandiBusinessException("error", "", "Error while changing the password ");
+            throw new ProfitMandiBusinessException("error", "", "all fields are required");
+        }
+        try{
+            customerService.changePassword(userModel.getMobile(),  userModel.getOldPassword(),userModel.getPassword());
+        }
+        catch (ProfitMandiBusinessException p){
+            throw new ProfitMandiBusinessException("error", "", "An error occurred while changing password");
+        }
+        return responseSender.ok(true);
+    }
     @RequestMapping(value = "/store/register", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> register(HttpServletRequest request, @RequestBody UserModel userModel) throws Exception {
         Customer customer = new Customer();
         try {
             Map<String, List<MobileInsurancePlan>> productDurationPlans = insuranceService.getAllPlans(itemId, sellingPrice, true);
             return productDurationPlans;
         } catch (Exception e) {
             logger.info(e, e);
-            throw new ProfitMandiBusinessException("Fetch Insurance Plans", "Insurance",
+            throw new ProfitMandiBusinessException("Fetch Insurance Plans", "Insurance", "Could not fetch insurance Plans");
-                    "Could not fetch insurance Plans");
+        }
+    }
     @RequestMapping(value = "/store/confirmOrder", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+        }
         return responseSender.ok(returnMap);
+    }
     @RequestMapping(value = "/store/address", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     @ApiOperation(value = "Get brand list and count for category")
     public ResponseEntity<?> getAddress(HttpServletRequest request) throws Exception {
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         CustomRetailer customRetailer = retailerService.getFofoRetailer(storeId);
         return responseSender.ok(customRetailer.getAddress());
+    }
     @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) {
             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(

Subversion Repositories SmartDukaan

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