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

 	@Autowired
 	private ActivityRepository activityRepository;
 	@Autowired
 	private TicketAssignedRepository ticketAssignedRepository;
 	@Autowired
 	private PartnerRegionRepository partnerRegionRepository;
 	@GetMapping(value = "/cs/createCategory")
 	public String getCreateCategory(HttpServletRequest request, Model model) {
 		List<TicketCategory> ticketCategories = ticketCategoryRepository.selectAll();
 		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 		return "response";
+	}
 	@GetMapping(value = "/cs/getPartners")
+	public String getPartners(HttpServletRequest request,
-	public String getPartners(HttpServletRequest request,@RequestParam(name="regionId",defaultValue="0")int regionId,Model model) {
+			@RequestParam(name = "regionId", defaultValue = "0") int regionId, Model model) {
 		List<Integer> fofoIds = targetSlabService.getfofoIdsFromfofoStore();
-		List<Integer> addedfofoIds=partnerRegionRepository.selectByRegionId(regionId).stream().map(x->x.getFofoId()).collect(Collectors.toList());
+		List<Integer> addedfofoIds = partnerRegionRepository.selectByRegionId(regionId).stream().map(x -> x.getFofoId())
+				.collect(Collectors.toList());
 		Map<Integer, CustomRetailer> fofoRetailers = retailerService.getFofoRetailers(fofoIds);
 		model.addAttribute("fofoRetailers", fofoRetailers);
 		model.addAttribute("addedfofoIds", addedfofoIds);
 		return "added-region-partners";
+	}
 	@GetMapping(value = "/cs/createPartnerRegion")
 	public String createPartnerRegion(HttpServletRequest request, Model model) {
 		List<Region> regions = regionRepository.selectAll();
 		model.addAttribute("regions", regions);
 		return "create-partner-region";
 			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 			ticketAssigneds = ticketAssignedRepository.selectByAssigneeId(authUser.getId(), offset, limit);
 			ticketIds = ticketAssigneds.stream().map(x -> x.getTicketId()).collect(Collectors.toList());
 			tickets = ticketRepository.selectAllByTicketIds(ticketIds);
 			size = ticketAssignedRepository.selectCountByAssigneeId(authUser.getId());
+			LOGGER.info(size +"size");
 			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
-			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
+				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
-			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 		} else {
 			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.empty(), offset, limit);
 			authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
 			size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(), Optional.empty());
 		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);
-			ticketIds = ticketAssigneds.stream().map(x -> x.getTicketId()).collect(Collectors.toList());
+				ticketIds = ticketAssigneds.stream().map(x -> x.getTicketId()).collect(Collectors.toList());
-			tickets = ticketRepository.selectAllByTicketIds(ticketIds);
+				tickets = ticketRepository.selectAllByTicketIds(ticketIds);
-			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
+				authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
-			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
+				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
-			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 		} else {
 			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.empty(), offset, limit);
 			authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
+		}
 		model.addAttribute("roleType", roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds())));
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		long size = 0;
 		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 		List<Ticket> tickets = null;
-		Map<Integer, List<AuthUser>> authUserListMap=null;
+		Map<Integer, List<AuthUser>> authUserListMap = null;
 		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
-			authUserListMap=csService.getAuthUserList(tickets, EscalationType.L4);
+			authUserListMap = csService.getAuthUserList(tickets, EscalationType.L4);
 			size = ticketRepository.selectAllCount();
 		} else {
 			tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L2, offset, limit);
 			if (tickets.size() == 0) {
 				tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L3, offset,
 						limit);
 				size = ticketRepository.selectAllCountByEscalatedUserType(authUser.getId(), EscalationType.L3);
-				authUserListMap=csService.getAuthUserList(tickets, EscalationType.L3);
+				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L3);
+				if(tickets.size()>0) {
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+				}
 			} else {
 				size = ticketRepository.selectAllCountByEscalatedUserType(authUser.getId(), EscalationType.L2);
-				authUserListMap=csService.getAuthUserList(tickets, EscalationType.L2);
+				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L2);
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+			}
+		}
 		if (size < limit) {
 			tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L2, offset, limit);
 			if (tickets.size() == 0) {
 				tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L3, offset,
 						limit);
 				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L3);
