Subversion Repositories SmartDukaan

Rev

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

Rev 24751 Rev 24787
Line 336... Line 336...
336 
 
 336 
 
337 
	@GetMapping(value = "/cs/myticket")
 337 
	@GetMapping(value = "/cs/myticket")
338 
	public String getTicket(HttpServletRequest request,
 338 
	public String getTicket(HttpServletRequest request,
339 
			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
 339 
			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
340 
			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
 340 
			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
- 
 
 341 
			@RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
- 
 
 342 
			@RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
341 
			@RequestParam(name = "offset", defaultValue = "0") int offset,
 343 
			@RequestParam(name = "offset", defaultValue = "0") int offset,
342 
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 344 
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
343 
			throws ProfitMandiBusinessException {
 345 
			throws ProfitMandiBusinessException {
344 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 346 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
345 
		List<Ticket> tickets = null;
 347 
		List<Ticket> tickets = null;
Line 348... Line 350...
348 
		long size = 0;
 350 
		long size = 0;
349 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 351 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
350 
		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
 352 
		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
351 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 353 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
352 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 354 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
353 
			LOGGER.info(ticketStatus);
 355 
			if (ticketSearchType == null) {
- 
 
 356 
					tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
- 
 
 357 
							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
354 
			LOGGER.info(sortOrder);
 358 
							limit);
- 
 
 359 
					size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
- 
 
 360 
							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), null, searchTerm);
- 
 
 361
- 
 
 362 
			} else {
- 
 
 363
355 
			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
 364 
					tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
356 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
 365 
							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType,
- 
 
 366 
							searchTerm, offset, limit);
357 
			size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
 367 
					size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
358 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
 368 
							Optional.of(TicketStatus.OPENED.equals(ticketStatus)), ticketSearchType, searchTerm);
- 
 
 369
- 
 
 370 
			}
359 
			LOGGER.info(size + "size");
 371 
			LOGGER.info(size + "size");
- 
 
 372 
			if(tickets.size()>0) {
360 
			ticketAssigneds = ticketAssignedRepository
 373 
			ticketAssigneds = ticketAssignedRepository
361 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
 374 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
362 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 375 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
363 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 376 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
364 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 377 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
- 
 
 378 
			}
365 
 
 379 
 
366 
		} else {
 380 
		} else {
367 
			LOGGER.info(ticketStatus);
 381 
			LOGGER.info(ticketStatus);
368 
			LOGGER.info(sortOrder);
 382 
			LOGGER.info(sortOrder);
369 
			LOGGER.info(TicketStatus.OPENED.equals(ticketStatus));
 383 
			LOGGER.info(TicketStatus.OPENED.equals(ticketStatus));
Line 392... Line 406...
392 
		model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
 406 
		model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
393 
		model.addAttribute("ticketStatusValues", TicketStatus.values());
 407 
		model.addAttribute("ticketStatusValues", TicketStatus.values());
394 
		model.addAttribute("orderByValues", SortOrder.values());
 408 
		model.addAttribute("orderByValues", SortOrder.values());
395 
		model.addAttribute("selectedticketStatus", ticketStatus);
 409 
		model.addAttribute("selectedticketStatus", ticketStatus);
396 
		model.addAttribute("selectedorderby", sortOrder);
 410 
		model.addAttribute("selectedorderby", sortOrder);
- 
 
 411 
		model.addAttribute("ticketSearchTypes", TicketSearchType.values());
- 
 
 412 
		model.addAttribute("ticketSearchType", ticketSearchType);
- 
 
 413 
		model.addAttribute("searchTerm", searchTerm);
397 
		return "ticket";
 414 
		return "ticket";
398 
	}
 415 
	}
399 
 
 416 
 
400 
	@GetMapping(value = "/cs/myticketPaginated")
 417 
	@GetMapping(value = "/cs/myticketPaginated")
