diff --git a/src/CampaignDataModel.java b/src/CampaignDataModel.java index d11e6a23c01954f86f057087d3ea03879de6de08..40ea4c2d46fc0365dbe2659ecb848044e7589875 100644 --- a/src/CampaignDataModel.java +++ b/src/CampaignDataModel.java @@ -56,13 +56,13 @@ public class CampaignDataModel { this.connection = connection; } - private String getMetricWhole(QueryEngine qe, Metric metric) { + private String getMetricWhole_(QueryEngine qe, Metric metric) { return qe.getMetric(metric).get(""); } public String getMetricWhole(Metric metric, String startDate, String endDate, BounceDef bounceDef, FilterOptions filterOptions) { QueryEngine qe = new QueryEngine(connection, startDate, endDate, null,filterOptions, bounceDef); - return getMetricWhole(qe, metric); + return getMetricWhole_(qe, metric); } //TODO use improved code @@ -70,18 +70,18 @@ public class CampaignDataModel { QueryEngine qe = new QueryEngine(connection, startDate, endDate, null,filterOptions, bounceDef); MetricRecord metrics = new MetricRecord(); - metrics.impressions = getMetricWhole(qe, Metric.N_IMPRESSIONS); - metrics.clicks = getMetricWhole(qe, Metric.N_CLICKS); - metrics.uniques = getMetricWhole(qe, Metric.N_UNIQUES); - metrics.bounces = getMetricWhole(qe, Metric.N_BOUNCES); - metrics.conversions = getMetricWhole(qe, Metric.N_CONVERSIONS); - metrics.totalCost = getMetricWhole(qe, Metric.TOTAL_COST); - - metrics.ctr = getMetricWhole(qe, Metric.CTR); - metrics.cpa = getMetricWhole(qe, Metric.CPA); - metrics.cpc = getMetricWhole(qe, Metric.CPC); - metrics.cpm = getMetricWhole(qe, Metric.CPM); - metrics.bounceRate = getMetricWhole(qe, Metric.BOUNCE_RATE); + metrics.impressions = getMetricWhole_(qe, Metric.N_IMPRESSIONS); + metrics.clicks = getMetricWhole_(qe, Metric.N_CLICKS); + metrics.uniques = getMetricWhole_(qe, Metric.N_UNIQUES); + metrics.bounces = getMetricWhole_(qe, Metric.N_BOUNCES); + metrics.conversions = getMetricWhole_(qe, Metric.N_CONVERSIONS); + metrics.totalCost = getMetricWhole_(qe, Metric.TOTAL_COST); + + metrics.ctr = getMetricWhole_(qe, Metric.CTR); + metrics.cpa = getMetricWhole_(qe, Metric.CPA); + metrics.cpc = getMetricWhole_(qe, Metric.CPC); + metrics.cpm = getMetricWhole_(qe, Metric.CPM); + metrics.bounceRate = getMetricWhole_(qe, Metric.BOUNCE_RATE); return metrics; }