Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎉 Source Shopify: convert prices into numbers #5244

Merged
merged 22 commits into from
Sep 17, 2021
Merged

🎉 Source Shopify: convert prices into numbers #5244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bfb8a80
Source Shopify #4841 - update schemas, transform root properties
vitaliizazmic Aug 5, 2021
a37c12b
Source Shopify #4841 - transform nested properties
vitaliizazmic Aug 6, 2021
1ef3d85
Merge branch 'master' into vitalii/4841_shopify_prices_into_numbers
vitaliizazmic Aug 6, 2021
4409209
Source Shopify #4841 - ignore transforming for null values
vitaliizazmic Aug 9, 2021
de53799
Merge branch 'master' into vitalii/4841_shopify_prices_into_numbers
vitaliizazmic Aug 16, 2021
5aae64b
Source Shopify #4841 - improving according to PR review
vitaliizazmic Aug 17, 2021
fe8e8b3
Source Shopify #4841 - create transformer
vitaliizazmic Aug 18, 2021
45c10a7
Source Shopify #4841 - reformat
vitaliizazmic Aug 18, 2021
8adaeb0
Source Shopify #4841 - reformat(fix)
vitaliizazmic Aug 18, 2021
7c18eb9
Source Shopify #4841 - improving extracting schemas type
vitaliizazmic Aug 18, 2021
89d1a92
Merge branch 'master' into vitalii/4841_shopify_prices_into_numbers
vitaliizazmic Sep 3, 2021
2a95129
Source Shopify #4841 - unit tests for transform solution
vitaliizazmic Sep 7, 2021
311a65b
Merge branch 'master' into vitalii/4841_shopify_prices_into_numbers
vitaliizazmic Sep 7, 2021
26524c2
Source Shopify #4841 - reformat
vitaliizazmic Sep 7, 2021
87b31bd
Source Shopify - fix according to review
vitaliizazmic Sep 13, 2021
83bb970
Source Shopify - fix DRY
vitaliizazmic Sep 13, 2021
251db75
Source Shopify - fix orders schema (add type)
vitaliizazmic Sep 14, 2021
e553c16
Source Shopify - fixing according to PR review
vitaliizazmic Sep 16, 2021
dec7e76
Merge branch 'master' into vitalii/4841_shopify_prices_into_numbers
vitaliizazmic Sep 17, 2021
5f2b977
Source Shopify - bump version
vitaliizazmic Sep 17, 2021
38352ed
Source Shopify - update changelogs
vitaliizazmic Sep 17, 2021
4018784
Merge branch 'master' into vitalii/4841_shopify_prices_into_numbers
vitaliizazmic Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ain/resources/config/STANDARD_SOURCE_DEFINITION/9da77001-af33-4bcd-be46-6252bf9342b9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "9da77001-af33-4bcd-be46-6252bf9342b9",
"name": "Shopify",
"dockerRepository": "airbyte/source-shopify",
"dockerImageTag": "0.1.16",
"dockerImageTag": "0.1.17",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/shopify"
}
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
- sourceDefinitionId: 9da77001-af33-4bcd-be46-6252bf9342b9
name: Shopify
dockerRepository: airbyte/source-shopify
dockerImageTag: 0.1.16
dockerImageTag: 0.1.17
documentationUrl: https://docs.airbyte.io/integrations/sources/shopify
- sourceDefinitionId: e87ffa8e-a3b5-f69c-9076-6011339de1f6
name: Redshift
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-shopify/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ COPY source_shopify ./source_shopify
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.16
LABEL io.airbyte.version=0.1.17
LABEL io.airbyte.name=airbyte/source-shopify
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-shopify/acceptance-test-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tests:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
timeout_seconds: 1200
incremental:
incremental:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
future_state_path: "integration_tests/abnormal_state.json"
Expand Down
28 changes: 14 additions & 14 deletions ...te-integrations/connectors/source-shopify/source_shopify/schemas/abandoned_checkouts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"properties": {
"price_set": {},
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"title": {
"type": ["null", "string"]
Expand All @@ -143,7 +143,7 @@
"type": ["null", "array"]
},
"total_line_items_price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"closed_at": {
"type": ["null", "string"],
Expand All @@ -165,10 +165,10 @@
"type": ["null", "string"]
},
"total_tax": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"subtotal_price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"line_items": {
"items": {
Expand All @@ -181,7 +181,7 @@
"type": ["null", "integer"]
},
"compare_at_price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"destination_location_id": {
"type": ["null", "integer"]
Expand All @@ -190,7 +190,7 @@
"type": ["null", "string"]
},
"line_price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"origin_location_id": {
"type": ["null", "integer"]
Expand Down Expand Up @@ -237,7 +237,7 @@
},
"amount_set": {},
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
}
},
"type": ["null", "object"]
Expand Down Expand Up @@ -283,7 +283,7 @@
"properties": {
"price_set": {},
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"title": {
"type": ["null", "string"]
Expand Down Expand Up @@ -338,7 +338,7 @@
"type": ["null", "object"]
},
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"requires_shipping": {
"type": ["null", "boolean"]
Expand Down Expand Up @@ -399,7 +399,7 @@
"type": ["null", "string"]
},
"total_discounts": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"note": {
"type": ["null", "string"]
Expand Down Expand Up @@ -430,7 +430,7 @@
"type": ["null", "integer"]
},
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"requested_fulfillment_service_id": {
"type": ["null", "string"]
Expand All @@ -446,7 +446,7 @@
"properties": {
"price_set": {},
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"title": {
"type": ["null", "string"]
Expand Down Expand Up @@ -630,7 +630,7 @@
"type": ["null", "boolean"]
},
"total_spent": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"last_order_id": {
"type": ["null", "integer"]
Expand Down Expand Up @@ -746,7 +746,7 @@
}
},
"total_price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"cart_token": {
"type": ["null", "string"]
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-shopify/source_shopify/schemas/customers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"type": ["null", "boolean"]
},
"total_spent": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"last_order_id": {
"type": ["null", "integer"]
Expand Down
36 changes: 18 additions & 18 deletions airbyte-integrations/connectors/source-shopify/source_shopify/schemas/draft_orders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"type": ["null", "string"]
},
"total_spent": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"last_order_id": {
"type": ["null", "integer"]
Expand Down Expand Up @@ -359,7 +359,7 @@
}
},
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"price_set": {
"type": ["null", "object"],
Expand All @@ -368,7 +368,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -379,7 +379,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand Down Expand Up @@ -413,7 +413,7 @@
"type": ["null", "string"]
},
"total_discount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"total_discount_set": {
"type": ["null", "object"],
Expand All @@ -422,7 +422,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -433,7 +433,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -460,7 +460,7 @@
"type": ["null", "object"],
"properties": {
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"price_set": {
"type": ["null", "object"],
Expand All @@ -469,7 +469,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -480,7 +480,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand Down Expand Up @@ -515,7 +515,7 @@
"type": ["null", "object"],
"properties": {
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"rate": {
"type": ["null", "number"]
Expand All @@ -530,7 +530,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -541,7 +541,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -559,7 +559,7 @@
"discounted_price_set": {},
"price_set": {},
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"title": {
"type": ["null", "string"]
Expand Down Expand Up @@ -614,7 +614,7 @@
"type": ["null", "object"],
"properties": {
"price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"rate": {
"type": ["null", "number"]
Expand All @@ -629,7 +629,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -640,7 +640,7 @@
"type": ["null", "object"],
"properties": {
"amount": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"currency_code": {
"type": ["null", "string"]
Expand All @@ -662,7 +662,7 @@
"type": ["null", "boolean"]
},
"total_price": {
"type": ["null", "string"]
"type": ["null", "number"]
},
"completed_at": {
"type": ["null", "string"],
Expand Down
Loading