Update parking_cycle_hangar_allocation_update.py (#2049)

* Update parking_cycle_hangar_allocation_update.py

add check for unsubscribed emails

* add parking prefix back to the tables

---------

Co-authored-by: Tian Chen <[email protected]>

Author: barnesm707

scripts/jobs/parking/parking_cycle_hangar_allocation_update.py

@@ -39,6 +39,7 @@
 26/09/2024 - add hangar location.
 04/10/2024 - add additional checks for the waiting list
 04/12/2024 - collect the interim cycle hangar waiting list
+08/01/2025 - Amend to remove records from the waiting list that have been unsuscribed
 ******************************************************************************************************************/
 /*******************************************************************************
 Create a comparison between Toms Hangar list and EStreet
@@ -76,6 +77,14 @@
     UNION ALL
     SELECT 'new_only','new_only','new_only'),
 
+/*** 08-01-2025 collect the unsubscribed_emails ***/
+unsubscribed_emails as (
+    SELECT *,
+        ROW_NUMBER() OVER ( PARTITION BY email_address ORDER BY email_address DESC) row1
+    FROM "parking-raw-zone".parking_parking_cycle_hangar_unsubscribed_emails 
+    WHERE import_date = (select max(import_date) 
+                    from "parking-raw-zone".parking_cycle_hangar_unsubscribed_emails)), 
+
 /*******************************************************************************
 Obtain the latest Waiting List History
 *******************************************************************************/
@@ -106,17 +115,20 @@
     FROM "dataplatform-stg-liberator-raw-zone".liberator_permit_llpg
     WHERE import_Date = format_datetime(current_date, 'yyyyMMdd')),
 /*******************************************************************************
-04/12/2024 - interim cycle hangar waiting list
+04/12/2024 - interim cycle hangar waiting list remove unsubscribed emails
 *******************************************************************************/   
 Interim_Wait as (
-    SELECT * from "parking-raw-zone".interim_cycle_wait_list 
-    WHERE import_date = (select max(import_date) 
+    SELECT A.*, E.email_address from "parking-raw-zone".interim_cycle_wait_list as A
+    LEFT JOIN unsubscribed_emails as E ON upper(ltrim(rtrim(A.email))) = 
+                                upper(ltrim(rtrim(E.email_address)))    
+    WHERE A.import_date = (select max(import_date) 
                     from "parking-raw-zone".interim_cycle_wait_list)),
-    
+
 /*** count the number on the waiting list by hangar ***/
 Interim_Wait_summary as (
     SELECT hanger_id, count(*) as Interim_Wait_Total
     FROM Interim_Wait
+    WHERE email_address is NULL
     GROUP BY hanger_id),
 /*******************************************************************************
 Cycle Hangar allocation details