| Line 344... |
Line 344... |
| 344 |
@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
|
344 |
@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
|
| 345 |
throws ProfitMandiBusinessException {
|
345 |
throws ProfitMandiBusinessException {
|
| 346 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
346 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 347 |
List<Ticket> tickets = null;
|
347 |
List<Ticket> tickets = null;
|
| 348 |
List<TicketAssigned> ticketAssigneds = null;
|
348 |
List<TicketAssigned> ticketAssigneds = null;
|
| 349 |
// List<Integer> ticketIds = null;
|
- |
|
| 350 |
long size = 0;
|
349 |
long size = 0;
|
| 351 |
Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
|
350 |
Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
|
| 352 |
// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
|
- |
|
| 353 |
if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
351 |
if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
| 354 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
352 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
| 355 |
if (ticketSearchType == null) {
|
353 |
if (ticketSearchType == null) {
|
| - |
|
354 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
| - |
|
355 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder, null,
|
| - |
|
356 |
searchTerm, offset, limit);
|
| - |
|
357 |
size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.empty(), null,
|
| - |
|
358 |
searchTerm);
|
| - |
|
359 |
} else {
|
| 356 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
360 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
| 357 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
|
361 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
|
| 358 |
limit);
|
362 |
limit);
|
| 359 |
size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
|
363 |
size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
|
| 360 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), null, searchTerm);
|
364 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), null, searchTerm);
|
| 361 |
|
365 |
}
|
| - |
|
366 |
|
| 362 |
} else {
|
367 |
} else {
|
| - |
|
368 |
|
| - |
|
369 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
| - |
|
370 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder,
|
| - |
|
371 |
ticketSearchType, searchTerm, offset, limit);
|
| - |
|
372 |
size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.empty(),
|
| - |
|
373 |
ticketSearchType, searchTerm);
|
| 363 |
|
374 |
} else {
|
| 364 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
375 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
| 365 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType,
|
376 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType,
|
| 366 |
searchTerm, offset, limit);
|
377 |
searchTerm, offset, limit);
|
| 367 |
size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
|
378 |
size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
|
| 368 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), ticketSearchType, searchTerm);
|
379 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), ticketSearchType, searchTerm);
|
| 369 |
|
380 |
}
|
| 370 |
}
|
381 |
}
|
| 371 |
LOGGER.info(size + "size");
|
382 |
//LOGGER.info(size + "size");
|
| 372 |
if(tickets.size()>0) {
|
383 |
if (tickets.size() > 0) {
|
| 373 |
ticketAssigneds = ticketAssignedRepository
|
384 |
ticketAssigneds = ticketAssignedRepository
|
| 374 |
.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
385 |
.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
| 375 |
authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
|
386 |
authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
|
| 376 |
Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
|
387 |
Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
|
| 377 |
model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
|
388 |
model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
|
| 378 |
}
|
389 |
}
|
| 379 |
|
390 |
|
| 380 |
} else {
|
391 |
} else {
|
| 381 |
LOGGER.info(ticketStatus);
|
- |
|
| 382 |
LOGGER.info(sortOrder);
|
- |
|
| 383 |
LOGGER.info(TicketStatus.OPENED.equals(ticketStatus));
|
- |
|
| 384 |
tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
|
392 |
tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
|
| 385 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
|
393 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
|
| 386 |
size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(),
|
394 |
size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(),
|
| 387 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
|
395 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
|
| 388 |
}
|
396 |
}
|
| Line 424... |
Line 432... |
| 424 |
@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
|
432 |
@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
|
| 425 |
throws ProfitMandiBusinessException {
|
433 |
throws ProfitMandiBusinessException {
|
| 426 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
434 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 427 |
List<Ticket> tickets = null;
|
435 |
List<Ticket> tickets = null;
|
| 428 |
List<TicketAssigned> ticketAssigneds = null;
|
436 |
List<TicketAssigned> ticketAssigneds = null;
|
| 429 |
// List<Integer> ticketIds = null;
|
- |
|
| - |
|
437 |
|
| 430 |
Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
|
438 |
Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
|
| 431 |
// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
|
- |
|
| - |
|
439 |
|
| 432 |
if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
440 |
if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
|
| 433 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
441 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
| 434 |
|
- |
|
| 435 |
if (ticketSearchType == null) {
|
442 |
if (ticketSearchType == null) {
|
| - |
|
443 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
| - |
|
444 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder, null,
|
| - |
|
445 |
searchTerm, offset, limit);
|
| - |
|
446 |
} else {
|
| 436 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
447 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
| 437 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
|
448 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
|
| 438 |
limit);
|
449 |
limit);
|
| - |
|
450 |
}
|
| - |
|
451 |
|
| 439 |
} else {
|
452 |
} else {
|
| - |
|
453 |
|
| - |
|
454 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
| - |
|
455 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder,
|
| - |
|
456 |
ticketSearchType, searchTerm, offset, limit);
|
| - |
|
457 |
} else {
|
| 440 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
458 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
| 441 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType, searchTerm,
|
459 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType,
|
| 442 |
offset, limit);
|
460 |
searchTerm, offset, limit);
|
| - |
|
461 |
}
|
| 443 |
}
|
462 |
}
|
| 444 |
ticketAssigneds = ticketAssignedRepository
|
463 |
ticketAssigneds = ticketAssignedRepository
|
| 445 |
.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
464 |
.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
| 446 |
authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
|
465 |
authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
|
| 447 |
Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
|
466 |
Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
|
| Line 512... |
Line 531... |
| 512 |
activity.setCreatedBy(authUser.getId());
|
531 |
activity.setCreatedBy(authUser.getId());
|
| 513 |
activity.setCreateTimestamp(LocalDateTime.now());
|
532 |
activity.setCreateTimestamp(LocalDateTime.now());
|
| 514 |
activity.setType(ActivityType.COMMUNICATION_OUT);
|
533 |
activity.setType(ActivityType.COMMUNICATION_OUT);
|
| 515 |
csService.addActivity(ticketId, activity);
|
534 |
csService.addActivity(ticketId, activity);
|
| 516 |
String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
|
535 |
String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
|
| 517 |
LOGGER.info(authUser.getEmailId() + " " + subject + " " + message);
|
536 |
//LOGGER.info(authUser.getEmailId() + " " + subject + " " + message);
|
| 518 |
this.activityRelatedMail(retailerService.getFofoRetailer(ticket.getFofoId()).getEmail(), null, subject,
|
537 |
this.activityRelatedMail(retailerService.getFofoRetailer(ticket.getFofoId()).getEmail(), null, subject,
|
| 519 |
message);
|
538 |
message);
|
| 520 |
model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
|
539 |
model.addAttribute("response", mvcResponseSender.createResponseString(authUser));
|
| 521 |
}
|
540 |
}
|
| 522 |
} else {
|
541 |
} else {
|