From f0f981d197dac1572d852f2bcaa930adc9f1a0ab Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@isti.cnr.it>
Date: Mon, 4 Jun 2018 14:35:32 +0000
Subject: [PATCH] Fixed launch

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

diff --git a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
index a24c11f..a006efd 100644
--- a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
+++ b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
@@ -39,6 +39,7 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 	public static final String START_DATE_INPUT_PARAMETER = "startDate";
 	public static final String MEASURE_TYPE_INPUT_PARAMETER = "measureType";
 	public static final String RERUN_INPUT_PARAMETER = "reRun";
+	public static final String GET_VRE_USERS_INPUT_PARAMETER = "getVREUsers";
 	public static final String DRY_RUN_INPUT_PARAMETER = "dryRun";
 
 	public static final String SO_BIG_DATA_CATALOGUE_CONTEXT = "/d4science.research-infrastructures.eu/SoBigData/ResourceCatalogue";
@@ -103,6 +104,16 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 			}
 		}
 
+		boolean getVREUsers = true;
+		if(inputs.containsKey(GET_VRE_USERS_INPUT_PARAMETER)) {
+			try {
+				reRun = (boolean) inputs.get(GET_VRE_USERS_INPUT_PARAMETER);
+			}catch (Exception e) {
+				throw new IllegalArgumentException("'" + GET_VRE_USERS_INPUT_PARAMETER + "' must be a boolean");
+			}
+		}
+		
+		
 		boolean dryRun = true;
 		if(inputs.containsKey(DRY_RUN_INPUT_PARAMETER)) {
 			try {
@@ -154,7 +165,7 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 
 			try {
 				// Collecting info on VRE users
-				if(!reRun) {
+				if(getVREUsers) {
 					VREUsersHarvester vreUsersHarvester = new VREUsersHarvester(start, end);
 					List<HarvestedData> harvested = vreUsersHarvester.getData();
 					data.addAll(harvested);
@@ -205,7 +216,7 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 					logger.error("Error harvesting Method Invocations for {}", context, e);
 				}
 			}
-
+			
 		}
 		
 		Utils.setContext(initialToken);
diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
index 8fdbd41..22ed43b 100644
--- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
+++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
@@ -58,11 +58,12 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
 			MeasureType measureType = MeasureType.MONTHLY;
 
 			inputs.put(AccountingDataHarvesterPlugin.MEASURE_TYPE_INPUT_PARAMETER, measureType.name());
+			inputs.put(AccountingDataHarvesterPlugin.GET_VRE_USERS_INPUT_PARAMETER, false);
 			inputs.put(AccountingDataHarvesterPlugin.RERUN_INPUT_PARAMETER, true);
 			inputs.put(AccountingDataHarvesterPlugin.DRY_RUN_INPUT_PARAMETER, false);
 
 			/*
-			Calendar from = DateUtils.getStartCalendar(2018, Calendar.MARCH, 1);
+			Calendar from = DateUtils.getStartCalendar(2018, Calendar.FEBRUARY, 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);