diff --git a/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java index e0be344c251aba796273647cd64e538e1d493e80..6e841c48be70c2e92d70fbf1b9baa49e26c6eff0 100644 --- a/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java +++ b/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java @@ -11,6 +11,7 @@ import java.sql.SQLException; import java.sql.Timestamp; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -286,7 +287,7 @@ public class TicketDaoImpl implements TicketDao { ticket.setOperation("save"); ticket.setStatus(value); if (ticket.getSourceId().equals(3L)) { - sendTicketEmail(ticket); + sendTicketEmail(ticket,ticket.getRequesterEmail()); ticketsRequestInterceptor.addData(ticket); } if (!value1) { @@ -410,7 +411,7 @@ public class TicketDaoImpl implements TicketDao { return RandomStringUtils.random(length, randomText); } - private void sendTicketEmail(Ticket ticket) { + /*private void sendTicketEmail(Ticket ticket) { try { User user = superAdminDao.userDetailsByUserId(ticket.getRequestedBy()); user.setOrgId(MasterDataManager.getUserOrgMap().get(ticket.getRequestedBy())); @@ -426,6 +427,23 @@ public class TicketDaoImpl implements TicketDao { } catch (ResourceNotFoundException e) { LOGGER.error(String.format(ENCOUNTERED_AN_EXCEPTION_S, e.getMessage())); } + }*/ + + + private void sendTicketEmail(Ticket ticket, String recipientEmail) { + try { + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/YYYY"); + User user = superAdminDao.userDetailsByUserId(ticket.getRequestedBy()); + user.setOrgId(MasterDataManager.getUserOrgMap().get(ticket.getRequestedBy())); + Map<String, String> keyValue = new HashMap<>(); + keyValue.put(JsonKey.FIRST_NAME, user.getName()); + keyValue.put(JsonKey.ID, ticket.getId().toString()); + keyValue.put(JsonKey.DATE, ticket.getCreatedTime().toLocalDateTime().format(dateTimeFormatter)); + String[] emails = recipientEmail.split(","); + SendMail.sendMail(keyValue, emails, Constants.TICKETCREATION, "new-ticket-createdby-aurora.vm"); + } catch (ResourceNotFoundException e) { + LOGGER.error(String.format(ENCOUNTERED_AN_EXCEPTION_S, e.getMessage())); + } } private void mapTicketToHelpdesk(Ticket ticket) { diff --git a/src/main/java/org/upsmf/grievance/model/GrievanceRaise.java b/src/main/java/org/upsmf/grievance/model/GrievanceRaise.java index 503ae7b1f2368208b84fcfa1171c5bddc8f5e20f..1fd712815efd188404c8e8980723b3d8663f39cf 100644 --- a/src/main/java/org/upsmf/grievance/model/GrievanceRaise.java +++ b/src/main/java/org/upsmf/grievance/model/GrievanceRaise.java @@ -29,12 +29,5 @@ public class GrievanceRaise { private List<String> filePath; - private String appKey; - - private Long appId; - - private String appName; - - } diff --git a/src/main/java/org/upsmf/grievance/service/impl/GrievanceRaiseServiceImpl.java b/src/main/java/org/upsmf/grievance/service/impl/GrievanceRaiseServiceImpl.java index 725184ed2741482b64a60c259ecc34175ac1eb67..e12515f82ec013dd40036d48154c6988b9e76187 100644 --- a/src/main/java/org/upsmf/grievance/service/impl/GrievanceRaiseServiceImpl.java +++ b/src/main/java/org/upsmf/grievance/service/impl/GrievanceRaiseServiceImpl.java @@ -1,5 +1,7 @@ package org.upsmf.grievance.service.impl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -30,10 +32,11 @@ public class GrievanceRaiseServiceImpl implements GrievanceRaiseService { @Value("${default_app_key}") private String appKey; + public static final Logger LOGGER = LoggerFactory.getLogger(GrievanceRaiseServiceImpl.class); @Override public GrievanceTicket addGrievance(GrievanceRaise grievance) { - + LOGGER.info("Enter the addGrievanc method"); ticket.setUserName(grievance.getName()); ticket.setHelpdeskId(grievance.getHelpdeskId()); ticket.setSourceId(sourceId); @@ -44,11 +47,12 @@ public class GrievanceRaiseServiceImpl implements GrievanceRaiseService { ticket.setRequesterUser(grievance.getName()); ticket.setRequesterEmail(grievance.getEmailId()); ticket.setRequesterPhoneNumber(grievance.getPhone()); - + LOGGER.info("added all values to ticket" + ticket); ticket=ticketService.addTicket(ticket); // checking response GrievanceTicket grievanceTicket = null; + LOGGER.info("after raise and sent a ticket to mail taking ticketid"+ticket.getId()+" date"+ticket.getCreatedTimeTS()); if(ticket!=null && ticket.getId()>0){ grievanceTicket = GrievanceTicket.builder().ticketId(ticket.getId()) .date(ticket.getCreatedTime().toString()).build(); diff --git a/src/main/java/org/upsmf/grievance/util/JsonKey.java b/src/main/java/org/upsmf/grievance/util/JsonKey.java index ee88bd18b4ba8cb910624cfe8eb24876a53820ab..3a803898a5c008a7317d551085f36cf14615a5ac 100644 --- a/src/main/java/org/upsmf/grievance/util/JsonKey.java +++ b/src/main/java/org/upsmf/grievance/util/JsonKey.java @@ -112,4 +112,6 @@ public class JsonKey { public static final String NEWSTATUS = "newStatus"; public static final String ID = "id"; public static final String HELPDESKID = "helpdeskId"; + + public static final String DATE = "date"; }