+				LOGGER.info(tickets);
+				if(tickets.size()>0)
+				{
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+				}
 			} else {
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
-				authUserListMap=csService.getAuthUserList(tickets, EscalationType.L2);
+				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L2);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+			}
+		}
 		model.addAttribute("tickets", tickets);
 		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
 		Ticket ticket = ticketRepository.selectById(ticketId);
 		List<TicketCategory> ticketCategories = csService.getAllTicketCategotyFromSubCategory();
 		TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
 		List<TicketSubCategory> ticketSubCategories = ticketSubCategoryRepository
 				.selectAll(ticketSubCategory.getcategoryId());
-		List<AuthUser> authUsers=authRepository.selectAll();
+		List<AuthUser> authUsers = authRepository.selectAll();
 		model.addAttribute("ticket", ticket);
 		model.addAttribute("ticketCategories", ticketCategories);
 		model.addAttribute("ticketSubCategories", ticketSubCategories);
 		model.addAttribute("authUsers", authUsers);
 		return "edit-ticket-modal";
 			@RequestParam(name = "subCategoryId", defaultValue = "0") int subCategoryId,
 			@RequestParam(name = "categoryId", defaultValue = "0") int categoryId,
 			@RequestParam(name = "authUserId", defaultValue = "0") int authUserId, Model model) throws Exception {
 		LOGGER.info(ticketId);
 		Ticket ticket = ticketRepository.selectById(ticketId);
+		ticketAssignedRepository.deleteByTicketId(ticketId);
-		if(ticket.getSubCategoryId()==subCategoryId)
+		if (ticket.getSubCategoryId() == subCategoryId) {
-		{
-		LOGGER.info(ticket);
+			LOGGER.info(ticket);
-		TicketAssigned ticketAssigned=ticketAssignedRepository.selectByAssigneeIdAndTicketId(authUserId, ticket.getId());
-		if(ticketAssigned==null)
-		{
-			ticketAssignedRepository.deleteByTicketId(ticketId);
-			ticketAssigned=new TicketAssigned();
+			TicketAssigned ticketAssigned = new TicketAssigned();
 			ticketAssigned.setTicketId(ticketId);
 			ticketAssigned.setAssineeId(authUserId);
 			ticketAssignedRepository.persist(ticketAssigned);
-		}
-		ticket.setL1AuthUser(authUserId);
+			ticket.setL1AuthUser(authUserId);
-		ticket.setSubCategoryId(subCategoryId);
+			ticket.setSubCategoryId(subCategoryId);
-		ticket.setUpdateTimestamp(LocalDateTime.now());
+			ticket.setUpdateTimestamp(LocalDateTime.now());
-		ticket.setL2EscalationTimestamp(ticket.getUpdateTimestamp().plusDays(2));
+			ticket.setL2EscalationTimestamp(ticket.getUpdateTimestamp().plusDays(2));
-		ticket.setL3EscalationTimestamp(ticket.getL2EscalationTimestamp().plusDays(2));
+			ticket.setL3EscalationTimestamp(ticket.getL2EscalationTimestamp().plusDays(2));
-		ticket.setLastEscalationTimestamp(ticket.getL3EscalationTimestamp().plusDays(2));
+			ticket.setLastEscalationTimestamp(ticket.getL3EscalationTimestamp().plusDays(2));
-		ticketRepository.persist(ticket);
+			ticketRepository.persist(ticket);
+			csService.sendAssignedTicketMail(authRepository.selectById(authUserId), ticket);
-		model.addAttribute("response", mvcResponseSender.createResponseString(true));
+			model.addAttribute("response", mvcResponseSender.createResponseString(true));
-		}
-		else
+		} else {
-		{
-			ticketAssignedRepository.deleteByTicketId(ticketId);
-			csService.updateTicket(categoryId,subCategoryId,ticket);
+			csService.updateTicket(categoryId, subCategoryId, ticket);
 			model.addAttribute("response", mvcResponseSender.createResponseString(true));
+		}
 		return "response";
+	}

Subversion Repositories SmartDukaan

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