From 1a3a9d4b787e736447bf7da045cb7290ad0b3e2a Mon Sep 17 00:00:00 2001
From: Maxcj <maxcj.zhong@outlook.com>
Date: Mon, 1 Jan 2024 02:32:13 +0800
Subject: [PATCH] add new fields to MandrillMessageInfo and
 MandrillMessageStatus

---
 .../lutung/view/MandrillMessageInfo.java      | 17 +++++++++++--
 .../lutung/view/MandrillMessageStatus.java    | 24 ++++++++++++++-----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageInfo.java b/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageInfo.java
index c591d63..6a9d199 100644
--- a/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageInfo.java
+++ b/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageInfo.java
@@ -13,12 +13,13 @@
  */
 public class MandrillMessageInfo {
     private Long ts;
-	private Integer opens, clicks;
-	private String _id, sender, template, subject, email, state;
+	private Integer opens, clicks, bgtools_code;
+	private String _id, sender, template, subject, email, state, diag;
 	private List<String> tags;
 	private List<UserActionDetail> opens_detail, clicks_detail;
 	private List<SMTPEvent> smtp_events;
 	private Map<String,String> metadata;
+	private MandrillRejectsEntry reject;
 
 	/**
 	 * @return The Unix timestamp from when this message was sent.
@@ -102,6 +103,18 @@ public Map<String,String> getMetadata() {
 		return metadata;
 	}
 
+	public Integer getBgtoolsCode() {
+		return bgtools_code;
+	}
+
+	public String getDiag() {
+		return diag;
+	}
+
+	public MandrillRejectsEntry getReject() {
+		return reject;
+	}
+
 	public static class UserActionDetail {
 		private Integer ts;
 		private String url, ip, location, ua;
diff --git a/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageStatus.java b/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageStatus.java
index cf5ba91..6b7599a 100644
--- a/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageStatus.java
+++ b/src/main/java/com/microtripit/mandrillapp/lutung/view/MandrillMessageStatus.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package com.microtripit.mandrillapp.lutung.view;
 
@@ -9,7 +9,7 @@
  * @since Mar 16, 2013
  */
 public class MandrillMessageStatus {
-	private String email, status, reject_reason, _id;
+	private String email, status, reject_reason, queued_reason, _id;
 
 	/**
 	 * @return The email address of the recipient.
@@ -19,26 +19,38 @@ public String getEmail() {
 	}
 
 	/**
-	 * @return The sending status of the recipient &ndash; 
+	 * @return The sending status of the recipient &ndash;
 	 * either 'sent', 'queued', 'rejected', or 'invalid'.
 	 */
 	public String getStatus() {
 		return status;
 	}
-	
+
 	/**
-	 * @return The reason for the rejection if the recipient 
+	 * @return The reason for the rejection if the recipient
 	 * status is 'rejected'.
 	 */
 	public String getRejectReason() {
 		return reject_reason;
 	}
 
+	/**
+	 * @return The reason for the email being queued if the response status is "queued"
+	 * Possible values: "attachments", "multiple-recipients",
+	 * "free-trial-sends-exhausted", "hourly-quota-exhausted",
+	 * "monthly-limit-reached", "sending-paused",
+	 * "sending-suspended", "account-suspended",
+	 * 	or "sending-backlogged".
+	 */
+	public String getQueuedReason() {
+		return queued_reason;
+	}
+
 	/**
 	 * @return The message's unique id.
 	 */
 	public String getId() {
 		return _id;
 	}
-	
+
 }