🎉 Source Shopify: convert prices into numbers

* Source Shopify #4841 - update schemas, transform root properties * Source Shopify #4841 - transform nested properties * Source Shopify #4841 - ignore transforming for null values * Source Shopify #4841 - improving according to PR review * Source Shopify #4841 - create transformer * Source Shopify #4841 - reformat * Source Shopify #4841 - reformat(fix) * Source Shopify #4841 - improving extracting schemas type * Source Shopify #4841 - unit tests for transform solution * Source Shopify #4841 - reformat * Source Shopify - fix according to review * Source Shopify - fix DRY * Source Shopify - fix orders schema (add type) * Source Shopify - fixing according to PR review * Source Shopify - bump version * Source Shopify - update changelogs
airbytehq · Sep 17, 2021 · e04623f · e04623f
1 parent 4625d90
commit e04623f
Show file tree

Hide file tree

Showing 16 changed files with 529 additions and 123 deletions.
diff --git a/...ain/resources/config/STANDARD_SOURCE_DEFINITION/9da77001-af33-4bcd-be46-6252bf9342b9.json b/...ain/resources/config/STANDARD_SOURCE_DEFINITION/9da77001-af33-4bcd-be46-6252bf9342b9.json
@@ -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"
 }
diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
@@ -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

diff --git a/airbyte-integrations/connectors/source-shopify/Dockerfile b/airbyte-integrations/connectors/source-shopify/Dockerfile
@@ -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
diff --git a/airbyte-integrations/connectors/source-shopify/acceptance-test-config.yml b/airbyte-integrations/connectors/source-shopify/acceptance-test-config.yml
@@ -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"

diff --git a/...te-integrations/connectors/source-shopify/source_shopify/schemas/abandoned_checkouts.json b/...te-integrations/connectors/source-shopify/source_shopify/schemas/abandoned_checkouts.json
@@ -117,7 +117,7 @@
         "properties": {
           "price_set": {},
           "price": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "title": {
             "type": ["null", "string"]
@@ -143,7 +143,7 @@
       "type": ["null", "array"]
     },
     "total_line_items_price": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     },
     "closed_at": {
       "type": ["null", "string"],
@@ -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": {
@@ -181,7 +181,7 @@
             "type": ["null", "integer"]
           },
           "compare_at_price": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "destination_location_id": {
             "type": ["null", "integer"]
@@ -190,7 +190,7 @@
             "type": ["null", "string"]
           },
           "line_price": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "origin_location_id": {
             "type": ["null", "integer"]
@@ -237,7 +237,7 @@
                 },
                 "amount_set": {},
                 "amount": {
-                  "type": ["null", "string"]
+                  "type": ["null", "number"]
                 }
               },
               "type": ["null", "object"]
