Subversion Repositories SmartDukaan

Rev

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

Rev 27318 Rev 27410
Line 70... Line 70...
70 
@Controller
 70 
@Controller
71 
@Transactional(rollbackFor = Throwable.class)
 71 
@Transactional(rollbackFor = Throwable.class)
72 
public class CsController {
 72 
public class CsController {
73 
 
 73 
 
74 
	private static final Logger LOGGER = LogManager.getLogger(CsController.class);
 74 
	private static final Logger LOGGER = LogManager.getLogger(CsController.class);
75 
 
 - 
 
76 
	private static final String ACTIVITY_SUBJECT = "Message related ticketId#%s";
 75 
	private static final String ACTIVITY_SUBJECT = "Message related ticketId#%s";
77 
	private static final String PARTNER_RESOLVED_TICKET_MAIL = "Dear Partner , we have resolved your ticket # %s , request to kindly accept the same. In case you still have any concerns regarding the same pls click on %s so that we can help you.Regards\nSmartdukaan";
 76 
	private static final String PARTNER_RESOLVED_TICKET_MAIL = "Dear Partner , we have resolved your ticket # %s , request to kindly accept the same. In case you still have any concerns regarding the same pls click on %s so that we can help you.Regards\nSmartdukaan";
78 
	private static final String PARTNER_REOPEN = "Dear Partner , Your ticket # %s has been re-opened as per your confirmation & we are committed to resolve it on priority.Regards\nSmartdukaan";
 77 
	private static final String PARTNER_REOPEN = "Dear Partner , Your ticket # %s has been re-opened as per your confirmation & we are committed to resolve it on priority.Regards\nSmartdukaan";
79 
	private static final String INTERNAL_REOPEN_MAIL = "Team, Pls note that the Ticket Id %s has been re-opened by %s , pls respond on priority";
 78 
	private static final String INTERNAL_REOPEN_MAIL = "Team, Pls note that the Ticket Id %s has been re-opened by %s , pls respond on priority";
80 
	private static final String INTERNAL_REOPEN_ACTIVITY_MESSAGE = "Hi,My ticket is not resolved yet,so I have reopened it";
 79 
	private static final String INTERNAL_REOPEN_ACTIVITY_MESSAGE = "Hi,My ticket is not resolved yet,so I have reopened it";
Line 265... Line 264...
265 
		csService.addPartnerToRegion(regionId, selectedFofoIds);
 264 
		csService.addPartnerToRegion(regionId, selectedFofoIds);
266 
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 265 
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
267 
		return "response";
 266 
		return "response";
268 
	}
 267 
	}
269 
 
 268 
 
- 
 
 269 
	@GetMapping(value = "/cs/getPosition")
