Schema Fixes (#17)

* set order_refunds created_at to a date-time * make order_adjustments available and add to order_refunds
singer-io · Dec 3, 2018 · 324fc88 · 324fc88
1 parent 6439e8b
commit 324fc88
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 61 deletions.
diff --git a/tap_shopify/schemas/definitions.json b/tap_shopify/schemas/definitions.json
@@ -1,4 +1,60 @@
 {
+  "order_adjustments": {
+    "items": {
+      "properties": {
+        "order_id": {
+          "type": [
+            "null",
+            "integer"
+          ]
+        },
+        "tax_amount": {
+          "type": [
+            "null",
+            "number"
+          ]
+        },
+        "refund_id": {
+          "type": [
+            "null",
+            "integer"
+          ]
+        },
+        "amount": {
+          "type": [
+            "null",
+            "number"
+          ]
+        },
+        "kind": {
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "id": {
+          "type": [
+            "null",
+            "integer"
+          ]
+        },
+        "reason": {
+          "type": [
+            "null",
+            "string"
+          ]
+        }
+      },
+      "type": [
+        "null",
+        "object"
+      ]
+    },
+    "type": [
+      "null",
+      "array"
+    ]
+  },
   "customer": {
     "type": "object",
     "properties": {

diff --git a/tap_shopify/schemas/order_refunds.json b/tap_shopify/schemas/order_refunds.json
@@ -13,6 +13,9 @@
         "boolean"
       ]
     },
+    "order_adjustments": {
+      "$ref": "definitions.json#/order_adjustments"
+    },
     "processed_at": {
       "type": [
         "null",
@@ -38,7 +41,8 @@
       ]
     },
     "created_at": {
-      "type": "string"
+      "type": ["null", "string"],
+      "format": "date-time"
     },
     "admin_graphql_api_id": {
       "type": [

diff --git a/tap_shopify/schemas/orders.json b/tap_shopify/schemas/orders.json
@@ -1,62 +1,4 @@
 {
-  "definitions": {
-    "order_adjustments": {
-      "items": {
-        "properties": {
-          "order_id": {
-            "type": [
-              "null",
-              "integer"
-            ]
-          },
-          "tax_amount": {
-            "type": [
-              "null",
-              "number"
-            ]
-          },
-          "refund_id": {
-            "type": [
-              "null",
-              "integer"
-            ]
-          },
-          "amount": {
-            "type": [
-              "null",
-              "number"
-            ]
-          },
-          "kind": {
-            "type": [
-              "null",
-              "string"
-            ]
-          },
-          "id": {
-            "type": [
-              "null",
-              "integer"
-            ]
-          },
-          "reason": {
-            "type": [
-              "null",
-              "string"
-            ]
-          }
-        },
-        "type": [
-          "null",
-          "object"
-        ]
-      },
-      "type": [
-        "null",
-        "array"
-      ]
-    }
-  },
   "properties": {
     "presentment_currency": {
         "type": [
@@ -110,7 +52,7 @@
       ]
     },
     "order_adjustments": {
-      "$ref": "#/definitions/order_adjustments"
+      "$ref": "definitions.json#/order_adjustments"
     },
     "shipping_lines": {
       "items": {
@@ -1127,7 +1069,7 @@
             "format": "date-time"
           },
           "order_adjustments": {
-            "$ref": "#/definitions/order_adjustments"
+            "$ref": "definitions.json#/order_adjustments"
           }
         },
         "type": [