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

+		}
 		return "response";
+	}
 	@GetMapping(value = "/cs/createTicket")
-	public String createTicket(HttpServletRequest request, Model model) {
+	public String createTicket(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
+		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		List<TicketCategory> ticketCategories = csService.getAllTicketCategotyFromSubCategory();
+		model.addAttribute("roleType", roleManager.isAdmin(loginDetails.getRoleIds()));
 		model.addAttribute("ticketCategories", ticketCategories);
 		return "create-ticket";
+	}
 	@GetMapping(value = "/cs/getSubCategoriesByCategoryId")
 							searchTerm, offset, limit);
 					size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
 							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), ticketSearchType, searchTerm);
+				}
+			}
-			//LOGGER.info(size + "size");
+			// LOGGER.info(size + "size");
 			if (tickets.size() > 0) {
 				ticketAssigneds = ticketAssignedRepository
 						.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
 				authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		List<Ticket> tickets = null;
 		List<TicketAssigned> ticketAssigneds = null;
 		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 			if (ticketSearchType == null) {
 				if (ticketStatus.equals(TicketStatus.RESOLVED)) {
 					tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder, null,
+	}
 	@GetMapping(value = "/cs/getActivities")
 	public String getActivity(HttpServletRequest request,
 			@RequestParam(name = "ticketId", defaultValue = "0") int ticketId, Model model) throws Exception {
-		List<Activity> activities = activityRepository.selectAll(ticketId);
+		List<Activity> allactivities = activityRepository.selectAll(ticketId);
+		List<Activity> activities = null;
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		if (roleManager.isAdmin(loginDetails.getRoleIds())) {
-			Set<Integer> authUserIds = activities.stream().map(x -> x.getCreatedBy()).collect(Collectors.toSet());
+			Set<Integer> authUserIds = allactivities.stream().map(x -> x.getCreatedBy()).collect(Collectors.toSet());
 			List<AuthUser> users = authRepository.selectAllAuthUserByIds(new ArrayList<>(authUserIds));
 			Map<Integer, String> authUserNameMap = users.stream()
 					.collect(Collectors.toMap(AuthUser::getId, x -> x.getFirstName() + " " + x.getLastName()));
-			activities.stream().forEach(x -> x.setName(authUserNameMap.get(x.getCreatedBy())));
+			allactivities.stream().forEach(x -> x.setName(authUserNameMap.get(x.getCreatedBy())));
+			activities = allactivities;
+		} else {
+			activities = allactivities.stream().filter(x -> !x.getType().equals(ActivityType.COMMUNICATION_INTERNAL))
+					.collect(Collectors.toList());
+		}
 		if (activities == null) {
 			throw new ProfitMandiBusinessException("Activity", ticketId, "No Activity Found");
+		}
 		model.addAttribute("response", mvcResponseSender.createResponseString(activities));
 	@PostMapping(value = "/cs/createActivity")
 	public String createActivity(HttpServletRequest request,
 			@RequestParam(name = "ticketId", defaultValue = "0") int ticketId,
 			@RequestParam(name = "assigneeId", defaultValue = "0") int assigneeId,
+			@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) {
 			if (!roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 				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);
+				// 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);
+				} else {
-				activity.setType(ActivityType.COMMUNICATION_OUT);
+					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);
-				String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
-				//LOGGER.info(authUser.getEmailId() + " " + subject + " " + message);
+				// LOGGER.info(authUser.getEmailId() + " " + subject + " " + message);
-				this.activityRelatedMail(retailerService.getFofoRetailer(ticket.getFofoId()).getEmail(), null, subject,
-						message);
 				model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
+			}
 		} else {
 			throw new ProfitMandiBusinessException("Ticket", ticket.getId(), "Already closed ticket");
+		}

Subversion Repositories SmartDukaan

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