Feature/remove dbt date (#191)

* feature/remove-dbt-date

* add week_end

* update for snowflake

* update yml

* rename macros

* formatting

* update chagenlog, readme, versions

* changelog

* Apply suggestions from code review

Co-authored-by: Jamie Rodriguez <[email protected]>

---------

Co-authored-by: Jamie Rodriguez <[email protected]>

Author: fivetran-catfritz

CHANGELOG.md

@@ -1,4 +1,11 @@
-# dbt_zendesk version.version
+# dbt_zendesk v0.21.0
+
+This release includes the following updates:
+
+## Dependency Changes
+- Removed the package dependency on [calogica/dbt_date](https://github.com/calogica/dbt-date), which is no longer actively maintained. Replaced the following macros with `fivetran_*` equivalents that provide the same functionality and have been tested for compatibility: ([#191](https://github.com/fivetran/dbt_zendesk/pull/191))
+  - `dbt_date.week_end` → `zendesk.fivetran_week_end`
+  - `dbt_date.week_start` → `zendesk.fivetran_week_start`
 
 ## Documentation
 - Added Quickstart model counts to README. ([#183](https://github.com/fivetran/dbt_zendesk/pull/183))

README.md

@@ -68,7 +68,7 @@ Include the following zendesk package version in your `packages.yml` file:
 ```yml
 packages:
   - package: fivetran/zendesk
-    version: [">=0.20.0", "<0.21.0"]
+    version: [">=0.21.0", "<0.22.0"]
 
 ```
 > **Note**: Do not include the Zendesk Support source package. The Zendesk Support transform package already has a dependency on the source in its own `packages.yml` file.
@@ -304,9 +304,6 @@ packages:
 
     - package: dbt-labs/spark_utils
       version: [">=0.3.0", "<0.4.0"]
-
-    - package: calogica/dbt_date
-      version: [">=0.9.0", "<1.0.0"]
 ```
 ## How is this package maintained and can I contribute?
 ### Package Maintenance

dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'zendesk'
-version: '0.20.0'
+version: '0.21.0'
 
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]

integration_tests/dbt_project.yml

@@ -1,7 +1,7 @@
 config-version: 2
 
 name: 'zendesk_integration_tests'
-version: '0.20.0'
+version: '0.21.0'
 
 profile: 'integration_tests'
 

macros/fivetran_week_end.sql

@@ -0,0 +1,19 @@
+{%- macro fivetran_week_end(dt) -%}
+{{ return(adapter.dispatch('fivetran_week_end', 'zendesk') (dt)) }}
+{%- endmacro -%}
+
+{%- macro default__fivetran_week_end(dt) -%}
+{{ dbt.last_day(dt, 'week') }}
+{%- endmacro %}
+
+{%- macro snowflake__fivetran_week_end(dt) -%}
+cast({{ dbt.dateadd('day', 6, zendesk.fivetran_week_start(dt)) }} as date)
+{%- endmacro %}
+
+{%- macro postgres__fivetran_week_end(dt) -%}
+cast({{ dbt.dateadd('day', 6, zendesk.fivetran_week_start(dt)) }} as date)
+{%- endmacro %}
+
+{%- macro duckdb__fivetran_week_end(dt) -%}
+{{ return(zendesk.postgres__fivetran_week_end(dt)) }}
+{%- endmacro %}

macros/fivetran_week_start.sql

@@ -0,0 +1,26 @@
+{%- macro fivetran_week_start(dt) -%}
+{{ return(adapter.dispatch('fivetran_week_start', 'zendesk') (dt)) }}
+{%- endmacro -%}
+
+{%- macro default__fivetran_week_start(dt) -%}
+cast({{ dbt.date_trunc('week', dt) }} as date)
+{%- endmacro %}
+
+{%- macro snowflake__fivetran_week_start(dt) -%}
+-- Adjust week start to Sunday
+cast(
+    case 
+        when dayofweekiso({{ dt }}) = 7 then {{ dt }} -- dayofweekiso returns 7 for Sunday
+        else {{ dbt.dateadd("day", "-1 * dayofweekiso(" ~ dt ~ ")", dt) }}
+    end
+as date)
+{%- endmacro %}
+
+{%- macro postgres__fivetran_week_start(dt) -%}
+-- Sunday as week start date
+cast({{ dbt.dateadd('day', -1, dbt.date_trunc('week', dbt.dateadd('day', 1, dt))) }} as date)
+{%- endmacro %}
+
+{%- macro duckdb__fivetran_week_start(dt) -%}
+{{ return(zendesk.postgres__fivetran_week_start(dt)) }}
+{%- endmacro %}

models/agent_work_time/int_zendesk__ticket_work_time_business.sql

@@ -50,7 +50,7 @@ with ticket_historical_status as (
       status_valid_starting_at,
       status_valid_ending_at,
     ({{ dbt.datediff(
-            "cast(" ~ dbt_date.week_start('ticket_status_crossed_with_schedule.status_schedule_start','UTC') ~ "as " ~ dbt.type_timestamp() ~ ")", 
+            "cast(" ~ zendesk.fivetran_week_start('ticket_status_crossed_with_schedule.status_schedule_start') ~ "as " ~ dbt.type_timestamp() ~ ")", 
             "cast(ticket_status_crossed_with_schedule.status_schedule_start as " ~ dbt.type_timestamp() ~ ")",
             'second') }} /60
           ) as start_time_in_minutes_from_week,
@@ -59,7 +59,7 @@ with ticket_historical_status as (
               'ticket_status_crossed_with_schedule.status_schedule_end',
               'second') }} /60
             ) as raw_delta_in_minutes,
-    {{ dbt_date.week_start('ticket_status_crossed_with_schedule.status_schedule_start','UTC') }} as start_week_date
+    {{ zendesk.fivetran_week_start('ticket_status_crossed_with_schedule.status_schedule_start') }} as start_week_date
 
     from ticket_status_crossed_with_schedule
     {{ dbt_utils.group_by(n=8) }}

models/intermediate/int_zendesk__schedule_holiday.sql

@@ -16,8 +16,8 @@ with schedule as (
         schedule_id,
         cast({{ dbt.date_trunc('day', 'holiday_start_date_at') }} as {{ dbt.type_timestamp() }}) as holiday_valid_from,
         cast({{ dbt.date_trunc('day', 'holiday_end_date_at') }}  as {{ dbt.type_timestamp() }}) as holiday_valid_until,
-        cast({{ dbt_date.week_start('holiday_start_date_at','UTC') }} as {{ dbt.type_timestamp() }}) as holiday_starting_sunday,
-        cast({{ dbt_date.week_start(dbt.dateadd('week', 1, 'holiday_end_date_at'),'UTC') }} as {{ dbt.type_timestamp() }}) as holiday_ending_sunday,
+        cast({{ zendesk.fivetran_week_start('holiday_start_date_at') }} as {{ dbt.type_timestamp() }}) as holiday_starting_sunday,
+        cast({{ zendesk.fivetran_week_start(dbt.dateadd('week', 1, 'holiday_end_date_at')) }} as {{ dbt.type_timestamp() }}) as holiday_ending_sunday,
         -- Since the spine is based on weeks, holidays that span multiple weeks need to be broken up in to weeks. First step is to find those holidays.
         {{ dbt.datediff('holiday_start_date_at', 'holiday_end_date_at', 'week') }} + 1 as holiday_weeks_spanned
     from schedule_holiday

models/intermediate/int_zendesk__schedule_timezones.sql

@@ -277,9 +277,9 @@ with split_timezones as (
         end_time_utc,
         schedule_valid_from,
         schedule_valid_until,
-        -- use dbt_date.week_start to ensure we truncate to Sunday
-        cast({{ dbt_date.week_start('schedule_valid_from','UTC') }} as {{ dbt.type_timestamp() }}) as schedule_starting_sunday,
-        cast({{ dbt_date.week_start('schedule_valid_until','UTC') }} as {{ dbt.type_timestamp() }}) as schedule_ending_sunday,
+        -- use zendesk.fivetran_week_start to ensure we truncate to Sunday
+        cast({{ zendesk.fivetran_week_start('schedule_valid_from') }} as {{ dbt.type_timestamp() }}) as schedule_starting_sunday,
+        cast({{ zendesk.fivetran_week_start('schedule_valid_until') }} as {{ dbt.type_timestamp() }}) as schedule_ending_sunday,
         -- Check if the start fo the schedule was from a schedule or timezone change for tracking downstream.
         case when schedule_valid_from = timezone_valid_from
             then 'timezone'

models/reply_times/int_zendesk__ticket_first_reply_time_business.sql

@@ -40,7 +40,7 @@ with ticket_reply_times as (
     min(first_reply_time.agent_responded_at) as agent_responded_at,
 
     ({{ dbt.datediff(
-            "cast(" ~ dbt_date.week_start('ticket_schedules.schedule_created_at','UTC') ~ "as " ~ dbt.type_timestamp() ~ ")", 
+            "cast(" ~ zendesk.fivetran_week_start('ticket_schedules.schedule_created_at') ~ "as " ~ dbt.type_timestamp() ~ ")", 
             "cast(ticket_schedules.schedule_created_at as " ~ dbt.type_timestamp() ~ ")",
             'second') }} /60
           ) as start_time_in_minutes_from_week,
@@ -51,7 +51,7 @@ with ticket_reply_times as (
           'least(ticket_schedules.schedule_invalidated_at, min(first_reply_time.agent_responded_at))',
           'second') }}/60
         )) as raw_delta_in_minutes,
-    {{ dbt_date.week_start('ticket_schedules.schedule_created_at','UTC') }} as start_week_date
+    {{ zendesk.fivetran_week_start('ticket_schedules.schedule_created_at') }} as start_week_date
 
   from first_reply_time
   join ticket_schedules 

models/resolution_times/int_zendesk__ticket_first_resolution_time_business.sql

@@ -28,7 +28,7 @@ with ticket_resolution_times_calendar as (
     min(ticket_resolution_times_calendar.first_solved_at) as first_solved_at,
 
     ({{ dbt.datediff(
-            "cast(" ~ dbt_date.week_start('ticket_schedules.schedule_created_at','UTC') ~ "as " ~ dbt.type_timestamp() ~ ")", 
+            "cast(" ~ zendesk.fivetran_week_start('ticket_schedules.schedule_created_at') ~ "as " ~ dbt.type_timestamp() ~ ")", 
             "cast(ticket_schedules.schedule_created_at as " ~ dbt.type_timestamp() ~ ")",
             'second') }} /60
           ) as start_time_in_minutes_from_week,
@@ -39,7 +39,7 @@ with ticket_resolution_times_calendar as (
           'least(ticket_schedules.schedule_invalidated_at, min(ticket_resolution_times_calendar.first_solved_at))',
           'second') }}/60
         )) as raw_delta_in_minutes,
-    {{ dbt_date.week_start('ticket_schedules.schedule_created_at','UTC') }} as start_week_date
+    {{ zendesk.fivetran_week_start('ticket_schedules.schedule_created_at') }} as start_week_date
 
   from ticket_resolution_times_calendar
   join ticket_schedules 

models/resolution_times/int_zendesk__ticket_full_resolution_time_business.sql

@@ -27,7 +27,7 @@ with ticket_resolution_times_calendar as (
     -- bringing this in the determine which schedule (Daylight Savings vs Standard time) to use
     min(ticket_resolution_times_calendar.last_solved_at) as last_solved_at,
     ({{ dbt.datediff(
-            "cast(" ~ dbt_date.week_start('ticket_schedules.schedule_created_at','UTC') ~ "as " ~ dbt.type_timestamp() ~ ")", 
+            "cast(" ~ zendesk.fivetran_week_start('ticket_schedules.schedule_created_at') ~ "as " ~ dbt.type_timestamp() ~ ")", 
             "cast(ticket_schedules.schedule_created_at as " ~ dbt.type_timestamp() ~ ")",
             'second') }} /60
           ) as start_time_in_minutes_from_week,
@@ -38,7 +38,7 @@ with ticket_resolution_times_calendar as (
           'least(ticket_schedules.schedule_invalidated_at, min(ticket_resolution_times_calendar.last_solved_at))',
           'second') }}/60
         )) as raw_delta_in_minutes,
-    {{ dbt_date.week_start('ticket_schedules.schedule_created_at','UTC') }} as start_week_date
+    {{ zendesk.fivetran_week_start('ticket_schedules.schedule_created_at') }} as start_week_date
 
   from ticket_resolution_times_calendar
   join ticket_schedules 

models/sla_policy/agent_work_time/int_zendesk__agent_work_time_business_hours.sql

@@ -62,7 +62,7 @@ with agent_work_time_filtered_statuses as (
       status_valid_starting_at,
       status_valid_ending_at,
       ({{ dbt.datediff(
-              "cast(" ~ dbt_date.week_start('ticket_status_crossed_with_schedule.valid_starting_at','UTC') ~ "as " ~ dbt.type_timestamp() ~ ")", 
+              "cast(" ~ zendesk.fivetran_week_start('ticket_status_crossed_with_schedule.valid_starting_at') ~ "as " ~ dbt.type_timestamp() ~ ")", 
               "cast(ticket_status_crossed_with_schedule.valid_starting_at as " ~ dbt.type_timestamp() ~ ")",
               'second') }} /60
             ) as valid_starting_at_in_minutes_from_week,
@@ -71,7 +71,7 @@ with agent_work_time_filtered_statuses as (
                 'ticket_status_crossed_with_schedule.valid_ending_at',
                 'second') }} /60
               ) as raw_delta_in_minutes,
-    {{ dbt_date.week_start('ticket_status_crossed_with_schedule.valid_starting_at','UTC') }} as start_week_date
+    {{ zendesk.fivetran_week_start('ticket_status_crossed_with_schedule.valid_starting_at') }} as start_week_date
 
     from ticket_status_crossed_with_schedule
     {{ dbt_utils.group_by(n=11) }}
@@ -187,7 +187,7 @@ with agent_work_time_filtered_statuses as (
     {{ fivetran_utils.timestamp_add(
       "minute",
       "cast(((7*24*60) * week_number) + breach_minutes_from_week as " ~ dbt.type_int() ~ " )",
-      "cast(" ~ dbt_date.week_start('valid_starting_at','UTC') ~ " as " ~ dbt.type_timestamp() ~ " )"
+      "cast(" ~ zendesk.fivetran_week_start('valid_starting_at') ~ " as " ~ dbt.type_timestamp() ~ " )"
       ) }} as sla_breach_at
   from intercepted_periods_agent_filtered
 )

models/sla_policy/reply_time/int_zendesk__reply_time_business_hours.sql

@@ -66,12 +66,12 @@ with ticket_schedules as (
     sla_policy_applied.*,
     ticket_schedules.schedule_id,
     ({{ dbt.datediff(
-            "cast(" ~ dbt_date.week_start('sla_policy_applied.sla_applied_at','UTC') ~ "as " ~ dbt.type_timestamp() ~ ")", 
+            "cast(" ~ zendesk.fivetran_week_start('sla_policy_applied.sla_applied_at') ~ "as " ~ dbt.type_timestamp() ~ ")", 
             "cast(sla_policy_applied.sla_applied_at as " ~ dbt.type_timestamp() ~ ")",
             'second') }} /60
           ) as start_time_in_minutes_from_week,
       schedule_business_hours.total_schedule_weekly_business_minutes,
-    {{ dbt_date.week_start('sla_policy_applied.sla_applied_at','UTC') }} as start_week_date
+    {{ zendesk.fivetran_week_start('sla_policy_applied.sla_applied_at') }} as start_week_date
 
   from sla_policy_applied
   left join ticket_schedules on sla_policy_applied.ticket_id = ticket_schedules.ticket_id
@@ -183,20 +183,20 @@ with ticket_schedules as (
   select
     *,
     schedule_end_time + remaining_minutes as breached_at_minutes,
-    {{ dbt_date.week_start('sla_applied_at','UTC') }} as starting_point,
+    {{ zendesk.fivetran_week_start('sla_applied_at') }} as starting_point,
     {{ fivetran_utils.timestamp_add(
         "minute",
         "cast(((7*24*60) * week_number) + (schedule_end_time + remaining_minutes) as " ~ dbt.type_int() ~ " )",
-        "cast(" ~ dbt_date.week_start('sla_applied_at','UTC') ~ " as " ~ dbt.type_timestamp() ~ ")" ) }} as sla_breach_at,
+        "cast(" ~ zendesk.fivetran_week_start('sla_applied_at') ~ " as " ~ dbt.type_timestamp() ~ ")" ) }} as sla_breach_at,
     {{ fivetran_utils.timestamp_add(
         "minute",
         "cast(((7*24*60) * week_number) + (schedule_start_time) as " ~ dbt.type_int() ~ " )",
-        "cast(" ~ dbt_date.week_start('sla_applied_at','UTC') ~ " as " ~ dbt.type_timestamp() ~ ")" ) }} as sla_schedule_start_at,
+        "cast(" ~ zendesk.fivetran_week_start('sla_applied_at') ~ " as " ~ dbt.type_timestamp() ~ ")" ) }} as sla_schedule_start_at,
     {{ fivetran_utils.timestamp_add(
         "minute",
         "cast(((7*24*60) * week_number) + (schedule_end_time) as " ~ dbt.type_int() ~ " )",
-        "cast(" ~ dbt_date.week_start('sla_applied_at','UTC') ~ " as " ~ dbt.type_timestamp() ~ ")" ) }} as sla_schedule_end_at,
-    {{ dbt_date.week_end("sla_applied_at", tz="America/UTC") }} as week_end_date
+        "cast(" ~ zendesk.fivetran_week_start('sla_applied_at') ~ " as " ~ dbt.type_timestamp() ~ ")" ) }} as sla_schedule_end_at,
+    {{ zendesk.fivetran_week_end("sla_applied_at") }} as week_end_date
   from intercepted_periods_with_breach_flag
 
 ), reply_time_business_hours_sla as (

models/sla_policy/requester_wait_time/int_zendesk__requester_wait_time_business_hours.sql

@@ -62,7 +62,7 @@ with requester_wait_time_filtered_statuses as (
       status_valid_starting_at,
       status_valid_ending_at,
       ({{ dbt.datediff(
-            "cast(" ~ dbt_date.week_start('ticket_status_crossed_with_schedule.valid_starting_at','UTC') ~ "as " ~ dbt.type_timestamp() ~ ")", 
+            "cast(" ~ zendesk.fivetran_week_start('ticket_status_crossed_with_schedule.valid_starting_at') ~ "as " ~ dbt.type_timestamp() ~ ")", 
             "cast(ticket_status_crossed_with_schedule.valid_starting_at as " ~ dbt.type_timestamp() ~ ")",
             'second') }} /60
           ) as valid_starting_at_in_minutes_from_week,
@@ -71,7 +71,7 @@ with requester_wait_time_filtered_statuses as (
               'ticket_status_crossed_with_schedule.valid_ending_at',
               'second') }} /60
             ) as raw_delta_in_minutes,
-    {{ dbt_date.week_start('ticket_status_crossed_with_schedule.valid_starting_at','UTC') }} as start_week_date
+    {{ zendesk.fivetran_week_start('ticket_status_crossed_with_schedule.valid_starting_at') }} as start_week_date
 
     from ticket_status_crossed_with_schedule
     {{ dbt_utils.group_by(n=11) }}
@@ -187,7 +187,7 @@ with requester_wait_time_filtered_statuses as (
     {{ fivetran_utils.timestamp_add(
       "minute",
       "cast(((7*24*60) * week_number) + breach_minutes_from_week as " ~ dbt.type_int() ~ " )",
-      "cast(" ~ dbt_date.week_start('valid_starting_at','UTC') ~ " as " ~ dbt.type_timestamp() ~ " )"
+      "cast(" ~ zendesk.fivetran_week_start('valid_starting_at') ~ " as " ~ dbt.type_timestamp() ~ " )"
       ) }} as sla_breach_at
   from intercepted_periods_agent_filtered
 

packages.yml

@@ -1,6 +1,3 @@
 packages:
   - package: fivetran/zendesk_source
-    version: [">=0.15.0", "<0.16.0"]
-
-  - package: calogica/dbt_date
-    version: [">=0.9.0", "<1.0.0"]
+    version: [">=0.15.0", "<0.16.0"]