QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-604 ADd overload to getSqlExpression that takes zoneId

Browse Source
This commit is contained in:
darin.kelkhoff
2023-10-24 11:36:49 -05:00
parent a19a789449
commit c2c9a3acce
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/DateTimeGroupBy.java
View File

@ -99,7 +99,17 @@ public enum DateTimeGroupBy
public String getSqlExpression() public String getSqlExpression()
{ {
ZoneId sessionOrInstanceZoneId = ValueUtils.getSessionOrInstanceZoneId(); ZoneId sessionOrInstanceZoneId = ValueUtils.getSessionOrInstanceZoneId();
String targetTimezone = sessionOrInstanceZoneId.toString(); return (getSqlExpression(sessionOrInstanceZoneId));
}
/*******************************************************************************
**
*******************************************************************************/
public String getSqlExpression(ZoneId targetZoneId)
{
String targetTimezone = targetZoneId.toString();
if("Z".equals(targetTimezone) || !StringUtils.hasContent(targetTimezone)) if("Z".equals(targetTimezone) || !StringUtils.hasContent(targetTimezone))
{ {
@ -220,20 +230,20 @@ public enum DateTimeGroupBy
{ {
ZonedDateTime zoned = instant.atZone(ValueUtils.getSessionOrInstanceZoneId()); ZonedDateTime zoned = instant.atZone(ValueUtils.getSessionOrInstanceZoneId());
return switch(this) return switch(this)
{
case YEAR -> zoned.with(TemporalAdjusters.firstDayOfYear()).truncatedTo(ChronoUnit.DAYS).toInstant();
case MONTH -> zoned.with(TemporalAdjusters.firstDayOfMonth()).truncatedTo(ChronoUnit.DAYS).toInstant();
case WEEK ->
{ {
case YEAR -> zoned.with(TemporalAdjusters.firstDayOfYear()).truncatedTo(ChronoUnit.DAYS).toInstant(); while(zoned.get(ChronoField.DAY_OF_WEEK) != DayOfWeek.SUNDAY.getValue())
case MONTH -> zoned.with(TemporalAdjusters.firstDayOfMonth()).truncatedTo(ChronoUnit.DAYS).toInstant();
case WEEK ->
{ {
while(zoned.get(ChronoField.DAY_OF_WEEK) != DayOfWeek.SUNDAY.getValue()) zoned = zoned.minusDays(1);
{
zoned = zoned.minusDays(1);
}
yield (zoned.truncatedTo(ChronoUnit.DAYS).toInstant());
} }
case DAY -> zoned.truncatedTo(ChronoUnit.DAYS).toInstant(); yield (zoned.truncatedTo(ChronoUnit.DAYS).toInstant());
case HOUR -> zoned.truncatedTo(ChronoUnit.HOURS).toInstant(); }
}; case DAY -> zoned.truncatedTo(ChronoUnit.DAYS).toInstant();
case HOUR -> zoned.truncatedTo(ChronoUnit.HOURS).toInstant();
};
} }