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

 		if (ticketSubCategory != null) {
 			throw new ProfitMandiBusinessException("name & categoryId", name + "  " + categoryId, "already exists!");
+		}
 		ticketSubCategory = new TicketSubCategory();
-		ticketSubCategory.setcategoryId(categoryId);
+		ticketSubCategory.setCategoryId(categoryId);
 		ticketSubCategory.setName(name);
 		ticketSubCategory.setDescription(description);
 		ticketSubCategoryRepository.persist(ticketSubCategory);
 		return "create-ticket-sub-category";
+	}
 							searchTerm, offset, limit);
 					size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.empty(), null,
 							searchTerm);
 				} else {
 					tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
-							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
+							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
 							limit);
 					size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
-							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), null, searchTerm);
+							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm);
+				}
 			} else {
 				if (ticketStatus.equals(TicketStatus.RESOLVED)) {
 							ticketSearchType, searchTerm, offset, limit);
 					size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.empty(),
 							ticketSearchType, searchTerm);
 				} else {
 					tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
-							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType,
+							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, ticketSearchType,
 							searchTerm, offset, limit);
 					size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
-							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), ticketSearchType, searchTerm);
+							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
+				}
+			}
 			// LOGGER.info(size + "size");
 			if (tickets.size() > 0) {
 				ticketAssigneds = ticketAssignedRepository
 			@RequestParam(name = "internal", defaultValue = "true") boolean internal,
 			@RequestParam(name = "message", defaultValue = "") String message, Model model) throws Exception {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		Ticket ticket = ticketRepository.selectById(ticketId);
 		if (ticket.getCloseTimestamp() == null) {
+			Activity activity = new Activity();
+			activity.setCreatedBy(0);
+			activity.setCreateTimestamp(LocalDateTime.now());
+			activity.setMessage(message);
 			if (!roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
-				Activity activity = new Activity();
-				activity.setMessage(message);
-				activity.setCreatedBy(0);
-				activity.setCreateTimestamp(LocalDateTime.now());
 				activity.setType(ActivityType.COMMUNICATION_IN);
-				csService.addActivity(ticketId, activity);
 				AuthUser authUser = authRepository.selectById(ticket.getL1AuthUser());
 				String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
 				String[] cc = { authRepository.selectById(ticket.getL2AuthUser()).getEmailId(),
 						authRepository.selectById(ticket.getL3AuthUser()).getEmailId() };
 				// LOGGER.info(authUser.getEmailId()+" "+cc+" "+subject+" "+message);
 				// this.activityRelatedMail(authUser.getEmailId(), cc, subject, message);
 				model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
 			} else {
 				AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-				Activity activity = new Activity();
-				activity.setMessage(message);
 				activity.setCreatedBy(authUser.getId());
-				activity.setCreateTimestamp(LocalDateTime.now());
 				if (internal) {
 					activity.setType(ActivityType.COMMUNICATION_INTERNAL);
-					String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
+					// String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
-					if (authUser.getId() == ticket.getL1AuthUser()) {
-						String cc[] = { authRepository.selectById(ticket.getL3AuthUser()).getEmailId() };
-						this.activityRelatedMail(authRepository.selectById(ticket.getL2AuthUser()).getEmailId(), cc,
-								subject, message);
-					} else if (authUser.getId() == ticket.getL2AuthUser()) {
-						String cc[] = { authRepository.selectById(ticket.getL3AuthUser()).getEmailId() };
-						this.activityRelatedMail(authRepository.selectById(ticket.getL1AuthUser()).getEmailId(), cc,
-								subject, message);
-					} else {
-						String cc[] = { authRepository.selectById(ticket.getL2AuthUser()).getEmailId() };
-						this.activityRelatedMail(authRepository.selectById(ticket.getL1AuthUser()).getEmailId(), cc,
-								subject, message);
-					}
 				} else {
 					activity.setType(ActivityType.COMMUNICATION_OUT);
-					String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
-					this.activityRelatedMail(retailerService.getFofoRetailer(ticket.getFofoId()).getEmail(), null,
-							subject, message);
+				}
-				csService.addActivity(ticketId, activity);
-				// LOGGER.info(authUser.getEmailId() + " " + subject + " " + message);
 				model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
+			}
+			activityRepository.persist(activity);
+			csService.addActivity(ticket, activity);
 		} else {
 			throw new ProfitMandiBusinessException("Ticket", ticket.getId(), "Already closed ticket");
+		}
 		return "response";
+	}
+		}
 		return "response";
+	}
 	@GetMapping(value = "/cs/managerTicket")
-	public String getL2L3AndL4Tickets(HttpServletRequest request,
+	public String getManagerTickets(HttpServletRequest request,
 			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
 			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
 			@RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
 			@RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "ticketId", defaultValue = "0") int ticketId, Model model) {
 		Ticket ticket = ticketRepository.selectById(ticketId);
 		List<TicketCategory> ticketCategories = csService.getAllTicketCategotyFromSubCategory();
 		TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
 		List<TicketSubCategory> ticketSubCategories = ticketSubCategoryRepository
-				.selectAll(ticketSubCategory.getcategoryId());
+				.selectAll(ticketSubCategory.getCategoryId());
-		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
+		List<AuthUser> authUsers = new ArrayList<>();
 		model.addAttribute("ticket", ticket);
 		model.addAttribute("ticketCategories", ticketCategories);
 		model.addAttribute("ticketSubCategories", ticketSubCategories);
 		model.addAttribute("ticketSubCategory", ticketSubCategory);
 		model.addAttribute("authUsers", authUsers);
 			@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) {
-			LOGGER.info(ticket);
-			TicketAssigned ticketAssigned = new TicketAssigned();
-			ticketAssigned.setTicketId(ticketId);
-			ticketAssigned.setAssineeId(authUserId);
-			ticketAssignedRepository.persist(ticketAssigned);
-			ticket.setL1AuthUser(authUserId);
-			ticket.setSubCategoryId(subCategoryId);
-			ticket.setUpdateTimestamp(LocalDateTime.now());
-			ticket.setL2EscalationTimestamp(ticket.getUpdateTimestamp().plusDays(2));
-			ticket.setL3EscalationTimestamp(ticket.getL2EscalationTimestamp().plusDays(2));
-			ticket.setLastEscalationTimestamp(ticket.getL3EscalationTimestamp().plusDays(2));
-			ticketRepository.persist(ticket);
-			csService.sendAssignedTicketMail(authRepository.selectById(authUserId), ticket);
-			model.addAttribute("response", mvcResponseSender.createResponseString(true));
-		} else {
-			csService.updateTicket(categoryId, subCategoryId, ticket);
+		csService.updateTicket(categoryId, subCategoryId, ticket);
-			model.addAttribute("response", mvcResponseSender.createResponseString(true));
+		model.addAttribute("response", mvcResponseSender.createResponseString(true));
-		}
 		return "response";
+	}
 	@DeleteMapping(value = "/cs/removePosition")
 	public String removePosition(HttpServletRequest request,
 			@RequestParam(name = "positionId", defaultValue = "0") int positionId, Model model) throws Exception {
 				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.setAssineeId(ticket.getL1AuthUser());
 				ticketAssigned.setTicketId(ticketId);
 				ticketAssignedRepository.persist(ticketAssigned);
 				this.activityRelatedMail(retailerService.getFofoRetailer(loginDetails.getFofoId()).getEmail(), null,
 						subject, String.format(PARTNER_REOPEN, ticketId));
+			}
+		}
-		ticketRepository.persist(ticket);
 		activityRepository.persist(activity);
 		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 25570 → 27124