Merge pull request cloudbees-oss#67 from matthewtckr/newevents

Implement additional Event types

Author: stephenc

src/main/java/org/zendesk/client/v2/model/events/AttachmentRedactionEvent.java

@@ -0,0 +1,44 @@
+package org.zendesk.client.v2.model.events;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * An attachment was redacted, or permanently deleted, from a ticket comment
+ * 
+ * @author matthewtckr
+ * @see <a href="https://developer.zendesk.com/rest_api/docs/core/ticket_audits#attachment-redaction-event">Zendesk API Documentation</a>
+ *
+ */
+public class AttachmentRedactionEvent extends Event {
+
+  private Long attachmentId;
+  private Long commentId;
+
+  @JsonProperty("attachment_id")
+  public Long getAttachmentId() {
+    return attachmentId;
+  }
+
+  public void setAttachmentId( Long attachmentId ) {
+    this.attachmentId = attachmentId;
+  }
+
+  @JsonProperty("comment_id")
+  public Long getCommentId() {
+    return commentId;
+  }
+
+  public void setCommentId( Long commentId ) {
+    this.commentId = commentId;
+  }
+
+  @Override
+  public String toString() {
+      final StringBuilder sb = new StringBuilder();
+      sb.append("AttachmentRedactionEvent");
+      sb.append("{attachmentId=").append(attachmentId);
+      sb.append(", commentId=").append(commentId);
+      sb.append('}');
+      return sb.toString();
+  }
+}

src/main/java/org/zendesk/client/v2/model/events/CommentRedactionEvent.java

@@ -0,0 +1,33 @@
+package org.zendesk.client.v2.model.events;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A word or string was redacted from a ticket comment
+ * 
+ * @author matthewtckr
+ * @see <a href="https://developer.zendesk.com/rest_api/docs/core/ticket_audits#comment-redaction-event">Zendesk API Documentation</a>
+ *
+ */
+public class CommentRedactionEvent extends Event {
+
+  private Long commentId;
+
+  @JsonProperty("comment_id")
+  public Long getCommentId() {
+    return commentId;
+  }
+
+  public void setCommentId( Long commentId ) {
+    this.commentId = commentId;
+  }
+
+  @Override
+  public String toString() {
+      final StringBuilder sb = new StringBuilder();
+      sb.append("CommentRedactionEvent");
+      sb.append("{commentId=").append(commentId);
+      sb.append('}');
+      return sb.toString();
+  }
+}

src/main/java/org/zendesk/client/v2/model/events/Event.java

@@ -23,7 +23,10 @@
         @JsonSubTypes.Type(value = PushEvent.class, name = "Push"),
         @JsonSubTypes.Type(value = TweetEvent.class, name = "Tweet"),
         @JsonSubTypes.Type(value = SMSEvent.class, name = "SMS"),
