From 1ae18166738e344eed7c7761552d91818636db4c Mon Sep 17 00:00:00 2001
From: Jack Forgash <58153492+forgxyz@users.noreply.github.com>
Date: Tue, 8 Apr 2025 11:22:07 -0600
Subject: [PATCH] Modify Transaction Results (#427)

* rm data from complete txres model

* comment

* rm data from complete tx

* add manual load to txres

* add RETRY_WINDOW var

* fix tx final RETRY_WINDOW
---
 .../core/silver__streamline_transaction_results.sql       | 8 ++++++--
 .../silver/core/silver__streamline_transactions_final.sql | 6 +++---
 .../streamline__complete_get_transaction_results.sql      | 2 --
 .../complete/streamline__complete_get_transactions.sql    | 1 -
 .../streamline__get_transaction_results_realtime.sql      | 7 +------
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/models/silver/core/silver__streamline_transaction_results.sql b/models/silver/core/silver__streamline_transaction_results.sql
index ae90fd7..d12e88e 100644
--- a/models/silver/core/silver__streamline_transaction_results.sql
+++ b/models/silver/core/silver__streamline_transaction_results.sql
@@ -12,7 +12,7 @@
 SELECT
     block_number,
     id AS tx_id,
-    DATA: error_message :: STRING AS error_message,
+    DATA :error_message :: STRING AS error_message,
     DATA :events :: ARRAY AS events,
     DATA :status :: INT AS status,
     DATA :status_code :: INT AS status_code,
@@ -30,6 +30,10 @@ FROM
         {{ ref('bronze__streamline_transaction_results_history') }}
         -- TODO need incremental logic of some sort probably (for those 5800 missing txs)
         -- where inserted timestamp >= max from this where network version = backfill version OR block range between root and end
+{% elif var('MANUAL_FIX', False) %}
+    {{ ref('bronze__streamline_fr_transaction_results') }}
+    WHERE 
+        _partition_by_block_id BETWEEN {{ var('RANGE_START', 0) }} AND {{ var('RANGE_END', 0) }}
 {% else %}
 
 {% if is_incremental() %}
@@ -43,7 +47,7 @@ WHERE
     )
     -- AND _partition_by_block_id > 107700000 -- march 27th 2025
     -- AND _partition_by_block_id > 108000000 -- march 28th 2025
-    AND _partition_by_block_id > 108800000 -- april 5th 2025
+    -- AND _partition_by_block_id > 108800000 -- april 5th 2025
 {% else %}
     {{ ref('bronze__streamline_fr_transaction_results') }}
 {% endif %}
diff --git a/models/silver/core/silver__streamline_transactions_final.sql b/models/silver/core/silver__streamline_transactions_final.sql
index 23fecb7..0e57732 100644
--- a/models/silver/core/silver__streamline_transactions_final.sql
+++ b/models/silver/core/silver__streamline_transactions_final.sql
@@ -18,7 +18,7 @@
                     block_height
                 FROM """ ~ this ~ """
                 WHERE
-                    modified_timestamp >= SYSDATE() - INTERVAL '7 days'
+                    modified_timestamp >= SYSDATE() - INTERVAL '""" ~ var('RETRY_WINDOW', 3) ~ """ days'
                     AND (
                         block_timestamp IS NULL
                         OR pending_result_response
@@ -43,7 +43,7 @@
                 )
                 OR -- re-run record if block comes in later than tx records
                 (
-                    modified_timestamp >= SYSDATE() - INTERVAL '3 days'
+                    modified_timestamp >= SYSDATE() - INTERVAL '""" ~ var('RETRY_WINDOW', 3) ~ """ days'
                     AND
                     tx_id IN (
                         SELECT
@@ -81,7 +81,7 @@ tx_results AS (
 
 {% if is_incremental() %}
 WHERE
-    modified_timestamp >= SYSDATE() - INTERVAL '3 days'
+    modified_timestamp >= SYSDATE() - INTERVAL '{{ var('RETRY_WINDOW', 3) }} days'
     AND tx_id IN (
         SELECT
             DISTINCT tx_id
diff --git a/models/streamline/core/complete/streamline__complete_get_transaction_results.sql b/models/streamline/core/complete/streamline__complete_get_transaction_results.sql
index 1ba6c9e..f476c6a 100644
--- a/models/streamline/core/complete/streamline__complete_get_transaction_results.sql
+++ b/models/streamline/core/complete/streamline__complete_get_transaction_results.sql
@@ -10,7 +10,6 @@
 
 SELECT
     id,
-    DATA,
     block_number,
     _partition_by_block_id,
     _inserted_timestamp
@@ -28,7 +27,6 @@ WHERE
         ),
         '1900-01-01' :: timestamp_ntz
     )
-    AND _partition_by_block_id > 108800000
     -- id NOT IN (
     --     'f31f601728b59a0411b104e6795eb18e32c9b1bea3e52ea1d28a801ed5ceb009',
     --     'b68b81b7a2ec9fb4e3789f871f95084ba4fdd9b46bb6c7029efa578a69dba432'
diff --git a/models/streamline/core/complete/streamline__complete_get_transactions.sql b/models/streamline/core/complete/streamline__complete_get_transactions.sql
index 5b9b625..7281a21 100644
--- a/models/streamline/core/complete/streamline__complete_get_transactions.sql
+++ b/models/streamline/core/complete/streamline__complete_get_transactions.sql
@@ -10,7 +10,6 @@
 
 SELECT
     id,
-    data,
     block_number,
     _partition_by_block_id,
     _inserted_timestamp
diff --git a/models/streamline/core/realtime/streamline__get_transaction_results_realtime.sql b/models/streamline/core/realtime/streamline__get_transaction_results_realtime.sql
index d48cb4d..9b0fb24 100644
--- a/models/streamline/core/realtime/streamline__get_transaction_results_realtime.sql
+++ b/models/streamline/core/realtime/streamline__get_transaction_results_realtime.sql
@@ -68,11 +68,6 @@ SELECT
     ) AS request
 FROM
     transactions_to_ingest
-WHERE
-    block_height > 108800000
-    -- transaction_id NOT IN (
-    --     'f31f601728b59a0411b104e6795eb18e32c9b1bea3e52ea1d28a801ed5ceb009',
-    --     'b68b81b7a2ec9fb4e3789f871f95084ba4fdd9b46bb6c7029efa578a69dba432'
-    -- )
+
 ORDER BY
     block_height DESC