Merge pull request #393 from icefoganalytics/test

More WUP fixes

Author: datajohnson

db/2025_updates.sql

@@ -80,22 +80,21 @@ ALTER TABLE sfa.status_reason ADD funding_application_type_id INT NULL REFERENCE
 
 
 
-CREATE FUNCTION [sfa].[fn_financial_coding](@disbursement_id INT)
+CREATE OR ALTER FUNCTION [sfa].[fn_financial_coding](@disbursement_id INT)
 RETURNS NVARCHAR
 AS 
 BEGIN
 DECLARE @coding NVARCHAR = '';
 
 
 SELECT @coding = CASE 
-	WHEN app.funding_application_type_id = 1 THEN rt.financial_coding 
-	WHEN app.funding_application_type_id = 2 THEN 
-        CASE WHEN CAST(JSON_VALUE(fr.json_data, '$.funding_source') AS nvarchar) = 'WDA' THEN  '031-500707-0301-8888'
-             WHEN CAST(JSON_VALUE(fr.json_data, '$.funding_source') AS nvarchar) = 'LMDA' THEN '031-500708-0301-8888' 
-		END
-	END
+        WHEN app.funding_application_type_id = 2 AND d.disbursement_type_id = 11 THEN '031-500707-0301-8888'
+        WHEN app.funding_application_type_id = 2 AND d.disbursement_type_id = 10 THEN '031-500708-0301-8888' 
+        ELSE rt.financial_coding
+        END
 FROM sfa.disbursement d 
 	INNER JOIN sfa.funding_request fr ON fr.id = d.funding_request_id
+    INNER JOIN sfa.disbursement_type dt ON dt.id = d.disbursement_type_id
 	LEFT OUTER JOIN sfa.application a1 ON a1.id = fr.application_id
 	LEFT OUTER JOIN sfa.funding_application a2 ON a2.id = fr.funding_application_id
 	CROSS APPLY (