Do not require argument to unixtimestamp function by boulter · Pull Request #1191 · HubSpot/jinjava · GitHub
Skip to content

Do not require argument to unixtimestamp function #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boulter merged 1 commit into from
Jun 6, 2024
Merged

Do not require argument to unixtimestamp function #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilter.java
View file
Open in desktop
34 changes: 28 additions & 6 deletions src/main/java/com/hubspot/jinjava/lib/filter/UnixTimestampFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
package com.hubspot.jinjava.lib.filter;

import static com.hubspot.jinjava.lib.filter.time.DateTimeFormatHelper.FIXED_DATE_TIME_FILTER_NULL_ARG;

import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
import com.hubspot.jinjava.doc.annotations.JinjavaParam;
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
import com.hubspot.jinjava.features.DateTimeFeatureActivationStrategy;
import com.hubspot.jinjava.features.FeatureActivationStrategy;
import com.hubspot.jinjava.interpret.InvalidArgumentException;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.interpret.TemplateError;
import com.hubspot.jinjava.lib.fn.Functions;

@JinjavaDoc(
value = "Gets the UNIX timestamp value (in milliseconds) of a date object",
input = @JinjavaParam(
value = "value",
defaultValue = "current time",
desc = "The date variable",
required = true
),
input = @JinjavaParam(value = "value", desc = "The date variable", required = true),
snippets = { @JinjavaSnippet(code = "{% mydatetime|unixtimestamp %}") }
)
public class UnixTimestampFilter implements Filter {
Expand All @@ -25,6 +26,27 @@ public String getName() {

@Override
public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
if (var == null) {
interpreter.addError(
TemplateError.fromMissingFilterArgException(
new InvalidArgumentException(
interpreter,
"unixtimestamp",
"unixtimestamp filter called with null datetime"
)
)
);

FeatureActivationStrategy feat = interpreter
.getConfig()
.getFeatures()
.getActivationStrategy(FIXED_DATE_TIME_FILTER_NULL_ARG);

if (feat.isActive(interpreter.getContext())) {
var = ((DateTimeFeatureActivationStrategy) feat).getActivateAt();
}
}

return Functions.unixtimestamp(var);
}
}
29 changes: 2 additions & 27 deletions src/main/java/com/hubspot/jinjava/lib/fn/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static ZonedDateTime today(String... var) {
@JinjavaDoc(
value = "formats a date to a string",
params = {
@JinjavaParam(value = "var", type = "date", defaultValue = "current time"),
@JinjavaParam(value = "var", type = "date", required = true),
@JinjavaParam(
value = "format",
defaultValue = StrftimeFormatter.DEFAULT_DATE_FORMAT
Expand Down Expand Up @@ -310,36 +310,11 @@ public static ZonedDateTime getDateTimeArg(Object var, ZoneId zoneOffset) {

@JinjavaDoc(
value = "gets the unix timestamp milliseconds value of a datetime",
params = {
@JinjavaParam(value = "var", type = "date", defaultValue = "current time"),
}
params = { @JinjavaParam(value = "var", type = "date", required = true) }
)
public static long unixtimestamp(Object... var) {
Object filterVar = var == null || var.length == 0 ? null : var[0];

if (filterVar == null) {
JinjavaInterpreter interpreter = JinjavaInterpreter.getCurrent();

interpreter.addError(
TemplateError.fromMissingFilterArgException(
new InvalidArgumentException(
interpreter,
"unixtimestamp",
"unixtimestamp filter called with null datetime"
)
)
);

FeatureActivationStrategy feat = interpreter
.getConfig()
.getFeatures()
.getActivationStrategy(FIXED_DATE_TIME_FILTER_NULL_ARG);

if (feat.isActive(interpreter.getContext())) {
filterVar = ((DateTimeFeatureActivationStrategy) feat).getActivateAt();
}
}

ZonedDateTime d = getDateTimeArg(filterVar, ZoneOffset.UTC);

if (d == null) {
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/hubspot/jinjava/lib/fn/UnixTimestampFunctionTest.java
View file
Open in desktop