From d547e43df616ece200457d99dd1e0735db965d9b Mon Sep 17 00:00:00 2001 From: prijendev Date: Fri, 24 Jun 2022 17:07:15 +0530 Subject: [PATCH 1/2] Added new fields into schemas. --- tap_xero/schemas/accounts.json | 6 ++ tap_xero/schemas/bank_transactions.json | 73 ++++++++++++++++++++++++- tap_xero/schemas/bank_transfers.json | 18 ++++++ tap_xero/schemas/contact_groups.json | 27 +++++++++ tap_xero/schemas/contacts.json | 24 ++++++++ tap_xero/schemas/credit_notes.json | 1 + tap_xero/schemas/invoices.json | 7 +++ tap_xero/schemas/organisations.json | 18 ++++++ tap_xero/schemas/payments.json | 71 ++++++++++++++++++++++++ tap_xero/schemas/tax_rates.json | 1 + 10 files changed, 245 insertions(+), 1 deletion(-) diff --git a/tap_xero/schemas/accounts.json b/tap_xero/schemas/accounts.json index ec03317..d28d79e 100644 --- a/tap_xero/schemas/accounts.json +++ b/tap_xero/schemas/accounts.json @@ -111,6 +111,12 @@ "null", "boolean" ] + }, + "AddToWatchlist": { + "type": [ + "null", + "boolean" + ] } }, "additionalProperties": false diff --git a/tap_xero/schemas/bank_transactions.json b/tap_xero/schemas/bank_transactions.json index fbe1eb0..d5eab14 100644 --- a/tap_xero/schemas/bank_transactions.json +++ b/tap_xero/schemas/bank_transactions.json @@ -25,6 +25,77 @@ "BankAccount": { "$ref": "accounts" }, + "BatchPayment": { + "type": [ + "null", + "object" + ], + "properties": { + "Account": { + "type": [ + "null", + "object" + ], + "properties": { + "AccountID": { + "type": [ + "null", + "string" + ] + } + } + }, + "BatchPaymentID": { + "type": [ + "null", + "string" + ] + }, + "Date": { + "type": [ + "null", + "string" + ], + "format": "date-time" + }, + "Type": { + "type": [ + "null", + "string" + ] + }, + "Status": { + "type": [ + "null", + "string" + ] + }, + "TotalAmount": { + "type": [ + "null", + "number" + ], + "minimum": -1e+33, + "maximum": 1e+33, + "multipleOf": 1e-06, + "exclusiveMinimum": true, + "exclusiveMaximum": true + }, + "UpdatedDateUTC": { + "type": [ + "null", + "string" + ], + "format": "date-time" + }, + "IsReconciled": { + "type": [ + "null", + "boolean" + ] + } + } + }, "IsReconciled": { "type": [ "null", @@ -162,4 +233,4 @@ "line_items" ], "additionalProperties": false -} +} \ No newline at end of file diff --git a/tap_xero/schemas/bank_transfers.json b/tap_xero/schemas/bank_transfers.json index 76b92c6..4e8467a 100644 --- a/tap_xero/schemas/bank_transfers.json +++ b/tap_xero/schemas/bank_transfers.json @@ -63,6 +63,24 @@ "string" ] }, + "FromIsReconciled ": { + "type": [ + "null", + "boolean" + ] + }, + "ToIsReconciled ": { + "type": [ + "null", + "boolean" + ] + }, + "Reference": { + "type": [ + "null", + "string" + ] + }, "HasAttachments": { "type": [ "null", diff --git a/tap_xero/schemas/contact_groups.json b/tap_xero/schemas/contact_groups.json index c172c01..eab748a 100644 --- a/tap_xero/schemas/contact_groups.json +++ b/tap_xero/schemas/contact_groups.json @@ -21,6 +21,33 @@ "string" ] }, + "Contacts": { + "type": [ + "null", + "array" + ], + "items": { + "properties": { + "ContactID": { + "type": [ + "null", + "string" + ] + }, + "Name": { + "type": [ + "null", + "string" + ] + } + }, + "type": [ + "null", + "object" + ], + "additionalProperties": false + } + }, "HasValidationErrors": { "type": [ "null", diff --git a/tap_xero/schemas/contacts.json b/tap_xero/schemas/contacts.json index e570ede..62291c4 100644 --- a/tap_xero/schemas/contacts.json +++ b/tap_xero/schemas/contacts.json @@ -27,6 +27,30 @@ "string" ] }, + "CompanyNumber":{ + "type": [ + "null", + "number" + ] + }, + "MergedToContactID ": { + "type": [ + "null", + "string" + ] + }, + "SalesDefaultLineAmountType": { + "type": [ + "null", + "string" + ] + }, + "PurchasesDefaultLineAmountType": { + "type": [ + "null", + "string" + ] + }, "Name": { "type": [ "null", diff --git a/tap_xero/schemas/credit_notes.json b/tap_xero/schemas/credit_notes.json index 949bb3e..7ae0f88 100644 --- a/tap_xero/schemas/credit_notes.json +++ b/tap_xero/schemas/credit_notes.json @@ -99,6 +99,7 @@ "exclusiveMinimum": true, "exclusiveMaximum": true }, + "CISDeduction": {}, "UpdatedDateUTC": { "format": "date-time", "type": [ diff --git a/tap_xero/schemas/invoices.json b/tap_xero/schemas/invoices.json index bf11104..3f136d7 100644 --- a/tap_xero/schemas/invoices.json +++ b/tap_xero/schemas/invoices.json @@ -185,6 +185,13 @@ "boolean" ] }, + "RepeatingInvoiceID": { + "type": [ + "null", + "string" + ] + }, + "CISDeduction": {}, "Payments": { "type": [ "null", diff --git a/tap_xero/schemas/organisations.json b/tap_xero/schemas/organisations.json index 5b1347d..dec397d 100644 --- a/tap_xero/schemas/organisations.json +++ b/tap_xero/schemas/organisations.json @@ -70,6 +70,12 @@ "string" ] }, + "EmployerIdentificationNumber": { + "type": [ + "null", + "string" + ] + }, "TaxNumber": { "type": [ "null", @@ -156,6 +162,18 @@ "string" ] }, + "Edition": { + "type": [ + "null", + "string" + ] + }, + "Class": { + "type": [ + "null", + "string" + ] + }, "LineOfBusiness": { "type": [ "null", diff --git a/tap_xero/schemas/payments.json b/tap_xero/schemas/payments.json index 72ac426..4ef8ac7 100644 --- a/tap_xero/schemas/payments.json +++ b/tap_xero/schemas/payments.json @@ -146,6 +146,77 @@ "string" ] }, + "BatchPayment": { + "type": [ + "null", + "object" + ], + "properties": { + "Account": { + "type": [ + "null", + "object" + ], + "properties": { + "AccountID": { + "type": [ + "null", + "string" + ] + } + } + }, + "BatchPaymentID": { + "type": [ + "null", + "string" + ] + }, + "Date": { + "type": [ + "null", + "string" + ], + "format": "date-time" + }, + "Type": { + "type": [ + "null", + "string" + ] + }, + "Status": { + "type": [ + "null", + "string" + ] + }, + "TotalAmount": { + "type": [ + "null", + "number" + ], + "minimum": -1e+33, + "maximum": 1e+33, + "multipleOf": 1e-06, + "exclusiveMinimum": true, + "exclusiveMaximum": true + }, + "UpdatedDateUTC": { + "type": [ + "null", + "string" + ], + "format": "date-time" + }, + "IsReconciled": { + "type": [ + "null", + "boolean" + ] + } + } + }, "HasAccount": { "type": [ "null", diff --git a/tap_xero/schemas/tax_rates.json b/tap_xero/schemas/tax_rates.json index 059f381..50de543 100644 --- a/tap_xero/schemas/tax_rates.json +++ b/tap_xero/schemas/tax_rates.json @@ -15,6 +15,7 @@ "string" ] }, + "ElementsForTaxComponents": {}, "TaxComponents": { "type": [ "null", From b0d6fc204e69e1028da6766a4094da623368780c Mon Sep 17 00:00:00 2001 From: prijendev Date: Tue, 28 Jun 2022 16:26:21 +0530 Subject: [PATCH 2/2] Added new fields into schemas. --- tap_xero/schemas/bank_transactions.json | 73 +------------------------ tap_xero/schemas/batch_payment.json | 72 ++++++++++++++++++++++++ tap_xero/schemas/branding_themes.json | 11 ++++ tap_xero/schemas/payments.json | 73 +------------------------ tap_xero/schemas/tax_rates.json | 1 - 5 files changed, 89 insertions(+), 141 deletions(-) create mode 100644 tap_xero/schemas/batch_payment.json diff --git a/tap_xero/schemas/bank_transactions.json b/tap_xero/schemas/bank_transactions.json index d5eab14..e004c96 100644 --- a/tap_xero/schemas/bank_transactions.json +++ b/tap_xero/schemas/bank_transactions.json @@ -26,75 +26,7 @@ "$ref": "accounts" }, "BatchPayment": { - "type": [ - "null", - "object" - ], - "properties": { - "Account": { - "type": [ - "null", - "object" - ], - "properties": { - "AccountID": { - "type": [ - "null", - "string" - ] - } - } - }, - "BatchPaymentID": { - "type": [ - "null", - "string" - ] - }, - "Date": { - "type": [ - "null", - "string" - ], - "format": "date-time" - }, - "Type": { - "type": [ - "null", - "string" - ] - }, - "Status": { - "type": [ - "null", - "string" - ] - }, - "TotalAmount": { - "type": [ - "null", - "number" - ], - "minimum": -1e+33, - "maximum": 1e+33, - "multipleOf": 1e-06, - "exclusiveMinimum": true, - "exclusiveMaximum": true - }, - "UpdatedDateUTC": { - "type": [ - "null", - "string" - ], - "format": "date-time" - }, - "IsReconciled": { - "type": [ - "null", - "boolean" - ] - } - } + "$ref": "batch_payment" }, "IsReconciled": { "type": [ @@ -230,7 +162,8 @@ "tap_schema_dependencies": [ "accounts", "contacts", - "line_items" + "line_items", + "batch_payment" ], "additionalProperties": false } \ No newline at end of file diff --git a/tap_xero/schemas/batch_payment.json b/tap_xero/schemas/batch_payment.json new file mode 100644 index 0000000..ec7546b --- /dev/null +++ b/tap_xero/schemas/batch_payment.json @@ -0,0 +1,72 @@ +{ + "type": [ + "null", + "object" + ], + "properties": { + "Account": { + "type": [ + "null", + "object" + ], + "properties": { + "AccountID": { + "type": [ + "null", + "string" + ] + } + } + }, + "BatchPaymentID": { + "type": [ + "null", + "string" + ] + }, + "Date": { + "type": [ + "null", + "string" + ], + "format": "date-time" + }, + "Type": { + "type": [ + "null", + "string" + ] + }, + "Status": { + "type": [ + "null", + "string" + ] + }, + "TotalAmount": { + "type": [ + "null", + "number" + ], + "minimum": -1e+33, + "maximum": 1e+33, + "multipleOf": 1e-06, + "exclusiveMinimum": true, + "exclusiveMaximum": true + }, + "UpdatedDateUTC": { + "type": [ + "null", + "string" + ], + "format": "date-time" + }, + "IsReconciled": { + "type": [ + "null", + "boolean" + ] + } + }, + "additionalProperties": false +} \ No newline at end of file diff --git a/tap_xero/schemas/branding_themes.json b/tap_xero/schemas/branding_themes.json index 7064e5e..caeb224 100644 --- a/tap_xero/schemas/branding_themes.json +++ b/tap_xero/schemas/branding_themes.json @@ -27,6 +27,17 @@ "type": [ "string" ] + }, + "LogoUrl": { + "type": [ + "string" + ] + }, + "Type": { + "type": [ + "null", + "string" + ] } }, "additionalProperties": false diff --git a/tap_xero/schemas/payments.json b/tap_xero/schemas/payments.json index 4ef8ac7..4e07d12 100644 --- a/tap_xero/schemas/payments.json +++ b/tap_xero/schemas/payments.json @@ -147,75 +147,7 @@ ] }, "BatchPayment": { - "type": [ - "null", - "object" - ], - "properties": { - "Account": { - "type": [ - "null", - "object" - ], - "properties": { - "AccountID": { - "type": [ - "null", - "string" - ] - } - } - }, - "BatchPaymentID": { - "type": [ - "null", - "string" - ] - }, - "Date": { - "type": [ - "null", - "string" - ], - "format": "date-time" - }, - "Type": { - "type": [ - "null", - "string" - ] - }, - "Status": { - "type": [ - "null", - "string" - ] - }, - "TotalAmount": { - "type": [ - "null", - "number" - ], - "minimum": -1e+33, - "maximum": 1e+33, - "multipleOf": 1e-06, - "exclusiveMinimum": true, - "exclusiveMaximum": true - }, - "UpdatedDateUTC": { - "type": [ - "null", - "string" - ], - "format": "date-time" - }, - "IsReconciled": { - "type": [ - "null", - "boolean" - ] - } - } + "$ref": "batch_payment" }, "HasAccount": { "type": [ @@ -232,7 +164,8 @@ }, "tap_schema_dependencies": [ "accounts", - "nested_invoice" + "nested_invoice", + "batch_payment" ], "additionalProperties": false } diff --git a/tap_xero/schemas/tax_rates.json b/tap_xero/schemas/tax_rates.json index 50de543..059f381 100644 --- a/tap_xero/schemas/tax_rates.json +++ b/tap_xero/schemas/tax_rates.json @@ -15,7 +15,6 @@ "string" ] }, - "ElementsForTaxComponents": {}, "TaxComponents": { "type": [ "null",