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

 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.cs.Activity;
+import com.spice.profitmandi.dao.entity.cs.ActivityAttachment;
 import com.spice.profitmandi.dao.entity.cs.PartnerPosition;
 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.dtr.Document;
 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.model.CreatePositionModel;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
+import com.spice.profitmandi.dao.repository.catalog.DeviceRepository;
+import com.spice.profitmandi.dao.repository.cs.ActivityAttachmentRepository;
 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.PartnersPositionRepository;
 import com.spice.profitmandi.dao.repository.cs.PositionRepository;
 import com.spice.profitmandi.dao.repository.cs.RegionRepository;
 import com.spice.profitmandi.dao.repository.cs.TicketAssignedRepository;
 import com.spice.profitmandi.dao.repository.cs.TicketCategoryRepository;
 import com.spice.profitmandi.dao.repository.cs.TicketRepository;
 import com.spice.profitmandi.dao.repository.cs.TicketSubCategoryRepository;
+import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.slab.TargetSlabService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.web.model.LoginDetails;
 	@Autowired
 	private ActivityRepository activityRepository;
 	@Autowired
+	private ActivityAttachmentRepository activityAttachmentRepository;
+	@Autowired
 	private TicketAssignedRepository ticketAssignedRepository;
 	@Autowired
 	private PartnerRegionRepository partnerRegionRepository;
 	PartnersPositionRepository partnersPositionRepository;
 	@Autowired
 	FofoStoreRepository fofoStoreRepository;
