From d7a14c3270ac4b7bb4a7423552cc503f76afe27d Mon Sep 17 00:00:00 2001
From: Willy Raedy <wraedy@gmail.com>
Date: Tue, 20 May 2025 11:53:23 -0500
Subject: [PATCH 1/2] remove indivisible committee filters

---
 models/staging/ngpvan/core/stg_ngpvan__activist_codes.sql     | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__campaigns.sql          | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__codes.sql              | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__committees.sql         | 4 ----
 .../ngpvan/core/stg_ngpvan__contacts_activist_codes.sql       | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__contacts_codes.sql     | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__contacts_contacts.sql  | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__contacts_notes.sql     | 4 ----
 .../ngpvan/core/stg_ngpvan__contacts_survey_responses.sql     | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__public_users.sql       | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__survey_questions.sql   | 4 ----
 models/staging/ngpvan/core/stg_ngpvan__survey_responses.sql   | 4 ----
 models/staging/ngpvan/stg_ngpvan__users_committees.sql        | 4 ----
 13 files changed, 52 deletions(-)

diff --git a/models/staging/ngpvan/core/stg_ngpvan__activist_codes.sql b/models/staging/ngpvan/core/stg_ngpvan__activist_codes.sql
index d5b2f73..fe191ca 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__activist_codes.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__activist_codes.sql
@@ -62,7 +62,3 @@ dedupe AS (
 
 SELECT *
 FROM dedupe
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__campaigns.sql b/models/staging/ngpvan/core/stg_ngpvan__campaigns.sql
index cc2b919..4b24e3c 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__campaigns.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__campaigns.sql
@@ -33,7 +33,3 @@ renamed AS (
 
 SELECT *
 FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__codes.sql b/models/staging/ngpvan/core/stg_ngpvan__codes.sql
index 42c55ae..7cce10b 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__codes.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__codes.sql
@@ -48,7 +48,3 @@ WITH
 SELECT
     *
 FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__committees.sql b/models/staging/ngpvan/core/stg_ngpvan__committees.sql
index 5120a2d..0e06d6b 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__committees.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__committees.sql
@@ -33,7 +33,3 @@ WITH
 SELECT
     DISTINCT *
 FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__contacts_activist_codes.sql b/models/staging/ngpvan/core/stg_ngpvan__contacts_activist_codes.sql
index daa8860..725a041 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__contacts_activist_codes.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__contacts_activist_codes.sql
@@ -50,7 +50,3 @@ WITH
     )
 
 SELECT * FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__contacts_codes.sql b/models/staging/ngpvan/core/stg_ngpvan__contacts_codes.sql
index 0ecc6ec..634b9e7 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__contacts_codes.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__contacts_codes.sql
@@ -39,7 +39,3 @@ WITH
 SELECT
     *
 FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__contacts_contacts.sql b/models/staging/ngpvan/core/stg_ngpvan__contacts_contacts.sql
index 6f0b0e8..79e4c70 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__contacts_contacts.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__contacts_contacts.sql
@@ -89,7 +89,3 @@ WITH
     )
 
 SELECT DISTINCT * FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__contacts_notes.sql b/models/staging/ngpvan/core/stg_ngpvan__contacts_notes.sql
index fc3e771..80064f5 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__contacts_notes.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__contacts_notes.sql
@@ -42,7 +42,3 @@ WITH
 SELECT
     *
 FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__contacts_survey_responses.sql b/models/staging/ngpvan/core/stg_ngpvan__contacts_survey_responses.sql
index 57837ec..e041c81 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__contacts_survey_responses.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__contacts_survey_responses.sql
@@ -52,7 +52,3 @@ WITH
     )
 
 SELECT * FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__public_users.sql b/models/staging/ngpvan/core/stg_ngpvan__public_users.sql
index 873949b..8eeffbf 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__public_users.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__public_users.sql
@@ -24,7 +24,3 @@ WITH
 SELECT
     *
 FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__survey_questions.sql b/models/staging/ngpvan/core/stg_ngpvan__survey_questions.sql
index e12bcde..2eeaa22 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__survey_questions.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__survey_questions.sql
@@ -31,7 +31,3 @@ WITH
     )
 
 SELECT * FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
diff --git a/models/staging/ngpvan/core/stg_ngpvan__survey_responses.sql b/models/staging/ngpvan/core/stg_ngpvan__survey_responses.sql
index bf5b938..03fd81d 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__survey_responses.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__survey_responses.sql
@@ -58,7 +58,3 @@ WITH
     )
 
 SELECT DISTINCT * FROM dedupe
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)
\ No newline at end of file
diff --git a/models/staging/ngpvan/stg_ngpvan__users_committees.sql b/models/staging/ngpvan/stg_ngpvan__users_committees.sql
index b3747a7..33adf5b 100644
--- a/models/staging/ngpvan/stg_ngpvan__users_committees.sql
+++ b/models/staging/ngpvan/stg_ngpvan__users_committees.sql
@@ -25,7 +25,3 @@ WITH
 SELECT
     *
 FROM renamed
-WHERE NOT (
-    source_schema LIKE 'raw_avvan%'
-    AND committee_id = 68149
-)

From 6923a37f11624f8ad71785c0b21d4c6e1a6e8f85 Mon Sep 17 00:00:00 2001
From: Ian <47256454+IanRFerguson@users.noreply.github.com>
Date: Wed, 13 Aug 2025 07:46:54 -0400
Subject: [PATCH 2/2] remove ambiguous field

---
 models/staging/ngpvan/core/stg_ngpvan__codes.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/staging/ngpvan/core/stg_ngpvan__codes.sql b/models/staging/ngpvan/core/stg_ngpvan__codes.sql
index 7cce10b..2bfac99 100644
--- a/models/staging/ngpvan/core/stg_ngpvan__codes.sql
+++ b/models/staging/ngpvan/core/stg_ngpvan__codes.sql
@@ -5,7 +5,7 @@ WITH
     ),
 
     committees AS (
-        SELECT * FROM {{ ref('base_ngpvan__committees') }}
+        SELECT * EXCEPT(_avvan_source_relation) FROM {{ ref('base_ngpvan__committees') }}
     ),
 
     codetypes AS (