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

 package com.spice.profitmandi.web.controller;
-import java.io.StringWriter;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
 import javax.servlet.http.HttpServletRequest;
 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.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import com.spice.profitmandi.common.model.CreatePendingOrderRequest;
 import com.spice.profitmandi.common.model.CustomRetailer;
 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.util.FormattingUtils;
 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.web.processor.OtpProcessor;
 import com.spice.profitmandi.web.res.DealBrands;
 import com.spice.profitmandi.web.res.DealObjectResponse;
 import com.spice.profitmandi.web.res.DealsResponse;
 import com.spice.profitmandi.web.res.ValidateCartResponse;
+import com.spice.profitmandi.web.services.EmailService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 	private WebProductListingRepository webProductListingRepository;
 	@Autowired
 	private RoleManager roleManagerService;
 	@Autowired
-	private VelocityEngine velocityEngine;
+	EmailService emailService;
-	@Autowired
-	JavaMailSender mailSender;
 	@Autowired
 	CsService csService;
 	List<String> filterableParams = Arrays.asList("brand");
+		}
 		pendingOrder.setPendingOrderItems(pendingOrderItems);
 		CustomerAddress customerAddress = customerAddressRepository.selectById(pendingOrder.getCustomerAddressId());
-		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy H:m");
+		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy h:mm a");
-		Template t = velocityEngine.getTemplate("sms.vm");
-		VelocityContext context = new VelocityContext();
+		Map<String, Object> emailModel = new HashMap<>();
-		context.put("customer", customerAddress);
+		emailModel.put("customer", customerAddress);
-		context.put("pendingOrder", pendingOrder);
+		emailModel.put("pendingOrder", pendingOrder);
-		context.put("date", dateTimeFormatter);
+		emailModel.put("date", dateTimeFormatter);
-		StringWriter writer = new StringWriter();
-		t.merge(context, writer);
 		CustomRetailer customRetailer = retailerService.getFofoRetailer(pendingOrder.getFofoId());
 		Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
+		String[] customerEmail = null;
-		if (!customer.getEmailId().equals(null)) {
+		if (customer.getEmailId()!= null) {
-			String[] customerEmail = { customer.getEmailId() };
+			customerEmail = new String[]{ customer.getEmailId() };
-			this.sendMailWithAttachments("Order Confirmation", writer.toString(), customerEmail);
+		}
-		String[] retailerEmail = { customRetailer.getEmail() };
-		List<String> sendTo = Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com",
+		List<String> bccTo = Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com",
 				"hemant.kaura@smartdukaan.com", "niranjan.kala@smartdukaan.com", "sm@smartdukaan.com",
-				"tejbeer.kaur@shop2020.in");
+				"tejbeer.kaur@shop2020.in", customRetailer.getEmail());
 		List<String> authUserEmails = csService.getAuthUserByPartnerId(customRetailer.getPartnerId());
-		logger.info("authUserEmails" + authUserEmails);
+		bccTo.addAll(authUserEmails);
-		this.sendMailWithAttachments("Order Confirmation", writer.toString(), retailerEmail);
+		emailService.sendMailWithAttachments("Order Created with SmartDukaan", "order-confirm.vm",
-		this.sendMailWithAttachments("Order Confirmation", writer.toString(),
+				emailModel, customerEmail, null,
-				sendTo.toArray(new String[sendTo.size()]));
+				bccTo.toArray(new String[0]));
-		if (!authUserEmails.isEmpty()) {
-			this.sendMailWithAttachments("Order Confirmation", writer.toString(),
-					authUserEmails.toArray(new String[authUserEmails.size()]));
-		}
 		return responseSender.ok(pendingOrder);
+	}
-	private void sendMailWithAttachments(String subject, String messageText, String[] email) throws Exception {
-		MimeMessage message = mailSender.createMimeMessage();
-		MimeMessageHelper helper = new MimeMessageHelper(message, true);
-		helper.setTo(email);
-		helper.setSubject(subject);
-		helper.setText(messageText, true);
-		InternetAddress senderAddress = new InternetAddress("noreply@smartdukaan.com", "Smartdukaan Alerts");
-		helper.setFrom(senderAddress);
-		mailSender.send(message);
-	}
 	@RequestMapping(value = "/store/addresses/{customerId}", method = RequestMethod.GET)
 	public ResponseEntity<?> getAll(HttpServletRequest request, @PathVariable int customerId) throws Throwable {
 		return responseSender.ok(customerAddressRepository.selectByActiveCustomerId(customerId));
+	}
 	public ResponseEntity<?> cancelPendingOrderItem(HttpServletRequest request, @RequestParam int id,
 			@RequestParam String statusDescription) throws Exception {
 		PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(id);
 		PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderItem.getOrderId());
+		Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
 		if (pendingOrderItem.getBilledTimestamp() == null) {
 			pendingOrderItem.setStatus(OrderStatus.CANCELLED);
 			pendingOrderItem.setStatusDescription(statusDescription);
+			pendingOrderItem.setCancelledTimestamp(LocalDateTime.now());
 			List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
 					.stream().map(x -> x.getStatus()).collect(Collectors.toList());
 			if (!status.contains(OrderStatus.PENDING)) {
 				pendingOrder.setStatus(OrderStatus.CLOSED);
+			}
 			pendingOrderItemRepository.persist(pendingOrderItem);
+			String itemDescription = itemRepository.selectById(pendingOrderItem.getItemId()).getItemDescription();
+			otpProcessor.sendSms(OtpProcessor.SELF_CANCELLED_TEMPLATE_ID,
+					String.format(OtpProcessor.SELF_CANCELLED_TEMPLATE, pendingOrder.getId(),
+							StringUtils.abbreviate(itemDescription, 30),
+							FormattingUtils.format(pendingOrderItem.getCancelledTimestamp())),
+					customer.getMobileNumber());
+		}
 		return responseSender.ok(true);
+	}

Subversion Repositories SmartDukaan

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