+	@Autowired
+	DocumentRepository documentRepository;
 	@GetMapping(value = "/cs/createCategory")
 	public String getCreateCategory(HttpServletRequest request, Model model) {
 		List<TicketCategory> ticketCategories = ticketCategoryRepository.selectAll();
 		model.addAttribute("ticketCategories", ticketCategories);
 		return "create-ticket-category";
 	@GetMapping(value = "/cs/getActivities")
 	public String getActivity(HttpServletRequest request,
 			@RequestParam(name = "ticketId", defaultValue = "0") int ticketId, Model model) throws Exception {
 		List<Activity> allactivities = activityRepository.selectAll(ticketId);
+		List<List<ActivityAttachment>> activityAttachments = allactivities.stream().map(x -> x.getActivityAttachment())
+				.collect(Collectors.toList());
+		for (List<ActivityAttachment> aA : activityAttachments) {
+			// List<ActivityAttachment> documentId = aA.stream().map(x ->
+			// x).collect(Collectors.toList());
+			for (ActivityAttachment attachment : aA) {
+				Document document = documentRepository.selectById(attachment.getDocumentId());
+				attachment.setDocumentName(document.getDisplayName());
+				activityAttachmentRepository.persist(attachment);
+			}
+		}
 		List<Activity> activities = null;
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		if (roleManager.isAdmin(loginDetails.getRoleIds())) {
 			Set<Integer> authUserIds = allactivities.stream().map(x -> x.getCreatedBy()).collect(Collectors.toSet());
 			List<AuthUser> users = authRepository.selectAllAuthUserByIds(new ArrayList<>(authUserIds));
 	@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 {
+			@RequestParam(name = "message", defaultValue = "") String message, @RequestBody List<Integer> documentIds,
+			Model model) throws Exception {
+		LOGGER.info("documentIds" + documentIds);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		Ticket ticket = ticketRepository.selectById(ticketId);
 		List<TicketAssigned> ticketAssignedList = ticketAssignedRepository.selectByTicketIds(Arrays.asList(ticketId));
-		List<Integer>authUserIds = ticketAssignedList.stream().map(x->x.getAssineeId()).collect(Collectors.toList());
+		List<Integer> authUserIds = ticketAssignedList.stream().map(x -> x.getAssineeId()).collect(Collectors.toList());
-		authUserIds.add(ticketAssignedList.get(ticketAssignedList.size()-1).getManagerId());
+		authUserIds.add(ticketAssignedList.get(ticketAssignedList.size() - 1).getManagerId());
-		Map<Integer, AuthUser> authUsersMap = authRepository.selectAllAuthUserByIds(authUserIds).stream().collect(Collectors.toMap(x->x.getId(), x->x));
+		Map<Integer, AuthUser> authUsersMap = authRepository.selectAllAuthUserByIds(authUserIds).stream()
+				.collect(Collectors.toMap(x -> x.getId(), x -> x));
 		if (ticket.getCloseTimestamp() == null) {
 			Activity activity = new Activity();
 			activity.setCreatedBy(0);
 			activity.setCreateTimestamp(LocalDateTime.now());
 			String subject = null;
-			String mailMessage=null;
+			String mailMessage = null;
 			activity.setMessage(message);
 			if (!roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 				CustomRetailer customRetailer = retailerService.getFofoRetailers(true).get(loginDetails.getFofoId());
 				activity.setType(ActivityType.COMMUNICATION_IN);
-				subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(), customRetailer.getBusinessName() + "("+customRetailer.getCode()+")");
+				subject = String.format("Ticket Update #%s by franchisee %s", ticket.getId(),
+						customRetailer.getBusinessName() + "(" + customRetailer.getCode() + ")");
 				mailMessage = String.format("Franchisee message - %s", message);
 			} else {
 				AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 				activity.setCreatedBy(authUser.getId());
 				authUsersMap.remove(authUser.getId());
 					this.activityRelatedMail(customRetailer.getEmail(), null, "subject", partnerMessage);
 					activity.setType(ActivityType.COMMUNICATION_OUT);
+				}
+			}
 			activityRepository.persist(activity);
+			for (Integer documentId : documentIds) {
+				ActivityAttachment activityAttachment = new ActivityAttachment();
+				activityAttachment.setActivityId(activity.getId());
+				activityAttachment.setDocumentId(documentId);
+				activityAttachmentRepository.persist(activityAttachment);
+			}
 			csService.addActivity(ticket, activity);
 			AuthUser authUser = authUsersMap.remove(authUserIds.get(0));
-			if(authUser==null) {
+			if (authUser == null) {
 				authUser = authUsersMap.remove(authUserIds.get(1));
+			}
 			model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
-			String [] cc = authUsersMap.entrySet().stream().map(x->x.getValue().getEmailId()).toArray(String[]::new);
+			String[] cc = authUsersMap.entrySet().stream().map(x -> x.getValue().getEmailId()).toArray(String[]::new);
 			this.activityRelatedMail(authUser.getEmailId(), cc, subject, mailMessage);
 		} else {
 			throw new ProfitMandiBusinessException("Ticket", ticket.getId(), "Already closed ticket");
+		}
 		return "response";
 				activity.setCreateTimestamp(LocalDateTime.now());
 			} else {
 				String message = String.format(INTERNAL_REOPEN_MAIL, ticketId,
 						retailerService.getFofoRetailer(loginDetails.getFofoId()).getBusinessName());
 				String to = authRepository.selectById(ticket.getL1AuthUser()).getEmailId();
-				String[] ccTo = authRepository.selectAllAuthUserByIds(
+				String[] ccTo = authRepository
-						Arrays.asList(ticket.getL2AuthUser(), ticket.getL3AuthUser(), ticket.getL4AuthUser(), ticket.getL5AuthUser()))
+						.selectAllAuthUserByIds(Arrays.asList(ticket.getL2AuthUser(), ticket.getL3AuthUser(),
+								ticket.getL4AuthUser(), ticket.getL5AuthUser()))
-						.stream().map(x->x.getEmailId()).toArray(String[]::new);
+						.stream().map(x -> x.getEmailId()).toArray(String[]::new);
 				ticket.setLastActivity(lastActivity);
 				ticket.setUpdateTimestamp(LocalDateTime.now());
 				ticketAssignedRepository.deleteByTicketId(ticketId);
 				TicketAssigned ticketAssigned = new TicketAssigned();
 				ticketAssigned.setAssineeId(ticket.getL1AuthUser());

Subversion Repositories SmartDukaan

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