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

 import in.shop2020.crm.Activity;
 import in.shop2020.crm.ActivityType;
 import in.shop2020.crm.Agent;
 import in.shop2020.crm.SearchFilter;
+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.HelperClient;
+import in.shop2020.thrift.clients.UserClient;
 import in.shop2020.util.CRMConstants;
 import in.shop2020.utils.HelperService.Client;
 import java.text.ParseException;
 import java.util.ArrayList;
     private String            activityId;
     private String            description;
     private String            type;
     private String            subject;
     private String            body;
-    private String            userEmailId;
     private String            customerMobileNumber;
     private String            creatorId;
     private String[]          agentIds;
     private String            startTimestamp;
     private String            endTimestamp;
+    private String            customerEmailId;
+    private String            customerName;
+    private String            userId;
     public String index() {
         try {
             SearchFilter searchFilter = new SearchFilter();
+            if (activityId != null && !activityId.isEmpty()) {
+                searchFilter.setActivityId(Long.parseLong(activityId));
+            } else if (userId != null && !userId.isEmpty()) {
+                searchFilter.setCustomerId(Long.parseLong(userId));
-            if (creatorId != null && !creatorId.isEmpty()) {
+            } else if (creatorId != null && !creatorId.isEmpty()) {
-                searchFilter.setActivityCreatorIds(Collections.singletonList(Long.parseLong(creatorId)));
+                searchFilter.setActivityCreatorIds(Collections
+                        .singletonList(Long.parseLong(creatorId)));
                 searchFilter.setIsActivityRead(false);
-            }
-            else if (agentIds != null && agentIds.length != 0) {
+            } else if (agentIds != null && agentIds.length != 0) {
                 searchFilter.setActivityCreatorIds(new ArrayList<Long>());
                 for (String agentId : agentIds) {
+                    searchFilter.getActivityCreatorIds().add(
-                    searchFilter.getActivityCreatorIds().add(CRMAuthorizingRealm.getAgent(agentId).getId());
+                            CRMAuthorizingRealm.getAgent(agentId).getId());
+                }
                 try {
                     if (startTimestamp != null && !startTimestamp.isEmpty()) {
+                        searchFilter.setStartTimestamp(SDF
-                        searchFilter.setStartTimestamp(SDF.parse(startTimestamp).getTime());
+                                .parse(startTimestamp).getTime());
+                    }
                     if (endTimestamp != null && !endTimestamp.isEmpty()) {
-                        searchFilter.setEndTimestamp(SDF.parse(endTimestamp).getTime());
+                        searchFilter.setEndTimestamp(SDF.parse(endTimestamp)
+                                .getTime());
+                    }
-                }
-                catch (ParseException e) {
+                } catch (ParseException e) {
                     log.error("Error parsing timestamps", e);
+                }
-            }
+            } else {
-            else {
+                searchFilter.setActivityCreatorIds(Collections
-                searchFilter.setActivityCreatorIds(Collections.singletonList(CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId()));
+                        .singletonList(CRMAuthorizingRealm.getAgent(
+                                currentAgentEmailId).getId()));
+            }
-            crmServiceClient         = new CRMClient().getClient();
+            crmServiceClient = new CRMClient().getClient();
             activities = crmServiceClient.getActivities(searchFilter);
         } catch (TException e) {
             log.error("Error while retrieving activities for "
                     + currentAgentEmailId, e);
+        } catch (NumberFormatException e) {
+            log.error("Error parsing userId: " + userId, e);
+        }
         return INDEX;
+    }
+    public String editNew() {
+        subject = "";
+        return EDIT_NEW;
+    }
     public String create() throws Exception {
         Activity activity = new Activity();
         activity.setDescription(description);
         activity.setType(ActivityType.valueOf(type));
-        activity.setCreatorId(CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId());
+        activity.setCreatorId(CRMAuthorizingRealm.getAgent(currentAgentEmailId)
+                .getId());
+        if (userId != null && !userId.isEmpty()) {
+            activity.setCustomerId(Long.parseLong(userId));
+        } else {
+            User user = null;
+            userContextServiceClient = new UserClient().getClient();
+            try {
+                if (customerName != null && !customerName.isEmpty()) {
+                    activity.setCustomerName(customerName);
+                }
+                if (customerEmailId != null && !customerEmailId.isEmpty()) {
+                    activity.setCustomerEmailId(customerEmailId);
+                    user = userContextServiceClient
+                            .getUserByEmail(customerEmailId);
+                }
+                if ((user == null || user.getUserId() == -1)
+                        && customerMobileNumber != null
-        if (customerMobileNumber != null && !customerMobileNumber.isEmpty()) {
+                        && !customerMobileNumber.isEmpty()) {
-            activity.setCustomerMobileNumber(customerMobileNumber);
+                    activity.setCustomerMobileNumber(customerMobileNumber);
+                    user = userContextServiceClient.getUserByMobileNumber(Long
+                            .parseLong(customerMobileNumber));
+                }
+            } catch (UserContextException e) {
+                log.error("Could not fetch user for: " + customerEmailId + " "
+                        + customerMobileNumber + " " + customerName, e);
+            }
+            if (user != null && user.getUserId() != -1) {
+                activity.setCustomerId(user.getUserId());
+            }
+        }
         if (ActivityType.SEND_EMAIL_TO_CUSTOMER.equals(activity.getType())) {
             log.info("Sending mail");
             Client helperClient = new HelperClient().getClient();
             activity.setUserEmailId(helperClient.saveUserEmailForSending(
-                    userEmailId, CRMConstants.CRM_EMAIL_SENDOR, subject, body,
+                    customerEmailId, CRMConstants.CRM_EMAIL_SENDOR, subject,
-                    null, CRMConstants.CRM_EMAIL_TYPE));
+                    "<pre>" + body + "</pre>", null, CRMConstants.CRM_EMAIL_TYPE));
             activity.setDescription("Subject: " + subject + "\n\n" + "Body: "
                     + body);
+        }
-        crmServiceClient         = new CRMClient().getClient();
+        crmServiceClient = new CRMClient().getClient();
-        crmServiceClient.insertActivity(activity);
+        activityId = String.valueOf(crmServiceClient.insertActivity(activity));
         return index();
+    }
-    public String markAsRead()
+    public String markAsRead() {
-    {
         try {
-            crmServiceClient         = new CRMClient().getClient();
+            crmServiceClient = new CRMClient().getClient();
+            crmServiceClient.markAsRead(Long.parseLong(activityId),
-            crmServiceClient.markAsRead(Long.parseLong(activityId), CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId());
+                    CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId());
         } catch (NumberFormatException e) {
             log.error("Could not parse activity id from" + activityId, e);
         } catch (TException e) {
-            log.error("Could not mark the activityId: " + activityId + " as read", e);
+            log.error("Could not mark the activityId: " + activityId
+                    + " as read", e);
+        }
-        return INDEX;
+        return index();
+    }
     public ActivityType[] getActivityTypes() {
         return ActivityType.values();
+    }
     public void setBody(String body) {
         this.body = body;
+    }
-    public String getUserEmailId() {
-        return userEmailId;
-    }
-    public void setUserEmailId(String userEmailId) {
-        this.userEmailId = userEmailId;
-    }
     public String getCustomerMobileNumber() {
         return customerMobileNumber;
+    }
     public void setCustomerMobileNumber(String customerMobileNumber) {
+    }
     public void setActivities(List<Activity> activities) {
         this.activities = activities;
+    }
+    public String getCustomerEmailId() {
+        return customerEmailId;
+    }
+    public void setCustomerEmailId(String customerEmailId) {
+        this.customerEmailId = customerEmailId;
+    }
+    public String getUserId() {
+        return userId;
+    }
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+    public User getUser(Long userId) {
+        User user = null;
+        try {
+            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);
+        } catch (TException e) {
+            String errorString = "Could not create client";
+            log.error(errorString, e);
+            addActionError(errorString);
+        }
+        return user;
+    }
+    public String getCustomerName() {
+        return customerName;
+    }
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java – Rev 3397 → 3405