set primary keys back, testing showed non unique ids

Author: leslievandemark

tap_circle_ci/streams/context.py

@@ -18,7 +18,7 @@ class Context(CollaborationMixin, FullTableStream):
 
     stream = "context"
     tap_stream_id = "context"
-    key_properties = ["id"]
+    key_properties = ["id", "organization_id"]
     url_endpoint = "https://circleci.com/api/v2/context?owner-id={organization_id}&owner-type=organization"
     project = None
     parent_stream = "collaborations"

tap_circle_ci/streams/deploy.py

@@ -18,7 +18,7 @@ class Deploy(CollaborationMixin, IncrementalStream):
 
     stream = "deploy"
     tap_stream_id = "deploy"
-    key_properties = ["id"]
+    key_properties = ["id", "organization_id"]
     replication_key = "updated_at"
     valid_replication_keys = ["updated_at"]
     url_endpoint = "https://circleci.com/api/v2/deploy/environments?org-id={organization_id}&page-size={page_size}"

tap_circle_ci/streams/jobs.py

@@ -22,7 +22,7 @@ class Jobs(FullTableStream):
 
     stream = "jobs"
     tap_stream_id = "jobs"
-    key_properties = ["id"]
+    key_properties = ["id", "_workflow_id"]
     url_endpoint = "https://circleci.com/api/v2/workflow/WORKFLOW_ID/job"
     project = None
 

tap_circle_ci/streams/pipeline_definition.py

@@ -18,7 +18,7 @@ class PipelineDefinition(FullTableStream):
 
     stream = "pipeline_definition"
     tap_stream_id = "pipeline_definition"
-    key_properties = ["id"]
+    key_properties = ["id", "project_id", "organization_id"]
     url_endpoint = "https://circleci.com/api/v2/projects/{project_id}/pipeline-definitions"
     parent_stream = "project"
     requires_project = False

tap_circle_ci/streams/project.py

@@ -17,7 +17,7 @@ class Project(CollaborationMixin, FullTableStream):
 
     stream = "project"
     tap_stream_id = "project"
-    key_properties = ["id"]
+    key_properties = ["id", "organization_id"]
     url_endpoint = "https://circleci.com/api/private/project?organization-id={organization_id}"
     parent_stream = "collaborations"
     requires_project = False

tap_circle_ci/streams/trigger.py

@@ -18,7 +18,7 @@ class Trigger(FullTableStream):
 
     stream = "trigger"
     tap_stream_id = "trigger"
-    key_properties = ["id"]
+    key_properties = ["id", "project_id", "pipeline_definition_id"]
     parent_stream = "pipeline_definition"
     requires_project = False
 

tests/base.py

@@ -65,18 +65,18 @@ def expected_metadata(self):
                 self.OBEYS_START_DATE: True,
             },
             "jobs": {
-                self.PRIMARY_KEYS: {"id"},
+                self.PRIMARY_KEYS: {"id", "_workflow_id"},
                 self.REPLICATION_METHOD: self.FULL_TABLE,
                 self.OBEYS_START_DATE: False,
             },
             "context": {
-                self.PRIMARY_KEYS: {"id"},
+                self.PRIMARY_KEYS: {"id", "organization_id"},
                 self.REPLICATION_METHOD: self.FULL_TABLE,
                 self.OBEYS_START_DATE: False,
                 self.PARENT_TAP_STREAM_ID: "collaborations",
             },
             "deploy": {
-                self.PRIMARY_KEYS: {"id"},
+                self.PRIMARY_KEYS: {"id", "organization_id"},
                 self.REPLICATION_METHOD: self.INCREMENTAL,
                 self.REPLICATION_KEYS: {"updated_at"},
                 self.OBEYS_START_DATE: True,
@@ -89,13 +89,13 @@ def expected_metadata(self):
                 self.PARENT_TAP_STREAM_ID: "collaborations",
             },
             "pipeline_definition": {
-                self.PRIMARY_KEYS: {"id"},
+                self.PRIMARY_KEYS: {"id", "project_id", "organization_id"},
                 self.REPLICATION_METHOD: self.FULL_TABLE,
                 self.OBEYS_START_DATE: False,
                 self.PARENT_TAP_STREAM_ID: "project",
             },
             "project": {
-                self.PRIMARY_KEYS: {"id"},
+                self.PRIMARY_KEYS: {"id", "organization_id"},
                 self.REPLICATION_METHOD: self.FULL_TABLE,
                 self.OBEYS_START_DATE: False,
                 self.PARENT_TAP_STREAM_ID: "collaborations",
@@ -108,7 +108,7 @@ def expected_metadata(self):
                 self.PARENT_TAP_STREAM_ID: "project",
             },
             "trigger": {
-                self.PRIMARY_KEYS: {"id"},
+                self.PRIMARY_KEYS: {"id", "project_id", "pipeline_definition_id"},
                 self.REPLICATION_METHOD: self.FULL_TABLE,
                 self.OBEYS_START_DATE: False,
                 self.PARENT_TAP_STREAM_ID: "pipeline_definition",