@@ -283,7 +283,7 @@
               "properties": {
                 "price_set": {},
                 "price": {
-                  "type": ["null", "string"]
+                  "type": ["null", "number"]
                 },
                 "title": {
                   "type": ["null", "string"]
@@ -338,7 +338,7 @@
             "type": ["null", "object"]
           },
           "price": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "requires_shipping": {
             "type": ["null", "boolean"]
@@ -399,7 +399,7 @@
       "type": ["null", "string"]
     },
     "total_discounts": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     },
     "note": {
       "type": ["null", "string"]
@@ -430,7 +430,7 @@
             "type": ["null", "integer"]
           },
           "price": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "requested_fulfillment_service_id": {
             "type": ["null", "string"]
@@ -446,7 +446,7 @@
               "properties": {
                 "price_set": {},
                 "price": {
-                  "type": ["null", "string"]
+                  "type": ["null", "number"]
                 },
                 "title": {
                   "type": ["null", "string"]
@@ -630,7 +630,7 @@
           "type": ["null", "boolean"]
         },
         "total_spent": {
-          "type": ["null", "string"]
+          "type": ["null", "number"]
         },
         "last_order_id": {
           "type": ["null", "integer"]
@@ -746,7 +746,7 @@
       }
     },
     "total_price": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     },
     "cart_token": {
       "type": ["null", "string"]

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/customers.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/customers.json
@@ -79,7 +79,7 @@
       "type": ["null", "boolean"]
     },
     "total_spent": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     },
     "last_order_id": {
       "type": ["null", "integer"]

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/draft_orders.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/draft_orders.json
@@ -42,7 +42,7 @@
           "type": ["null", "string"]
         },
         "total_spent": {
-          "type": ["null", "string"]
+          "type": ["null", "number"]
         },
         "last_order_id": {
           "type": ["null", "integer"]
@@ -359,7 +359,7 @@
             }
           },
           "price": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "price_set": {
             "type": ["null", "object"],
@@ -368,7 +368,7 @@
                 "type": ["null", "object"],
                 "properties": {
                   "amount": {
-                    "type": ["null", "string"]
+                    "type": ["null", "number"]
                   },
                   "currency_code": {
                     "type": ["null", "string"]
@@ -379,7 +379,7 @@
                 "type": ["null", "object"],
                 "properties": {
                   "amount": {
-                    "type": ["null", "string"]
+                    "type": ["null", "number"]
                   },
                   "currency_code": {
                     "type": ["null", "string"]
@@ -413,7 +413,7 @@
             "type": ["null", "string"]
           },
           "total_discount": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "total_discount_set": {
             "type": ["null", "object"],
@@ -422,7 +422,7 @@
                 "type": ["null", "object"],
                 "properties": {
                   "amount": {
-                    "type": ["null", "string"]
+                    "type": ["null", "number"]
                   },
                   "currency_code": {
                     "type": ["null", "string"]
@@ -433,7 +433,7 @@
                 "type": ["null", "object"],
                 "properties": {
                   "amount": {
-                    "type": ["null", "string"]
+                    "type": ["null", "number"]
                   },
                   "currency_code": {
                     "type": ["null", "string"]
@@ -460,7 +460,7 @@
               "type": ["null", "object"],
               "properties": {
                 "price": {
-                  "type": ["null", "string"]
+                  "type": ["null", "number"]
                 },
                 "price_set": {
                   "type": ["null", "object"],
@@ -469,7 +469,7 @@
                       "type": ["null", "object"],
                       "properties": {
                         "amount": {
-                          "type": ["null", "string"]
+                          "type": ["null", "number"]
                         },
                         "currency_code": {
                           "type": ["null", "string"]
@@ -480,7 +480,7 @@
                       "type": ["null", "object"],
                       "properties": {
                         "amount": {
-                          "type": ["null", "string"]
+                          "type": ["null", "number"]
                         },
                         "currency_code": {
                           "type": ["null", "string"]
@@ -515,7 +515,7 @@
             "type": ["null", "object"],
             "properties": {
               "price": {
-                "type": ["null", "string"]
+                "type": ["null", "number"]
               },
               "rate": {
                 "type": ["null", "number"]
@@ -530,7 +530,7 @@
                     "type": ["null", "object"],
                     "properties": {
                       "amount": {
-                        "type": ["null", "string"]
+                        "type": ["null", "number"]
                       },
                       "currency_code": {
                         "type": ["null", "string"]
@@ -541,7 +541,7 @@
                     "type": ["null", "object"],
                     "properties": {
                       "amount": {
-                        "type": ["null", "string"]
+                        "type": ["null", "number"]
                       },
                       "currency_code": {
                         "type": ["null", "string"]
@@ -559,7 +559,7 @@
         "discounted_price_set": {},
         "price_set": {},
         "price": {
-          "type": ["null", "string"]
+          "type": ["null", "number"]
         },
         "title": {
           "type": ["null", "string"]
@@ -614,7 +614,7 @@
         "type": ["null", "object"],
         "properties": {
           "price": {
-            "type": ["null", "string"]
+            "type": ["null", "number"]
           },
           "rate": {
             "type": ["null", "number"]
@@ -629,7 +629,7 @@
                 "type": ["null", "object"],
                 "properties": {
                   "amount": {
-                    "type": ["null", "string"]
+                    "type": ["null", "number"]
                   },
                   "currency_code": {
                     "type": ["null", "string"]
@@ -640,7 +640,7 @@
                 "type": ["null", "object"],
                 "properties": {
                   "amount": {
-                    "type": ["null", "string"]
+                    "type": ["null", "number"]
                   },
                   "currency_code": {
                     "type": ["null", "string"]
@@ -662,7 +662,7 @@
       "type": ["null", "boolean"]
     },
     "total_price": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     },
     "completed_at": {
       "type": ["null", "string"],