Commit 6f3aca8a authored by lakshmikommalapati's avatar lakshmikommalapati
Browse files

create new send mail method to send requestedmail

Showing with 28 additions and 11 deletions
+28 -11
...@@ -11,6 +11,7 @@ import java.sql.SQLException; ...@@ -11,6 +11,7 @@ import java.sql.SQLException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
...@@ -286,7 +287,7 @@ public class TicketDaoImpl implements TicketDao { ...@@ -286,7 +287,7 @@ public class TicketDaoImpl implements TicketDao {
ticket.setOperation("save"); ticket.setOperation("save");
ticket.setStatus(value); ticket.setStatus(value);
if (ticket.getSourceId().equals(3L)) { if (ticket.getSourceId().equals(3L)) {
sendTicketEmail(ticket); sendTicketEmail(ticket,ticket.getRequesterEmail());
ticketsRequestInterceptor.addData(ticket); ticketsRequestInterceptor.addData(ticket);
} }
if (!value1) { if (!value1) {
...@@ -410,7 +411,7 @@ public class TicketDaoImpl implements TicketDao { ...@@ -410,7 +411,7 @@ public class TicketDaoImpl implements TicketDao {
return RandomStringUtils.random(length, randomText); return RandomStringUtils.random(length, randomText);
} }
private void sendTicketEmail(Ticket ticket) { /*private void sendTicketEmail(Ticket ticket) {
try { try {
User user = superAdminDao.userDetailsByUserId(ticket.getRequestedBy()); User user = superAdminDao.userDetailsByUserId(ticket.getRequestedBy());
user.setOrgId(MasterDataManager.getUserOrgMap().get(ticket.getRequestedBy())); user.setOrgId(MasterDataManager.getUserOrgMap().get(ticket.getRequestedBy()));
...@@ -426,6 +427,23 @@ public class TicketDaoImpl implements TicketDao { ...@@ -426,6 +427,23 @@ public class TicketDaoImpl implements TicketDao {
} catch (ResourceNotFoundException e) { } catch (ResourceNotFoundException e) {
LOGGER.error(String.format(ENCOUNTERED_AN_EXCEPTION_S, e.getMessage())); 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) { private void mapTicketToHelpdesk(Ticket ticket) {
......
...@@ -29,12 +29,5 @@ public class GrievanceRaise { ...@@ -29,12 +29,5 @@ public class GrievanceRaise {
private List<String> filePath; private List<String> filePath;
private String appKey;
private Long appId;
private String appName;
} }
package org.upsmf.grievance.service.impl; 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.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -30,10 +32,11 @@ public class GrievanceRaiseServiceImpl implements GrievanceRaiseService { ...@@ -30,10 +32,11 @@ public class GrievanceRaiseServiceImpl implements GrievanceRaiseService {
@Value("${default_app_key}") @Value("${default_app_key}")
private String appKey; private String appKey;
public static final Logger LOGGER = LoggerFactory.getLogger(GrievanceRaiseServiceImpl.class);
@Override @Override
public GrievanceTicket addGrievance(GrievanceRaise grievance) { public GrievanceTicket addGrievance(GrievanceRaise grievance) {
LOGGER.info("Enter the addGrievanc method");
ticket.setUserName(grievance.getName()); ticket.setUserName(grievance.getName());
ticket.setHelpdeskId(grievance.getHelpdeskId()); ticket.setHelpdeskId(grievance.getHelpdeskId());
ticket.setSourceId(sourceId); ticket.setSourceId(sourceId);
...@@ -44,11 +47,12 @@ public class GrievanceRaiseServiceImpl implements GrievanceRaiseService { ...@@ -44,11 +47,12 @@ public class GrievanceRaiseServiceImpl implements GrievanceRaiseService {
ticket.setRequesterUser(grievance.getName()); ticket.setRequesterUser(grievance.getName());
ticket.setRequesterEmail(grievance.getEmailId()); ticket.setRequesterEmail(grievance.getEmailId());
ticket.setRequesterPhoneNumber(grievance.getPhone()); ticket.setRequesterPhoneNumber(grievance.getPhone());
LOGGER.info("added all values to ticket" + ticket);
ticket=ticketService.addTicket(ticket); ticket=ticketService.addTicket(ticket);
// checking response // checking response
GrievanceTicket grievanceTicket = null; 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){ if(ticket!=null && ticket.getId()>0){
grievanceTicket = GrievanceTicket.builder().ticketId(ticket.getId()) grievanceTicket = GrievanceTicket.builder().ticketId(ticket.getId())
.date(ticket.getCreatedTime().toString()).build(); .date(ticket.getCreatedTime().toString()).build();
......
...@@ -112,4 +112,6 @@ public class JsonKey { ...@@ -112,4 +112,6 @@ public class JsonKey {
public static final String NEWSTATUS = "newStatus"; public static final String NEWSTATUS = "newStatus";
public static final String ID = "id"; public static final String ID = "id";
public static final String HELPDESKID = "helpdeskId"; public static final String HELPDESKID = "helpdeskId";
public static final String DATE = "date";
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment