From 899090a9f273f0ad9e55731d35a3cdbc815779be Mon Sep 17 00:00:00 2001
From: William Ridgeway <10358980+wrridgeway@users.noreply.github.com>
Date: Fri, 8 Mar 2024 14:37:07 -0600
Subject: [PATCH]  Correctly join calculated number of parcels per sale to
 sales view (#334)

* Adjust joining for calculated number of parcels per sale

* Add dbt test to detect NULL values for num_parcels_sale
---
 aws-athena/views/default-vw_pin_sale.sql          | 3 ++-
 dbt/models/default/schema/default.vw_pin_sale.yml | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/aws-athena/views/default-vw_pin_sale.sql b/aws-athena/views/default-vw_pin_sale.sql
index f017ff744..bdf1b7833 100644
--- a/aws-athena/views/default-vw_pin_sale.sql
+++ b/aws-athena/views/default-vw_pin_sale.sql
@@ -130,7 +130,8 @@ unique_sales AS (
             ) AS sale_filter_deed_type
         FROM {{ source('iasworld', 'sales') }} AS sales
         LEFT JOIN calculated
-            ON sales.instruno = calculated.instruno
+            ON NULLIF(REPLACE(sales.instruno, 'D', ''), '')
+            = calculated.instruno
         LEFT JOIN
             town_class AS tc
             ON sales.parid = tc.parid
diff --git a/dbt/models/default/schema/default.vw_pin_sale.yml b/dbt/models/default/schema/default.vw_pin_sale.yml
index dc83c129d..bf295de4d 100644
--- a/dbt/models/default/schema/default.vw_pin_sale.yml
+++ b/dbt/models/default/schema/default.vw_pin_sale.yml
@@ -77,6 +77,9 @@ models:
       - row_count:
           name: default_vw_pin_sale_row_count
           above: 2477674 # as of 2023-11-22
+      - not_null:
+          name: default_vw_pin_sale_num_parcels_sale_not_null
+          column_name: num_parcels_sale
       # TODO: Sale is validated (after sales validation has been added to
       # iasworld)
       # TODO: Validation is catching obvious outliers