Merge pull request #13 from taboola/fix-campaign-summary-wrong-field-…

…name Renaming 'block_level' to 'blocking_level' based on spec
taboola · Mar 5, 2019 · 0c3b09f · 0c3b09f
2 parents 6d5f690 + 68e7956
commit 0c3b09f
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/main/java/com/taboola/backstage/model/media/reports/CampaignSummaryRow.java b/src/main/java/com/taboola/backstage/model/media/reports/CampaignSummaryRow.java
@@ -38,7 +38,7 @@ public class CampaignSummaryRow implements DynamicRow {
     private String countryName;
     private String platform;
     private String platformName;
-    private BlockingLevelType blockLevel;
+    private BlockingLevelType blockingLevel;
     private Double roas;
 
     // dynamic
@@ -242,13 +242,12 @@ public CampaignSummaryRow setPlatformName(String platformName) {
         return this;
     }
 
-    public BlockingLevelType getBlockLevel() {
-        return blockLevel;
+    public BlockingLevelType getBlockingLevel() {
+        return blockingLevel;
     }
 
-    public CampaignSummaryRow setBlockLevel(BlockingLevelType blockLevel) {
-        this.blockLevel = blockLevel;
-        return this;
+    public void setBlockingLevel(BlockingLevelType blockingLevel) {
+        this.blockingLevel = blockingLevel;
     }
 
     public Integer getSiteId() {
@@ -306,7 +305,7 @@ public boolean equals(Object o) {
                 Objects.equals(countryName, that.countryName) &&
                 Objects.equals(platform, that.platform) &&
                 Objects.equals(platformName, that.platformName) &&
-                blockLevel == that.blockLevel &&
+                Objects.equals(blockingLevel, that.blockingLevel) &&
                 Objects.equals(roas, that.roas) &&
                 Objects.equals(dynamicFields, that.dynamicFields);
     }
@@ -316,7 +315,7 @@ public int hashCode() {
         return Objects.hash(impressions, ctr, clicks, cpc, cpm, cpaConversionRate, cpaActionsNum, spent,
                 currency, date, dateEndPeriod, contentProvider, contentProviderName,
                 campaignsNum, campaign, campaignName, site, siteName, siteId, country,
-                countryName, platform, platformName, blockLevel, roas, dynamicFields);
+                countryName, platform, platformName, blockingLevel, roas, dynamicFields);
     }
 
     @Override
@@ -345,7 +344,7 @@ public String toString() {
                 ", countryName='" + countryName + '\'' +
                 ", platform='" + platform + '\'' +
                 ", platformName='" + platformName + '\'' +
-                ", blockLevel=" + blockLevel +
+                ", blockingLevel=" + blockingLevel +
                 ", roas=" + roas +
                 ", dynamicFields=" + dynamicFields +
                 '}';