WebSVN – SmartDukaan – Diff – /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java

     // Basic attributes of activity
     private long           id;
     private String         description;
     private ActivityType   type;
     private Long           customerId;
-    private String         customerMobileNumber;
-    private Long           emailId;
+    private Long           userEmailId;
     // time at which the activity happened
     private Date           creationTimestamp;
     private long           creatorId;
     private TicketCategory ticketCategory;
     private Long           ticketAssigneeId;
     private TicketPriority ticketPriority;
     private String         ticketDescription;
+    // relevant only for the activities generated by customer
+    // tracks whether its being read by any agent or not
+    private boolean        isRead = true;
+    // fields for unregistered users
+    private String         customerEmailId;
+    private String         customerName;
+    private String         customerMobileNumber;
+    private Agent          ticketAssignee;
+    private Agent          creator;
     /**
      * Converts a thrift activity object to our domain object for activity
+     *
      * @param tactivity
      * @return
      */
     public static Activity create(in.shop2020.crm.Activity tactivity)
             throws ParseException {
         Activity activity = new Activity();
         activity.id = tactivity.getId();
-        activity.emailId = tactivity.getEmailId();
+        activity.userEmailId = tactivity.getUserEmailId();
         activity.creationTimestamp = new Date(tactivity.getCreationTimestamp());
         activity.creatorId = tactivity.getCreatorId();
         activity.ticketPriority = tactivity.getTicketPriority();
         activity.ticketStatus = tactivity.getTicketStatus();
         activity.ticketCategory = tactivity.getTicketCategory();
         activity.ticketDescription = tactivity.getTicketDescription();
         activity.description = tactivity.getDescription();
         activity.type = tactivity.getType();
+        activity.isRead = tactivity.isIsRead();
         if (tactivity.isSetCustomerId()) {
             activity.customerId = tactivity.getCustomerId();
+        }
-        if (tactivity.isSetEmailId()) {
+        if (tactivity.isSetUserEmailId()) {
-            activity.emailId = tactivity.getEmailId();
+            activity.userEmailId = tactivity.getUserEmailId();
+        }
+        if (tactivity.isSetCustomerName()) {
+            activity.customerName = tactivity.getCustomerName();
+        }
+        if (tactivity.isSetCustomerEmailId()) {
+            activity.customerEmailId = tactivity.getCustomerEmailId();
+        }
         if (tactivity.isSetCustomerMobileNumber()) {
             activity.customerMobileNumber = tactivity.getCustomerMobileNumber();
+        }
-        if (tactivity.isSetTicketId() && tactivity.getTicketId() != 0) {
+        if (tactivity.isSetTicketId()) {
             activity.ticketId = tactivity.getTicketId();
+        }
+        if (tactivity.isSetCreator()) {
+            activity.creator = Agent.create(tactivity.getCreator());
+        }
+        if (tactivity.isSetTicketAssignee()) {
+            activity.ticketAssignee = Agent.create(tactivity.getTicketAssignee());
+        }
         if (tactivity.isSetTicketAssigneeId()) {
             activity.ticketAssigneeId = tactivity.getTicketAssigneeId();
+        }
         return activity;
         tactivity.setTicketStatus(ticketStatus);
         tactivity.setTicketCategory(ticketCategory);
         tactivity.setTicketDescription(ticketDescription);
         tactivity.setCreationTimestamp(creationTimestamp.getTime());
         tactivity.setCreatorId(creatorId);
+        tactivity.setIsRead(isRead);
         if (customerId != null) {
             tactivity.setCustomerId(customerId);
+        }
-        if (customerMobileNumber != null) {
-            tactivity.setCustomerMobileNumber(customerMobileNumber);
-        }
-        if (emailId != null) {
+        if (userEmailId != null) {
-            tactivity.setEmailId(emailId);
+            tactivity.setUserEmailId(userEmailId);
+        }
         if (ticketId != null) {
             tactivity.setTicketId(ticketId);
+        }
         if (ticketAssigneeId != null) {
             tactivity.setTicketAssigneeId(ticketAssigneeId);
+        }
+        if (customerMobileNumber != null) {
+            tactivity.setCustomerMobileNumber(customerMobileNumber);
+        }
+        if (customerName != null) {
+            tactivity.setCustomerName(customerName);
+        }
+        if (customerEmailId != null) {
+            tactivity.setCustomerEmailId(customerEmailId);
+        }
+        if (creator != null) {
+            tactivity.setCreator(creator.getThriftAgent());
+        }
+        if (ticketAssignee != null) {
+            tactivity.setTicketAssignee(ticketAssignee.getThriftAgent());
+        }
         return tactivity;
+    }
     public long getId() {
         return id;
     public void setType(ActivityType type) {
         this.type = type;
+    }
-    public Long getEmailId() {
+    public Long getUserEmailId() {
-        return emailId;
+        return userEmailId;
+    }
-    public void setEmailId(Long emailId) {
+    public void setUserEmailId(Long emailId) {
-        this.emailId = emailId;
+        this.userEmailId = emailId;
+    }
     public String getCustomerMobileNumber() {
         return customerMobileNumber;
+    }
     public void setCustomerMobileNumber(String customerMobileNumber) {
         this.customerMobileNumber = customerMobileNumber;
+    }
+    public boolean isRead() {
+        return isRead;
+    }
+    public void setRead(boolean isRead) {
+        this.isRead = isRead;
+    }
+    public String getCustomerEmailId() {
+        return customerEmailId;
+    }
+    public void setCustomerEmailId(String customerEmailId) {
+        this.customerEmailId = customerEmailId;
+    }
+    public String getCustomerName() {
+        return customerName;
+    }
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+    public Agent getTicketAssignee() {
+        return ticketAssignee;
+    }
+    public void setTicketAssignee(Agent ticketAssignee) {
+        this.ticketAssignee = ticketAssignee;
+    }
+    public Agent getCreator() {
+        return creator;
+    }
+    public void setCreator(Agent creator) {
+        this.creator = creator;
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java – Rev 3269 → 3390