Bump Google Ads (connector skip dates) (#5502)

* Fix issue 5411: Connector skipping dates

* bump version

Co-authored-by: MaxKrog <[email protected]>

Author: marcosmarxm

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/253487c0-2246-43ba-a21f-5116b20a2c50.json

@@ -2,6 +2,6 @@
   "sourceDefinitionId": "253487c0-2246-43ba-a21f-5116b20a2c50",
   "name": "Google Ads",
   "dockerRepository": "airbyte/source-google-ads",
-  "dockerImageTag": "0.1.6",
+  "dockerImageTag": "0.1.7",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/google-ads"
 }

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -28,7 +28,7 @@
 - sourceDefinitionId: 253487c0-2246-43ba-a21f-5116b20a2c50
   name: Google Ads
   dockerRepository: airbyte/source-google-ads
-  dockerImageTag: 0.1.6
+  dockerImageTag: 0.1.7
   documentationUrl: https://docs.airbyte.io/integrations/sources/google-ads
 - sourceDefinitionId: fdc8b827-3257-4b33-83cc-106d234c34d4
   name: Google Adwords (Deprecated)

airbyte-integrations/connectors/source-google-ads/Dockerfile

@@ -13,5 +13,5 @@ RUN pip install .
 
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.6
+LABEL io.airbyte.version=0.1.7
 LABEL io.airbyte.name=airbyte/source-google-ads

airbyte-integrations/connectors/source-google-ads/source_google_ads/source.py

@@ -33,7 +33,6 @@
 
 from .google_ads import GoogleAds
 from .streams import (
-    UserLocationReport,
     AccountPerformanceReport,
     Accounts,
     AdGroupAdReport,

airbyte-integrations/connectors/source-google-ads/source_google_ads/streams.py

@@ -193,6 +193,7 @@ class ShoppingPerformanceReport(IncrementalGoogleAdsStream):
     Google Ads API field mapping: https://developers.google.com/google-ads/api/docs/migration/mapping#shopping_performance
     """
 
+
 class UserLocationReport(IncrementalGoogleAdsStream):
     """
     UserLocationReport stream: https://developers.google.com/google-ads/api/fields/v8/user_location_view

airbyte-integrations/connectors/source-google-ads/unit_tests/test_google_ads.py

@@ -25,7 +25,9 @@
 from datetime import date
 import pendulum
 
+import pendulum
 from source_google_ads.google_ads import GoogleAds
+from source_google_ads.streams import IncrementalGoogleAdsStream, chunk_date_range
 
 from source_google_ads.streams import chunk_date_range
 from source_google_ads.streams import IncrementalGoogleAdsStream
@@ -132,6 +134,23 @@ def test_get_date_params():
 
     assert mock_start_date == start_date and mock_end_date == end_date
 
+def test_interval_chunking():
+    mock_intervals = [{"segments.date": "2021-05-18"}, {"segments.date": "2021-06-18"}, {"segments.date": "2021-07-18"}]
+    intervals = chunk_date_range("2021-06-01", 14, "segments.date", "2021-08-15")
+
+    assert mock_intervals == intervals
+
+
+def test_get_date_params():
+    mock_start_date = "2021-05-19"  # Please note that this is equal to inputted stream_slice start date + 1 day
+    mock_end_date = "2021-06-18"
+    start_date, end_date = IncrementalGoogleAdsStream.get_date_params(
+        stream_slice={"segments.date": "2021-05-18"}, cursor_field="segments.date", end_date=pendulum.parse("2021-08-15")
+    )
+
+    assert mock_start_date == start_date and mock_end_date == end_date
+
+
 def test_convert_schema_into_query():
     report_name = "ad_group_ad_report"
     query = "SELECT segment.date FROM ad_group_ad WHERE segments.date >= '2020-01-01' AND segments.date <= '2020-03-01' ORDER BY segments.date ASC"

docs/integrations/sources/google-ads.md

@@ -87,6 +87,7 @@ The Google Ads Query Language can query the Google Ads API. Check out [Google Ad
 
 | Version | Date | Pull Request | Subject |
 | :------ | :--------  | :-----       | :------ |
+| `0.1.7` | 2021-08-03 | [#5422](https://github.com/airbytehq/airbyte/pull/5422) | Correct query to not skip dates |
 | `0.1.6` | 2021-08-03 | [#5423](https://github.com/airbytehq/airbyte/pull/5423) | Added new stream UserLocationReport |
 | `0.1.5` | 2021-08-03 | [#5159](https://github.com/airbytehq/airbyte/pull/5159) | Add field `login_customer_id` to spec |
 | `0.1.4` | 2021-07-28 | [#4962](https://github.com/airbytehq/airbyte/pull/4962) | Support new Report streams |