- 
 
 270 
	public String getPosition(HttpServletRequest request, @RequestParam int positionId, Model model) {
- 
 
 271 
 
- 
 
 272 
		Position position = positionRepository.selectById(positionId);
- 
 
 273
- 
 
 274 
 
- 
 
 275 
		List<CustomRetailer> positionIdCustomRetailer = csService.getPositionCustomRetailerMap(Arrays.asList(position))
- 
 
 276 
				.get(position.getId());
- 
 
 277 
 
- 
 
 278 
		Map<Integer, CustomRetailer> regionRetailerMap = csService.getRegionPartners(Arrays.asList(position))
- 
 
 279 
				.get(position.getRegionId()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
- 
 
 280 
 
- 
 
 281
- 
 
 282 
		model.addAttribute("position", position);
- 
 
 283 
		model.addAttribute("regionRetailerMap", regionRetailerMap);
- 
 
 284 
		model.addAttribute("positionIdCustomRetailer", positionIdCustomRetailer);
- 
 
 285
- 
 
 286 
 
- 
 
 287 
		return "position-partner";
- 
 
 288 
	}
- 
 
 289 
 
270 
	@GetMapping(value = "/cs/createPosition")
 290 
	@GetMapping(value = "/cs/createPosition")
271 
	public String createPosition(HttpServletRequest request,
 291 
	public String createPosition(HttpServletRequest request,
272 
			@RequestParam(name = "offset", defaultValue = "0") int offset,
 292 
			@RequestParam(name = "offset", defaultValue = "0") int offset,
273 
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) {
 293 
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) {
274 
		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
 294 
		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
Line 285... Line 305...
285 
				.getAuthUserIdAndAuthUserMapUsingPositions(positions);
 305 
				.getAuthUserIdAndAuthUserMapUsingPositions(positions);
286 
		Map<Integer, TicketCategory> categoryIdAndCategoryMap = csService
 306 
		Map<Integer, TicketCategory> categoryIdAndCategoryMap = csService
287 
				.getCategoryIdAndCategoryUsingPositions(positions);
 307 
				.getCategoryIdAndCategoryUsingPositions(positions);
288 
		Map<Integer, Region> regionIdAndRegionMap = csService.getRegionIdAndRegionMap(positions);
 308 
		Map<Integer, Region> regionIdAndRegionMap = csService.getRegionIdAndRegionMap(positions);
289 
 
 309 
 
290 
		Map<Integer, List<CustomRetailer>> positionIdAndpartnerRegionMap = csService
 310 
//	    Map<Integer, List<CustomRetailer>> positionIdAndpartnerRegionMap = csService
291 
				.getpositionIdAndpartnerRegionMap(positions);
 311 
//			.getpositionIdAndpartnerRegionMap(positions);
292 
 
 312 
 
293 
		Map<Integer, List<CustomRetailer>> addedpositionIdAndCustomRetailerMap = csService
 313 
//	     Map<Integer, List<CustomRetailer>> addedpositionIdAndCustomRetailerMap = csService
294 
				.getPositionCustomRetailerMap(positions);
 314 
//				.getPositionCustomRetailerMap(positions);
295 
		LOGGER.info("fofoIdAndCustomRetailerMap" + addedpositionIdAndCustomRetailerMap);
 315 
//		LOGGER.info("fofoIdAndCustomRetailerMap" + addedpositionIdAndCustomRetailerMap);
296 
		long size = positionRepository.selectAllCount();
 316 
		long size = positionRepository.selectAllCount();
297 
 
 317 
 
298 
		if (size < limit) {
 318 
		if (size < limit) {
299 
			model.addAttribute("end", offset + size);
 319 
			model.addAttribute("end", offset + size);
300 
		} else {
 320 
		} else {
Line 305... Line 325...
305 
		model.addAttribute("size", size);
 325 
		model.addAttribute("size", size);
306 
		model.addAttribute("positions", positions);
 326 
		model.addAttribute("positions", positions);
307 
		model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
 327 
		model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
308 
		model.addAttribute("categoryIdAndCategoryMap", categoryIdAndCategoryMap);
 328 
		model.addAttribute("categoryIdAndCategoryMap", categoryIdAndCategoryMap);
309 
		model.addAttribute("regionIdAndRegionMap", regionIdAndRegionMap);
 329 
		model.addAttribute("regionIdAndRegionMap", regionIdAndRegionMap);
310 
		model.addAttribute("positionIdAndCustomRetailerMap", addedpositionIdAndCustomRetailerMap);
 330 
		// model.addAttribute("positionIdAndCustomRetailerMap",
- 
 
 331 
		// addedpositionIdAndCustomRetailerMap);
311 
		model.addAttribute("positionIdAndpartnerRegionMap", positionIdAndpartnerRegionMap);
 332 
		// model.addAttribute("positionIdAndpartnerRegionMap",
- 
 
 333 
// positionIdAndpartnerRegionMap);
312 
 
 334 
 
313 
		return "create-position";
 335 
		return "create-position";
314 
	}
 336 
	}
315 
 
 337 
 
316 
	@GetMapping(value = "/cs/position-paginated")
 338 
	@GetMapping(value = "/cs/position-paginated")
Line 322... Line 344...
322 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = csService
 344 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = csService
323 
				.getAuthUserIdAndAuthUserMapUsingPositions(positions);
 345 
				.getAuthUserIdAndAuthUserMapUsingPositions(positions);
324 
		Map<Integer, TicketCategory> categoryIdAndCategoryMap = csService
 346 
		Map<Integer, TicketCategory> categoryIdAndCategoryMap = csService
325 
				.getCategoryIdAndCategoryUsingPositions(positions);
 347 
				.getCategoryIdAndCategoryUsingPositions(positions);
326 
		Map<Integer, Region> regionIdAndRegionMap = csService.getRegionIdAndRegionMap(positions);
 348 
		Map<Integer, Region> regionIdAndRegionMap = csService.getRegionIdAndRegionMap(positions);
327 
 
 349 
		/*
328 
		Map<Integer, List<CustomRetailer>> positionIdAndpartnerRegionMap = csService
 350 
		 * Map<Integer, List<CustomRetailer>> positionIdAndpartnerRegionMap = csService
329 
				.getpositionIdAndpartnerRegionMap(positions);
 351 
		 * .getpositionIdAndpartnerRegionMap(positions);
330 
 
 352 
		 *
331 
		Map<Integer, List<CustomRetailer>> addedpositionIdAndCustomRetailerMap = csService
 353 
		 * Map<Integer, List<CustomRetailer>> addedpositionIdAndCustomRetailerMap =
332 
				.getPositionCustomRetailerMap(positions);
 354 
		 * csService .getPositionCustomRetailerMap(positions);
- 
 
 355 
		 */
333 
 
 356 
 
334 
		model.addAttribute("positions", positions);
 357 
		model.addAttribute("positions", positions);
335 
		model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
 358 
		model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
336 
		model.addAttribute("categoryIdAndCategoryMap", categoryIdAndCategoryMap);
 359 
		model.addAttribute("categoryIdAndCategoryMap", categoryIdAndCategoryMap);
337 
		model.addAttribute("regionIdAndRegionMap", regionIdAndRegionMap);
 360 
		model.addAttribute("regionIdAndRegionMap", regionIdAndRegionMap);
338 
		model.addAttribute("positionIdAndCustomRetailerMap", addedpositionIdAndCustomRetailerMap);
 361 
		// model.addAttribute("positionIdAndCustomRetailerMap",
- 
 
 362 
		// addedpositionIdAndCustomRetailerMap);
339 
		model.addAttribute("positionIdAndpartnerRegionMap", positionIdAndpartnerRegionMap);
 363 
		// model.addAttribute("positionIdAndpartnerRegionMap",
- 
 
 364 
		// positionIdAndpartnerRegionMap);
340 
 
 365 
 
341 
		return "position-paginated";
 366 
		return "position-paginated";
342 
	}
 367 
	}
343 
 
 368 
 
344 
	@PostMapping(value = "/cs/createPosition")
 369 
	@PostMapping(value = "/cs/createPosition")
Line 671... Line 696...
671 
			AuthUser authUser = authUsersMap.remove(authUserIds.get(0));
 696 
			AuthUser authUser = authUsersMap.remove(authUserIds.get(0));
672 
			if (authUser == null) {
 697 
			if (authUser == null) {
673 
				authUser = authUsersMap.remove(authUserIds.get(1));
 698 
				authUser = authUsersMap.remove(authUserIds.get(1));
674 
			}
 699 
			}
675 
			model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
 700 
			model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
676 
		    String[] cc = authUsersMap.entrySet().stream().map(x -> x.getValue().getEmailId()).toArray(String[]::new);
 701 
			String[] cc = authUsersMap.entrySet().stream().map(x -> x.getValue().getEmailId()).toArray(String[]::new);
677 
			this.activityRelatedMail(authUser.getEmailId(), cc, subject, mailMessage);
 702 
			this.activityRelatedMail(authUser.getEmailId(), cc, subject, mailMessage);
678 
		} else {
 703 
		} else {
679 
			throw new ProfitMandiBusinessException("Ticket", ticket.getId(), "Already closed ticket");
 704 
			throw new ProfitMandiBusinessException("Ticket", ticket.getId(), "Already closed ticket");
680 
		}
 705 
		}
681 
		return "response";
 706 
		return "response";