bugfix/leap-year-lookback

CHANGELOG.md

@@ -1,3 +1,9 @@
+# dbt_xero v0.6.2
+[PR #46](https://github.com/fivetran/dbt_xero/pull/46) includes the following updates:
+
+## Bug Fixes
+- Update to the `xero__balance_sheet` model to ensure the calculated `current_year_end_date` field takes into account fiscal year ends which are occur on a leap year. To address this, if a lookback is required then the 28th of the previous year will be used to ensure an accurate date is used.
+
 # dbt_xero v0.6.1
 
 [PR #40](https://github.com/fivetran/dbt_xero/pull/40) includes the following updates:

dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'xero'
-version: '0.6.1'
+version: '0.6.2'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 vars:

integration_tests/ci/sample.profiles.yml

@@ -16,13 +16,13 @@ integration_tests:
       pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}"
       dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}"
       port: 5439
-      schema: xero_integration_tests_1
+      schema: xero_integration_tests_2
       threads: 8
     bigquery:
       type: bigquery
       method: service-account-json
       project: 'dbt-package-testing'
-      schema: xero_integration_tests_1
+      schema: xero_integration_tests_2
       threads: 8
       keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}"
     snowflake:
@@ -33,7 +33,7 @@ integration_tests:
       role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}"
       database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}"
       warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}"
-      schema: xero_integration_tests_1
+      schema: xero_integration_tests_2
       threads: 8
     postgres:
       type: postgres
@@ -42,13 +42,13 @@ integration_tests:
       pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}"
       dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}"
       port: 5432
-      schema: xero_integration_tests_1
+      schema: xero_integration_tests_2
       threads: 8
     databricks:
       catalog: "{{ env_var('CI_DATABRICKS_DBT_CATALOG') }}"
       host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}"
       http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}"
-      schema: xero_integration_tests_1
+      schema: xero_integration_tests_2
       threads: 8
       token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}"
       type: databricks

integration_tests/dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'xero_integration_tests'
-version: '0.6.1'
+version: '0.6.2'
 profile: 'integration_tests'
 config-version: 2
 vars:
@@ -13,7 +13,7 @@ vars:
     xero_organization_identifier: "xero_organization_data"
     xero_bank_transaction_identifier: "xero_bank_transaction_data"
     xero_credit_note_identifier: "xero_credit_note_data"
-    xero_schema: xero_integration_tests_1
+    xero_schema: xero_integration_tests_2
 
 dispatch:
   - macro_namespace: dbt_utils

integration_tests/seeds/xero_organization_data.csv

@@ -1,2 +1,2 @@
 organisation_id,financial_year_end_month,financial_year_end_day
-dab0e928-c82f-4c46-83fd-36ee9674d745,12,31
+dab0e928-c82f-4c46-83fd-36ee9674d745,2,29

models/xero__balance_sheet_report.sql

@@ -19,7 +19,10 @@ with calendar as (
         case
             when cast(extract(year from current_date) || '-' || financial_year_end_month || '-' || financial_year_end_day as date) >= current_date
             then cast(extract(year from current_date) || '-' || financial_year_end_month || '-' || financial_year_end_day as date)
-            else cast(extract(year from {{ dbt.dateadd('year', -1, 'current_date') }}) || '-' || financial_year_end_month || '-' || financial_year_end_day as date)
+            else case when financial_year_end_month = 2 and financial_year_end_day = 29 
+                then cast(extract(year from {{ dbt.dateadd('year', -1, 'current_date') }}) || '-' || financial_year_end_month || '-28' as date) -- Necessary for organizations with a reported fiscal year end of 02-29 as the previous year will not be a leap year and must be the 28th. 
+                else cast(extract(year from {{ dbt.dateadd('year', -1, 'current_date') }}) || '-' || financial_year_end_month || '-' || financial_year_end_day as date)
+            end
         end as current_year_end_date,
 		source_relation
     from organization