refactor: refactored after review

ToucanToco · Mar 17, 2021 · ecd5508 · ecd5508
1 parent ef9b12f
commit ecd5508
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 35 deletions.
diff --git a/setup.py b/setup.py
@@ -70,7 +70,7 @@ def get_static_file_paths():
 
 setup(
     name='toucan_connectors',
-    version='0.49.0',
+    version='0.50.0',
     description='Toucan Toco Connectors',
     long_description=(HERE / 'README.md').read_text(encoding='utf-8'),
     long_description_content_type='text/markdown',

diff --git a/toucan_connectors/google_adwords/helpers.py b/toucan_connectors/google_adwords/helpers.py
@@ -1,42 +1,30 @@
 from typing import List
 
+operators = [
+    'EqualTo',
+    'Contains',
+    'ContainsAll',
+    'ContainsAny',
+    'ContainsIgnoreCase',
+    'DoesNotContain',
+    'GreaterThan',
+    'GreaterThanOrEqualTo',
+    'DoesNotContainIgnoreCase',
+    'In',
+    'LessThan',
+    'LessThanOrEqualTo',
+    'ContainsNone',
+    'NotIn',
+    'NotEqualTo',
+    'StartsWith',
+    'StartsWithIgnoreCase',
+]
+
 
 def apply_filter(query_builder, filter_dict: dict):
     for k, v in filter_dict.items():
-        if v['operator'] == 'EqualTo':
-            query_builder.Where(k).EqualTo(v['value'])
-        elif v['operator'] == 'Contains':
-            query_builder.Where(k).Contains(v['value'])
-        elif v['operator'] == 'ContainsAll':
-            query_builder.Where(k).ContainsAll(v['value'])
-        elif v['operator'] == 'ContainsAny':
-            query_builder.Where(k).ContainsAny(v['value'])
-        elif v['operator'] == 'ContainsIgnoreCase':
-            query_builder.Where(k).ContainsIgnoreCase(v['value'])
-        elif v['operator'] == 'DoesNotContain':
-            query_builder.Where(k).DoesNotContain(v['value'])
-        elif v['operator'] == 'GreaterThan':
-            query_builder.Where(k).GreaterThan(v['value'])
-        elif v['operator'] == 'GreaterThanOrEqualTo':
-            query_builder.Where(k).GreaterThanOrEqualTo(v['value'])
-        elif v['operator'] == 'DoesNotContainIgnoreCase':
-            query_builder.Where(k).DoesNotContainIgnoreCase(v['value'])
-        elif v['operator'] == 'In':
-            query_builder.Where(k).In(v['value'])
-        elif v['operator'] == 'LessThan':
-            query_builder.Where(k).LessThan(v['value'])
-        elif v['operator'] == 'LessThanOrEqualTo':
-            query_builder.Where(k).LessThanOrEqualTo(v['value'])
-        elif v['operator'] == 'ContainsNone':
-            query_builder.Where(k).ContainsNone(v['value'])
-        elif v['operator'] == 'NotIn':
-            query_builder.Where(k).NotIn(v['value'])
-        elif v['operator'] == 'NotEqualTo':
-            query_builder.Where(k).NotEqualTo(v['value'])
-        elif v['operator'] == 'StartsWith':
-            query_builder.Where(k).StartsWith(v['value'])
-        elif v['operator'] == 'StartsWithIgnoreCase':
-            query_builder.Where(k).StartsWithIgnoreCase(v['value'])
+        if v['operator'] in operators:
+            getattr(query_builder.Where(k), v['operator'])(v['value'])
     return query_builder