WebSVN – SmartDukaan – Diff – /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java

 public class UserTicketsController extends BaseController {
     private static final String AGENT      = "Agent";
     private Map<Long, Ticket>   ticketsMap = new HashMap<Long, Ticket>();
-    private long                userId;
+    private String              userId;
     private String              userEmailId;
     private String              id;
     private String              activityDescription;
     private String              description;
     private String              assigneeEmailId;
     private String              body;
     public String index() {
         try {
             createServiceClients();
-            List<Ticket> ticketsList = crmServiceClient.getTickets(userId);
+            List<Ticket> ticketsList = crmServiceClient.getTickets(Long.parseLong(userId));
             if (ticketsList != null) {
                 for (Ticket ticket : ticketsList) {
                     ticketsMap.put(ticket.getId(), ticket);
+                }
+            }
             ticket.setStatus(TicketStatus.valueOf(status));
             // Update when a ticket is closed!
             if (TicketStatus.CLOSED.name().equals(status)) {
                 ticket.setCloseDate(new Date().getTime());
-            } else {
+            }
+            if (activityDescription == null || activityDescription.isEmpty()) {
-                ticket.setCloseDateIsSet(false);
+                activityDescription = "Updating ticket fields";
+            }
             Activity activity = new Activity();
             activity.setDescription(activityDescription);
-            activity.setCustomerId(userId);
             activity.setType(ActivityType.valueOf(activityType));
             activity.setTicketPriority(TicketPriority.valueOf(priority));
             activity.setTicketStatus(TicketStatus.valueOf(status));
             activity.setCreatorId(creatorId);
             activity.setTicketCategory(TicketCategory.valueOf(category));
             activity.setTicketDescription(description);
+            if (userId != null && !userId.isEmpty()) {
+                activity.setCustomerId(Long.parseLong(userId));
+            }
             log.info(activityType);
-            if (ActivityType.EMAIL_CUSTOMER.equals(activity.getType())) {
+            if (ActivityType.SEND_EMAIL_TO_CUSTOMER.equals(activity.getType())) {
                 log.info("Sending mail");
                 Client helperClient = new HelperClient().getClient();
                 activity.setEmailId(helperClient.saveUserEmailForSending(
                         userEmailId, CRMConstants.CRM_EMAIL_SENDOR, subject,
                         body, null, CRMConstants.CRM_EMAIL_TYPE));
                 // We change activityType to OTHER when pop up box for email
                 // closes
-                activity.setDescription("Subject: " + subject + "\n\n" + "Body: " + body);
+                activity.setDescription("Subject: " + subject + "\n\n"
+                        + "Body: " + body);
+            }
             // handling null values appropriately
             if (assigneeEmailId != null && !assigneeEmailId.isEmpty()) {
                 long assigneeId = crmServiceClient.getAgentByEmailId(
             crmServiceClient.updateTicket(ticket, activity);
         } catch (TException e) {
             log.error("Error while updating ticket", e);
             return EXCEPTION;
-        }
-        catch (HelperServiceException hse) {
+        } catch (HelperServiceException hse) {
             log.error("Error while sending mail", hse);
             return EXCEPTION;
+        }
         return index();
             createServiceClients();
             long ticketId = Long.parseLong(id);
             ticket = crmServiceClient.getTicket(ticketId);
             activities = crmServiceClient.getActivitiesForTicket(ticketId);
             subject = createSubjectString(ticket);
+            userId = String.valueOf(ticket.getCustomerId());
-            userId = ticket.getCustomerId();
+            userEmailId = ticket.getCustomerEmailId();
         } catch (TException e) {
             log.error("Error while loading edit page", e);
             return EXCEPTION;
+        }
     public Map<Long, Ticket> getTickets() {
         return ticketsMap;
+    }
     public User getUser() throws UserContextException, TException {
-        return userContextServiceClient.getUserById(userId);
+        return userContextServiceClient.getUserById(Long.parseLong(userId));
+    }
     public Agent getAgent(long agentId) {
         Agent agent = null;
+    }
     public String create() {
         try {
             createServiceClients();
-            long creatorId = crmServiceClient.getAgentByEmailId(
+            long creatorId = crmServiceClient.getAgentByEmailId(currentAgentEmailId).getId();
-                    currentAgentEmailId).getId();
             Ticket ticket = new Ticket();
             ticket.setDescription(description);
-            ticket.setCustomerId(userId);
             ticket.setCreatorId(creatorId);
-            if (orderId == null || orderId.isEmpty()) {
-                ticket.setOrderIdIsSet(false);
-            } else {
-                ticket.setOrderId(Long.parseLong(orderId));
-            }
             ticket.setStatus(TicketStatus.OPEN);
             ticket.setPriority(TicketPriority.valueOf(priority));
             ticket.setCategory(TicketCategory.valueOf(category));
             Activity activity = new Activity();
             // At creation of ticket activity's description is same as that of
             // ticket
-            activity.setDescription(description);
+            activity.setDescription("Creating Ticket");
-            activity.setCustomerId(userId);
             activity.setType(ActivityType.OTHER);
             activity.setTicketPriority(TicketPriority.valueOf(priority));
             activity.setTicketStatus(TicketStatus.OPEN);
             activity.setCreatorId(creatorId);
             activity.setTicketCategory(TicketCategory.valueOf(category));
             activity.setTicketDescription(description);
+            if (userEmailId != null && !userEmailId.isEmpty()) {
+                ticket.setCustomerEmailId(userEmailId);
+            }
+            if (orderId != null && !orderId.isEmpty()) {
+                ticket.setOrderId(Long.parseLong(orderId));
+            }
+            if (userId != null && !userId.isEmpty()) {
+                ticket.setCustomerId(Long.parseLong(userId));
+                activity.setCustomerId(Long.parseLong(userId));
+            }
             // handling null values appropriately
             if (assigneeEmailId != null && !assigneeEmailId.isEmpty()) {
-                long assigneeId = crmServiceClient.getAgentByEmailId(
+                long assigneeId = crmServiceClient.getAgentByEmailId(assigneeEmailId).getId();
-                        assigneeEmailId).getId();
                 ticket.setAssigneeId(assigneeId);
                 activity.setTicketAssigneeId(assigneeId);
-            } else {
-                ticket.setAssigneeIdIsSet(false);
-                activity.setTicketAssigneeIdIsSet(false);
+            }
             crmServiceClient.insertTicket(ticket, activity);
         } catch (TException e) {
             log.error("Error while creating ticket", e);
             return EXCEPTION;
+        }
     public Map<Long, Ticket> getTicketsMap() {
         return ticketsMap;
+    }
     public void setUserId(String userId) {
-        this.userId = Long.parseLong(userId);
+        this.userId = userId;
+    }
     public void setOrderId(String orderId) {
         this.orderId = orderId;
+    }
-    public long getUserId() {
+    public String getUserId() {
         return userId;
+    }
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
     public String getId() {
         return id;
+    }
     public void setId(String id) {

Subversion Repositories SmartDukaan

(root)/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java @ 3269 – Rev 3234 → 3269