diff --git a/src/main/java/org/upsmf/grievance/model/Ticket.java b/src/main/java/org/upsmf/grievance/model/Ticket.java
index 028d2e70d13a6345ae1bd6f19cfd8d019f193a4c..f6866901ac42edff3fbc37b12b79080048100c74 100644
--- a/src/main/java/org/upsmf/grievance/model/Ticket.java
+++ b/src/main/java/org/upsmf/grievance/model/Ticket.java
@@ -53,13 +53,13 @@ public class Ticket {
@Column(name = "junked_by")
private String junkedBy;
- @Column(name = "Junk_by_reason", length = 1000)
+ @Column(name = "Junk_by_reason", length = 3000)
private String junkByReason;
@Column(name = "is_other")
private Boolean other = false;
- @Column(name = "other_by_reason", length = 1000)
+ @Column(name = "other_by_reason", length = 3000)
private String otherByReason;
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.S", timezone = "Asia/Kolkata")
diff --git a/src/main/java/org/upsmf/grievance/repository/RaiserTicketAttachmentRepository.java b/src/main/java/org/upsmf/grievance/repository/RaiserTicketAttachmentRepository.java
index 04e73901330094a2075665a8399b28210da68019..65b481fd8491743232cf23ac88b4cd8a9135b2f6 100644
--- a/src/main/java/org/upsmf/grievance/repository/RaiserTicketAttachmentRepository.java
+++ b/src/main/java/org/upsmf/grievance/repository/RaiserTicketAttachmentRepository.java
@@ -4,6 +4,9 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
import org.upsmf.grievance.model.RaiserTicketAttachment;
+import java.util.List;
+
@Repository
public interface RaiserTicketAttachmentRepository extends CrudRepository<RaiserTicketAttachment, Long> {
+ List<RaiserTicketAttachment> findByTicketId(Long ticketId);
}
diff --git a/src/main/java/org/upsmf/grievance/service/EmailService.java b/src/main/java/org/upsmf/grievance/service/EmailService.java
index 7c2cb305911c7e1bfd3717871d183778d55a8690..24be4c8db58058f9ca3c765539ce6d8d7d88369a 100644
--- a/src/main/java/org/upsmf/grievance/service/EmailService.java
+++ b/src/main/java/org/upsmf/grievance/service/EmailService.java
@@ -1,10 +1,7 @@
package org.upsmf.grievance.service;
import com.fasterxml.jackson.databind.JsonNode;
-import org.upsmf.grievance.model.AssigneeTicketAttachment;
-import org.upsmf.grievance.model.EmailDetails;
-import org.upsmf.grievance.model.Ticket;
-import org.upsmf.grievance.model.User;
+import org.upsmf.grievance.model.*;
import java.util.List;
@@ -12,11 +9,11 @@ public interface EmailService {
// Method
// To send a simple email
- void sendCreateTicketMail(EmailDetails details, Ticket ticket);
+ void sendCreateTicketMail(EmailDetails details, Ticket ticket, List<RaiserTicketAttachment> raiserTicketAttachments);
void sendUpdateTicketMail(EmailDetails details, Ticket ticket);
- void sendClosedTicketMail(EmailDetails details, Ticket ticket, String comment, List<AssigneeTicketAttachment> attachments, String feedbackURL);
+ void sendClosedTicketMail(EmailDetails details, Ticket ticket, String comment, List<AssigneeTicketAttachment> attachments, String feedbackURL, List<RaiserTicketAttachment> raiserTicketAttachments);
void sendJunkMail(EmailDetails details, Ticket ticket, String comment, List<AssigneeTicketAttachment> attachments, String feedbackURL);
void sendSimpleMail(EmailDetails details);
diff --git a/src/main/java/org/upsmf/grievance/service/impl/EmailServiceImpl.java b/src/main/java/org/upsmf/grievance/service/impl/EmailServiceImpl.java
index 246ab41e66a5c4797180b9bb8b19a8ff92a162da..51d837ab29d74777a27c21b48d69f91fe760da77 100644
--- a/src/main/java/org/upsmf/grievance/service/impl/EmailServiceImpl.java
+++ b/src/main/java/org/upsmf/grievance/service/impl/EmailServiceImpl.java
@@ -65,12 +65,12 @@ public class EmailServiceImpl implements EmailService {
private TicketDepartmentRepository ticketDepartmentRepository;
@Override
- public void sendCreateTicketMail(EmailDetails details, Ticket ticket) {
+ public void sendCreateTicketMail(EmailDetails details, Ticket ticket, List<RaiserTicketAttachment> raiserTicketAttachments) {
// getUserByDepartmentId(ticket.getTicketDepartment().getId());
// sending mail activity in seperate thread
Runnable mailThread = () -> { // lambda expression
- sendMailToRaiser(details, ticket);
+ sendMailToRaiser(details, ticket, raiserTicketAttachments);
sendMailToAdmin(details, ticket);
//sendMailToNodalOfficer(details, ticket);
};
@@ -87,10 +87,10 @@ public class EmailServiceImpl implements EmailService {
}
@Override
- public void sendClosedTicketMail(EmailDetails details, Ticket ticket, String comment, List<AssigneeTicketAttachment> attachments, String feedbackURL) {
+ public void sendClosedTicketMail(EmailDetails details, Ticket ticket, String comment, List<AssigneeTicketAttachment> attachments, String feedbackURL, List<RaiserTicketAttachment> raiserTicketAttachments) {
// Try block to check for exceptions
Runnable mailThread = () -> { // lambda expression
- sendFeedbackMailToRaiser(details, ticket, comment, attachments, feedbackURL);
+ sendFeedbackMailToRaiser(details, ticket, comment, attachments, feedbackURL, raiserTicketAttachments);
};
new Thread(mailThread).start();
@@ -108,7 +108,7 @@ public class EmailServiceImpl implements EmailService {
private void sendFeedbackMailToRaiser(EmailDetails details, Ticket ticket,
String comment, List<AssigneeTicketAttachment> attachments,
- String feedbackUrl) {
+ String feedbackUrl, List<RaiserTicketAttachment> raiserTicketAttachments) {
try {
MimeMessagePreparator preparator = new MimeMessagePreparator() {
public void prepare(MimeMessage mimeMessage) throws Exception {
@@ -130,6 +130,8 @@ public class EmailServiceImpl implements EmailService {
velocityContext.put("comment", comment);
velocityContext.put("url", feedbackUrl);
velocityContext.put("docLinks", attachments);
+ velocityContext.put("description", ticket.getDescription());
+ velocityContext.put("originalDocLinks", raiserTicketAttachments);
// signature
createCommonMailSignature(velocityContext, message);
// merge mail body
@@ -486,7 +488,7 @@ public class EmailServiceImpl implements EmailService {
message.setFrom(mailSender);
}
- private void sendMailToRaiser(EmailDetails details, Ticket ticket) {
+ private void sendMailToRaiser(EmailDetails details, Ticket ticket, List<RaiserTicketAttachment> raiserTicketAttachments) {
try {
MimeMessagePreparator preparator = new MimeMessagePreparator() {
public void prepare(MimeMessage mimeMessage) throws Exception {
@@ -497,7 +499,11 @@ public class EmailServiceImpl implements EmailService {
VelocityContext velocityContext = new VelocityContext();
velocityContext.put("first_name", ticket.getFirstName());
velocityContext.put("id", ticket.getId());
+ velocityContext.put("description", ticket.getDescription());
+ velocityContext.put("department", ticket.getTicketDepartment().getTicketDepartmentName());
+ velocityContext.put("council", ticket.getTicketCouncil().getTicketCouncilName());
velocityContext.put("created_date", DateUtil.getFormattedDateInString(ticket.getCreatedDate()));
+ velocityContext.put("docLinks", raiserTicketAttachments);
// signature
createCommonMailSignature(velocityContext, message);
// merge mail body
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 01ff4a79afe70f181d8358f8cb703ae53acd4960..63f7a258db4826942f1f9cad4b95fa81317e0d92 100644
--- a/src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java
+++ b/src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java
@@ -219,9 +219,12 @@ public class TicketServiceImpl implements TicketService {
Ticket ticket = createTicketWithDefault(ticketRequest);
// create ticket
ticket = saveWithAttachment(ticket, ticketRequest.getAttachmentUrls());
+ // get raiser urls
+ List<RaiserTicketAttachment> raiserTicketAttachments = raiserTicketAttachmentRepository
+ .findByTicketId(ticket.getId());
// send mail
EmailDetails emailDetails = EmailDetails.builder().recipient(ticket.getEmail()).subject("New Complaint Registration").build();
- emailService.sendCreateTicketMail(emailDetails, ticket);
+ emailService.sendCreateTicketMail(emailDetails, ticket, raiserTicketAttachments);
log.debug("ticket details - {}",ticket);
return ticket;
}
@@ -668,6 +671,8 @@ public class TicketServiceImpl implements TicketService {
log.error("Ticket for generateFeedbackLinkAndEmail - {}", curentUpdatedTicket);
List<AssigneeTicketAttachment> assigneeTicketAttachments = assigneeTicketAttachmentRepository
.findByTicketId(curentUpdatedTicket.getId());
+ List<RaiserTicketAttachment> raiserTicketAttachments = raiserTicketAttachmentRepository
+ .findByTicketId(curentUpdatedTicket.getId());
log.error("comments fetch for generateFeedbackLinkAndEmail - {}", comments);
Comments latestComment =null;
if(comments!=null && comments.size() > 0) {
@@ -684,7 +689,7 @@ public class TicketServiceImpl implements TicketService {
.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, assigneeTicketAttachments, link);
+ emailService.sendClosedTicketMail(resolutionOfYourGrievance, curentUpdatedTicket, comment, assigneeTicketAttachments, link, raiserTicketAttachments);
}
private void generateFeedbackLinkAndEmailForJunkTicket(Ticket curentUpdatedTicket) {
List<Comments> comments = commentRepository.findAllByTicketId(curentUpdatedTicket.getId());
diff --git a/src/main/resources/templates/raiser-create-ticket.vm b/src/main/resources/templates/raiser-create-ticket.vm
index bdd729d84cf37e04cb0a3e70dfe98ff9aa889eb9..31073bcabf2cec1a827428d300e574bb1139dd12 100644
--- a/src/main/resources/templates/raiser-create-ticket.vm
+++ b/src/main/resources/templates/raiser-create-ticket.vm
@@ -89,11 +89,26 @@
<p>Please be assured that we have registered your grievance (details below), and our team will thoroughly investigate the matter to understand the root cause and identify the best course of action to resolve it. We aim to respond to your complaint within 7 days.</p>
<p>
<div>Grievance ID: <strong>${id}</strong></div>
+ <div>Description: <strong>${description}</strong></div>
+ <div>Council: <strong>${council}</strong></div>
+ <div>Department: <strong>${department}</strong></div>
<div>Date: <strong>${created_date}</strong></div>
</p>
<p>In the meantime, we request your patience and cooperation as we work towards resolving the issue. Your satisfaction is our top priority, and we will do our utmost to rectify the situation to your complete satisfaction.</p>
<p>If you have any supporting documents or relevant information related to your complaint, please feel free to attach them to this email.</p>
<p>We truly appreciate your understanding and cooperation.</p>
+ <p>#if (${docLinks})
+ #set ($counter = 0)
+ <div> <strong> Attached document links </strong> </div>
+ <p style="color:blue;">
+
+ #foreach( $docLink in $docLinks )
+ #set ($counter = $counter + 1)
+ <strong ><a href="${docLink.attachment_url}">Document $counter</a></strong>
+ #end
+ </p>
+ #end
+ </p>
</td>
</tr>
<tr></tr>
diff --git a/src/main/resources/templates/raiser_feedback.vm b/src/main/resources/templates/raiser_feedback.vm
index 7e77809084364c8207fb934cfcf62ed4ad2feefa..829bc9557283dfd82cfc1ad3db2105221f52f9b9 100644
--- a/src/main/resources/templates/raiser_feedback.vm
+++ b/src/main/resources/templates/raiser_feedback.vm
@@ -89,6 +89,7 @@
<p>
<div>Grievance Details:</div>
<div>Grievance ID: <strong>${id}</strong></div>
+ <div>Description: <span><strong>${description}</strong></span></div>
<div>Date of Registration: <strong>${created_date}</strong></div>
<div>Nature of Grievance: <strong>${department}</strong></div>
<div>Resolution Details: <strong>${comment}</strong></div>
@@ -96,6 +97,18 @@
<p>If you have any further questions or require additional information regarding the resolution, please do not hesitate to reach out to us at ${email}.</p>
<p>We want to assure you that we take all grievances seriously and are committed to ensuring a positive resolution. Your feedback is invaluable to us, if the problem is solved to your satisfaction, please spare few seconds to let us know about your support experience by participating in the rating below.</p>
<p><a href="${url}"><img src="https://storage.googleapis.com/dev-public-upsmf/grievance/Picture%201.png" alt="feedback_link" width="400px"></a></p>
+ <p>#if (${originalDocLinks})
+ #set ($counter = 0)
+ <div> <strong> Original document links </strong> </div>
+ <p style="color:blue;">
+
+ #foreach( $originalDocLink in $originalDocLinks )
+ #set ($counter = $counter + 1)
+ <strong ><a href="${originalDocLink.attachment_url}">Document $counter</a></strong>
+ #end
+ </p>
+ #end
+ </p>
<p>#if (${docLinks})
#set ($counter = 0)
<div> <strong> Attached document links </strong> </div>