From 41ead0c81c9d3c6c711771c2cbd6cccd8b04d883 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 26 Nov 2021 17:24:10 +0100
Subject: [PATCH] Fixed time interval aligning

---
 .../org/gcube/accounting/analytics/TemporalConstraint.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java b/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java
index 8252a4c..2c18fdc 100644
--- a/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java
+++ b/src/main/java/org/gcube/accounting/analytics/TemporalConstraint.java
@@ -151,7 +151,12 @@ public class TemporalConstraint {
 	}
 	
 	public Calendar getAlignedEndTime(){
-		return getAlignedCalendar(endTime, aggregationMode);
+		Calendar calendar = getAlignedCalendar(endTime, aggregationMode);
+		int ordinal = aggregationMode.ordinal();
+		int calendarToAdd = CalendarEnum.values()[ordinal].getCalendarValue();
+		calendar.add(calendarToAdd, 1);
+		calendar.add(Calendar.MILLISECOND, -1);
+		return calendar;
 	}
 	
 	public SortedSet<Calendar> getCalendarSequence(){