From 618f18e331f4bb2cdd0a502a1d67da1df9014154 Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@isti.cnr.it>
Date: Tue, 29 May 2018 09:08:24 +0000
Subject: [PATCH] Code redesign

Refs #11756: Refactor DataHArvesterPlugin to support scheduled execution from smart-executor

Task-Url: https://support.d4science.org/issues/11756

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-dashboard-harvester-se-plugin@167820 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../dataharvest/AccountingDataHarvesterPlugin.java | 14 +++++++++++---
 .../dao/DatabaseParameterRetriever.java            |  5 ++---
 .../AccountingDataHarvesterPluginTest.java         |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
index 0c8749e..68f0f37 100644
--- a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
+++ b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.SortedSet;
 
+import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.dataharvest.dao.DatabaseManager;
 import org.gcube.dataharvest.datamodel.HarvestedData;
 import org.gcube.dataharvest.harvester.MethodInvocationHarvester;
@@ -133,6 +134,9 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 
 		ArrayList<HarvestedData> data = new ArrayList<HarvestedData>();
 
+		
+		String initialToken = SecurityTokenProvider.instance.get();
+		
 		for(String context : contexts) {
 
 			// Setting the token for the context
@@ -149,9 +153,11 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 
 			try {
 				// Collecting info on VRE users
-				VREUsersHarvester vreUsersHarvester = new VREUsersHarvester(start, end);
-				List<HarvestedData> harvested = vreUsersHarvester.getData();
-				data.addAll(harvested);
+				if(!reRun) {
+					VREUsersHarvester vreUsersHarvester = new VREUsersHarvester(start, end);
+					List<HarvestedData> harvested = vreUsersHarvester.getData();
+					data.addAll(harvested);
+				}
 			} catch(Exception e) {
 				logger.error("Error harvesting Context Users for {}", context, e);
 			}
@@ -200,6 +206,8 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 			}
 
 		}
+		
+		Utils.setContext(initialToken);
 
 		if(!dryRun) {
 			dbaseManager.insertMonthlyData(start, end, data, reRun);
diff --git a/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java b/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java
index 2a8d14c..f56df36 100644
--- a/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java
+++ b/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java
@@ -88,9 +88,8 @@ public class DatabaseParameterRetriever {
 					}
 				}
 				
-			} catch(Exception ex) {
-				logger.error(ex.getLocalizedMessage());
-				throw new DaoException(ex.getLocalizedMessage(), ex.getCause());
+			} catch(Exception e) {
+				throw new DaoException("Error retrieving database connection", e);
 			}
 			
 		}
diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
index 55c0252..8fdbd41 100644
--- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
+++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
@@ -62,12 +62,12 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
 			inputs.put(AccountingDataHarvesterPlugin.DRY_RUN_INPUT_PARAMETER, false);
 
 			/*
-			Calendar from = DateUtils.getStartCalendar(2018, Calendar.APRIL, 1);
+			Calendar from = DateUtils.getStartCalendar(2018, Calendar.MARCH, 1);
 			String fromDate = DateUtils.LAUNCH_DATE_FORMAT.format(from.getTime());
 			logger.trace("{} is {}", AccountingDataHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate);
 			inputs.put(AccountingDataHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate);
 			*/
-
+			
 			accountingDataHarvesterPlugin.launch(inputs);
 
 			logger.info("End.");