Merge branch 'issue-32871/test_application_fees' into issue-32871/tes…

…t_other_incremental_stripe_stream
airbytehq · Dec 15, 2023 · 9605ead · 9605ead
2 parents 542ddad + 8043e90
commit 9605ead
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 145 deletions.
diff --git a/...a/airbyte-cdk/db-sources/src/testFixtures/java/io/airbyte/cdk/testutils/TestDatabase.java b/...a/airbyte-cdk/db-sources/src/testFixtures/java/io/airbyte/cdk/testutils/TestDatabase.java
@@ -167,10 +167,13 @@ public Database getDatabase() {
     return new Database(getDslContext());
   }
 
-  protected void execSQL(Stream<String> sql) {
+  protected void execSQL(final Stream<String> sql) {
     try {
       getDatabase().query(ctx -> {
-        sql.forEach(ctx::execute);
+        sql.forEach(statement -> {
+          LOGGER.debug("{}", statement);
+          ctx.execute(statement);
+        });
         return null;
       });
     } catch (SQLException e) {

diff --git a/airbyte-integrations/connectors/source-linkedin-ads/integration_tests/expected_records.jsonl b/airbyte-integrations/connectors/source-linkedin-ads/integration_tests/expected_records.jsonl
@@ -4,10 +4,10 @@
 {"stream": "account_users", "data": {"role": "ACCOUNT_BILLING_ADMIN", "user": "urn:li:person:HRnXB4kIO7", "account": "urn:li:sponsoredAccount:508720451", "created": "2021-06-14T10:09:22+00:00", "lastModified": "2021-06-14T10:09:22+00:00"}, "emitted_at": 1697196559364}
 {"stream": "account_users", "data": {"role": "ACCOUNT_BILLING_ADMIN", "user": "urn:li:person:HRnXB4kIO7", "account": "urn:li:sponsoredAccount:508774356", "created": "2021-08-21T21:28:19+00:00", "lastModified": "2021-08-21T21:28:19+00:00"}, "emitted_at": 1697196559760}
 {"stream": "account_users", "data": {"role": "ACCOUNT_BILLING_ADMIN", "user": "urn:li:person:HRnXB4kIO7", "account": "urn:li:sponsoredAccount:508777244", "created": "2021-08-21T21:27:55+00:00", "lastModified": "2021-08-21T21:27:55+00:00"}, "emitted_at": 1697196560036}
-{"stream": "ad_campaign_analytics", "data": {"documentFirstQuartileCompletions": 0.0, "actionClicks": 0.0, "comments": 0.0, "costInUsd": -2e-18, "commentLikes": 0.0, "adUnitClicks": 0.0, "companyPageClicks": 0.0, "costInLocalCurrency": -2e-18, "conversionValueInLocalCurrency": 0.0, "documentThirdQuartileCompletions": 0.0, "externalWebsiteConversions": 0.0, "cardImpressions": 0.0, "documentCompletions": 0.0, "clicks": 0.0, "cardClicks": 0.0, "approximateUniqueImpressions": 0.0, "documentMidpointCompletions": 0.0, "downloadClicks": 0.0, "start_date": "2023-08-26", "end_date": "2023-08-26", "pivotValue": "urn:li:sponsoredCampaign:252074216", "externalWebsitePostClickConversions": 0.0, "externalWebsitePostViewConversions": 0.0, "postClickJobApplyClicks": 0.0, "oneClickLeads": 0.0, "landingPageClicks": 0.0, "fullScreenPlays": 0.0, "follows": 0.0, "oneClickLeadFormOpens": 0.0, "impressions": 1.0, "postClickJobApplications": 0.0, "otherEngagements": 0.0, "jobApplyClicks": 0.0, "jobApplications": 0.0, "leadGenerationMailContactInfoShares": 0.0, "opens": 0.0, "leadGenerationMailInterestedClicks": 0.0, "pivotValues": ["urn:li:sponsoredCampaign:252074216"], "likes": 0.0, "postClickRegistrations": 0.0}, "emitted_at": 1697196575455}
-{"stream": "ad_campaign_analytics", "data": {"documentFirstQuartileCompletions": 0.0, "actionClicks": 0.0, "comments": 0.0, "costInUsd": 100.00000000000004, "commentLikes": 0.0, "adUnitClicks": 0.0, "companyPageClicks": 0.0, "costInLocalCurrency": 100.00000000000004, "conversionValueInLocalCurrency": 0.0, "documentThirdQuartileCompletions": 0.0, "externalWebsiteConversions": 0.0, "cardImpressions": 0.0, "documentCompletions": 0.0, "clicks": 106.0, "cardClicks": 0.0, "approximateUniqueImpressions": 17392.0, "documentMidpointCompletions": 0.0, "downloadClicks": 0.0, "start_date": "2023-08-25", "end_date": "2023-08-25", "pivotValue": "urn:li:sponsoredCampaign:252074216", "externalWebsitePostClickConversions": 0.0, "externalWebsitePostViewConversions": 0.0, "postClickJobApplyClicks": 0.0, "oneClickLeads": 0.0, "landingPageClicks": 106.0, "fullScreenPlays": 0.0, "follows": 0.0, "oneClickLeadFormOpens": 0.0, "impressions": 19464.0, "postClickJobApplications": 0.0, "otherEngagements": 0.0, "jobApplyClicks": 0.0, "jobApplications": 0.0, "leadGenerationMailContactInfoShares": 0.0, "opens": 0.0, "leadGenerationMailInterestedClicks": 0.0, "pivotValues": ["urn:li:sponsoredCampaign:252074216"], "likes": 0.0, "postClickRegistrations": 0.0, "videoCompletions": 0.0, "registrations": 0.0, "talentLeads": 0.0, "viralCardImpressions": 0.0, "videoFirstQuartileCompletions": 0.0, "textUrlClicks": 0.0, "videoStarts": 0.0, "postViewJobApplyClicks": 0.0, "sends": 0.0, "shares": 0.0, "videoMidpointCompletions": 0.0, "validWorkEmailLeads": 0.0, "viralCardClicks": 0.0, "postViewRegistrations": 0.0, "videoThirdQuartileCompletions": 0.0, "totalEngagements": 106.0, "reactions": 0.0, "postViewJobApplications": 0.0, "videoViews": 0.0}, "emitted_at": 1697196575461}
-{"stream": "ad_creative_analytics", "data": {"documentFirstQuartileCompletions": 0.0, "actionClicks": 0.0, "comments": 0.0, "costInUsd": -2e-18, "commentLikes": 0.0, "adUnitClicks": 0.0, "companyPageClicks": 0.0, "costInLocalCurrency": -2e-18, "conversionValueInLocalCurrency": 0.0, "documentThirdQuartileCompletions": 0.0, "externalWebsiteConversions": 0.0, "cardImpressions": 0.0, "documentCompletions": 0.0, "clicks": 0.0, "cardClicks": 0.0, "approximateUniqueImpressions": 0.0, "documentMidpointCompletions": 0.0, "downloadClicks": 0.0, "start_date": "2023-08-26", "end_date": "2023-08-26", "pivotValue": "urn:li:sponsoredCreative:287513206", "externalWebsitePostClickConversions": 0.0, "externalWebsitePostViewConversions": 0.0, "postClickJobApplyClicks": 0.0, "oneClickLeads": 0.0, "landingPageClicks": 0.0, "fullScreenPlays": 0.0, "follows": 0.0, "oneClickLeadFormOpens": 0.0, "impressions": 1.0, "postClickJobApplications": 0.0, "otherEngagements": 0.0, "jobApplyClicks": 0.0, "jobApplications": 0.0, "leadGenerationMailContactInfoShares": 0.0, "opens": 0.0, "leadGenerationMailInterestedClicks": 0.0, "pivotValues": ["urn:li:sponsoredCreative:287513206"], "likes": 0.0, "postClickRegistrations": 0.0}, "emitted_at": 1697196599913}
-{"stream": "ad_creative_analytics", "data": {"documentFirstQuartileCompletions": 0.0, "actionClicks": 0.0, "comments": 0.0, "costInUsd": 100.00000000000004, "commentLikes": 0.0, "adUnitClicks": 0.0, "companyPageClicks": 0.0, "costInLocalCurrency": 100.00000000000004, "conversionValueInLocalCurrency": 0.0, "documentThirdQuartileCompletions": 0.0, "externalWebsiteConversions": 0.0, "cardImpressions": 0.0, "documentCompletions": 0.0, "clicks": 106.0, "cardClicks": 0.0, "approximateUniqueImpressions": 17392.0, "documentMidpointCompletions": 0.0, "downloadClicks": 0.0, "start_date": "2023-08-25", "end_date": "2023-08-25", "pivotValue": "urn:li:sponsoredCreative:287513206", "externalWebsitePostClickConversions": 0.0, "externalWebsitePostViewConversions": 0.0, "postClickJobApplyClicks": 0.0, "oneClickLeads": 0.0, "landingPageClicks": 106.0, "fullScreenPlays": 0.0, "follows": 0.0, "oneClickLeadFormOpens": 0.0, "impressions": 19464.0, "postClickJobApplications": 0.0, "otherEngagements": 0.0, "jobApplyClicks": 0.0, "jobApplications": 0.0, "leadGenerationMailContactInfoShares": 0.0, "opens": 0.0, "leadGenerationMailInterestedClicks": 0.0, "pivotValues": ["urn:li:sponsoredCreative:287513206"], "likes": 0.0, "postClickRegistrations": 0.0, "videoCompletions": 0.0, "registrations": 0.0, "talentLeads": 0.0, "viralCardImpressions": 0.0, "videoFirstQuartileCompletions": 0.0, "textUrlClicks": 0.0, "videoStarts": 0.0, "postViewJobApplyClicks": 0.0, "sends": 0.0, "shares": 0.0, "videoMidpointCompletions": 0.0, "validWorkEmailLeads": 0.0, "viralCardClicks": 0.0, "postViewRegistrations": 0.0, "videoThirdQuartileCompletions": 0.0, "totalEngagements": 106.0, "reactions": 0.0, "postViewJobApplications": 0.0, "videoViews": 0.0}, "emitted_at": 1697196599918}
+{"stream":"ad_campaign_analytics","data":{"documentFirstQuartileCompletions":0.0,"actionClicks":0.0,"comments":0.0,"costInUsd":-2E-18,"commentLikes":0.0,"adUnitClicks":0.0,"companyPageClicks":0.0,"costInLocalCurrency":-2E-18,"documentThirdQuartileCompletions":0.0,"externalWebsiteConversions":0.0,"cardImpressions":0.0,"documentCompletions":0.0,"clicks":0.0,"cardClicks":0.0,"approximateUniqueImpressions":0.0,"documentMidpointCompletions":0.0,"downloadClicks":0.0,"start_date":"2023-08-26","end_date":"2023-08-26","pivotValue":"urn:li:sponsoredCampaign:252074216","oneClickLeads":0.0,"landingPageClicks":0.0,"fullScreenPlays":0.0,"oneClickLeadFormOpens":0.0,"follows":0.0,"impressions":1.0,"otherEngagements":0.0,"leadGenerationMailContactInfoShares":0.0,"opens":0.0,"leadGenerationMailInterestedClicks":0.0,"pivotValues":["urn:li:sponsoredCampaign:252074216"],"likes":0.0},"emitted_at":1702655286996}
+{"stream":"ad_campaign_analytics","data":{"documentFirstQuartileCompletions":0.0,"actionClicks":0.0,"comments":0.0,"costInUsd":100.00000000000004,"commentLikes":0.0,"adUnitClicks":0.0,"companyPageClicks":0.0,"costInLocalCurrency":100.00000000000004,"documentThirdQuartileCompletions":0.0,"externalWebsiteConversions":0.0,"cardImpressions":0.0,"documentCompletions":0.0,"clicks":106.0,"cardClicks":0.0,"approximateUniqueImpressions":17392.0,"documentMidpointCompletions":0.0,"downloadClicks":0.0,"start_date":"2023-08-25","end_date":"2023-08-25","pivotValue":"urn:li:sponsoredCampaign:252074216","oneClickLeads":0.0,"landingPageClicks":106.0,"fullScreenPlays":0.0,"oneClickLeadFormOpens":0.0,"follows":0.0,"impressions":19464.0,"otherEngagements":0.0,"leadGenerationMailContactInfoShares":0.0,"opens":0.0,"leadGenerationMailInterestedClicks":0.0,"pivotValues":["urn:li:sponsoredCampaign:252074216"],"likes":0.0,"videoCompletions":0.0,"viralCardImpressions":0.0,"videoFirstQuartileCompletions":0.0,"textUrlClicks":0.0,"videoStarts":0.0,"sends":0.0,"shares":0.0,"videoMidpointCompletions":0.0,"validWorkEmailLeads":0.0,"viralCardClicks":0.0,"videoThirdQuartileCompletions":0.0,"totalEngagements":106.0,"reactions":0.0,"videoViews":0.0},"emitted_at":1702655287003}
+{"stream":"ad_creative_analytics","data":{"documentFirstQuartileCompletions":0.0,"actionClicks":0.0,"comments":0.0,"costInUsd":-2E-18,"commentLikes":0.0,"adUnitClicks":0.0,"companyPageClicks":0.0,"costInLocalCurrency":-2E-18,"documentThirdQuartileCompletions":0.0,"externalWebsiteConversions":0.0,"cardImpressions":0.0,"documentCompletions":0.0,"clicks":0.0,"cardClicks":0.0,"approximateUniqueImpressions":0.0,"documentMidpointCompletions":0.0,"downloadClicks":0.0,"start_date":"2023-08-26","end_date":"2023-08-26","pivotValue":"urn:li:sponsoredCreative:287513206","oneClickLeads":0.0,"landingPageClicks":0.0,"fullScreenPlays":0.0,"oneClickLeadFormOpens":0.0,"follows":0.0,"impressions":1.0,"otherEngagements":0.0,"leadGenerationMailContactInfoShares":0.0,"opens":0.0,"leadGenerationMailInterestedClicks":0.0,"pivotValues":["urn:li:sponsoredCreative:287513206"],"likes":0.0},"emitted_at":1702656821471}
+{"stream":"ad_creative_analytics","data":{"documentFirstQuartileCompletions":0.0,"actionClicks":0.0,"comments":0.0,"costInUsd":100.00000000000004,"commentLikes":0.0,"adUnitClicks":0.0,"companyPageClicks":0.0,"costInLocalCurrency":100.00000000000004,"documentThirdQuartileCompletions":0.0,"externalWebsiteConversions":0.0,"cardImpressions":0.0,"documentCompletions":0.0,"clicks":106.0,"cardClicks":0.0,"approximateUniqueImpressions":17392.0,"documentMidpointCompletions":0.0,"downloadClicks":0.0,"start_date":"2023-08-25","end_date":"2023-08-25","pivotValue":"urn:li:sponsoredCreative:287513206","oneClickLeads":0.0,"landingPageClicks":106.0,"fullScreenPlays":0.0,"oneClickLeadFormOpens":0.0,"follows":0.0,"impressions":19464.0,"otherEngagements":0.0,"leadGenerationMailContactInfoShares":0.0,"opens":0.0,"leadGenerationMailInterestedClicks":0.0,"pivotValues":["urn:li:sponsoredCreative:287513206"],"likes":0.0,"videoCompletions":0.0,"viralCardImpressions":0.0,"videoFirstQuartileCompletions":0.0,"textUrlClicks":0.0,"videoStarts":0.0,"sends":0.0,"shares":0.0,"videoMidpointCompletions":0.0,"validWorkEmailLeads":0.0,"viralCardClicks":0.0,"videoThirdQuartileCompletions":0.0,"totalEngagements":106.0,"reactions":0.0,"videoViews":0.0},"emitted_at":1702656821475}
 {"stream": "ad_impression_device_analytics", "data": {"documentFirstQuartileCompletions": 0.0, "actionClicks": 0.0, "comments": 0.0, "costInUsd": 2.29, "commentLikes": 0.0, "adUnitClicks": 0.0, "companyPageClicks": 0.0, "costInLocalCurrency": 2.29, "documentThirdQuartileCompletions": 0.0, "externalWebsiteConversions": 0.0, "cardImpressions": 0.0, "documentCompletions": 0.0, "clicks": 0.0, "cardClicks": 0.0, "documentMidpointCompletions": 0.0, "downloadClicks": 0.0, "start_date": "2023-08-25", "end_date": "2023-08-25", "pivotValue": "urn:li:sponsoredCampaign:252074216", "oneClickLeads": 0.0, "landingPageClicks": 0.0, "fullScreenPlays": 0.0, "oneClickLeadFormOpens": 0.0, "follows": 0.0, "impressions": 498.0, "otherEngagements": 0.0, "leadGenerationMailContactInfoShares": 0.0, "opens": 0.0, "leadGenerationMailInterestedClicks": 0.0, "pivotValues": ["UNDETECTED"], "likes": 0.0, "videoCompletions": 0.0, "viralCardImpressions": 0.0, "videoFirstQuartileCompletions": 0.0, "textUrlClicks": 0.0, "videoStarts": 0.0, "sends": 0.0, "shares": 0.0, "videoMidpointCompletions": 0.0, "validWorkEmailLeads": 0.0, "viralCardClicks": 0.0, "videoThirdQuartileCompletions": 0.0, "totalEngagements": 20.0, "reactions": 0.0, "videoViews": 0.0}, "emitted_at": 1697196622374}
 {"stream": "ad_impression_device_analytics", "data": {"documentFirstQuartileCompletions": 0.0, "actionClicks": 0.0, "comments": 0.0, "costInUsd": -2e-18, "commentLikes": 0.0, "adUnitClicks": 0.0, "companyPageClicks": 0.0, "costInLocalCurrency": -2e-18, "documentThirdQuartileCompletions": 0.0, "externalWebsiteConversions": 0.0, "cardImpressions": 0.0, "documentCompletions": 0.0, "clicks": 0.0, "cardClicks": 0.0, "documentMidpointCompletions": 0.0, "downloadClicks": 0.0, "start_date": "2023-08-26", "end_date": "2023-08-26", "pivotValue": "urn:li:sponsoredCampaign:252074216", "oneClickLeads": 0.0, "landingPageClicks": 0.0, "fullScreenPlays": 0.0, "oneClickLeadFormOpens": 0.0, "follows": 0.0, "impressions": 1.0, "otherEngagements": 0.0, "leadGenerationMailContactInfoShares": 0.0, "opens": 0.0, "leadGenerationMailInterestedClicks": 0.0, "pivotValues": ["MOBILE_WEB"], "likes": 0.0}, "emitted_at": 1697196622395}
 {"stream": "ad_member_company_size_analytics", "data": {"documentFirstQuartileCompletions": 0.0, "actionClicks": 0.0, "comments": 0.0, "costInUsd": 24.457317520310493, "commentLikes": 0.0, "adUnitClicks": 0.0, "companyPageClicks": 0.0, "costInLocalCurrency": 24.457317520310493, "documentThirdQuartileCompletions": 0.0, "externalWebsiteConversions": 0.0, "documentCompletions": 0.0, "clicks": 9.0, "documentMidpointCompletions": 0.0, "downloadClicks": 0.0, "start_date": "2023-08-25", "end_date": "2023-08-25", "pivotValue": "urn:li:sponsoredCampaign:252074216", "externalWebsitePostClickConversions": 0.0, "externalWebsitePostViewConversions": 0.0, "oneClickLeads": 0.0, "landingPageClicks": 9.0, "fullScreenPlays": 0.0, "follows": 0.0, "oneClickLeadFormOpens": 0.0, "impressions": 1480.0, "otherEngagements": 0.0, "leadGenerationMailContactInfoShares": 0.0, "opens": 0.0, "leadGenerationMailInterestedClicks": 0.0, "pivotValues": ["SIZE_2_TO_10"], "likes": 0.0, "videoCompletions": 0.0, "talentLeads": 0.0, "videoFirstQuartileCompletions": 0.0, "textUrlClicks": 0.0, "videoStarts": 0.0, "sends": 0.0, "shares": 0.0, "videoMidpointCompletions": 0.0, "validWorkEmailLeads": 0.0, "videoThirdQuartileCompletions": 0.0, "totalEngagements": 8.0, "reactions": 0.0, "videoViews": 0.0}, "emitted_at": 1697196644434}

diff --git a/airbyte-integrations/connectors/source-linkedin-ads/metadata.yaml b/airbyte-integrations/connectors/source-linkedin-ads/metadata.yaml
@@ -11,7 +11,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: 137ece28-5434-455c-8f34-69dc3782f451
-  dockerImageTag: 0.6.4
+  dockerImageTag: 0.6.5
   dockerRepository: airbyte/source-linkedin-ads
   documentationUrl: https://docs.airbyte.com/integrations/sources/linkedin-ads
   githubIssueLabel: source-linkedin-ads

diff --git a/airbyte-integrations/connectors/source-linkedin-ads/source_linkedin_ads/spec.json b/airbyte-integrations/connectors/source-linkedin-ads/source_linkedin_ads/spec.json
@@ -111,9 +111,9 @@
                 "MEMBER_COMPANY_SIZE",
                 "MEMBER_INDUSTRY",
                 "MEMBER_SENIORITY",
-                "MEMBER_JOB_TITLE ",
-                "MEMBER_JOB_FUNCTION ",
-                "MEMBER_COUNTRY_V2 ",
+                "MEMBER_JOB_TITLE",
+                "MEMBER_JOB_FUNCTION",
+                "MEMBER_COUNTRY_V2",
                 "MEMBER_REGION_V2",
                 "MEMBER_COMPANY",
                 "PLACEMENT_NAME",

diff --git a/airbyte-integrations/connectors/source-stripe/metadata.yaml b/airbyte-integrations/connectors/source-stripe/metadata.yaml
@@ -10,7 +10,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: e094cb9a-26de-4645-8761-65c0c425d1de
-  dockerImageTag: 5.1.0
+  dockerImageTag: 5.1.1
   dockerRepository: airbyte/source-stripe
   documentationUrl: https://docs.airbyte.com/integrations/sources/stripe
   githubIssueLabel: source-stripe

diff --git a/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py b/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py
@@ -202,7 +202,7 @@ def retry_factor(self) -> float:
         """
         Override for testing purposes
         """
-        return 0 if IS_TESTING else super().retry_factor()
+        return 0 if IS_TESTING else super(StripeStream, self).retry_factor
 
 
 class IStreamSelector(ABC):

diff --git a/airbyte-integrations/connectors/source-stripe/unit_tests/integration/request_builder.py b/airbyte-integrations/connectors/source-stripe/unit_tests/integration/request_builder.py
@@ -1,8 +1,10 @@
+# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
+
 from datetime import datetime
 from typing import List, Optional
 
-from airbyte_cdk.test.mock_http.request import ANY_QUERY_PARAMS
 from airbyte_cdk.test.mock_http import HttpRequest
+from airbyte_cdk.test.mock_http.request import ANY_QUERY_PARAMS
 
 
 class StripeRequestBuilder:

diff --git a/airbyte-integrations/connectors/source-stripe/unit_tests/integration/test_events.py b/airbyte-integrations/connectors/source-stripe/unit_tests/integration/test_events.py
@@ -25,7 +25,6 @@
 from integration.response_builder import a_response_with_status
 from source_stripe import SourceStripe
 
-
 _STREAM_NAME = "events"
 _NOW = datetime.now(timezone.utc)
 _A_START_DATE = _NOW - timedelta(days=60)

diff --git a/...nector-development/testing-connectors/testing-a-local-catalog-in-development.md b/...nector-development/testing-connectors/testing-a-local-catalog-in-development.md