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

 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
+import javax.swing.SortOrder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.javamail.JavaMailSender;
 import com.spice.profitmandi.dao.entity.cs.Position;
 import com.spice.profitmandi.dao.entity.cs.Region;
 import com.spice.profitmandi.dao.entity.cs.Ticket;
 import com.spice.profitmandi.dao.entity.cs.TicketAssigned;
 import com.spice.profitmandi.dao.entity.cs.TicketCategory;
+import com.spice.profitmandi.dao.entity.cs.TicketSearchType;
 import com.spice.profitmandi.dao.entity.cs.TicketSubCategory;
 import com.spice.profitmandi.dao.entity.fofo.ActivityType;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
+import com.spice.profitmandi.dao.enumuration.cs.TicketStatus;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.cs.ActivityRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
 import com.spice.profitmandi.dao.repository.cs.PartnerRegionRepository;
 import com.spice.profitmandi.dao.repository.cs.PositionRepository;
 public class CsController {
 	private static final Logger LOGGER = LogManager.getLogger(CsController.class);
 	private static final String ACTIVITY_SUBJECT = "Message related ticketId#%s";
-	private static final String PARTNER_RESOLVED_TICKET_MAIL="Dear Partner , we have resolved your ticket # %s , request to kindly accept the same. In case you still have any concerns regarding the same pls click on %s so that we can help you.Regards\nSmartdukaan";
+	private static final String PARTNER_RESOLVED_TICKET_MAIL = "Dear Partner , we have resolved your ticket # %s , request to kindly accept the same. In case you still have any concerns regarding the same pls click on %s so that we can help you.Regards\nSmartdukaan";
-	private static final String PARTNER_REOPEN="Dear Partner , Your ticket # %s has been re-opened as per your confirmation & we are committed to resolve it on priority.Regards\nSmartdukaan";
+	private static final String PARTNER_REOPEN = "Dear Partner , Your ticket # %s has been re-opened as per your confirmation & we are committed to resolve it on priority.Regards\nSmartdukaan";
-	private static final String INTERNAL_REOPEN_MAIL="Hi, Pls note that the ticket # %s has been re-opened by %s , pls respond on priority.";
+	private static final String INTERNAL_REOPEN_MAIL = "Hi, Pls note that the ticket # %s has been re-opened by %s , pls respond on priority.";
-	private static final String INTERNAL_REOPEN_ACTIVITY_MESSAGE="Hi,My ticket is not resolved yet,so I am reopenning ticket";
+	private static final String INTERNAL_REOPEN_ACTIVITY_MESSAGE = "Hi,My ticket is not resolved yet,so I am reopenning ticket";
 	@Autowired
 	JavaMailSender mailSender;
 	@Autowired
 	private CsService csService;
 	@PostMapping(value = "/cs/createTicket")
 	public String createTicket(HttpServletRequest request, @RequestParam(name = "categoryId") int categoryId,
 			@RequestParam(name = "subCategoryId") int subCategoryId, @RequestParam(name = "message") String message,
 			Model model) throws Exception {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		List<Ticket> tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(true), 0, 10);
+		List<Ticket> tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(true),SortOrder.DESCENDING,0, 10);
 		if (tickets.size() > 3 || tickets.size() == 3) {
 			model.addAttribute("response", mvcResponseSender.createResponseString(false));
 		} else {
 			csService.createTicket(loginDetails.getFofoId(), categoryId, subCategoryId, message);
 			model.addAttribute("response", mvcResponseSender.createResponseString(true));
+		}
 		return "response";
+	}
 	@GetMapping(value = "/cs/myticket")
