diff --git a/src/main/java/org/upsmf/grievance/enums/TicketStatus.java b/src/main/java/org/upsmf/grievance/enums/TicketStatus.java index 8037f4eb414c590e04b3cbfa9cd9388122080bc9..99cc4e30a7e64c4c1f17e63ebe2d69fb21e60bc8 100644 --- a/src/main/java/org/upsmf/grievance/enums/TicketStatus.java +++ b/src/main/java/org/upsmf/grievance/enums/TicketStatus.java @@ -2,7 +2,7 @@ package org.upsmf.grievance.enums; public enum TicketStatus { - OPEN(1), CLOSED(2); + OPEN(1), CLOSED(2), INVALID(3); private int id; diff --git a/src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java b/src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java index 0029dfdc494d6a4c7e1df3f3716bdd3236e64821..245e224758d2c60925b97b1b46332ace751c1227 100644 --- a/src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java +++ b/src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java @@ -202,10 +202,15 @@ public class TicketServiceImpl implements TicketService { if(curentUpdatedTicket.getStatus().name().equalsIgnoreCase(TicketStatus.CLOSED.name())) { generateFeedbackLinkAndEmail(ticket); return ticket; + } else if (curentUpdatedTicket.getStatus().name().equalsIgnoreCase(TicketStatus.INVALID.name())) { + EmailDetails resolutionOfYourGrievance = EmailDetails.builder().subject("Update on Ticket Status - " +curentUpdatedTicket.getTicketId()).recipient(curentUpdatedTicket.getEmail()).build(); + emailService.sendUpdateTicketMail(resolutionOfYourGrievance, ticket); + return ticket; + }else { + EmailDetails resolutionOfYourGrievance = EmailDetails.builder().subject("Resolution of Your Grievance - " + curentUpdatedTicket.getTicketId()).recipient(curentUpdatedTicket.getEmail()).build(); + emailService.sendUpdateTicketMail(resolutionOfYourGrievance, ticket); + return ticket; } - EmailDetails resolutionOfYourGrievance = EmailDetails.builder().subject("Update on Ticket Status - " +curentUpdatedTicket.getTicketId()).recipient(curentUpdatedTicket.getEmail()).build(); - emailService.sendUpdateTicketMail(resolutionOfYourGrievance, ticket); - return ticket; } private void generateFeedbackLinkAndEmail(Ticket curentUpdatedTicket) { @@ -225,6 +230,23 @@ public class TicketServiceImpl implements TicketService { EmailDetails resolutionOfYourGrievance = EmailDetails.builder().subject("Resolution of Your Grievance").recipient(curentUpdatedTicket.getEmail()).build(); emailService.sendClosedTicketMail(resolutionOfYourGrievance, curentUpdatedTicket, comment, Collections.EMPTY_LIST, link); } +// private void generateFeedbackLinkAndEmail(Ticket curentUpdatedTicket) { +// List<Comments> comments = commentRepository.findAllByTicketId(curentUpdatedTicket.getId()); +// Comments latestComment =null; +// if(comments!=null && comments.size() > 0) { +// latestComment = comments.get(comments.size()-1); +// } +// String comment = latestComment!=null?latestComment.getComment():""; +// String link = feedbackBaseUrl.concat("?").concat("guestName=") +// .concat(curentUpdatedTicket.getFirstName().concat("%20").concat(curentUpdatedTicket.getLastName())) +// .concat("&ticketId=").concat(String.valueOf(curentUpdatedTicket.getId())) +// .concat("&resolutionComment=").concat(comment) +// .concat("&email=").concat(curentUpdatedTicket.getEmail()) +// .concat("&phone=").concat(curentUpdatedTicket.getPhone()) +// .concat("&ticketTitle=").concat(curentUpdatedTicket.getDescription()); +// EmailDetails resolutionOfYourGrievance = EmailDetails.builder().subject("Resolution of Your Grievance").recipient(curentUpdatedTicket.getEmail()).build(); +// emailService.sendClosedTicketMail(resolutionOfYourGrievance, curentUpdatedTicket, comment, Collections.EMPTY_LIST, link); +// } @Override public Ticket getTicketById(long id) { @@ -366,7 +388,7 @@ public class TicketServiceImpl implements TicketService { } private boolean isValidStatus(TicketStatus status) { - return status == TicketStatus.OPEN || status==TicketStatus.CLOSED; + return status == TicketStatus.OPEN || status==TicketStatus.CLOSED || status==TicketStatus.INVALID; } private boolean isValidPriority(TicketPriority priority) { diff --git a/src/main/resources/templates/raiser_update_ticket.vm b/src/main/resources/templates/raiser_update_ticket.vm index 6d66496aad3579d2d34eb67f738e44114d8322c8..f12531c56c87fb6fd17af07212f26e0551684c4f 100644 --- a/src/main/resources/templates/raiser_update_ticket.vm +++ b/src/main/resources/templates/raiser_update_ticket.vm @@ -85,7 +85,7 @@ <td align="justify" class="esd-block-text es-m-txt-l"> <p></br></p> <p>Dear ${first_name},</p> - <p>We hope this email finds you well. We are writing to provide you with an update regarding your recent ticket with us, ${ticket_number}.</p> + <p>We hope this email finds you well. We are writing to provide you with an update regarding your recent ticket with us, ${id}.</p> <p>We are pleased to inform you that significant progress has been made in resolving the issue you reported. Our dedicated team has been diligently working on your case, and we are confident that we are moving towards a resolution.</p> <p> <div>Here is a brief overview of the status:</div>