Feature/add union data

CHANGELOG.md

@@ -1,3 +1,8 @@
+# dbt_zendesk v0.14.0
+
+## 🎉 Feature Update 🎉 
+This release supports running the package on multiple Zendesk sources at once! See the [README](https://github.com/fivetran/dbt_zendesk?tab=readme-ov-file#step-3-define-database-and-schema-variables) for details on how to leverage this feature ([PR #132](https://github.com/fivetran/dbt_zendesk/pull/132)).
+
 # dbt_zendesk v0.13.1
 
 [PR #128](https://github.com/fivetran/dbt_zendesk/pull/128) includes the following changes:

dbt_project.yml

@@ -1,6 +1,5 @@
 name: 'zendesk'
-version: '0.13.1'
-
+version: '0.14.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.13.1'
+version: '0.14.0'
 
 profile: 'integration_tests'
 

models/agent_work_time/int_zendesk__ticket_work_time_business.sql

@@ -19,6 +19,7 @@ with ticket_historical_status as (
 
     select
       ticket_historical_status.ticket_id,
+      ticket_historical_status.source_relation,
       ticket_historical_status.status as ticket_status,
       ticket_schedules.schedule_id,
 
@@ -33,13 +34,15 @@ with ticket_historical_status as (
     from ticket_historical_status
     left join ticket_schedules
       on ticket_historical_status.ticket_id = ticket_schedules.ticket_id
+      and ticket_historical_status.source_relation = ticket_schedules.source_relation
       -- making sure there is indeed real overlap
       where {{ dbt.datediff('greatest(valid_starting_at, schedule_created_at)', 'least(valid_ending_at, schedule_invalidated_at)', 'second') }} > 0
 
 ), ticket_full_solved_time as (
 
     select 
       ticket_id,
+      source_relation,
       ticket_status,
       schedule_id,
       status_schedule_start,
@@ -59,7 +62,7 @@ with ticket_historical_status as (
     {{ dbt_date.week_start('ticket_status_crossed_with_schedule.status_schedule_start','UTC') }} as start_week_date
 
     from ticket_status_crossed_with_schedule
-    {{ dbt_utils.group_by(n=7) }}
+    {{ dbt_utils.group_by(n=8) }}
 
 ), weeks as (
 
@@ -90,6 +93,7 @@ with ticket_historical_status as (
 
     select 
       weekly_periods.ticket_id,
+      weekly_periods.source_relation,
       weekly_periods.week_number,
       weekly_periods.schedule_id,
       weekly_periods.ticket_status,
@@ -103,6 +107,7 @@ with ticket_historical_status as (
       ticket_week_start_time <= schedule.end_time_utc 
       and ticket_week_end_time >= schedule.start_time_utc
       and weekly_periods.schedule_id = schedule.schedule_id
+      and weekly_periods.source_relation = schedule.source_relation
       -- this chooses the Daylight Savings Time or Standard Time version of the schedule
       -- We have everything calculated within a week, so take us to the appropriate week first by adding the week_number * minutes-in-a-week to the minute-mark where we start and stop counting for the week
       and cast( {{ dbt.dateadd(datepart='minute', interval='week_number * (7*24*60) + ticket_week_end_time', from_date_or_timestamp='start_week_date') }} as {{ dbt.type_timestamp() }}) > cast(schedule.valid_from as {{ dbt.type_timestamp() }})
@@ -112,6 +117,7 @@ with ticket_historical_status as (
 
     select 
       ticket_id,
+      source_relation,
       ticket_status,
       case when ticket_status in ('pending') then scheduled_minutes
           else 0 end as agent_wait_time_in_minutes,
@@ -133,6 +139,7 @@ with ticket_historical_status as (
 
     select 
       ticket_id,
+      source_relation,
       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(solve_time_in_minutes) as solve_time_in_business_minutes,
@@ -141,4 +148,4 @@ with ticket_historical_status as (
       sum(new_status_duration_minutes) as new_status_duration_in_business_minutes,
       sum(open_status_duration_minutes) as open_status_duration_in_business_minutes
     from business_minutes
-    group by 1
+    group by 1,2

models/agent_work_time/int_zendesk__ticket_work_time_calendar.sql

@@ -7,6 +7,7 @@ with ticket_historical_status as (
 
     select 
         ticket_id,
+        source_relation,
         status,
         case when status in ('pending') then status_duration_calendar_minutes
             else 0 end as agent_wait_time_in_minutes,
@@ -24,8 +25,8 @@ with ticket_historical_status as (
             else 0 end as open_status_duration_minutes,
         case when status = 'deleted' then 1
             else 0 end as ticket_deleted,
-        first_value(valid_starting_at) over (partition by ticket_id order by valid_starting_at desc, ticket_id rows unbounded preceding) as last_status_assignment_date,
-        case when lag(status) over (partition by ticket_id order by valid_starting_at) = 'deleted' and status != 'deleted'
+        first_value(valid_starting_at) over (partition by ticket_id, source_relation order by valid_starting_at desc, ticket_id rows unbounded preceding) as last_status_assignment_date,
+        case when lag(status) over (partition by ticket_id, source_relation order by valid_starting_at) = 'deleted' and status != 'deleted'
             then 1
             else 0
                 end as ticket_recoveries
@@ -36,6 +37,7 @@ with ticket_historical_status as (
 
 select 
   ticket_id,
+  source_relation,
   last_status_assignment_date,
   sum(ticket_deleted) as ticket_deleted_count,
   sum(agent_wait_time_in_minutes) as agent_wait_time_in_calendar_minutes,
@@ -47,4 +49,4 @@ select
   sum(open_status_duration_minutes) as open_status_duration_in_calendar_minutes,
   sum(ticket_recoveries) as total_ticket_recoveries
 from calendar_minutes
-group by 1, 2
+group by 1, 2, 3

models/intermediate/int_zendesk__assignee_updates.sql

@@ -9,6 +9,7 @@ with ticket_updates as (
 ), ticket_requester as (
     select
         ticket.ticket_id,
+        ticket.source_relation,
         ticket.assignee_id,
         ticket_updates.valid_starting_at
 
@@ -17,16 +18,18 @@ with ticket_updates as (
     left join ticket_updates
         on ticket_updates.ticket_id = ticket.ticket_id
             and ticket_updates.user_id = ticket.assignee_id
+            and ticket_updates.source_relation = ticket.source_relation
 
 ), final as (
     select 
         ticket_id,
+        source_relation,
         assignee_id,
         max(valid_starting_at) as last_updated,
         count(*) as total_updates
     from ticket_requester
 
-    group by 1, 2
+    group by 1, 2, 3
 )
 
 select * 

models/intermediate/int_zendesk__comment_metrics.sql

@@ -7,6 +7,7 @@ with ticket_comments as (
 comment_counts as (
     select
         ticket_id,
+        source_relation,
         last_comment_added_at,
         sum(case when commenter_role = 'internal_comment' and is_public = true
             then 1
@@ -38,7 +39,7 @@ comment_counts as (
                 end) as count_agent_replies
     from ticket_comments
 
-    group by 1, 2
+    group by 1, 2, 3
 ),
 
 final as (

models/intermediate/int_zendesk__latest_ticket_form.sql

@@ -9,13 +9,14 @@ with ticket_form_history as (
 latest_ticket_form as (
     select
       *,
-      row_number() over(partition by ticket_form_id order by updated_at desc) as latest_form_index
+      row_number() over(partition by ticket_form_id, source_relation order by updated_at desc) as latest_form_index
     from ticket_form_history
 ),
 
 final as (
     select 
         ticket_form_id,
+        source_relation,
         created_at,
         updated_at,
         display_name,

models/intermediate/int_zendesk__organization_aggregates.sql

@@ -11,13 +11,15 @@ with organizations as (
 ), tag_aggregates as (
     select
         organizations.organization_id,
+        organizations.source_relation,
         {{ fivetran_utils.string_agg('organization_tags.tags', "', '" ) }} as organization_tags
     from organizations
 
     left join organization_tags
-        using (organization_id)
+        on organizations.organization_id = organization_tags.organization_id
+        and organizations.source_relation = organization_tags.source_relation
 
-    group by 1
+    group by 1, 2
 {% endif %}
 
 --If you use using_domain_names tags this will be included, if not it will be ignored.
@@ -30,13 +32,15 @@ with organizations as (
 ), domain_aggregates as (
     select
         organizations.organization_id,
+        organizations.source_relation,
         {{ fivetran_utils.string_agg('domain_names.domain_name', "', '" ) }} as domain_names
     from organizations
 
     left join domain_names
-        using(organization_id)
+        on organizations.organization_id = domain_names.organization_id
+        and organizations.source_relation = domain_names.source_relation
 
-    group by 1
+    group by 1, 2
 {% endif %}
 
 
@@ -59,13 +63,15 @@ with organizations as (
     --If you use using_domain_names tags this will be included, if not it will be ignored.
     {% if var('using_domain_names', True) %}
     left join domain_aggregates
-        using(organization_id)
+        on organizations.organization_id = domain_aggregates.organization_id
+        and organizations.source_relation = domain_aggregates.source_relation
     {% endif %}
 
     --If you use organization tags this will be included, if not it will be ignored.
     {% if var('using_organization_tags', True) %}
     left join tag_aggregates
-        using(organization_id)
+        on organizations.organization_id = tag_aggregates.organization_id
+        and organizations.source_relation = tag_aggregates.source_relation
     {% endif %}
 )
 

models/intermediate/int_zendesk__requester_updates.sql

@@ -9,6 +9,7 @@ with ticket_updates as (
 ), ticket_requester as (
     select
         ticket.ticket_id,
+        ticket.source_relation,
         ticket.requester_id,
         ticket_updates.valid_starting_at
 
@@ -17,16 +18,18 @@ with ticket_updates as (
     left join ticket_updates
         on ticket_updates.ticket_id = ticket.ticket_id
             and ticket_updates.user_id = ticket.requester_id
+            and ticket_updates.source_relation = ticket.source_relation
 
 ), final as (
     select 
         ticket_id,
+        source_relation,
         requester_id,
         max(valid_starting_at) as last_updated,
         count(*) as total_updates
     from ticket_requester
 
-    group by 1, 2
+    group by 1, 2, 3
 )
 
 select *