diff --git a/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnector.java b/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnector.java index 00e27eb..da86647 100644 --- a/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnector.java +++ b/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnector.java @@ -286,7 +286,7 @@ public class PostgreSQLConnector extends PersistencePostgreSQL implements Aggreg * aggregation_start_date >= '2017-05-01 00:00:00.000 +0000' AND * aggregation_start_date <= '2017-05-31 00:00:00.000 +0000' * - * ORDER BY last_update_time DESC LIMIT 1 + * ORDER BY aggregation_start_date DESC LIMIT 1 * */ diff --git a/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorStatus.java b/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorStatus.java index 51cc12a..970cdf7 100644 --- a/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorStatus.java +++ b/src/main/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorStatus.java @@ -6,7 +6,7 @@ package org.gcube.accounting.aggregator.persistence; public class PostgreSQLConnectorStatus extends PostgreSQLConnector implements AggregatorPersistenceStatus { protected PostgreSQLConnectorStatus() throws Exception { - super(AggregatorPersistenceSrc.class); + super(AggregatorPersistenceDst.class); } protected PostgreSQLConnectorStatus(Class clazz) throws Exception { diff --git a/src/test/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorTest.java b/src/test/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorTest.java index c00ba3d..ee7df84 100644 --- a/src/test/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorTest.java +++ b/src/test/java/org/gcube/accounting/aggregator/persistence/PostgreSQLConnectorTest.java @@ -26,7 +26,7 @@ public class PostgreSQLConnectorTest extends ContextTest { public PostgreSQLConnectorTest() throws Exception { aggregatorPersistenceStatus = AggregatorPersistenceFactory.getAggregatorPersistenceStatus(); - logger.debug("{}", aggregatorPersistenceStatus); + logger.info("{}", aggregatorPersistenceStatus); } // @Ignore @@ -46,7 +46,7 @@ public class PostgreSQLConnectorTest extends ContextTest { @Test public void getLastTest() throws Exception { AggregationStatus aggregationStatus = aggregatorPersistenceStatus.getLast(ServiceUsageRecord.class.getSimpleName(), AggregationType.DAILY, null, null); - logger.debug("Last : {}", DSMapper.getObjectMapper().writeValueAsString(aggregationStatus)); + logger.info("Last : {}", DSMapper.getObjectMapper().writeValueAsString(aggregationStatus)); } @Test @@ -59,8 +59,8 @@ public class PostgreSQLConnectorTest extends ContextTest { @Test public void getLastTestWithConstraint() throws Exception { - Calendar aggregationStart = Utility.getAggregationStartCalendar(2017, Calendar.JANUARY, 1); - Calendar aggregationEnd = Utility.getAggregationStartCalendar(2017, Calendar.JANUARY, 31); + Calendar aggregationStart = Utility.getAggregationStartCalendar(2024, Calendar.FEBRUARY, 02); + Calendar aggregationEnd = Utility.getAggregationStartCalendar(2024, Calendar.FEBRUARY, 03); AggregationStatus aggregationStatus = aggregatorPersistenceStatus.getLast(ServiceUsageRecord.class.getSimpleName(), AggregationType.DAILY, aggregationStart.getTime(), aggregationEnd.getTime()); logger.info("Last : {}", DSMapper.getObjectMapper().writeValueAsString(aggregationStatus)); @@ -79,9 +79,9 @@ public class PostgreSQLConnectorTest extends ContextTest { @Test public void getAggregationStatusTest() throws Exception{ - Calendar aggregationStartCalendar = Utility.getAggregationStartCalendar(2017, Calendar.JUNE, 15); + Calendar aggregationStartCalendar = Utility.getAggregationStartCalendar(2024, Calendar.FEBRUARY, 02); AggregationStatus aggregationStatus = aggregatorPersistenceStatus.getAggregationStatus(ServiceUsageRecord.class.getSimpleName(), AggregationType.DAILY, aggregationStartCalendar.getTime()); - logger.debug("{}", DSMapper.getObjectMapper().writeValueAsString(aggregationStatus)); + logger.info("{}", DSMapper.getObjectMapper().writeValueAsString(aggregationStatus)); } //@Test