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

 package in.shop2020.serving.controllers;
 import in.shop2020.crm.Activity;
 import in.shop2020.crm.ActivityType;
 import in.shop2020.crm.Agent;
+import in.shop2020.crm.SearchFilter;
 import in.shop2020.crm.Ticket;
 import in.shop2020.crm.TicketCategory;
 import in.shop2020.crm.TicketPriority;
 import in.shop2020.crm.TicketStatus;
 import in.shop2020.model.v1.user.User;
 import in.shop2020.model.v1.user.UserContextException;
+import in.shop2020.serving.auth.CRMAuthorizingRealm;
+import in.shop2020.thrift.clients.CRMClient;
+import in.shop2020.thrift.clients.UserClient;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.apache.thrift.TException;
 /**
     private String            category;
     private String            orderId;
     public String create() {
         try {
-            createServiceClients();
-            long creatorId = crmServiceClient.getAgentByEmailId(
+            long creatorId = CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId();
-                    currentAgentEmailId).getId();
             Ticket ticket = new Ticket();
             ticket.setDescription(description);
             ticket.setCreatorId(creatorId);
             ticket.setStatus(TicketStatus.OPEN);
             ticket.setPriority(TicketPriority.valueOf(priority));
             if (orderId != null && !orderId.isEmpty()) {
                 ticket.setOrderId(Long.parseLong(orderId));
+            }
             if (userEmailId != null && !userEmailId.isEmpty()) {
+                User user = null;
+                userContextServiceClient = new UserClient().getClient();
+                try {
+                    user = userContextServiceClient.getUserByEmail(userEmailId);
+                } catch (UserContextException e) {
+                    log.error("Could not fetch user for " + userEmailId, e);
+                }
+                if (user != null && user.getUserId() != -1) {
+                    ticket.setCustomerId(user.getUserId());
+                    activity.setCustomerId(user.getUserId());
+                }
+                else {
-                ticket.setCustomerEmailId(userEmailId);
+                    ticket.setCustomerEmailId(userEmailId);
+                    activity.setCustomerEmailId(userEmailId);
+                }
+            }
             // handling null values appropriately
             if (assigneeEmailId != null && !assigneeEmailId.isEmpty()) {
-                long assigneeId = crmServiceClient.getAgentByEmailId(
+                long assigneeId = CRMAuthorizingRealm.getAgent(assigneeEmailId).getId();
-                        assigneeEmailId).getId();
                 ticket.setAssigneeId(assigneeId);
                 activity.setTicketAssigneeId(assigneeId);
+            }
+            crmServiceClient         = new CRMClient().getClient();
             crmServiceClient.insertTicket(ticket, activity);
         } catch (TException e) {
             log.error("Error while creating ticket", e);
             return EXCEPTION;
+        }
         return getMyOpenTickets();
+    }
     public String getMyOpenTickets() {
         try {
-            createServiceClients();
-            Agent agent = crmServiceClient
-                    .getAgentByEmailId(currentAgentEmailId);
+            Agent agent = CRMAuthorizingRealm.getAgent(currentAgentEmailId);
+            SearchFilter searchFilter = new SearchFilter();
-            for (Ticket ticket : crmServiceClient.getAssignedTickets(agent
+            searchFilter.setTicketAssigneeIds(Collections.singletonList(agent.getId()));
-                    .getId())) {
+            crmServiceClient         = new CRMClient().getClient();
+            for (Ticket ticket : crmServiceClient.getTickets(searchFilter)) {
                 if (TicketStatus.OPEN.equals(ticket.getStatus())) {
                     tickets.add(ticket);
+                }
+            }
         } catch (TException e) {
         return INDEX;
+    }
     public String getMyTickets() {
         try {
-            createServiceClients();
+            Agent agent = CRMAuthorizingRealm.getAgent(currentAgentEmailId);
-            Agent agent = crmServiceClient
+            SearchFilter searchFilter = new SearchFilter();
+            searchFilter.setTicketAssigneeIds(Collections.singletonList(agent.getId()));
-                    .getAgentByEmailId(currentAgentEmailId);
+            crmServiceClient         = new CRMClient().getClient();
-            tickets = crmServiceClient.getAssignedTickets(agent.getId());
+            tickets = crmServiceClient.getTickets(searchFilter);
         } catch (TException e) {
             String errorString = "Error getting tickets for "
                     + currentAgentEmailId;
             log.error(errorString, e);
             addActionError(errorString);
         return INDEX;
+    }
     public String getUnassignedTickets() {
         try {
-            createServiceClients();
+            crmServiceClient         = new CRMClient().getClient();
             tickets = crmServiceClient.getUnassignedTickets();
         } catch (TException e) {
             String errorString = "Error getting tickets for "
                     + currentAgentEmailId;
             log.error(errorString, e);
         return INDEX;
+    }
     public String getAllTickets() {
         try {
-            createServiceClients();
+            SearchFilter searchFilter = new SearchFilter();
-            Agent agent = crmServiceClient
+            searchFilter.setTicketAssigneeIds(Collections.singletonList(CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId()));
-                    .getAgentByEmailId(currentAgentEmailId);
+            crmServiceClient         = new CRMClient().getClient();
-            tickets = crmServiceClient.getAllTickets(agent.getId());
+            tickets = crmServiceClient.getTickets(searchFilter);
         } catch (TException e) {
             String errorString = "Error getting tickets for "
                     + currentAgentEmailId;
             log.error(errorString, e);
             addActionError(errorString);
         return INDEX;
+    }
     public String getAllOpenTickets() {
         try {
-            createServiceClients();
+            SearchFilter searchFilter = new SearchFilter();
-            Agent agent = crmServiceClient
+            searchFilter.setTicketAssigneeIds(Collections.singletonList(CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId()));
-                    .getAgentByEmailId(currentAgentEmailId);
+            crmServiceClient          = new CRMClient().getClient();
-            for (Ticket ticket : crmServiceClient.getAllTickets(agent.getId())) {
+            for (Ticket ticket : crmServiceClient.getTickets(searchFilter)) {
                 if (TicketStatus.OPEN.equals(ticket.getStatus())) {
                     tickets.add(ticket);
+                }
+            }
         } catch (TException e) {
     public User getUser(Long userId) {
         User user = null;
         try {
-            createServiceClients();
+            userContextServiceClient = new UserClient().getClient();
             user = userContextServiceClient.getUserById(userId);
         } catch (UserContextException e) {
             String errorString = "Could not fetch user for " + userId;
             log.error(errorString, e);
             addActionError(errorString);
+        }
         return user;
+    }
-    public Agent getAgent(long agentId) {
+    public Agent getAgent(long agentId) throws TException {
-        Agent agent = null;
-        try {
-            agent = crmServiceClient.getAgent(agentId);
+        return CRMAuthorizingRealm.getAgent(agentId);
-        } catch (TException e) {
-            String errorString = "Could not get agent for " + agentId;
-            log.error(errorString, e);
-            addActionError(errorString);
-        }
-        return agent;
+    }
     public List<Agent> getAllAgents() {
-        List<Agent> agents = null;
-        try {
-            createServiceClients();
-            agents = crmServiceClient.getAllAgents();
+        return CRMAuthorizingRealm.getAgents();
-        } catch (TException e) {
-            String errorString = "Error while getting roles";
-            log.error(errorString, e);
-            addActionError(errorString);
-        }
-        return agents;
+    }
     public TicketCategory[] getTicketCategories() {
         return TicketCategory.values();
+    }

Subversion Repositories SmartDukaan

(root)//trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java – Rev 3339 → 3390