Subversion Repositories SmartDukaan

Rev

Rev 27155 | Rev 27157 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 27155 Rev 27156
Line 597... Line 597...
597
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
597
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
598
		Ticket ticket = ticketRepository.selectById(ticketId);
598
		Ticket ticket = ticketRepository.selectById(ticketId);
599
		List<TicketAssigned> ticketAssignedList = ticketAssignedRepository.selectByTicketIds(Arrays.asList(ticketId));
599
		List<TicketAssigned> ticketAssignedList = ticketAssignedRepository.selectByTicketIds(Arrays.asList(ticketId));
600
		List<Integer>authUserIds = ticketAssignedList.stream().map(x->x.getAssineeId()).collect(Collectors.toList());
600
		List<Integer>authUserIds = ticketAssignedList.stream().map(x->x.getAssineeId()).collect(Collectors.toList());
601
		authUserIds.add(ticketAssignedList.get(ticketAssignedList.size()-1).getManagerId());
601
		authUserIds.add(ticketAssignedList.get(ticketAssignedList.size()-1).getManagerId());
602
		authUserIds.add(assigneeId);
-
 
603
		Map<Integer, AuthUser> authUsersMap = authRepository.selectAllAuthUserByIds(authUserIds).stream().collect(Collectors.toMap(x->x.getId(), x->x));
602
		Map<Integer, AuthUser> authUsersMap = authRepository.selectAllAuthUserByIds(authUserIds).stream().collect(Collectors.toMap(x->x.getId(), x->x));
604
		if (ticket.getCloseTimestamp() == null) {
603
		if (ticket.getCloseTimestamp() == null) {
605
			Activity activity = new Activity();
604
			Activity activity = new Activity();
606
			activity.setCreatedBy(0);
605
			activity.setCreatedBy(0);
607
			activity.setCreateTimestamp(LocalDateTime.now());
606
			activity.setCreateTimestamp(LocalDateTime.now());
Line 611... Line 610...
611
				activity.setType(ActivityType.COMMUNICATION_IN);
610
				activity.setType(ActivityType.COMMUNICATION_IN);
612
				subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(), customRetailer.getBusinessName() + "("+customRetailer.getCode()+")");
611
				subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(), customRetailer.getBusinessName() + "("+customRetailer.getCode()+")");
613
				message = String.format("Franchisee message - %s", message);
612
				message = String.format("Franchisee message - %s", message);
614
				activity.setMessage(message);
613
				activity.setMessage(message);
615
			} else {
614
			} else {
616
				AuthUser authUser = authUsersMap.remove(assigneeId);
615
				AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
617
				activity.setCreatedBy(assigneeId);
616
				activity.setCreatedBy(assigneeId);
618
				subject = String.format("Ticket Update #%s by %s", ticket.getId(), authUser.getName());
617
				subject = String.format("Ticket Update #%s by %s", ticket.getId(), authUser.getName());
619
				message = String.format("%s's message - %s", authUser.getFirstName(), message);
618
				message = String.format("%s's message - %s", authUser.getFirstName(), message);
620
				if (internal) {
619
				if (internal) {
621
					activity.setType(ActivityType.COMMUNICATION_INTERNAL);
620
					activity.setType(ActivityType.COMMUNICATION_INTERNAL);