[387] Update grain of tvl_agg model and push down filter in int_tvl_trustlines

Author: taha-aziz

models/intermediate/tvl/int_tvl_trustlines.sql

@@ -1,6 +1,6 @@
 {% set meta_config = {
     "materialized": "incremental",
-    "unique_key": ["day", "account_id", "asset_code", "asset_issuer"],
+    "unique_key": ["day", "account_id", "asset_code", "asset_issuer", "asset_type"],
     "tags": ["tvl"]
 } %}
 
@@ -34,6 +34,7 @@ with
     , filter_trustlines as (
         select
             t.account_id
+            , t.asset_type
             , t.asset_code
             , t.asset_issuer
             , t.selling_liabilities
@@ -49,28 +50,30 @@ with
         select
             d.day
             , t.account_id
+            , t.asset_type
             , t.asset_code
             , t.asset_issuer
             , array_agg(t.selling_liabilities order by t.closed_at desc)[offset(0)] as tvl
             , array_agg(t.deleted order by t.closed_at desc)[offset(0)] as deleted
         from date_range as d
         inner join filter_trustlines as t
             on t.closed_at < timestamp(date_add(d.day, interval 1 day))
-        where
-            true
-            and deleted = false
-        group by 1, 2, 3, 4
+        group by 1, 2, 3, 4, 5
     )
 
     , daily_trustline_tvl as (
         select
             day
             , account_id
+            , asset_type
             , asset_code
             , asset_issuer
             , sum(tvl) as trustlines_tvl
         from trustline_tvl_per_day
-        group by 1, 2, 3, 4
+        where
+            true
+            and deleted = false
+        group by 1, 2, 3, 4, 5
     )
 
 select *

models/intermediate/tvl/int_tvl_trustlines.yml

@@ -18,6 +18,13 @@ models:
               date_column_name: "day"
               greater_than_equal_to: "2 day"
 
+      - name: asset_type
+        description: '{{ doc("asset_type") }}'
+        tests:
+          - stellar_dbt_public.incremental_not_null:
+              date_column_name: "day"
+              greater_than_equal_to: "2 day"
+
       - name: asset_code
         description: "The asset code of the TVL, this table only has non XLM tvl."
         tests:

models/marts/tvl/tvl_agg.sql

@@ -1,6 +1,6 @@
 {% set meta_config = {
     "materialized": "incremental",
-    "unique_key": ["day"],
+    "unique_key": ["day", "asset_code", "asset_issuer", "asset_type"],
     "tags": ["tvl"]
 } %}
 
@@ -14,28 +14,40 @@ with
     accounts_tvl as (
         select
             day
+            , 'native' as asset_type
+            , 'XLM' as asset_code
+            , '' as asset_issuer
             , sum(accounts_tvl) as accounts_tvl
         from {{ ref('int_tvl_accounts') }}
-        group by 1
+        group by 1, 2, 3, 4
     )
 
     , trustlines_tvl as (
         select
             day
+            , asset_type
+            , asset_code
+            , asset_issuer
             , sum(trustlines_tvl) as trustlines_tvl
         from {{ ref('int_tvl_trustlines') }}
-        group by 1
+        group by 1, 2, 3, 4
     )
 
     , combined as (
         select
-            a.day
-            , a.accounts_tvl
-            , t.trustlines_tvl
-            , a.accounts_tvl + t.trustlines_tvl as total_tvl
+            coalesce(a.day, t.day) as day
+            , coalesce(a.asset_type, t.asset_type) as asset_type
+            , coalesce(a.asset_code, t.asset_code) as asset_code
+            , coalesce(a.asset_issuer, t.asset_issuer) as asset_issuer
+            , coalesce(a.accounts_tvl, 0) as accounts_tvl
+            , coalesce(t.trustlines_tvl, 0) as trustlines_tvl
+            , coalesce(a.accounts_tvl, 0) + coalesce(t.trustlines_tvl, 0) as total_tvl
         from accounts_tvl as a
-        inner join trustlines_tvl as t
+        full outer join trustlines_tvl as t
             on a.day = t.day
+            and a.asset_type = t.asset_type
+            and a.asset_code = t.asset_code
+            and a.asset_issuer = t.asset_issuer
     )
 
 select *

models/marts/tvl/tvl_agg.yml

@@ -11,6 +11,23 @@ models:
               date_column_name: "day"
               greater_than_equal_to: "2 day"
 
+      - name: asset_type
+        description: '{{ doc("asset_type") }}'
+        tests:
+          - stellar_dbt_public.incremental_not_null:
+              date_column_name: "day"
+              greater_than_equal_to: "2 day"
+
+      - name: asset_code
+        description: '{{ doc("asset_code") }}'
+        tests:
+          - stellar_dbt_public.incremental_not_null:
+              date_column_name: "day"
+              greater_than_equal_to: "2 day"
+
+      - name: asset_issuer
+        description: '{{ doc("asset_issuer") }}'
+
       - name: accounts_tvl
         description: '{{ doc("accounts_tvl") }}'
         tests: