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

 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import com.spice.profitmandi.common.enumuration.SchemeType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.CreatePendingOrderRequest;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.CustomerOrderDetail;
-import com.spice.profitmandi.common.model.Notification;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.UserInfo;
 import com.spice.profitmandi.common.solr.SolrService;
 import com.spice.profitmandi.common.web.client.RestClient;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.TagListing;
 import com.spice.profitmandi.dao.entity.dtr.WebListing;
 import com.spice.profitmandi.dao.entity.fofo.CurrentInventorySnapshot;
 import com.spice.profitmandi.dao.entity.fofo.Customer;
+import com.spice.profitmandi.dao.entity.fofo.CustomerAddress;
 import com.spice.profitmandi.dao.entity.fofo.PendingOrder;
 import com.spice.profitmandi.dao.entity.fofo.PendingOrderItem;
 import com.spice.profitmandi.dao.entity.fofo.PincodePartner;
 import com.spice.profitmandi.dao.entity.inventory.ItemAvailabilityCache;
 import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
 	@Autowired
 	private FofoStoreRepository fofoStoreRepository;
 	@Autowired
 	private RetailerService retailerService;
+	@Autowired
+	private PendingOrderRepository pendingOrderRepository;
+	@Autowired
+	private PendingOrderItemRepository pendingOrderItemRepository;
 	@Autowired
 	private PendingOrderService pendingOrderService;
 	@Autowired
 	private WebProductListingRepository webProductListingRepository;
 	@Autowired
 	private RoleManager roleManagerService;
-	@Autowired
-	private PendingOrderRepository pendingOrderRepository;
-	@Autowired
-	private PendingOrderItemRepository pendingOrderItemRepository;
 	List<String> filterableParams = Arrays.asList("brand");
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = "/store/fofo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	}
 	@RequestMapping(value = "/store/otp/generateOTP", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> generateOtp(HttpServletRequest request, @RequestParam String mobile) throws Exception {
-		return responseSender.ok(otpProcessor.generateOtp(mobile, OtpType.PREBOOKING_ORDER));
+		return responseSender.ok(otpProcessor.generateOtp(mobile, OtpType.REGISTRATION));
+	}
 	@RequestMapping(value = "/store/checkmobile/{mobile}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> checkRegistrationUsingMobile(HttpServletRequest request, @PathVariable String mobile)
 			return responseSender.ok(true);
 		} else {
 			return responseSender.ok(false);
+		}
+	}
 	@RequestMapping(value = "/store/resetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> resetPassword(HttpServletRequest request, @RequestBody UserModel userModel)
+	public ResponseEntity<?> resetPassword(HttpServletRequest request, @RequestBody UserModel userModel) throws Exception {
-			throws Exception {
 		customerService.changePassword(userModel.getMobile(), userModel.getPassword());
 		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();
+		customer.setPassword(userModel.getPassword());
+		customer.setEmailId(userModel.getEmail());
+		customer.setFirstName(userModel.getFirstName());
+		customer.setLastName(userModel.getLastName());
+		customer.setMobileNumber(userModel.getMobile());
+		return responseSender.ok(customerService.addCustomer(customer));
+	}
 	@RequestMapping(value = "/store/confirmOrder", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> confirmCart(HttpServletRequest request,
+	public ResponseEntity<?> confirmOrder(HttpServletRequest request,
 			@RequestBody CreatePendingOrderRequest createPendingOrderRequest) throws Exception {
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		Integer storeId = userInfo.getRetailerId();
 		createPendingOrderRequest.setFofoId(storeId);
-		this.pendingOrderService.createPendingOrder(createPendingOrderRequest);
+		return responseSender.ok(this.pendingOrderService.createPendingOrder(createPendingOrderRequest));
-		return responseSender.ok(true);
+	}
+	@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");
+		Integer storeId = userInfo.getRetailerId();
+		CustomRetailer customRetailer = retailerService.getFofoRetailer(storeId);
+		return responseSender.ok(customRetailer.getAddress());
+	}
+	@RequestMapping(value = "/store/address/{pincode}", 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<?> getStoresByPincode(HttpServletRequest request, @PathVariable String pincode)
+			throws Exception {
+		List<PincodePartner> pincodePartners = pincodePartnerRepository.selectPartnersByPincode(pincode);
+		int fofoId = DEFAULT_STORE;
+		if (pincodePartners.size() > 0) {
+			fofoId = pincodePartners.get(0).getFofoId();
+		}
+		return responseSender.ok(fofoStoreRepository.selectByRetailerId(fofoId).getCode());
+	}
 	@RequestMapping(value = "/store/order", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getOrderDetail(HttpServletRequest request, @RequestParam(value = "id") int id,
 			@RequestParam(name = "offset") int offset, @RequestParam(name = "limit") int limit)
 			throws ProfitMandiBusinessException {
 		List<CustomerOrderDetail> customerOrderDetails = new ArrayList<>();
+		}
 		return responseSender.ok(customerOrderDetails);
+	}
-	@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");
-		Integer storeId = userInfo.getRetailerId();
-		CustomRetailer customRetailer = retailerService.getFofoRetailer(storeId);
-		return responseSender.ok(customRetailer.getAddress());
-	}
-	@RequestMapping(value = "/store/address/{pincode}", 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<?> getStoresByPincode(HttpServletRequest request, @PathVariable String pincode)
-			throws Exception {
-		List<PincodePartner> pincodePartners = pincodePartnerRepository.selectPartnersByPincode(pincode);
-		int fofoId = DEFAULT_STORE;
-		if (pincodePartners.size() > 0) {
-			fofoId = pincodePartners.get(0).getFofoId();
-		}
-		return responseSender.ok(fofoStoreRepository.selectByRetailerId(fofoId).getCode());
-	}
 	@RequestMapping(value = "/store/listing", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@Cacheable(value = "storelisting.all", cacheManager = "thirtyMinsTimeOutCacheManager")
 	public ResponseEntity<?> getStoresListing(HttpServletRequest request) throws Exception {
 		List<WebListing> webListings = webListingRepository.selectAllWebListing(Optional.of(true));
 	@RequestMapping(value = "/store/addresses/{customerId}", method = RequestMethod.GET)
 	public ResponseEntity<?> getAll(HttpServletRequest request, @PathVariable int customerId) throws Throwable {
 		return responseSender.ok(customerAddressRepository.selectByCustomerId(customerId));
+	}
+	@RequestMapping(value = "/store/address", method = RequestMethod.POST)
+	public ResponseEntity<?> addAddress(HttpServletRequest request, @RequestBody CustomerAddress customerAddress)
+			throws Throwable {
+		customerAddressRepository.persist(customerAddress);
+		return responseSender.ok(customerAddress);
+	}
+}
 class UserModel {
+	@JsonProperty(required = true)
 	private String mobile;
+	@JsonProperty(required = true)
 	private String password;
+	@JsonProperty(required = false)
+	private String firstName;
+	@JsonProperty(required = false)
+	private String lastName;
+	@JsonProperty(required = false)
+	private String email;
 	@Override
 	public String toString() {
 		return "UserModel [mobile=" + mobile + ", password=" + password + "]";
+	}
+	}
 	public void setPassword(String password) {
 		this.password = password;
+	}
+	public String getFirstName() {
+		return firstName;
+	}
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	public String getLastName() {
+		return lastName;
+	}
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+}
 class CustomerModel {
 	@JsonProperty(required = false)

Subversion Repositories SmartDukaan

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