Merge pull request #624 from larsenle/main

DSS-771 DB: Updates for BL linking/unlinking

Author: ychung-mot

database/ddl/STR_DSS_Routines_Sprint_13.sql

@@ -1,12 +1,12 @@
+DROP PROCEDURE IF EXISTS dss_process_biz_lic_table(lg_id BIGINT);
+
 CREATE OR REPLACE PROCEDURE dss_process_biz_lic_table_delete(lg_id BIGINT)
 LANGUAGE plpgsql
 AS $$
 DECLARE
 	source_count int;
 	unlink_count int;
 	delete_count int;
-	merged_count int;
-	linked_count int;
 BEGIN
     -- Exit if temporary table is missing
     IF NOT EXISTS (
@@ -36,7 +36,10 @@ BEGIN
 	) AS src
 	ON (tgt.governing_business_licence_id = src.business_licence_id)
     WHEN MATCHED THEN
-		UPDATE SET governing_business_licence_id = NULL;
+		UPDATE SET
+			effective_business_licence_no = regexp_replace(UPPER(tgt.business_licence_no), '[^A-Z0-9]+', '', 'g'),
+			governing_business_licence_id = NULL,
+			is_changed_business_licence = false;
 
 	GET DIAGNOSTICS unlink_count = ROW_COUNT;
 
@@ -54,16 +57,12 @@ BEGIN
     RAISE NOTICE 'Deleted % business licences', delete_count;
 END $$;
 
-
 CREATE OR REPLACE PROCEDURE dss_process_biz_lic_table_insert(lg_id BIGINT)
 LANGUAGE plpgsql
 AS $$
 DECLARE
 	source_count int;
-	unlink_count int;
-	delete_count int;
 	merged_count int;
-	linked_count int;
 BEGIN
     -- Exit if temporary table is missing
     IF NOT EXISTS (
@@ -134,61 +133,39 @@ BEGIN
 	GET DIAGNOSTICS merged_count = ROW_COUNT;
 
     RAISE NOTICE 'Created or refreshed % business licences', merged_count;
+
+    -- Optional: Truncate the temporary table after processing
+    TRUNCATE TABLE biz_lic_table;
 END $$;
 
 CREATE OR REPLACE PROCEDURE dss_process_biz_lic_table_update(lg_id BIGINT)
 LANGUAGE plpgsql
 AS $$
 DECLARE
-	source_count int;
-	unlink_count int;
-	delete_count int;
-	merged_count int;
 	linked_count int;
 BEGIN
-    -- Exit if temporary table is missing
-    IF NOT EXISTS (
-        SELECT 1
-        FROM pg_tables
-        WHERE tablename = 'biz_lic_table'
-    ) THEN
-        RAISE NOTICE 'biz_lic_table does not exist. Exiting procedure.';
-        RETURN;
-    END IF;
-
-	SELECT COUNT(1) INTO source_count
-	FROM biz_lic_table
-	WHERE providing_organization_id = lg_id;
-
-    RAISE NOTICE 'Found % source rows', source_count;
-
-
-
     -- Update dss_rental_listing if differing match found
 	MERGE INTO dss_rental_listing AS tgt
 	USING (
-		SELECT drl.rental_listing_id, dbl.business_licence_id
+		SELECT drl.rental_listing_id, dbl.business_licence_id, regexp_replace(UPPER(drl.business_licence_no), '[^A-Z0-9]+', '', 'g') AS normalized_business_licence_no
 		FROM dss_rental_listing drl
 		JOIN dss_physical_address dpa ON drl.locating_physical_address_id = dpa.physical_address_id
 		JOIN dss_organization lgs ON lgs.organization_id = dpa.containing_organization_id AND dpa.match_score_amt > 1
 		LEFT JOIN dss_business_licence dbl ON (
             regexp_replace(UPPER(drl.business_licence_no), '[^A-Z0-9]+', '', 'g') = regexp_replace(UPPER(dbl.business_licence_no), '[^A-Z0-9]+', '', 'g')
             AND lgs.managing_organization_id = dbl.providing_organization_id)
-		WHERE drl.including_rental_listing_report_id IS NULL 
+		WHERE drl.including_rental_listing_report_id IS NULL
 		  AND COALESCE(drl.governing_business_licence_id, -1) != COALESCE(dbl.business_licence_id, -1)
+		  AND NOT COALESCE(drl.is_changed_business_licence, false)
 		  AND lgs.managing_organization_id = lg_id
 	) AS src
 	ON (tgt.rental_listing_id = src.rental_listing_id)
     WHEN MATCHED THEN
-		UPDATE SET governing_business_licence_id = src.business_licence_id;
+		UPDATE SET
+			effective_business_licence_no = src.normalized_business_licence_no,
+			governing_business_licence_id = src.business_licence_id;
 
 	GET DIAGNOSTICS linked_count = ROW_COUNT;
 
     RAISE NOTICE 'Linked business licences for % listings', linked_count;
-
-    -- Optional: Truncate the temporary table after processing
-    TRUNCATE TABLE biz_lic_table;
-
-    -- Notify of completion
-    RAISE NOTICE 'Data has been processed from biz_lic_table to dss_business_licence for lg_id %', lg_id;
 END $$;