+	public String getTicket(HttpServletRequest request,
+			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
-	public String getMyTicket(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset,
+			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		List<Ticket> tickets = null;
 		List<TicketAssigned> ticketAssigneds = null;
-		List<Integer> ticketIds = null;
+		//List<Integer> ticketIds = null;
 		long size = 0;
 		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
 		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-			ticketAssigneds = ticketAssignedRepository.selectByAssigneeId(authUser.getId(), offset, limit);
+			LOGGER.info(ticketStatus);
-			ticketIds = ticketAssigneds.stream().map(x -> x.getTicketId()).collect(Collectors.toList());
+			LOGGER.info(sortOrder);
-			tickets = ticketRepository.selectAllByTicketIds(ticketIds);
+			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
+					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
-			size = ticketAssignedRepository.selectCountByAssigneeId(authUser.getId());
+			size = ticketRepository.selectAllCountByAssignee(authUser.getId(),Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
 			LOGGER.info(size + "size");
+			ticketAssigneds=ticketAssignedRepository.selectByTicketIds(tickets.stream().map(x->x.getId()).collect(Collectors.toList()));
 			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 		} else {
+			LOGGER.info(ticketStatus);
+			LOGGER.info(sortOrder);
+			LOGGER.info(TicketStatus.CLOSED.equals(ticketStatus));
-			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.empty(), offset, limit);
+			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
-			authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
+					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)),sortOrder,offset, limit);
-			size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(), Optional.empty());
+			size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(),
+					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
+		}
+		authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
 		if (size < limit) {
 			model.addAttribute("end", offset + size);
 		} else {
 			model.addAttribute("end", offset + limit);
+		}
 		model.addAttribute("resolved", ActivityType.RESOLVED);
 		model.addAttribute("resolved-accepted", ActivityType.RESOLVED_ACCEPTED);
 		model.addAttribute("resolved-rejected", ActivityType.RESOLVED_REJECTED);
 		model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
 		model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
+		model.addAttribute("ticketStatusValues", TicketStatus.values());
+		model.addAttribute("orderByValues", SortOrder.values());
+		model.addAttribute("selectedticketStatus", ticketStatus);
+		model.addAttribute("selectedorderby", sortOrder);
 		return "ticket";
+	}
 	@GetMapping(value = "/cs/myticketPaginated")
 	public String getMyTicketPaginated(HttpServletRequest request,
+			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		List<Ticket> tickets = null;
 		List<TicketAssigned> ticketAssigneds = null;
-		List<Integer> ticketIds = null;
+		//List<Integer> ticketIds = null;
 		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
 		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-			ticketAssigneds = ticketAssignedRepository.selectByAssigneeId(authUser.getId(), offset, limit);
+			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
-			ticketIds = ticketAssigneds.stream().map(x -> x.getTicketId()).collect(Collectors.toList());
+					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
-			tickets = ticketRepository.selectAllByTicketIds(ticketIds);
+			ticketAssigneds=ticketAssignedRepository.selectByTicketIds(tickets.stream().map(x->x.getId()).collect(Collectors.toList()));
 			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 		} else {
-			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.empty(), offset, limit);
+			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)),sortOrder,offset, limit);
 			authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
+		}
 		model.addAttribute("roleType", roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds())));
 		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
 				.getSubCategoryIdAndSubCategoryMap(tickets);
 		model.addAttribute("tickets", tickets);
 		model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
 		model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
+		model.addAttribute("resolved", ActivityType.RESOLVED);
+		model.addAttribute("resolved-accepted", ActivityType.RESOLVED_ACCEPTED);
+		model.addAttribute("resolved-rejected", ActivityType.RESOLVED_REJECTED);
 		return "ticket-paginated";
+	}
 	@GetMapping(value = "/cs/getActivities")
 	public String getActivity(HttpServletRequest request,
 		return "response";
+	}
 	@GetMapping(value = "/cs/managerTicket")
 	public String getL2L3AndL4Tickets(HttpServletRequest request,
+			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		long size = 0;
 		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
 			size = ticketRepository.selectAllCount();
 		} else {
-			tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), offset, limit);
+			tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), offset, limit);
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
-			size = ticketRepository.selectAllCountByEscalatedUserType(authUser.getId());
+			size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
 			if (tickets.size() > 0) {
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+			}
+		}
 		model.addAttribute("size", size);
 		model.addAttribute("tickets", tickets);
 		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
 				.getSubCategoryIdAndSubCategoryMap(tickets);