-        @JsonSubTypes.Type(value = TicketSharingEvent.class, name = "TicketSharingEvent")
+        @JsonSubTypes.Type(value = TicketSharingEvent.class, name = "TicketSharingEvent"),
+        @JsonSubTypes.Type(value = AttachmentRedactionEvent.class, name = "AttachmentRedactionEvent" ),
+        @JsonSubTypes.Type(value = CommentRedactionEvent.class, name = "CommentRedactionEvent" ),
+        @JsonSubTypes.Type(value = OrganizationActivityEvent.class, name = "OrganizationActivity" )
 })
 
 public abstract class Event {

src/main/java/org/zendesk/client/v2/model/events/OrganizationActivityEvent.java

@@ -0,0 +1,64 @@
+package org.zendesk.client.v2.model.events;
+
+import java.util.List;
+
+import org.zendesk.client.v2.model.Via;
+
+/**
+ * A notification was sent to the organization subscribers
+ * 
+ * @author matthewtckr
+ * @see <a href="https://developer.zendesk.com/rest_api/docs/core/ticket_audits#organization-subscription-notification-event">Zendesk API Documentation</a>
+ *
+ */
+public class OrganizationActivityEvent extends Event {
+
+  private String subject;
+  private String body;
+  private List<Long> recipients;
+  private Via via;
+
+  public String getSubject() {
+    return subject;
+  }
+
+  public void setSubject( String subject ) {
+    this.subject = subject;
+  }
+
+  public String getBody() {
+    return body;
+  }
+
+  public void setBody( String body ) {
+    this.body = body;
+  }
+
+  public List<Long> getRecipients() {
+    return recipients;
+  }
+
+  public void setRecipients( List<Long> recipients ) {
+    this.recipients = recipients;
+  }
+
+  public Via getVia() {
+    return via;
+  }
+
+  public void setVia( Via via ) {
+    this.via = via;
+  }
+
+  @Override
+  public String toString() {
+      final StringBuilder sb = new StringBuilder();
+      sb.append("OrganizationActivityEvent");
+      sb.append("{subject=").append(subject);
+      sb.append(", body=").append(body);
+      sb.append(", recipients=").append(recipients);
+      sb.append(", via=").append(via);
+      sb.append('}');
+      return sb.toString();
+  }
+}

src/test/java/org/zendesk/client/v2/model/EventTest.java

@@ -0,0 +1,63 @@
+package org.zendesk.client.v2.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.zendesk.client.v2.model.events.AttachmentRedactionEvent;
+import org.zendesk.client.v2.model.events.CommentRedactionEvent;
+import org.zendesk.client.v2.model.events.Event;
+import org.zendesk.client.v2.model.events.OrganizationActivityEvent;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EventTest {
+
+  private Event parseJson( byte[] json ) {
+    ObjectMapper mapper = new ObjectMapper();
+    try {
+      return mapper.readValue( json, Event.class );
+    } catch ( Exception e ) {
+      System.out.println( e );
+      return null;
+    }
+  }
+
+  @Test
+  public void testOrganizationActivityEvent() {
+    String json = "{ \"id\": 21337631753, \"type\": \"OrganizationActivity\", \"subject\": \"Custom Subject\", \"body\": \"This is sample data\", \"recipients\": [568628833] }";
+    Event ev = parseJson( json.getBytes() );
+    assertNotNull( ev );
+    assertEquals( OrganizationActivityEvent.class, ev.getClass() );
+    assertEquals( new Long(21337631753L), ev.getId() );
+    assertEquals( "Custom Subject", ((OrganizationActivityEvent) ev).getSubject() );
+    assertEquals( "This is sample data", ((OrganizationActivityEvent) ev).getBody() );
+    assertNotNull( ((OrganizationActivityEvent) ev).getRecipients() );
+    assertEquals( 1, ((OrganizationActivityEvent) ev).getRecipients().size() );
+    assertEquals( new Long(568628833L), ((OrganizationActivityEvent) ev).getRecipients().get(0) );
+    assertEquals( "OrganizationActivityEvent{subject=Custom Subject, body=This is sample data, recipients=[568628833], via=null}", ev.toString() );
+  }
+
+  @Test
+  public void testAttachmentRedactionEvent() {
+    String json = "{ \"id\": 10593649089, \"type\": \"AttachmentRedactionEvent\", \"attachment_id\": 315988189, \"comment_id\": 10591294149 }";
+    Event ev = parseJson( json.getBytes() );
+    assertNotNull( ev );
+    assertEquals( AttachmentRedactionEvent.class, ev.getClass() );
+    assertEquals( new Long(10593649089L), ev.getId() );
+    assertEquals( new Long(315988189L), ((AttachmentRedactionEvent) ev).getAttachmentId() );
+    assertEquals( new Long(10591294149L), ((AttachmentRedactionEvent) ev).getCommentId() );
+    assertEquals( "AttachmentRedactionEvent{attachmentId=315988189, commentId=10591294149}", ev.toString() );
+  }
+
+  @Test
+  public void testCommentRedactionEvent() {
+    String json = "{ \"id\": 18231937759, \"type\": \"CommentRedactionEvent\", \"comment_id\": \"18974155255\" }";
+    Event ev = parseJson( json.getBytes() );
+    assertNotNull( ev );
+    assertEquals( CommentRedactionEvent.class, ev.getClass() );
+    assertEquals( new Long(18231937759L), ev.getId() );
+    assertEquals( new Long(18974155255L), ((CommentRedactionEvent) ev).getCommentId() );
+    assertEquals( "CommentRedactionEvent{commentId=18974155255}", ev.toString() );
+  }
+}