[ISSUE-36] Properly format DateTime value in request parameter (#39)

Crim · web-flow · commit 6387449d5461 · 2019-12-12T17:07:24.000+09:00
* [ISSUE-36] Properly format DateTime object to go over the wire

* Update changelog

* Add final

* cleanup
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## 1.1.0 (UNRELEASED)
 
 #### Bugfixes
-- [Issue-35](https://github.com/Crim/pardot-java-client/issues/35) Submit POST parameters using UTF-8 charset by default. 
+- [Issue-35](https://github.com/Crim/pardot-java-client/issues/35) Submit POST parameters using UTF-8 charset by default.
+- [Issue-36](https://github.com/Crim/pardot-java-client/issues/36) Sending email with the scheduled_time was broken due to improperly formatted value. 
 
 #### Internal Dependency Updates
 - org.apache.httpcomponents:httpclent from 4.5.6 to 4.5.10
diff --git a/src/main/java/com/darksci/pardot/api/request/BaseRequest.java b/src/main/java/com/darksci/pardot/api/request/BaseRequest.java
@@ -17,6 +17,9 @@
 
 package com.darksci.pardot.api.request;
 
+import org.joda.time.DateTime;
+
+import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -45,6 +48,17 @@ protected T setParam(final String name, Object value) {
         return (T) this;
     }
 
+    @SuppressWarnings("unchecked")
+    protected T setParam(final String name, final DateTime value) {
+        if (value == null) {
+            params.remove(name);
+        } else {
+            final String dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(value.toDate());
+            return setParam(name, dateStr);
+        }
+        return (T) this;
+    }
+
     /**
      * Utility method to set a boolean parameter, converts boolean into string "true"/"false".
      *
diff --git a/src/main/java/com/darksci/pardot/api/request/email/EmailSendListRequest.java b/src/main/java/com/darksci/pardot/api/request/email/EmailSendListRequest.java
@@ -43,7 +43,7 @@ public EmailSendListRequest withCampaignId(final Long campaignId) {
     }
 
     /**
-     * Defiine Name and Email to send the email using.
+     * Define Name and Email to send the email using.
      * @param fromName The name of the sending user.
      * @param fromEmail The email of the sending user.
      * @return RequestBuilder
diff --git a/src/test/java/com/darksci/pardot/api/PardotClientTest.java b/src/test/java/com/darksci/pardot/api/PardotClientTest.java
@@ -112,6 +112,7 @@
 import com.darksci.pardot.api.response.visitor.VisitorQueryResponse;
 import com.darksci.pardot.api.response.visitoractivity.VisitorActivity;
 import com.darksci.pardot.api.response.visitoractivity.VisitorActivityQueryResponse;
+import org.joda.time.DateTime;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -498,21 +499,22 @@ public void emailSendOneToOneTest() {
      */
     @Test
     public void emailSendListTest() {
-        final long campaignId = 14885;
-        final long listId = 33173;
+        final long campaignId = 1;
+        final long listId = 5;
+        final DateTime scheduledTime = DateTime.now().plusDays(2);
 
         EmailSendListRequest request = new EmailSendListRequest()
             .withListId(listId)
             .withCampaignId(campaignId)
             .withFromNameAndEmail("Test User", "no-reply@example.com")
             .withReplyToEmail("no-reply@example.com")
             .withName("Test List Email Send " + System.currentTimeMillis())
-            .withOperationalEmail(true)
             .withSubject("Test Email From Api")
             .withTag("Tag 1")
             .withTag("Tag 2")
-            .withTextContent("Hello %%first_name%%!")
-            .withHtmlContent("<html><body><h1>Hello %%first_name%%!</h1></body></html>");
+            .withTextContent("Hello %%first_name%%! %%unsubscribe%%")
+            .withHtmlContent("<html><body><h1>Hello %%first_name%%! %%unsubscribe%% </h1></body></html>")
+            .withScheduledTime(scheduledTime);
 
         final Email response = client.emailSendList(request);
         assertNotNull("Should not be null", response);

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public EmailSendListRequest withCampaignId(final Long campaignId) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * Defiine Name and Email to send the email using.`
	`46`	`+ * Define Name and Email to send the email using.`
`47`	`47`	`* @param fromName The name of the sending user.`
`48`	`48`	`* @param fromEmail The email of the sending user.`
`49`	`49`	`* @return RequestBuilder`