Merge branch 'filter-exclude'

3Squared · Apr 25, 2021 · 57aabed · 57aabed
2 parents a7b0ad5 + 3375377
commit 57aabed
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 24 deletions.
diff --git a/Sources/PeakPivot/BuildPivot.swift b/Sources/PeakPivot/BuildPivot.swift
@@ -140,7 +140,7 @@ fileprivate extension BuildPivot {
             if let filters = self.filters {
 
                 let matchingFilters = filters.filter { filter -> Bool in
-                    return fieldName == filter.fieldName && !filter.include.contains(fieldValue)
+                    return fieldName == filter.fieldName && filter.exclude.contains(fieldValue)
                 }
 
                 if matchingFilters.count > 0 {

diff --git a/Sources/PeakPivot/BuildPivotFilter.swift b/Sources/PeakPivot/BuildPivotFilter.swift
@@ -13,12 +13,12 @@ public struct BuildPivotFilter {
     /// The field name to filter on
     public let fieldName: FieldName
 
-    /// The values of the field name to include
-    public let include: [FieldValue]
+    /// The values of the field name to exclude
+    public let exclude: [FieldValue]
 
-    public init(fieldName: FieldName, include: [FieldName]) {
+    public init(fieldName: FieldName, exclude: [FieldName]) {
         self.fieldName = fieldName
-        self.include = include
+        self.exclude = exclude
     }
 }
 

diff --git a/Tests/PeakPivotTests/PivotBuilderIntegrationTests.swift b/Tests/PeakPivotTests/PivotBuilderIntegrationTests.swift
@@ -15,7 +15,8 @@ class PivotBuilderIntegrationTests: PivotBuilderTestsBase {
         builder.percentagesEnabled = false
         builder.table = TestData.people
         builder.fields = ["age_range", "gender"]
-        builder.filters = [BuildPivotFilter(fieldName: "age_range", include: ["40s"])]
+
+        builder.filters = [BuildPivotFilter(fieldName: "age_range", exclude: ["20s", "30s", "50s", "60s"])]
         builder.percentagesEnabled = true
 
         runBuilder()
@@ -35,7 +36,7 @@ class PivotBuilderIntegrationTests: PivotBuilderTestsBase {
         builder.percentagesEnabled = false
         builder.table = TestData.people
         builder.fields = ["age_range", "gender"]
-        builder.filters = [BuildPivotFilter(fieldName: "age_range", include: ["40s", "60s"])]
+        builder.filters = [BuildPivotFilter(fieldName: "age_range", exclude: ["20s", "30s", "50s"])]
         builder.sortDescriptor = .byCount(ascending: false)
         builder.percentagesEnabled = true
 
@@ -61,7 +62,7 @@ class PivotBuilderIntegrationTests: PivotBuilderTestsBase {
         builder.percentagesEnabled = true
            builder.sortDescriptor = .byCount(ascending: false)
            builder.fields = ["age_range", "gender", "title"]
-           builder.filters = [BuildPivotFilter(fieldName: "gender", include: ["Female"])]
+        builder.filters = [BuildPivotFilter(fieldName: "gender", exclude: ["Male", Blank])]
 
           runBuilder()
 

diff --git a/Tests/PeakPivotTests/PivotBuilderMultipleFilterTests.swift b/Tests/PeakPivotTests/PivotBuilderMultipleFilterTests.swift
@@ -13,11 +13,11 @@ import XCTest
 
 class PivotBuilderMultipleFilterTests: PivotBuilderTestsBase {
 
-    func testTwoLevels_TwoFilters_TwoIncludes() {
+    func testTwoLevels_TwoFilters() {
         builder.fields = ["title", "age_range"]
         builder.filters = [
-            BuildPivotFilter(fieldName: "title", include: ["Dr", Blank]),
-            BuildPivotFilter(fieldName: "age_range", include: ["40s", "60s"]),
+            BuildPivotFilter(fieldName: "title", exclude: ["Honorable", "Mr", "Mrs", "Rev", "Ms"]),
+            BuildPivotFilter(fieldName: "age_range", exclude: ["20s", "30s", "50s"])
         ]
 
         runBuilder()
@@ -36,10 +36,11 @@ class PivotBuilderMultipleFilterTests: PivotBuilderTestsBase {
         XCTAssertEqual(pivotRows, expected)
     }
 
-    func testTwoLevels_TwoFilters_TwoIncludes_ZerosEnabled() {
+    func testTwoLevels_OneFilter_ZerosEnabled() {
         builder.fields = ["title", "age_range"]
         builder.filters = [
-            BuildPivotFilter(fieldName: "age_range", include: ["50s"]),
+            BuildPivotFilter(fieldName: "age_range", exclude: ["20s", "30s", "40s", "60s"])
+
         ]
         builder.zeroRowsEnabled = true
 
@@ -65,11 +66,12 @@ class PivotBuilderMultipleFilterTests: PivotBuilderTestsBase {
 
     }
 
-    func testTwoLevels_TwoFilters_TwoIncludes_ZerosDisabled() {
+    func testTwoLevels_TwoFilters_ZerosDisabled() {
         builder.fields = ["title", "age_range"]
         builder.filters = [
-            BuildPivotFilter(fieldName: "age_range", include: ["50s"]),
+            BuildPivotFilter(fieldName: "age_range", exclude: ["20s", "30s", "40s", "60s"])
         ]
+
         builder.zeroRowsEnabled = false
 
         runBuilder()
@@ -90,10 +92,10 @@ class PivotBuilderMultipleFilterTests: PivotBuilderTestsBase {
 
     }
 
-    func testTwoLevels_TwoFilters_TwoIncludes_ZerosDisabled_PercentagesEnabled() {
+    func testTwoLevels_TwoFilters_ZerosDisabled_PercentagesEnabled() {
         builder.fields = ["title", "age_range"]
         builder.filters = [
-            BuildPivotFilter(fieldName: "age_range", include: ["50s"]),
+            BuildPivotFilter(fieldName: "age_range", exclude: ["20s", "30s", "40s", "60s"])
         ]
         builder.zeroRowsEnabled = false
         builder.percentagesEnabled = true

diff --git a/Tests/PeakPivotTests/PivotBuilderSingleFilterTests.swift b/Tests/PeakPivotTests/PivotBuilderSingleFilterTests.swift
@@ -11,9 +11,9 @@ import XCTest
 
 class PivotBuilderSingleFilterTests: PivotBuilderTestsBase {
 
-    func testThreeLevels_oneIncludesAtLevelOne() {
+    func testThreeLevels_fourExcludesAtLevelOne() {
         builder.fields = ["age_range", "gender", "title"]
-        builder.filters = [BuildPivotFilter(fieldName: "age_range", include: ["20s"])]
+        builder.filters = [BuildPivotFilter(fieldName: "age_range", exclude: ["30s", "40s", "50s", "60s"])]
 
         runBuilder()
 
@@ -34,9 +34,10 @@ class PivotBuilderSingleFilterTests: PivotBuilderTestsBase {
         XCTAssertEqual(pivotRows, expected)
     }
 
-    func testThreeLevels_twoIncludesAtLevelOne() {
+    func testThreeLevels_threeExcludesAtLevelOne() {
         builder.fields = ["age_range", "gender", "title"]
-        builder.filters = [BuildPivotFilter(fieldName: "age_range", include: ["20s", "50s"])]
+//        builder.filters = [BuildPivotFilter(fieldName: "age_range", include: ["20s", "50s"])]
+        builder.filters = [BuildPivotFilter(fieldName: "age_range", exclude: ["30s", "40s", "60s"])]
 
         runBuilder()
 
@@ -70,10 +71,11 @@ class PivotBuilderSingleFilterTests: PivotBuilderTestsBase {
         XCTAssertEqual(pivotRows, expected)
     }
 
-    func testThreeLevels_threeIncludesAtLevelTwo_sortByValueAscending_noPercentages() {
+    func testThreeLevels_twoExcludesAtLevelTwo_sortByValueAscending_noPercentages() {
         builder.sortDescriptor = .byCount(ascending: true)
         builder.fields = ["age_range", "gender"]
-        builder.filters = [BuildPivotFilter(fieldName: "age_range", include: ["20s", "30s", "60s"])]
+//        builder.filters = [BuildPivotFilter(fieldName: "age_range", include: ["20s", "30s", "60s"])]
+        builder.filters = [BuildPivotFilter(fieldName: "age_range", exclude: ["40s", "50s"])]
 
         runBuilder()
 
@@ -100,7 +102,7 @@ class PivotBuilderSingleFilterTests: PivotBuilderTestsBase {
 
     func testOneLevels_blankInclude() {
         builder.fields = ["gender"]
-        builder.filters = [BuildPivotFilter(fieldName: "gender", include: [Blank])]
+        builder.filters = [BuildPivotFilter(fieldName: "gender", exclude: ["Female", "Male"])]
 
         runBuilder()