Merge pull request #110 from fivetran/try_v0.12.0

copy contents from v0.10.2 plus whitespace addditions
fivetran · Sep 8, 2023 · 2b1a6d5 · 2b1a6d5
2 parents 86e87d0 + 3b46adc
commit 2b1a6d5
Show file tree

Hide file tree

Showing 24 changed files with 63 additions and 356 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# dbt_zendesk v0.11.2
+
+## Rollback
+This [PR #110](https://github.com/fivetran/dbt_zendesk/pull/110/files) is a rollback to v0.10.2. We are seeing issues in business minutes and SLA duplicate records following the v0.11.0 release.
+
 # dbt_zendesk v0.11.1
 
 Tiny release ahead!
@@ -8,6 +13,9 @@ Tiny release ahead!
 - [@bcolbert978](https://github.com/bcolbert978) ([PR #106](https://github.com/fivetran/dbt_zendesk/pull/106))
 
 # dbt_zendesk v0.11.0
+
+## Update: There have been bugs identified in this release and we have rolled back this package to v0.10.2 in the v0.11.2 release.
+
 ## Feature Updates:
 - Added support of the new `schedule_holiday` table in the `schedule_spine` intermediate model in order to properly capture how holidays impact ticket schedules and their respective SLAs. ([PR #98](https://github.com/fivetran/dbt_zendesk/pull/98))
 - Made relevant downstream changes within the following models to capture proper business hour metrics when taking into account holiday schedules: ([PR #98](https://github.com/fivetran/dbt_zendesk/pull/98))
@@ -179,4 +187,4 @@ Tiny release ahead!
 - [csaroff](https://github.com/csaroff) ([#47](https://github.com/fivetran/dbt_zendesk/pull/47))
 - [jackiexsun](https://github.com/jackiexsun) ([#42](https://github.com/fivetran/dbt_zendesk/pull/42))
 - [emiliedecherney](https://github.com/emiliedecherney) ([#50](https://github.com/fivetran/dbt_zendesk/pull/50))
-- [gareginordyan](https://github.com/gareginordyan) ([#44](https://github.com/fivetran/dbt_zendesk/pull/44))
+- [gareginordyan](https://github.com/gareginordyan) ([#44](https://github.com/fivetran/dbt_zendesk/pull/44))
diff --git a/README.md b/README.md
@@ -177,7 +177,7 @@ This dbt package is dependent on the following dbt packages. Please be aware tha
 ```yml
 packages:
     - package: fivetran/zendesk_source
-      version: [">=0.9.0", "<0.10.0"]
+      version: [">=0.8.0", "<0.9.0"]
 
     - package: fivetran/fivetran_utils
       version: [">=0.4.0", "<0.5.0"]

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'zendesk'
-version: '0.11.1'
+version: '0.11.2'
 
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
@@ -35,7 +35,6 @@ vars:
     organization_tag: "{{ ref('stg_zendesk__organization_tag') }}"
     organization: "{{ ref('stg_zendesk__organization') }}"
     schedule: "{{ ref('stg_zendesk__schedule') }}"
-    schedule_holiday: "{{ ref('stg_zendesk__schedule_holiday') }}"
     ticket: "{{ ref('stg_zendesk__ticket') }}"
     ticket_form_history: "{{ ref('stg_zendesk__ticket_form_history') }}"
     ticket_comment: "{{ ref('stg_zendesk__ticket_comment') }}"

diff --git a/docs/catalog.json b/docs/catalog.json
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/docs/run_results.json b/docs/run_results.json
diff --git a/integration_tests/.gitignore b/integration_tests/.gitignore
@@ -3,5 +3,4 @@ target/
 dbt_modules/
 logs/
 .DS_Store
-dbt_packages/
-env/
+dbt_packages/
diff --git a/integration_tests/ci/sample.profiles.yml b/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: zendesk_integration_tests_1
+      schema: zendesk_integration_tests_2
       threads: 8
     bigquery:
       type: bigquery
       method: service-account-json
       project: 'dbt-package-testing'
-      schema: zendesk_integration_tests_1
+      schema: zendesk_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: zendesk_integration_tests_1
+      schema: zendesk_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: zendesk_integration_tests_1
+      schema: zendesk_integration_tests_2
       threads: 8
     databricks:
       catalog: null
       host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}"
       http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}"
-      schema: zendesk_integration_tests_1
-      threads: 2
+      schema: zendesk_integration_tests_2
+      threads: 8
       token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}"
       type: databricks
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,16 +1,16 @@
 config-version: 2
 
 name: 'zendesk_integration_tests'
-version: '0.11.1'
+version: '0.11.2'
+
 
 profile: 'integration_tests'
 
 vars:
-  zendesk_schema: zendesk_integration_tests_1
+  zendesk_schema: zendesk_integration_tests_2
   zendesk_source:
     zendesk_organization_identifier:           "organization_data"
     zendesk_schedule_identifier:               "schedule_data"
-    zendesk_schedule_holiday_identifier:       "schedule_holiday_data"
     zendesk_ticket_identifier:                 "ticket_data"
     zendesk_ticket_comment_identifier:         "ticket_comment_data"
     zendesk_ticket_field_history_identifier:   "ticket_field_history_data"
@@ -49,10 +49,6 @@ seeds:
         end_time_utc: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}"
         start_time_utc: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}"
         created_at: timestamp
-    schedule_holiday_data:
-      +column_types:
-        id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}"
-        schedule_id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}"
     ticket_comment_data:
       +column_types:
         id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}"

diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt
@@ -1,6 +1,6 @@
 dbt-snowflake>=1.3.0,<2.0.0
 dbt-bigquery>=1.3.0,<2.0.0
-dbt-redshift>=1.3.0,<1.5.0
+dbt-redshift>=1.3.0,<2.0.0
 dbt-postgres>=1.3.0,<2.0.0
 dbt-spark>=1.3.0,<2.0.0
 dbt-spark[PyHive]>=1.3.0,<2.0.0

diff --git a/integration_tests/seeds/schedule_holiday_data.csv b/integration_tests/seeds/schedule_holiday_data.csv
diff --git a/models/agent_work_time/int_zendesk__ticket_work_time_business.sql b/models/agent_work_time/int_zendesk__ticket_work_time_business.sql
@@ -113,11 +113,7 @@ with ticket_historical_status as (
       case when ticket_status in ('new', 'open') then scheduled_minutes
           else 0 end as agent_work_time_in_minutes,
       case when ticket_status in ('hold') then scheduled_minutes
-          else 0 end as on_hold_time_in_minutes,
-      case when ticket_status = 'new' then scheduled_minutes
-          else 0 end as new_status_duration_minutes,
-      case when ticket_status = 'open' then scheduled_minutes
-          else 0 end as open_status_duration_minutes
+          else 0 end as on_hold_time_in_minutes
     from intercepted_periods
 
 )
@@ -127,8 +123,6 @@ with ticket_historical_status as (
       sum(agent_wait_time_in_minutes) as agent_wait_time_in_business_minutes,
       sum(requester_wait_time_in_minutes) as requester_wait_time_in_business_minutes,
       sum(agent_work_time_in_minutes) as agent_work_time_in_business_minutes,
-      sum(on_hold_time_in_minutes) as on_hold_time_in_business_minutes,
-      sum(new_status_duration_minutes) as new_status_duration_in_business_minutes,
-      sum(open_status_duration_minutes) as open_status_duration_in_business_minutes
+      sum(on_hold_time_in_minutes) as on_hold_time_in_business_minutes
     from business_minutes
     group by 1
diff --git a/models/intermediate/int_zendesk__comment_metrics.sql b/models/intermediate/int_zendesk__comment_metrics.sql
@@ -31,11 +31,7 @@ comment_counts as (
         count(*) as total_comments,
         count(distinct case when commenter_role = 'internal_comment'
             then user_id
-                end) as count_ticket_handoffs,
-        sum(case when commenter_role = 'internal_comment' and is_public = true and previous_commenter_role != 'first_comment'
-            then 1
-            else 0
-                end) as count_agent_replies
+                end) as count_ticket_handoffs
     from ticket_comments
 
     group by 1, 2