We should be setting the dateFormat to what it originally is in PyishDate.

jasmith-hs · jasmith-hs · commit 72bd6f96d2bc · 2023-02-09T11:13:25.000-05:00
This PR adds a new method which we can use when reconstructing to put the date format back to what it originally was
diff --git a/src/main/java/com/hubspot/jinjava/objects/date/PyishDate.java b/src/main/java/com/hubspot/jinjava/objects/date/PyishDate.java
@@ -112,6 +112,11 @@ public void setDateFormat(String dateFormat) {
     this.dateFormat = dateFormat;
   }
 
+  public PyishDate withDateFormat(String dateFormat) {
+    setDateFormat(dateFormat);
+    return this;
+  }
+
   public Date toDate() {
     return Date.from(date.toInstant());
   }
@@ -163,10 +168,12 @@ public boolean equals(Object obj) {
   public <T extends Appendable & CharSequence> T appendPyishString(T appendable)
     throws IOException {
     return (T) appendable
-      .append('\'')
+      .append("('")
       .append(strftime(FULL_DATE_FORMAT))
       .append("'|strtotime(")
       .append(PyishObjectMapper.getAsPyishStringOrThrow(FULL_DATE_FORMAT))
+      .append(")).withDateFormat(")
+      .append(PyishObjectMapper.getAsPyishStringOrThrow(dateFormat))
       .append(')');
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/objects/date/PyishDateTest.java b/src/test/java/com/hubspot/jinjava/objects/date/PyishDateTest.java
@@ -67,6 +67,26 @@ public void itPyishSerializes() {
     assertThat(d1).isEqualTo(interpreter.getContext().get("foo"));
   }
 
+  @Test
+  public void itPyishSerializesWithCustomDateFormat() {
+    PyishDate d1 = new PyishDate(ZonedDateTime.parse("2013-11-12T14:15:16.170+02:00"));
+    d1.setDateFormat("yyyy-MM-dd");
+    JinjavaInterpreter interpreter = new Jinjava().newInterpreter();
+    interpreter.render("{% set foo = " + PyishObjectMapper.getAsPyishString(d1) + "%}");
+    PyishDate reconstructed = (PyishDate) interpreter.getContext().get("foo");
+    assertThat(reconstructed.toString()).isEqualTo("2013-11-12");
+  }
+
+  @Test
+  public void itDoesntLoseSecondsOnReconstruction() {
+    PyishDate d1 = new PyishDate(ZonedDateTime.parse("2013-11-12T14:15:16.170+02:00"));
+    d1.setDateFormat("yyyy-MM-dd");
+    JinjavaInterpreter interpreter = new Jinjava().newInterpreter();
+    interpreter.render("{% set foo = " + PyishObjectMapper.getAsPyishString(d1) + "%}");
+    PyishDate reconstructed = (PyishDate) interpreter.getContext().get("foo");
+    assertThat(reconstructed.getSecond()).isEqualTo(16);
+  }
+
   @Test
   public void testPyishDateToStringWithCustomDateFormatter() {
     PyishDate d1 = new PyishDate(ZonedDateTime.parse("2013-11-12T14:15:16.170+02:00"));

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,11 @@ public void setDateFormat(String dateFormat) {`
`112`	`112`	`this.dateFormat = dateFormat;`
`113`	`113`	`}`
`114`	`114`
	`115`	`+ public PyishDate withDateFormat(String dateFormat) {`
	`116`	`+ setDateFormat(dateFormat);`
	`117`	`+ return this;`
	`118`	`+ }`
	`119`	`+`
`115`	`120`	`public Date toDate() {`
`116`	`121`	`return Date.from(date.toInstant());`
`117`	`122`	`}`
`@@ -163,10 +168,12 @@ public boolean equals(Object obj) {`
`163`	`168`	`public <T extends Appendable & CharSequence> T appendPyishString(T appendable)`
`164`	`169`	`throws IOException {`
`165`	`170`	`return (T) appendable`
`166`		`- .append('\'')`
	`171`	`+ .append("('")`
`167`	`172`	`.append(strftime(FULL_DATE_FORMAT))`
`168`	`173`	`.append("'\|strtotime(")`
`169`	`174`	`.append(PyishObjectMapper.getAsPyishStringOrThrow(FULL_DATE_FORMAT))`
	`175`	`+ .append(")).withDateFormat(")`
	`176`	`+ .append(PyishObjectMapper.getAsPyishStringOrThrow(dateFormat))`
`170`	`177`	`.append(')');`
`171`	`178`	`}`
`172`	`179`	`}`