401 
	public String getMyTicketPaginated(HttpServletRequest request,
 418 
	public String getMyTicketPaginated(HttpServletRequest request,
402 
			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
 419 
			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
403 
			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
 420 
			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
- 
 
 421 
			@RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
- 
 
 422 
			@RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
404 
			@RequestParam(name = "offset", defaultValue = "0") int offset,
 423 
			@RequestParam(name = "offset", defaultValue = "0") int offset,
405 
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 424 
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
406 
			throws ProfitMandiBusinessException {
 425 
			throws ProfitMandiBusinessException {
407 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 426 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
408 
		List<Ticket> tickets = null;
 427 
		List<Ticket> tickets = null;
Line 410... Line 429...
410 
		// List<Integer> ticketIds = null;
 429 
		// List<Integer> ticketIds = null;
411 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 430 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
412 
		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
 431 
		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
413 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 432 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
414 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 433 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
- 
 
 434 
 
- 
 
 435 
			if (ticketSearchType == null) {
415 
			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
 436 
				tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
416 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
 437 
						Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
- 
 
 438 
						limit);
- 
 
 439 
			} else {
- 
 
 440 
				tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
- 
 
 441 
						Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType, searchTerm,
- 
 
 442 
						offset, limit);
- 
 
 443 
			}
417 
			ticketAssigneds = ticketAssignedRepository
 444 
			ticketAssigneds = ticketAssignedRepository
418 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
 445 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
419 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 446 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
420 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 447 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
421 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 448 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
Line 540... Line 567...
540 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 567 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
541 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
 568 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
542 
			size = ticketRepository.selectAllCount();
 569 
			size = ticketRepository.selectAllCount();
543 
		} else {
 570 
		} else {
544 
			if (ticketSearchType == null) {
 571 
			if (ticketSearchType == null) {
- 
 
 572 
				if (ticketStatus.equals(TicketStatus.RESOLVED)) {
- 
 
 573 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.empty(),
- 
 
 574 
							null, searchTerm, offset, limit);
- 
 
 575 
					size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.empty(), null, 0);
- 
 
 576 
				} else {
545 
				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
 577 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
546 
						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm, offset, limit);
 578 
							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm, offset, limit);
547 
				size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(),
 579 
					size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(),
548 
						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, 0);
 580 
							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, 0);
- 
 
 581 
				}
549 
			} else {
 582 
			} else {
- 
 
 583 
				if (ticketStatus.equals(TicketStatus.RESOLVED)) {
- 
 
 584 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.empty(),
- 
 
 585 
							ticketSearchType, searchTerm, offset, limit);
- 
 
 586 
					size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.empty(),
- 
 
 587 
							ticketSearchType, searchTerm);
- 
 
 588 
				} else {
550 
				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
 589 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
551 
						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm, offset,
 590 
							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm, offset,
552 
						limit);
 591 
							limit);
553 
				size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(),
 592 
					size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(),
554 
						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
 593 
							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
- 
 
 594 
				}
- 
 
 595 
 
555 
			}
 596 
			}
556 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
 597 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
557 
 
 598 
 
558 
			if (tickets.size() > 0) {
 599 
			if (tickets.size() > 0) {
559 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 600 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
Line 600... Line 641...
600 
		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 641 
		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
601 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 642 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
602 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
 643 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
603 
		} else {
 644 
		} else {
604 
			if (ticketSearchType == null) {
 645 
			if (ticketSearchType == null) {
- 
 
 646 
				if (ticketStatus.equals(TicketStatus.RESOLVED)) {
- 
 
 647 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.empty(),
- 
 
 648 
							null, searchTerm, offset, limit);
- 
 
 649 
 
- 
 
 650 
				} else {
605 
				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
 651 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
606 
						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm, offset, limit);
 652 
							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm, offset, limit);
- 
 
 653 
 
- 
 
 654 
				}
607 
			} else {
 655 
			} else {
- 
 
 656 
				if (ticketStatus.equals(TicketStatus.RESOLVED)) {
- 
 
 657 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.empty(),
- 
 
 658 
							ticketSearchType, searchTerm, offset, limit);
- 
 
 659 
 
- 
 
 660 
				} else {
608 
				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
 661 
					tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
609 
						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm, offset,
 662 
							Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm, offset,
610 
						limit);
 663 
							limit);
- 
 
 664 
				}
- 
 
 665 
 
611 
			}
 666 
			}
612 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
 667 
			authUserListMap = csService.getAuthUserList(tickets, authUser);
613 
			if (tickets.size() > 0) {
 668 
			if (tickets.size() > 0) {
614 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 669 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
615 
				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 670 
				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);