+		model.addAttribute("ticketStatusValues", TicketStatus.values());
+		model.addAttribute("orderByValues", SortOrder.values());
+		model.addAttribute("selectedticketStatus", ticketStatus);
+		model.addAttribute("selectedorderby", sortOrder);
 		model.addAttribute("tickets", tickets);
 		model.addAttribute("authUserListMap", authUserListMap);
 		model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
 		return "managerTicket";
+	}
 	@GetMapping(value = "/cs/managerTicket-paginated")
 	public String getL2L3AndL4TicketsPaginated(HttpServletRequest request,
+			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 		List<Ticket> tickets = null;
 		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
 		} else {
-			tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), offset, limit);
+			tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), offset, limit);
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
 			if (tickets.size() > 0) {
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+			}
 		Activity activity = new Activity();
 		String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
 		if (roleManager.isAdmin(loginDetails.getRoleIds())) {
 			ticket.setLastActivity(lastActivity);
 			String to = retailerService.getFofoRetailer(ticket.getFofoId()).getEmail();
-			String message = String.format(PARTNER_RESOLVED_TICKET_MAIL,ticketId,"REOPEN");
+			String message = String.format(PARTNER_RESOLVED_TICKET_MAIL, ticketId, "REOPEN");
 			activity.setMessage(message);
 			activity.setCreatedBy(authRepository.selectByEmailOrMobile(loginDetails.getEmailId()).getId());
 			activity.setTicketId(ticketId);
 			activity.setCreateTimestamp(LocalDateTime.now());
 			activity.setType(ActivityType.COMMUNICATION_OUT);
 				activity.setCreatedBy(0);
 				activity.setTicketId(ticketId);
 				activity.setType(ActivityType.COMMUNICATION_IN);
 				activity.setCreateTimestamp(LocalDateTime.now());
 			} else {
+				String message = String.format(INTERNAL_REOPEN_MAIL, ticketId,
-				String message = String.format(INTERNAL_REOPEN_MAIL,ticketId,retailerService.getFofoRetailer(loginDetails.getFofoId()).getBusinessName());
+						retailerService.getFofoRetailer(loginDetails.getFofoId()).getBusinessName());
 				String to = authRepository.selectById(ticket.getL1AuthUser()).getEmailId();
 				String cc[] = { authRepository.selectById(ticket.getL2AuthUser()).getEmailId(),
 						authRepository.selectById(ticket.getL3AuthUser()).getEmailId() };
 				ticket.setLastActivity(lastActivity);
 				ticket.setUpdateTimestamp(LocalDateTime.now());
 				ticket.setL2EscalationTimestamp(ticket.getUpdateTimestamp().plusDays(2));
 				ticket.setL3EscalationTimestamp(ticket.getL2EscalationTimestamp().plusDays(2));
 				ticket.setLastEscalationTimestamp(ticket.getL3EscalationTimestamp().plusDays(2));
 				ticketAssignedRepository.deleteByTicketId(ticketId);
-				TicketAssigned ticketAssigned=new TicketAssigned();
+				TicketAssigned ticketAssigned = new TicketAssigned();
 				ticketAssigned.setAssineeId(ticket.getL1AuthUser());
 				ticketAssigned.setTicketId(ticketId);
 				ticketAssignedRepository.persist(ticketAssigned);
 				activity.setMessage(INTERNAL_REOPEN_ACTIVITY_MESSAGE);
 				activity.setCreatedBy(0);
 				activity.setTicketId(ticketId);
 				activity.setType(ActivityType.COMMUNICATION_IN);
 				activity.setCreateTimestamp(LocalDateTime.now());
 				this.activityRelatedMail(to, cc, subject, message);
-				this.activityRelatedMail(retailerService.getFofoRetailer(loginDetails.getFofoId()).getEmail(), null, subject, String.format(PARTNER_REOPEN, ticketId));
+				this.activityRelatedMail(retailerService.getFofoRetailer(loginDetails.getFofoId()).getEmail(), null,
+						subject, String.format(PARTNER_REOPEN, ticketId));
+			}
+		}
 		ticketRepository.persist(ticket);
 		activityRepository.persist(activity);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java – Rev 24638 → 24699